diff --git a/bundles/org.openhab.ui.iconset.classic/icons/_iconconvert b/bundles/org.openhab.ui.iconset.classic/icons/_iconconvert
index bc7e567110..5f5336b4ae 100755
--- a/bundles/org.openhab.ui.iconset.classic/icons/_iconconvert
+++ b/bundles/org.openhab.ui.iconset.classic/icons/_iconconvert
@@ -1,37 +1,39 @@
 #!/bin/sh
 
 for file in $1*.svg; do
+
   if [[ $file != 'none'* ]]; then
+
     png=`echo $file | sed s/.svg/.png/`
-    
+
     # 1. Clean up SVG file.
-    if hash xmllint; then
+    if type xmllint &>/dev/null; then
+
       # Should be pre-installed on OS X.
       xmllint $file -o $file --pretty 1
+
     fi
-    
+
     # 2. Convert SVG files to PNG.
-    if hash rsvg-convert; then
+    if [ ! -f "$png" ]; then
 
-      # Can be installed with Homebrew. (Installation is slow, but conversion is fast.)
-      # brew install librsvg
-      rsvg-convert $file -o $png
+      if type rsvg-convert &>/dev/null; then
 
-    elif hash svgexport; then
+        # Can be installed with Homebrew. (Installation is slow, but conversion is fast.)
+        # brew install librsvg
+        echo "rsvg-convert: converting $file"
+        rsvg-convert $file -o $png
 
-      # Can be installed with NPM. (Installation is fast, but conversion is slow.)
-      # npm install -g svgexport
-      svgexport $file $png
+      elif type svgexport &>/dev/null; then
+
+        # Can be installed with NPM. (Installation is fast, but conversion is slow.)
+        # npm install -g svgexport
+        echo "svgexport: converting $file"
+        svgexport $file $png
+
+      fi
 
     fi
-    
-    # 3. Minify PNG files.
-    if hash imageoptim; then
 
-      # Can be installed with NPM. (Note: You must already have the GUI application installed.)
-      # npm install -g imageoptim-cli
-      echo $png | imageoptim
-
-    fi
-  fi  
-done
\ No newline at end of file
+  fi
+done
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/_iconcopy b/bundles/org.openhab.ui.iconset.classic/icons/_iconcopy
index 004d7beb13..a44542d35b 100755
--- a/bundles/org.openhab.ui.iconset.classic/icons/_iconcopy
+++ b/bundles/org.openhab.ui.iconset.classic/icons/_iconcopy
@@ -1,36 +1,150 @@
 #!/bin/sh
 #
-#  Create needed copies of duplicate icons.
+#  Create needed icon copies.
 #
 
-rm -f garagedoor-ajar.png   && cp -f garagedoor-70.png    garagedoor-ajar.png
-rm -f garagedoor-ajar.svg   && cp -f garagedoor-70.svg    garagedoor-ajar.svg
-rm -f garagedoor-closed.png && cp -f garagedoor-100.png   garagedoor-closed.png
-rm -f garagedoor-closed.svg && cp -f garagedoor-100.svg   garagedoor-closed.svg
-rm -f garagedoor-open.png   && cp -f garagedoor-0.png     garagedoor-open.png
-rm -f garagedoor-open.svg   && cp -f garagedoor-0.svg     garagedoor-open.svg
-rm -f garagedoor.png        && cp -f garagedoor-ajar.png  garagedoor.png
-rm -f garagedoor.svg        && cp -f garagedoor-ajar.svg  garagedoor.svg
 
-rm -f group.png             && cp -f house.png            group.png
-rm -f group.svg             && cp -f house.svg            group.svg
+# Aliases
 
-rm -f heating-off.png       && cp -f heating-0.png        heating-off.png
-rm -f heating-off.svg       && cp -f heating-0.svg        heating-off.svg
-rm -f heating-on.png        && cp -f heating-100.png      heating-on.png
-rm -f heating-on.svg        && cp -f heating-100.svg      heating-on.svg
-rm -f heating.png           && cp -f heating-on.png       heating.png
-rm -f heating.svg           && cp -f heating-on.svg       heating.svg
+cp -f house.png             group.png
+cp -f house.svg             group.svg
 
-rm -f light-off.png         && cp -f slider-0.png         light-off.png
-rm -f light-off.svg         && cp -f slider-0.svg         light-off.svg
-rm -f light-on.png          && cp -f slider-100.png       light-on.png
-rm -f light-on.svg          && cp -f slider-100.svg       light-on.svg
-rm -f slider.png            && cp -f slider-100.png       slider.png
-rm -f slider.svg            && cp -f slider-100.svg       slider.svg
 
-rm -f lock.png              && cp -f lock-closed.png      lock.png
-rm -f lock.svg              && cp -f lock-closed.svg      lock.svg
+# Alternative Types
 
-rm -f rollershutter.png     && cp -f rollershutter-70.png rollershutter.png
-rm -f rollershutter.svg     && cp -f rollershutter-70.svg rollershutter.svg
+cp -f dimmablelight-0.png   light-off.png
+cp -f dimmablelight-0.svg   light-off.svg
+cp -f dimmablelight-100.png light-on.png
+cp -f dimmablelight-100.svg light-on.svg
+
+cp -f garagedoor-70.png     garagedoor-ajar.png
+cp -f garagedoor-70.svg     garagedoor-ajar.svg
+cp -f garagedoor-100.png    garagedoor-closed.png
+cp -f garagedoor-100.svg    garagedoor-closed.svg
+cp -f garagedoor-0.png      garagedoor-open.png
+cp -f garagedoor-0.svg      garagedoor-open.svg
+cp -f garagedoor-ajar.png   garagedoor.png
+cp -f garagedoor-ajar.svg   garagedoor.svg
+
+cp -f heating-0.png         heating-off.png
+cp -f heating-0.svg         heating-off.svg
+cp -f heating-100.png       heating-on.png
+cp -f heating-100.svg       heating-on.svg
+
+
+# Uninitialized State
+
+cp -f dimmablelight-100.png dimmablelight.png
+cp -f dimmablelight-100.svg dimmablelight.svg
+
+cp -f fire-on.png           fire.png
+cp -f fire-on.svg           fire.svg
+
+cp -f heating-on.png        heating.png
+cp -f heating-on.svg        heating.svg
+
+cp -f light-on.png          light.png
+cp -f light-on.svg          light.svg
+
+cp -f lock-closed.png       lock.png
+cp -f lock-closed.svg       lock.svg
+
+cp -f receiver-on.png       receiver.png
+cp -f receiver-on.svg       receiver.svg
+
+cp -f siren-on.png          siren.png
+cp -f siren-on.svg          siren.svg
+
+cp -f soundvolume-100.png   soundvolume.png
+cp -f soundvolume-100.svg   soundvolume.svg
+
+
+# ESH Channel Categories
+
+cp -f siren.png             alarm.png
+cp -f siren.svg             alarm.svg
+
+cp -f battery-0.png         battery.png
+cp -f battery-0.svg         battery.svg
+
+cp -f rollershutter-0.png   blinds-0.png
+cp -f rollershutter-0.svg   blinds-0.svg
+cp -f rollershutter-10.png  blinds-10.png
+cp -f rollershutter-10.svg  blinds-10.svg
+cp -f rollershutter-20.png  blinds-20.png
+cp -f rollershutter-20.svg  blinds-20.svg
+cp -f rollershutter-30.png  blinds-30.png
+cp -f rollershutter-30.svg  blinds-30.svg
+cp -f rollershutter-40.png  blinds-40.png
+cp -f rollershutter-40.svg  blinds-40.svg
+cp -f rollershutter-50.png  blinds-50.png
+cp -f rollershutter-50.svg  blinds-50.svg
+cp -f rollershutter-60.png  blinds-60.png
+cp -f rollershutter-60.svg  blinds-60.svg
+cp -f rollershutter-70.png  blinds-70.png
+cp -f rollershutter-70.svg  blinds-70.svg
+cp -f rollershutter-80.png  blinds-80.png
+cp -f rollershutter-80.svg  blinds-80.svg
+cp -f rollershutter-90.png  blinds-90.png
+cp -f rollershutter-90.svg  blinds-90.svg
+cp -f rollershutter-100.png blinds-100.png
+cp -f rollershutter-100.svg blinds-100.svg
+cp -f rollershutter.png     blinds.png
+cp -f rollershutter.svg     blinds.svg
+
+cp -f colorwheel.png        colorlight.png
+cp -f colorwheel.svg        colorlight.svg
+
+cp -f window-ajar.png       contact-ajar.png
+cp -f window-ajar.svg       contact-ajar.svg
+cp -f window-closed.png     contact-closed.png
+cp -f window-closed.svg     contact-closed.svg
+cp -f window-open.png       contact-open.png
+cp -f window-open.svg       contact-open.svg
+cp -f window.png            contact.png
+cp -f window.svg            contact.svg
+
+cp -f dimmablelight-0.png   slider-0.png
+cp -f dimmablelight-0.svg   slider-0.svg
+cp -f dimmablelight-10.png  slider-10.png
+cp -f dimmablelight-10.svg  slider-10.svg
+cp -f dimmablelight-20.png  slider-20.png
+cp -f dimmablelight-20.svg  slider-20.svg
+cp -f dimmablelight-30.png  slider-30.png
+cp -f dimmablelight-30.svg  slider-30.svg
+cp -f dimmablelight-40.png  slider-40.png
+cp -f dimmablelight-40.svg  slider-40.svg
+cp -f dimmablelight-50.png  slider-50.png
+cp -f dimmablelight-50.svg  slider-50.svg
+cp -f dimmablelight-60.png  slider-60.png
+cp -f dimmablelight-60.svg  slider-60.svg
+cp -f dimmablelight-70.png  slider-70.png
+cp -f dimmablelight-70.svg  slider-70.svg
+cp -f dimmablelight-80.png  slider-80.png
+cp -f dimmablelight-80.svg  slider-80.svg
+cp -f dimmablelight-90.png  slider-90.png
+cp -f dimmablelight-90.svg  slider-90.svg
+cp -f dimmablelight-100.png slider-100.png
+cp -f dimmablelight-100.svg slider-100.svg
+cp -f dimmablelight.png     slider.png
+cp -f dimmablelight.svg     slider.svg
+
+cp -f fan_box.png           fan.png
+cp -f fan_box.svg           fan.svg
+
+cp -f receiver.png          player.png
+cp -f receiver.svg          player.svg
+
+cp -f signal-0.png          qualityofservice-0.png
+cp -f signal-0.svg          qualityofservice-0.svg
+cp -f signal-1.png          qualityofservice-1.png
+cp -f signal-1.svg          qualityofservice-1.svg
+cp -f signal-2.png          qualityofservice-2.png
+cp -f signal-2.svg          qualityofservice-2.svg
+cp -f signal-3.png          qualityofservice-3.png
+cp -f signal-3.svg          qualityofservice-3.svg
+cp -f signal-4.png          qualityofservice-4.png
+cp -f signal-4.svg          qualityofservice-4.svg
+
+cp -f microphone.png        recorder.png
+cp -f microphone.svg        recorder.svg
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/_iconminify b/bundles/org.openhab.ui.iconset.classic/icons/_iconminify
index 7326fbde41..2416e3e345 100755
--- a/bundles/org.openhab.ui.iconset.classic/icons/_iconminify
+++ b/bundles/org.openhab.ui.iconset.classic/icons/_iconminify
@@ -2,11 +2,14 @@
 #
 #  Minify .png files using imageoptim.
 #
-#  Can be installed with NPM. (Note: You must already have the GUI application installed.)
+#  Can be installed with NPM.
 #  npm install -g imageoptim-cli
 #
+#  Note: The GUI application also has to be installed.
+#  brew cask install imageoptim
+#
 
-if hash imageoptim; then
+if type imageoptim &>/dev/null; then
 
   if [ "$1" != '' ] ; then
 
@@ -15,7 +18,7 @@ if hash imageoptim; then
     done
 
 	else
-		imageoptim -d `dirname $0`
+		imageoptim -d "$(dirname $0)"
 	fi
 
 fi
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/_legacy_icons b/bundles/org.openhab.ui.iconset.classic/icons/_legacy_icons
deleted file mode 100755
index e30087ecd9..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/_legacy_icons
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-#  Create copies of icons to support deprecated file names.
-#
-
-rm -f boy0.png       && cp -f boy_3.png       boy0.png
-rm -f boy0.svg       && cp -f boy_3.svg       boy0.svg
-rm -f boy1.png       && cp -f boy_2.png       boy1.png
-rm -f boy1.svg       && cp -f boy_2.svg       boy1.svg
-rm -f boy2.png       && cp -f boy_1.png       boy2.png
-rm -f boy2.svg       && cp -f boy_1.svg       boy2.svg
-rm -f boy3.png       && cp -f boy_4.png       boy3.png
-rm -f boy3.svg       && cp -f boy_4.svg       boy3.svg
-rm -f boy4.png       && cp -f boy_3.png       boy4.png
-rm -f boy4.svg       && cp -f boy_3.svg       boy4.svg
-rm -f boy5.png       && cp -f boy_4.png       boy5.png
-rm -f boy5.svg       && cp -f boy_4.svg       boy5.svg
-rm -f boy6.png       && cp -f boy_2.png       boy6.png
-rm -f boy6.svg       && cp -f boy_2.svg       boy6.svg
-rm -f boy7.png       && cp -f boy_2.png       boy7.png
-rm -f boy7.svg       && cp -f boy_2.svg       boy7.svg
-
-rm -f child1.png     && cp -f girl_1.png      child1.png
-rm -f child1.svg     && cp -f girl_1.svg      child1.svg
-rm -f child2.png     && cp -f girl_2.png      child2.png
-rm -f child2.svg     && cp -f girl_2.svg      child2.svg
-                                             
-rm -f child1-off.png && cp -f child1.png      child1-off.png
-rm -f child1-off.svg && cp -f child1.svg      child1-off.svg
-rm -f child2-off.png && cp -f child2.png      child2-off.png
-rm -f child2-off.svg && cp -f child2.svg      child2-off.svg
-
-rm -f garden2.png    && cp -f garden.png      garden2.png
-rm -f garden2.svg    && cp -f garden.svg      garden2.svg
-rm -f garden3.png    && cp -f garden.png      garden3.png
-rm -f garden3.svg    && cp -f garden.svg      garden3.svg
-
-rm -f house-off.png  && cp -f house.png       house-off.png
-rm -f house-off.svg  && cp -f house.svg       house-off.svg
-
-rm -f parents.png    && cp -f parents_3_3.png parents.png
-rm -f parents.svg    && cp -f parents_3_3.svg parents.svg
-
-rm -f shield-2.png   && cp -f shield-1.png    shield-2.png
-rm -f shield-2.svg   && cp -f shield-1.svg    shield-2.svg
-
-rm -f wardrobe2.png  && cp -f wardrobe.png    wardrobe2.png
-rm -f wardrobe2.svg  && cp -f wardrobe.svg    wardrobe2.svg
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/alarm.png b/bundles/org.openhab.ui.iconset.classic/icons/alarm.png
new file mode 100644
index 0000000000..f4ac892700
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/alarm.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/alarm.svg b/bundles/org.openhab.ui.iconset.classic/icons/alarm.svg
new file mode 100644
index 0000000000..ca0ea0ba59
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/alarm.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6 58.5c-.83 0-1.5-.67-1.5-1.5v-4.15c0-.83.67-1.5 1.5-1.5h52c.83 0 1.5.67 1.5 1.5v4.15c0 .83-.67 1.5-1.5 1.5h-52" style="fill:#afafaf"/>
+  <path d="m58 51.86c.55 0 1 .45 1 1v4.14c0 .55-.45 1-1 1h-52c-.55 0-1-.45-1-1v-4.15c0-.55.45-1 1-1h52m0-.99h-52c-1.1 0-2 .9-2 2v4.14c0 1.1.9 2 2 2h52c1.1 0 2-.9 2-2v-4.15c0-1.1-.9-1.99-2-1.99z" style="fill:#787878"/>
+  <path d="m8.42 50.5l.06-.55c.41-3.83.75-7.97 1.08-11.99 1.25-15.24 2.43-29.63 7.3-31.43 5.26-1.95 14.12-2.03 15.11-2.03 1.04 0 9.91.08 15.18 2.03 4.87 1.81 6.05 16.2 7.3 31.43.33 4.01.67 8.16 1.08 11.99l.06.55h-47.17" style="fill:#ef4d4d"/>
+  <path d="m32.02 5c.51 0 9.68.04 14.95 2 5.83 2.17 6.17 25.33 8.05 43h-8.78-14.22-.05-14.21-8.78c1.88-17.67 2.22-40.84 8.05-43 5.27-1.96 14.45-2 14.95-2 0 0 .02 0 .02 0s.02 0 .02 0m0-1v1l-.02-1c-1.03 0-9.97.07-15.32 2.06-5.17 1.92-6.3 15.8-7.62 31.86-.33 4.01-.67 8.15-1.07 11.97l-.13 1.11h1.11 8.78 14.22 14.27 8.78 1.11l-.12-1.11c-.41-3.82-.75-7.96-1.07-11.97-1.32-16.07-2.45-29.94-7.62-31.86-5.36-1.99-14.29-2.06-15.3-2.06z" style="fill:#cc2929"/>
+  <path d="m32.01 6.99c0 0-10.38-.94-14.01 2.01-4.92 4-6.08 22.75-7 39h21.01v-41.01" style="fill:#ffce00"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/app-icon.png b/bundles/org.openhab.ui.iconset.classic/icons/app-icon.png
index b509aa2e73..40ecc845e1 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/app-icon.png and b/bundles/org.openhab.ui.iconset.classic/icons/app-icon.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/attic.png b/bundles/org.openhab.ui.iconset.classic/icons/attic.png
index d366df8942..d15fafd1aa 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/attic.png and b/bundles/org.openhab.ui.iconset.classic/icons/attic.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/attic.svg b/bundles/org.openhab.ui.iconset.classic/icons/attic.svg
index 18c4e7943d..55bea1ebe9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/attic.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/attic.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_1.svg
index cb164f4a7a..7a3dc27c20 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#f4d0b1"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#e5b795"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c.5.5.7 1.1.7 1.8 0 .7-.3 1.3-.7 1.8l-.4.4c-.4.3-1 .6-1.7.6" style="fill:#f4d0b1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_2.svg
index 69f4f57740..7fecb8bd2f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#e7b48f"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#d89f79"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c.5.5.7 1.1.7 1.8 0 .7-.3 1.3-.7 1.8l-.4.4c-.4.3-1 .6-1.7.6" style="fill:#e7b48f"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_3.svg
index bf48270dbc..ca6e166f19 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#d29e7c"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#c18a6b"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c.5.5.7 1.1.7 1.8 0 .7-.3 1.3-.7 1.8l-.4.4c-.4.3-1 .6-1.7.6" style="fill:#d29e7c"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_4.svg
index ac1c4dd9e5..052d64c28e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#ba7750"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#a35c3d"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c.5.5.7 1.1.7 1.8 0 .7-.3 1.3-.7 1.8l-.4.4c-.4.3-1 .6-1.7.6" style="fill:#ba7750"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_5.png b/bundles/org.openhab.ui.iconset.classic/icons/baby_5.png
index ccb552d297..93b14af0e4 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/baby_5.png and b/bundles/org.openhab.ui.iconset.classic/icons/baby_5.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_5.svg
index 38ab0765c3..9248bae60b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#a55d2b"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#89471b"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c.5.5.7 1.1.7 1.8 0 .7-.3 1.3-.7 1.8l-.4.4c-.4.3-1 .6-1.7.6" style="fill:#a55d2b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/baby_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/baby_6.svg
index ea48b70c50..af7af3e3fe 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/baby_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/baby_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 17.5c-4.7 0-8.5-3.8-8.5-8.5s3.8-8.5 8.5-8.5 8.5 3.8 8.5 8.5-3.8 8.5-8.5 8.5" style="fill:#3c201d"/>
   <path d="m32 1c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8m0-1c-5 0-9 4-9 9 0 5 4 9 9 9s9-4 9-9c0-5-4-9-9-9z" style="fill:#1e0e0e"/>
   <path d="m27.6 63.5c-.7 0-1.3-.3-1.8-.7l-8.5-8.5c-2.1-2.1-2.1-5.6 0-7.8l5.3-5.3 5.7 5.7-5.3 5.3 6.7 6.7c1 1 1 2.6 0 3.5l-.4.4c-.4.4-1 .7-1.7.7" style="fill:#3c201d"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bath.svg b/bundles/org.openhab.ui.iconset.classic/icons/bath.svg
index 7af3592615..c66c1d22ed 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bath.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bath.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="26.1191" x2="0" y2="46.5">
       <stop style="stop-color:#fafafa"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-0.svg
index 7dc16cf5c3..e112d9daad 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-0.svg
@@ -1,15 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-10.svg
index 4cd7f2682a..202af8c95e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-10.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F00014" d="M9,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h6V46z"/>
-</g>
-<rect x="8" y="18" fill="#D6001A" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m9 46h-6c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h6v28" style="fill:#f00014"/>
+  <path d="m8 18h1v28h-1z" style="fill:#d6001a"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-100.svg
index dd859b6119..84c10ad427 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-100.svg
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#00C83C" d="M54,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h51c1.1,0,2,0.9,2,2v24C56,45.1,55.1,46,54,46z"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m54 46h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2" style="fill:#00c83c"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-20.svg
index 5194a9b835..d67ab8e842 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-20.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#FF6400" d="M15,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h12V46z"/>
-</g>
-<rect x="14" y="18" fill="#E55200" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m15 46h-12c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h12v28" style="fill:#ff6400"/>
+  <path d="m14 18h1v28h-1z" style="fill:#e55200"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-30.svg
index def86fe518..282948a9d5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-30.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#FFD200" d="M20,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h17V46z"/>
-</g>
-<rect x="19" y="18" fill="#E5B900" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m20 46h-17c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h17v28" style="fill:#ffd200"/>
+  <path d="m19 18h1v28h-1z" style="fill:#e5b900"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-40.svg
index 9cc3c1eabd..036a8b0ea8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-40.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#FFD200" d="M25,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h22V46z"/>
-</g>
-<rect x="24" y="18" fill="#E5B900" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m25 46h-22c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h22v28" style="fill:#ffd200"/>
+  <path d="m24 18h1v28h-1z" style="fill:#e5b900"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-50.svg
index 40b084bd9f..80d3e950c9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-50.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#FFD200" d="M30,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h27V46z"/>
-</g>
-<rect x="29" y="18" fill="#E5B900" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m30 46h-27c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h27v28" style="fill:#ffd200"/>
+  <path d="m29 18h1v28h-1z" style="fill:#e5b900"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-60.svg
index 15dff498d6..e15bf43bc9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-60.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#00C83C" d="M35,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h32V46z"/>
-</g>
-<rect x="34" y="18" fill="#00B22A" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m35 46h-32c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h32v28" style="fill:#00c83c"/>
+  <path d="m34 18h1v28h-1z" style="fill:#00b22a"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-70.svg
index 9232d26f84..c7ed8c7fc5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-70.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#00C83C" d="M40,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h37V46z"/>
-</g>
-<rect x="39" y="18" fill="#00B22A" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m40 46h-37c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h37v28" style="fill:#00c83c"/>
+  <path d="m39 18h1v28h-1z" style="fill:#00b22a"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-80.svg
index 30ac6a51bd..3ebd531779 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-80.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#00C83C" d="M45,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h42V46z"/>
-</g>
-<rect x="44" y="18" fill="#00B22A" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m45 46h-42c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h42v28" style="fill:#00c83c"/>
+  <path d="m44 18h1v28h-1z" style="fill:#00b22a"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery-90.svg
index 19bef2f19b..2031e75cfc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery-90.svg
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
-<g>
-	<path fill="#00C83C" d="M50,46H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h47V46z"/>
-</g>
-<rect x="49" y="18" fill="#00B22A" width="1" height="28"/>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
+  <path d="m50 46h-47c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h47v28" style="fill:#00c83c"/>
+  <path d="m49 18h1v28h-1z" style="fill:#00b22a"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/battery.svg b/bundles/org.openhab.ui.iconset.classic/icons/battery.svg
index 7dc16cf5c3..e112d9daad 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/battery.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/battery.svg
@@ -1,15 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#BEBEC8" d="M57,39.5c-0.3,0-0.5-0.2-0.5-0.5V25c0-0.3,0.2-0.5,0.5-0.5h5c0.8,0,1.5,0.7,1.5,1.5v12   c0,0.8-0.7,1.5-1.5,1.5H57z"/>
-	<g>
-		<path fill="#34383F" d="M62,25c0.6,0,1,0.4,1,1v12c0,0.6-0.4,1-1,1h-5V25H62 M62,24h-5c-0.6,0-1,0.4-1,1v14c0,0.6,0.4,1,1,1h5    c1.1,0,2-0.9,2-2V26C64,24.9,63.1,24,62,24L62,24z"/>
-	</g>
-</g>
-<g>
-	<path fill="#F0F0F0" d="M3,46.5c-1.4,0-2.5-1.1-2.5-2.5V20c0-1.4,1.1-2.5,2.5-2.5h51c1.4,0,2.5,1.1,2.5,2.5v24   c0,1.4-1.1,2.5-2.5,2.5H3z"/>
-	<g>
-		<path fill="#34383F" d="M54,18c1.1,0,2,0.9,2,2v24c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2H54 M54,17H3    c-1.7,0-3,1.3-3,3v24c0,1.7,1.3,3,3,3h51c1.7,0,3-1.3,3-3V20C57,18.3,55.7,17,54,17L54,17z"/>
-	</g>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m57 39.5c-.3 0-.5-.2-.5-.5v-14c0-.3.2-.5.5-.5h5c.8 0 1.5.7 1.5 1.5v12c0 .8-.7 1.5-1.5 1.5h-5" style="fill:#bebec8"/>
+  <path d="m62 25c.6 0 1 .4 1 1v12c0 .6-.4 1-1 1h-5v-14h5m0-1h-5c-.6 0-1 .4-1 1v14c0 .6.4 1 1 1h5c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" style="fill:#34383f"/>
+  <path d="m3 46.5c-1.4 0-2.5-1.1-2.5-2.5v-24c0-1.4 1.1-2.5 2.5-2.5h51c1.4 0 2.5 1.1 2.5 2.5v24c0 1.4-1.1 2.5-2.5 2.5h-51" style="fill:#f0f0f0"/>
+  <path d="m54 18c1.1 0 2 .9 2 2v24c0 1.1-.9 2-2 2h-51c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h51m0-1h-51c-1.7 0-3 1.3-3 3v24c0 1.7 1.3 3 3 3h51c1.7 0 3-1.3 3-3v-24c0-1.7-1.3-3-3-3z" style="fill:#34383f"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom.png b/bundles/org.openhab.ui.iconset.classic/icons/bedroom.png
index f90e74cba3..d98aa93720 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/bedroom.png and b/bundles/org.openhab.ui.iconset.classic/icons/bedroom.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom.svg b/bundles/org.openhab.ui.iconset.classic/icons/bedroom.svg
index 7f8511bc8a..65ec9aab3e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bedroom.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bedroom.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="-47.0055" x2="-39.6209" gradientTransform="matrix(1.2374.212-.1689.9856 78.2996 32.5442)">
       <stop style="stop-color:#b4b4b4"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.png b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.png
index 8b3149ab03..23b832011e 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.png and b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.svg b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.svg
index 6194d98296..216d446950 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_blue.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
       <stop style="stop-color:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_orange.svg b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_orange.svg
index b549090c83..3cc743fa8f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_orange.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_orange.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
       <stop style="stop-color:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.png b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.png
index 5d8b437d78..22cd81c88d 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.png and b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.svg b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.svg
index 7180fbbaff..e3bec80482 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bedroom_red.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
       <stop style="stop-color:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.png
new file mode 100644
index 0000000000..451aa241d4
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.svg
new file mode 100644
index 0000000000..d22be37ed8
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-0.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.png
new file mode 100644
index 0000000000..1ccd1e95bb
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.svg
new file mode 100644
index 0000000000..cd808de5b0
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-10.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v5h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v4h-34v-4h34m1-1h-36v6h36v-6z" style="fill:#646464"/>
+  <path d="m15 15h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.png
new file mode 100644
index 0000000000..cb1be9e94f
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.svg
new file mode 100644
index 0000000000..b8dfa323a9
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-100.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 17.5h35v32h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 18v31h-34v-31h34m1-1h-36v33h36v-33z" style="fill:#646464"/>
+  <path d="m15 21h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 25h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 29h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 33h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 37h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 41h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 45h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.png
new file mode 100644
index 0000000000..9c91afed63
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.svg
new file mode 100644
index 0000000000..f05db0f68d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-20.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v8h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v7h-34v-7h34m1-1h-36v9h36v-9z" style="fill:#646464"/>
+  <path d="m15 18h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.png
new file mode 100644
index 0000000000..dbd602c09a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.svg
new file mode 100644
index 0000000000..ecaccb3273
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-30.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 15.5h35v10h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 16v9h-34v-9h34m1-1h-36v11h36v-11z" style="fill:#646464"/>
+  <path d="m15 17h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 21h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.png
new file mode 100644
index 0000000000..680931759c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.svg
new file mode 100644
index 0000000000..567a5bc079
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-40.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v14h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v13h-34v-13h34m1-1h-36v15h36v-15z" style="fill:#646464"/>
+  <path d="m15 16h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 20h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 24h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.png
new file mode 100644
index 0000000000..8567e3a50c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.svg
new file mode 100644
index 0000000000..517b70167a
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-50.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v17h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v16h-34v-16h34m1-1h-36v18h36v-18z" style="fill:#646464"/>
+  <path d="m15 15h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 19h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 23h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 27h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.png
new file mode 100644
index 0000000000..bcc40e6c95
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.svg
new file mode 100644
index 0000000000..9a09003056
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-60.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v21h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v20h-34v-20h34m1-1h-36v22h36v-22z" style="fill:#646464"/>
+  <path d="m15 19h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 23h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 27h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 31h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.png
new file mode 100644
index 0000000000..55f9d28c24
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.svg
new file mode 100644
index 0000000000..78b1302694
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-70.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v25h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v24h-34v-24h34m1-1h-36v26h36v-26z" style="fill:#646464"/>
+  <path d="m15 19h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 23h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 27h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 31h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 35h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.png
new file mode 100644
index 0000000000..97ee1f2e5d
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.svg
new file mode 100644
index 0000000000..63c7dace87
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-80.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v29h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v28h-34v-28h34m1-1h-36v30h36v-30z" style="fill:#646464"/>
+  <path d="m15 15h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 19h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 23h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 27h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 31h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 35h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 39h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.png
new file mode 100644
index 0000000000..1953b2053e
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.svg
new file mode 100644
index 0000000000..fdeb17174b
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds-90.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v32h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v31h-34v-31h34m1-1h-36v33h36v-33z" style="fill:#646464"/>
+  <path d="m15 18h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 22h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 26h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 30h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 34h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 38h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 42h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds.png b/bundles/org.openhab.ui.iconset.classic/icons/blinds.png
new file mode 100644
index 0000000000..55f9d28c24
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/blinds.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/blinds.svg b/bundles/org.openhab.ui.iconset.classic/icons/blinds.svg
new file mode 100644
index 0000000000..78b1302694
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/blinds.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m14.5 14.5h35v25h-35z" style="fill:#c8c8c8"/>
+  <path d="m49 15v24h-34v-24h34m1-1h-36v26h36v-26z" style="fill:#646464"/>
+  <path d="m15 19h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 23h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 27h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 31h34v1h-34z" style="opacity:.25"/>
+  <path d="m15 35h34v1h-34z" style="opacity:.25"/>
+  <path d="m14 14h36v4h-36z" style="fill:#282828"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/bluetooth.svg b/bundles/org.openhab.ui.iconset.classic/icons/bluetooth.svg
index ff25b43216..ec60c1fa4f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/bluetooth.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/bluetooth.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <ellipse cx="32" cy="32" rx="21.5" ry="30" style="fill:#fff"/>
   <path d="m32 64c14.21 0 24-6.64 24-32 0-25.36-9.79-32-24-32-14.2 0-24 6.64-24 32 0 25.36 9.79 32 24 32" style="fill:#0064c8"/>
   <path d="m46.6 42.94l-10.94-10.94 10.94-10.94-16.57-16.58v21.85l-9.11-9.12-3.32 3.31 11.44 11.48-11.44 11.47 3.32 3.32 9.11-9.12v21.85l16.57-16.58m-6.62-21.85l-5.29 5.29v-10.58l5.29 5.29m-5.29 16.53l5.29 5.29-5.29 5.29v-10.58" style="fill:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.png b/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.png
index 8ae4b3514d..05bdebfa21 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.png and b/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.svg b/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.svg
index fa0a3ee8bf..eee51b401d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boiler_viessmann.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="10.5" x2="53.5">
       <stop style="stop-color:#c9d0e4"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_1.svg
index 8b41cbc35d..b15226ef5c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#f4d0b1"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#e5b795"/>
   <path d="m27.5 64c-1.9 0-3.5-1.6-3.5-3.5v-1.5h7v1.5c0 1.9-1.5 3.5-3.5 3.5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_2.png b/bundles/org.openhab.ui.iconset.classic/icons/boy_2.png
index d3d582c87a..2413f52813 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/boy_2.png and b/bundles/org.openhab.ui.iconset.classic/icons/boy_2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_2.svg
index fc385cb100..4a917e3e52 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#e7b48f"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#d89f79"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_3.svg
index b2c2a15258..c5a4132373 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#d29e7c"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#c18a6b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_4.svg
index cc5978a336..2a567eacd5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#ba7750"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#a35c3d"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_5.svg
index 99b5004461..33df3253cb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#a55d2b"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#89471b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/boy_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/boy_6.svg
index 41b3c0b1f7..915a376d33 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/boy_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/boy_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
   <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.7 1.5-1.5 1.5" style="fill:#3c201d"/>
   <path d="m44 36v3c0 .6-.4 1-1 1s-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#1e0e0e"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/calendar.svg b/bundles/org.openhab.ui.iconset.classic/icons/calendar.svg
index f5d77c65d0..1d261cd8ba 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/calendar.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/calendar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m2.5 3.5h59v57h-59z" style="fill:#fff"/>
   <path d="M61,4v56H3V4H61 M62,3H2v58h60V3L62,3z" style="fill:#7f7f7f"/>
   <path d="m2.5 3.5h59v13h-59z" style="fill:#dc0000"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/camera.png b/bundles/org.openhab.ui.iconset.classic/icons/camera.png
new file mode 100644
index 0000000000..5a0fce1769
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/camera.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/camera.svg b/bundles/org.openhab.ui.iconset.classic/icons/camera.svg
new file mode 100644
index 0000000000..d173c99de9
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/camera.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="36.5008" y1="47.7955" x2="27.4992" y2="32.2045">
+      <stop offset=".5" style="stop-color:#fff;stop-opacity:0"/>
+      <stop offset=".5" style="stop-color:#fff"/>
+    </linearGradient>
+  </defs>
+  <g style="fill:#212121">
+    <path d="m2 20h60v7h-60z"/>
+    <ellipse cx="32" cy="20" rx="30" ry="18"/>
+  </g>
+  <path d="M32,42.5C16.3,42.5,3.5,35.1,3.5,26S16.3,9.5,32,9.5S60.5,16.9,60.5,26S47.7,42.5,32,42.5z" style="fill:#4b4a4b"/>
+  <path d="m32 10c15.4 0 28 7.2 28 16s-12.6 16-28 16-28-7.2-28-16 12.6-16 28-16m0-1c-16 0-29 7.6-29 17s13 17 29 17 29-7.6 29-17-13-17-29-17z" style="fill:#555"/>
+  <path d="m32 58.5c-14.6 0-26.5-11.9-26.5-26.5v-8c4.3-6.3 14.9-10.5 26.5-10.5s22.2 4.2 26.5 10.5v8c0 14.6-11.9 26.5-26.5 26.5" style="fill:#f5f5f5"/>
+  <path d="m32 14c11.4 0 21.7 4.1 26 10.1v7.9c0 14.3-11.7 26-26 26s-26-11.7-26-26v-7.9c4.3-6 14.6-10.1 26-10.1m0-1c-12.3 0-22.8 4.5-27 10.8v8.2c0 14.9 12.1 27 27 27s27-12.1 27-27v-8.2c-4.2-6.3-14.7-10.8-27-10.8z" style="fill:#c8c8c8"/>
+  <path d="M32,53.5c-7.4,0-13.5-6.1-13.5-13.5S24.6,26.5,32,26.5S45.5,32.6,45.5,40S39.4,53.5,32,53.5z" style="fill:#262626"/>
+  <path d="m32 27c7.2 0 13 5.8 13 13s-5.8 13-13 13-13-5.8-13-13 5.8-13 13-13m0-1c-7.7 0-14 6.3-14 14s6.3 14 14 14 14-6.3 14-14-6.3-14-14-14z" style="fill:#0d0d0d"/>
+  <path d="m32 49.5c-5.2 0-9.5-4.3-9.5-9.5s4.3-9.5 9.5-9.5 9.5 4.3 9.5 9.5-4.3 9.5-9.5 9.5" style="fill:#505050"/>
+  <path d="m32 31c5 0 9 4 9 9s-4 9-9 9-9-4-9-9 4-9 9-9m0-1c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10z" style="fill:#1a171b"/>
+  <circle cx="32" cy="40" r="4.5" style="fill:#3a3a3a"/>
+  <path d="m32 36c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4m0-1c-2.8 0-5 2.2-5 5s2.2 5 5 5c2.8 0 5-2.2 5-5s-2.2-5-5-5z" style="fill:#1a171b"/>
+  <circle cx="33" cy="39" r="1" style="fill:#fff"/>
+  <g style="opacity:.15">
+    <circle cx="32" cy="40" r="9" style="fill:url(#0)"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.png b/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.png
new file mode 100644
index 0000000000..3d2853bce9
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.svg b/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.svg
new file mode 100644
index 0000000000..30d8b91efd
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/carbondioxide.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:none;stroke-miterlimit:10;stroke:#00a064">
+    <g style="stroke-width:4">
+      <circle cx="36" cy="29" r="10"/>
+      <path d="m21.1 21.9c-1.8-1.8-4.3-2.9-7.1-2.9-5.5 0-10 4.5-10 10s4.5 10 10 10c2.8 0 5.3-1.1 7.1-2.9"/>
+    </g>
+    <path d="m52.5 36c0-3.3 1.8-4.5 4-4.5s4 1.8 4 4c0 1.1-.4 2.1-1.2 2.8 0 0-6.8 3.3-6.8 7.2h9.5" style="stroke-width:3"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cellar.svg b/bundles/org.openhab.ui.iconset.classic/icons/cellar.svg
index 22b1581a11..fd2a8ca962 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cellar.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cellar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/chart.svg b/bundles/org.openhab.ui.iconset.classic/icons/chart.svg
index dffacb2017..6bbf329745 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/chart.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/chart.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m1.5 31.5h17v31h-17z" style="fill:#00b450"/>
   <path d="m18 32v30h-16v-30h16m1-1h-1-16-1v1 30 1h1 16 1v-1-30-1z" style="fill:#008c39"/>
   <path d="m23.5 16.5h17v46h-17z" style="fill:#ff9100"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinema.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinema.svg
index 3026042093..85d221b2e4 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinema.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinema.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="8" x2="56">
       <stop/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-0.svg
index cf344a19a1..dad4de8866 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
   <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-10.svg
index 5a2c19a465..d64213345d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v3h-50z" style="fill:#fff"/>
   <path d="m56 17v1h-48v-1h48m2-2h-52v5h52v-5z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-100.svg
index b01c40de34..077b2836e6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
   <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
   <path d="m7 18h50v32h-50z" style="fill:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-20.svg
index f7dabb1c44..8c603c2cd9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v6h-50z" style="fill:#fff"/>
   <path d="m56 17v4h-48v-4h48m2-2h-52v8h52v-8z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-30.svg
index d1119ca5eb..c7af162a9b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v10h-50z" style="fill:#fff"/>
   <path d="m56 17v8h-48v-8h48m2-2h-52v12h52v-12z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-40.svg
index f18e235eb8..39b66a9ae9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v13h-50z" style="fill:#fff"/>
   <path d="m56 17v11h-48v-11h48m2-2h-52v15h52v-15z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-50.svg
index f4d1d7891a..efbbb8f79f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v17h-50z" style="fill:#fff"/>
   <path d="m56 17v15h-48v-15h48m2-2h-52v19h52v-19z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-60.svg
index 504a22f290..96448fb719 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v20h-50z" style="fill:#fff"/>
   <path d="m56 17v18h-48v-18h48m2-2h-52v22h52v-22z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-70.svg
index cc624968e8..f4d298239b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v23h-50z" style="fill:#fff"/>
   <path d="m56 17v21h-48v-21h48m2-2h-52v25h52v-25z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.png b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.png
index 9c757a8663..058dde0738 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.png and b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.svg
index a6cc7cee57..3a27bde0bb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v27h-50z" style="fill:#fff"/>
   <path d="m56 17v25h-48v-25h48m2-2h-52v29h52v-29z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-90.svg
index 30dc831d1e..67153930cf 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v30h-50z" style="fill:#fff"/>
   <path d="m56 17v28h-48v-28h48m2-2h-52v32h52v-32z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen.svg b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen.svg
index f4d1d7891a..efbbb8f79f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cinemascreen.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m7 16h50v17h-50z" style="fill:#fff"/>
   <path d="m56 17v15h-48v-15h48m2-2h-52v19h52v-19z" style="fill:#282828"/>
   <path d="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-0.svg
index 8729c519ab..1c4006eff2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m18 60.5c-4.69 0-8.5-3.81-8.5-8.5v-34c0-4.52 3.54-8.23 8-8.49v-4.01h29v4.01c4.46.26 8 3.97 8 8.49v34c0 4.69-3.81 8.5-8.5 8.5h-28" style="fill:#f0f0f0"/>
   <path d="m46 6v4c4.4 0 8 3.6 8 8v34c0 4.4-3.6 8-8 8h-28c-4.4 0-8-3.6-8-8v-34c0-4.4 3.6-8 8-8v-4h28m1-1h-1-28-1v1 3.06c-4.49.5-8 4.32-8 8.94v34c0 4.96 4.04 9 9 9h28c4.96 0 9-4.04 9-9v-34c0-4.62-3.51-8.45-8-8.94v-3.06-1z" style="fill:#c8c8c8"/>
   <path d="m15 7.5c-.83 0-1.5-.67-1.5-1.5v-1c0-.83.67-1.5 1.5-1.5h34c.83 0 1.5.67 1.5 1.5v1c0 .83-.67 1.5-1.5 1.5h-34" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-10.svg
index 9b44258db3..310a93430c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-100.svg
index 9d5f2a0c26..9d6e8ac47e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-20.svg
index 70d79665c8..df384d2f67 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-30.svg
index 01d2e9569a..ee28f1edc2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-40.svg
index 641a1193e8..6f37842a34 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-50.svg
index 52798d281c..1f263581eb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-60.svg
index 6920c43853..8cd1a35f78 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-70.svg
index 6605df76b6..3644f21011 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-80.svg
index d8a3a667f2..401c7e5fa9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern-90.svg
index a22daf264b..9c5b51ec6f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/cistern.svg b/bundles/org.openhab.ui.iconset.classic/icons/cistern.svg
index d2bfee9956..a41d5f526f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/cistern.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/cistern.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/climate-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/climate-on.svg
index 0ce3ae6230..0e055ffb9d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/climate-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/climate-on.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 2.5c.98 0 1.76.79 1.76 1.76v8.25l2.82-4.09c.35-.5.9-.77 1.47-.76.34 0 .68.11.98.31.8.55 1.01 1.65.45 2.45l-5.73 8.31v3.56 6.66l8.85-5.11 4.33-9.11c.42-.88 1.47-1.25 2.35-.84.33.16.59.4.76.7.29.49.33 1.1.07 1.65l-2.13 4.49 7.15-4.13c.85-.49 1.92-.2 2.41.65.49.85.2 1.92-.65 2.41l-7.15 4.13 4.96.4c.61.05 1.12.4 1.4.89.17.3.25.64.22 1.01-.08.97-.92 1.69-1.9 1.62l-10.06-.8-8.84 5.09 5.77 3.33 3.08 1.78 10.06-.8c.97-.08 1.82.64 1.9 1.62.03.36-.05.71-.22 1.01-.28.49-.79.84-1.4.89l-4.96.4 7.15 4.13c.85.49 1.13 1.56.65 2.41-.49.85-1.56 1.13-2.41.64l-7.15-4.13 2.13 4.49c.26.55.22 1.17-.07 1.65-.17.29-.43.54-.76.69-.88.42-1.93.05-2.35-.83l-4.33-9.11-8.85-5.11v6.66 3.56l5.73 8.31c.55.8.35 1.9-.45 2.45-.3.21-.64.31-.98.31-.57.01-1.12-.26-1.47-.76l-2.82-4.09v8.25c0 .98-.79 1.76-1.76 1.76-.98 0-1.76-.79-1.76-1.76v-8.25l-2.82 4.09c-.35.5-.9.77-1.47.76-.34 0-.68-.11-.98-.31-.8-.55-1.01-1.65-.45-2.45l5.73-8.31v-3.56-6.66l-5.77 3.33-3.08 1.78-4.33 9.11c-.42.88-1.47 1.25-2.35.83-.33-.16-.59-.4-.76-.69-.29-.49-.33-1.1-.07-1.65l2.14-4.49-7.15 4.13c-.85.49-1.92.2-2.41-.64-.49-.85-.2-1.92.64-2.41l7.15-4.13-4.96-.4c-.61-.05-1.12-.4-1.4-.89-.17-.3-.25-.64-.22-1.01.08-.97.92-1.69 1.9-1.62l10.06.8 3.08-1.78 5.75-3.33-8.85-5.11-10.06.8c-.97.08-1.82-.64-1.9-1.62-.03-.36.05-.71.22-1.01.28-.49.79-.84 1.4-.89l4.96-.4-7.15-4.11c-.85-.49-1.13-1.56-.64-2.41.49-.85 1.56-1.13 2.41-.65l7.15 4.13-2.14-4.49c-.26-.55-.22-1.17.07-1.65.17-.29.43-.54.76-.7.88-.42 1.93-.05 2.35.84l4.33 9.11 8.85 5.11v-6.66-3.56l-5.73-8.31c-.55-.8-.35-1.9.45-2.45.3-.21.64-.31.98-.31.57-.01 1.12.26 1.47.76l2.82 4.09v-8.25c.01-.97.79-1.76 1.77-1.76" style="fill:#1e82ff"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/climate.svg b/bundles/org.openhab.ui.iconset.classic/icons/climate.svg
index b2f97f3b4f..9b4b7d99fb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/climate.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/climate.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 2.5c.98 0 1.76.79 1.76 1.76v8.25l2.82-4.09c.35-.5.9-.77 1.47-.76.34 0 .68.11.98.31.8.55 1.01 1.65.45 2.45l-5.73 8.31v3.56 6.66l8.85-5.11 4.33-9.11c.42-.88 1.47-1.25 2.35-.84.33.16.59.4.76.7.29.49.33 1.1.07 1.65l-2.13 4.49 7.15-4.13c.85-.49 1.92-.2 2.41.65.49.85.2 1.92-.65 2.41l-7.15 4.13 4.96.4c.61.05 1.12.4 1.4.89.17.3.25.64.22 1.01-.08.97-.92 1.69-1.9 1.62l-10.06-.8-8.84 5.09 5.77 3.33 3.08 1.78 10.06-.8c.97-.08 1.82.64 1.9 1.62.03.36-.05.71-.22 1.01-.28.49-.79.84-1.4.89l-4.96.4 7.15 4.13c.85.49 1.13 1.56.65 2.41-.49.85-1.56 1.13-2.41.64l-7.15-4.13 2.13 4.49c.26.55.22 1.17-.07 1.65-.17.29-.43.54-.76.69-.88.42-1.93.05-2.35-.83l-4.33-9.11-8.85-5.11v6.66 3.56l5.73 8.31c.55.8.35 1.9-.45 2.45-.3.21-.64.31-.98.31-.57.01-1.12-.26-1.47-.76l-2.82-4.09v8.25c0 .98-.79 1.76-1.76 1.76-.98 0-1.76-.79-1.76-1.76v-8.25l-2.82 4.09c-.35.5-.9.77-1.47.76-.34 0-.68-.11-.98-.31-.8-.55-1.01-1.65-.45-2.45l5.73-8.31v-3.56-6.66l-5.77 3.33-3.08 1.78-4.33 9.11c-.42.88-1.47 1.25-2.35.83-.33-.16-.59-.4-.76-.69-.29-.49-.33-1.1-.07-1.65l2.14-4.49-7.15 4.13c-.85.49-1.92.2-2.41-.64-.49-.85-.2-1.92.64-2.41l7.15-4.13-4.96-.4c-.61-.05-1.12-.4-1.4-.89-.17-.3-.25-.64-.22-1.01.08-.97.92-1.69 1.9-1.62l10.06.8 3.08-1.78 5.75-3.33-8.85-5.11-10.06.8c-.97.08-1.82-.64-1.9-1.62-.03-.36.05-.71.22-1.01.28-.49.79-.84 1.4-.89l4.96-.4-7.15-4.11c-.85-.49-1.13-1.56-.64-2.41.49-.85 1.56-1.13 2.41-.65l7.15 4.13-2.14-4.49c-.26-.55-.22-1.17.07-1.65.17-.29.43-.54.76-.7.88-.42 1.93-.05 2.35.84l4.33 9.11 8.85 5.11v-6.66-3.56l-5.73-8.31c-.55-.8-.35-1.9.45-2.45.3-.21.64-.31.98-.31.57-.01 1.12.26 1.47.76l2.82 4.09v-8.25c.01-.97.79-1.76 1.77-1.76" style="fill:#dae1e4"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/clock-on.png b/bundles/org.openhab.ui.iconset.classic/icons/clock-on.png
index 0b1b67d80f..2be0feb7fc 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/clock-on.png and b/bundles/org.openhab.ui.iconset.classic/icons/clock-on.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/clock-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/clock-on.svg
index 78b86f6738..337a658ac7 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/clock-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/clock-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.73,61.5,2.5,48.27,2.5,32S15.73,2.5,32,2.5S61.5,15.73,61.5,32S48.27,61.5,32,61.5z" style="fill:#00c864"/>
   <path d="m32 3c15.99 0 29 13.01 29 29s-13.01 29-29 29-29-13.01-29-29 13.01-29 29-29m0-1c-16.57 0-30 13.43-30 30s13.43 30 30 30 30-13.43 30-30-13.43-30-30-30z" style="fill:#009949"/>
   <path d="M32,54.5C19.59,54.5,9.5,44.41,9.5,32S19.59,9.5,32,9.5S54.5,19.59,54.5,32S44.41,54.5,32,54.5z" style="fill:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/clock.svg b/bundles/org.openhab.ui.iconset.classic/icons/clock.svg
index 0ed39b140b..080da521e5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/clock.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/clock.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.73,61.5,2.5,48.27,2.5,32S15.73,2.5,32,2.5S61.5,15.73,61.5,32S48.27,61.5,32,61.5z" style="fill:#ececed"/>
   <path d="m32 3c15.99 0 29 13.01 29 29s-13.01 29-29 29-29-13.01-29-29 13.01-29 29-29m0-1c-16.57 0-30 13.43-30 30s13.43 30 30 30 30-13.43 30-30-13.43-30-30-30z" style="fill:#9b9c9e"/>
   <path d="M32,54.5C19.59,54.5,9.5,44.41,9.5,32S19.59,9.5,32,9.5c12.41,0,22.5,10.09,22.5,22.5S44.41,54.5,32,54.5z" style="fill:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/colorlight.png b/bundles/org.openhab.ui.iconset.classic/icons/colorlight.png
new file mode 100644
index 0000000000..684c419e31
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/colorlight.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/colorlight.svg b/bundles/org.openhab.ui.iconset.classic/icons/colorlight.svg
new file mode 100644
index 0000000000..3ac83c0f23
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/colorlight.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m1.14 40.27c1.52 5.68 4.11 10.17 8.27 14.32l11.28-11.28c-1.96-1.96-3.39-4.42-4.13-7.18l-15.42 4.14" style="fill:#3d01a4"/>
+  <path d="m62.86 23.73l-15.42 4.13c.35 1.32.56 2.71.56 4.14s-.21 2.82-.56 4.14l15.42 4.13c1.52-5.68 1.52-10.86 0-16.54" style="fill:#fefe33"/>
+  <path d="m20.69 20.69l-11.28-11.28c-4.16 4.16-6.75 8.64-8.27 14.32l15.42 4.13c.74-2.75 2.17-5.22 4.13-7.17" style="fill:#a7194b"/>
+  <path d="m16 32c0-1.43.21-2.82.56-4.14l-15.42-4.13c-1.52 5.68-1.52 10.86 0 16.54l15.42-4.13c-.35-1.32-.56-2.71-.56-4.14" style="fill:#8601af"/>
+  <path d="m32 48c-1.43 0-2.82-.21-4.14-.56l-4.13 15.42c5.68 1.52 10.86 1.52 16.54 0l-4.13-15.42c-1.32.35-2.71.56-4.14.56" style="fill:#0391ce"/>
+  <path d="m47.44 36.14c-.74 2.75-2.17 5.22-4.13 7.18l11.28 11.28c4.16-4.16 6.75-8.64 8.27-14.32l-15.42-4.14" style="fill:#d0ea2b"/>
+  <path d="m43.31 43.31c-1.96 1.96-4.42 3.39-7.18 4.13l4.13 15.42c5.68-1.52 10.17-4.11 14.32-8.27l-11.27-11.28" style="fill:#66b032"/>
+  <path d="m20.69 43.31l-11.28 11.28c4.16 4.16 8.64 6.75 14.32 8.27l4.13-15.42c-2.75-.74-5.22-2.17-7.17-4.13" style="fill:#0247fe"/>
+  <path d="m32 16c1.43 0 2.82.21 4.14.56l4.13-15.42c-5.68-1.52-10.86-1.52-16.54 0l4.13 15.42c1.32-.35 2.71-.56 4.14-.56" style="fill:#fd5308"/>
+  <path d="m27.86 16.56l-4.13-15.42c-5.68 1.52-10.16 4.11-14.32 8.27l11.28 11.28c1.95-1.96 4.42-3.39 7.17-4.13" style="fill:#fe2712"/>
+  <path d="m43.31 20.69l11.28-11.28c-4.16-4.16-8.64-6.75-14.32-8.27l-4.13 15.42c2.75.74 5.22 2.17 7.17 4.13" style="fill:#fb9902"/>
+  <path d="m62.86 23.73c-1.52-5.68-4.11-10.17-8.27-14.32l-11.28 11.28c1.96 1.96 3.39 4.42 4.13 7.18l15.42-4.14" style="fill:#fabc02"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/colorwheel.svg b/bundles/org.openhab.ui.iconset.classic/icons/colorwheel.svg
index e71004516b..3ac83c0f23 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/colorwheel.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/colorwheel.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m1.14 40.27c1.52 5.68 4.11 10.17 8.27 14.32l11.28-11.28c-1.96-1.96-3.39-4.42-4.13-7.18l-15.42 4.14" style="fill:#3d01a4"/>
   <path d="m62.86 23.73l-15.42 4.13c.35 1.32.56 2.71.56 4.14s-.21 2.82-.56 4.14l15.42 4.13c1.52-5.68 1.52-10.86 0-16.54" style="fill:#fefe33"/>
   <path d="m20.69 20.69l-11.28-11.28c-4.16 4.16-6.75 8.64-8.27 14.32l15.42 4.13c.74-2.75 2.17-5.22 4.13-7.17" style="fill:#a7194b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/contact-ajar.svg b/bundles/org.openhab.ui.iconset.classic/icons/contact-ajar.svg
index 1c97c95829..987c0f1e69 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/contact-ajar.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/contact-ajar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
   <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
   <path d="m15.47 48.5l-1.94-31h36.94l-1.94 31z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/contact-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/contact-closed.svg
index 8864f301df..bc0a688b83 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/contact-closed.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/contact-closed.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/contact-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/contact-open.svg
index 48548bb26f..0d780641dd 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/contact-open.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/contact-open.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
   <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
   <path d="m15.5 48.6v-33.2l17-3.78v40.76z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/contact.svg b/bundles/org.openhab.ui.iconset.classic/icons/contact.svg
index 3c4eab78ef..5f871f0963 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/contact.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/contact.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#ebebeb"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/corridor.svg b/bundles/org.openhab.ui.iconset.classic/icons/corridor.svg
index 3c82751b05..1a806f5725 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/corridor.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/corridor.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="42.4482" y1="39.7958" x2="63.4705" y2="36.089" xlink:href="#2"/>
     <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="20.3975" y1="38.8891" x2="36.8356" y2="35.9907">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.png
new file mode 100644
index 0000000000..f581dd94cf
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.svg
new file mode 100644
index 0000000000..3853ad06bb
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-0.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.png
new file mode 100644
index 0000000000..6a6641d37b
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.svg
new file mode 100644
index 0000000000..101b5b2365
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-10.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.1"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.png
new file mode 100644
index 0000000000..0e99648725
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.svg
new file mode 100644
index 0000000000..a2797c506d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-100.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.png
new file mode 100644
index 0000000000..b3a2c19ee0
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.svg
new file mode 100644
index 0000000000..3c3ca481c0
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-20.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.png
new file mode 100644
index 0000000000..82bdc8a49f
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.svg
new file mode 100644
index 0000000000..5625e61d92
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-30.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.3"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.png
new file mode 100644
index 0000000000..b2bc5b1906
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.svg
new file mode 100644
index 0000000000..1bc4e909e8
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-40.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.4"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.png
new file mode 100644
index 0000000000..c2bda42a1c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.svg
new file mode 100644
index 0000000000..d0391a0dcc
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-50.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.5"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.png
new file mode 100644
index 0000000000..a5ba164a1d
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.svg
new file mode 100644
index 0000000000..49e35c04fc
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-60.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.6"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.png
new file mode 100644
index 0000000000..a4ac4ceba4
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.svg
new file mode 100644
index 0000000000..2b348e730a
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-70.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.7"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.png
new file mode 100644
index 0000000000..4f97751b27
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.svg
new file mode 100644
index 0000000000..8818b22a14
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-80.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.8"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.png
new file mode 100644
index 0000000000..f07ce5e7d1
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.svg
new file mode 100644
index 0000000000..3d7f919a0e
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight-90.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#dae1e4"/>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d;opacity:.9"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.png b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.png
new file mode 100644
index 0000000000..0e99648725
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.svg b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.svg
new file mode 100644
index 0000000000..a2797c506d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dimmablelight.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#797878">
+    <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
+    <path d="m37.07 56h-10.14c-.65 0-1.18-.53-1.18-1.18 0-.45.37-.82.82-.82h10.85c.45 0 .82.37.82.82.01.65-.52 1.18-1.17 1.18"/>
+    <path d="m32 60c2.21 0 4-1.34 4-3h-8c0 1.66 1.79 3 4 3"/>
+  </g>
+  <path d="m48 20.58c0-8.61-7.16-15.58-16-15.58s-16 6.97-16 15.58c0 2.73.72 5.29 1.98 7.51.77 1.49 1.32 2.56 1.67 3.23.72 1.4 1.14 2.21 1.66 3.42.22.51.55 1.28.86 2.16 1.23 3.49 1.7 6.82 1.7 6.82s.23 1.74 1.16 2.59c.26.24.52.38.65.44.45.21.86.25 1.11.25.16 0 .32 0 .48 0h4.66.13 4.66c.16 0 .32 0 .48 0 .24 0 .66-.04 1.11-.25.13-.06.39-.2.65-.44.93-.85 1.16-2.59 1.16-2.59s.47-3.33 1.7-6.82c.31-.88.64-1.65.86-2.16.52-1.21.94-2.02 1.66-3.42.35-.68.9-1.74 1.67-3.23 1.27-2.23 1.99-4.79 1.99-7.51" style="fill:#ffc84d"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/door-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/door-closed.svg
index 3148927d3c..d98e396cb2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/door-closed.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/door-closed.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 8.5h29v50h-29z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/door-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/door-open.svg
index 1037b0da66..869e59d08f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/door-open.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/door-open.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 58.61v-50.22l15-3.75v57.72z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/door.svg b/bundles/org.openhab.ui.iconset.classic/icons/door.svg
index 1037b0da66..869e59d08f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/door.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/door.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 58.61v-50.22l15-3.75v57.72z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.png
index a2393b5e13..7a19023036 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.svg
index 46e404f3ff..827b1ecb09 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-0.svg
@@ -1,132 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient4101">
-<stop stop-color="#919191" offset="0"/>
-<stop stop-color="#e4e4e4" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-<radialGradient id="radialGradient4099" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(2.062383,0,0,2.0625676,-48.536628,894.97999)" r="7"/>
-<radialGradient id="radialGradient4179" gradientUnits="userSpaceOnUse" cy="62.398" cx="41.416" gradientTransform="matrix(1.2081928,0,0,2.0310325,-9.4645969,896.94657)" r="7">
-<stop stop-color="#919191" offset="0"/>
-<stop stop-color="#FFF" offset="1"/>
-</radialGradient>
-<radialGradient id="radialGradient3087" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g display="none" fill="url(#radialGradient3087)">
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" transform="translate(0,-988.36218)"/>
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" transform="translate(0,-988.36218)"/>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path fill="#a5ffa8" d="m32,994.36,8,0-0.000003,8-8,0z"/>
-<path fill="#00c808" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#a1a1a1" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#a1a1a1" d="m46,996.36,4,0,0,4-4,0z"/>
-<g transform="translate(4.9077742,3.9774756)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path d="m32,994.36,8,0-0.000003,8-8,0z" fill="#a5ffa8"/>
-<path d="m34,996.36,4,0,0,4-4,0z" fill="#00c808"/>
-<path d="m40,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<path d="m46,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<g transform="translate(0.39996847,0.26516505)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-<g transform="translate(9.887247,6.6608496)">
-<path d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z" fill="#018aca"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path d="m32,994.36,8,0-0.000003,8-8,0z" fill="#a5ffa8"/>
-<path d="m34,996.36,4,0,0,4-4,0z" fill="#00c808"/>
-<path d="m40,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<path d="m46,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<g transform="translate(-0.21875,0)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-<g transform="translate(4.9375,9.3125)">
-<path d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z" fill="#018aca"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-<g transform="translate(10.09375,0)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="#FFF"/>
-<text style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" xml:space="preserve" transform="scale(1.1795269,0.84779756)" font-size="28.94024849px" font-style="normal" y="1218.5784" x="19.74913" font-family="Bitstream Vera Sans" line-height="125%" fill="#919191"><tspan x="19.74913" y="1218.5784">?</tspan></text>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path fill="#ffa5a5" d="m38,994.36,8,0,0,8-8,0z"/>
-<path fill="#ff0505" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
-<g display="none">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="M55.997,6.0008,53.996,6v54h-41.997v1.9999h43.997z" fill-opacity="0.50446424" fill="#969696"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<rect height="6" width="7" y="1020.4" x="15" fill="#FFF"/>
-<path fill="#b8b8b8" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-<path d="m46.333,1023.6c0,7.9739-6.4635,14.438-14.437,14.438-7.9732,0-14.437-6.4639-14.437-14.438,0-7.9736,6.4635-14.438,14.437-14.438,7.9732,0,14.437,6.4646,14.437,14.438z" fill="url(#radialGradient4099)"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#9f9f9f" stroke-width="2.21210146" fill="none"/>
-<path d="m46.112,1023.6c0,7.8521-3.7865,14.217-8.4574,14.217s-8.4574-6.365-8.4574-14.217c0-7.8519,3.7865-14.217,8.4574-14.217s8.4574,6.3653,8.4574,14.217z" fill="url(#radialGradient4179)"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.2881666,0,0,2.0261849,-11.989825,897.24888)" stroke="#4b4b4b" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="1.38269734" fill="none"/>
-<path fill="#939393" d="m29,1020.4,3,0,0,6-3,0z"/>
-</g>
-<g transform="translate(0,-988.36218)" display="none">
-<path fill="#ffeca5" d="m44,994.36,8,0,0,8-8,0z"/>
-<path fill="#FC0" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m40,996.36,4,0,0,4-4,0z"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <radialGradient id="2" gradientUnits="userSpaceOnUse" cy="62.398" cx="41.416" gradientTransform="matrix(1.2081928 0 0 2.0310325-9.4645969 896.94657)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#fff"/>
+    </radialGradient>
+    <radialGradient id="3" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(2.062383 0 0 2.0625676-48.536628 894.97999)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="4"/>
+      <path d="m40 996.36h4v4h-4z" id="5"/>
+      <path d="m46 996.36h4v4h-4z" id="6"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+    <path d="m15 1020.4h7v6h-7z" style="fill:#fff"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#5"/>
+      <use xlink:href="#6"/>
+      <use xlink:href="#4"/>
+    </g>
+    <path d="m46.333 1023.6c0 7.9739-6.4635 14.438-14.437 14.438-7.9732 0-14.437-6.4639-14.437-14.438 0-7.9736 6.4635-14.438 14.437-14.438 7.9732 0 14.437 6.4646 14.437 14.438" style="fill:url(#3)"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#9f9f9f;stroke-width:2.21210146"/>
+    <path d="m46.112 1023.6c0 7.8521-3.7865 14.217-8.4574 14.217s-8.4574-6.365-8.4574-14.217c0-7.8519 3.7865-14.217 8.4574-14.217s8.4574 6.3653 8.4574 14.217" style="fill:url(#2)"/>
+    <path d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7z" transform="matrix(1.2881666 0 0 2.0261849-11.989825 897.24888)" style="fill:none;stroke:#4b4b4b;stroke-width:1.38269734"/>
+    <path d="m29 1020.4h3v6h-3z" style="fill:#939393"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.png
index 91694c8969..e1108fbba9 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.svg
index 9ab60210ac..0add846dc3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-1.svg
@@ -1,64 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path d="m32,994.36,8,0-0.000003,8-8,0z" fill="#a5ffa8"/>
-<path d="m34,996.36,4,0,0,4-4,0z" fill="#00c808"/>
-<path d="m40,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<path d="m46,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<g transform="translate(-0.21875,0)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-<g transform="translate(4.9375,9.3125)">
-<path d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z" fill="#018aca"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-<g transform="translate(10.09375,0)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m26.549 1024.8c-.68936-.1242-1.2755-.4302-1.7681-.9228-.62207-.622-.96657-1.4419-.96657-2.3003 0-.8444.49988-2.2195 1.7941-4.9351.4064-.8527.73294-1.502 1.0975-2.1824.39998-.7465.39098-.7324.43573-.6854.09635.1011.94304 1.7424 1.4794 2.8678 1.2942 2.7156 1.7941 4.0907 1.7941 4.9351 0 1.2592-.75536 2.4277-1.9199 2.9698-.57265.2667-1.3278.3649-1.9463.2533z" style="fill:#018aca"/>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="2" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z"/>
+      <path d="m40 996.36h4v4h-4z" id="3"/>
+      <path d="m46 996.36h4v4h-4z" id="4"/>
+    </g>
+    <path d="m32 994.36h8l-.000003 8h-8z" style="fill:#a5ffa8"/>
+    <path d="m34 996.36h4v4h-4z" style="fill:#00c808"/>
+    <g style="fill:#a1a1a1">
+      <use xlink:href="#3"/>
+      <use xlink:href="#4"/>
+    </g>
+    <g transform="translate(-.21875)">
+      <use xlink:href="#0"/>
+      <path d="m27.59 1023.1c.5933-.1531 1.1042-.6213 1.3007-1.192.08037-.2334.11866-.4834.10519-.6869-.03916-.5912-.54406-1.8555-1.492-3.7359-.26906-.5336-.36194-.7016-.38801-.7016s-.11896.168-.38801.7016c-.79115 1.5694-1.2641 2.6878-1.4458 3.419-.06261.2519-.05851.5951.01012.848.13267.4887.46321.9183.8978 1.1669.41085.2351.92985.3021 1.4.1809z" id="5" style="fill:#006694"/>
+    </g>
+    <g transform="translate(4.9375 9.3125)">
+      <use xlink:href="#0"/>
+      <use id="6" xlink:href="#5"/>
+    </g>
+    <g transform="translate(10.09375)">
+      <use xlink:href="#0"/>
+      <use xlink:href="#6"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#2)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#1)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.png
index 6e7fdfb8e0..56e8060989 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.svg
index 165d01a7f6..9f9dcecfee 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-2.svg
@@ -1,59 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path d="m32,994.36,8,0-0.000003,8-8,0z" fill="#a5ffa8"/>
-<path d="m34,996.36,4,0,0,4-4,0z" fill="#00c808"/>
-<path d="m40,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<path d="m46,996.36,4,0,0,4-4,0z" fill="#a1a1a1"/>
-<g transform="translate(0.39996847,0.26516505)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path fill="#006694" d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z"/>
-</g>
-<g transform="translate(9.887247,6.6608496)">
-<path d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z" fill="#018aca"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z"/>
+      <path d="m40 996.36h4v4h-4z" id="2"/>
+      <path d="m46 996.36h4v4h-4z" id="3"/>
+    </g>
+    <path d="m32 994.36h8l-.000003 8h-8z" style="fill:#a5ffa8"/>
+    <path d="m34 996.36h4v4h-4z" style="fill:#00c808"/>
+    <g style="fill:#a1a1a1">
+      <use xlink:href="#2"/>
+      <use xlink:href="#3"/>
+    </g>
+    <g transform="translate(.39996847.26516505)">
+      <path d="m26.549 1024.8c-.68936-.1242-1.2755-.4302-1.7681-.9228-.62207-.622-.96657-1.4419-.96657-2.3003 0-.8444.49988-2.2195 1.7941-4.9351.4064-.8527.73294-1.502 1.0975-2.1824.39998-.7465.39098-.7324.43573-.6854.09635.1011.94304 1.7424 1.4794 2.8678 1.2942 2.7156 1.7941 4.0907 1.7941 4.9351 0 1.2592-.75536 2.4277-1.9199 2.9698-.57265.2667-1.3278.3649-1.9463.2533z" id="4" style="fill:#018aca"/>
+      <path d="m27.59 1023.1c.5933-.1531 1.1042-.6213 1.3007-1.192.08037-.2334.11866-.4834.10519-.6869-.03916-.5912-.54406-1.8555-1.492-3.7359-.26906-.5336-.36194-.7016-.38801-.7016s-.11896.168-.38801.7016c-.79115 1.5694-1.2641 2.6878-1.4458 3.419-.06261.2519-.05851.5951.01012.848.13267.4887.46321.9183.8978 1.1669.41085.2351.92985.3021 1.4.1809z" id="5" style="fill:#006694"/>
+    </g>
+    <g transform="translate(9.887247 6.6608496)">
+      <use xlink:href="#4"/>
+      <use xlink:href="#5"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.png
index fdd84b10ff..10d2130772 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.svg
index 3fa24a87f5..3e076e6449 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-3.svg
@@ -1,56 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="#a5ffa8" d="m32,994.36,8,0-0.000003,8-8,0z"/>
-<path fill="#00c808" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#a1a1a1" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#a1a1a1" d="m46,996.36,4,0,0,4-4,0z"/>
-<g transform="translate(4.9077742,3.9774756)">
-<path fill="#018aca" d="m26.549,1024.8c-0.68936-0.1242-1.2755-0.4302-1.7681-0.9228-0.62207-0.622-0.96657-1.4419-0.96657-2.3003,0-0.8444,0.49988-2.2195,1.7941-4.9351,0.4064-0.8527,0.73294-1.502,1.0975-2.1824,0.39998-0.7465,0.39098-0.7324,0.43573-0.6854,0.09635,0.1011,0.94304,1.7424,1.4794,2.8678,1.2942,2.7156,1.7941,4.0907,1.7941,4.9351,0,1.2592-0.75536,2.4277-1.9199,2.9698-0.57265,0.2667-1.3278,0.3649-1.9463,0.2533z"/>
-<path d="m27.59,1023.1c0.5933-0.1531,1.1042-0.6213,1.3007-1.192,0.08037-0.2334,0.11866-0.4834,0.10519-0.6869-0.03916-0.5912-0.54406-1.8555-1.492-3.7359-0.26906-0.5336-0.36194-0.7016-0.38801-0.7016s-0.11896,0.168-0.38801,0.7016c-0.79115,1.5694-1.2641,2.6878-1.4458,3.419-0.06261,0.2519-0.05851,0.5951,0.01012,0.848,0.13267,0.4887,0.46321,0.9183,0.8978,1.1669,0.41085,0.2351,0.92985,0.3021,1.4,0.1809z" fill="#006694"/>
-</g>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z"/>
+      <path d="m40 996.36h4v4h-4z" id="2"/>
+      <path d="m46 996.36h4v4h-4z" id="3"/>
+    </g>
+    <path d="m32 994.36h8l-.000003 8h-8z" style="fill:#a5ffa8"/>
+    <path d="m34 996.36h4v4h-4z" style="fill:#00c808"/>
+    <g style="fill:#a1a1a1">
+      <use xlink:href="#2"/>
+      <use xlink:href="#3"/>
+    </g>
+    <g transform="translate(4.9077742 3.9774756)">
+      <path d="m26.549 1024.8c-.68936-.1242-1.2755-.4302-1.7681-.9228-.62207-.622-.96657-1.4419-.96657-2.3003 0-.8444.49988-2.2195 1.7941-4.9351.4064-.8527.73294-1.502 1.0975-2.1824.39998-.7465.39098-.7324.43573-.6854.09635.1011.94304 1.7424 1.4794 2.8678 1.2942 2.7156 1.7941 4.0907 1.7941 4.9351 0 1.2592-.75536 2.4277-1.9199 2.9698-.57265.2667-1.3278.3649-1.9463.2533z" style="fill:#018aca"/>
+      <path d="m27.59 1023.1c.5933-.1531 1.1042-.6213 1.3007-1.192.08037-.2334.11866-.4834.10519-.6869-.03916-.5912-.54406-1.8555-1.492-3.7359-.26906-.5336-.36194-.7016-.38801-.7016s-.11896.168-.38801.7016c-.79115 1.5694-1.2641 2.6878-1.4458 3.419-.06261.2519-.05851.5951.01012.848.13267.4887.46321.9183.8978 1.1669.41085.2351.92985.3021 1.4.1809z" style="fill:#006694"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.png
index 8a0e7ec6aa..0cb83a0e33 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.svg
index 1e2fdf40b4..5fe0c4a395 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-4.svg
@@ -1,52 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="#ffa5a5" d="m38,994.36,8,0,0,8-8,0z"/>
-<path fill="#ff0505" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="2"/>
+      <path d="m40 996.36h4v4h-4z"/>
+      <path d="m46 996.36h4v4h-4z" id="3"/>
+    </g>
+    <path d="m38 994.36h8v8h-8z" style="fill:#ffa5a5"/>
+    <path d="m40 996.36h4v4h-4z" style="fill:#ff0505"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#3"/>
+      <use xlink:href="#2"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.png
index 1af56e9566..dc823a946a 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.svg
index d23ccb7871..fb8998da6f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer-5.svg
@@ -1,52 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="#ffeca5" d="m44,994.36,8,0,0,8-8,0z"/>
-<path fill="#FC0" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m40,996.36,4,0,0,4-4,0z"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="2"/>
+      <path d="m40 996.36h4v4h-4z" id="3"/>
+      <path d="m46 996.36h4v4h-4z"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+    <path d="m44 994.36h8v8h-8z" style="fill:#ffeca5"/>
+    <path d="m46 996.36h4v4h-4z" style="fill:#fc0"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#2"/>
+      <use xlink:href="#3"/>
+    </g>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer.png b/bundles/org.openhab.ui.iconset.classic/icons/dryer.png
index d184afbc33..acf277681a 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/dryer.png and b/bundles/org.openhab.ui.iconset.classic/icons/dryer.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/dryer.svg b/bundles/org.openhab.ui.iconset.classic/icons/dryer.svg
index f65cd9a4da..f06749ae80 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/dryer.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/dryer.svg
@@ -1,45 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<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:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m47.38,1023.6c0,8.5523-6.9324,15.485-15.484,15.485s-15.484-6.9331-15.484-15.485c0-8.5524,6.9324-15.485,15.484-15.485s15.484,6.933,15.484,15.485z" stroke="#4c4c4c" stroke-width="2.21210146" fill="none"/>
-<path fill="#939393" d="m15,1020.4,6,0,0,6-6,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-<path d="m19,10c0,1.6569-1.3431,3-3,3s-3-1.3431-3-3,1.3431-3,3-3c0.86924,0,1.6957,0.37702,2.2655,1.0335" fill-opacity="0" transform="translate(1.0192254,988.34924)" stroke="#acacac" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1.08299994"/>
-<path fill="#4f4f4f" d="M17,10,19.672,7.6406,20.562,10z" transform="translate(0,988.36218)"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="0" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z"/>
+      <path d="m40 996.36h4v4h-4z"/>
+      <path d="m46 996.36h4v4h-4z"/>
+    </g>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#1)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#0)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <path d="m47.38 1023.6c0 8.5523-6.9324 15.485-15.484 15.485s-15.484-6.9331-15.484-15.485c0-8.5524 6.9324-15.485 15.484-15.485s15.484 6.933 15.484 15.485z" style="fill:none;stroke:#4c4c4c;stroke-width:2.21210146"/>
+    <path d="m15 1020.4h6v6h-6z" style="fill:#939393"/>
+    <path d="m17 10l2.672-2.3594.89 2.3594z" transform="translate(0 988.36218)" style="fill:#4f4f4f"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/energy.svg b/bundles/org.openhab.ui.iconset.classic/icons/energy.svg
index 5c95c5da9c..3e21e37dd5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/energy.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/energy.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m6.93 58.5c-.9 0-1.71-.47-2.17-1.25-.45-.78-.45-1.72 0-2.5l25.07-43.43c.45-.78 1.26-1.25 2.17-1.25s1.71.47 2.17 1.25l25.07 43.43c.45.78.45 1.72 0 2.5-.45.78-1.26 1.25-2.17 1.25h-50.14" style="fill:#fcd703"/>
   <path d="m32 11.57c.22 0 .61.06.87.5l25.07 43.43c.25.44.11.81 0 1-.11.19-.36.5-.87.5h-50.14c-.5 0-.76-.31-.87-.5-.11-.19-.25-.56 0-1l25.07-43.43c.26-.43.65-.5.87-.5m0-3c-1.35 0-2.69.67-3.46 2l-25.08 43.43c-1.54 2.67.38 6 3.46 6h50.14c3.08 0 5-3.33 3.46-6l-25.06-43.43c-.77-1.33-2.11-2-3.46-2z"/>
   <path d="m37.03 32.59l-7.97 4.6 5.23-13.62h-4.74l-4.97 18.57 8-4.62-1.83 10.68-1.45-2.08 1.31 7.45 4.64-6.63-2.34 1.59z"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/error.svg b/bundles/org.openhab.ui.iconset.classic/icons/error.svg
index cb36b70d34..2574b5e604 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/error.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/error.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m6.93 59.5c-1.26 0-2.4-.65-3.03-1.75-.63-1.1-.63-2.41 0-3.5l25.07-43.43c.63-1.1 1.77-1.75 3.03-1.75s2.4.65 3.03 1.75l25.07 43.43c.63 1.1.63 2.41 0 3.5-.63 1.09-1.77 1.75-3.03 1.75h-50.14" style="fill:#ffa500"/>
   <path d="m32 9.57c1.08 0 2.06.56 2.6 1.5l25.07 43.43c.54.94.54 2.06 0 3-.54.94-1.51 1.5-2.6 1.5h-50.14c-1.08 0-2.06-.56-2.6-1.5-.54-.94-.54-2.06 0-3l25.07-43.43c.54-.93 1.52-1.5 2.6-1.5m0-1c-1.35 0-2.69.67-3.46 2l-25.08 43.43c-1.54 2.67.38 6 3.46 6h50.14c3.08 0 5-3.33 3.46-6l-25.06-43.43c-.77-1.33-2.11-2-3.46-2z" style="fill:#e58200"/>
   <path d="m30.16 44.5l-1.5-12.76-.01-8.24h6.66v8.18l-1.55 12.82z" style="fill:#fff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fan.png b/bundles/org.openhab.ui.iconset.classic/icons/fan.png
new file mode 100644
index 0000000000..25e72ea590
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/fan.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fan.svg b/bundles/org.openhab.ui.iconset.classic/icons/fan.svg
new file mode 100644
index 0000000000..f0a3b9084d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fan.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <radialGradient id="0" cx="32" cy="31" r="24.5" gradientUnits="userSpaceOnUse">
+      <stop style="stop-color:#b4b4b4"/>
+      <stop offset="1" style="stop-color:#999"/>
+    </radialGradient>
+  </defs>
+  <path d="m16 61.5c-.3 0-.5-.2-.5-.5v-2c0-.3.2-.5.5-.5h4c.3 0 .5.2.5.5v2c0 .3-.2.5-.5.5h-4" style="fill:#f0f0f0"/>
+  <path d="m20 59v2h-4v-2h4m0-1h-4c-.6 0-1 .4-1 1v2c0 .6.4 1 1 1h4c.6 0 1-.4 1-1v-2c0-.6-.4-1-1-1z" style="fill:#b4b4b4"/>
+  <path d="m44 61.5c-.3 0-.5-.2-.5-.5v-2c0-.3.2-.5.5-.5h4c.3 0 .5.2.5.5v2c0 .3-.2.5-.5.5h-4" style="fill:#f0f0f0"/>
+  <path d="m48 59v2h-4v-2h4m0-1h-4c-.6 0-1 .4-1 1v2c0 .6.4 1 1 1h4c.6 0 1-.4 1-1v-2c0-.6-.4-1-1-1z" style="fill:#b4b4b4"/>
+  <path d="M15,58.5C9.2,58.5,4.5,53.8,4.5,48V14C4.5,8.2,9.2,3.5,15,3.5h34c5.8,0,10.5,4.7,10.5,10.5v34   c0,5.8-4.7,10.5-10.5,10.5H15z" style="fill:#f0f0f0"/>
+  <path d="m49 4c5.5 0 10 4.5 10 10v34c0 5.5-4.5 10-10 10h-34c-5.5 0-10-4.5-10-10v-34c0-5.5 4.5-10 10-10h34m0-1h-34c-6.1 0-11 4.9-11 11v34c0 6.1 4.9 11 11 11h34c6.1 0 11-4.9 11-11v-34c0-6.1-4.9-11-11-11z" style="fill:#b4b4b4"/>
+  <path d="m16 55.5c-4.7 0-8.5-3.8-8.5-8.5v-32c0-4.7 3.8-8.5 8.5-8.5h32c4.7 0 8.5 3.8 8.5 8.5v32c0 4.7-3.8 8.5-8.5 8.5h-32" style="fill:url(#0)"/>
+  <path d="m48 7c4.4 0 8 3.6 8 8v32c0 4.4-3.6 8-8 8h-32c-4.4 0-8-3.6-8-8v-32c0-4.4 3.6-8 8-8h32m0-1h-32c-5 0-9 4-9 9v32c0 5 4 9 9 9h32c5 0 9-4 9-9v-32c0-5-4-9-9-9z" style="fill:#b4b4b4"/>
+  <g style="fill:#f0f0f0;stroke-miterlimit:10;stroke:#7f7f7f;stroke-linecap:round;stroke-linejoin:round">
+    <path d="m28.8 24.7c0 0 4-.4 5.5-5.1s.6-6.5.6-6.5-.7-2 .5-3.6c1.3-1.6 3.2-1.2 3.2-1.2s3.6.7 5.7 5c2.1 4.3-.3 7.5-.3 7.5s-2.9 4.6-8 6.4c-5 1.8-7.2-2.5-7.2-2.5z"/>
+    <path d="m38.7 34.1c0 0-3 2.7-1.5 7.4 1.5 4.7 3.4 5.6 3.4 5.6s1.8 1.2 1.7 3.2-1.9 2.9-1.9 2.9-3.3 1.6-7.6-.7-4.2-6.3-4.2-6.3-.3-5.4 2.7-9.9 7.4-2.2 7.4-2.2z"/>
+    <path d="m31.3 38.2c0 0-3.5-2-7.5.9-4 2.9-4.3 4.9-4.3 4.9s-.5 2-2.5 2.5-3.3-.9-3.3-.9-2.5-2.6-1.7-7.4 4.7-5.9 4.7-5.9 5.1-2 10.2-.5c5.2 1.6 4.4 6.4 4.4 6.4z"/>
+    <path d="m25.1 32.3c0 0 .9-3.9-3.2-6.8s-5.9-2.5-5.9-2.5-2.1.1-3.2-1.6c-1.1-1.7-.2-3.4-.2-3.4s1.8-3.3 6.5-3.9c4.8-.7 7.1 2.6 7.1 2.6s3.4 4.2 3.6 9.6-4.7 6-4.7 6z"/>
+    <path d="m37.2 25.7c0 0 1.6 3.7 6.6 3.7s6.3-1.5 6.3-1.5 1.7-1.3 3.6-.6 2.2 2.6 2.2 2.6.5 3.7-3 7c-3.5 3.3-7.3 2.1-7.3 2.1s-5.2-1.4-8.5-5.6c-3.4-4.2.1-7.7.1-7.7z"/>
+    <circle cx="32.2" cy="31" r="7.3"/>
+  </g>
+  <g style="opacity:.75">
+    <path d="m41 55.5c-.3 0-.5-.2-.5-.5v-5.5h-17v5.5c0 .3-.2.5-.5.5h-1c-.3 0-.5-.2-.5-.5v-5.5h-13c-.2 0-.4-.2-.5-.4l-.2-1c0-.1 0-.3.1-.4s.2-.2.4-.2h13.2v-5h-13.5c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h13.5v-5h-13.5c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h13.5v-5h-13.5c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h13.5v-5h-13.5c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h13.5v-5h-13.3c-.2 0-.3-.1-.4-.2s-.1-.3 0-.4l.2-1c.1-.2.3-.4.5-.4h13v-5.5c0-.3.2-.5.5-.5h1c.3 0 .5.2.5.5v5.5h17v-5.5c0-.3.2-.5.5-.5h1c.3 0 .5.2.5.5v5.5h13c.2 0 .4.2.5.4l.2 1c0 .1 0 .3-.1.4s-.2.2-.4.2h-13.2v5h13.5c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-13.5v5h13.5c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-13.5v5h13.5c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-13.5v5h13.5c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-13.5v5h13.2c.2 0 .3.1.4.2s.1.3.1.4l-.2 1c-.1.2-.3.4-.5.4h-13v5.5c0 .3-.2.5-.5.5h-1m-.5-8v-5h-17v5h17m0-7v-5h-17v5h17m0-7v-5h-17v5h17m0-7v-5h-17v5h17m0-7v-5h-17v5h17" style="fill:#f0f0f0"/>
+    <path d="m42 7v6h13.5l.2 1h-13.7v6h14v1h-14v6h14v1h-14v6h14v1h-14v6h14v1h-14v6h13.8l-.2 1h-13.6v6h-1v-6h-18v6h-1v-6h-13.5l-.2-1h13.7v-6h-14v-1h14v-6h-14v-1h14v-6h-14v-1h14v-6h-14v-1h14v-6h-13.8l.2-1h13.6v-6h1v6h18v-6h1m-19 13h18v-6h-18v6m0 7h18v-6h-18v6m0 7h18v-6h-18v6m0 7h18v-6h-18v6m0 7h18v-6h-18v6m19-42h-1c-.6 0-1 .4-1 1v5h-16v-5c0-.6-.4-1-1-1h-1c-.6 0-1 .4-1 1v5h-12.5c-.5 0-.9.3-1 .8l-.2 1c-.1.3 0 .6.2.9.2.2.4.3.7.3h12.8v4h-13c-.6 0-1 .4-1 1v1c0 .6.4 1 1 1h13v4h-13c-.6 0-1 .4-1 1v1c0 .6.4 1 1 1h13v4h-13c-.6 0-1 .4-1 1v1c0 .6.4 1 1 1h13v4h-13c-.6 0-1 .4-1 1v1c0 .6.4 1 1 1h13v4h-12.8c-.3 0-.6.1-.8.4-.2.2-.3.6-.2.9l.2 1c.2.4.6.7 1.1.7h12.5v5c0 .6.4 1 1 1h1c.6 0 1-.4 1-1v-5h16v5c0 .6.4 1 1 1h1c.6 0 1-.4 1-1v-5h12.5c.5 0 .9-.3 1-.8l.2-1c.1-.3 0-.6-.2-.9-.2-.2-.5-.4-.8-.4h-12.7v-4h13c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-13v-4h13c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-13v-4h13c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-13v-4h13c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-13v-4h12.8c.3 0 .6-.1.8-.4.2-.2.3-.6.2-.9l-.2-1c-.1-.4-.5-.8-1-.8h-12.6v-4.8c0-.6-.4-1-1-1zm-18 9h16v4h-16v-4m0 7h16v4h-16v-4m0 7h16v4h-16v-4m0 7h16v4h-16v-4m0 7h16v4h-16v-4" style="fill:#b4b4b4"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fan_box.svg b/bundles/org.openhab.ui.iconset.classic/icons/fan_box.svg
index 50c972b525..f0a3b9084d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/fan_box.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fan_box.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <radialGradient id="0" cx="32" cy="31" r="24.5" gradientUnits="userSpaceOnUse">
       <stop style="stop-color:#b4b4b4"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fan_ceiling.svg b/bundles/org.openhab.ui.iconset.classic/icons/fan_ceiling.svg
index 08c418bb12..8aff839302 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/fan_ceiling.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fan_ceiling.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="27.4999" x2="36.5001">
       <stop style="stop-color:#82828c"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/faucet.svg b/bundles/org.openhab.ui.iconset.classic/icons/faucet.svg
index 677a52bc3a..bc7b70fc0d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/faucet.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/faucet.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m25.5 9.5h7v13h-7z" style="fill:#8b96ac"/>
   <path d="m32 10v12h-6v-12h6m1-1h-8v14h8v-14z" style="fill:#676b72"/>
   <path d="m46.5 39.5v-3.5c0-1.38-1.12-2.5-2.5-2.5h-35.5v-11h15v-4.5c0-.83.67-1.5 1.5-1.5h8c.83 0 1.5.67 1.5 1.5v4.5h11.5c6.34 0 11.5 5.16 11.5 11.5v5.5h-11" style="fill:#8b96ac"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fire-off.png b/bundles/org.openhab.ui.iconset.classic/icons/fire-off.png
new file mode 100644
index 0000000000..daa26137c1
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/fire-off.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fire-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/fire-off.svg
new file mode 100644
index 0000000000..c7f5858e25
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fire-off.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m54.13 40.06c-3.39-30.48-21.05-38.16-25.76-39.67-.56-.18-1.1.27-1.06.85.77 12.02-5.18 18.82-5.18 18.82s-7.83 9.75-10 13-5.42 15.67 3 26c7.2 8.84 15.26 2.55 17.43.55.33-.3.82-.27 1.14.04 3.61 3.56 7.79 4.48 11.43 1.41 11.41-9.61 9-21 9-21" style="fill:#b2b2b2"/>
+  <path d="m32.74 59.06c0 0-5.88 5.33-10 0s-2-14-2-14 3.21-7.46 10-15c0 0 2.67-2.92 3-5 0 0 9.08 4.83 10 17 .92 12.17-9 19-9 19l-2-2" style="fill:#d8d8d8"/>
+  <path d="m32.48 59.06c0 0 6.79-1.96 8-14 0 0 .88-3.88-6-10l-8 9c0 0-3 3.04-3 8s3 7 3 7 2.67 3.34 6 0" style="fill:#f2f2f2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fire-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/fire-on.svg
index 921fa9cf14..69affd715c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/fire-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fire-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m54 40c-3.39-30.49-21.05-38.16-25.76-39.68-.56-.18-1.1.27-1.06.85.76 12.02-5.18 18.83-5.18 18.83s-7.83 9.75-10 13-5.42 15.67 3 26c7.2 8.84 15.26 2.55 17.43.55.33-.3.82-.27 1.14.04 3.62 3.56 7.79 4.48 11.43 1.41 11.41-9.61 9-21 9-21" style="fill:#f01428"/>
   <path d="m33 59c0 0-5.88 5.33-10 0s-2-14-2-14 3.21-7.46 10-15c0 0 2.67-2.92 3-5 0 0 9.08 4.83 10 17s-9 19-9 19l-2-2" style="fill:#ff8200"/>
   <path d="m33 59c0 0 6.79-1.96 8-14 0 0 .88-3.88-6-10l-8 9c0 0-3 3.04-3 8s3 7 3 7 2.67 3.33 6 0" style="fill:#ffc800"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fire.png b/bundles/org.openhab.ui.iconset.classic/icons/fire.png
index daa26137c1..6dbc80c1aa 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/fire.png and b/bundles/org.openhab.ui.iconset.classic/icons/fire.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/fire.svg b/bundles/org.openhab.ui.iconset.classic/icons/fire.svg
index 0d7aaa98fc..69affd715c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/fire.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/fire.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
-  <path d="m54.13 40.06c-3.39-30.48-21.05-38.16-25.76-39.67-.56-.18-1.1.27-1.06.85.77 12.02-5.18 18.82-5.18 18.82s-7.83 9.75-10 13-5.42 15.67 3 26c7.2 8.84 15.26 2.55 17.43.55.33-.3.82-.27 1.14.04 3.61 3.56 7.79 4.48 11.43 1.41 11.41-9.61 9-21 9-21" style="fill:#b2b2b2"/>
-  <path d="m32.74 59.06c0 0-5.88 5.33-10 0s-2-14-2-14 3.21-7.46 10-15c0 0 2.67-2.92 3-5 0 0 9.08 4.83 10 17 .92 12.17-9 19-9 19l-2-2" style="fill:#d8d8d8"/>
-  <path d="m32.48 59.06c0 0 6.79-1.96 8-14 0 0 .88-3.88-6-10l-8 9c0 0-3 3.04-3 8s3 7 3 7 2.67 3.34 6 0" style="fill:#f2f2f2"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m54 40c-3.39-30.49-21.05-38.16-25.76-39.68-.56-.18-1.1.27-1.06.85.76 12.02-5.18 18.83-5.18 18.83s-7.83 9.75-10 13-5.42 15.67 3 26c7.2 8.84 15.26 2.55 17.43.55.33-.3.82-.27 1.14.04 3.62 3.56 7.79 4.48 11.43 1.41 11.41-9.61 9-21 9-21" style="fill:#f01428"/>
+  <path d="m33 59c0 0-5.88 5.33-10 0s-2-14-2-14 3.21-7.46 10-15c0 0 2.67-2.92 3-5 0 0 9.08 4.83 10 17s-9 19-9 19l-2-2" style="fill:#ff8200"/>
+  <path d="m33 59c0 0 6.79-1.96 8-14 0 0 .88-3.88-6-10l-8 9c0 0-3 3.04-3 8s3 7 3 7 2.67 3.33 6 0" style="fill:#ffc800"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/firstfloor.svg b/bundles/org.openhab.ui.iconset.classic/icons/firstfloor.svg
index bece74d06e..7ee4e9a57c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/firstfloor.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/firstfloor.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/flow.png b/bundles/org.openhab.ui.iconset.classic/icons/flow.png
new file mode 100644
index 0000000000..36b15f0234
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/flow.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/flow.svg b/bundles/org.openhab.ui.iconset.classic/icons/flow.svg
new file mode 100644
index 0000000000..53d899ccec
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/flow.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:none;stroke-miterlimit:10;stroke:#1e82ff;stroke-width:4">
+    <path d="m6 20c0 0 8.5-3.6 26-1s26-2 26-2"/>
+    <path d="m6 46c0 0 8.5-3.6 26-1s26-2 26-2"/>
+    <path d="m6 33c0 0 8.5-3.6 26-1s26-2 26-2"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/flowpipe.svg b/bundles/org.openhab.ui.iconset.classic/icons/flowpipe.svg
index beb1739f76..da8ae132d7 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/flowpipe.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/flowpipe.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m18 59.5c-.83 0-1.5-.67-1.5-1.5v-20c0-1.38-1.12-2.5-2.5-2.5h-9.17c-.74 0-1.2-.48-1.39-.93-.19-.45-.2-1.11.33-1.63l27.18-28.8c.27-.28.65-.43 1.05-.43s.78.16 1.06.44l27.16 28.78c.53.53.52 1.2.33 1.65-.19.45-.65.93-1.39.93h-9.16c-1.38 0-2.5 1.12-2.5 2.5v20c0 .83-.67 1.5-1.5 1.5h-28z" style="fill:#f35"/>
   <path d="m32 4.21c.27 0 .52.1.69.27l27.19 28.81c.44.44.28.94.22 1.09-.06.14-.3.62-.92.62h-9.18c-1.65 0-3 1.35-3 3v20c0 .55-.45 1-1 1h-28c-.55 0-1-.45-1-1v-20c0-1.65-1.35-3-3-3h-9.17c-.62 0-.86-.47-.92-.62-.06-.14-.22-.65.24-1.11l27.14-28.77c.19-.19.44-.29.71-.29m0-1c-.51 0-1.02.2-1.41.59l-27.18 28.79c-1.26 1.26-.36 3.41 1.42 3.41h9.17c1.1 0 2 .9 2 2v20c0 1.1.9 2 2 2h28c1.1 0 2-.9 2-2v-20c0-1.1.9-2 2-2h9.17c1.78 0 2.67-2.15 1.41-3.41l-27.17-28.8c-.39-.39-.9-.58-1.41-.58z" style="fill:#cc1526"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-closed.svg
index 66ddbd19b5..74ca4cf870 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-closed.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-closed.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 8.5h29v50h-29z" style="fill:#646464"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-open.svg
index 912abf19a2..8957a9e83e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-open.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor-open.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 58.61v-50.22l15-3.75v57.72z" style="fill:#646464"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor.svg b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor.svg
index 912abf19a2..8957a9e83e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/frontdoor.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/frontdoor.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47.5 58.5v-51h-31v51h-4v-55h39v55z" style="fill:#ececed"/>
   <path d="M51,4v54h-3V8V7h-1H17h-1v1v50h-3V4H51 M52,3H12v56h5V8h30v51h5V3L52,3z" style="fill:#9b9c9e"/>
   <path d="m17.5 58.61v-50.22l15-3.75v57.72z" style="fill:#646464"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garage.svg b/bundles/org.openhab.ui.iconset.classic/icons/garage.svg
index d0654e1ff9..f84c65e81e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garage.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garage.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m.5 59.5v-45.2l19.5-9.7 19.5 9.7v45.2z" style="fill:#f0f0f0"/>
   <path d="M20,5.1l19,9.5V59H1V14.6L20,5.1 M20,4L0,14v46h40V14L20,4L20,4z" style="fill:#c8c8c8"/>
   <path d="m.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garage_detached.svg b/bundles/org.openhab.ui.iconset.classic/icons/garage_detached.svg
index c4da9e632c..1061617b80 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garage_detached.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garage_detached.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m12.5 45.5v-20.1l19.5-6.9 19.5 6.9v20.1z" style="fill:#f0f0f0"/>
   <path d="m32 19.1l19 6.6v19.3h-38v-19.3l19-6.6m0-1.1l-20 7v21h40v-21l-20-7z" style="fill:#c8c8c8"/>
   <path d="m57.7 27.5l-25.7-9-25.7 9" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garage_detached_selected.svg b/bundles/org.openhab.ui.iconset.classic/icons/garage_detached_selected.svg
index e630abea77..a253febcc9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garage_detached_selected.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garage_detached_selected.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m12.5 45.5v-20.1l19.5-6.9 19.5 6.9v20.1z" style="fill:#ffccd3"/>
   <path d="m32 19.1l19 6.6v19.3h-38v-19.3l19-6.6m0-1.1l-20 7v21h40v-21l-20-7z" style="fill:#f66"/>
   <path d="m57.7 27.5l-25.7-9-25.7 9" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-0.svg
index 2a27ce0661..65c3c2c3e5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m55.5 53.5v-35h-47v35h-5v-40h57v40z" style="fill:#f0f0f0"/>
   <path d="m60 14v4 35h-4v-35h-48v35h-4v-35-4h4 48 4m1-1h-1-4-48-4-1v1 4 35 1h1 4 1v-1-34h46v34 1h1 4 1v-1-35-4-1z" style="fill:#c8c8c8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-10.svg
index 56c2cd4123..1bcf69d86e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 15.5h15v7h-15z" style="fill:#282828"/>
   <path d="m24 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 15.5h15v7h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-100.svg
index c7c02c0395..63811dbdb3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m55.5 53.5v-35h-47v35h-5v-40h57v40z" style="fill:#f0f0f0"/>
   <path d="m60 14v4 35h-4v-35h-48v35h-4v-35-4h4 48 4m1-1h-1-4-48-4-1v1 4 35 1h1 4 1v-1-34h46v34 1h1 4 1v-1-35-4-1z" style="fill:#c8c8c8"/>
   <path d="m9.5 19.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-20.svg
index 21da1b068b..bde531990d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 15.5h15v11h-15z" style="fill:#282828"/>
   <path d="m24 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 15.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-30.svg
index 943efb0c0d..31e8d8e1d8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 19.5h15v11h-15z" style="fill:#282828"/>
   <path d="m24 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 19.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-40.svg
index 2f9f642a14..0a94fee1ca 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 15.5h15v8h-15z" style="fill:#282828"/>
   <path d="m24 16v7h-14v-7h14m1-1h-1-14-1v1 7 1h1 14 1v-1-7-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 15.5h15v8h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-50.svg
index 93ec236ca4..3b6587430c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 14.5h15v11h-15z" style="fill:#282828"/>
   <path d="m24 15v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 14.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-60.svg
index d6fe209d07..9ff3cdba4a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 16.5h15v11h-15z" style="fill:#282828"/>
   <path d="m24 17v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 16.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-70.svg
index 18155c643a..508d7c4989 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 14.5h15v4h-15z" style="fill:#282828"/>
   <path d="m24 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 14.5h15v4h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-80.svg
index 34becaf851..1e579c0099 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 15.5h15v7h-15z" style="fill:#282828"/>
   <path d="m24 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 15.5h15v7h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-90.svg
index 0a376190e5..0201d63b1c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 15.5h15v11h-15z" style="fill:#282828"/>
   <path d="m24 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 15.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-ajar.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-ajar.svg
index 18155c643a..508d7c4989 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-ajar.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-ajar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 14.5h15v4h-15z" style="fill:#282828"/>
   <path d="m24 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 14.5h15v4h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-closed.svg
index c7c02c0395..63811dbdb3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-closed.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-closed.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m55.5 53.5v-35h-47v35h-5v-40h57v40z" style="fill:#f0f0f0"/>
   <path d="m60 14v4 35h-4v-35h-48v35h-4v-35-4h4 48 4m1-1h-1-4-48-4-1v1 4 35 1h1 4 1v-1-34h46v34 1h1 4 1v-1-35-4-1z" style="fill:#c8c8c8"/>
   <path d="m9.5 19.5h15v11h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-open.svg
index 2a27ce0661..65c3c2c3e5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-open.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor-open.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m55.5 53.5v-35h-47v35h-5v-40h57v40z" style="fill:#f0f0f0"/>
   <path d="m60 14v4 35h-4v-35h-48v35h-4v-35-4h4 48 4m1-1h-1-4-48-4-1v1 4 35 1h1 4 1v-1-34h46v34 1h1 4 1v-1-35-4-1z" style="fill:#c8c8c8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor.svg b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor.svg
index 18155c643a..508d7c4989 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garagedoor.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garagedoor.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.5 14.5h15v4h-15z" style="fill:#282828"/>
   <path d="m24 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
   <path d="m24.5 14.5h15v4h-15z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/garden.svg b/bundles/org.openhab.ui.iconset.classic/icons/garden.svg
index e2cf275ada..2eefe817c5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/garden.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/garden.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="stroke-miterlimit:10;stroke-width:.25">
     <g style="fill:#063;stroke:#009949">
       <path d="m44.22 39.65c-1.58 0-2.94.6-3.63 1.47l-6.06-4.51-3.83-.97-3.84 1.45-2.25 1.45c-1.09-1.35-3.01-2.25-5.21-2.25-3.4 0-6.16 2.14-6.16 4.77s2.76 4.77 6.16 4.77c2.47 0 4.58-1.13 5.57-2.76.52 1.14 1.61 1.79 2.63 1.5.3-.09.56-.25.77-.46.62 1.21 2.42 1.63 4.13.93.44-.18.83-.42 1.16-.69.25 1.35 1.96 2.4 4.06 2.4 2 0 3.66-.95 4.03-2.2.69.34 1.54.56 2.46.56 2.27 0 4.11-1.22 4.11-2.73.01-1.5-1.83-2.73-4.1-2.73z"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/gas.png b/bundles/org.openhab.ui.iconset.classic/icons/gas.png
new file mode 100644
index 0000000000..40022e3e3d
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/gas.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/gas.svg b/bundles/org.openhab.ui.iconset.classic/icons/gas.svg
new file mode 100644
index 0000000000..8263161822
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/gas.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="30" x2="34">
+      <stop style="stop-color:#c7a23d"/>
+      <stop offset=".5" style="stop-color:#e6cead"/>
+      <stop offset="1" style="stop-color:#c7a23d"/>
+    </linearGradient>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="16.5" x2="47.5">
+      <stop style="stop-color:#dd2a42"/>
+      <stop offset=".5" style="stop-color:#dc6478"/>
+      <stop offset="1" style="stop-color:#dd2a42"/>
+    </linearGradient>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="23.5" x2="40.5">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="16.5" x2="47.5" xlink:href="#0"/>
+  </defs>
+  <path d="M16.5,54.5V25c0-4.1,3.4-7.5,7.5-7.5h16c4.1,0,7.5,3.4,7.5,7.5v29.5H16.5z" style="fill:url(#2)"/>
+  <path d="m40 18c3.9 0 7 3.1 7 7v29h-30v-29c0-3.9 3.1-7 7-7h16m0-1h-16c-4.4 0-8 3.6-8 8v30h32v-30c0-4.4-3.6-8-8-8z" style="fill:#b2243b"/>
+  <path d="m23.5 16.5v-6c1.1-.2 2-1.2 2-2.5s-.9-2.2-2-2.5v-1h17v1c-1.1.2-2 1.2-2 2.5s.9 2.2 2 2.5v6h-17m4-2h9v-8h-9v8" style="fill:url(#0)"/>
+  <path d="m40 5v.2c-1.2.4-2 1.5-2 2.8s.8 2.4 2 2.8v5.2h-16v-5.2c1.2-.4 2-1.5 2-2.8s-.8-2.4-2-2.8v-.2h16m-13 10h1 8 1v-1-7-1h-1-8-1v1 7 1m14-11h-18v2c1.1 0 2 .9 2 2 0 1.1-.9 2-2 2v7h18v-7c-1.1 0-2-.9-2-2 0-1.1.9-2 2-2v-2zm-13 10v-7h8v7h-8" style="fill:#6a6a72"/>
+  <path d="m30 9v1h1v4h2v-4h1v-1z" style="fill:url(#3)"/>
+  <path d="m16.5 60.5v-4h4v-1h4v1h15v-1h4v1h4v4z" style="fill:url(#1)"/>
+  <path d="m43 56v1h1 3v3h-30v-3h3 1v-1h3v1h1 14 1v-1h3m1-1h-5v1h-14v-1h-5v1h-4v5h32v-5h-4v-1z" style="fill:#6a6a72"/>
+  <path d="m47 35v2h-30v-2h30m1-1h-32v4h32v-4z" style="fill:#b2243b"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_1.svg
index d32ae26780..410cb01ea8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#f4d0b1"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#e5b795"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#f4d0b1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_2.svg
index 76cd12289a..279cc47e1e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#e7b48f"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#d89f79"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#e7b48f"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_3.svg
index 74b7b34fe6..3cc58400f7 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#d29e7c"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#c18a6b"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#d29e7c"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_4.svg
index 10f04bf0a6..d1f0925c0d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#ba7750"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#a35c3d"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#ba7750"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_5.svg
index 979652bcb3..085fc4571f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#a55d2b"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#89471b"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#a55d2b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/girl_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/girl_6.svg
index 134a7b983b..60c02bd5dc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/girl_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/girl_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#3c201d"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#1e0e0e"/>
   <path d="m36.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#3c201d"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/grass.svg b/bundles/org.openhab.ui.iconset.classic/icons/grass.svg
index a3e2514b73..c2513ecb3a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/grass.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/grass.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m10.92 3.96c-.04.07-.08.14-.12.21.15.18.29.36.45.53.52.54 1.07 1.06 1.58 1.61 4.16 4.42 7.03 9.63 9.18 15.24 3.27 8.53 4.82 17.43 5.5 26.49.29 3.86.32 7.75.47 11.62 0 .12.04.24.05.35 2.71 0 5.39 0 8.09 0 0-.19 0-.33 0-.48-.04-4.99-.35-9.95-1.08-14.89-.79-5.34-2.02-10.56-3.89-15.63-2.51-6.81-5.98-13.05-10.97-18.37-2.14-2.28-4.49-4.3-7.23-5.81-.64-.35-1.35-.58-2.03-.87m29.98 56.06c2.85 0 5.59 0 8.38 0 0-.32 0-.6 0-.87.07-4.45.44-8.88 1.31-13.25 1.1-5.53 2.84-10.83 5.61-15.75 1.07-1.9 2.3-3.71 3.44-5.58.18-.31.25-.69.37-1.03-.38.07-.79.07-1.13.23-1.75.84-3.2 2.09-4.56 3.43-5.04 4.94-8.61 10.8-10.88 17.47-1.2 3.53-1.95 7.15-2.28 10.86-.15 1.47-.18 2.96-.26 4.49m-15.61.02c-.06-1.2-.1-2.33-.18-3.47-.25-3.72-1.04-7.34-2.27-10.85-2.27-6.46-5.91-12.04-10.77-16.84-1.82-1.8-3.78-3.44-6.02-4.71-.61-.35-1.23-.71-2.05-.62 1.16 1.87 2.73 3.43 3.89 5.27 1.17 1.86 2.38 3.71 3.38 5.67.99 1.96 1.85 4 2.57 6.08.72 2.07 1.3 4.21 1.75 6.36.46 2.15.77 4.34 1 6.53.23 2.18.28 4.38.41 6.58 2.75 0 5.46 0 8.29 0m13.29-18.95c.03-.14.06-.32.09-.49.6-3.8 1.44-7.53 2.72-11.17 2.14-6.08 5.23-11.53 10.22-15.76.1-.08.15-.21.23-.32-.03-.05-.06-.1-.09-.15-.56.16-1.13.26-1.66.47-2.88 1.12-5.18 3.05-7.21 5.31-2.44 2.72-4.19 5.88-5.74 9.17-.77 1.64-1.22 3.23-.34 4.96.02.03.01.07.02.11.59 2.63 1.18 5.25 1.76 7.87"/>
   <g style="stroke-miterlimit:10;stroke-width:.25">
     <g style="stroke:#2aaa00">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/greenhouse.svg b/bundles/org.openhab.ui.iconset.classic/icons/greenhouse.svg
index 5e6e6b9554..606a255d2f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/greenhouse.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/greenhouse.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m3 24.5c-.21 0-.39-.13-.47-.32s-.03-.41.13-.55l14-13c.04-.04.1-.08.15-.1l15-6c.06-.02.13-.03.19-.03s.13.01.19.04l15 6c.06.02.11.06.15.1l14 13c.15.14.2.36.13.55s-.26.31-.47.31h-58" style="fill:#d9f1ff"/>
   <path d="m32 5l15 6 14 13h-14-30-14l14-13 15-6m0-1c-.13 0-.25.02-.37.07l-15 6c-.11.05-.22.11-.31.2l-14 13c-.3.28-.4.72-.25 1.1s.52.63.93.63h14 30 14c.41 0 .78-.25.93-.63s.05-.82-.25-1.1l-14-13c-.09-.08-.19-.15-.31-.2l-15-6c-.12-.05-.24-.07-.37-.07z" style="fill:#7aadcc"/>
   <path d="m17 24.5l-.5-.5v-13l.5-.5h30l.5.5v13l-.5.5z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/groundfloor.svg b/bundles/org.openhab.ui.iconset.classic/icons/groundfloor.svg
index 1e1a53bb20..0e46f14c4a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/groundfloor.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/groundfloor.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/group.svg b/bundles/org.openhab.ui.iconset.classic/icons/group.svg
index b64a1af2ed..4e20e334ee 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/group.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/group.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-0.svg
index 410dd52085..991a13e6e6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-6.3 0-11.84-4.03-13.79-10.02-1.2-3.68-.89-7.61.87-11.06s4.76-6.01 8.44-7.21c1.46-.47 2.97-.71 4.48-.71 6.3 0 11.84 4.03 13.79 10.02 1.2 3.68.89 7.61-.87 11.06-1.76 3.45-4.76 6.01-8.44 7.21-1.46.47-2.97.71-4.48.71" style="fill:#f0f0f0"/>
   <path d="m32 24c6.08 0 11.43 3.89 13.31 9.68 1.16 3.56.86 7.35-.84 10.68-1.7 3.33-4.59 5.8-8.15 6.96-1.4.45-2.86.68-4.32.68-6.08 0-11.43-3.89-13.31-9.68-1.16-3.56-.86-7.35.84-10.68 1.7-3.33 4.59-5.8 8.15-6.96 1.4-.45 2.86-.68 4.32-.68m0-1c-1.54 0-3.1.24-4.64.74-7.88 2.56-12.19 11.02-9.63 18.9 2.06 6.33 7.94 10.36 14.27 10.36 1.54 0 3.1-.24 4.64-.74 7.88-2.56 12.19-11.02 9.63-18.9-2.06-6.33-7.94-10.36-14.27-10.36z" style="fill:#b4b4b4"/>
   <g style="opacity:.6">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-100.svg
index cee8efccbe..cccd8c74cc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-6.3 0-11.84-4.03-13.79-10.02-1.2-3.68-.89-7.61.87-11.06s4.76-6.01 8.44-7.21c1.46-.47 2.97-.71 4.48-.71 6.3 0 11.84 4.03 13.79 10.02 1.2 3.68.89 7.61-.87 11.06s-4.76 6.01-8.44 7.21c-1.46.47-2.97.71-4.48.71" style="fill:#f0f0f0"/>
   <path d="m32 24c6.08 0 11.43 3.89 13.31 9.68 1.16 3.56.86 7.35-.84 10.68-1.7 3.33-4.59 5.8-8.15 6.96-1.4.45-2.86.68-4.32.68-6.08 0-11.43-3.89-13.31-9.68-1.16-3.56-.86-7.35.84-10.68 1.7-3.33 4.59-5.8 8.15-6.96 1.4-.45 2.86-.68 4.32-.68m0-1c-1.54 0-3.1.24-4.64.74-7.88 2.56-12.19 11.02-9.63 18.9 2.06 6.33 7.94 10.36 14.27 10.36 1.54 0 3.1-.24 4.64-.74 7.88-2.56 12.19-11.02 9.63-18.9-2.06-6.33-7.94-10.36-14.27-10.36z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-20.svg
index 6df25d7feb..0837cd69f6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-1.52 0-3.03-.24-4.48-.71-3.68-1.2-6.68-3.76-8.44-7.21s-2.07-7.38-.87-11.06c1.95-6 7.49-10.02 13.79-10.02 1.52 0 3.03.24 4.48.71 3.68 1.2 6.68 3.76 8.44 7.21s2.07 7.38.87 11.06c-1.95 6-7.49 10.02-13.79 10.02" style="fill:#f0f0f0"/>
   <path d="m32 23v1c1.46 0 2.92.23 4.33.69 7.34 2.39 11.37 10.3 8.99 17.64-1.89 5.78-7.24 9.67-13.32 9.67-1.47 0-2.92-.23-4.33-.69-7.34-2.39-11.37-10.3-8.99-17.64 1.89-5.78 7.24-9.67 13.32-9.67v-1m0 0c-6.32 0-12.2 4.03-14.26 10.37-2.56 7.88 1.75 16.34 9.63 18.9 1.54.5 3.1.73 4.63.73 6.32 0 12.2-4.03 14.26-10.37 2.56-7.88-1.75-16.34-9.63-18.9-1.54-.5-3.1-.73-4.63-.73" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-40.svg
index 695e8ec5ce..f2d83314e2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32.01 52.5c-4.63 0-9.02-2.23-11.74-5.98-4.7-6.47-3.26-15.55 3.21-20.25 2.49-1.81 5.44-2.77 8.51-2.77 4.63 0 9.02 2.23 11.74 5.98 4.7 6.47 3.26 15.55-3.21 20.25-2.49 1.81-5.43 2.77-8.51 2.77" style="fill:#f0f0f0"/>
   <path d="m31.99 24c4.47 0 8.71 2.16 11.34 5.77 2.2 3.03 3.09 6.73 2.5 10.42-.58 3.69-2.57 6.94-5.6 9.14-2.41 1.75-5.25 2.67-8.22 2.67-4.47 0-8.71-2.16-11.34-5.77-2.2-3.03-3.09-6.73-2.5-10.42.58-3.69 2.57-6.94 5.6-9.14 2.41-1.75 5.25-2.67 8.22-2.67m0-1c-3.06 0-6.14.93-8.8 2.87-6.7 4.87-8.19 14.25-3.32 20.95 2.93 4.04 7.5 6.18 12.14 6.18 3.06 0 6.14-.93 8.8-2.87 6.7-4.87 8.19-14.25 3.32-20.95-2.93-4.04-7.5-6.18-12.14-6.18z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-60.svg
index 7bb6511a4c..a9b8e418db 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,52.5c-8,0-14.5-6.5-14.5-14.5S24,23.5,32,23.5S46.5,30,46.5,38S40,52.5,32,52.5z" style="fill:#f0f0f0"/>
   <path d="m32 24c7.72 0 14 6.28 14 14s-6.28 14-14 14-14-6.28-14-14 6.28-14 14-14m0-1c-8.28 0-15 6.72-15 15s6.72 15 15 15 15-6.72 15-15-6.72-15-15-15z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-80.svg
index 492805d297..ddf682b5f1 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m31.99 52.5c-3.07 0-6.02-.96-8.51-2.77-6.47-4.7-7.91-13.79-3.21-20.25 2.72-3.74 7.11-5.98 11.74-5.98 3.07 0 6.02.96 8.51 2.77 6.47 4.7 7.91 13.79 3.21 20.25-2.72 3.75-7.11 5.98-11.74 5.98" style="fill:#f0f0f0"/>
   <path d="m32.01 24c2.97 0 5.81.92 8.22 2.67 3.03 2.2 5.01 5.44 5.6 9.14s-.3 7.39-2.5 10.42c-2.63 3.61-6.87 5.77-11.34 5.77-2.97 0-5.81-.92-8.22-2.67-3.03-2.2-5.01-5.44-5.6-9.14s.3-7.39 2.5-10.42c2.63-3.61 6.87-5.77 11.34-5.77m0-1c-4.64 0-9.21 2.14-12.15 6.18-4.87 6.7-3.38 16.08 3.32 20.95 2.66 1.93 5.75 2.87 8.8 2.87 4.64 0 9.21-2.14 12.15-6.18 4.87-6.7 3.38-16.08-3.32-20.95-2.66-1.94-5.74-2.87-8.8-2.87z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-off.svg
index 410dd52085..991a13e6e6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-6.3 0-11.84-4.03-13.79-10.02-1.2-3.68-.89-7.61.87-11.06s4.76-6.01 8.44-7.21c1.46-.47 2.97-.71 4.48-.71 6.3 0 11.84 4.03 13.79 10.02 1.2 3.68.89 7.61-.87 11.06-1.76 3.45-4.76 6.01-8.44 7.21-1.46.47-2.97.71-4.48.71" style="fill:#f0f0f0"/>
   <path d="m32 24c6.08 0 11.43 3.89 13.31 9.68 1.16 3.56.86 7.35-.84 10.68-1.7 3.33-4.59 5.8-8.15 6.96-1.4.45-2.86.68-4.32.68-6.08 0-11.43-3.89-13.31-9.68-1.16-3.56-.86-7.35.84-10.68 1.7-3.33 4.59-5.8 8.15-6.96 1.4-.45 2.86-.68 4.32-.68m0-1c-1.54 0-3.1.24-4.64.74-7.88 2.56-12.19 11.02-9.63 18.9 2.06 6.33 7.94 10.36 14.27 10.36 1.54 0 3.1-.24 4.64-.74 7.88-2.56 12.19-11.02 9.63-18.9-2.06-6.33-7.94-10.36-14.27-10.36z" style="fill:#b4b4b4"/>
   <g style="opacity:.6">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating-on.svg
index cee8efccbe..cccd8c74cc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-6.3 0-11.84-4.03-13.79-10.02-1.2-3.68-.89-7.61.87-11.06s4.76-6.01 8.44-7.21c1.46-.47 2.97-.71 4.48-.71 6.3 0 11.84 4.03 13.79 10.02 1.2 3.68.89 7.61-.87 11.06s-4.76 6.01-8.44 7.21c-1.46.47-2.97.71-4.48.71" style="fill:#f0f0f0"/>
   <path d="m32 24c6.08 0 11.43 3.89 13.31 9.68 1.16 3.56.86 7.35-.84 10.68-1.7 3.33-4.59 5.8-8.15 6.96-1.4.45-2.86.68-4.32.68-6.08 0-11.43-3.89-13.31-9.68-1.16-3.56-.86-7.35.84-10.68 1.7-3.33 4.59-5.8 8.15-6.96 1.4-.45 2.86-.68 4.32-.68m0-1c-1.54 0-3.1.24-4.64.74-7.88 2.56-12.19 11.02-9.63 18.9 2.06 6.33 7.94 10.36 14.27 10.36 1.54 0 3.1-.24 4.64-.74 7.88-2.56 12.19-11.02 9.63-18.9-2.06-6.33-7.94-10.36-14.27-10.36z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/heating.svg b/bundles/org.openhab.ui.iconset.classic/icons/heating.svg
index cee8efccbe..cccd8c74cc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/heating.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/heating.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 52.5c-6.3 0-11.84-4.03-13.79-10.02-1.2-3.68-.89-7.61.87-11.06s4.76-6.01 8.44-7.21c1.46-.47 2.97-.71 4.48-.71 6.3 0 11.84 4.03 13.79 10.02 1.2 3.68.89 7.61-.87 11.06s-4.76 6.01-8.44 7.21c-1.46.47-2.97.71-4.48.71" style="fill:#f0f0f0"/>
   <path d="m32 24c6.08 0 11.43 3.89 13.31 9.68 1.16 3.56.86 7.35-.84 10.68-1.7 3.33-4.59 5.8-8.15 6.96-1.4.45-2.86.68-4.32.68-6.08 0-11.43-3.89-13.31-9.68-1.16-3.56-.86-7.35.84-10.68 1.7-3.33 4.59-5.8 8.15-6.96 1.4-.45 2.86-.68 4.32-.68m0-1c-1.54 0-3.1.24-4.64.74-7.88 2.56-12.19 11.02-9.63 18.9 2.06 6.33 7.94 10.36 14.27 10.36 1.54 0 3.1-.24 4.64-.74 7.88-2.56 12.19-11.02 9.63-18.9-2.06-6.33-7.94-10.36-14.27-10.36z" style="fill:#b4b4b4"/>
   <path d="m4.03 37h10.03c.18-3.21 1.19-6.2 2.83-8.75l-8.11-5.89c-2.85 4.21-4.56 9.23-4.75 14.64" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/house.svg b/bundles/org.openhab.ui.iconset.classic/icons/house.svg
index b64a1af2ed..4e20e334ee 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/house.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/house.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-0.svg
index 931a0ccfa7..cca34f2bb1 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8 0-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-10.svg
index db3bf9dab3..8d921da29f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8 0-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-100.svg
index 0e5e956ba3..dbee856e64 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8 0-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-20.svg
index 67a06df52f..f28d9046a6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-30.svg
index 0773fb34c3..67bc1947cd 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-40.svg
index 00f907d951..6b8b2d18d5 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-50.svg
index 601f2e7ce2..ff58aa955f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-60.svg
index 6c69af35b1..5da6b7dc89 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-70.svg
index 9031497571..d958741db8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8-.1-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-80.svg
index d0f8738f8b..690121fd3d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8 0-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity-90.svg
index e065a26829..e8adbc2d3d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
   <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
   <path d="m50.1 16.6l-3.5 3.5c2.6 3.2 4.2 7.4 4.2 11.9 0 5.2-2.1 9.9-5.5 13.3l3.5 3.5c4.3-4.3 7-10.2 7-16.8 0-5.9-2.2-11.3-5.7-15.4" style="fill:#2e7de5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/humidity.svg b/bundles/org.openhab.ui.iconset.classic/icons/humidity.svg
index a8939cf62e..b6fbc95242 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/humidity.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/humidity.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M24,52.5C11,52.5,0.5,42,0.5,29S11,5.5,24,5.5S47.5,16,47.5,29S37,52.5,24,52.5z" style="fill:#f0f0f0"/>
   <path d="m24 6c12.7 0 23 10.3 23 23s-10.3 23-23 23-23-10.3-23-23 10.3-23 23-23m0-1c-13.3 0-24 10.7-24 24s10.7 24 24 24 24-10.7 24-24-10.7-24-24-24z" style="fill:#b4b4b4"/>
   <path d="m51.1 58.5c-.1 0-.3 0-.4-.1-.3 0-.7-.1-.9-.2h-.1c-4.8-.9-8.9-5.7-9.1-10.8v-1.5c.1-.9.3-1.9.7-2.9.4-.8.8-1.6 1.2-2.2l1.5-2.1c3.4-4.2 6.1-8.3 8.1-12.5l.2.4c2 5.1 5.3 9.4 8 12.6.3.5.7 1 1.1 1.5.5.8 1.1 1.8 1.6 2.8.3.7.5 1.6.6 2.6v1.4c0 .2-.1.3-.1.5 0 .1 0 .3 0 .3v.1.1c-.5 4.7-4.5 9-9 9.8h-.1c-.3.1-.6.1-.9.2-.2 0-.3 0-.5.1h-1.9z" style="fill:#1e82ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/incline.svg b/bundles/org.openhab.ui.iconset.classic/icons/incline.svg
index 2db933f6ea..e5f1ce2c19 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/incline.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/incline.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m.5 49.5v-7h.2l.05-.44c1.96-15.71 15.4-27.56 31.25-27.56s29.29 11.85 31.25 27.56l.05.44h.2v7h-63m31.5-28c-12.01 0-22.17 8.59-24.16 20.42l-.1.58h48.51l-.1-.58c-1.98-11.83-12.14-20.42-24.15-20.42" style="fill:#e6f3ff"/>
   <path d="M32,15c15.6,0,28.82,11.66,30.75,27.12L62.86,43H63v6H1v-6h0.14l0.11-0.88C3.18,26.66,16.4,15,32,15     M7.16,43h1.18h47.32h1.18l-0.2-1.17C54.62,29.76,44.26,21,32,21S9.38,29.76,7.35,41.83L7.16,43 M32,14    C15.68,14,2.23,26.22,0.26,42H0v8h64v-8h-0.26C61.77,26.22,48.32,14,32,14L32,14z M8.34,42C10.24,30.65,20.11,22,32,22    s21.76,8.65,23.66,20H8.34L8.34,42z" style="fill:#c0e4ff"/>
   <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b;stroke-width:.5">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/keyring.svg b/bundles/org.openhab.ui.iconset.classic/icons/keyring.svg
index e59d267ba3..fa71dc4d8b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/keyring.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/keyring.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m2.5 43.5v-23h35.29l11.5 11.5-11.5 11.5h-35.29m39.5-15c-1.93 0-3.5 1.57-3.5 3.5s1.57 3.5 3.5 3.5 3.5-1.57 3.5-3.5-1.57-3.5-3.5-3.5" style="fill:#1e82ff"/>
   <path d="m37.59 21l11 11-11 11h-34.59v-22h34.59m4.41 15c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4m-4-16h-36v24h36l12-12-12-12zm4 15c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3" style="fill:#1271d8"/>
   <path d="m44.45 38.55c1.84 2.11 4.53 3.45 7.55 3.45 5.52 0 10-4.48 10-10 0-5.52-4.48-10-10-10s-10 4.48-10 10c0 .68.07 1.34.2 1.98" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-linecap:round;stroke-linejoin:round;stroke-width:2"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/kitchen.svg b/bundles/org.openhab.ui.iconset.classic/icons/kitchen.svg
index 4349683214..20f830635f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/kitchen.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/kitchen.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="21.8288" y1="4.055" x2="42.1712" y2="59.945">
       <stop/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/light-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/light-off.svg
index 9032f26cf2..3853ad06bb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/light-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/light-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/light-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/light-on.svg
index f680714387..a2797c506d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/light-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/light-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/light.svg b/bundles/org.openhab.ui.iconset.classic/icons/light.svg
index f680714387..a2797c506d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/light.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/light.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-decline.png b/bundles/org.openhab.ui.iconset.classic/icons/line-decline.png
new file mode 100644
index 0000000000..065102dfde
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/line-decline.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-decline.svg b/bundles/org.openhab.ui.iconset.classic/icons/line-decline.svg
new file mode 100644
index 0000000000..2e147aa432
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/line-decline.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#212121">
+    <path d="m4 10h2v50h-2z"/>
+    <path d="m4 58h50v2h-50z"/>
+    <path d="m5 5l-3 5h6z"/>
+    <path d="m59 59l-5-3v6z"/>
+    <path d="m2 18h4v2h-4z"/>
+    <path d="m2 28h4v2h-4z"/>
+    <path d="m2 38h4v2h-4z"/>
+    <path d="m2 48h4v2h-4z"/>
+    <path d="m16 58h2v4h-2z"/>
+    <path d="m26 58h2v4h-2z"/>
+    <path d="m36 58h2v4h-2z"/>
+    <path d="m46 58h2v4h-2z"/>
+  </g>
+  <path d="m10 16l13 8 10 22 22 7" style="fill:none;stroke-miterlimit:10;stroke:#f00014;stroke-width:2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-incline.png b/bundles/org.openhab.ui.iconset.classic/icons/line-incline.png
new file mode 100644
index 0000000000..d72bfe7acd
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/line-incline.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-incline.svg b/bundles/org.openhab.ui.iconset.classic/icons/line-incline.svg
new file mode 100644
index 0000000000..a175851c11
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/line-incline.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#212121">
+    <path d="m4 10h2v50h-2z"/>
+    <path d="m4 58h50v2h-50z"/>
+    <path d="m5 5l-3 5h6z"/>
+    <path d="m59 59l-5-3v6z"/>
+    <path d="m2 18h4v2h-4z"/>
+    <path d="m2 28h4v2h-4z"/>
+    <path d="m2 38h4v2h-4z"/>
+    <path d="m2 48h4v2h-4z"/>
+    <path d="m16 58h2v4h-2z"/>
+    <path d="m26 58h2v4h-2z"/>
+    <path d="m36 58h2v4h-2z"/>
+    <path d="m46 58h2v4h-2z"/>
+  </g>
+  <path d="m10 54l18-11 12-19 15-10" style="fill:none;stroke-miterlimit:10;stroke:#00c83c;stroke-width:2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.png b/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.png
new file mode 100644
index 0000000000..3ad0ba4296
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.svg b/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.svg
new file mode 100644
index 0000000000..a2f85f4c4c
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/line-stagnation.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#212121">
+    <path d="m4 10h2v50h-2z"/>
+    <path d="m4 58h50v2h-50z"/>
+    <path d="m5 5l-3 5h6z"/>
+    <path d="m59 59l-5-3v6z"/>
+    <path d="m2 18h4v2h-4z"/>
+    <path d="m2 28h4v2h-4z"/>
+    <path d="m2 38h4v2h-4z"/>
+    <path d="m2 48h4v2h-4z"/>
+    <path d="m16 58h2v4h-2z"/>
+    <path d="m26 58h2v4h-2z"/>
+    <path d="m36 58h2v4h-2z"/>
+    <path d="m46 58h2v4h-2z"/>
+  </g>
+  <path d="m10 34l11-2 14 2 20-1" style="fill:none;stroke-miterlimit:10;stroke:#bebec8;stroke-width:2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line.png b/bundles/org.openhab.ui.iconset.classic/icons/line.png
new file mode 100644
index 0000000000..2e834936f5
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/line.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/line.svg b/bundles/org.openhab.ui.iconset.classic/icons/line.svg
new file mode 100644
index 0000000000..df32f8d431
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/line.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#212121">
+    <path d="m4 10h2v50h-2z"/>
+    <path d="m4 58h50v2h-50z"/>
+    <path d="m5 5l-3 5h6z"/>
+    <path d="m59 59l-5-3v6z"/>
+    <path d="m2 18h4v2h-4z"/>
+    <path d="m2 28h4v2h-4z"/>
+    <path d="m2 38h4v2h-4z"/>
+    <path d="m2 48h4v2h-4z"/>
+    <path d="m16 58h2v4h-2z"/>
+    <path d="m26 58h2v4h-2z"/>
+    <path d="m36 58h2v4h-2z"/>
+    <path d="m46 58h2v4h-2z"/>
+  </g>
+  <g style="fill:none;stroke-miterlimit:10;stroke-width:2">
+    <path d="m11 46l17-12 12 18 12-8" style="stroke:#a34cb5"/>
+    <path d="m12 52l17-5 11-23 13-5" style="stroke:#2e7de5"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.png b/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.png
index 802a88f317..e533f717f8 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.png and b/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.svg
index 2155fe762f..2e88b59adb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/lock-closed.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m42 29.59v-5.45c0-5.52-4.48-10-10-10s-10 4.48-10 10v12.73" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-width:4"/>
   <path d="m17.5 29.5h29v25h-29z" style="fill:#f8cf99"/>
   <path d="m46 30v24h-28v-24h28m1-1h-1-28-1v1 24 1h1 28 1v-1-24-1z" style="fill:#cb9d61"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/lock-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/lock-open.svg
index 81ebad17c2..d5c9e3e575 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/lock-open.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/lock-open.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9 25v-5c0-5.52 4.48-10 10-10s10 4.48 10 10v12.73" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-width:4"/>
   <path d="m23.5 29.5h29v25h-29z" style="fill:#f8cf99"/>
   <path d="m52 30v24h-28v-24h28m1-1h-1-28-1v1 24 1h1 28 1v-1-24-1z" style="fill:#cb9d61"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/lock.png b/bundles/org.openhab.ui.iconset.classic/icons/lock.png
index 802a88f317..e533f717f8 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/lock.png and b/bundles/org.openhab.ui.iconset.classic/icons/lock.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/lock.svg b/bundles/org.openhab.ui.iconset.classic/icons/lock.svg
index 2155fe762f..2e88b59adb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/lock.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/lock.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m42 29.59v-5.45c0-5.52-4.48-10-10-10s-10 4.48-10 10v12.73" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-width:4"/>
   <path d="m17.5 29.5h29v25h-29z" style="fill:#f8cf99"/>
   <path d="m46 30v24h-28v-24h28m1-1h-1-28-1v1 24 1h1 28 1v-1-24-1z" style="fill:#cb9d61"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_1.svg
index d5a62c8a05..e06019f74a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_2.svg
index e76dd31bda..41bcfdabd6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_3.svg
index f447d95986..03d637f4a0 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_4.svg
index 17aaef5e4d..6ada7545a4 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_5.svg
index 6381b18c94..e70b57b2bf 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/man_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/man_6.svg
index 065d12fb33..ef90c45449 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/man_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/man_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m29.3 17.3c0 0 2.7 7.9 2.7 10.7 0-2.7 2.7-10.7 2.7-10.7h-5.4"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/microphone.png b/bundles/org.openhab.ui.iconset.classic/icons/microphone.png
new file mode 100644
index 0000000000..c1bbba7f21
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/microphone.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/microphone.svg b/bundles/org.openhab.ui.iconset.classic/icons/microphone.svg
new file mode 100644
index 0000000000..c8f05303b6
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/microphone.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="20" x2="44">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="25.5" x2="38.5">
+      <stop style="stop-color:#282828"/>
+      <stop offset=".5" style="stop-color:#505050"/>
+      <stop offset="1" style="stop-color:#282828"/>
+    </linearGradient>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="35" x2="0" y2="57">
+      <stop style="stop-color:#64646e"/>
+      <stop offset="1" style="stop-color:#82828c;stop-opacity:0"/>
+    </linearGradient>
+  </defs>
+  <path d="m32 44.5c-3.6 0-6.5-2.9-6.5-6.5v-22c0-3.6 2.9-6.5 6.5-6.5s6.5 2.9 6.5 6.5v22c0 3.6-2.9 6.5-6.5 6.5" style="fill:url(#1)"/>
+  <path d="m32 10c3.3 0 6 2.7 6 6v22c0 3.3-2.7 6-6 6-3.3 0-6-2.7-6-6v-22c0-3.3 2.7-6 6-6m0-1c-3.9 0-7 3.2-7 7v22c0 3.8 3.1 7 7 7 3.8 0 7-3.2 7-7v-22c0-3.8-3.2-7-7-7z" style="fill:#1a171b"/>
+  <g style="fill:url(#0)">
+    <path d="m20 57h24v2h-24z"/>
+    <path d="m41 35v3c0 5-4 9-9 9s-9-4-9-9v-3h-3v3c0 5.9 4.3 10.9 10 11.8v7.2h4v-7.2c5.7-1 10-5.9 10-11.8v-3h-3"/>
+  </g>
+  <path d="m43 36v2c0 5.4-3.9 9.9-9.2 10.8l-.8.2v.8 6.2h-2v-6.2-.8l-.8-.1c-5.3-1-9.2-5.5-9.2-10.9v-2h1v2c0 5.5 4.5 10 10 10s10-4.5 10-10v-2h1m1-1h-3v3c0 5-4 9-9 9s-9-4-9-9v-3h-3v3c0 5.9 4.3 10.9 10 11.8v7.2h4v-7.2c5.7-1 10-5.9 10-11.8v-3z" style="fill:url(#2)"/>
+  <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b">
+    <path d="m25 15.5h14"/>
+    <path d="m25 19.5h14"/>
+    <path d="m25 23.5h14"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/moon.svg b/bundles/org.openhab.ui.iconset.classic/icons/moon.svg
index cec6ded4a9..11fb3acfba 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/moon.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/moon.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m35.3 61.5c-11.4 0-21.9-6.7-26.8-17-3.3-7.1-3.7-15.2-1-22.6s8.2-13.3 15.3-16.6c2.2-1 4.5-1.8 6.9-2.2-10.5 5-13.6 20.6-7 34.8 5.2 11.1 14.9 18.5 24.3 18.5 2.4 0 4.7-.5 6.8-1.5-1.9 1.5-3.9 2.8-6.1 3.8-3.9 1.9-8.1 2.8-12.4 2.8" style="fill:#efe8da"/>
   <path d="m26.6 4.3c-8.4 6.4-10.4 20.6-4.3 33.7 5.2 11.2 15.2 18.8 24.8 18.8 1.3 0 2.6-.1 3.8-.4-1.1.7-2.2 1.3-3.3 1.8-3.9 1.8-8 2.7-12.2 2.7-11.3.1-21.6-6.5-26.4-16.6-6.7-14.5-.5-31.8 14-38.6 1.2-.5 2.4-1 3.6-1.4m8.7-2.3c-4.3 0-8.6.9-12.7 2.8-15 7-21.5 24.9-14.5 39.9 5.1 10.9 15.9 17.3 27.2 17.3 4.2 0 8.6-.9 12.7-2.8 4.3-2 7.9-4.9 10.7-8.4-1.4 1.5-3.1 2.8-5 3.7-2.1 1-4.4 1.5-6.7 1.5-9 0-18.7-7-23.9-18.2-6.5-14.2-3.5-29.5 6.9-34.4 1.9-.9 3.9-1.4 6-1.4-.3 0-.5 0-.7 0z" style="fill:#dbd4c8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/motion.png b/bundles/org.openhab.ui.iconset.classic/icons/motion.png
new file mode 100644
index 0000000000..0d6be3d37c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/motion.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/motion.svg b/bundles/org.openhab.ui.iconset.classic/icons/motion.svg
new file mode 100644
index 0000000000..f628483f41
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/motion.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:none;stroke-miterlimit:10;stroke:#212121;stroke-width:3">
+    <path d="m49.2 41.2c1.5-2.8 2.3-5.9 2.3-9.2 0-3.3-.8-6.5-2.3-9.2"/>
+    <path d="m14.8 22.8c-1.5 2.8-2.3 5.9-2.3 9.2 0 3.3.8 6.5 2.3 9.2"/>
+    <path d="m55.2 44.8c2.1-3.8 3.3-8.2 3.3-12.8 0-4.7-1.2-9-3.3-12.8"/>
+    <path d="M8.8,19.2C6.7,23,5.5,27.3,5.5,32  c0,4.7,1.2,9,3.3,12.8"/>
+  </g>
+  <g style="fill:#212121">
+    <path d="m33.2 17.9c1.9.2 3.6-1.3 3.7-3.2.1-1.9-1.3-3.6-3.2-3.7-1.9-.1-3.6 1.3-3.7 3.2-.1 1.9 1.3 3.6 3.2 3.7"/>
+    <path d="m30.3 19.4c.7-.5 1.5-.8 2.4-.7 1.2.1 2.2.8 2.8 1.7l3.5 7 4.8 3.3c.4.3.7.8.6 1.4-.1.9-.8 1.5-1.7 1.4-.3 0-.5-.1-.7-.2l-5.2-3.6c-.2-.1-.3-.3-.4-.5l-1.3-2.6-1.6 6.9 6.2 7.3c.1.2.2.5.3.8l1.7 8.8c0 .2 0 .3 0 .5-.1 1.3-1.2 2.3-2.5 2.2-1.1-.1-1.9-.9-2.1-1.9l-1.6-8.2-5-5.5-1.2 5.3c0 .3-.4.8-.5 1l-4.8 8.1c-.5.7-1.3 1.2-2.2 1.1-1.3-.1-2.3-1.2-2.2-2.5 0-.4.2-.8.3-1l4.5-7.5 3.7-16.5-2.4 2-1.3 5.9c-.2.8-.9 1.4-1.7 1.3-.9-.1-1.5-.8-1.4-1.7 0-.1 0-.1 0-.2l1.5-6.9c.1-.3.3-.6.5-.8l7-5.7"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.png b/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.png
new file mode 100644
index 0000000000..4f7f2ea3ac
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.svg b/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.svg
new file mode 100644
index 0000000000..94e696daed
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/movecontrol.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:none;stroke-miterlimit:10;stroke:#212121;stroke-width:4">
+    <path d="m32 14v36"/>
+    <path d="m14 32h36"/>
+  </g>
+  <g style="fill:#212121">
+    <path d="m26 14h12l-6-7.5z"/>
+    <path d="m38 50h-12l6 7.5z"/>
+    <path d="m50 26v12l7.5-6z"/>
+    <path d="m14 38v-12l-7.5 6z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/network-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/network-off.svg
index 1e47f8dc97..38535ba73c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/network-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/network-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m28.5 48.8c1-.8 2.2-1.3 3.5-1.3s2.5.4 3.5 1.3l-3.5 3.5-3.5-3.5" style="fill:#c80028"/>
   <path d="m32 48c1 0 1.9.3 2.8.8l-2.8 2.8-2.8-2.8c.9-.5 1.8-.8 2.8-.8m0-1c-1.5 0-3.1.6-4.2 1.8l4.2 4.2 4.2-4.2c-1.1-1.2-2.7-1.8-4.2-1.8z" style="fill:#990025"/>
   <path d="m40.5 43.8c-2.3-2.1-5.3-3.3-8.5-3.3s-6.2 1.2-8.5 3.3l-3.5-3.5c3.3-3.1 7.5-4.8 12-4.8s8.8 1.7 12 4.8l-3.5 3.5" style="fill:#c80028"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/network-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/network-on.svg
index 85dabd989b..0fa706a7c0 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/network-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/network-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m28.5 48.8c1-.8 2.2-1.3 3.5-1.3s2.5.4 3.5 1.3l-3.5 3.5-3.5-3.5" style="fill:#00c864"/>
   <path d="m32 48c1 0 1.9.3 2.8.8l-2.8 2.8-2.8-2.8c.9-.5 1.8-.8 2.8-.8m0-1c-1.5 0-3.1.6-4.2 1.8l4.2 4.2 4.2-4.2c-1.1-1.2-2.7-1.8-4.2-1.8z" style="fill:#009949"/>
   <path d="m40.5 43.8c-2.3-2.1-5.3-3.3-8.5-3.3s-6.2 1.2-8.5 3.3l-3.5-3.5c3.3-3.1 7.5-4.8 12-4.8s8.8 1.7 12 4.8l-3.5 3.5" style="fill:#00c864"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/network.svg b/bundles/org.openhab.ui.iconset.classic/icons/network.svg
index b57826639a..0580abcdc1 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/network.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/network.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m28.5 48.8c1-.8 2.2-1.3 3.5-1.3s2.5.4 3.5 1.3l-3.5 3.5-3.5-3.5" style="fill:#323232"/>
   <path d="m32 48c1 0 1.9.3 2.8.8l-2.8 2.8-2.8-2.8c.9-.5 1.8-.8 2.8-.8m0-1c-1.5 0-3.1.6-4.2 1.8l4.2 4.2 4.2-4.2c-1.1-1.2-2.7-1.8-4.2-1.8z"/>
   <path d="m40.5 43.8c-2.3-2.1-5.3-3.3-8.5-3.3s-6.2 1.2-8.5 3.3l-3.5-3.5c3.3-3.1 7.5-4.8 12-4.8s8.8 1.7 12 4.8l-3.5 3.5" style="fill:#323232"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/niveau.svg b/bundles/org.openhab.ui.iconset.classic/icons/niveau.svg
index 7994b0e350..f3c744c974 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/niveau.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/niveau.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m30.59 20.69l2.12 2.12c.39.39.39 1.02 0 1.41l-8.49 8.49c-.39.39-1.02.39-1.41 0l-2.12-2.12-16.97 16.97 12.73 12.73 43.84-43.84-12.73-12.73-16.97 16.97m-11.36 29.65c-1.56 1.56-4.09 1.56-5.66 0-1.56-1.56-1.56-4.09 0-5.66s4.09-1.56 5.66 0c1.56 1.57 1.56 4.1 0 5.66" style="fill:#fcd703"/>
   <path d="m60.28 16.44c.78-.78.78-2.05 0-2.83l-9.9-9.9c-.78-.78-2.05-.78-2.83 0l12.73 12.73"/>
   <path d="m16.44 60.28c-.78.78-2.05.78-2.83 0l-9.9-9.9c-.78-.78-.78-2.05 0-2.83l12.73 12.73"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/office.svg b/bundles/org.openhab.ui.iconset.classic/icons/office.svg
index 477a12ff15..68cfd89eae 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/office.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/office.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m4.5 8.5h13v43h-13z" style="fill:#ff4545"/>
   <path d="M17,9v42H5V9H17 M18,8H4v44h14V8L18,8z" style="fill:#d82b2b"/>
   <circle cx="11" cy="44" r="3" style="fill:#828b7d"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/oil.png b/bundles/org.openhab.ui.iconset.classic/icons/oil.png
index f281d685fb..6153e128cf 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/oil.png and b/bundles/org.openhab.ui.iconset.classic/icons/oil.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/oil.svg b/bundles/org.openhab.ui.iconset.classic/icons/oil.svg
index 0ca26926ac..0ef1d42813 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/oil.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/oil.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
-  <path fill="#282828" d="M30.4,61.5c-0.2,0-0.5-0.1-0.8-0.1c-0.6-0.1-1.2-0.1-1.7-0.3l0,0l-0.1,0c-8.6-1.5-15.9-10.2-16.3-19.3   l0-2.7c0.3-1.7,0.6-3.5,1.3-5.2c0.7-1.3,1.4-2.7,2.2-4l2.6-3.6c6.2-7.6,11-14.9,14.6-22.5L32.8,5c3.5,8.9,9.3,16.4,13.9,22   c0.6,0.9,1.2,1.8,1.9,2.6c1,1.5,2,3.2,2.8,5c0.5,1.3,0.9,2.9,1.1,4.6l0,2.5c-0.1,0.3-0.1,0.6-0.1,0.8c0,0.3,0,0.5-0.1,0.7l0,0.1   l0,0.1c-0.9,8.4-8,16.1-16.1,17.5l-0.1,0l0,0c-0.5,0.2-1.1,0.3-1.7,0.3c-0.3,0-0.6,0.1-0.8,0.1H30.4z"/>
-  <path d="M32.2,4.9l0.2,0.4c3.6,8.9,9.3,16.5,13.9,22.1c0.6,0.9,1.3,1.8,1.9,2.6c1,1.5,2,3.2,2.8,4.9c0.5,1.3,0.8,2.8,1,4.5v2.4   c-0.1,0.3-0.1,0.6-0.1,0.9c0,0.2,0,0.4-0.1,0.6l-0.1,0.1l0,0.1c-0.9,8.2-7.8,15.7-15.6,17.1l-0.1,0l-0.1,0c-0.5,0.2-1,0.2-1.6,0.3   c-0.3,0-0.6,0.1-0.8,0.1h-3c-0.3,0-0.5-0.1-0.8-0.1c-0.6-0.1-1.2-0.1-1.6-0.3l-0.1,0l-0.1,0c-8.4-1.5-15.5-9.9-15.9-18.7v-2.6   c0.3-1.7,0.6-3.4,1.3-5.1c0.8-1.5,1.4-2.7,2.2-3.9l2.6-3.6C24,19.3,28.6,12.1,32.2,4.9 M32.2,2.5c-3.9,8.4-9.1,16.2-15,23.4   l-2.6,3.7c-0.8,1.3-1.5,2.7-2.3,4.1c-0.7,1.7-1.1,3.6-1.3,5.4v2.7c0.4,9.2,7.7,18.1,16.7,19.7c0.8,0.3,1.8,0.3,2.7,0.5h3.2   c0.9-0.1,1.9-0.1,2.7-0.5c8.3-1.5,15.5-9.3,16.5-18c0.2-0.5,0.1-1.2,0.2-1.7v-2.6c-0.2-1.6-0.5-3.2-1.1-4.8   c-0.8-1.8-1.8-3.5-2.9-5.1c-0.7-0.9-1.3-1.7-1.9-2.6C41.5,20,36.5,12.9,33.3,4.8L32.2,2.5L32.2,2.5z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m30.4 61.5c-.2 0-.5-.1-.8-.1-.6-.1-1.2-.1-1.7-.3h-.1c-8.6-1.5-15.9-10.2-16.3-19.3v-2.7c.3-1.7.6-3.5 1.3-5.2.7-1.3 1.4-2.7 2.2-4l2.6-3.6c6.2-7.6 11-14.9 14.6-22.5l.6 1.2c3.5 8.9 9.3 16.4 13.9 22 .6.9 1.2 1.8 1.9 2.6 1 1.5 2 3.2 2.8 5 .5 1.3.9 2.9 1.1 4.6v2.5c-.1.3-.1.6-.1.8 0 .3 0 .5-.1.7v.1.1c-.9 8.4-8 16.1-16.1 17.5h-.1c-.5.2-1.1.3-1.7.3-.3 0-.6.1-.8.1h-3.2z" style="fill:#282828"/>
+  <path d="m32.2 4.9l.2.4c3.6 8.9 9.3 16.5 13.9 22.1.6.9 1.3 1.8 1.9 2.6 1 1.5 2 3.2 2.8 4.9.5 1.3.8 2.8 1 4.5v2.4c-.1.3-.1.6-.1.9 0 .2 0 .4-.1.6l-.1.1v.1c-.9 8.2-7.8 15.7-15.6 17.1h-.1-.1c-.5.2-1 .2-1.6.3-.3 0-.6.1-.8.1h-3c-.3 0-.5-.1-.8-.1-.6-.1-1.2-.1-1.6-.3h-.1-.1c-8.4-1.5-15.5-9.9-15.9-18.7v-2.6c.3-1.7.6-3.4 1.3-5.1.8-1.5 1.4-2.7 2.2-3.9l2.6-3.6c5.9-7.4 10.5-14.6 14.1-21.8m0-2.4c-3.9 8.4-9.1 16.2-15 23.4l-2.6 3.7c-.8 1.3-1.5 2.7-2.3 4.1-.7 1.7-1.1 3.6-1.3 5.4v2.7c.4 9.2 7.7 18.1 16.7 19.7.8.3 1.8.3 2.7.5h3.2c.9-.1 1.9-.1 2.7-.5 8.3-1.5 15.5-9.3 16.5-18 .2-.5.1-1.2.2-1.7v-2.6c-.2-1.6-.5-3.2-1.1-4.8-.8-1.8-1.8-3.5-2.9-5.1-.7-.9-1.3-1.7-1.9-2.6-5.6-6.7-10.6-13.8-13.8-21.9l-1.1-2.3z"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/outdoorlight.svg b/bundles/org.openhab.ui.iconset.classic/icons/outdoorlight.svg
index 19701b7eed..1298070600 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/outdoorlight.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/outdoorlight.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/pantry.svg b/bundles/org.openhab.ui.iconset.classic/icons/pantry.svg
index 84c89cb8b4..f809341b5e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/pantry.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/pantry.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <clipPath id="0">
       <use xlink:href="#1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents-off.svg
index 660b1256fe..3cae6a594b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_1.svg
index 94649606ea..48a9d98c39 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_2.svg
index bf09ad2201..512d6a81fd 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_3.svg
index 5bb3a898a6..1c6f955e43 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_4.svg
index 652def42d0..2ebed5986a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_5.svg
index 7c63b4a929..243222d45b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_6.svg
index 1ff1da6343..536258e6d9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_1_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_1_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_1.svg
index d8edb3203f..91a3f85448 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 23.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_2.svg
index 7a2f4b7be8..bb7d6f5863 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_3.svg
index c452280481..bcfa0b5c67 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_4.svg
index 91c24eee97..e298d0f7b8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_5.svg
index 0efcb1d583..4107a8113f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_6.svg
index ec620a3dd1..6030e3af56 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_2_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_2_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_1.svg
index 728732a9df..f1d1afd66f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 23.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_2.svg
index ea4d6333f5..382c37a5a3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_3.svg
index c2cc532dc5..4acea8b2ed 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_4.svg
index 1f217988ee..f29de5ac97 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_5.svg
index 805b9cde7b..b241e857c3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_6.svg
index b9d0735865..4ba459346b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_3_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_3_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_1.svg
index b7272d1b91..519d7d2911 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 23.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_2.svg
index 2668d0893f..377b84e900 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_3.svg
index 0edef64a5c..e45f00f784 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_4.svg
index d85195897a..9394eb785e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_5.svg
index c001755e3d..dd890181ad 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_6.svg
index 4d8f4275e6..6315440490 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_4_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_4_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_1.svg
index d3c544ab59..81c4a25e71 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 23.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_2.svg
index 85b2e4e07c..783eb1e989 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_3.svg
index 71f3fed157..aa1f92fd30 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_4.svg
index 560f1f7f5b..14c3ba0e5e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_5.svg
index 151d33a283..df8af225aa 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_6.svg
index bf69e80ed9..9890fad77e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_5_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_5_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_1.svg
index adae86c33e..6a9451107a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 23.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_2.svg
index 83a0a8126d..b6e1aaf6c4 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_3.svg
index 31c72e8415..53efb74103 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_4.svg
index 2550028aa9..6e3786b591 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_5.svg
index 26132be1ea..af87513b0a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_6.svg
index dfbfac1ebe..f5ca7a22aa 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/parents_6_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/parents_6_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m38.7 24.9c0 0 3.3 9.8 3.3 13.1 0-3.4 3.3-13.1 3.3-13.1h-6.6"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/party.svg b/bundles/org.openhab.ui.iconset.classic/icons/party.svg
index d636d9c0cb..20cb21e26c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/party.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/party.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M53.5,10.21l0.02-0.02C50.32,8.32,42.34,7,33,7s-17.32,1.32-20.51,3.19l0.02,0.02h-0.03   L33,33.5l20.53-23.29H53.5z" style="fill:#e5395e;opacity:.9"/>
   <g style="fill:none;stroke-miterlimit:10;stroke:#cec6c6">
     <ellipse cx="33" cy="8.5" rx="22" ry="5" style="opacity:.9"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/pie.svg b/bundles/org.openhab.ui.iconset.classic/icons/pie.svg
index 79f7fb502a..e269418a54 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/pie.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/pie.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="M35.18,30.5L48.45,7.52c7.71,5.19,12.54,13.72,13,22.98H35.18z" style="fill:#ff9100"/>
   <path d="m48.61 8.24c7.18 5.03 11.71 13.03 12.31 21.76h-24.87l12.56-21.76m-.33-1.43l-13.96 24.19h27.66c-.34-10.15-5.71-19.02-13.7-24.19z" style="fill:#e57200"/>
   <path d="M2.55,30.5C3.33,14.76,16.17,2.5,32,2.5c5.01,0,9.95,1.28,14.31,3.71L32.29,30.5H2.55z" style="fill:#00b450"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/piggybank.svg b/bundles/org.openhab.ui.iconset.classic/icons/piggybank.svg
index d6d433e566..11d91fb813 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/piggybank.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/piggybank.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m18 24h18v4h-18z" style="fill:#633833"/>
   <g style="fill:#fff">
     <circle cx="51" cy="36" r="2"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/player.png b/bundles/org.openhab.ui.iconset.classic/icons/player.png
new file mode 100644
index 0000000000..9ba2bacfb0
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/player.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/player.svg b/bundles/org.openhab.ui.iconset.classic/icons/player.svg
new file mode 100644
index 0000000000..108824cee8
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/player.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m3.5 21.5h57v19h-57z" style="fill:#e7ebf4"/>
+  <path d="m60 22v18h-56v-18h56m1-1h-1-56-1v1 18 1h1 56 1v-1-18-1z" style="fill:#c4c6cc"/>
+  <path d="m10 25h42v5h-42z"/>
+  <path d="m7 41h6v1h-6z"/>
+  <path d="m51 41h6v1h-6z"/>
+  <circle cx="7.5" cy="26.5" r="1.5" style="fill:#b6c7d1"/>
+  <circle cx="9" cy="37" r="1"/>
+  <path d="m53.5 30.88c-1.86 0-3.38-1.51-3.38-3.38s1.51-3.38 3.38-3.38 3.38 1.51 3.38 3.38-1.52 3.38-3.38 3.38" style="fill:#b6c7d1"/>
+  <path d="m53.5 24.25c1.79 0 3.25 1.46 3.25 3.25s-1.46 3.25-3.25 3.25-3.25-1.46-3.25-3.25 1.46-3.25 3.25-3.25m0-.25c-1.93 0-3.5 1.57-3.5 3.5s1.57 3.5 3.5 3.5 3.5-1.57 3.5-3.5-1.57-3.5-3.5-3.5z" style="fill:#889499"/>
+  <path d="m6 32h52v1h-52z" style="fill:#3c3c3c"/>
+  <path d="m6 33h52v1h-52z" style="fill:#fff"/>
+  <path d="m47 36h11v2h-11z" style="fill:#899ba7"/>
+  <text transform="translate(21 29)" style="font-size:4;font-family:'MyriadPro-Regular';fill:#fff">POWER ON</text>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.png
new file mode 100644
index 0000000000..f476b43d37
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.svg
new file mode 100644
index 0000000000..6a81bbf80e
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-au.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="M32,59.5C16.8,59.5,4.5,47.2,4.5,32S16.8,4.5,32,4.5S59.5,16.8,59.5,32S47.2,59.5,32,59.5z" style="fill:#f5f5f5"/>
+  <path d="M32,5c14.9,0,27,12.1,27,27S46.9,59,32,59S5,46.9,5,32S17.1,5,32,5 M32,4C16.6,4,4,16.6,4,32s12.6,28,28,28  s28-12.6,28-28S47.4,4,32,4z" style="fill:#c8c8c8"/>
+  <g style="fill:#dcdcdc">
+    <path d="m43.1 14.9l-.9.5-3.5 1.9-.9.5.5.9 5.1 9.7.5.9.9-.5 3.5-1.9.9-.5-.5-.9-5.1-9.7-.5-.9"/>
+    <path d="m20.9 14.9l-.5.9-5.1 9.7-.5.9.9.5 3.5 1.9.9.5.5-.9 5.1-9.7.5-.9-.9-.5-3.5-1.9-.9-.5"/>
+    <path d="m35 37h-1-4-1v1 12 1h1 4 1v-1-12-1"/>
+  </g>
+  <g style="fill:#212121">
+    <path d="m21.3 16.2l3.5 1.9-5.1 9.7-3.5-1.9 5.1-9.7"/>
+    <path d="m42.7 16.2l5.1 9.7-3.5 1.9-5.1-9.7 3.5-1.9"/>
+    <path d="m34 38v12h-4v-12h4"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.png
new file mode 100644
index 0000000000..8c9c0c8f69
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.svg
new file mode 100644
index 0000000000..ceb8d17b36
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-eu.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <circle id="0" cx="32" cy="32" r="27"/>
+    <clipPath id="1">
+      <use xlink:href="#0"/>
+    </clipPath>
+  </defs>
+  <path d="M32,59.5C16.8,59.5,4.5,47.2,4.5,32S16.8,4.5,32,4.5S59.5,16.8,59.5,32S47.2,59.5,32,59.5z" style="fill:#ebebeb"/>
+  <path d="m32 5c14.9 0 27 12.1 27 27s-12.1 27-27 27-27-12.1-27-27 12.1-27 27-27m0-1c-15.4 0-28 12.6-28 28s12.6 28 28 28 28-12.6 28-28-12.6-28-28-28z" style="fill:#c8c8c8"/>
+  <g style="fill:#212121;stroke-miterlimit:10;stroke:#dcdcdc">
+    <circle cx="22" cy="32" r="3.5"/>
+    <circle cx="42" cy="32" r="3.5"/>
+  </g>
+  <g style="fill:#8c8c8c">
+    <path d="m30 5h4v4.9h-4z" style="clip-path:url(#1)"/>
+    <path d="m30 54h4v4.9h-4z" style="clip-path:url(#1)"/>
+  </g>
+  <g style="clip-path:url(#1)">
+    <g>
+      <path d="m-.5 34.5h11v29h-11z" style="fill:#f5f5f5"/>
+      <path d="m10 35v28h-10v-28h10m1-1h-1-10-1v1 28 1h1 10 1v-1-28-1z" style="fill:#c8c8c8"/>
+    </g>
+    <g>
+      <path d="m-.5.5h11v29h-11z" style="fill:#f5f5f5"/>
+      <path d="m10 1v28h-10v-28h10m1-1h-1-10-1v1 28 1h1 10 1v-1-28-1z" style="fill:#c8c8c8"/>
+    </g>
+  </g>
+  <g style="clip-path:url(#1)">
+    <g>
+      <path d="m53.5 34.5h11v29h-11z" style="fill:#f5f5f5"/>
+      <path d="m64 35v28h-10v-28h10m1-1h-1-10-1v1 28 1h1 10 1v-1-28-1z" style="fill:#c8c8c8"/>
+    </g>
+    <g>
+      <path d="m53.5.5h11v29h-11z" style="fill:#f5f5f5"/>
+      <path d="m64 1v28h-10v-28h10m1-1h-1-10-1v1 28 1h1 10 1v-1-28-1z" style="fill:#c8c8c8"/>
+    </g>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-off.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-off.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-off.png
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-off.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-off.svg
similarity index 96%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-off.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-off.svg
index 926e3ee9c5..e54794d270 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <circle id="0" cx="32" cy="32" r="14"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-on.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-on.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-on.png
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-on.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-on.svg
similarity index 96%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-on.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-on.svg
index 129f716337..92b7854ad6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <circle id="0" cx="32" cy="32" r="14"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-uk.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-uk.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-uk.png
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-uk.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-uk.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-uk.svg
new file mode 100644
index 0000000000..2312cfa41d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-uk.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m4.5 4.5h55v55h-55z" style="fill:#f5f5f5"/>
+  <path d="m59 5v54h-54v-54h54m1-1h-1-54-1v1 54 1h1 54 1v-1-54-1z" style="fill:#c8c8c8"/>
+  <path d="m13.5 42.5h10v6h-10z" style="fill:#212121"/>
+  <path d="m23 43v5h-9v-5h9m1-1h-1-9-1v1 5 1h1 9 1v-1-5-1z" style="fill:#dcdcdc"/>
+  <path d="m40.5 42.5h10v6h-10z" style="fill:#212121"/>
+  <path d="m50 43v5h-9v-5h9m1-1h-1-9-1v1 5 1h1 9 1v-1-5-1z" style="fill:#dcdcdc"/>
+  <path d="m29.5 12.5h5v11h-5z" style="fill:#212121"/>
+  <path d="m34 13v10h-4v-10h4m1-1h-1-4-1v1 10 1h1 4 1v-1-10-1z" style="fill:#dcdcdc"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-us.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-us.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket-us.png
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-us.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-us.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-us.svg
new file mode 100644
index 0000000000..bd54a6b590
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet-us.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.9 53.5l-.1-.1c-7.1-5-11.3-13-11.3-21.4s4.2-16.4 11.3-21.4l.1-.1h32.1l.1.1c7.1 5 11.3 13 11.3 21.4s-4.2 16.4-11.3 21.4l-.1.1h-32.1" style="fill:#f5f5f5"/>
+  <path d="m47.9 11c6.7 4.7 11.1 12.4 11.1 21 0 8.6-4.4 16.3-11.1 21h-31.8c-6.7-4.7-11.1-12.4-11.1-21 0-8.6 4.4-16.3 11.1-21h31.8m.3-1h-.3-31.8-.3l-.3.2c-7.2 5.1-11.5 13.2-11.5 21.8 0 8.6 4.3 16.7 11.5 21.8l.3.2h.3 31.8.3l.3-.2c7.2-5.1 11.5-13.2 11.5-21.8 0-8.6-4.3-16.7-11.5-21.8l-.3-.2z" style="fill:#c8c8c8"/>
+  <path d="m19.5 19.5h4v14h-4z" style="fill:#212121"/>
+  <path d="m23 20v13h-3v-13h3m1-1h-1-3-1v1 13 1h1 3 1v-1-13-1z" style="fill:#dcdcdc"/>
+  <path d="m39.5 21.5h4v11h-4z" style="fill:#212121"/>
+  <path d="m43 22v10h-3v-10h3m1-1h-1-3-1v1 10 1h1 3 1v-1-10-1z" style="fill:#dcdcdc"/>
+  <path d="m26.5 49.5v-5c0-2.8 2.2-5 5-5s5 2.2 5 5v5h-10" style="fill:#212121"/>
+  <path d="m31.5 40c2.5 0 4.5 2 4.5 4.5v4.5h-9v-4.5c0-2.5 2-4.5 4.5-4.5m0-1c-3 0-5.5 2.5-5.5 5.5v4.5 1h1 9 1v-1-4.5c0-3-2.5-5.5-5.5-5.5z" style="fill:#dcdcdc"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket.png b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket.png
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket.svg b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet.svg
similarity index 96%
rename from bundles/org.openhab.ui.iconset.classic/icons/socket.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/poweroutlet.svg
index 65fa951a84..7dc9449f0a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/poweroutlet.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <circle id="0" cx="32" cy="32" r="14"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/present-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/present-off.svg
index d7063c5c9e..7dbdf00357 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/present-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/present-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/present.svg b/bundles/org.openhab.ui.iconset.classic/icons/present.svg
index 309b62befd..905a666f01 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/present.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/present.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/pressure.png b/bundles/org.openhab.ui.iconset.classic/icons/pressure.png
new file mode 100644
index 0000000000..33320386fc
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/pressure.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/pressure.svg b/bundles/org.openhab.ui.iconset.classic/icons/pressure.svg
new file mode 100644
index 0000000000..73517d0f5d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/pressure.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="M32,61.5C15.7,61.5,2.5,48.3,2.5,32S15.7,2.5,32,2.5S61.5,15.7,61.5,32S48.3,61.5,32,61.5z" style="fill:#f0f0f0"/>
+  <path d="m32 3c16 0 29 13 29 29s-13 29-29 29-29-13-29-29 13-29 29-29m0-1c-16.6 0-30 13.4-30 30s13.4 30 30 30 30-13.4 30-30-13.4-30-30-30z" style="fill:#b4b4b4"/>
+  <g style="fill:#1a171b">
+    <path d="m11 28.7l20.6 5.8c0-.2.2-2.3.3-2.5s.4-2.2.5-2.4l-21.4-.9"/>
+    <ellipse transform="matrix(.1565-.9877.9877.1565-4.6124 58.5995)" cx="32" cy="32" rx="2.5" ry="2.5"/>
+  </g>
+  <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b;stroke-width:2">
+    <path d="m47.6 47.6c4-4 6.4-9.5 6.4-15.6 0-12.2-9.8-22-22-22s-22 9.8-22 22c0 6.1 2.5 11.6 6.4 15.6" style="opacity:.6"/>
+    <path d="m54 32h3" style="opacity:.6"/>
+    <path d="m7 32h3" style="opacity:.6"/>
+    <path d="m47.5 16.5l2.2-2.2" style="opacity:.6"/>
+    <path d="m14.3 49.7l2.2-2.2" style="opacity:.6"/>
+    <path d="m32 10v-3" style="opacity:.6"/>
+    <path d="m16.5 16.5l-2.2-2.2" style="opacity:.6"/>
+    <path d="m49.7 49.7l-2.2-2.2" style="opacity:.6"/>
+  </g>
+  <g style="opacity:.6">
+    <path d="m29.1 48.8h1.3v.8c.2-.4.5-.6.8-.8.3-.2.7-.2 1.1-.2.5 0 .9.1 1.3.3.4.2.7.4.9.7.2.3.4.7.5 1 .1.4.2.8.2 1.3 0 .4-.1.8-.2 1.2-.1.4-.3.7-.5 1-.2.3-.5.5-.8.7-.3.2-.7.3-1.2.3-.2 0-.4 0-.6-.1-.2 0-.4-.1-.6-.2-.2-.1-.4-.2-.5-.3-.2-.1-.3-.3-.4-.4v3.1h-1.4v-8.4zm4.8 3.1c0-.3 0-.6-.1-.8-.1-.3-.2-.5-.3-.7s-.3-.4-.5-.5c-.2-.1-.5-.2-.7-.2-.6 0-1 .2-1.3.6-.3.4-.4.9-.4 1.6 0 .3 0 .6.1.9.1.3.2.5.3.7.2.2.3.3.5.5.2.1.5.2.7.2.3 0 .6-.1.8-.2.2-.1.4-.3.5-.5.1-.2.2-.4.3-.7s.1-.6.1-.9" style="fill:#1a171b"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/projector_benq.svg b/bundles/org.openhab.ui.iconset.classic/icons/projector_benq.svg
index 059e93058d..e1a1d6e340 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/projector_benq.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/projector_benq.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3" x2="61">
       <stop style="stop-color:#1d1a1e"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/pump.svg b/bundles/org.openhab.ui.iconset.classic/icons/pump.svg
index 64299e2297..afb2267b52 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/pump.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/pump.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="5" gradientUnits="userSpaceOnUse" x1="29" x2="58">
       <stop style="stop-color:#82828c;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.png b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.png
new file mode 100644
index 0000000000..f6b863b35a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.svg
new file mode 100644
index 0000000000..f99a0a6add
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-0.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#dae1e4">
+    <path d="m6 44h10v12h-10z"/>
+    <path d="m20 32h10v24h-10z"/>
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.png b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.png
new file mode 100644
index 0000000000..bad50efbbf
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.svg b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.svg
new file mode 100644
index 0000000000..8c39ed13e3
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <g style="fill:#dae1e4">
+    <path d="m20 32h10v24h-10z"/>
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.png b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.png
new file mode 100644
index 0000000000..14d8bba37a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.svg b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.svg
new file mode 100644
index 0000000000..7e453d965d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-2.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <g style="fill:#dae1e4">
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.png b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.png
new file mode 100644
index 0000000000..ac693442a7
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.svg b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.svg
new file mode 100644
index 0000000000..382e256e00
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <path d="m34.5 24.5h9v31h-9z" style="fill:#323232"/>
+  <path d="m43 25v30h-8v-30h8m1-1h-10v32h10v-32z"/>
+  <path d="m48 8h10v48h-10z" style="fill:#dae1e4"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.png b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.png
new file mode 100644
index 0000000000..b224da1cce
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.svg b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.svg
new file mode 100644
index 0000000000..7064682763
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/qualityofservice-4.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <path d="m34.5 24.5h9v31h-9z" style="fill:#323232"/>
+  <path d="m43 25v30h-8v-30h8m1-1h-10v32h10v-32z"/>
+  <path d="m48.5 8.5h9v47h-9z" style="fill:#323232"/>
+  <path d="m57 9v46h-8v-46h8m1-1h-10v48h10v-48z"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/radiator.svg b/bundles/org.openhab.ui.iconset.classic/icons/radiator.svg
index c0f3d21723..9ea82ed6a2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/radiator.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/radiator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="5" gradientUnits="userSpaceOnUse" y1="10.5" x2="0" y2="53.5">
       <stop style="stop-color:#fafafa"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rain.png b/bundles/org.openhab.ui.iconset.classic/icons/rain.png
new file mode 100644
index 0000000000..f46b6eb3cc
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/rain.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rain.svg b/bundles/org.openhab.ui.iconset.classic/icons/rain.svg
new file mode 100644
index 0000000000..3c5dd287c0
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rain.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m38.5 26.5c0 0-.1 0-.2 0-.2 0-.3 0-.4-.1h-.1c-2.3-.4-4.2-2.7-4.4-5.2v-.8c.1-.4.2-.9.3-1.4.2-.3.4-.7.6-1.1l.7-1c1.6-1.9 2.9-3.8 3.8-5.8 1 2.4 2.6 4.5 3.9 6.1.1.2.3.5.6.8.2.4.5.9.8 1.3.1.3.2.8.3 1.2v.6c0 .1 0 .2 0 .3 0 0 0 .1 0 .1v.1.1c-.3 2.2-2.1 4.3-4.3 4.7h-.1c-.1 0-.2.1-.4.1-.1 0-.2 0-.2 0h-.9" style="fill:#1e82ff"/>
+  <path d="m39 12.3c1 2.1 2.4 3.8 3.5 5.2.2.3.4.5.5.7.3.4.5.8.7 1.3.1.3.2.7.2 1v.6c0 .1 0 .2 0 .3v.1c-.2 2-1.9 3.9-3.9 4.3h-.1-.1c0 0-.2 0-.3 0-.1 0-.1 0-.2 0h-.8c-.1 0-.1 0-.2 0-.1 0-.2 0-.3 0h-.1-.1c-2.1-.4-3.8-2.5-3.9-4.7v-.7c.1-.4.2-.8.3-1.2.2-.4.4-.7.6-1l.7-1c1.4-1.6 2.6-3.2 3.5-4.9m.1-2.3c-1.1 2.4-2.6 4.6-4.3 6.7l-.8 1c-.2.4-.4.8-.6 1.2-.2.5-.3 1-.4 1.5v.8c.1 2.6 2.2 5.2 4.8 5.6.2.2.5.2.7.2h.9c.2 0 .5 0 .8-.1 2.4-.4 4.4-2.7 4.7-5.1.1-.1 0-.3.1-.5v-.8c-.1-.5-.2-.9-.3-1.4-.2-.5-.5-1-.8-1.5-.2-.2-.4-.5-.6-.8-1.6-1.9-3-4-3.9-6.3l-.3-.5z" style="fill:#1271d8"/>
+  <path d="m20.5 40c0 0-.1 0-.2 0-.2 0-.3 0-.4-.1h-.1c-2.3-.4-4.2-2.7-4.4-5.2v-.8c.1-.4.2-.9.3-1.4.2-.3.4-.7.6-1.1l.7-1c1.6-1.9 2.9-3.8 3.8-5.8 1 2.4 2.6 4.5 3.9 6.1.1.2.3.5.6.8.2.4.5.9.8 1.3.1.3.2.8.3 1.2v.6c0 .1 0 .2 0 .3 0 0 0 .1 0 .1v.1.1c-.3 2.2-2.1 4.3-4.3 4.7h-.1c-.1 0-.2.1-.4.1-.1 0-.2 0-.2 0h-.9" style="fill:#1e82ff"/>
+  <path d="m21 25.8c1 2.1 2.4 3.8 3.5 5.2.2.3.4.5.5.7.3.4.5.8.7 1.3.1.3.2.7.2 1v.6c0 .1 0 .2 0 .3v.1c-.2 2-1.9 3.9-3.9 4.3h-.1-.1c0 0-.2 0-.3 0-.1 0-.1 0-.2 0h-.8c-.1 0-.1 0-.2 0-.1 0-.2 0-.3 0h-.1-.1c-2.1-.4-3.8-2.5-3.9-4.7v-.6c.1-.4.2-.8.3-1.2.2-.4.4-.7.6-1l.7-1c1.4-1.7 2.6-3.3 3.5-5m.1-2.3c-1.1 2.4-2.6 4.6-4.3 6.7l-.8 1c-.2.4-.4.8-.6 1.2-.2.5-.3 1-.4 1.5v.8c.1 2.6 2.2 5.2 4.8 5.6.2.1.5.1.8.1h.9c.2 0 .5 0 .8-.1 2.4-.4 4.4-2.7 4.7-5.1.1-.1 0-.3.1-.5v-.7c-.1-.5-.2-.9-.3-1.4-.2-.5-.5-1-.8-1.5-.2-.2-.4-.5-.6-.8-1.6-1.9-3-4-3.9-6.3l-.4-.5z" style="fill:#1271d8"/>
+  <path d="m38.5 53.5c0 0-.1 0-.2 0-.2 0-.3 0-.4-.1h-.1c-2.3-.4-4.2-2.7-4.4-5.2v-.8c.1-.4.2-.9.3-1.4.2-.3.4-.7.6-1.1l.7-1c1.6-1.9 2.9-3.8 3.8-5.8 1 2.4 2.6 4.5 3.9 6.1.1.2.3.5.6.8.2.4.5.9.8 1.3.1.3.2.8.3 1.2v.6c0 .1 0 .2 0 .3 0 0 0 .1 0 .1v.1.1c-.3 2.2-2.1 4.3-4.3 4.7h-.1c-.1 0-.2.1-.4.1-.1 0-.2 0-.2 0h-.9" style="fill:#1e82ff"/>
+  <path d="m39 39.3c1 2.1 2.4 3.8 3.5 5.2.2.3.4.5.5.7.3.4.5.8.7 1.3.1.3.2.7.2 1v.6c0 .1 0 .2 0 .3v.1c-.2 2-1.9 3.9-3.9 4.3h-.1-.1c0 0-.2 0-.3 0-.1 0-.1 0-.2 0h-.8c-.1 0-.1 0-.2 0-.1 0-.2 0-.3 0h-.1-.1c-2.1-.4-3.8-2.5-3.9-4.7v-.7c.1-.4.2-.8.3-1.2.2-.4.4-.7.6-1l.7-1c1.4-1.6 2.6-3.2 3.5-4.9m.1-2.3c-1.1 2.4-2.6 4.6-4.3 6.7l-.8 1c-.2.4-.4.8-.6 1.2-.2.5-.3 1-.4 1.5v.8c.1 2.6 2.2 5.2 4.8 5.6.2.2.5.2.7.2h.9c.2 0 .5 0 .8-.1 2.4-.4 4.4-2.7 4.7-5.1.1-.1 0-.3.1-.5v-.8c-.1-.5-.2-.9-.3-1.4-.2-.5-.5-1-.8-1.5-.2-.2-.4-.5-.6-.8-1.6-1.9-3-4-3.9-6.3l-.3-.5z" style="fill:#1271d8"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/receiver-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/receiver-off.svg
index c73e8ca169..fea71552ad 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/receiver-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/receiver-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m3.5 21.5h57v19h-57z" style="fill:#e7ebf4"/>
   <path d="m60 22v18h-56v-18h56m1-1h-1-56-1v1 18 1h1 56 1v-1-18-1z" style="fill:#c4c6cc"/>
   <path d="m10 25h42v5h-42z"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/receiver-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/receiver-on.svg
index cf7dba2c78..108824cee8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/receiver-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/receiver-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m3.5 21.5h57v19h-57z" style="fill:#e7ebf4"/>
   <path d="m60 22v18h-56v-18h56m1-1h-1-56-1v1 18 1h1 56 1v-1-18-1z" style="fill:#c4c6cc"/>
   <path d="m10 25h42v5h-42z"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/receiver.svg b/bundles/org.openhab.ui.iconset.classic/icons/receiver.svg
index cf7dba2c78..108824cee8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/receiver.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/receiver.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m3.5 21.5h57v19h-57z" style="fill:#e7ebf4"/>
   <path d="m60 22v18h-56v-18h56m1-1h-1-56-1v1 18 1h1 56 1v-1-18-1z" style="fill:#c4c6cc"/>
   <path d="m10 25h42v5h-42z"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/recorder.png b/bundles/org.openhab.ui.iconset.classic/icons/recorder.png
new file mode 100644
index 0000000000..c1bbba7f21
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/recorder.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/recorder.svg b/bundles/org.openhab.ui.iconset.classic/icons/recorder.svg
new file mode 100644
index 0000000000..c8f05303b6
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/recorder.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="20" x2="44">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="25.5" x2="38.5">
+      <stop style="stop-color:#282828"/>
+      <stop offset=".5" style="stop-color:#505050"/>
+      <stop offset="1" style="stop-color:#282828"/>
+    </linearGradient>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="35" x2="0" y2="57">
+      <stop style="stop-color:#64646e"/>
+      <stop offset="1" style="stop-color:#82828c;stop-opacity:0"/>
+    </linearGradient>
+  </defs>
+  <path d="m32 44.5c-3.6 0-6.5-2.9-6.5-6.5v-22c0-3.6 2.9-6.5 6.5-6.5s6.5 2.9 6.5 6.5v22c0 3.6-2.9 6.5-6.5 6.5" style="fill:url(#1)"/>
+  <path d="m32 10c3.3 0 6 2.7 6 6v22c0 3.3-2.7 6-6 6-3.3 0-6-2.7-6-6v-22c0-3.3 2.7-6 6-6m0-1c-3.9 0-7 3.2-7 7v22c0 3.8 3.1 7 7 7 3.8 0 7-3.2 7-7v-22c0-3.8-3.2-7-7-7z" style="fill:#1a171b"/>
+  <g style="fill:url(#0)">
+    <path d="m20 57h24v2h-24z"/>
+    <path d="m41 35v3c0 5-4 9-9 9s-9-4-9-9v-3h-3v3c0 5.9 4.3 10.9 10 11.8v7.2h4v-7.2c5.7-1 10-5.9 10-11.8v-3h-3"/>
+  </g>
+  <path d="m43 36v2c0 5.4-3.9 9.9-9.2 10.8l-.8.2v.8 6.2h-2v-6.2-.8l-.8-.1c-5.3-1-9.2-5.5-9.2-10.9v-2h1v2c0 5.5 4.5 10 10 10s10-4.5 10-10v-2h1m1-1h-3v3c0 5-4 9-9 9s-9-4-9-9v-3h-3v3c0 5.9 4.3 10.9 10 11.8v7.2h4v-7.2c5.7-1 10-5.9 10-11.8v-3z" style="fill:url(#2)"/>
+  <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b">
+    <path d="m25 15.5h14"/>
+    <path d="m25 19.5h14"/>
+    <path d="m25 23.5h14"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/returnpipe.svg b/bundles/org.openhab.ui.iconset.classic/icons/returnpipe.svg
index 3bf624e921..c9fe853db2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/returnpipe.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/returnpipe.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 60.29c-.4 0-.78-.16-1.06-.44l-27.16-28.78c-.53-.53-.52-1.2-.33-1.65.19-.45.65-.93 1.39-.93h9.16c1.38 0 2.5-1.12 2.5-2.5v-19.99c0-.83.67-1.5 1.5-1.5h28c.83 0 1.5.67 1.5 1.5v20c0 1.38 1.12 2.5 2.5 2.5h9.17c.74 0 1.2.48 1.39.93.19.45.2 1.11-.33 1.63l-27.18 28.8c-.27.28-.65.43-1.05.43" style="fill:#36aeff"/>
   <path d="m46 5c.55 0 1 .45 1 1v20c0 1.65 1.35 3 3 3h9.17c.62 0 .86.47.92.62.06.14.22.65-.24 1.11l-27.14 28.77c-.19.19-.44.29-.71.29s-.52-.1-.69-.27l-27.19-28.81c-.44-.44-.28-.94-.22-1.09.06-.15.31-.62.93-.62h9.17c1.65 0 3-1.35 3-3v-20c0-.55.45-1 1-1h28m0-1h-28c-1.1 0-2 .9-2 2v20c0 1.1-.9 2-2 2h-9.17c-1.78 0-2.67 2.15-1.41 3.41l27.17 28.79c.39.39.9.59 1.41.59s1.02-.2 1.41-.59l27.17-28.79c1.26-1.26.37-3.41-1.41-3.41h-9.17c-1.1 0-2-.9-2-2v-20c0-1.1-.9-2-2-2z" style="fill:#2b8ed8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rgb.svg b/bundles/org.openhab.ui.iconset.classic/icons/rgb.svg
index c3d88ea0f8..50cd849932 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rgb.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rgb.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 29c-2.8 2.51-4.82 5.88-5.62 9.7 1.77.58 3.65.91 5.62.91s3.85-.33 5.62-.91c-.8-3.82-2.82-7.18-5.62-9.7" style="fill:#fff"/>
   <path d="m32 39.61c-1.96 0-3.84-.32-5.61-.9-.25 1.18-.39 2.42-.39 3.68 0 5.32 2.33 10.09 6 13.39 3.67-3.3 6-8.07 6-13.39 0-1.27-.14-2.5-.39-3.69-1.77.58-3.65.91-5.61.91" style="fill:#f0f"/>
   <path d="m26 42.39c0-1.27.13-2.5.38-3.69-6.05-1.99-10.67-7.09-11.99-13.41-7.19 2.36-12.39 9.12-12.39 17.1 0 9.94 8.06 18 18 18 4.62 0 8.81-1.75 12-4.61-3.67-3.29-6-8.06-6-13.39" style="fill:#f00"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-0.svg
index b4887e29a2..d22be37ed8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-10.svg
index c6bbac0247..cd808de5b0 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-100.svg
index 84df6318c4..b8dfa323a9 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-20.svg
index c92c95351f..f05db0f68d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-30.svg
index 549d4d9dd3..ecaccb3273 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-40.svg
index 38afd32168..567a5bc079 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-50.svg
index cc2eafcc0a..517b70167a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-60.svg
index 9f68678a10..9a09003056 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-70.svg
index ddf8599141..78b1302694 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-80.svg
index 5c98dd7786..63c7dace87 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-90.svg
index 316bb6bb8b..fdeb17174b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter.svg b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter.svg
index ddf8599141..78b1302694 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/rollershutter.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/rollershutter.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
   <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
   <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/settings.svg b/bundles/org.openhab.ui.iconset.classic/icons/settings.svg
index 28c658fffc..7269223a54 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/settings.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/settings.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m29.97 59.5c-.91 0-1.65-.74-1.65-1.65l-.01-2.58c-.01-1.41-1.07-2.84-2.42-3.26l-3.58-1.45c-.39-.21-.92-.34-1.48-.34-.95 0-1.87.36-2.47.97l-1.83 1.84c-.31.31-.73.49-1.17.49-.44 0-.85-.17-1.16-.48l-3.07-3.03c-.64-.64-.65-1.69-.01-2.34l1.82-1.84c.99-.98 1.24-2.79.57-4.02l-1.48-3.55c-.41-1.3-1.84-2.35-3.25-2.35l-2.59.01c-.92 0-1.66-.74-1.66-1.65l-.03-4.3c0-.91.73-1.66 1.65-1.66l2.59-.01c1.41-.01 2.84-1.07 3.26-2.42l1.45-3.58c.65-1.2.38-2.96-.63-3.96l-1.83-1.82c-.31-.31-.49-.73-.49-1.17 0-.44.17-.86.48-1.17l3.03-3.06c.31-.31.73-.49 1.17-.49.44 0 .85.17 1.16.48l1.85 1.82c.6.59 1.51.95 2.45.95.57 0 1.11-.13 1.56-.37l3.55-1.48c1.31-.41 2.36-1.85 2.35-3.27l-.01-2.58c0-.91.74-1.66 1.65-1.66l4.31-.02c.92 0 1.66.74 1.66 1.65l.01 2.58c.01 1.39 1.09 2.85 2.42 3.26l3.56 1.45c.4.21.93.34 1.48.34.95 0 1.88-.36 2.48-.97l1.83-1.84c.31-.31.73-.49 1.17-.49.44 0 .85.17 1.16.48l3.07 3.03c.65.64.65 1.69.01 2.34l-1.83 1.84c-.99 1.01-1.24 2.77-.57 4.01l1.48 3.55c.41 1.3 1.85 2.35 3.25 2.35l2.59-.01c.92 0 1.66.74 1.66 1.64l.02 4.31c0 .44-.17.86-.48 1.17-.31.31-.73.49-1.17.49l-2.58.01c-1.39.01-2.85 1.09-3.26 2.42l-1.45 3.57c-.63 1.19-.36 2.99.63 3.96l1.85 1.82c.65.64.65 1.69.01 2.34l-3.04 3.06c-.31.31-.73.49-1.17.49-.44 0-.85-.17-1.16-.48l-1.84-1.82c-.6-.59-1.52-.94-2.45-.94-.57 0-1.11.13-1.56.38l-3.56 1.48c-1.31.42-2.36 1.86-2.35 3.27l.01 2.58c0 .44-.17.85-.48 1.17-.31.31-.73.49-1.17.49l-4.31.02m1.99-38.77c-6.21.03-11.24 5.11-11.22 11.32.03 6.18 5.08 11.21 11.27 11.21 6.27-.03 11.3-5.11 11.27-11.32-.03-6.18-5.08-11.21-11.26-11.21h-.06" style="fill:#8b96ac"/>
   <path d="m34.03 4v1c.63 0 1.15.52 1.16 1.15l.01 2.58c.01 1.61 1.2 3.23 2.73 3.72l3.53 1.43c.5.26 1.1.39 1.71.39 1.09 0 2.15-.42 2.83-1.12l1.83-1.84c.22-.22.51-.34.82-.34.31 0 .59.12.81.33l3.07 3.03c.45.45.45 1.18.01 1.63l-1.83 1.84c-1.12 1.14-1.42 3.13-.68 4.55l1.47 3.52c.51 1.52 2.13 2.7 3.75 2.7l2.59-.01c.63 0 1.15.51 1.15 1.15l.01 4.32c0 .31-.12.6-.34.82-.22.22-.51.34-.81.34l-2.58.01c-1.6.01-3.23 1.2-3.72 2.73l-1.43 3.53c-.73 1.43-.41 3.42.73 4.55l1.84 1.82c.45.45.46 1.18.01 1.64l-3.04 3.06c-.22.22-.51.34-.82.34-.31 0-.6-.12-.81-.33l-1.84-1.83c-.69-.68-1.74-1.09-2.8-1.09-.63 0-1.24.14-1.75.41l-3.52 1.47c-1.52.51-2.7 2.14-2.69 3.74l.01 2.58c0 .3-.12.59-.34.81-.22.22-.51.34-.81.34l-4.32.03c-.63 0-1.15-.51-1.16-1.15l-.01-2.58c-.01-1.6-1.2-3.23-2.73-3.72l-3.54-1.43c-.5-.26-1.09-.4-1.71-.4-1.08 0-2.14.42-2.83 1.11l-1.83 1.84c-.22.22-.51.34-.82.34-.31 0-.59-.12-.81-.33l-3.06-3.03c-.45-.45-.45-1.18-.01-1.64l1.82-1.84c1.14-1.14 1.44-3.13.69-4.56l-1.47-3.52c-.5-1.52-2.13-2.7-3.74-2.7l-2.59.01c-.63 0-1.15-.52-1.15-1.15l-.02-4.28c0-.64.51-1.15 1.15-1.16l2.59-.01c1.6-.01 3.22-1.2 3.72-2.73l1.43-3.53c.73-1.43.42-3.42-.73-4.55l-1.84-1.83c-.22-.22-.34-.5-.34-.81 0-.31.12-.6.33-.82l3.03-3.06c.22-.22.5-.34.81-.34.31 0 .59.12.81.33l1.85 1.82c.69.68 1.74 1.09 2.8 1.09.63 0 1.23-.14 1.75-.41l3.52-1.46c1.52-.5 2.7-2.14 2.69-3.75l-.01-2.58c0-.31.12-.59.34-.82.22-.22.51-.34.81-.34l4.32-.01v-1m-2.02 39.76h.06c6.49-.03 11.74-5.33 11.71-11.82-.03-6.46-5.31-11.71-11.76-11.71h-.06c-3.14.01-6.1 1.25-8.31 3.48-2.21 2.23-3.42 5.19-3.41 8.34.03 6.46 5.31 11.71 11.77 11.71m2.02-39.76c0 0-.01 0-.01 0l-4.31.02c-1.18.01-2.14.98-2.14 2.17l.01 2.58c.01 1.19-.91 2.45-2.04 2.8l-3.6 1.5c-.39.21-.85.31-1.32.31-.78 0-1.57-.28-2.1-.8l-1.85-1.82c-.42-.41-.97-.62-1.51-.62-.55 0-1.11.21-1.53.64l-3.03 3.06c-.84.84-.83 2.21.01 3.05l1.83 1.82c.84.83 1.08 2.37.52 3.42l-1.46 3.62c-.35 1.13-1.6 2.06-2.78 2.07l-2.59.01c-1.17-.01-2.14.96-2.13 2.15l.02 4.31c.01 1.18.98 2.15 2.15 2.15 0 0 .01 0 .01 0l2.59-.01c0 0 0 0 .01 0 1.18 0 2.44.92 2.79 2.04l1.5 3.6c.57 1.04.35 2.59-.49 3.43l-1.82 1.84c-.83.84-.83 2.21.01 3.05l3.06 3.03c.42.41.96.62 1.51.62.55 0 1.11-.21 1.53-.63l1.83-1.84c.52-.53 1.33-.82 2.12-.82.46 0 .91.1 1.29.3l3.62 1.47c1.13.35 2.06 1.6 2.07 2.78l.01 2.58c.01 1.18.98 2.14 2.16 2.14 0 0 .01 0 .01 0l4.31-.02c1.19-.01 2.15-.98 2.15-2.16l-.01-2.58c-.01-1.18.92-2.44 2.04-2.8l3.6-1.5c.39-.21.85-.32 1.32-.32.78 0 1.58.28 2.1.8l1.84 1.83c.42.41.97.62 1.51.62.55 0 1.11-.21 1.53-.63l3.04-3.06c.83-.84.83-2.21-.01-3.05l-1.85-1.82c-.84-.83-1.07-2.37-.52-3.42l1.47-3.61c.35-1.13 1.61-2.06 2.79-2.07l2.58-.01c1.19-.01 2.15-.98 2.14-2.16l-.02-4.31c-.01-1.18-.97-2.14-2.15-2.14 0 0-.01 0-.01 0l-2.58.01c0 0-.01 0-.01 0-1.18 0-2.44-.92-2.79-2.04l-1.5-3.6c-.56-1.04-.34-2.58.49-3.42l1.83-1.84c.83-.84.83-2.22-.01-3.05l-3.07-3.03c-.42-.41-.97-.62-1.51-.62-.55 0-1.11.21-1.53.64l-1.83 1.84c-.52.53-1.33.82-2.12.82-.46 0-.91-.1-1.29-.3l-3.61-1.46c-1.13-.34-2.06-1.6-2.07-2.78l-.01-2.58c-.04-1.23-1.01-2.2-2.19-2.2m-2.02 38.76c-5.93 0-10.74-4.78-10.77-10.71-.03-5.95 4.77-10.79 10.72-10.82.02 0 .03 0 .05 0 5.92 0 10.74 4.79 10.76 10.71.03 5.95-4.77 10.79-10.71 10.82-.02 0-.04 0-.05 0" style="fill:#676b72"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-0.svg
index 8729c519ab..1c4006eff2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m18 60.5c-4.69 0-8.5-3.81-8.5-8.5v-34c0-4.52 3.54-8.23 8-8.49v-4.01h29v4.01c4.46.26 8 3.97 8 8.49v34c0 4.69-3.81 8.5-8.5 8.5h-28" style="fill:#f0f0f0"/>
   <path d="m46 6v4c4.4 0 8 3.6 8 8v34c0 4.4-3.6 8-8 8h-28c-4.4 0-8-3.6-8-8v-34c0-4.4 3.6-8 8-8v-4h28m1-1h-1-28-1v1 3.06c-4.49.5-8 4.32-8 8.94v34c0 4.96 4.04 9 9 9h28c4.96 0 9-4.04 9-9v-34c0-4.62-3.51-8.45-8-8.94v-3.06-1z" style="fill:#c8c8c8"/>
   <path d="m15 7.5c-.83 0-1.5-.67-1.5-1.5v-1c0-.83.67-1.5 1.5-1.5h34c.83 0 1.5.67 1.5 1.5v1c0 .83-.67 1.5-1.5 1.5h-34" style="fill:#f0f0f0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-10.svg
index 94d1e8eebd..b756d0ab90 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-100.svg
index 3b3b74753f..d6dcffd9a2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-20.svg
index 828dbdef27..1e82a22d7b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-30.svg
index e9b35e9b52..d6071780b3 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-40.svg
index 17c435e71a..bf4ceb8f38 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-50.svg
index 0ad2e89501..e5a7ad6550 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-60.svg
index e6b37b1b50..5e6850b84c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-70.svg
index b1a4c9551c..0f0901bcc1 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-80.svg
index 107f882ad5..836d8326bd 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-90.svg
index 4097f4de2d..491bbfd305 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sewerage.svg b/bundles/org.openhab.ui.iconset.classic/icons/sewerage.svg
index d2bfee9956..a41d5f526f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sewerage.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sewerage.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <path id="0" d="m46 10v-4h-28v4c-4.4 0-8 3.6-8 8v34c0 4.4 3.6 8 8 8h28c4.4 0 8-3.6 8-8v-34c0-4.4-3.6-8-8-8"/>
     <clipPath id="1">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/shield-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/shield-0.svg
index 5ac0b34747..b270350922 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/shield-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/shield-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="opacity:.5">
     <path d="m31.7 62.4c-15.38-11.55-24.2-29.19-24.2-48.4 0-.25.01-.5.02-.75.01-.17.02-.91.02-.91l.39-.08c8.74-1.79 16.73-5.37 23.77-10.66l.3-.23.3.23c7.04 5.29 15.03 8.87 23.76 10.65l.39.08c0 0 .02.74.02.91.01.25.02.5.02.75 0 19.21-8.82 36.85-24.2 48.4l-.29.23-.3-.22" style="fill:#fff"/>
     <path d="m32 2c6.96 5.23 15.12 8.94 23.96 10.74.01.42.04.84.04 1.26 0 19.63-9.43 37.05-24 48-14.57-10.95-24-28.37-24-48 0-.42.03-.84.04-1.26 8.84-1.8 17-5.51 23.96-10.74m0-1.25l-.6.45c-6.98 5.24-14.9 8.79-23.56 10.56l-.78.16-.02.8c0 .17-.01.33-.02.5-.01.26-.02.52-.02.78 0 19.37 8.89 37.15 24.4 48.8l.6.45.6-.45c15.51-11.65 24.4-29.44 24.4-48.8 0-.26-.01-.52-.02-.78-.01-.17-.01-.33-.02-.5l-.02-.8-.78-.16c-8.66-1.77-16.58-5.32-23.56-10.56l-.6-.45z" style="fill:#c8c8c8"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/shield-1.svg b/bundles/org.openhab.ui.iconset.classic/icons/shield-1.svg
index d0fdf61842..940afd8396 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/shield-1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/shield-1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="opacity:.5">
     <path d="m31.7 62.4c-15.38-11.55-24.2-29.19-24.2-48.4 0-.25.01-.5.02-.75.01-.17.02-.91.02-.91l.39-.08c8.74-1.79 16.73-5.37 23.77-10.66l.3-.23.3.23c7.04 5.29 15.03 8.87 23.76 10.65l.39.08c0 0 .02.74.02.91.01.25.02.5.02.75 0 19.21-8.82 36.85-24.2 48.4l-.29.23-.3-.22" style="fill:#fff"/>
     <path d="m32 2c6.96 5.23 15.12 8.94 23.96 10.74.01.42.04.84.04 1.26 0 19.63-9.43 37.05-24 48-14.57-10.95-24-28.37-24-48 0-.42.03-.84.04-1.26 8.84-1.8 17-5.51 23.96-10.74m0-1.25l-.6.45c-6.98 5.24-14.9 8.79-23.56 10.56l-.78.16-.02.8c0 .17-.01.33-.02.5-.01.26-.02.52-.02.78 0 19.37 8.89 37.15 24.4 48.8l.6.45.6-.45c15.51-11.65 24.4-29.44 24.4-48.8 0-.26-.01-.52-.02-.78-.01-.17-.01-.33-.02-.5l-.02-.8-.78-.16c-8.66-1.77-16.58-5.32-23.56-10.56l-.6-.45z" style="fill:#c8c8c8"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/shield.svg b/bundles/org.openhab.ui.iconset.classic/icons/shield.svg
index f43f4bf707..69f277ae0f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/shield.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/shield.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="opacity:.5">
     <path d="m31.7 62.4c-15.38-11.55-24.2-29.19-24.2-48.4 0-.25.01-.5.02-.75.01-.17.02-.91.02-.91l.39-.08c8.74-1.79 16.73-5.37 23.77-10.66l.3-.23.3.23c7.04 5.29 15.03 8.87 23.76 10.65l.39.08c0 0 .02.74.02.91.01.25.02.5.02.75 0 19.21-8.82 36.85-24.2 48.4l-.29.23-.3-.22" style="fill:#fff"/>
     <path d="m32 2c6.96 5.23 15.12 8.94 23.96 10.74.01.42.04.84.04 1.26 0 19.63-9.43 37.05-24 48-14.57-10.95-24-28.37-24-48 0-.42.03-.84.04-1.26 8.84-1.8 17-5.51 23.96-10.74m0-1.25l-.6.45c-6.98 5.24-14.9 8.79-23.56 10.56l-.78.16-.02.8c0 .17-.01.33-.02.5-.01.26-.02.52-.02.78 0 19.37 8.89 37.15 24.4 48.8l.6.45.6-.45c15.51-11.65 24.4-29.44 24.4-48.8 0-.26-.01-.52-.02-.78-.01-.17-.01-.33-.02-.5l-.02-.8-.78-.16c-8.66-1.77-16.58-5.32-23.56-10.56l-.6-.45z" style="fill:#c8c8c8"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-0.png b/bundles/org.openhab.ui.iconset.classic/icons/signal-0.png
new file mode 100644
index 0000000000..f6b863b35a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/signal-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/signal-0.svg
new file mode 100644
index 0000000000..f99a0a6add
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/signal-0.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#dae1e4">
+    <path d="m6 44h10v12h-10z"/>
+    <path d="m20 32h10v24h-10z"/>
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-1.png b/bundles/org.openhab.ui.iconset.classic/icons/signal-1.png
new file mode 100644
index 0000000000..bad50efbbf
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/signal-1.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-1.svg b/bundles/org.openhab.ui.iconset.classic/icons/signal-1.svg
new file mode 100644
index 0000000000..8c39ed13e3
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/signal-1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <g style="fill:#dae1e4">
+    <path d="m20 32h10v24h-10z"/>
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-2.png b/bundles/org.openhab.ui.iconset.classic/icons/signal-2.png
new file mode 100644
index 0000000000..14d8bba37a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/signal-2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-2.svg b/bundles/org.openhab.ui.iconset.classic/icons/signal-2.svg
new file mode 100644
index 0000000000..7e453d965d
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/signal-2.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <g style="fill:#dae1e4">
+    <path d="m34 24h10v32h-10z"/>
+    <path d="m48 8h10v48h-10z"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-3.png b/bundles/org.openhab.ui.iconset.classic/icons/signal-3.png
new file mode 100644
index 0000000000..ac693442a7
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/signal-3.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-3.svg b/bundles/org.openhab.ui.iconset.classic/icons/signal-3.svg
new file mode 100644
index 0000000000..382e256e00
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/signal-3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <path d="m34.5 24.5h9v31h-9z" style="fill:#323232"/>
+  <path d="m43 25v30h-8v-30h8m1-1h-10v32h10v-32z"/>
+  <path d="m48 8h10v48h-10z" style="fill:#dae1e4"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-4.png b/bundles/org.openhab.ui.iconset.classic/icons/signal-4.png
new file mode 100644
index 0000000000..b224da1cce
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/signal-4.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/signal-4.svg b/bundles/org.openhab.ui.iconset.classic/icons/signal-4.svg
new file mode 100644
index 0000000000..7064682763
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/signal-4.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6.5 44.5h9v11h-9z" style="fill:#323232"/>
+  <path d="m15 45v10h-8v-10h8m1-1h-10v12h10v-12z"/>
+  <path d="m20.5 32.5h9v23h-9z" style="fill:#323232"/>
+  <path d="m29 33v22h-8v-22h8m1-1h-10v24h10v-24z"/>
+  <path d="m34.5 24.5h9v31h-9z" style="fill:#323232"/>
+  <path d="m43 25v30h-8v-30h8m1-1h-10v32h10v-32z"/>
+  <path d="m48.5 8.5h9v47h-9z" style="fill:#323232"/>
+  <path d="m57 9v46h-8v-46h8m1-1h-10v48h10v-48z"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren-off.png b/bundles/org.openhab.ui.iconset.classic/icons/siren-off.png
new file mode 100644
index 0000000000..cb41fd2c6c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/siren-off.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/siren-off.svg
new file mode 100644
index 0000000000..1c01c241ca
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/siren-off.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m6 58.5c-.83 0-1.5-.67-1.5-1.5v-4.15c0-.83.67-1.5 1.5-1.5h52c.83 0 1.5.67 1.5 1.5v4.15c0 .83-.67 1.5-1.5 1.5h-52" style="fill:#afafaf"/>
+  <path d="m58 51.86c.55 0 1 .45 1 1v4.14c0 .55-.45 1-1 1h-52c-.55 0-1-.45-1-1v-4.15c0-.55.45-1 1-1h52m0-.99h-52c-1.1 0-2 .9-2 2v4.14c0 1.1.9 2 2 2h52c1.1 0 2-.9 2-2v-4.15c0-1.1-.9-1.99-2-1.99z" style="fill:#787878"/>
+  <path d="m8.42 50.5l.06-.55c.41-3.83.75-7.97 1.08-11.99 1.25-15.24 2.43-29.63 7.3-31.43 5.26-1.95 14.12-2.03 15.11-2.03 1.04 0 9.91.08 15.17 2.03 4.87 1.81 6.05 16.2 7.3 31.43.33 4.01.67 8.16 1.08 11.99l.06.55h-47.16" style="fill:#c6c6c6"/>
+  <path d="m32.02 5c.51 0 9.68.04 14.95 2 5.83 2.17 6.17 25.33 8.05 43h-8.78-14.22-.05-14.21-8.78c1.88-17.67 2.22-40.84 8.05-43 5.27-1.96 14.45-2 14.95-2 0 0 .02 0 .02 0s.02 0 .02 0m0-1v1l-.02-1c-1.03 0-9.97.07-15.32 2.06-5.17 1.92-6.3 15.8-7.62 31.86-.33 4.01-.67 8.15-1.07 11.97l-.13 1.11h1.11 8.78 14.22 14.27 8.78 1.11l-.12-1.11c-.41-3.82-.75-7.96-1.07-11.97-1.32-16.07-2.45-29.94-7.62-31.86-5.36-1.99-14.29-2.06-15.3-2.06z" style="fill:#999"/>
+  <path d="m32.01 6.99c0 0-10.38-.94-14.01 2.01-4.92 4-6.08 22.75-7 39h21.01v-41.01" style="fill:#f2f2f2"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren-on.png b/bundles/org.openhab.ui.iconset.classic/icons/siren-on.png
index 2fccc6916f..f4ac892700 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/siren-on.png and b/bundles/org.openhab.ui.iconset.classic/icons/siren-on.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/siren-on.svg
index 1e1b40e9c6..ca0ea0ba59 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/siren-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/siren-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m6 58.5c-.83 0-1.5-.67-1.5-1.5v-4.15c0-.83.67-1.5 1.5-1.5h52c.83 0 1.5.67 1.5 1.5v4.15c0 .83-.67 1.5-1.5 1.5h-52" style="fill:#afafaf"/>
   <path d="m58 51.86c.55 0 1 .45 1 1v4.14c0 .55-.45 1-1 1h-52c-.55 0-1-.45-1-1v-4.15c0-.55.45-1 1-1h52m0-.99h-52c-1.1 0-2 .9-2 2v4.14c0 1.1.9 2 2 2h52c1.1 0 2-.9 2-2v-4.15c0-1.1-.9-1.99-2-1.99z" style="fill:#787878"/>
   <path d="m8.42 50.5l.06-.55c.41-3.83.75-7.97 1.08-11.99 1.25-15.24 2.43-29.63 7.3-31.43 5.26-1.95 14.12-2.03 15.11-2.03 1.04 0 9.91.08 15.18 2.03 4.87 1.81 6.05 16.2 7.3 31.43.33 4.01.67 8.16 1.08 11.99l.06.55h-47.17" style="fill:#ef4d4d"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren.png b/bundles/org.openhab.ui.iconset.classic/icons/siren.png
index cb41fd2c6c..f4ac892700 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/siren.png and b/bundles/org.openhab.ui.iconset.classic/icons/siren.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/siren.svg b/bundles/org.openhab.ui.iconset.classic/icons/siren.svg
index 47e91caeb4..ca0ea0ba59 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/siren.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/siren.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m6 58.5c-.83 0-1.5-.67-1.5-1.5v-4.15c0-.83.67-1.5 1.5-1.5h52c.83 0 1.5.67 1.5 1.5v4.15c0 .83-.67 1.5-1.5 1.5h-52" style="fill:#afafaf"/>
   <path d="m58 51.86c.55 0 1 .45 1 1v4.14c0 .55-.45 1-1 1h-52c-.55 0-1-.45-1-1v-4.15c0-.55.45-1 1-1h52m0-.99h-52c-1.1 0-2 .9-2 2v4.14c0 1.1.9 2 2 2h52c1.1 0 2-.9 2-2v-4.15c0-1.1-.9-1.99-2-1.99z" style="fill:#787878"/>
-  <path d="m8.42 50.5l.06-.55c.41-3.83.75-7.97 1.08-11.99 1.25-15.24 2.43-29.63 7.3-31.43 5.26-1.95 14.12-2.03 15.11-2.03 1.04 0 9.91.08 15.17 2.03 4.87 1.81 6.05 16.2 7.3 31.43.33 4.01.67 8.16 1.08 11.99l.06.55h-47.16" style="fill:#c6c6c6"/>
-  <path d="m32.02 5c.51 0 9.68.04 14.95 2 5.83 2.17 6.17 25.33 8.05 43h-8.78-14.22-.05-14.21-8.78c1.88-17.67 2.22-40.84 8.05-43 5.27-1.96 14.45-2 14.95-2 0 0 .02 0 .02 0s.02 0 .02 0m0-1v1l-.02-1c-1.03 0-9.97.07-15.32 2.06-5.17 1.92-6.3 15.8-7.62 31.86-.33 4.01-.67 8.15-1.07 11.97l-.13 1.11h1.11 8.78 14.22 14.27 8.78 1.11l-.12-1.11c-.41-3.82-.75-7.96-1.07-11.97-1.32-16.07-2.45-29.94-7.62-31.86-5.36-1.99-14.29-2.06-15.3-2.06z" style="fill:#999"/>
-  <path d="m32.01 6.99c0 0-10.38-.94-14.01 2.01-4.92 4-6.08 22.75-7 39h21.01v-41.01" style="fill:#f2f2f2"/>
+  <path d="m8.42 50.5l.06-.55c.41-3.83.75-7.97 1.08-11.99 1.25-15.24 2.43-29.63 7.3-31.43 5.26-1.95 14.12-2.03 15.11-2.03 1.04 0 9.91.08 15.18 2.03 4.87 1.81 6.05 16.2 7.3 31.43.33 4.01.67 8.16 1.08 11.99l.06.55h-47.17" style="fill:#ef4d4d"/>
+  <path d="m32.02 5c.51 0 9.68.04 14.95 2 5.83 2.17 6.17 25.33 8.05 43h-8.78-14.22-.05-14.21-8.78c1.88-17.67 2.22-40.84 8.05-43 5.27-1.96 14.45-2 14.95-2 0 0 .02 0 .02 0s.02 0 .02 0m0-1v1l-.02-1c-1.03 0-9.97.07-15.32 2.06-5.17 1.92-6.3 15.8-7.62 31.86-.33 4.01-.67 8.15-1.07 11.97l-.13 1.11h1.11 8.78 14.22 14.27 8.78 1.11l-.12-1.11c-.41-3.82-.75-7.96-1.07-11.97-1.32-16.07-2.45-29.94-7.62-31.86-5.36-1.99-14.29-2.06-15.3-2.06z" style="fill:#cc2929"/>
+  <path d="m32.01 6.99c0 0-10.38-.94-14.01 2.01-4.92 4-6.08 22.75-7 39h21.01v-41.01" style="fill:#ffce00"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-0.svg
index 9032f26cf2..3853ad06bb 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-10.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-10.svg
index 777d4b089e..101b5b2365 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-10.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-10.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-100.svg
index f680714387..a2797c506d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-20.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-20.svg
index bc71a69f0f..3c3ca481c0 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-20.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-20.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-30.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-30.svg
index 60f561b109..5625e61d92 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-30.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-30.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-40.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-40.svg
index 02001031ec..1bc4e909e8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-40.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-40.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-50.png b/bundles/org.openhab.ui.iconset.classic/icons/slider-50.png
index fe8b9acb58..c2bda42a1c 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/slider-50.png and b/bundles/org.openhab.ui.iconset.classic/icons/slider-50.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-50.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-50.svg
index a91e0ed17a..d0391a0dcc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-50.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-50.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-60.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-60.svg
index fc43052af1..49e35c04fc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-60.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-60.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-70.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-70.svg
index 82c4263cf1..2b348e730a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-70.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-70.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-80.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-80.svg
index 3026141786..8818b22a14 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-80.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-80.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider-90.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider-90.svg
index 2fad360d9c..3d7f919a0e 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider-90.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider-90.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/slider.svg b/bundles/org.openhab.ui.iconset.classic/icons/slider.svg
index f680714387..a2797c506d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/slider.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/slider.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#797878">
     <path d="m37.25 50h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
     <path d="m37.25 53h-10.5c-.55 0-1-.45-1-1 0-.55.45-1 1-1h10.5c.55 0 1 .45 1 1 0 .55-.45 1-1 1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/smiley.png b/bundles/org.openhab.ui.iconset.classic/icons/smiley.png
index e351717a79..a7cedf10e8 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/smiley.png and b/bundles/org.openhab.ui.iconset.classic/icons/smiley.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/smiley.svg b/bundles/org.openhab.ui.iconset.classic/icons/smiley.svg
index ea5a4450c2..9665431504 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/smiley.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/smiley.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <circle cx="32" cy="32" r="30" style="fill:#ffdc00"/>
   <path d="m51 32c0 10.49-8.51 19-19 19s-19-8.51-19-19" style="fill:none;stroke-miterlimit:10;stroke:#1a171b;stroke-width:4"/>
   <g style="fill:#1a171b">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/smoke.png b/bundles/org.openhab.ui.iconset.classic/icons/smoke.png
new file mode 100644
index 0000000000..f1f9e3cc55
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/smoke.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/smoke.svg b/bundles/org.openhab.ui.iconset.classic/icons/smoke.svg
new file mode 100644
index 0000000000..8a8970b1de
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/smoke.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <g style="fill:#c8c8c8">
+    <path d="m28.1 33.1c-.8 7.6 8 21.5 8 21.5s-3.3-13.6-1-23.1c2.4-9.5-5.7-22.4-5.7-22.4 2.3 6.8-.5 16.4-1.3 24"/>
+    <path d="m48 6.6c2.2 6.8-.6 16.4-1.4 24-.8 7.6 8 21.5 8 21.5s-3.3-13.6-1-23.1c2.4-9.5-5.6-22.4-5.6-22.4"/>
+    <path d="m9.6 35.7c-.8 7.6 8 21.5 8 21.5s-3.3-13.6-1-23.1-5.6-22.4-5.6-22.4c2.3 6.7-.6 16.4-1.4 24"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-au.png b/bundles/org.openhab.ui.iconset.classic/icons/socket-au.png
deleted file mode 100644
index 2fb6d74e3a..0000000000
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/socket-au.png and /dev/null differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-au.svg b/bundles/org.openhab.ui.iconset.classic/icons/socket-au.svg
deleted file mode 100644
index c0a98ff8e3..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-au.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#F5F5F5" d="M32,59.5C16.8,59.5,4.5,47.2,4.5,32S16.8,4.5,32,4.5S59.5,16.8,59.5,32S47.2,59.5,32,59.5z"/>
-	<g>
-		<path fill="#C8C8C8" d="M32,5c14.9,0,27,12.1,27,27S46.9,59,32,59S5,46.9,5,32S17.1,5,32,5 M32,4C16.6,4,4,16.6,4,32    s12.6,28,28,28s28-12.6,28-28S47.4,4,32,4L32,4z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="41" y="16" transform="matrix(-0.8851 0.4655 -0.4655 -0.8851 92.2406 21.2231)" fill="#212121" width="5" height="12"/>
-		<g>
-			<path fill="#DCDCDC" d="M42.7,16.2l5.1,9.7l-3.5,1.9l-5.1-9.7L42.7,16.2 M43.1,14.9l-0.9,0.5l-3.5,1.9l-0.9,0.5l0.5,0.9l5.1,9.7     l0.5,0.9l0.9-0.5l3.5-1.9l0.9-0.5l-0.5-0.9l-5.1-9.7L43.1,14.9L43.1,14.9z"/>
-		</g>
-	</g>
-	<g>
-		
-			<rect x="14.5" y="19.5" transform="matrix(-0.4655 0.8851 -0.8851 -0.4655 49.5138 14.0974)" fill="#212121" width="12" height="5"/>
-		<g>
-			<path fill="#DCDCDC" d="M21.3,16.2l3.5,1.9l-5.1,9.7l-3.5-1.9L21.3,16.2 M20.9,14.9l-0.5,0.9l-5.1,9.7l-0.5,0.9l0.9,0.5l3.5,1.9     l0.9,0.5l0.5-0.9l5.1-9.7l0.5-0.9l-0.9-0.5l-3.5-1.9L20.9,14.9L20.9,14.9z"/>
-		</g>
-	</g>
-	<g>
-		<rect x="29.5" y="37.5" fill="#212121" width="5" height="13"/>
-		<g>
-			<path fill="#DCDCDC" d="M34,38v12h-4V38H34 M35,37h-1h-4h-1v1v12v1h1h4h1v-1V38V37L35,37z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.png b/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.png
deleted file mode 100644
index c5f58de353..0000000000
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.png and /dev/null differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.svg b/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.svg
deleted file mode 100644
index 1f218468b2..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-eu.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#EBEBEB" d="M32,59.5C16.8,59.5,4.5,47.2,4.5,32S16.8,4.5,32,4.5S59.5,16.8,59.5,32S47.2,59.5,32,59.5z"/>
-		<path fill="#C8C8C8" d="M32,5c14.9,0,27,12.1,27,27S46.9,59,32,59S5,46.9,5,32S17.1,5,32,5 M32,4C16.6,4,4,16.6,4,32    s12.6,28,28,28s28-12.6,28-28S47.4,4,32,4L32,4z"/>
-	</g>
-	<circle fill="#212121" stroke="#DCDCDC" stroke-miterlimit="10" cx="22" cy="32" r="3.5"/>
-	<circle fill="#212121" stroke="#DCDCDC" stroke-miterlimit="10" cx="42" cy="32" r="3.5"/>
-	<g>
-		<defs>
-			<circle id="SVGID_1_" cx="32" cy="32" r="27"/>
-		</defs>
-		<clipPath id="SVGID_2_">
-			<use xlink:href="#SVGID_1_" overflow="visible"/>
-		</clipPath>
-		<rect x="30" y="5" clip-path="url(#SVGID_2_)" fill="#8C8C8C" width="4" height="4.9"/>
-		<rect x="30" y="54" clip-path="url(#SVGID_2_)" fill="#8C8C8C" width="4" height="4.9"/>
-		<g clip-path="url(#SVGID_2_)">
-			<g>
-				<rect x="-0.5" y="34.5" fill="#F5F5F5" width="11" height="29"/>
-				<path fill="#C8C8C8" d="M10,35v28H0V35H10 M11,34h-1H0h-1v1v28v1h1h10h1v-1V35V34L11,34z"/>
-			</g>
-			<g>
-				<rect x="-0.5" y="0.5" fill="#F5F5F5" width="11" height="29"/>
-				<path fill="#C8C8C8" d="M10,1v28H0V1H10 M11,0h-1H0h-1v1v28v1h1h10h1v-1V1V0L11,0z"/>
-			</g>
-		</g>
-		<g clip-path="url(#SVGID_2_)">
-			<g>
-				<rect x="53.5" y="34.5" fill="#F5F5F5" width="11" height="29"/>
-				<path fill="#C8C8C8" d="M64,35v28H54V35H64 M65,34h-1H54h-1v1v28v1h1h10h1v-1V35V34L65,34z"/>
-			</g>
-			<g>
-				<rect x="53.5" y="0.5" fill="#F5F5F5" width="11" height="29"/>
-				<path fill="#C8C8C8" d="M64,1v28H54V1H64 M65,0h-1H54h-1v1v28v1h1h10h1v-1V1V0L65,0z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-uk.svg b/bundles/org.openhab.ui.iconset.classic/icons/socket-uk.svg
deleted file mode 100644
index 83f8e2b13d..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-uk.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<rect x="4.5" y="4.5" fill="#F5F5F5" width="55" height="55"/>
-	<g>
-		<path fill="#C8C8C8" d="M59,5v54H5V5H59 M60,4h-1H5H4v1v54v1h1h54h1v-1V5V4L60,4z"/>
-	</g>
-</g>
-<g>
-	<rect x="13.5" y="42.5" fill="#212121" width="10" height="6"/>
-	<g>
-		<path fill="#DCDCDC" d="M23,43v5h-9v-5H23 M24,42h-1h-9h-1v1v5v1h1h9h1v-1v-5V42L24,42z"/>
-	</g>
-</g>
-<g>
-	<rect x="40.5" y="42.5" fill="#212121" width="10" height="6"/>
-	<g>
-		<path fill="#DCDCDC" d="M50,43v5h-9v-5H50 M51,42h-1h-9h-1v1v5v1h1h9h1v-1v-5V42L51,42z"/>
-	</g>
-</g>
-<g>
-	<rect x="29.5" y="12.5" fill="#212121" width="5" height="11"/>
-	<g>
-		<path fill="#DCDCDC" d="M34,13v10h-4V13H34 M35,12h-1h-4h-1v1v10v1h1h4h1v-1V13V12L35,12z"/>
-	</g>
-</g>
-</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/socket-us.svg b/bundles/org.openhab.ui.iconset.classic/icons/socket-us.svg
deleted file mode 100644
index fb86e092e4..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/socket-us.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Ebene_1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<g>
-	<path fill="#F5F5F5" d="M15.9,53.5l-0.1-0.1c-7.1-5-11.3-13-11.3-21.4s4.2-16.4,11.3-21.4l0.1-0.1h32.1l0.1,0.1   c7.1,5,11.3,13,11.3,21.4s-4.2,16.4-11.3,21.4l-0.1,0.1H15.9z"/>
-	<path fill="#C8C8C8" d="M47.9,11C54.6,15.7,59,23.4,59,32c0,8.6-4.4,16.3-11.1,21H16.1C9.4,48.3,5,40.6,5,32   c0-8.6,4.4-16.3,11.1-21H47.9 M48.2,10h-0.3H16.1h-0.3l-0.3,0.2C8.3,15.3,4,23.4,4,32c0,8.6,4.3,16.7,11.5,21.8l0.3,0.2h0.3h31.8   h0.3l0.3-0.2C55.7,48.7,60,40.6,60,32c0-8.6-4.3-16.7-11.5-21.8L48.2,10L48.2,10z"/>
-</g>
-<g>
-	<rect x="19.5" y="19.5" fill="#212121" width="4" height="14"/>
-	<path fill="#DCDCDC" d="M23,20v13h-3V20H23 M24,19h-1h-3h-1v1v13v1h1h3h1v-1V20V19L24,19z"/>
-</g>
-<g>
-	<rect x="39.5" y="21.5" fill="#212121" width="4" height="11"/>
-	<path fill="#DCDCDC" d="M43,22v10h-3V22H43 M44,21h-1h-3h-1v1v10v1h1h3h1v-1V22V21L44,21z"/>
-</g>
-<g>
-	<path fill="#212121" d="M26.5,49.5v-5c0-2.8,2.2-5,5-5s5,2.2,5,5v5H26.5z"/>
-	<path fill="#DCDCDC" d="M31.5,40c2.5,0,4.5,2,4.5,4.5V49h-9v-4.5C27,42,29,40,31.5,40 M31.5,39c-3,0-5.5,2.5-5.5,5.5V49v1h1h9h1v-1   v-4.5C37,41.5,34.5,39,31.5,39L31.5,39z"/>
-</g>
-</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sofa.svg b/bundles/org.openhab.ui.iconset.classic/icons/sofa.svg
index fccd12db9d..d1ded16224 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sofa.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sofa.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="36" x2="0" y2="46">
       <stop style="stop-color:#c80000"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/softener.svg b/bundles/org.openhab.ui.iconset.classic/icons/softener.svg
index d003f5d1f1..8d718a0e65 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/softener.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/softener.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m30.5 25.5h3v9h-3z" style="fill:#ececed"/>
   <path d="m33 26v8h-2v-8h2m1-1h-1-2-1v1 8 1h1 2 1v-1-8-1z" style="fill:#9b9c9e"/>
   <path d="m14 56.5c-1.38 0-2.5-1.12-2.5-2.5v-20c0-1.38 1.12-2.5 2.5-2.5h36c1.38 0 2.5 1.12 2.5 2.5v20c0 1.38-1.12 2.5-2.5 2.5h-36" style="fill:#36aeff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/solarplant.png b/bundles/org.openhab.ui.iconset.classic/icons/solarplant.png
index b96719e84b..ac802f7c51 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/solarplant.png and b/bundles/org.openhab.ui.iconset.classic/icons/solarplant.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/solarplant.svg b/bundles/org.openhab.ui.iconset.classic/icons/solarplant.svg
index 94dbdb800e..88697196fc 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/solarplant.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/solarplant.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <radialGradient id="0" cx="16.3333" cy="15.1667" r="43.6679" gradientUnits="userSpaceOnUse">
       <stop style="stop-color:#6c9ac2"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.png
new file mode 100644
index 0000000000..00b7c73b4f
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.svg
similarity index 87%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-0.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.svg
index 265642e547..c4c6a8fd45 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-0.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33-.3 0-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46s.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62s1.05-.21 1.46-.62.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-100.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-100.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-100.png
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-100.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-100.svg
similarity index 97%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-100.svg
index 955087e926..46125af691 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-100.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33-.3 0-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62-.41.41-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46.41.42.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62.56 0 1.05-.21 1.46-.62s.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z"/>
   <path d="m37.18 39.26c-.43 0-.79-.15-1.11-.46-.31-.3-.46-.67-.46-1.11 0-.34.09-.61.27-.83.22-.27.5-.51.82-.7.38-.23.76-.49 1.13-.77.43-.31.79-.76 1.09-1.32.29-.57.44-1.26.44-2.08s-.15-1.51-.44-2.08c-.29-.56-.66-1.01-1.09-1.32-.38-.28-.76-.53-1.13-.77-.32-.2-.59-.43-.82-.7-.18-.22-.27-.49-.27-.83 0-.45.15-.81.46-1.11.32-.31.68-.46 1.11-.46.24 0 .44.04.58.11 1.45.56 2.59 1.51 3.44 2.83.86 1.33 1.3 2.79 1.3 4.32 0 1.53-.44 2.98-1.29 4.31-.85 1.32-2 2.27-3.41 2.83-.18.11-.38.14-.62.14" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-33.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-33.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-33.png
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-33.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-33.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-33.svg
similarity index 94%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-33.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-33.svg
index ffdbd9f914..b5a53de610 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume-33.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-33.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33s-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46s.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62.56 0 1.05-.21 1.46-.62.41-.41.62-.9.62-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.4-.42-.89-.62-1.45-.62z"/>
   <path d="m37.18 39.26c-.43 0-.79-.15-1.11-.46-.31-.3-.46-.67-.46-1.11 0-.34.09-.61.27-.83.22-.27.5-.51.82-.7.38-.23.76-.49 1.13-.77.43-.31.79-.76 1.09-1.32.29-.57.44-1.26.44-2.08s-.15-1.51-.44-2.08c-.29-.56-.66-1.01-1.09-1.32-.38-.28-.76-.53-1.13-.77-.32-.2-.59-.43-.82-.7-.18-.22-.27-.49-.27-.83 0-.45.15-.81.46-1.11.32-.31.68-.46 1.11-.46.24 0 .44.04.58.11 1.45.56 2.59 1.51 3.44 2.83.86 1.33 1.3 2.79 1.3 4.32 0 1.53-.44 2.98-1.29 4.31-.85 1.32-2 2.27-3.41 2.83-.18.11-.38.14-.62.14" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-66.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-66.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-66.png
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-66.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-66.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-66.svg
similarity index 96%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-66.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume-66.svg
index c5a70e6fc3..08fcbabf7d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume-66.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume-66.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33-.3 0-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46s.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62.56 0 1.05-.21 1.46-.62s.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z"/>
   <path d="m37.18 39.26c-.43 0-.79-.15-1.11-.46-.31-.3-.46-.67-.46-1.11 0-.34.09-.61.27-.83.22-.27.5-.51.82-.7.38-.23.76-.49 1.13-.77.43-.31.79-.76 1.09-1.32.29-.57.44-1.26.44-2.08s-.15-1.51-.44-2.08c-.29-.56-.66-1.01-1.09-1.32-.38-.28-.76-.53-1.13-.77-.32-.2-.59-.43-.82-.7-.18-.22-.27-.49-.27-.83 0-.45.15-.81.46-1.11.32-.31.68-.46 1.11-.46.24 0 .44.04.58.11 1.45.56 2.59 1.51 3.44 2.83.86 1.33 1.3 2.79 1.3 4.32 0 1.53-.44 2.98-1.29 4.31-.85 1.32-2 2.27-3.41 2.83-.18.11-.38.14-.62.14" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume.png
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-100.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume.svg
similarity index 97%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume-100.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume.svg
index 955087e926..46125af691 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume-100.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33-.3 0-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62-.41.41-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46.41.42.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62.56 0 1.05-.21 1.46-.62s.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z"/>
   <path d="m37.18 39.26c-.43 0-.79-.15-1.11-.46-.31-.3-.46-.67-.46-1.11 0-.34.09-.61.27-.83.22-.27.5-.51.82-.7.38-.23.76-.49 1.13-.77.43-.31.79-.76 1.09-1.32.29-.57.44-1.26.44-2.08s-.15-1.51-.44-2.08c-.29-.56-.66-1.01-1.09-1.32-.38-.28-.76-.53-1.13-.77-.32-.2-.59-.43-.82-.7-.18-.22-.27-.49-.27-.83 0-.45.15-.81.46-1.11.32-.31.68-.46 1.11-.46.24 0 .44.04.58.11 1.45.56 2.59 1.51 3.44 2.83.86 1.33 1.3 2.79 1.3 4.32 0 1.53-.44 2.98-1.29 4.31-.85 1.32-2 2.27-3.41 2.83-.18.11-.38.14-.62.14" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume_mute.png b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume_mute.png
similarity index 100%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume_mute.png
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume_mute.png
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume_mute.svg b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume_mute.svg
similarity index 91%
rename from bundles/org.openhab.ui.iconset.classic/icons/volume_mute.svg
rename to bundles/org.openhab.ui.iconset.classic/icons/soundvolume_mute.svg
index d1f89e851d..701785d156 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/volume_mute.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/soundvolume_mute.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47-.32-.32-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11.32-.32.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47c.32.32.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48" style="fill:#282828"/>
   <path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76-.23.23-.46.33-.76.33-.3 0-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46s.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62s1.05-.21 1.46-.62.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z"/>
   <path d="m47.05 34.12l-8.48 8.49-2.12-2.12 8.48-8.49-8.48-8.49 2.12-2.12 8.48 8.49 8.49-8.49 2.12 2.12-8.49 8.49 8.49 8.49-2.12 2.12z" style="fill:#282828"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/status.png b/bundles/org.openhab.ui.iconset.classic/icons/status.png
index 0dd0b2e227..fe4661d3e0 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/status.png and b/bundles/org.openhab.ui.iconset.classic/icons/status.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/status.svg b/bundles/org.openhab.ui.iconset.classic/icons/status.svg
index b4fbf85a5c..554924513d 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/status.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/status.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m14 44c0 0 2 2.83 2 5s2.33 10 11 10 16-10.42 16-22" style="fill:none;stroke-miterlimit:10;stroke:#000;stroke-width:2"/>
   <circle cx="11.5" cy="41.5" r="4.5" style="fill:#cececf"/>
   <path d="m38 35v1l5 5 5-5v-1c0 0-10.08 0-10 0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/suitcase.svg b/bundles/org.openhab.ui.iconset.classic/icons/suitcase.svg
index ffe19ed5d3..0f6014834c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/suitcase.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/suitcase.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="57" x2="0" y2="12">
       <stop style="stop-color:#a35c48"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sun.svg b/bundles/org.openhab.ui.iconset.classic/icons/sun.svg
index 54b8f785c0..391a7a31a6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sun.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sun.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <radialGradient id="0" cx="31.99981448" cy="31.99994737" r="30.99998789" gradientUnits="userSpaceOnUse">
       <stop offset=".8" style="stop-color:#f8f5e5;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sun_clouds.svg b/bundles/org.openhab.ui.iconset.classic/icons/sun_clouds.svg
index aa514f07e4..84d8de4b44 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sun_clouds.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sun_clouds.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <radialGradient id="0" cx="33" cy="30" r="25" gradientUnits="userSpaceOnUse">
       <stop offset=".8" style="stop-color:#f8f5e5;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sunrise.svg b/bundles/org.openhab.ui.iconset.classic/icons/sunrise.svg
index bd7d310cf6..7caff13a4c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sunrise.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sunrise.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="64" x2="0">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/sunset.svg b/bundles/org.openhab.ui.iconset.classic/icons/sunset.svg
index 984bc606ca..e238d1de68 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/sunset.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/sunset.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="0" x2="64">
       <stop style="stop-color:#fff;stop-opacity:0"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/switch-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/switch-off.svg
index f174f8c81d..714172c87b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/switch-off.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/switch-off.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="54.364" y1="9.636" x2="9.636" y2="54.364">
       <stop style="stop-color:#f8f5e5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/switch-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/switch-on.svg
index d04bb04e19..920b7bba5c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/switch-on.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/switch-on.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="54.364" y1="9.636" x2="9.636" y2="54.364">
       <stop style="stop-color:#f8f5e5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/switch.svg b/bundles/org.openhab.ui.iconset.classic/icons/switch.svg
index 8c03696ab6..7f87bf14b6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/switch.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/switch.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="54.364" y1="9.636" x2="9.636" y2="54.364">
       <stop style="stop-color:#f8f5e5"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/television-on.png b/bundles/org.openhab.ui.iconset.classic/icons/television-on.png
new file mode 100644
index 0000000000..fe2019a762
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/television-on.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/television-on.svg b/bundles/org.openhab.ui.iconset.classic/icons/television-on.svg
new file mode 100644
index 0000000000..dc5b049f57
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/television-on.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="30" x2="34">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="16" x2="48" xlink:href="#0"/>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="19.0048" y1="53.5083" x2="44.9952" y2="8.4917">
+      <stop style="stop-color:#2e7de5"/>
+      <stop offset="1" style="stop-color:#2eafff"/>
+    </linearGradient>
+  </defs>
+  <path d="m30 36h4v16h-4z" style="fill:url(#0)"/>
+  <path d="m16 52h32v2h-32z" style="fill:url(#1)"/>
+  <path d="m2 14h60v34h-60z" style="fill:#212121"/>
+  <path d="m6 16h52v30h-52z" style="fill:url(#2)"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/televison-off.png b/bundles/org.openhab.ui.iconset.classic/icons/televison-off.png
new file mode 100644
index 0000000000..15a1ff240c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/televison-off.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/televison-off.svg b/bundles/org.openhab.ui.iconset.classic/icons/televison-off.svg
new file mode 100644
index 0000000000..e8cc52c457
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/televison-off.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="30" x2="34">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="16" x2="48" xlink:href="#0"/>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="19.0048" y1="53.5083" x2="44.9952" y2="8.4917">
+      <stop style="stop-color:#505050"/>
+      <stop offset="1" style="stop-color:#787878"/>
+    </linearGradient>
+  </defs>
+  <path d="m30 36h4v16h-4z" style="fill:url(#0)"/>
+  <path d="m16 52h32v2h-32z" style="fill:url(#1)"/>
+  <path d="m2 14h60v34h-60z" style="fill:#212121"/>
+  <path d="m6 16h52v30h-52z" style="fill:url(#2)"/>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/temperature.svg b/bundles/org.openhab.ui.iconset.classic/icons/temperature.svg
index 83da7c4944..b6d434e2bf 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/temperature.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/temperature.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <circle cx="32" cy="6" r="6" style="fill:#dae1e4"/>
   <circle cx="32" cy="6" r="5" style="fill:#c4cacc"/>
   <path d="m26 6h12v50h-12z" style="fill:#dae1e4"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/temperature_cold.svg b/bundles/org.openhab.ui.iconset.classic/icons/temperature_cold.svg
index 87be13bc22..610f1c560b 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/temperature_cold.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/temperature_cold.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <circle cx="32" cy="6" r="6" style="fill:#dae1e4"/>
   <circle cx="32" cy="6" r="5" style="fill:#c4cacc"/>
   <path d="m26 6h12v50h-12z" style="fill:#dae1e4"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/temperature_hot.svg b/bundles/org.openhab.ui.iconset.classic/icons/temperature_hot.svg
index 305825c4e4..cae85bf4e2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/temperature_hot.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/temperature_hot.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <g style="fill:#dae1e4">
     <circle cx="32" cy="55" r="9"/>
     <circle cx="32" cy="6" r="6"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/terrace.svg b/bundles/org.openhab.ui.iconset.classic/icons/terrace.svg
index 03eeedf02f..2c9735e25a 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/terrace.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/terrace.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="31" x2="33">
       <stop style="stop-color:#82828c"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/text.svg b/bundles/org.openhab.ui.iconset.classic/icons/text.svg
index d85f018f7e..d8c1382439 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/text.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/text.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m9.4.4h45.2v63.2h-45.2z" style="fill:#fafafa"/>
   <path d="M54.2,0.8v62.5H9.8V0.8H54.2 M55,0H9v64h46V0L55,0z" style="fill:#828282"/>
   <path d="m15 13h34v1h-34z" style="fill:#505050"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/toilet.svg b/bundles/org.openhab.ui.iconset.classic/icons/toilet.svg
index 75ddfb6b52..f9e1c3f18f 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/toilet.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/toilet.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
     <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="8" x2="0" y2="16">
       <stop style="stop-color:#dcdcdc"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/vacation.svg b/bundles/org.openhab.ui.iconset.classic/icons/vacation.svg
index 7f29ac74aa..969fcc1357 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/vacation.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/vacation.svg
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <defs>
-    <linearGradient id="6" gradientUnits="userSpaceOnUse" y1="53.4891" x2="0" y2="52.1296" xlink:href="#7"/>
-    <linearGradient id="5" gradientUnits="userSpaceOnUse" y1="61" x2="0" y2="13.3611">
+    <linearGradient id="6" gradientUnits="userSpaceOnUse" y1="61" x2="0" y2="13.3611">
       <stop style="stop-color:#a35c48"/>
       <stop offset="1" style="stop-color:#cd814c"/>
     </linearGradient>
-    <linearGradient id="7" gradientUnits="userSpaceOnUse" x1="25.2326" x2="34.6551">
+    <linearGradient id="5" gradientUnits="userSpaceOnUse" x1="25.2326" x2="34.6551">
       <stop style="stop-color:#4d2c19"/>
       <stop offset="1" style="stop-color:#793b20"/>
     </linearGradient>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="46.4858" x2="0" y2="45.1296" xlink:href="#7"/>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="40.4859" x2="0" y2="39.2037" xlink:href="#7"/>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="28.4897" x2="0" y2="27.2407" xlink:href="#7"/>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="23.484" x2="0" y2="22.2407" xlink:href="#7"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="34.4779" x2="0" y2="33.2037" xlink:href="#7"/>
+    <linearGradient id="7" gradientUnits="userSpaceOnUse" y1="53.4891" x2="0" y2="52.1296" xlink:href="#5"/>
+    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="46.4858" x2="0" y2="45.1296" xlink:href="#5"/>
+    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="40.4859" x2="0" y2="39.2037" xlink:href="#5"/>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="34.4779" x2="0" y2="33.2037" xlink:href="#5"/>
+    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="28.4897" x2="0" y2="27.2407" xlink:href="#5"/>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="23.484" x2="0" y2="22.2407" xlink:href="#5"/>
   </defs>
   <g style="stroke-miterlimit:10">
-    <path d="m29 16.36c0 0-4.38 42.56-3 44s5 0 5 0 1.44 1.06 1-15c-.44-16.06 2-32 2-32l-5 3z" style="fill:url(#5);stroke:url(#7)"/>
+    <path d="m29 16.36c0 0-4.38 42.56-3 44s5 0 5 0 1.44 1.06 1-15c-.44-16.06 2-32 2-32l-5 3z" style="fill:url(#6);stroke:url(#5)"/>
     <g style="fill:none">
-      <path d="m26 53c0 0 3.92-.83 6 0" style="stroke:url(#6)"/>
+      <path d="m26 53c0 0 3.92-.83 6 0" style="stroke:url(#7)"/>
       <path d="m26 46c0 0 3.42-.83 6 0" style="stroke:url(#4)"/>
       <path d="m27 40c0 0 2.75-.67 4 0" style="stroke:url(#3)"/>
-      <path d="m28 34c0 0 2.17-.67 3 0" style="stroke:url(#1)"/>
-      <path d="m28 28c0 0 2.83-.58 4 0" style="stroke:url(#0)"/>
-      <path d="m29 23c0 0 2.25-.58 3 0" style="stroke:url(#2)"/>
+      <path d="m28 34c0 0 2.17-.67 3 0" style="stroke:url(#0)"/>
+      <path d="m28 28c0 0 2.83-.58 4 0" style="stroke:url(#2)"/>
+      <path d="m29 23c0 0 2.25-.58 3 0" style="stroke:url(#1)"/>
     </g>
   </g>
   <path d="m38.92 33.12c-1.26-1.19-2.42-2.53-3.45-3.98l.77-2.06-1.56.89c-4.05-6.31-4.55-12.56-4.55-12.62l-.01-.09-5.22-1.04-.02.13c-1.29 8.39-9.35 13.06-10.73 13.8.11-1.15.25-2.29.41-3.39l1.53-1.3.39-.34-1.73.43c1.76-10.42 5.27-12.05 5.31-12.07l.46-.2-.5-.04c-.44-.03-.88-.05-1.32-.05-5.06 0-9.84 2.12-11.3 2.84 5.27-7.34 11.54-7.54 11.6-7.54l13.96 4.99 6.08-2c10.33.39 12.43 9.35 12.77 11.46-.51-.62-1.03-1.22-1.58-1.82l-.11-.77-.04-.24-.41.41c-6.75-7.07-12.03-7.28-12.61-7.28h-.17l-.01.17c1.39 4.26 2.21 8.61 2.46 12.92l-1.66 1.11 1.73.34c.01.41.02.8.02 1.18l-1.8.36 1.78.89c-.09 2.57-.38 4.32-.49 4.91" style="fill:#063"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/video.svg b/bundles/org.openhab.ui.iconset.classic/icons/video.svg
index 11fc284772..b2dbe086d6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/video.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/video.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m11.5 62.5v-61h41v61h-41m35-1h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5m34-6h5v-5h-5v5m-34 0h5v-5h-5v5" style="fill:#222"/>
   <path d="m46 2v1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1h1 4 1-40v-60 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1 1 4 1h1 4 1v-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1-1-4-1h28m7-1h-42v62h42v-62zm-6 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4m34 6v-4h4v4h-4m-34 0v-4h4v4h-4"/>
   <path d="m19.5 51.5h25v9h-25z" style="fill:#36aeff"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/volume-0.png b/bundles/org.openhab.ui.iconset.classic/icons/volume-0.png
deleted file mode 100644
index d077028499..0000000000
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/volume-0.png and /dev/null differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.png b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.png
index 61a2d39e91..a8394c5a34 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.png and b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.svg b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.svg
index 2e67c32f66..b37e650c12 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 25c0 0-.37-2.34 1.8-4.19 2.05-1.74 1.15-4 0-5.15s-4.1-.99-4.76 1.92" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5"/>
   <path d="m23.57 31.64c0 0-1.56 1.78-11.78 5.77s-9.74 7.2-9.74 7.2-.53 3.5 2.24 1.48c2.77-2.02 24.53-15.08 27.71-15.08v-5.99h-2.47c0 0-1.8-.38-2.78 2.63s-3.18 3.99-3.18 3.99"/>
   <path d="m40.43 31.64c0 0 1.56 1.78 11.78 5.77s9.74 7.2 9.74 7.2.53 3.5-2.24 1.48c-2.77-2.02-24.53-15.08-27.71-15.08v-5.99h2.47c0 0 1.8-.38 2.78 2.63s3.18 3.99 3.18 3.99"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.png b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.png
deleted file mode 100644
index 61a2d39e91..0000000000
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.png and /dev/null differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.svg b/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.svg
deleted file mode 100644
index 2e67c32f66..0000000000
--- a/bundles/org.openhab.ui.iconset.classic/icons/wardrobe2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
-  <path d="m32 25c0 0-.37-2.34 1.8-4.19 2.05-1.74 1.15-4 0-5.15s-4.1-.99-4.76 1.92" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5"/>
-  <path d="m23.57 31.64c0 0-1.56 1.78-11.78 5.77s-9.74 7.2-9.74 7.2-.53 3.5 2.24 1.48c2.77-2.02 24.53-15.08 27.71-15.08v-5.99h-2.47c0 0-1.8-.38-2.78 2.63s-3.18 3.99-3.18 3.99"/>
-  <path d="m40.43 31.64c0 0 1.56 1.78 11.78 5.77s9.74 7.2 9.74 7.2.53 3.5-2.24 1.48c-2.77-2.02-24.53-15.08-27.71-15.08v-5.99h2.47c0 0 1.8-.38 2.78 2.63s3.18 3.99 3.18 3.99"/>
-</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine.svg
index 751a443927..0cef7157d8 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m47 53h6v1h-6z" style="fill:#cacacc"/>
   <path d="m10.5 4.5h43v54h-43z" style="fill:#fafafa"/>
   <path d="m53 5v53h-42v-53h42m1-1h-44v55h44v-55z" style="fill:#666"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.png b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.png
index 0ac0f2448b..71fcd64ff3 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.png and b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.svg
index 3a9e775430..09f0cc1227 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-0.svg
@@ -1,74 +1,59 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="linearGradient4101">
-<stop stop-color="#919191" offset="0"/>
-<stop stop-color="#e4e4e4" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#CCC" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-<stop stop-color="#FFF" offset="0"/>
-<stop stop-color="#cdcdcd" offset="1"/>
-</linearGradient>
-<linearGradient id="linearGradient3961" y2="51.362" gradientUnits="userSpaceOnUse" x2="33" gradientTransform="matrix(1.9998887,0,0,1.3168561,-47.993281,934.69788)" y1="48.362" x1="33">
-<stop stop-color="#a6a6a6" offset="0"/>
-<stop stop-color="#828282" stop-opacity="0" offset="1"/>
-</linearGradient>
-<radialGradient id="radialGradient4099" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
-<radialGradient id="radialGradient4179" gradientUnits="userSpaceOnUse" cy="62.398" cx="41.416" gradientTransform="matrix(1.2081928,0,0,2.0310325,-9.4645969,896.94657)" r="7">
-<stop stop-color="#919191" offset="0"/>
-<stop stop-color="#FFF" offset="1"/>
-</radialGradient>
-</defs>
-<metadata>
-<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:license rdf:resource=""/>
-<dc:creator>
-<cc:Agent>
-<dc:title>Simon Buttazzi</dc:title>
-</cc:Agent>
-</dc:creator>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(0,-988.36218)">
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient4099)"/>
-<path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient4099)"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<path fill="#c4c4c4" d="m22,994.36,2,0,0,8-2,0z"/>
-<path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-<path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-<path fill="url(#linearGradient3961)" d="m14,998.36,6,0,0,4-6,0z"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-<path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#4c4c4c" fill="none"/>
-<path fill="#939393" d="m17,1020.4,5,0,0,6-5,0z"/>
-<rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
-</g>
-<g transform="translate(0,-988.36218)">
-<rect height="6.0448" width="5.4005" y="1020.3" x="16.602" fill="#FFF"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#9b9b9b" fill="none"/>
-<path fill="#b8b8b8" d="m40,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m46,996.36,4,0,0,4-4,0z"/>
-<path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-<path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient4099)"/>
-<path d="m46.112,1023.6c0,7.8521-3.7865,14.217-8.4574,14.217s-8.4574-6.365-8.4574-14.217c0-7.8519,3.7865-14.217,8.4574-14.217s8.4574,6.3653,8.4574,14.217z" fill="url(#radialGradient4179)"/>
-<path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.2081928,0,0,2.0310325,-9.4645969,896.94657)" stroke="#4b4b4b" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="1.38269734" fill="none"/>
-<path fill="#939393" d="m29,1020.4,3,0,0,6-3,0z"/>
-</g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14s6.2677-14.001 13.999-14.001c7.7316 0 13.999 6.2687 13.999 14.001"/>
+    <path id="1" d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7" style="fill:none"/>
+    <linearGradient id="3" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <linearGradient id="4" y2="51.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.3168561-47.993281 934.69788)" y1="48.362">
+      <stop style="stop-color:#a6a6a6"/>
+      <stop offset="1" style="stop-color:#828282;stop-opacity:0"/>
+    </linearGradient>
+    <linearGradient id="2" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <radialGradient id="5" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+    <radialGradient id="6" gradientUnits="userSpaceOnUse" cy="62.398" cx="41.416" gradientTransform="matrix(1.2081928 0 0 2.0310325-9.4645969 896.94657)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#fff"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <use xlink:href="#0" style="fill:url(#5)"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="7"/>
+      <path d="m40 996.36h4v4h-4z" id="8"/>
+      <path d="m46 996.36h4v4h-4z" id="9"/>
+    </g>
+    <use xlink:href="#0" style="fill:url(#5)"/>
+    <path d="m22 994.36h2v8h-2z" style="fill:#c4c4c4"/>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#3)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#2)"/>
+    <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#1" style="stroke:#c0c0c0"/>
+    <path d="m14 998.36h6v4h-6z" style="fill:url(#4)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <g transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)">
+      <use xlink:href="#1" style="stroke:#c0c0c0"/>
+      <use xlink:href="#1" style="stroke:#4c4c4c"/>
+    </g>
+    <path d="m17 1020.4h5v6h-5z" style="fill:#939393"/>
+    <path d="m16.602 1020.3h5.4005v6.04h-5.4005z" style="fill:#fff"/>
+    <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#1" style="stroke:#9b9b9b"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#8"/>
+      <use xlink:href="#9"/>
+      <use xlink:href="#7"/>
+    </g>
+    <use xlink:href="#0" style="fill:url(#5)"/>
+    <path d="m46.112 1023.6c0 7.8521-3.7865 14.217-8.4574 14.217s-8.4574-6.365-8.4574-14.217c0-7.8519 3.7865-14.217 8.4574-14.217s8.4574 6.3653 8.4574 14.217" style="fill:url(#6)"/>
+    <use transform="matrix(1.2081928 0 0 2.0310325-9.4645969 896.94657)" xlink:href="#1" style="stroke:#4b4b4b;stroke-width:1.38269734"/>
+    <path d="m29 1020.4h3v6h-3z" style="fill:#939393"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.png b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.png
index c9484f4901..c3f132883b 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.png and b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.svg
index 5f6eb0e6a1..fa7b9e6ae2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-1.svg
@@ -1,72 +1,57 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="linearGradient4101">
-   <stop stop-color="#919191" offset="0"/>
-   <stop stop-color="#e4e4e4" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#CCC" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#cdcdcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3961" y2="51.362" gradientUnits="userSpaceOnUse" x2="33" gradientTransform="matrix(1.9998887,0,0,1.3168561,-47.993281,934.69788)" y1="48.362" x1="33">
-   <stop stop-color="#a6a6a6" offset="0"/>
-   <stop stop-color="#828282" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4017" y2="67.639" gradientUnits="userSpaceOnUse" x2="44.507" y1="56.042" x1="36.433">
-   <stop stop-color="#3c85ff" offset="0"/>
-   <stop stop-color="#95f9ff" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient3087" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
- </defs>
- <metadata>
-  <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:license rdf:resource=""/>
-    <dc:creator>
-     <cc:Agent>
-      <dc:title>Simon Buttazzi</dc:title>
-     </cc:Agent>
-    </dc:creator>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-988.36218)">
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
-  <path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#a5ffa8" d="m32,994.36,8,0-0.000003,8-8,0z"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="#a8f8ff"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14,18.819,15.901,9.7483-13.529,27.998,0z" fill="#0099a6"/>
-  <path stroke-linejoin="miter" d="m40,62.362c0.52645,0.07521,0.15836,0.74675-0.125,0.875-0.76788,0.34754-1.5061-0.41624-1.625-1.125-0.21276-1.2678,0.93363-2.2948,2.125-2.375,1.7484-0.11768,3.0984,1.4549,3.125,3.125,0.03547,2.2259-1.9772,3.9078-4.125,3.875-2.7027-0.04123-4.72-2.4999-4.625-5.125,0.11511-3.1793,3.0228-5.534,6.125-5.375,3.6559,0.18735,6.3489,3.5458,6.125,7.125" transform="matrix(1.9602652,0,0,2.0018774,-46.625996,899.52399)" stroke="url(#linearGradient4017)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99950349" fill="none"/>
-  <path fill="#00c808" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path fill="#a1a1a1" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path fill="#a1a1a1" d="m46,996.36,4,0,0,4-4,0z"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#c4c4c4" d="m22,994.36,2,0,0,8-2,0z"/>
-  <path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-  <path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path fill="url(#linearGradient3961)" d="m14,998.36,6,0,0,4-6,0z"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#4c4c4c" fill="none"/>
-  <path fill="#939393" d="m17,1020.4,5,0,0,6-5,0z"/>
-  <rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
- </g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14s6.2677-14.001 13.999-14.001c7.7316 0 13.999 6.2687 13.999 14.001"/>
+    <path id="1" d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7" style="fill:none"/>
+    <linearGradient id="5" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <linearGradient id="4" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <linearGradient id="3" y2="51.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.3168561-47.993281 934.69788)" y1="48.362">
+      <stop style="stop-color:#a6a6a6"/>
+      <stop offset="1" style="stop-color:#828282;stop-opacity:0"/>
+    </linearGradient>
+    <linearGradient id="2" y2="67.639" gradientUnits="userSpaceOnUse" x2="44.507" y1="56.042" x1="36.433">
+      <stop style="stop-color:#3c85ff"/>
+      <stop offset="1" style="stop-color:#95f9ff"/>
+    </linearGradient>
+    <radialGradient id="6" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <use xlink:href="#0" style="fill:url(#6)"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z"/>
+      <path d="m40 996.36h4v4h-4z" id="7"/>
+      <path d="m46 996.36h4v4h-4z" id="8"/>
+    </g>
+    <use xlink:href="#0" style="fill:url(#6)"/>
+    <path d="m32 994.36h8l-.000003 8h-8z" style="fill:#a5ffa8"/>
+    <use xlink:href="#0" style="fill:#a8f8ff"/>
+    <path d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14 18.819 15.901 9.7483-13.529 27.998 0" style="fill:#0099a6"/>
+    <path d="m40 62.362c.52645.07521.15836.74675-.125.875-.76788.34754-1.5061-.41624-1.625-1.125-.21276-1.2678.93363-2.2948 2.125-2.375 1.7484-.11768 3.0984 1.4549 3.125 3.125.03547 2.2259-1.9772 3.9078-4.125 3.875-2.7027-.04123-4.72-2.4999-4.625-5.125.11511-3.1793 3.0228-5.534 6.125-5.375 3.6559.18735 6.3489 3.5458 6.125 7.125" transform="matrix(1.9602652 0 0 2.0018774-46.625996 899.52399)" style="fill:none;stroke:url(#2);stroke-width:.99950349"/>
+    <path d="m34 996.36h4v4h-4z" style="fill:#00c808"/>
+    <g style="fill:#a1a1a1">
+      <use xlink:href="#7"/>
+      <use xlink:href="#8"/>
+    </g>
+    <path d="m22 994.36h2v8h-2z" style="fill:#c4c4c4"/>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#4)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#5)"/>
+    <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#1" style="stroke:#c0c0c0"/>
+    <path d="m14 998.36h6v4h-6z" style="fill:url(#3)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <g transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)">
+      <use xlink:href="#1" style="stroke:#c0c0c0"/>
+      <use xlink:href="#1" style="stroke:#4c4c4c"/>
+    </g>
+    <path d="m17 1020.4h5v6h-5z" style="fill:#939393"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.png b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.png
index d589ba7f2c..c5a0d37cde 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.png and b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.svg
index 7c9614797a..cce1294cb4 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-2.svg
@@ -1,67 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="linearGradient4101">
-   <stop stop-color="#919191" offset="0"/>
-   <stop stop-color="#e4e4e4" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#CCC" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#cdcdcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3961" y2="51.362" gradientUnits="userSpaceOnUse" x2="33" gradientTransform="matrix(1.9998887,0,0,1.3168561,-47.993281,934.69788)" y1="48.362" x1="33">
-   <stop stop-color="#a6a6a6" offset="0"/>
-   <stop stop-color="#828282" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient3087" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
- </defs>
- <metadata>
-  <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:creator>
-     <cc:Agent>
-      <dc:title>Simon Buttazzi</dc:title>
-     </cc:Agent>
-    </dc:creator>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-988.36218)">
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
-  <path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#ffa5a5" d="m38,994.36,8,0,0,8-8,0z"/>
-  <path fill="#ff0505" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path fill="#b8b8b8" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path d="m36.002,1026.4c0,6.0002,3.1208,6.9496-4.6108,6.9496s-13.115-3.238-13.115-10.97c5.5555,0.4755,4.9643,3.4455,10.017,3.1332,2.3749-0.054,7.7087-7.1129,7.7087,0.8873z" fill="#bd0000"/>
-  <path d="m38.572,1028c0,7.732,1.0555,9.5807-6.676,9.5807-7.7316,0-13.115-3.2374-13.115-10.97,5.5555,0.4753,7.9883,5.4671,11.479,4.9761,2.4642-0.098,8.3124-11.319,8.3124-3.5872z" fill="#006f79"/>
-  <path d="m45.896,1023.6c2.6431,7.2665-6.2677,14-13.999,14-7.7316,0,6.0561,2.3185,6.0561-5.4136,0-7.7324-5.4161-0.2371-3.9502-7.829,1.2922-6.6926,9.9994-5.9644,11.893-0.7577z" fill="#eb9d00"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#c4c4c4" d="m22,994.36,2,0,0,8-2,0z"/>
-  <path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-  <path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path fill="url(#linearGradient3961)" d="m14,998.36,6,0,0,4-6,0z"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#4c4c4c" fill="none"/>
-  <path fill="#939393" d="m17,1020.4,5,0,0,6-5,0z"/>
-  <rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
- </g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7" style="fill:none"/>
+    <linearGradient id="2" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <linearGradient id="3" y2="51.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.3168561-47.993281 934.69788)" y1="48.362">
+      <stop style="stop-color:#a6a6a6"/>
+      <stop offset="1" style="stop-color:#828282;stop-opacity:0"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <radialGradient id="4" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <path d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14s6.2677-14.001 13.999-14.001c7.7316 0 13.999 6.2687 13.999 14.001" id="5" style="fill:url(#4)"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="6"/>
+      <path d="m40 996.36h4v4h-4z"/>
+      <path d="m46 996.36h4v4h-4z" id="7"/>
+    </g>
+    <use xlink:href="#5"/>
+    <path d="m38 994.36h8v8h-8z" style="fill:#ffa5a5"/>
+    <path d="m40 996.36h4v4h-4z" style="fill:#ff0505"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#7"/>
+      <use xlink:href="#6"/>
+    </g>
+    <path d="m36.002 1026.4c0 6.0002 3.1208 6.9496-4.6108 6.9496s-13.115-3.238-13.115-10.97c5.5555.4755 4.9643 3.4455 10.017 3.1332 2.3749-.054 7.7087-7.1129 7.7087.8873z" style="fill:#bd0000"/>
+    <path d="m38.572 1028c0 7.732 1.0555 9.5807-6.676 9.5807-7.7316 0-13.115-3.2374-13.115-10.97 5.5555.4753 7.9883 5.4671 11.479 4.9761 2.4642-.098 8.3124-11.319 8.3124-3.5872z" style="fill:#006f79"/>
+    <path d="m45.896 1023.6c2.6431 7.2665-6.2677 14-13.999 14-7.7316 0 6.0561 2.3185 6.0561-5.4136 0-7.7324-5.4161-.2371-3.9502-7.829 1.2922-6.6926 9.9994-5.9644 11.893-.7577z" style="fill:#eb9d00"/>
+    <path d="m22 994.36h2v8h-2z" style="fill:#c4c4c4"/>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#2)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#1)"/>
+    <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#0" style="stroke:#c0c0c0"/>
+    <path d="m14 998.36h6v4h-6z" style="fill:url(#3)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <g transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)">
+      <use xlink:href="#0" style="stroke:#c0c0c0"/>
+      <use xlink:href="#0" style="stroke:#4c4c4c"/>
+    </g>
+    <path d="m17 1020.4h5v6h-5z" style="fill:#939393"/>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.png b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.png
index 2f5935603a..de228b5ccf 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.png and b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.svg
index 95c08191cc..a44eace415 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2-3.svg
@@ -1,64 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="linearGradient4101">
-   <stop stop-color="#919191" offset="0"/>
-   <stop stop-color="#e4e4e4" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#CCC" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#cdcdcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3961" y2="51.362" gradientUnits="userSpaceOnUse" x2="33" gradientTransform="matrix(1.9998887,0,0,1.3168561,-47.993281,934.69788)" y1="48.362" x1="33">
-   <stop stop-color="#a6a6a6" offset="0"/>
-   <stop stop-color="#828282" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient3087" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
- </defs>
- <metadata>
-  <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:creator>
-     <cc:Agent>
-      <dc:title>Simon Buttazzi</dc:title>
-     </cc:Agent>
-    </dc:creator>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-988.36218)">
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
-  <path fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#c4c4c4" d="m22,994.36,2,0,0,8-2,0z"/>
-  <path fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-  <path fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path fill="url(#linearGradient3961)" d="m14,998.36,6,0,0,4-6,0z"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-  <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#4c4c4c" fill="none"/>
-  <path fill="#939393" d="m17,1020.4,5,0,0,6-5,0z"/>
-  <rect height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
- </g>
- <g transform="translate(0,-988.36218)">
-  <path fill="#ffeca5" d="m44,994.36,8,0,0,8-8,0z"/>
-  <path fill="#FC0" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path fill="#b8b8b8" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path fill="#b8b8b8" d="m40,996.36,4,0,0,4-4,0z"/>
- </g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7" style="fill:none"/>
+    <linearGradient id="2" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <linearGradient id="3" y2="51.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.3168561-47.993281 934.69788)" y1="48.362">
+      <stop style="stop-color:#a6a6a6"/>
+      <stop offset="1" style="stop-color:#828282;stop-opacity:0"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <radialGradient id="4" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+    <path d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14s6.2677-14.001 13.999-14.001c7.7316 0 13.999 6.2687 13.999 14.001" id="5" style="fill:url(#4)"/>
+    <g style="fill:#d3d3d3">
+      <path d="m34 996.36h4v4h-4z" id="6"/>
+      <path d="m40 996.36h4v4h-4z" id="7"/>
+      <path d="m46 996.36h4v4h-4z"/>
+    </g>
+    <use xlink:href="#5"/>
+    <path d="m22 994.36h2v8h-2z" style="fill:#c4c4c4"/>
+    <path d="m12 1002.4h40v6h-40z" style="fill:url(#2)"/>
+    <path d="m12 1042.4h40v4h-40z" style="fill:url(#1)"/>
+    <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#0" style="stroke:#c0c0c0"/>
+    <path d="m14 998.36h6v4h-6z" style="fill:url(#3)"/>
+    <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+    <g transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)">
+      <use xlink:href="#0" style="stroke:#c0c0c0"/>
+      <use xlink:href="#0" style="stroke:#4c4c4c"/>
+    </g>
+    <path d="m17 1020.4h5v6h-5z" style="fill:#939393"/>
+    <path d="m44 994.36h8v8h-8z" style="fill:#ffeca5"/>
+    <path d="m46 996.36h4v4h-4z" style="fill:#fc0"/>
+    <g style="fill:#b8b8b8">
+      <use xlink:href="#6"/>
+      <use xlink:href="#7"/>
+    </g>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.png b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.png
index a3c688f92c..f0b30a0c8b 100644
Binary files a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.png and b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.svg
index ab0d0bb912..616a408694 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/washingmachine_2.svg
@@ -1,58 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs id="defs4">
-  <linearGradient id="linearGradient4101">
-   <stop id="stop4103" stop-color="#919191" offset="0"/>
-   <stop id="stop4105" stop-color="#e4e4e4" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3805" y2="70.362" gradientUnits="userSpaceOnUse" x2="40" gradientTransform="matrix(1.9998887,0,0,1.2424276,-47.993281,955.21738)" y1="73.362" x1="40">
-   <stop id="stop3801" stop-color="#FFF" offset="0"/>
-   <stop id="stop3803" stop-color="#CCC" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3822" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887,0,0,2.0000677,-47.871459,861.62697)" x2="40" x1="40">
-   <stop id="stop3801-8" stop-color="#FFF" offset="0"/>
-   <stop id="stop3803-5" stop-color="#cdcdcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3961" y2="51.362" gradientUnits="userSpaceOnUse" x2="33" gradientTransform="matrix(1.9998887,0,0,1.3168561,-47.993281,934.69788)" y1="48.362" x1="33">
-   <stop id="stop3957" stop-color="#a6a6a6" offset="0"/>
-   <stop id="stop3959" stop-color="#828282" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient3087" xlink:href="#linearGradient4101" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" r="7"/>
- </defs>
- <metadata id="metadata7">
-  <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:creator>
-     <cc:Agent>
-      <dc:title>Simon Buttazzi</dc:title>
-     </cc:Agent>
-    </dc:creator>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g id="layer3" transform="translate(0,-988.36218)">
-  <path id="path4045" style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m12.253,994.45,9.187,0,30.498,0,0,51.689-39.685,0z" fill-rule="nonzero" fill="#FFF"/>
-  <path id="path4080" d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
-  <path id="rect4107" fill="#d3d3d3" d="m34,996.36,4,0,0,4-4,0z"/>
-  <path id="rect4109" fill="#d3d3d3" d="m40,996.36,4,0,0,4-4,0z"/>
-  <path id="rect4111" fill="#d3d3d3" d="m46,996.36,4,0,0,4-4,0z"/>
-  <path id="path4167" d="m45.896,1023.6c0,7.7323-6.2677,14-13.999,14-7.7316,0-13.999-6.268-13.999-14s6.2677-14.001,13.999-14.001c7.7316,0,13.999,6.2687,13.999,14.001z" fill="url(#radialGradient3087)"/>
- </g>
- <g id="layer1" transform="translate(0,-988.36218)">
-  <path id="rect3841-1-6-0-2" fill="#c4c4c4" d="m22,994.36,2,0,0,8-2,0z"/>
-  <path id="rect3797-0" fill="url(#linearGradient3822)" d="m12,1002.4,40,0,0,6-40,0z"/>
-  <path id="rect3797" fill="url(#linearGradient3805)" d="m12,1042.4,40,0,0,4-40,0z"/>
-  <path id="path3879" d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path id="rect3841-1-6-0" fill="url(#linearGradient3961)" d="m14,998.36,6,0,0,4-6,0z"/>
-  <path id="rect3018" style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10,992.36,0,56,44,0,0.000001-56zm2,2,40,0,0,52-40,0z" fill-rule="nonzero" fill="#969696"/>
-  <path id="path4043" style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" d="m10.316,992.45,0,1,0,53.689,0,0.9999,0.93745,0,41.685,0,0.99994,0,0-0.9999,0-53.689,0-1-0.99994,0-31.498,0-10.187,0zm1.9374,2.0001,9.187,0,30.498,0,0,51.689-39.685,0z" fill="none"/>
-  <path id="path4169" d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#c0c0c0" fill="none"/>
-  <path id="path4181" d="m46,62.362c0,3.866-3.134,7-7,7s-7-3.134-7-7,3.134-7,7-7,7,3.134,7,7z" transform="matrix(1.9998887,0,0,2.0000677,-46.099351,898.87761)" stroke="#4c4c4c" fill="none"/>
-  <path id="rect3881" fill="#939393" d="m17,1020.4,5,0,0,6-5,0z"/>
-  <rect id="rect4203" height="64.002" width="63.996" y="988.36" x="0.0040502" fill="none"/>
- </g>
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
+  <defs>
+    <path id="0" d="m46 62.362c0 3.866-3.134 7-7 7s-7-3.134-7-7 3.134-7 7-7 7 3.134 7 7" style="fill:none"/>
+    <linearGradient id="2" y2="70.362" gradientUnits="userSpaceOnUse" y1="73.362" gradientTransform="matrix(1.9998887 0 0 2.0000677-47.871459 861.62697)" x2="0">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#cdcdcd"/>
+    </linearGradient>
+    <linearGradient id="3" y2="51.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.3168561-47.993281 934.69788)" y1="48.362">
+      <stop style="stop-color:#a6a6a6"/>
+      <stop offset="1" style="stop-color:#828282;stop-opacity:0"/>
+    </linearGradient>
+    <linearGradient id="1" y2="70.362" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.9998887 0 0 1.2424276-47.993281 955.21738)" y1="73.362">
+      <stop style="stop-color:#fff"/>
+      <stop offset="1" style="stop-color:#ccc"/>
+    </linearGradient>
+    <radialGradient id="4" gradientUnits="userSpaceOnUse" cy="62.362" cx="39" gradientTransform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" r="7">
+      <stop style="stop-color:#919191"/>
+      <stop offset="1" style="stop-color:#e4e4e4"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(0-988.36218)">
+    <g>
+      <path d="m12.253 994.45h9.187 30.498v51.689h-39.685z" style="fill:#fff;color:#000"/>
+      <path id="5" d="m45.896 1023.6c0 7.7323-6.2677 14-13.999 14-7.7316 0-13.999-6.268-13.999-14s6.2677-14.001 13.999-14.001c7.7316 0 13.999 6.2687 13.999 14.001" style="fill:url(#4)"/>
+      <g style="fill:#d3d3d3">
+        <path d="m34 996.36h4v4h-4z"/>
+        <path d="m40 996.36h4v4h-4z"/>
+        <path d="m46 996.36h4v4h-4z"/>
+      </g>
+      <use xlink:href="#5"/>
+    </g>
+    <g>
+      <path d="m22 994.36h2v8h-2z" style="fill:#c4c4c4"/>
+      <path d="m12 1002.4h40v6h-40z" style="fill:url(#2)"/>
+      <path d="m12 1042.4h40v4h-40z" style="fill:url(#1)"/>
+      <use transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)" xlink:href="#0" style="stroke:#c0c0c0"/>
+      <path d="m14 998.36h6v4h-6z" style="fill:url(#3)"/>
+      <path d="m10 992.36v56h44l.000001-56zm2 2h40v52h-40z" style="fill:#969696;color:#000"/>
+      <g transform="matrix(1.9998887 0 0 2.0000677-46.099351 898.87761)">
+        <use xlink:href="#0" style="stroke:#c0c0c0"/>
+        <use xlink:href="#0" style="stroke:#4c4c4c"/>
+      </g>
+      <path d="m17 1020.4h5v6h-5z" style="fill:#939393"/>
+    </g>
+  </g>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/water.svg b/bundles/org.openhab.ui.iconset.classic/icons/water.svg
index 198aab01ac..d4aa29c711 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/water.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/water.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
-  <path fill="#1E82FF" d="M30.4,61.5c-0.2,0-0.5-0.1-0.8-0.1c-0.6-0.1-1.2-0.1-1.7-0.3l0,0l-0.1,0c-8.6-1.5-15.9-10.2-16.3-19.3   l0-2.7c0.3-1.7,0.6-3.5,1.3-5.2c0.8-1.5,1.4-2.8,2.2-4l2.6-3.7c6.2-7.6,11-14.9,14.6-22.5L32.8,5c3.5,8.9,9.3,16.4,13.9,22   c0.6,0.9,1.2,1.8,1.9,2.6c1,1.5,2,3.2,2.8,5c0.5,1.3,0.9,2.9,1.1,4.6l0,2.5c-0.1,0.3-0.1,0.6-0.1,0.8c0,0.3,0,0.5-0.1,0.7l0,0.1   l0,0.1c-0.9,8.4-8,16.1-16.1,17.5l-0.1,0l0,0c-0.5,0.2-1.1,0.3-1.7,0.3c-0.3,0-0.6,0.1-0.8,0.1H30.4z"/>
-  <path fill="#1271D8" d="M32.2,4.9l0.2,0.4c3.6,8.9,9.3,16.5,13.9,22.1c0.6,0.9,1.3,1.8,1.9,2.6c1,1.5,2,3.2,2.8,4.9   c0.5,1.3,0.8,2.8,1,4.5v2.4c-0.1,0.3-0.1,0.6-0.1,0.9c0,0.2,0,0.4-0.1,0.6l-0.1,0.1l0,0.1c-0.9,8.2-7.8,15.7-15.6,17.1l-0.1,0   l-0.1,0c-0.5,0.2-1,0.2-1.6,0.3c-0.3,0-0.6,0.1-0.8,0.1h-3c-0.3,0-0.5-0.1-0.8-0.1c-0.6-0.1-1.2-0.1-1.6-0.3l-0.1,0l-0.1,0   c-8.4-1.5-15.5-9.9-15.9-18.7v-2.6c0.3-1.7,0.6-3.4,1.3-5.1c0.7-1.3,1.4-2.7,2.2-3.9l2.6-3.6C24,19.3,28.6,12.1,32.2,4.9 M32.2,2.5   c-3.9,8.4-9.1,16.2-15,23.4l-2.6,3.7c-0.8,1.3-1.5,2.7-2.3,4.1c-0.7,1.7-1.1,3.6-1.3,5.4v2.7c0.4,9.2,7.7,18.1,16.7,19.7   c0.8,0.3,1.8,0.3,2.7,0.5h3.2c0.9-0.1,1.9-0.1,2.7-0.5c8.3-1.5,15.5-9.3,16.5-18c0.2-0.5,0.1-1.2,0.2-1.7v-2.6   c-0.2-1.6-0.5-3.2-1.1-4.8c-0.8-1.8-1.8-3.5-2.9-5.1c-0.7-0.9-1.3-1.7-1.9-2.6C41.5,20,36.5,12.9,33.3,4.8L32.2,2.5L32.2,2.5z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m30.4 61.5c-.2 0-.5-.1-.8-.1-.6-.1-1.2-.1-1.7-.3h-.1c-8.6-1.5-15.9-10.2-16.3-19.3v-2.7c.3-1.7.6-3.5 1.3-5.2.8-1.5 1.4-2.8 2.2-4l2.6-3.7c6.2-7.6 11-14.9 14.6-22.5l.6 1.3c3.5 8.9 9.3 16.4 13.9 22 .6.9 1.2 1.8 1.9 2.6 1 1.5 2 3.2 2.8 5 .5 1.3.9 2.9 1.1 4.6v2.5c-.1.3-.1.6-.1.8 0 .3 0 .5-.1.7v.1.1c-.9 8.4-8 16.1-16.1 17.5h-.1c-.5.2-1.1.3-1.7.3-.3 0-.6.1-.8.1h-3.2z" style="fill:#1e82ff"/>
+  <path d="m32.2 4.9l.2.4c3.6 8.9 9.3 16.5 13.9 22.1.6.9 1.3 1.8 1.9 2.6 1 1.5 2 3.2 2.8 4.9.5 1.3.8 2.8 1 4.5v2.4c-.1.3-.1.6-.1.9 0 .2 0 .4-.1.6l-.1.1v.1c-.9 8.2-7.8 15.7-15.6 17.1h-.1-.1c-.5.2-1 .2-1.6.3-.3 0-.6.1-.8.1h-3c-.3 0-.5-.1-.8-.1-.6-.1-1.2-.1-1.6-.3h-.1-.1c-8.4-1.5-15.5-9.9-15.9-18.7v-2.6c.3-1.7.6-3.4 1.3-5.1.7-1.3 1.4-2.7 2.2-3.9l2.6-3.6c5.9-7.4 10.5-14.6 14.1-21.8m0-2.4c-3.9 8.4-9.1 16.2-15 23.4l-2.6 3.7c-.8 1.3-1.5 2.7-2.3 4.1-.7 1.7-1.1 3.6-1.3 5.4v2.7c.4 9.2 7.7 18.1 16.7 19.7.8.3 1.8.3 2.7.5h3.2c.9-.1 1.9-.1 2.7-.5 8.3-1.5 15.5-9.3 16.5-18 .2-.5.1-1.2.2-1.7v-2.6c-.2-1.6-.5-3.2-1.1-4.8-.8-1.8-1.8-3.5-2.9-5.1-.7-.9-1.3-1.7-1.9-2.6-5.6-6.7-10.6-13.8-13.8-21.9l-1.1-2.3z" style="fill:#1271d8"/>
 </svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/wind.svg b/bundles/org.openhab.ui.iconset.classic/icons/wind.svg
index 43f9bc29d3..c23ffedd25 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/wind.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/wind.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m61.55 22.14c-3.06-.84-7.3-2.16-9.33-3.51-3.39-2.25-4.77-2.26-7.12-3.02-2.35-.76-4.78-2.08-4.78-2.08s-2.57-2.17-6.5-2.77c-3.92-.6-5.65-2.61-5.65-2.61s-.6-1.38-2.2-1.96c-2.54-1.01-6.25 2.29-8.28 7.38-2.03 5.09-1.61 10.04.94 11.05 0 0 6.32 2.52 10.66 2.08 4.34-.44 7.8.39 7.8.39s3.64.85 7.37.58c3.72-.27 6.09.62 6.09.62s2.41.67 10.18.27c.31-.43.57-.91.77-1.43.67-1.69.64-3.47.05-4.99z" style="fill:#db5336;stroke-miterlimit:10;stroke:#db5336"/>
   <ellipse transform="matrix(-.929-.37.37-.929 37.3113 37.9507)" cx="22.3" cy="15.4" rx="4.96" ry="9.92" style="fill:#ca2a14"/>
   <g style="fill:#fff">
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.png b/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.png
new file mode 100644
index 0000000000..14178b6e4a
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.svg b/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.svg
new file mode 100644
index 0000000000..987c0f1e69
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/window-ajar.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m15.47 48.5l-1.94-31h36.94l-1.94 31z" style="fill:#f0f0f0"/>
+  <path d="m49.94 18l-1.88 30h-32.12l-1.88-30h35.88m1.06-1h-38l2 32h34l2-32z" style="fill:#646464"/>
+  <path d="m19.48 44.5l-.96-23h26.96l-.96 23z" style="fill:#d9f1ff"/>
+  <path d="m44.96 22l-.92 22h-24.08l-.92-22h25.92m1.04-1h-28l1 24h26l1-24z" style="fill:#7aadcc"/>
+  <g style="fill:#646464">
+    <path d="m46.78 32.48l.22-5c.01-.27.25-.49.52-.48.27.01.49.25.48.52l-.22 5c-.01.27-.25.49-.52.48-.27-.01-.49-.25-.48-.52"/>
+    <circle cx="47.5" cy="32.5" r="1"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-closed.png b/bundles/org.openhab.ui.iconset.classic/icons/window-closed.png
new file mode 100644
index 0000000000..2734184a70
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/window-closed.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-closed.svg b/bundles/org.openhab.ui.iconset.classic/icons/window-closed.svg
new file mode 100644
index 0000000000..bc0a688b83
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/window-closed.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#d9f1ff"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#7aadcc"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <g style="fill:#646464">
+    <path d="m46 36.5v-5c0-.27.22-.5.5-.5.27 0 .5.23.5.5v5c0 .28-.23.5-.5.5-.28 0-.5-.22-.5-.5"/>
+    <circle cx="46.5" cy="31.5" r="1"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-open.png b/bundles/org.openhab.ui.iconset.classic/icons/window-open.png
new file mode 100644
index 0000000000..82aea4ee1c
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/window-open.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window-open.svg b/bundles/org.openhab.ui.iconset.classic/icons/window-open.svg
new file mode 100644
index 0000000000..0d780641dd
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/window-open.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <path d="m15.5 48.6v-33.2l17-3.78v40.76z" style="fill:#f0f0f0"/>
+  <path d="m32 12.25v39.51l-16-3.56v-32.4l16-3.55m1-1.25l-18 4v34l18 4v-42z" style="fill:#646464"/>
+  <path d="m18.5 44.61v-25.22l11-2.75v30.72z" style="fill:#d9f1ff"/>
+  <path d="m29 17.28v29.44l-10-2.5v-24.44l10-2.5m1-1.28l-12 3v26l12 3v-32z" style="fill:#7aadcc"/>
+  <g style="fill:#646464">
+    <path d="m25.46 30.4l4.98-.4c.27-.02.52.18.54.46.02.27-.18.52-.46.54l-4.98.4c-.27.02-.52-.18-.54-.46-.02-.28.19-.52.46-.54"/>
+    <ellipse cx="30.62" cy="30.5" rx=".62" ry="1"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window.png b/bundles/org.openhab.ui.iconset.classic/icons/window.png
new file mode 100644
index 0000000000..c3aade1f91
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/window.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/window.svg b/bundles/org.openhab.ui.iconset.classic/icons/window.svg
new file mode 100644
index 0000000000..5f871f0963
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/window.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <path d="m15.5 15.5h33v33h-33z" style="fill:#f0f0f0"/>
+  <path d="m48 16v32h-32v-32h32m1-1h-34v34h34v-34z" style="fill:#646464"/>
+  <path d="m19.5 19.5h25v25h-25z" style="fill:#ebebeb"/>
+  <path d="m44 20v24h-24v-24h24m1-1h-26v26h26v-26z" style="fill:#b2b2b2"/>
+  <path d="m10.5 53.5v-43h43v43h-43m4-4h35v-35h-35v35" style="fill:#ececed"/>
+  <path d="m53 11v42h-42v-42h42m-39 39h1 34 1v-1-34-1h-1-34-1v1 34 1m40-40h-44v44h44v-44zm-39 39v-34h34v34h-34" style="fill:#9b9c9e"/>
+  <g style="fill:#646464">
+    <path d="m46 36.5v-5c0-.27.22-.5.5-.5.27 0 .5.23.5.5v5c0 .28-.23.5-.5.5-.28 0-.5-.22-.5-.5"/>
+    <circle cx="46.5" cy="31.5" r="1"/>
+  </g>
+</svg>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_1.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_1.svg
index 99442953fc..663035f958 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_1.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_1.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 18.9c-3.9 0-7.5-1.4-10.2-3.8 1.9-.8 3.2-2.3 3.4-3.9h13.5c.2 1.7 1.5 3.1 3.4 3.9-2.5 2.4-6.2 3.8-10.1 3.8" style="fill:#e67831"/>
   <path d="m38.4 11.7c.3 1.4 1.4 2.7 2.9 3.5-2.5 2-5.8 3.1-9.3 3.1s-6.8-1.1-9.3-3.1c1.5-.8 2.6-2.1 2.9-3.5h12.8m.9-1h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5s8.5-1.7 11.1-4.5c-2.2-.7-3.8-2.3-3.8-4.2z" style="fill:#dd6022"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#f4d0b1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_2.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_2.svg
index d93d4840da..1bc91b02a2 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_2.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 18.9c-3.9 0-7.5-1.4-10.2-3.8 1.9-.8 3.2-2.3 3.4-3.9h13.5c.2 1.7 1.5 3.1 3.4 3.9-2.5 2.4-6.2 3.8-10.1 3.8" style="fill:#edda7b"/>
   <path d="m38.4 11.7c.3 1.4 1.4 2.7 2.9 3.5-2.5 2-5.8 3.1-9.3 3.1s-6.8-1.1-9.3-3.1c1.5-.8 2.6-2.1 2.9-3.5h12.8m.9-1h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5s8.5-1.7 11.1-4.5c-2.2-.7-3.8-2.3-3.8-4.2z" style="fill:#ccb966"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#f4d0b1"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_3.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_3.svg
index ffe7841cbf..e2aa463681 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_3.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_3.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 18.9c-3.9 0-7.5-1.4-10.2-3.8 1.9-.8 3.2-2.3 3.4-3.9h13.5c.2 1.7 1.5 3.1 3.4 3.9-2.5 2.4-6.2 3.8-10.1 3.8" style="fill:#61452d"/>
   <path d="m38.4 11.7c.3 1.4 1.4 2.7 2.9 3.5-2.5 2-5.8 3.1-9.3 3.1s-6.8-1.1-9.3-3.1c1.5-.8 2.6-2.1 2.9-3.5h12.8m.9-1h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5s8.5-1.7 11.1-4.5c-2.2-.7-3.8-2.3-3.8-4.2z" style="fill:#513624"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#d29e7c"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_4.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_4.svg
index b121ecf1c8..8c608ec89c 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_4.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 18.9c-3.9 0-7.5-1.4-10.2-3.8 1.9-.8 3.2-2.3 3.4-3.9h13.5c.2 1.7 1.5 3.1 3.4 3.9-2.5 2.4-6.2 3.8-10.1 3.8" style="fill:#472e18"/>
   <path d="m38.4 11.7c.3 1.4 1.4 2.7 2.9 3.5-2.5 2-5.8 3.1-9.3 3.1-3.5 0-6.8-1.1-9.3-3.1 1.5-.8 2.6-2.1 2.9-3.5h12.8m.9-1h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5 4.5 0 8.5-1.7 11.1-4.5-2.2-.7-3.8-2.3-3.8-4.2z" style="fill:#382211"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#ba7750"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_5.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_5.svg
index 434883479c..7e385d93a6 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_5.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_5.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m32 18.9c-3.9 0-7.5-1.4-10.2-3.8 1.9-.8 3.2-2.3 3.4-3.9h13.5c.2 1.7 1.5 3.1 3.4 3.9-2.5 2.4-6.2 3.8-10.1 3.8" style="fill:#1c1914"/>
   <path d="m38.4 11.7c.3 1.4 1.4 2.7 2.9 3.5-2.5 2-5.8 3.1-9.3 3.1-3.5 0-6.8-1.1-9.3-3.1 1.5-.8 2.6-2.1 2.9-3.5h12.8m.9-1h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5 4.5 0 8.5-1.7 11.1-4.5-2.2-.7-3.8-2.3-3.8-4.2z" style="fill:#0a0907"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#a55d2b"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/woman_6.svg b/bundles/org.openhab.ui.iconset.classic/icons/woman_6.svg
index 08a0a9ac47..2cd5cf3052 100644
--- a/bundles/org.openhab.ui.iconset.classic/icons/woman_6.svg
+++ b/bundles/org.openhab.ui.iconset.classic/icons/woman_6.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
   <path d="m39.3 10.7c0 0 0 0 0 0h-14.5c0 0 0 0 0 0 0 1.9-1.6 3.5-3.9 4.2 2.7 2.7 6.6 4.5 11.1 4.5s8.5-1.7 11.1-4.5c-2.2-.7-3.8-2.3-3.8-4.2"/>
   <path d="m27.5 63.5c-1.7 0-3-1.3-3-3v-20c0-1.7 1.3-3 3-3s3 1.3 3 3v20c0 1.7-1.3 3-3 3" style="fill:#3c201d"/>
   <path d="m27.5 38c1.4 0 2.5 1.1 2.5 2.5v20c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-20c0-1.4 1.1-2.5 2.5-2.5m0-1c-1.9 0-3.5 1.6-3.5 3.5v20c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-20c0-1.9-1.5-3.5-3.5-3.5z" style="fill:#1e0e0e"/>
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/zoom.png b/bundles/org.openhab.ui.iconset.classic/icons/zoom.png
new file mode 100644
index 0000000000..92226b08f1
Binary files /dev/null and b/bundles/org.openhab.ui.iconset.classic/icons/zoom.png differ
diff --git a/bundles/org.openhab.ui.iconset.classic/icons/zoom.svg b/bundles/org.openhab.ui.iconset.classic/icons/zoom.svg
new file mode 100644
index 0000000000..272ff2c781
--- /dev/null
+++ b/bundles/org.openhab.ui.iconset.classic/icons/zoom.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64">
+  <defs>
+    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="16.2146" x2="20.5046" y1="20.5098" y2="16.2198">
+      <stop style="stop-color:#82828c"/>
+      <stop offset=".5" style="stop-color:#ccd3e7"/>
+      <stop offset="1" style="stop-color:#82828c"/>
+    </linearGradient>
+    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="8.5" x2="39.5" xlink:href="#0"/>
+    <radialGradient id="2" cx="24" cy="24" r="11.5" gradientUnits="userSpaceOnUse">
+      <stop offset=".5" style="stop-color:#d2faff"/>
+      <stop offset="1" style="stop-color:#b4c8e6"/>
+    </radialGradient>
+  </defs>
+  <path d="m52.8 55.8c-.8 0-1.6-.3-2.1-.9l-19.8-19.7c-.6-.6-.9-1.4-.9-2.2s.3-1.6.9-2.1c.6-.6 1.3-.9 2.1-.9s1.6.3 2.1.9l19.7 19.7c.6.6.9 1.3.9 2.1s-.3 1.6-.9 2.1c-.5.7-1.2 1-2 1" style="fill:url(#0)"/>
+  <path d="m33 30.5c.7 0 1.3.3 1.8.7l19.8 19.8c1 1 1 2.6 0 3.6-.5.5-1.1.7-1.8.7s-1.3-.3-1.8-.7l-19.8-19.8c-1-1-1-2.6 0-3.6.5-.4 1.1-.7 1.8-.7m0-1c-.9 0-1.8.3-2.5 1-1.4 1.4-1.4 3.6 0 5l19.7 19.7c.7.7 1.6 1 2.5 1s1.8-.3 2.5-1c1.4-1.4 1.4-3.6 0-5l-19.7-19.7c-.7-.7-1.6-1-2.5-1z" style="fill:#6a6a72"/>
+  <path d="m24 39.5c-8.5 0-15.5-7-15.5-15.5s7-15.5 15.5-15.5 15.5 7 15.5 15.5-7 15.5-15.5 15.5" style="fill:url(#1)"/>
+  <path d="m24 9c8.3 0 15 6.7 15 15s-6.7 15-15 15-15-6.7-15-15 6.7-15 15-15m0-1c-8.8 0-16 7.2-16 16s7.2 16 16 16 16-7.2 16-16-7.2-16-16-16z" style="fill:#6a6a72"/>
+  <path d="M24,35.5c-6.3,0-11.5-5.2-11.5-11.5S17.7,12.5,24,12.5S35.5,17.7,35.5,24S30.3,35.5,24,35.5z" style="fill:url(#2)"/>
+  <path d="m24 13c6.1 0 11 4.9 11 11s-4.9 11-11 11-11-4.9-11-11 4.9-11 11-11m0-1c-6.6 0-12 5.4-12 12s5.4 12 12 12 12-5.4 12-12-5.4-12-12-12z" style="fill:#6a6a72"/>
+</svg>