diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index 44e94d12..7cca24d7 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -24,7 +24,8 @@
         <file>ui/devicelistpages/LightsDeviceListPage.qml</file>
         <file>ui/customviews/ExtendedVolumeController.qml</file>
         <file>ui/components/ColorIcon.qml</file>
-        <file>ui/images/torch-on.svg</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>
@@ -36,8 +37,8 @@
         <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 alias="media-play">ui/images/media-playback-start.svg</file>
-        <file alias="media-stop">ui/images/media-playback-stop.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>
@@ -59,7 +60,6 @@
         <file>ui/images/weathericons/wind.svg</file>
         <file>ui/devicepages/WeatherDevicePage.qml</file>
         <file>ui/devicepages/ColorLightDevicePage.qml</file>
-        <file>ui/images/torch-off.svg</file>
         <file>ui/components/ThrottledSlider.qml</file>
         <file>ui/components/ColorPickerCt.qml</file>
         <file>ui/images/navigation-menu.svg</file>
@@ -130,7 +130,7 @@
         <file>ui/PushButtonAuthPage.qml</file>
         <file>ui/images/dialog-error-symbolic.svg</file>
         <file>ui/images/send.svg</file>
-        <file>ui/images/mail-mark-important.svg</file>
+        <file>ui/images/attention.svg</file>
         <file>ui/devicepages/InputTriggerDevicePage.qml</file>
         <file>ui/images/clock-app-symbolic.svg</file>
         <file>ui/devicepages/StateLogPage.qml</file>
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index 5c0b2c46..d7a0e680 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -185,7 +185,7 @@ ApplicationWindow {
         case "light":
         case "colorlight":
         case "dimmablelight":
-            return Qt.resolvedUrl("images/torch-on.svg")
+            return Qt.resolvedUrl("images/light-on.svg")
         case "sensor":
         case "temperaturesensor":
         case "humiditysensor":
@@ -211,7 +211,7 @@ ApplicationWindow {
         case "connectable":
             return Qt.resolvedUrl("images/stock_link.svg")
         case "inputtrigger":
-            return Qt.resolvedUrl("images/mail-mark-important.svg")
+            return Qt.resolvedUrl("images/attention.svg")
         case "outputtrigger":
             return Qt.resolvedUrl("images/send.svg")
         case "shutter":
diff --git a/nymea-app/ui/components/ColorIcon.qml b/nymea-app/ui/components/ColorIcon.qml
index 0624a1e3..16e61690 100644
--- a/nymea-app/ui/components/ColorIcon.qml
+++ b/nymea-app/ui/components/ColorIcon.qml
@@ -76,6 +76,8 @@ Item {
 
     property int margins: 0
 
+    property alias status: image.status
+
     Image {
         id: image
 
diff --git a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
index 68a1286e..481b0307 100644
--- a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
+++ b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
@@ -24,6 +24,7 @@ ItemDelegate {
                     case "bool":
                     case "string":
                     case "qstring":
+                    case "color":
                         return [qsTr("is"), qsTr("is not")];
                     case "int":
                     case "double":
@@ -73,6 +74,7 @@ ItemDelegate {
                         return textFieldComponent;
                     case "string":
                     case "qstring":
+                    case "color":
                         if (paramType.allowedValues.length > 0) {
                             return comboBoxComponent
                         }
diff --git a/nymea-app/ui/devicepages/ColorLightDevicePage.qml b/nymea-app/ui/devicepages/ColorLightDevicePage.qml
index eccb95c0..41317395 100644
--- a/nymea-app/ui/devicepages/ColorLightDevicePage.qml
+++ b/nymea-app/ui/devicepages/ColorLightDevicePage.qml
@@ -28,7 +28,7 @@ DevicePageBase {
                 height: width
                 ColorIcon {
                     anchors.fill: parent
-                    name: "../images/torch-off.svg"
+                    name: "../images/light-off.svg"
                     color: powerRow.powerState.value === true ? keyColor : app.guhAccent
                 }
                 onClicked: {
@@ -62,7 +62,7 @@ DevicePageBase {
                 height: width
                 ColorIcon {
                     anchors.fill: parent
-                    name: "../images/torch-on.svg"
+                    name: "../images/light-on.svg"
                     color: powerRow.powerState.value === true ? app.guhAccent : keyColor
                 }
                 onClicked: {
diff --git a/nymea-app/ui/images/mail-mark-important.svg b/nymea-app/ui/images/attention.svg
similarity index 100%
rename from nymea-app/ui/images/mail-mark-important.svg
rename to nymea-app/ui/images/attention.svg
diff --git a/nymea-app/ui/images/torch-off.svg b/nymea-app/ui/images/light-off.svg
similarity index 100%
rename from nymea-app/ui/images/torch-off.svg
rename to nymea-app/ui/images/light-off.svg
diff --git a/nymea-app/ui/images/torch-on.svg b/nymea-app/ui/images/light-on.svg
similarity index 100%
rename from nymea-app/ui/images/torch-on.svg
rename to nymea-app/ui/images/light-on.svg
diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml
index b9a51ebb..76f7e0ea 100644
--- a/nymea-app/ui/magic/EditRulePage.qml
+++ b/nymea-app/ui/magic/EditRulePage.qml
@@ -335,8 +335,7 @@ Page {
                         }
                     }
                     Repeater {
-                        model: ["light-on", "light-off", "alarm-clock", "media-play", "media-stop", "lock", "unlock", "notification", "sensors", "garage", "home", "warning", "eye"]
-
+                        model: ["light-on", "light-off", "alarm-clock", "media-play", "network-secure", "notification", "sensors", "shutter-10", "attention", "eye"]
                         delegate: Item {
                             Layout.fillWidth: true
                             Layout.preferredHeight: app.iconSize + app.margins
diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml
index 62714156..2011dea0 100644
--- a/nymea-app/ui/mainviews/ScenesView.qml
+++ b/nymea-app/ui/mainviews/ScenesView.qml
@@ -63,6 +63,13 @@ Item {
                         Layout.alignment: Qt.AlignHCenter
                         name: scenesDelegate.iconTag ? "../images/" + scenesDelegate.iconTag.value + ".svg" : "../images/slideshow.svg";
                         color: scenesDelegate.colorTag ? scenesDelegate.colorTag.value : app.guhAccent;
+
+                        ColorIcon {
+                            anchors.fill: parent
+                            name: "../images/slideshow.svg"
+                            color: app.guhAccent
+                            visible: parent.status === Image.Error
+                        }
                     }
 
                     Label {