diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
index 4789254596df7e24031d1f25e1b2b72b0c3a7f8e..eec6e7426eb282787aece3b3aed01d72792e2e4a 100644
Binary files a/apps/dashboard/js/dashboard.js and b/apps/dashboard/js/dashboard.js differ
diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
index f82ecc4cd41eaa5e46140ec4782ca69308fa45ce..312d7b0848adf07cc8ca3f0b6d56f6c8fe86ff9e 100644
Binary files a/apps/dashboard/js/dashboard.js.map and b/apps/dashboard/js/dashboard.js.map differ
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
index f151648232ab698527218f10b036ff8c096c453a..bd41125f500bf4034fea7c2ad53aff068f16c70b 100644
--- a/apps/dashboard/src/App.vue
+++ b/apps/dashboard/src/App.vue
@@ -39,7 +39,7 @@
 			<div class="modal__content">
 				<h3>{{ t('dashboard', 'Edit widgets') }}</h3>
 				<ol class="panels">
-					<li v-for="(cb, status) in allCallbacksStatus" :key="status">
+					<li v-for="status in sortedAllStatuses" :key="status">
 						<input :id="'status-checkbox-' + status"
 							type="checkbox"
 							class="checkbox"
@@ -105,11 +105,11 @@ const shippedBackgroundList = loadState('dashboard', 'shippedBackgrounds')
 const statusInfo = {
 	weather: {
 		text: t('dashboard', 'Weather'),
-		icon: 'icon-github',
+		icon: 'icon-weather-status',
 	},
 	status: {
 		text: t('dashboard', 'User status'),
-		icon: 'icon-discourse',
+		icon: 'icon-user-status-online',
 	},
 }
 
@@ -190,6 +190,9 @@ export default {
 		isStatusActive() {
 			return (status) => !(status in this.enabledStatuses) || this.enabledStatuses[status]
 		},
+		sortedAllStatuses() {
+			return Object.keys(this.allCallbacksStatus).slice().sort((a, b) => a > b)
+		},
 		sortedPanels() {
 			return Object.values(this.panels).sort((a, b) => {
 				const indexA = this.layout.indexOf(a.id)
diff --git a/apps/weather_status/js/weather-status.js b/apps/weather_status/js/weather-status.js
index a0cff5eb7f9350bcfa9902981a431c094435acf3..6762a13f29f3c41f5875d4f429b15f6684701d9e 100644
Binary files a/apps/weather_status/js/weather-status.js and b/apps/weather_status/js/weather-status.js differ
diff --git a/apps/weather_status/js/weather-status.js.map b/apps/weather_status/js/weather-status.js.map
index 1d79f3b5aa389c954e8efc535e473afb9abc047e..f73e4a2af1630dde3019b746f9548a018445134a 100644
Binary files a/apps/weather_status/js/weather-status.js.map and b/apps/weather_status/js/weather-status.js.map differ
diff --git a/apps/weather_status/src/App.vue b/apps/weather_status/src/App.vue
index c83ad1e4eaf4ac092c7e33bd191f303a68523de5..aed774cb98deecf8921ee8ad56172a714b086b9a 100644
--- a/apps/weather_status/src/App.vue
+++ b/apps/weather_status/src/App.vue
@@ -360,6 +360,12 @@ export default {
 </script>
 
 <style lang="scss">
+.icon-weather-status {
+	background-image: url('./../img/app-dark.svg');
+}
+body.theme--dark .icon-weather-status {
+	background-image: url('./../img/app.svg');
+}
 .icon-clearsky-day {
 	background-image: url('./../img/sun.svg');
 }