diff --git a/nymea-app/images.qrc b/nymea-app/images.qrc
new file mode 100644
index 00000000..0c1fbb22
--- /dev/null
+++ b/nymea-app/images.qrc
@@ -0,0 +1,152 @@
+<RCC>
+    <qresource prefix="/">
+        <file>ui/images/awning/awning-000.svg</file>
+        <file>ui/images/awning/awning-010.svg</file>
+        <file>ui/images/awning/awning-020.svg</file>
+        <file>ui/images/awning/awning-030.svg</file>
+        <file>ui/images/awning/awning-040.svg</file>
+        <file>ui/images/awning/awning-050.svg</file>
+        <file>ui/images/awning/awning-060.svg</file>
+        <file>ui/images/awning/awning-070.svg</file>
+        <file>ui/images/awning/awning-080.svg</file>
+        <file>ui/images/awning/awning-090.svg</file>
+        <file>ui/images/awning/awning-100.svg</file>
+        <file>ui/images/battery/battery-000.svg</file>
+        <file>ui/images/battery/battery-010.svg</file>
+        <file>ui/images/battery/battery-020.svg</file>
+        <file>ui/images/battery/battery-030.svg</file>
+        <file>ui/images/battery/battery-040.svg</file>
+        <file>ui/images/battery/battery-050.svg</file>
+        <file>ui/images/battery/battery-060.svg</file>
+        <file>ui/images/battery/battery-070.svg</file>
+        <file>ui/images/battery/battery-080.svg</file>
+        <file>ui/images/battery/battery-090.svg</file>
+        <file>ui/images/battery/battery-100.svg</file>
+        <file>ui/images/fingerprint/fingerprint_boxes.json</file>
+        <file>ui/images/fingerprint/fingerprint_segmented.png</file>
+        <file>ui/images/sensors/conductivity.svg</file>
+        <file>ui/images/sensors/humidity.svg</file>
+        <file>ui/images/sensors/light.svg</file>
+        <file>ui/images/sensors/moisture.svg</file>
+        <file>ui/images/sensors/pressure.svg</file>
+        <file>ui/images/sensors/temperature.svg</file>
+        <file>ui/images/shutter/shutter-000.svg</file>
+        <file>ui/images/shutter/shutter-010.svg</file>
+        <file>ui/images/shutter/shutter-020.svg</file>
+        <file>ui/images/shutter/shutter-030.svg</file>
+        <file>ui/images/shutter/shutter-040.svg</file>
+        <file>ui/images/shutter/shutter-050.svg</file>
+        <file>ui/images/shutter/shutter-060.svg</file>
+        <file>ui/images/shutter/shutter-070.svg</file>
+        <file>ui/images/shutter/shutter-080.svg</file>
+        <file>ui/images/shutter/shutter-090.svg</file>
+        <file>ui/images/shutter/shutter-100.svg</file>
+        <file>ui/images/weathericons/humidity.svg</file>
+        <file>ui/images/weathericons/weather-clear-day.svg</file>
+        <file>ui/images/weathericons/weather-clear-night.svg</file>
+        <file>ui/images/weathericons/weather-clouds.svg</file>
+        <file>ui/images/weathericons/weather-few-clouds-day.svg</file>
+        <file>ui/images/weathericons/weather-few-clouds-night.svg</file>
+        <file>ui/images/weathericons/weather-fog.svg</file>
+        <file>ui/images/weathericons/weather-light-rain.svg</file>
+        <file>ui/images/weathericons/weather-overcast.svg</file>
+        <file>ui/images/weathericons/weather-shower-rain.svg</file>
+        <file>ui/images/weathericons/weather-snow.svg</file>
+        <file>ui/images/weathericons/weather-thunderstorm.svg</file>
+        <file>ui/images/weathericons/wind.svg</file>
+        <file>ui/images/account.svg</file>
+        <file>ui/images/action-interface.svg</file>
+        <file>ui/images/action.svg</file>
+        <file>ui/images/add.svg</file>
+        <file>ui/images/alarm-clock.svg</file>
+        <file>ui/images/attention.svg</file>
+        <file>ui/images/audio-speakers-muted-symbolic.svg</file>
+        <file>ui/images/audio-speakers-symbolic.svg</file>
+        <file>ui/images/back.svg</file>
+        <file>ui/images/bluetooth.svg</file>
+        <file>ui/images/Built_with_Qt_RGB_logo_vertical.svg</file>
+        <file>ui/images/Built_with_Qt_RGB_logo.svg</file>
+        <file>ui/images/clock-app-symbolic.svg</file>
+        <file>ui/images/close.svg</file>
+        <file>ui/images/cloud-error.svg</file>
+        <file>ui/images/cloud-offline.svg</file>
+        <file>ui/images/cloud.svg</file>
+        <file>ui/images/configure.svg</file>
+        <file>ui/images/contact-new.svg</file>
+        <file>ui/images/delete.svg</file>
+        <file>ui/images/DeviceIconBlind.svg</file>
+        <file>ui/images/DeviceIconRollerShutter.svg</file>
+        <file>ui/images/dialog-error-symbolic.svg</file>
+        <file>ui/images/dialog-warning-symbolic.svg</file>
+        <file>ui/images/down.svg</file>
+        <file>ui/images/edit.svg</file>
+        <file>ui/images/erase.svg</file>
+        <file>ui/images/event-interface.svg</file>
+        <file>ui/images/event.svg</file>
+        <file>ui/images/eye.svg</file>
+        <file>ui/images/filters.svg</file>
+        <file>ui/images/find.svg</file>
+        <file>ui/images/fingerprint.svg</file>
+        <file>ui/images/go-down.svg</file>
+        <file>ui/images/guh-logo.svg</file>
+        <file>ui/images/info.svg</file>
+        <file>ui/images/light-off.svg</file>
+        <file>ui/images/light-on.svg</file>
+        <file>ui/images/lock-broken.svg</file>
+        <file>ui/images/logs.svg</file>
+        <file>ui/images/magic.svg</file>
+        <file>ui/images/media-playback-pause.svg</file>
+        <file>ui/images/media-playback-start.svg</file>
+        <file>ui/images/media-playback-stop.svg</file>
+        <file>ui/images/media-preview-start.svg</file>
+        <file>ui/images/media-seek-backward.svg</file>
+        <file>ui/images/media-seek-forward.svg</file>
+        <file>ui/images/media-skip-backward.svg</file>
+        <file>ui/images/media-skip-forward.svg</file>
+        <file>ui/images/mediaplayer-app-symbolic.svg</file>
+        <file>ui/images/navigation-menu.svg</file>
+        <file>ui/images/network-secure.svg</file>
+        <file>ui/images/network-vpn.svg</file>
+        <file>ui/images/network-wifi-symbolic.svg</file>
+        <file>ui/images/network-wired-symbolic.svg</file>
+        <file>ui/images/next.svg</file>
+        <file>ui/images/nm-signal-00-secure.svg</file>
+        <file>ui/images/nm-signal-00.svg</file>
+        <file>ui/images/nm-signal-25-secure.svg</file>
+        <file>ui/images/nm-signal-25.svg</file>
+        <file>ui/images/nm-signal-50-secure.svg</file>
+        <file>ui/images/nm-signal-50.svg</file>
+        <file>ui/images/nm-signal-75-secure.svg</file>
+        <file>ui/images/nm-signal-75.svg</file>
+        <file>ui/images/nm-signal-100-secure.svg</file>
+        <file>ui/images/nm-signal-100.svg</file>
+        <file>ui/images/non-starred.svg</file>
+        <file>ui/images/notification.svg</file>
+        <file>ui/images/nymea-box-setup.svg</file>
+        <file>ui/images/plugin.svg</file>
+        <file>ui/images/private-browsing.svg</file>
+        <file>ui/images/question.svg</file>
+        <file>ui/images/refresh.svg</file>
+        <file>ui/images/remove.svg</file>
+        <file>ui/images/rpi-setup.svg</file>
+        <file>ui/images/select-none.svg</file>
+        <file>ui/images/send.svg</file>
+        <file>ui/images/sensors.svg</file>
+        <file>ui/images/settings.svg</file>
+        <file>ui/images/share.svg</file>
+        <file>ui/images/slideshow.svg</file>
+        <file>ui/images/sort-listitem.svg</file>
+        <file>ui/images/starred.svg</file>
+        <file>ui/images/state-interface.svg</file>
+        <file>ui/images/state.svg</file>
+        <file>ui/images/stock_application.svg</file>
+        <file>ui/images/stock_link.svg</file>
+        <file>ui/images/system-shutdown.svg</file>
+        <file>ui/images/tab-new.svg</file>
+        <file>ui/images/tick.svg</file>
+        <file>ui/images/up.svg</file>
+        <file>ui/images/view-collapse.svg</file>
+        <file>ui/images/view-expand.svg</file>
+        <file>ui/images/weather-app-symbolic.svg</file>
+    </qresource>
+</RCC>
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 86c2b022..5f2313bc 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -29,7 +29,8 @@ SOURCES += main.cpp \
     platformintegration/generic/platformhelpergeneric.cpp \
 
 RESOURCES += resources.qrc \
-    ruletemplates.qrc
+    ruletemplates.qrc \
+    images.qrc
 equals(STYLES_PATH, "") {
     RESOURCES += styles.qrc
 } else {
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index fef6a472..a6ffdafa 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -1,6 +1,19 @@
 <RCC>
     <qresource prefix="/">
         <file>ui/Nymea.qml</file>
+        <file>ui/NewDeviceWizard.qml</file>
+        <file>ui/SettingsPage.qml</file>
+        <file>ui/LoginPage.qml</file>
+        <file>ui/MagicPage.qml</file>
+        <file>ui/EditDevicesPage.qml</file>
+        <file>ui/PushButtonAuthPage.qml</file>
+        <file>ui/KeyboardLoader.qml</file>
+        <file>ui/MainPage.qml</file>
+        <file>ui/RootItem.qml</file>
+        <file>ui/mainviews/ScenesView.qml</file>
+        <file>ui/mainviews/FavoritesView.qml</file>
+        <file>ui/mainviews/DevicesPageDelegate.qml</file>
+        <file>ui/mainviews/DevicesPage.qml</file>
         <file>ui/connection/ConnectPage.qml</file>
         <file>ui/connection/ManualConnectPage.qml</file>
         <file>ui/connection/ConnectingPage.qml</file>
@@ -8,9 +21,7 @@
         <file>ui/connection/wifisetup/WirelessSetupPage.qml</file>
         <file>ui/connection/wifisetup/ConnectWiFiPage.qml</file>
         <file>ui/connection/wifisetup/NetworkSettingsPage.qml</file>
-        <file>ui/mainviews/DevicesPage.qml</file>
-        <file>ui/NewDeviceWizard.qml</file>
-        <file>ui/SettingsPage.qml</file>
+        <file>ui/connection/wifisetup/BoxInfoPage.qml</file>
         <file>ui/components/GuhHeader.qml</file>
         <file>ui/components/HeaderButton.qml</file>
         <file>ui/components/ColorPicker.qml</file>
@@ -40,98 +51,68 @@
         <file>ui/components/FingerprintVisual.qml</file>
         <file>ui/components/ListSectionHeader.qml</file>
         <file>ui/components/ListFilterInput.qml</file>
-        <file>ui/images/add.svg</file>
-        <file>ui/images/back.svg</file>
-        <file>ui/images/close.svg</file>
-        <file>ui/images/info.svg</file>
+        <file>ui/customviews/GenericTypeLogView.qml</file>
         <file>ui/customviews/CustomViewBase.qml</file>
         <file>ui/customviews/WeatherView.qml</file>
         <file>ui/customviews/MediaControllerView.qml</file>
-        <file>ui/LoginPage.qml</file>
         <file>ui/customviews/SensorView.qml</file>
-        <file>ui/devicepages/GenericDevicePage.qml</file>
+        <file>ui/customviews/NotificationsView.qml</file>
         <file>ui/devicepages/MediaDevicePage.qml</file>
+        <file>ui/devicepages/ButtonDevicePage.qml</file>
+        <file>ui/devicepages/GenericDeviceStateDetailsPage.qml</file>
+        <file>ui/devicepages/WeatherDevicePage.qml</file>
+        <file>ui/devicepages/SensorDevicePage.qml</file>
+        <file>ui/devicepages/DevicePageBase.qml</file>
+        <file>ui/devicepages/ConfigureThingPage.qml</file>
+        <file>ui/devicepages/InputTriggerDevicePage.qml</file>
+        <file>ui/devicepages/StateLogPage.qml</file>
+        <file>ui/devicepages/ShutterDevicePage.qml</file>
+        <file>ui/devicepages/GarageGateDevicePage.qml</file>
+        <file>ui/devicepages/AwningDevicePage.qml</file>
+        <file>ui/devicepages/NotificationsDevicePage.qml</file>
+        <file>ui/devicepages/LightDevicePage.qml</file>
+        <file>ui/devicepages/FingerprintReaderDevicePage.qml</file>
         <file>ui/devicelistpages/GenericDeviceListPage.qml</file>
         <file>ui/devicelistpages/LightsDeviceListPage.qml</file>
-        <file>ui/customviews/ExtendedVolumeController.qml</file>
-        <file>ui/images/light-on.svg</file>
-        <file>ui/images/light-off.svg</file>
-        <file>ui/images/media-preview-start.svg</file>
-        <file>ui/MagicPage.qml</file>
-        <file>ui/images/mediaplayer-app-symbolic.svg</file>
-        <file>ui/images/system-shutdown.svg</file>
-        <file>ui/devicepages/ButtonDevicePage.qml</file>
+        <file>ui/devicelistpages/SensorsDeviceListPage.qml</file>
+        <file>ui/devicelistpages/WeatherDeviceListPage.qml</file>
+        <file>ui/devicelistpages/DeviceListPageBase.qml</file>
         <file>ui/magic/SelectActionPage.qml</file>
-        <file>ui/devicepages/GenericDeviceStateDetailsPage.qml</file>
-        <file>ui/images/delete.svg</file>
-        <file>ui/images/audio-speakers-muted-symbolic.svg</file>
-        <file>ui/images/audio-speakers-symbolic.svg</file>
-        <file>ui/images/media-playback-pause.svg</file>
-        <file>ui/images/media-playback-start.svg</file>
-        <file>ui/images/media-playback-stop.svg</file>
-        <file>ui/images/media-seek-backward.svg</file>
-        <file>ui/images/media-seek-forward.svg</file>
-        <file>ui/images/media-skip-backward.svg</file>
-        <file>ui/images/media-skip-forward.svg</file>
-        <file>ui/images/weather-app-symbolic.svg</file>
-        <file>ui/images/weathericons/weather-clear-day.svg</file>
-        <file>ui/images/weathericons/weather-clear-night.svg</file>
-        <file>ui/images/weathericons/weather-clouds.svg</file>
-        <file>ui/images/weathericons/weather-few-clouds-day.svg</file>
-        <file>ui/images/weathericons/weather-few-clouds-night.svg</file>
-        <file>ui/images/weathericons/weather-fog.svg</file>
-        <file>ui/images/weathericons/weather-light-rain.svg</file>
-        <file>ui/images/weathericons/weather-overcast.svg</file>
-        <file>ui/images/weathericons/weather-shower-rain.svg</file>
-        <file>ui/images/weathericons/weather-snow.svg</file>
-        <file>ui/images/weathericons/weather-thunderstorm.svg</file>
-        <file>ui/images/weathericons/humidity.svg</file>
-        <file>ui/images/weathericons/wind.svg</file>
-        <file>ui/devicepages/WeatherDevicePage.qml</file>
-        <file>ui/images/navigation-menu.svg</file>
-        <file>ui/images/settings.svg</file>
-        <file>ui/images/stock_link.svg</file>
-        <file>ui/images/share.svg</file>
-        <file>ui/devicepages/SensorDevicePage.qml</file>
-        <file>ui/images/sensors.svg</file>
-        <file>ui/images/network-wired-symbolic.svg</file>
-        <file>ui/images/notification.svg</file>
-        <file>ui/customviews/NotificationsView.qml</file>
-        <file>ui/devicepages/DevicePageBase.qml</file>
-        <file>ui/images/battery/battery-000.svg</file>
-        <file>ui/images/battery/battery-010.svg</file>
-        <file>ui/images/battery/battery-020.svg</file>
-        <file>ui/images/battery/battery-030.svg</file>
-        <file>ui/images/battery/battery-040.svg</file>
-        <file>ui/images/battery/battery-050.svg</file>
-        <file>ui/images/battery/battery-060.svg</file>
-        <file>ui/images/battery/battery-070.svg</file>
-        <file>ui/images/battery/battery-080.svg</file>
-        <file>ui/images/battery/battery-090.svg</file>
-        <file>ui/images/battery/battery-100.svg</file>
-        <file>ui/images/dialog-warning-symbolic.svg</file>
-        <file>ui/images/magic.svg</file>
-        <file>ui/EditDevicesPage.qml</file>
-        <file>ui/devicepages/ConfigureThingPage.qml</file>
         <file>ui/magic/DeviceRulesPage.qml</file>
         <file>ui/magic/EditRulePage.qml</file>
         <file>ui/magic/SelectThingPage.qml</file>
         <file>ui/magic/ComposeEventDescriptorPage.qml</file>
-        <file>ui/images/view-expand.svg</file>
-        <file>ui/images/view-collapse.svg</file>
         <file>ui/magic/SelectRuleActionPage.qml</file>
         <file>ui/magic/SelectRuleActionParamsPage.qml</file>
-        <file>ui/images/tick.svg</file>
         <file>ui/magic/SelectEventDescriptorParamsPage.qml</file>
         <file>ui/magic/SelectEventDescriptorPage.qml</file>
+        <file>ui/magic/StateEvaluatorDelegate.qml</file>
+        <file>ui/magic/EditStateEvaluatorPage.qml</file>
+        <file>ui/magic/SimpleStateEvaluatorDelegate.qml</file>
+        <file>ui/magic/SelectStateDescriptorParamsPage.qml</file>
+        <file>ui/magic/SelectStateDescriptorPage.qml</file>
+        <file>ui/magic/TimeEventDelegate.qml</file>
+        <file>ui/magic/EditTimeEventItemPage.qml</file>
+        <file>ui/magic/EventDescriptorDelegate.qml</file>
+        <file>ui/magic/RuleActionDelegate.qml</file>
+        <file>ui/magic/EditCalendarItemPage.qml</file>
+        <file>ui/magic/CalendarItemDelegate.qml</file>
+        <file>ui/magic/NewThingMagicPage.qml</file>
         <file>ui/delegates/ParamDescriptorDelegate.qml</file>
         <file>ui/delegates/ParamDelegate.qml</file>
         <file>ui/delegates/ActionDelegate.qml</file>
+        <file>ui/delegates/ThingDelegate.qml</file>
         <file>ui/system/LogViewerPage.qml</file>
-        <file>ui/images/next.svg</file>
-        <file>ui/images/go-down.svg</file>
         <file>ui/system/PluginsPage.qml</file>
         <file>ui/system/PluginParamsPage.qml</file>
+        <file>ui/system/AboutNymeaPage.qml</file>
+        <file>ui/system/CloudSettingsPage.qml</file>
+        <file>ui/system/ConnectionInterfacesPage.qml</file>
+        <file>ui/system/ConnectionInterfaceDelegate.qml</file>
+        <file>ui/appsettings/AboutPage.qml</file>
+        <file>ui/appsettings/AppSettingsPage.qml</file>
+        <file>ui/appsettings/DeveloperOptionsPage.qml</file>
+        <file>ui/appsettings/CloudLoginPage.qml</file>
         <file>ui/fonts/Ubuntu-B.ttf</file>
         <file>ui/fonts/Ubuntu-BI.ttf</file>
         <file>ui/fonts/Ubuntu-C.ttf</file>
@@ -141,137 +122,9 @@
         <file>ui/fonts/Ubuntu-MI.ttf</file>
         <file>ui/fonts/Ubuntu-R.ttf</file>
         <file>ui/fonts/Ubuntu-RI.ttf</file>
-        <file>ui/magic/StateEvaluatorDelegate.qml</file>
-        <file>ui/magic/EditStateEvaluatorPage.qml</file>
-        <file>ui/magic/SimpleStateEvaluatorDelegate.qml</file>
-        <file>ui/magic/SelectStateDescriptorParamsPage.qml</file>
-        <file>ui/magic/SelectStateDescriptorPage.qml</file>
-        <file>ui/images/select-none.svg</file>
-        <file>ui/images/edit.svg</file>
-        <file>ui/PushButtonAuthPage.qml</file>
-        <file>ui/images/dialog-error-symbolic.svg</file>
-        <file>ui/images/send.svg</file>
-        <file>ui/images/attention.svg</file>
-        <file>ui/images/question.svg</file>
-        <file>ui/devicepages/InputTriggerDevicePage.qml</file>
-        <file>ui/images/clock-app-symbolic.svg</file>
-        <file>ui/devicepages/StateLogPage.qml</file>
-        <file>ui/customviews/GenericTypeLogView.qml</file>
         <file>qtquickcontrols2.conf</file>
-        <file>ui/images/bluetooth.svg</file>
-        <file>ui/images/refresh.svg</file>
-        <file>ui/images/nm-signal-00.svg</file>
-        <file>ui/images/nm-signal-00-secure.svg</file>
-        <file>ui/images/nm-signal-25.svg</file>
-        <file>ui/images/nm-signal-25-secure.svg</file>
-        <file>ui/images/nm-signal-50.svg</file>
-        <file>ui/images/nm-signal-50-secure.svg</file>
-        <file>ui/images/nm-signal-75.svg</file>
-        <file>ui/images/nm-signal-75-secure.svg</file>
-        <file>ui/images/nm-signal-100.svg</file>
-        <file>ui/images/nm-signal-100-secure.svg</file>
-        <file>ui/images/network-vpn.svg</file>
         <file>translations/nymea-app-de_DE.qm</file>
         <file>translations/nymea-app-en_US.qm</file>
-        <file>ui/images/stock_application.svg</file>
-        <file>ui/delegates/ThingDelegate.qml</file>
-        <file>ui/images/network-secure.svg</file>
-        <file>ui/images/lock-broken.svg</file>
-        <file>ui/images/sort-listitem.svg</file>
-        <file>ui/devicepages/ShutterDevicePage.qml</file>
-        <file>ui/images/shutter/shutter-000.svg</file>
-        <file>ui/images/shutter/shutter-010.svg</file>
-        <file>ui/images/shutter/shutter-020.svg</file>
-        <file>ui/images/shutter/shutter-030.svg</file>
-        <file>ui/images/shutter/shutter-040.svg</file>
-        <file>ui/images/shutter/shutter-050.svg</file>
-        <file>ui/images/shutter/shutter-060.svg</file>
-        <file>ui/images/shutter/shutter-070.svg</file>
-        <file>ui/images/shutter/shutter-080.svg</file>
-        <file>ui/images/shutter/shutter-090.svg</file>
-        <file>ui/images/shutter/shutter-100.svg</file>
-        <file>ui/images/down.svg</file>
-        <file>ui/images/up.svg</file>
-        <file>ui/devicepages/GarageGateDevicePage.qml</file>
-        <file>ui/images/remove.svg</file>
         <file>../LICENSE</file>
-        <file>ui/images/Built_with_Qt_RGB_logo.svg</file>
-        <file>ui/images/Built_with_Qt_RGB_logo_vertical.svg</file>
-        <file>ui/magic/TimeEventDelegate.qml</file>
-        <file>ui/magic/EditTimeEventItemPage.qml</file>
-        <file>ui/magic/EventDescriptorDelegate.qml</file>
-        <file>ui/magic/RuleActionDelegate.qml</file>
-        <file>ui/magic/EditCalendarItemPage.qml</file>
-        <file>ui/magic/CalendarItemDelegate.qml</file>
-        <file>ui/images/alarm-clock.svg</file>
-        <file>ui/images/action.svg</file>
-        <file>ui/images/event.svg</file>
-        <file>ui/images/state.svg</file>
-        <file>ui/images/event-interface.svg</file>
-        <file>ui/images/state-interface.svg</file>
-        <file>ui/images/action-interface.svg</file>
-        <file>ui/system/AboutNymeaPage.qml</file>
-        <file>ui/images/logs.svg</file>
-        <file>ui/images/plugin.svg</file>
-        <file>ui/images/nymea-box-setup.svg</file>
-        <file>ui/images/rpi-setup.svg</file>
-        <file>ui/images/eye.svg</file>
-        <file>ui/images/private-browsing.svg</file>
-        <file>ui/images/starred.svg</file>
-        <file>ui/images/non-starred.svg</file>
-        <file>ui/images/slideshow.svg</file>
-        <file>ui/mainviews/ScenesView.qml</file>
-        <file>ui/mainviews/FavoritesView.qml</file>
-        <file>ui/mainviews/DevicesPageDelegate.qml</file>
-        <file>ui/images/awning/awning-100.svg</file>
-        <file>ui/devicepages/AwningDevicePage.qml</file>
-        <file>ui/images/awning/awning-000.svg</file>
-        <file>ui/images/awning/awning-010.svg</file>
-        <file>ui/images/awning/awning-020.svg</file>
-        <file>ui/images/awning/awning-030.svg</file>
-        <file>ui/images/awning/awning-040.svg</file>
-        <file>ui/images/awning/awning-050.svg</file>
-        <file>ui/images/awning/awning-060.svg</file>
-        <file>ui/images/awning/awning-070.svg</file>
-        <file>ui/images/awning/awning-080.svg</file>
-        <file>ui/images/awning/awning-090.svg</file>
-        <file>ui/magic/NewThingMagicPage.qml</file>
-        <file>ui/images/DeviceIconBlind.svg</file>
-        <file>ui/images/DeviceIconRollerShutter.svg</file>
-        <file>ui/images/sensors/conductivity.svg</file>
-        <file>ui/images/sensors/humidity.svg</file>
-        <file>ui/images/sensors/light.svg</file>
-        <file>ui/images/sensors/moisture.svg</file>
-        <file>ui/images/sensors/pressure.svg</file>
-        <file>ui/images/sensors/temperature.svg</file>
-        <file>ui/images/configure.svg</file>
-        <file>ui/images/network-wifi-symbolic.svg</file>
-        <file>ui/KeyboardLoader.qml</file>
-        <file>ui/images/cloud.svg</file>
-        <file>ui/system/CloudSettingsPage.qml</file>
-        <file>ui/images/cloud-offline.svg</file>
-        <file>ui/images/cloud-error.svg</file>
-        <file>ui/appsettings/AboutPage.qml</file>
-        <file>ui/appsettings/AppSettingsPage.qml</file>
-        <file>ui/appsettings/DeveloperOptionsPage.qml</file>
-        <file>ui/appsettings/CloudLoginPage.qml</file>
-        <file>ui/devicepages/NotificationsDevicePage.qml</file>
-        <file>ui/devicepages/LightDevicePage.qml</file>
-        <file>ui/devicelistpages/SensorsDeviceListPage.qml</file>
-        <file>ui/devicelistpages/WeatherDeviceListPage.qml</file>
-        <file>ui/devicelistpages/DeviceListPageBase.qml</file>
-        <file>ui/MainPage.qml</file>
-        <file>ui/RootItem.qml</file>
-        <file>ui/devicepages/FingerprintReaderDevicePage.qml</file>
-        <file>ui/images/account.svg</file>
-        <file>ui/images/contact-new.svg</file>
-        <file>ui/images/fingerprint/fingerprint_boxes.json</file>
-        <file>ui/images/fingerprint/fingerprint_segmented.png</file>
-        <file>ui/images/fingerprint.svg</file>
-        <file>ui/images/find.svg</file>
-        <file>ui/images/erase.svg</file>
-        <file>ui/system/ConnectionInterfacesPage.qml</file>
-        <file>ui/system/ConnectionInterfaceDelegate.qml</file>
-        <file>ui/connection/wifisetup/BoxInfoPage.qml</file>
     </qresource>
 </RCC>
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index f2dd08d0..0ef4a56f 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -315,7 +315,7 @@ Item {
                     contentItem: ColorIcon {
                         height: parent.height
                         width: parent.width
-                        name: "../images/add.svg"
+                        name: "../images/tab-new.svg"
                     }
                     onClicked: {
                         tabModel.addTab()
diff --git a/nymea-app/ui/images/filters.svg b/nymea-app/ui/images/filters.svg
new file mode 100644
index 00000000..fe0300ce
--- /dev/null
+++ b/nymea-app/ui/images/filters.svg
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="filters.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.2057594"
+     inkscape:cx="48.929688"
+     inkscape:cy="39.609456"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="92,-8.0000001"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,12"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-9.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,83.568528"
+       orientation="1,0"
+       id="guide4170" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 411.99219,437.36133 c -7.71047,0 -14.00391,-6.2913 -14.00391,-14 0,-7.7087 6.29344,-14 14.00391,-14 7.71047,0 14.00586,6.2913 14.00586,14 0,7.7087 -6.29539,14 -14.00586,14 z m 0,-4 c 5.54914,0 10.0039,-4.45434 10.0039,-10 0,-5.54566 -4.45476,-9.99805 -10.0039,-9.99805 -5.54914,0 -10.00391,4.45239 -10.00391,9.99805 0,5.54566 4.45477,10 10.00391,10 z"
+             id="ellipse4189"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 367.97461,377.36133 c -7.71066,0 -14.00391,-6.29111 -14.00391,-14 0,-7.70889 6.29325,-14 14.00391,-14 7.71066,0 14.00586,6.29111 14.00586,14 0,7.70889 -6.2952,14 -14.00586,14 z m 0,-4 c 5.54933,0 10.00391,-4.45416 10.00391,-10 0,-5.54585 -4.45458,-9.99805 -10.00391,-9.99805 -5.54933,0 -10.00391,4.4522 -10.00391,9.99805 0,5.54584 4.45458,10 10.00391,10 z"
+             id="ellipse4199"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 409.99219,349.36133 v 52 h 4 v -52 z"
+             id="path4201"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 365.97461,375.36133 v 62 h 4 v -62 z"
+             id="path4203"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/nymea-app/ui/images/tab-new.svg b/nymea-app/ui/images/tab-new.svg
new file mode 100644
index 00000000..a9721857
--- /dev/null
+++ b/nymea-app/ui/images/tab-new.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="tab-new01a.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.720701"
+     inkscape:cx="29.524728"
+     inkscape:cy="62.507729"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-8.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+    <sodipodi:guide
+       position="92,-8.0000001"
+       orientation="1,0"
+       id="guide4760" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;enable-background:accumulate"
+             d="m 384.98148,371.3622 1.0004,-3.99998 -40.01574,0 0,3.99998 z"
+             id="rect3470"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <rect
+             transform="scale(-1,1)"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;enable-background:accumulate"
+             id="rect3472"
+             width="4.0014911"
+             height="40.000053"
+             x="-367.97476"
+             y="349.36221" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 18,12 c -6.66666,0 -10,5.1e-4 -10,7.751953 l 0,26.496094 4,0 L 12,42.25 12,35 12,19.751953 c 4e-6,-3.751956 1.000004,-3.751956 6,-3.751953 l 28,0 c 5.000004,-3e-6 5.980417,-3e-6 5.998047,3.751953 l 0,15.248047 0.002,0 0,11.248047 4,0 0,-26.496094 C 56,12.00051 52.66668,12 46,12 Z"
+             transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)"
+             id="path4676"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ssccccccccccccsss" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="M 0 44 L 0 48 L 12 48 L 12 44 L 0 44 z M 52 44 L 52 48 L 64 48 L 64 44 L 52 44 z "
+             transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)"
+             id="path4678" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>