diff --git a/_includes/documentation-menu.html b/_includes/documentation-menu.html
index da37d973d..687582652 100644
--- a/_includes/documentation-menu.html
+++ b/_includes/documentation-menu.html
@@ -24,6 +24,12 @@
 					<li><a href="{{docu}}/features/iconsets/classic/readme.html">Classic Iconset</a></li>
 				</ul>
 			</li>
+			<li><a href="{{docu}}/features/io.html">System Integrations</a>
+				<ul>
+					<li><a href="{{docu}}/features/io/homekit/readme.html">HomeKit</a></li>
+					<li><a href="{{docu}}/features/io/hueemulation/readme.html">Amazon Echo</a></li>
+				</ul>
+			</li>
 		</ul>
 	</li>
 	<li><a href="{{docu}}/development/ide.html">Development</a>
diff --git a/_repos/openhab2-addons b/_repos/openhab2-addons
index fb6dd8b16..6ad07d3e8 160000
--- a/_repos/openhab2-addons
+++ b/_repos/openhab2-addons
@@ -1 +1 @@
-Subproject commit fb6dd8b1647eb7bdcabc0532f92fa9160613114a
+Subproject commit 6ad07d3e889671f4c0eb096b7e4f3101fb319901
diff --git a/_repos/smarthome b/_repos/smarthome
index 4e1eb3f60..c138f6648 160000
--- a/_repos/smarthome
+++ b/_repos/smarthome
@@ -1 +1 @@
-Subproject commit 4e1eb3f60b88ed1f596d1b7711e953f8aea9f66b
+Subproject commit c138f6648265dcc75f0bc16e40c810eab49aa9fd
diff --git a/features/addons.md b/features/addons.md
index d1fe473dc..e1193d339 100644
--- a/features/addons.md
+++ b/features/addons.md
@@ -13,6 +13,7 @@ _Note_: If you are successfully using a 1.x add-on with the 2.0 runtime, which i
 |-------------|----------------------|
 |[Bindings](bindings.html)| Bindings integrate physical hardware, external systems and web services in openHAB |
 |[User Interfaces](uis.html)| User interfaces are either native smartphone apps or web applications that access the openHAB server through the REST API |
+|[System Integration](io.html)| System integrations expose openHAB to an external system |
 
 ...
 
diff --git a/features/bindings/digitalstrom/readme.md b/features/bindings/digitalstrom/readme.md
index cf22d3d54..89e96b987 100644
--- a/features/bindings/digitalstrom/readme.md
+++ b/features/bindings/digitalstrom/readme.md
@@ -105,7 +105,7 @@ The digitalSTROM-Server thing has the following configuration parameter groups *
 
 At the thing file, a manual configuration looks e.g. like
 ```
-Bridge digitalstrom:dssBridge:dssBridge1 [ ipAddress="dss.local.",  userName=”dssadmin”, password=“dssadmin”, sensorDataUpdateIntervall=”180”]
+Bridge digitalstrom:dssBridge:dssBridge1 [ ipAddress="dss.local.",  userName="dssadmin", password=“dssadmin", sensorDataUpdateIntervall="180"]
 ```
 
 ### digitalSTROM-Devices: 
@@ -154,7 +154,7 @@ Usually the discovery works reliable, so that a manual configuration is not need
 However, at the thing file, a manual configuration looks e.g. like 
 
 ```
-Thing digitalstrom:GE:GE-KM200 [ dSID="´3504175fe0000000000043d4",  activePowerRefreshPriority=”low”, electricMeterRefreshPriority=“medium”, outputCurrentRefreshPriority=”high”]
+Thing digitalstrom:GE:GE-KM200 [ dSID="´3504175fe0000000000043d4",  activePowerRefreshPriority="low", electricMeterRefreshPriority=“medium", outputCurrentRefreshPriority="high"]
 
 Thing digitalstrom:GR:GR-KM200 [ dSID="3504175fe0000000000043d5"]
 ```
diff --git a/features/bindings/network/readme.md b/features/bindings/network/readme.md
index 310996cbc..c820aa443 100644
--- a/features/bindings/network/readme.md
+++ b/features/bindings/network/readme.md
@@ -19,7 +19,7 @@ Network devices can be manually discovered by sending a PING to every IP on the
 ## Thing Configuration
 
 ```
-network:device:1 [ hostname="192.168.0.64", port="0", retry="1", timeout="5000", refresh_interval="60000", use_system_ping="false" ]
+network:device:1 [ hostname="192.168.0.64", port="0", retry="1", timeout="5000", refresh_interval="60000", use_system_ping="false", dhcplisten="true" ]
 ```
 
 - hostname: IP address or hostname of the device
@@ -28,15 +28,29 @@ network:device:1 [ hostname="192.168.0.64", port="0", retry="1", timeout="5000",
 - timeout: How long shall the PING wait for an answer
 - refresh_interval: How often shall the device be checked
 - use\_system\_ping: Uses the ping of the operating system, instead of the Java ping. Useful if the devices cannot be reached by the Java ping.
+- dhcplisten: Listen for DHCP Request messages. If devices leave and reenter a network, they usually request their last IP address by a udp
+              broadcast message (DHCP, Message type Request). If we listen for those messages, we can make the status update more "real-time" and do not
+              have to wait for the next refresh cycle.
+              
+## Limitations
+This binding uses ping packets, if port is set to 0, to detect the status of a device.
+If you want to detect IoT devices, usually you have to configure them to support ping. 
+
+If you want to use "dhcplisten": Please make sure that the process which hosts this binding has elevated privileges for listening to sockets below port 1024.
+For example by setting the **cap_net_bind_service** capability:
+  * __setcap 'cap_net_bind_service=+ep' /usr/bin/java__
+  * Check with: __getcap /usr/bin/java__
+  
+    /usr/bin/java = cap_net_bind_service+ep
 
 ## Channels
 
 All devices support some of the following channels:
 
 | Channel Type ID | Item Type    | Description  |
-|-----------------|------------------------|--------------|----------------- |------------- |
-| online | Switch       | This channel indicates whether a device is online or not |
-| time   | Number       | This channel indicates the Ping time in milliseconds |
+|-----------------|--------------|----------------------------------------------- |
+| online          | Switch       | This channel indicates whether a device is online or not |
+| time            | Number       | This channel indicates the Ping time in milliseconds. Maybe 0 if no time is available. |
 
 
 ## Full Example
@@ -44,7 +58,7 @@ All devices support some of the following channels:
 demo.Things:
 
 ```
-network:device:1 [ hostname="192.168.0.64", port="0", retry="1", timeout="5000", refresh_interval="60000", use_system_ping="false" ]
+network:device:1 [ hostname="192.168.0.64", port="0", retry="1", timeout="5000", refresh_interval="60000", use_system_ping="false", dhcplisten="true" ]
 ```
 
 demo.items:
diff --git a/features/bindings/sonos/readme.md b/features/bindings/sonos/readme.md
index 969e91610..c36029cc0 100644
--- a/features/bindings/sonos/readme.md
+++ b/features/bindings/sonos/readme.md
@@ -10,7 +10,9 @@ This binding integrates the [Sonos Multi-Room Audio system](http://www.sonos.com
 
 ## Supported Things
 
-All available Sonos (playback) devices are supported by this binding. This includes the Play:1, Play:3, Play:5, Connect, Connect:Amp, Playbar, and Sub. The Bridge and Boost are not supported, but these devices do only have an auxiliary role in the Sonos network and do not have any playback capability
+All available Sonos (playback) devices are supported by this binding. This includes the Play:1, Play:3, Play:5, Connect, Connect:Amp, Playbar, and Sub. The Bridge and Boost are not supported, but these devices do only have an auxiliary role in the Sonos network and do not have any playback capability.
+
+When being defined in a *.things file, the specific thing types PLAY1, PLAY3, PLAY5, PLAYBAR, CONNECT and CONNECTAMP should be used.
 
 ## Discovery
 
@@ -25,7 +27,7 @@ The binding does not require any special configuration
 The Sonos Thing requires the UPnP UDN (Unique Device Name) as a configuration value in order for the binding to know how to access it. All the Sonos UDN have the "RINCON_000E58D8403A0XXXX" format. Additionally, a refresh interval, used to poll the Sonos device, can be specified (in seconds)
 In the thing file, this looks e.g. like
 ```
-Thing sonos:zoneplayer:1 [ udn="RINCON_000E58D8403A0XXXX", refresh=60]
+Thing sonos:PLAY1:1 [ udn="RINCON_000E58D8403A0XXXX", refresh=60]
 ```
 
 ## Channels
@@ -42,18 +44,21 @@ All devices support the following channels (non-exhaustive):
 ## Full Example
 
 demo.things:
+
 ```
-Thing sonos:zoneplayer:1 [ udn="RINCON_000E58D8403A0XXXX", refresh=60]
+Thing sonos:PLAY3:1 [ udn="RINCON_000E58D8403A0XXXX", refresh=60]
 ```
 
 demo.items:
+
 ```
-Dimmer Volume {channel="sonos:zoneplayer:1:volume"}
-String LineInUDN {channel="sonos:zoneplayer:1:playlinein"}
-Player Controller (controllerGroup) {channel="sonos:zoneplayer:1:control"}
+Dimmer Volume {channel="sonos:PLAY3:1:volume"}
+String LineInUDN {channel="sonos:PLAY3:1:playlinein"}
+Player Controller (controllerGroup) {channel="sonos:PLAY3:1:control"}
 ```
 
 demo.sitemap:
+
 ```
 sitemap demo label="Main Menu"
 {
diff --git a/features/bindings/wemo/readme.md b/features/bindings/wemo/readme.md
index 75d77d6e1..16d8dad46 100644
--- a/features/bindings/wemo/readme.md
+++ b/features/bindings/wemo/readme.md
@@ -26,7 +26,7 @@ The binding does not need any special configuration
 For manual Thing configuration, one needs to know the UUID of a certain WeMo device.
 In the thing file, this looks e.g. like
 ```
-[wemo:Socket-1-0-xxxxxx:Socket]
+wemo:socket:Switch1 [udn="Socket-1_0-221242K11xxxxx"]
 ```
 
 ## Channels
@@ -53,18 +53,18 @@ Devices support some of the following channels:
 
 demo.things:
 ```
-wemo:socket:11111111111
+wemo:socket:Switch1 [udn="Socket-1_0-221242K11xxxxx"]
 ```
 
 demo.items:
 ```
-Switch DemoSwitch    { channel="wemo:socket:1234567:state" }
-Switch LightSwitch   { channel="wemo:lightswitch:1234567:state" }
-Switch MotionSensor  { channel="wemo:Motion:1234567:state" }
-Number InsightPower  { channel="wemo:insight:1234567:currentpower" }
-Number InsightLastOn { channel="wemo:insight:1234567:lastOnFor" }
-Number InsightToday  { channel="wemo:insight:1234567:onToday" }
-Number InsightTotal  { channel="wemo:insight:1234567:onTotal" }
+Switch DemoSwitch    { channel="wemo:socket:Switch1:state" }
+Switch LightSwitch   { channel="wemo:lightswitch:Lightswitch1:state" }
+Switch MotionSensor  { channel="wemo:Motion:Sensor1:state" }
+Number InsightPower  { channel="wemo:insight:Insight1:currentPower" }
+Number InsightLastOn { channel="wemo:insight:Insight1:lastOnFor" }
+Number InsightToday  { channel="wemo:insight:Insight1:onToday" }
+Number InsightTotal  { channel="wemo:insight:Insight1:onTotal" }
 ```
 
 demo.sitemap:
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/README.md b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/README.md
deleted file mode 100644
index 722bf1ffc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/README.md
+++ /dev/null
@@ -1,380 +0,0 @@
----
-layout: documentation
----
-
-{% include base.html %}
-
-# Classic Icon Set
-
-This is a modernized version of the original icon set of openHAB 1.<br/><br/>
-
-![alarm](icons/alarm.png)
-![attic](icons/attic.png)
-![baby_1](icons/baby_1.png)
-![baby_2](icons/baby_2.png)
-![baby_3](icons/baby_3.png)
-![baby_4](icons/baby_4.png)
-![baby_5](icons/baby_5.png)
-![baby_6](icons/baby_6.png)
-![bath](icons/bath.png)
-![battery-0](icons/battery-0.png)
-![battery-10](icons/battery-10.png)
-![battery-100](icons/battery-100.png)
-![battery-20](icons/battery-20.png)
-![battery-30](icons/battery-30.png)
-![battery-40](icons/battery-40.png)
-![battery-50](icons/battery-50.png)
-![battery-60](icons/battery-60.png)
-![battery-70](icons/battery-70.png)
-![battery-80](icons/battery-80.png)
-![battery-90](icons/battery-90.png)
-![battery](icons/battery.png)
-![bedroom](icons/bedroom.png)
-![bedroom_blue](icons/bedroom_blue.png)
-![bedroom_orange](icons/bedroom_orange.png)
-![bedroom_red](icons/bedroom_red.png)
-![blinds-0](icons/blinds-0.png)
-![blinds-10](icons/blinds-10.png)
-![blinds-100](icons/blinds-100.png)
-![blinds-20](icons/blinds-20.png)
-![blinds-30](icons/blinds-30.png)
-![blinds-40](icons/blinds-40.png)
-![blinds-50](icons/blinds-50.png)
-![blinds-60](icons/blinds-60.png)
-![blinds-70](icons/blinds-70.png)
-![blinds-80](icons/blinds-80.png)
-![blinds-90](icons/blinds-90.png)
-![blinds](icons/blinds.png)
-![bluetooth](icons/bluetooth.png)
-![boiler_viessmann](icons/boiler_viessmann.png)
-![boy_1](icons/boy_1.png)
-![boy_2](icons/boy_2.png)
-![boy_3](icons/boy_3.png)
-![boy_4](icons/boy_4.png)
-![boy_5](icons/boy_5.png)
-![boy_6](icons/boy_6.png)
-![calendar](icons/calendar.png)
-![camera](icons/camera.png)
-![carbondioxide](icons/carbondioxide.png)
-![cellar](icons/cellar.png)
-![chart](icons/chart.png)
-![cinema](icons/cinema.png)
-![cinemascreen-0](icons/cinemascreen-0.png)
-![cinemascreen-10](icons/cinemascreen-10.png)
-![cinemascreen-100](icons/cinemascreen-100.png)
-![cinemascreen-20](icons/cinemascreen-20.png)
-![cinemascreen-30](icons/cinemascreen-30.png)
-![cinemascreen-40](icons/cinemascreen-40.png)
-![cinemascreen-50](icons/cinemascreen-50.png)
-![cinemascreen-60](icons/cinemascreen-60.png)
-![cinemascreen-70](icons/cinemascreen-70.png)
-![cinemascreen-80](icons/cinemascreen-80.png)
-![cinemascreen-90](icons/cinemascreen-90.png)
-![cinemascreen](icons/cinemascreen.png)
-![cistern-0](icons/cistern-0.png)
-![cistern-10](icons/cistern-10.png)
-![cistern-100](icons/cistern-100.png)
-![cistern-20](icons/cistern-20.png)
-![cistern-30](icons/cistern-30.png)
-![cistern-40](icons/cistern-40.png)
-![cistern-50](icons/cistern-50.png)
-![cistern-60](icons/cistern-60.png)
-![cistern-70](icons/cistern-70.png)
-![cistern-80](icons/cistern-80.png)
-![cistern-90](icons/cistern-90.png)
-![cistern](icons/cistern.png)
-![climate-on](icons/climate-on.png)
-![climate](icons/climate.png)
-![clock-on](icons/clock-on.png)
-![clock](icons/clock.png)
-![colorlight](icons/colorlight.png)
-![colorwheel](icons/colorwheel.png)
-![contact-ajar](icons/contact-ajar.png)
-![contact-closed](icons/contact-closed.png)
-![contact-open](icons/contact-open.png)
-![contact](icons/contact.png)
-![corridor](icons/corridor.png)
-![dimmablelight-0](icons/dimmablelight-0.png)
-![dimmablelight-10](icons/dimmablelight-10.png)
-![dimmablelight-100](icons/dimmablelight-100.png)
-![dimmablelight-20](icons/dimmablelight-20.png)
-![dimmablelight-30](icons/dimmablelight-30.png)
-![dimmablelight-40](icons/dimmablelight-40.png)
-![dimmablelight-50](icons/dimmablelight-50.png)
-![dimmablelight-60](icons/dimmablelight-60.png)
-![dimmablelight-70](icons/dimmablelight-70.png)
-![dimmablelight-80](icons/dimmablelight-80.png)
-![dimmablelight-90](icons/dimmablelight-90.png)
-![dimmablelight](icons/dimmablelight.png)
-![door-closed](icons/door-closed.png)
-![door-open](icons/door-open.png)
-![door](icons/door.png)
-![dryer-0](icons/dryer-0.png)
-![dryer-1](icons/dryer-1.png)
-![dryer-2](icons/dryer-2.png)
-![dryer-3](icons/dryer-3.png)
-![dryer-4](icons/dryer-4.png)
-![dryer-5](icons/dryer-5.png)
-![dryer](icons/dryer.png)
-![energy](icons/energy.png)
-![error](icons/error.png)
-![fan](icons/fan.png)
-![fan_box](icons/fan_box.png)
-![fan_ceiling](icons/fan_ceiling.png)
-![faucet](icons/faucet.png)
-![fire-off](icons/fire-off.png)
-![fire-on](icons/fire-on.png)
-![fire](icons/fire.png)
-![firstfloor](icons/firstfloor.png)
-![flow](icons/flow.png)
-![flowpipe](icons/flowpipe.png)
-![frontdoor-closed](icons/frontdoor-closed.png)
-![frontdoor-open](icons/frontdoor-open.png)
-![frontdoor](icons/frontdoor.png)
-![garage](icons/garage.png)
-![garage_detached](icons/garage_detached.png)
-![garage_detached_selected](icons/garage_detached_selected.png)
-![garagedoor-0](icons/garagedoor-0.png)
-![garagedoor-10](icons/garagedoor-10.png)
-![garagedoor-100](icons/garagedoor-100.png)
-![garagedoor-20](icons/garagedoor-20.png)
-![garagedoor-30](icons/garagedoor-30.png)
-![garagedoor-40](icons/garagedoor-40.png)
-![garagedoor-50](icons/garagedoor-50.png)
-![garagedoor-60](icons/garagedoor-60.png)
-![garagedoor-70](icons/garagedoor-70.png)
-![garagedoor-80](icons/garagedoor-80.png)
-![garagedoor-90](icons/garagedoor-90.png)
-![garagedoor-ajar](icons/garagedoor-ajar.png)
-![garagedoor-closed](icons/garagedoor-closed.png)
-![garagedoor-open](icons/garagedoor-open.png)
-![garagedoor](icons/garagedoor.png)
-![garden](icons/garden.png)
-![gas](icons/gas.png)
-![girl_1](icons/girl_1.png)
-![girl_2](icons/girl_2.png)
-![girl_3](icons/girl_3.png)
-![girl_4](icons/girl_4.png)
-![girl_5](icons/girl_5.png)
-![girl_6](icons/girl_6.png)
-![grass](icons/grass.png)
-![greenhouse](icons/greenhouse.png)
-![groundfloor](icons/groundfloor.png)
-![group](icons/group.png)
-![heating-0](icons/heating-0.png)
-![heating-100](icons/heating-100.png)
-![heating-20](icons/heating-20.png)
-![heating-40](icons/heating-40.png)
-![heating-60](icons/heating-60.png)
-![heating-80](icons/heating-80.png)
-![heating-off](icons/heating-off.png)
-![heating-on](icons/heating-on.png)
-![heating](icons/heating.png)
-![house](icons/house.png)
-![humidity-0](icons/humidity-0.png)
-![humidity-10](icons/humidity-10.png)
-![humidity-100](icons/humidity-100.png)
-![humidity-20](icons/humidity-20.png)
-![humidity-30](icons/humidity-30.png)
-![humidity-40](icons/humidity-40.png)
-![humidity-50](icons/humidity-50.png)
-![humidity-60](icons/humidity-60.png)
-![humidity-70](icons/humidity-70.png)
-![humidity-80](icons/humidity-80.png)
-![humidity-90](icons/humidity-90.png)
-![humidity](icons/humidity.png)
-![incline](icons/incline.png)
-![keyring](icons/keyring.png)
-![kitchen](icons/kitchen.png)
-![light-off](icons/light-off.png)
-![light-on](icons/light-on.png)
-![light](icons/light.png)
-![line-decline](icons/line-decline.png)
-![line-incline](icons/line-incline.png)
-![line-stagnation](icons/line-stagnation.png)
-![line](icons/line.png)
-![lock-closed](icons/lock-closed.png)
-![lock-open](icons/lock-open.png)
-![lock](icons/lock.png)
-![man_1](icons/man_1.png)
-![man_2](icons/man_2.png)
-![man_3](icons/man_3.png)
-![man_4](icons/man_4.png)
-![man_5](icons/man_5.png)
-![man_6](icons/man_6.png)
-![microphone](icons/microphone.png)
-![moon](icons/moon.png)
-![motion](icons/motion.png)
-![movecontrol](icons/movecontrol.png)
-![network-off](icons/network-off.png)
-![network-on](icons/network-on.png)
-![network](icons/network.png)
-![niveau](icons/niveau.png)
-![office](icons/office.png)
-![oil](icons/oil.png)
-![outdoorlight](icons/outdoorlight.png)
-![pantry](icons/pantry.png)
-![parents-off](icons/parents-off.png)
-![parents_1_1](icons/parents_1_1.png)
-![parents_1_2](icons/parents_1_2.png)
-![parents_1_3](icons/parents_1_3.png)
-![parents_1_4](icons/parents_1_4.png)
-![parents_1_5](icons/parents_1_5.png)
-![parents_1_6](icons/parents_1_6.png)
-![parents_2_1](icons/parents_2_1.png)
-![parents_2_2](icons/parents_2_2.png)
-![parents_2_3](icons/parents_2_3.png)
-![parents_2_4](icons/parents_2_4.png)
-![parents_2_5](icons/parents_2_5.png)
-![parents_2_6](icons/parents_2_6.png)
-![parents_3_1](icons/parents_3_1.png)
-![parents_3_2](icons/parents_3_2.png)
-![parents_3_3](icons/parents_3_3.png)
-![parents_3_4](icons/parents_3_4.png)
-![parents_3_5](icons/parents_3_5.png)
-![parents_3_6](icons/parents_3_6.png)
-![parents_4_1](icons/parents_4_1.png)
-![parents_4_2](icons/parents_4_2.png)
-![parents_4_3](icons/parents_4_3.png)
-![parents_4_4](icons/parents_4_4.png)
-![parents_4_5](icons/parents_4_5.png)
-![parents_4_6](icons/parents_4_6.png)
-![parents_5_1](icons/parents_5_1.png)
-![parents_5_2](icons/parents_5_2.png)
-![parents_5_3](icons/parents_5_3.png)
-![parents_5_4](icons/parents_5_4.png)
-![parents_5_5](icons/parents_5_5.png)
-![parents_5_6](icons/parents_5_6.png)
-![parents_6_1](icons/parents_6_1.png)
-![parents_6_2](icons/parents_6_2.png)
-![parents_6_3](icons/parents_6_3.png)
-![parents_6_4](icons/parents_6_4.png)
-![parents_6_5](icons/parents_6_5.png)
-![parents_6_6](icons/parents_6_6.png)
-![party](icons/party.png)
-![pie](icons/pie.png)
-![piggybank](icons/piggybank.png)
-![player](icons/player.png)
-![poweroutlet-au](icons/poweroutlet-au.png)
-![poweroutlet-eu](icons/poweroutlet-eu.png)
-![poweroutlet-off](icons/poweroutlet-off.png)
-![poweroutlet-on](icons/poweroutlet-on.png)
-![poweroutlet-uk](icons/poweroutlet-uk.png)
-![poweroutlet-us](icons/poweroutlet-us.png)
-![poweroutlet](icons/poweroutlet.png)
-![present-off](icons/present-off.png)
-![present](icons/present.png)
-![pressure](icons/pressure.png)
-![projector_benq](icons/projector_benq.png)
-![pump](icons/pump.png)
-![qualityofservice-0](icons/qualityofservice-0.png)
-![qualityofservice-1](icons/qualityofservice-1.png)
-![qualityofservice-2](icons/qualityofservice-2.png)
-![qualityofservice-3](icons/qualityofservice-3.png)
-![qualityofservice-4](icons/qualityofservice-4.png)
-![radiator](icons/radiator.png)
-![rain](icons/rain.png)
-![receiver-off](icons/receiver-off.png)
-![receiver-on](icons/receiver-on.png)
-![receiver](icons/receiver.png)
-![recorder](icons/recorder.png)
-![returnpipe](icons/returnpipe.png)
-![rgb](icons/rgb.png)
-![rollershutter-0](icons/rollershutter-0.png)
-![rollershutter-10](icons/rollershutter-10.png)
-![rollershutter-100](icons/rollershutter-100.png)
-![rollershutter-20](icons/rollershutter-20.png)
-![rollershutter-30](icons/rollershutter-30.png)
-![rollershutter-40](icons/rollershutter-40.png)
-![rollershutter-50](icons/rollershutter-50.png)
-![rollershutter-60](icons/rollershutter-60.png)
-![rollershutter-70](icons/rollershutter-70.png)
-![rollershutter-80](icons/rollershutter-80.png)
-![rollershutter-90](icons/rollershutter-90.png)
-![rollershutter](icons/rollershutter.png)
-![settings](icons/settings.png)
-![sewerage-0](icons/sewerage-0.png)
-![sewerage-10](icons/sewerage-10.png)
-![sewerage-100](icons/sewerage-100.png)
-![sewerage-20](icons/sewerage-20.png)
-![sewerage-30](icons/sewerage-30.png)
-![sewerage-40](icons/sewerage-40.png)
-![sewerage-50](icons/sewerage-50.png)
-![sewerage-60](icons/sewerage-60.png)
-![sewerage-70](icons/sewerage-70.png)
-![sewerage-80](icons/sewerage-80.png)
-![sewerage-90](icons/sewerage-90.png)
-![sewerage](icons/sewerage.png)
-![shield-0](icons/shield-0.png)
-![shield-1](icons/shield-1.png)
-![shield](icons/shield.png)
-![signal-0](icons/signal-0.png)
-![signal-1](icons/signal-1.png)
-![signal-2](icons/signal-2.png)
-![signal-3](icons/signal-3.png)
-![signal-4](icons/signal-4.png)
-![siren-off](icons/siren-off.png)
-![siren-on](icons/siren-on.png)
-![siren](icons/siren.png)
-![slider-0](icons/slider-0.png)
-![slider-10](icons/slider-10.png)
-![slider-100](icons/slider-100.png)
-![slider-20](icons/slider-20.png)
-![slider-30](icons/slider-30.png)
-![slider-40](icons/slider-40.png)
-![slider-50](icons/slider-50.png)
-![slider-60](icons/slider-60.png)
-![slider-70](icons/slider-70.png)
-![slider-80](icons/slider-80.png)
-![slider-90](icons/slider-90.png)
-![slider](icons/slider.png)
-![smiley](icons/smiley.png)
-![smoke](icons/smoke.png)
-![sofa](icons/sofa.png)
-![softener](icons/softener.png)
-![solarplant](icons/solarplant.png)
-![soundvolume-0](icons/soundvolume-0.png)
-![soundvolume-100](icons/soundvolume-100.png)
-![soundvolume-33](icons/soundvolume-33.png)
-![soundvolume-66](icons/soundvolume-66.png)
-![soundvolume](icons/soundvolume.png)
-![soundvolume_mute](icons/soundvolume_mute.png)
-![status](icons/status.png)
-![suitcase](icons/suitcase.png)
-![sun](icons/sun.png)
-![sun_clouds](icons/sun_clouds.png)
-![sunrise](icons/sunrise.png)
-![sunset](icons/sunset.png)
-![switch-off](icons/switch-off.png)
-![switch-on](icons/switch-on.png)
-![switch](icons/switch.png)
-![television-on](icons/television-on.png)
-![televison-off](icons/televison-off.png)
-![temperature](icons/temperature.png)
-![temperature_cold](icons/temperature_cold.png)
-![temperature_hot](icons/temperature_hot.png)
-![terrace](icons/terrace.png)
-![text](icons/text.png)
-![toilet](icons/toilet.png)
-![vacation](icons/vacation.png)
-![video](icons/video.png)
-![wardrobe](icons/wardrobe.png)
-![washingmachine](icons/washingmachine.png)
-![washingmachine_2-0](icons/washingmachine_2-0.png)
-![washingmachine_2-1](icons/washingmachine_2-1.png)
-![washingmachine_2-2](icons/washingmachine_2-2.png)
-![washingmachine_2-3](icons/washingmachine_2-3.png)
-![washingmachine_2](icons/washingmachine_2.png)
-![water](icons/water.png)
-![wind](icons/wind.png)
-![window-ajar](icons/window-ajar.png)
-![window-closed](icons/window-closed.png)
-![window-open](icons/window-open.png)
-![window](icons/window.png)
-![woman_1](icons/woman_1.png)
-![woman_2](icons/woman_2.png)
-![woman_3](icons/woman_3.png)
-![woman_4](icons/woman_4.png)
-![woman_5](icons/woman_5.png)
-![woman_6](icons/woman_6.png)
-![zoom](icons/zoom.png)
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/_iconcopy b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/_iconcopy
deleted file mode 100644
index a7f1b0ed1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/_iconcopy
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-#
-#  Create needed icon copies.
-#
-
-
-# Aliases
-
-cp -f house.png             group.png
-cp -f house.svg             group.svg
-
-
-# Alternative Types
-
-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 signal-4.png          signal.png
-cp -f signal-4.svg          signal.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 signal.png            qualityofservice.png
-cp -f signal.svg            qualityofservice.svg
-
-cp -f microphone.png        recorder.png
-cp -f microphone.svg        recorder.svg
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.png
deleted file mode 100644
index f4ac89270..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.svg
deleted file mode 100644
index ca0ea0ba5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/alarm.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.png
deleted file mode 100644
index d15fafd1a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.svg
deleted file mode 100644
index 55bea1ebe..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/attic.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.19l19.5-9.75 19.5 9.75v45.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V59H13V14.62L32,5.12 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m17.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.47 23.47h6.06v6.06h-6.06z" style="fill:#f0f0f0"/>
-  <g style="fill:#c8c8c8">
-    <path d="m46.06 23.94v5.13h-5.13v-5.13h5.13m.94-.94h-7v7h7v-7z"/>
-    <path d="m44 41h1v1h-1z"/>
-  </g>
-  <path d="m12.5 20.5v-6.19l19.5-9.75 19.5 9.75v6.19z" style="fill:#ffccd3"/>
-  <path d="M32,5.12l19,9.5V20H13v-5.38L32,5.12 M32,4L12,14v7h40v-7L32,4L32,4z" style="fill:#f66"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#ffccd3"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#f66"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#ffccd3"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#f66"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.png
deleted file mode 100644
index 8dbe69956..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.svg
deleted file mode 100644
index 7a3dc27c2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_1.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#e5b795"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-.5-.5-.7-1.1-.7-1.8 0-.7.3-1.3.7-1.8l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.5-1.1.8-1.7.8" style="fill:#f4d0b1"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9.8 0 1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#e5b795"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#f4d0b1"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9.8 0 1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#e5b795"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.png
deleted file mode 100644
index 48de8565e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.svg
deleted file mode 100644
index 7fecb8bd2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_2.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#d89f79"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-.5-.5-.7-1.1-.7-1.8 0-.7.3-1.3.7-1.8l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.5-1.1.8-1.7.8" style="fill:#e7b48f"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#d89f79"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#e7b48f"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6c-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#d89f79"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.png
deleted file mode 100644
index c8b07d929..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.svg
deleted file mode 100644
index ca6e166f1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_3.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#c18a6b"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-.5-.5-.7-1.1-.7-1.8 0-.7.3-1.3.7-1.8l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.5-1.1.8-1.7.8" style="fill:#d29e7c"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#c18a6b"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#d29e7c"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6c-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#c18a6b"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.png
deleted file mode 100644
index 4412eb0de..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.svg
deleted file mode 100644
index 052d64c28..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_4.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#a35c3d"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-.5-.5-.7-1.1-.7-1.8 0-.7.3-1.3.7-1.8l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.5-1.1.8-1.7.8" style="fill:#ba7750"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#a35c3d"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#ba7750"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6c-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#a35c3d"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.png
deleted file mode 100644
index 93b14af0e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.svg
deleted file mode 100644
index 9248bae60..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_5.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#89471b"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-.5-.5-.7-1.1-.7-1.8 0-.7.3-1.3.7-1.8l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.5-1.1.8-1.7.8" style="fill:#a55d2b"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#89471b"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#a55d2b"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9.8 0 1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#89471b"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.png
deleted file mode 100644
index 7b080f657..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.svg
deleted file mode 100644
index af7af3e3f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/baby_6.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 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"/>
-  <path d="m22.7 41.9l4.9 4.9-4.6 4.7-.7.7.7.7 6.4 6.4c.8.8.8 2 0 2.8l-.4.3c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-6.4-6.4-2.1-2.1c-1.9-1.9-1.9-5.1 0-7.1l5-4.9m0-1.4l-5.7 5.7c-2.3 2.3-2.3 6.1 0 8.5l2.1 2.1 6.4 6.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l.4-.4c1.2-1.2 1.2-3.1 0-4.2l-6.4-6.4 5.3-5.3-6.3-6.4z" style="fill:#1e0e0e"/>
-  <path d="m36.4 63.5c-.7 0-1.3-.3-1.8-.7l-.4-.4c-1-1-1-2.6 0-3.5l6.7-6.7-5.3-5.3 5.7-5.7 5.3 5.3c2.1 2.1 2.1 5.6 0 7.8l-8.5 8.5c-.4.4-1.1.7-1.7.7" style="fill:#3c201d"/>
-  <path d="m41.3 41.9l4.9 4.9c1.9 1.9 1.9 5.1 0 7.1l-2.1 2.1-6.4 6.4c-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-.4-.4c-.8-.8-.8-2 0-2.8l6.4-6.4.7-.7-.6-.6-4.6-4.6 4.9-5m0-1.4l-6.3 6.4 5.3 5.3-6.4 6.4c-1.2 1.2-1.2 3.1 0 4.2l.4.4c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9l6.4-6.4 2.1-2.1c2.3-2.3 2.3-6.1 0-8.5l-5.7-5.7z" style="fill:#1e0e0e"/>
-  <path d="m51.2 38c-.7 0-1.3-.3-1.8-.7l-9-9v8h-17v-8l-9 9c-.5.5-1.1.7-1.8.7-.7 0-1.3-.3-1.8-.7-1-1-1-2.6 0-3.5l12.9-12.8c.5-.5 1.1-.7 1.8-.7h.1.1 12.6c0 0 .1 0 .1 0 .7 0 1.4.3 1.8.7l12.8 12.7c1 1 1 2.6 0 3.5-.5.5-1.1.8-1.8.8" style="fill:#3c201d"/>
-  <path d="m38.3 20.8h.1.1c.5 0 1 .2 1.4.6l12.7 12.7c.8.8.8 2 0 2.8-.4.4-.9.6-1.4.6s-1-.2-1.4-.6l-8.1-8.1-1.7-1.7v2.4 6.3h-16v-6.3-2.4l-1.7 1.7-8.1 8.1c-.4.4-.9.6-1.4.6-.5 0-1-.2-1.4-.6-.8-.8-.8-2 0-2.8l12.7-12.7c.4-.4.9-.6 1.4-.6h.1c0 0 .1 0 .1 0h12.6m0-1h-12.6c0 0-.1 0-.1 0 0 0-.1 0-.1 0-.8 0-1.5.3-2.1.9l-12.8 12.7c-1.2 1.2-1.2 3.1 0 4.2.6.6 1.4.9 2.1.9.8 0 1.5-.3 2.1-.9l8.1-8.1v7.3h18v-7.3l8.1 8.1c.6.6 1.4.9 2.1.9s1.5-.3 2.1-.9c1.2-1.2 1.2-3.1 0-4.2l-12.6-12.8c-.6-.6-1.4-.9-2.1-.9 0 .1-.1.1-.2.1z" style="fill:#1e0e0e"/>
-  <path d="m23 36.8l-.3 3.7 6.3 6.4h6l6.3-6.4-.3-3.7z" style="fill:#fff;stroke-miterlimit:10;stroke:#e8e8e8;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.png
deleted file mode 100644
index 7e5fbbd38..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.svg
deleted file mode 100644
index c66c1d22e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bath.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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" y1="26.1191" x2="0" y2="46.5">
-      <stop style="stop-color:#fafafa"/>
-      <stop offset="1" style="stop-color:#dcdcdc"/>
-    </linearGradient>
-  </defs>
-  <path d="m3.12 24.88v-1.88c0-2.14 1.74-3.88 3.88-3.88h6c1.03 0 1.88.84 1.88 1.88v.88h-1.75v-.38c0-.34-.28-.62-.62-.62h-5.51c-1.17 0-2.12.95-2.12 2.12v1.88h-1.76" style="fill:#c5c6c8"/>
-  <path d="m13 19.25c.96 0 1.75.79 1.75 1.75v.75h-1.5v-.25c0-.41-.34-.75-.75-.75h-5.5c-1.24 0-2.25 1.01-2.25 2.25v1.75h-1.5v-1.75c0-2.07 1.68-3.75 3.75-3.75h6m0-.25h-6c-2.2 0-4 1.8-4 4v2h2v-2c0-1.1.9-2 2-2h5.5c.28 0 .5.22.5.5v.5h2v-1c0-1.1-.9-2-2-2z" style="fill:#8c8c8c"/>
-  <path d="m13.7 46.5c-9.6 0-11.72-16.74-12.04-19.96l60.67-.42c-.17 1.57-.96 6.5-4.36 12.71-3.97 7.25-9 7.65-9.21 7.67h-35.06" style="fill:url(#0)"/>
-  <path d="m61.77 26.62c-.28 1.95-1.21 6.44-4.23 11.97-3.88 7.08-8.6 7.4-8.76 7.41h-35.08c-8.72 0-11.01-14.82-11.48-18.96l59.55-.42m1.11-1.01l-61.76.44c0 0 1.43 20.95 12.58 20.95s35.07 0 35.07 0 5.39-.18 9.63-7.93c4.25-7.74 4.48-13.46 4.48-13.46z" style="fill:#b4b4b4"/>
-  <path d="m1 26.58c-.28 0-.5-.22-.5-.5v-1.58h63v1.58c0 .28-.22.5-.5.5h-62" style="fill:#f0f0f0"/>
-  <path d="m63 25v1.08h-62v-1.08h62m1-1h-64v2.08c0 .55.45 1 1 1h62c.55 0 1-.45 1-1v-2.08z" style="fill:#b4b4b4"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.png
deleted file mode 100644
index 4f4e4caa8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.svg
deleted file mode 100644
index e112d9daa..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-0.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.png
deleted file mode 100644
index 389445154..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.svg
deleted file mode 100644
index 202af8c95..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-10.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.png
deleted file mode 100644
index 207b75fea..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.svg
deleted file mode 100644
index 84c10ad42..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-100.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.png
deleted file mode 100644
index 2c46cf098..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.svg
deleted file mode 100644
index d67ab8e84..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-20.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.png
deleted file mode 100644
index 0c22b254e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.svg
deleted file mode 100644
index 282948a9d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-30.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.png
deleted file mode 100644
index 0873c4a2b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.svg
deleted file mode 100644
index 036a8b0ea..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-40.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.png
deleted file mode 100644
index 327e0305b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.svg
deleted file mode 100644
index 80d3e950c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-50.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.png
deleted file mode 100644
index ae80eea59..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.svg
deleted file mode 100644
index e15bf43bc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-60.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.png
deleted file mode 100644
index 2833da5c9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.svg
deleted file mode 100644
index c7ed8c7fc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-70.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.png
deleted file mode 100644
index 6db4779f4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.svg
deleted file mode 100644
index 3ebd53177..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-80.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.png
deleted file mode 100644
index d23cf0b4c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.svg
deleted file mode 100644
index 2031e75cf..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery-90.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.png
deleted file mode 100644
index 4f4e4caa8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.svg
deleted file mode 100644
index e112d9daa..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/battery.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.png
deleted file mode 100644
index d98aa9372..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.svg
deleted file mode 100644
index 65ec9aab3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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="-47.0055" x2="-39.6209" gradientTransform="matrix(1.2374.212-.1689.9856 78.2996 32.5442)">
-      <stop style="stop-color:#b4b4b4"/>
-      <stop offset=".4354" style="stop-color:#a9a9a9"/>
-      <stop offset="1" style="stop-color:#a0a0a0"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="24.75" x2="0" y2="46">
-      <stop style="stop-color:#fff"/>
-      <stop offset="1" style="stop-color:#b4b4b4"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="18" x2="58" xlink:href="#3"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="19.71" y1="25.8551" x2="11.1441" y2="34.421">
-      <stop style="stop-color:#fff"/>
-      <stop offset="1" style="stop-color:#c8c8c8"/>
-    </linearGradient>
-  </defs>
-  <path d="m58.5 25.5h5v24h-5z" style="fill:#845340"/>
-  <path d="m63 26v23h-4v-23h4m1-1h-6v25h6v-25z" style="fill:#663629"/>
-  <path d="m20.75 36.92c-.5 0-.98-.11-1.43-.33l-11.38-5.62c-.78-.38-1.36-1.05-1.64-1.87-.28-.82-.22-1.71.16-2.48l.71-1.45c.54-1.1 1.69-1.81 2.92-1.81.5 0 .98.11 1.43.33l11.38 5.61c1.61.79 2.27 2.74 1.48 4.35l-.71 1.45c-.53 1.1-1.68 1.82-2.92 1.82" style="fill:url(#1)"/>
-  <path d="m10.1 23.61c.46 0 .9.1 1.32.31l11.39 5.61c.72.35 1.25.97 1.51 1.73s.21 1.57-.15 2.29l-.71 1.45c-.5 1.02-1.56 1.67-2.7 1.67-.46 0-.9-.1-1.32-.31l-11.39-5.61c-1.48-.73-2.1-2.53-1.37-4.02l.71-1.45c.51-1.01 1.57-1.67 2.71-1.67m0-.5c-1.29 0-2.54.72-3.15 1.95l-.71 1.45c-.85 1.73-.13 3.84 1.59 4.69l11.39 5.61c.49.24 1.02.36 1.54.36 1.29 0 2.54-.72 3.15-1.95l.71-1.45c.85-1.73.13-3.84-1.59-4.69l-11.39-5.61c-.5-.24-1.02-.36-1.54-.36z" style="fill:#bebebe"/>
-  <path d="m5.5 32.5h53v10h-53z" style="fill:#845340"/>
-  <path d="m58 33v9h-52v-9h52m1-1h-54v11h54v-11z" style="fill:#663629"/>
-  <path d="M54.25,31H40.5c0,0-7.6-0.1-12.5-2.5  c-4.9-2.4-10-3.75-10-3.75V31v11.25c0,2.07,1.68,3.75,3.75,3.75H53c2.76,0,5-2.24,5-5v-6.25C58,32.68,56.32,31,54.25,31z" style="fill:url(#2);stroke-miterlimit:10;stroke:#bebebe;stroke-width:.5"/>
-  <path d="m19 26.08c1.79.55 5.24 1.69 8.56 3.32 5.04 2.46 12.61 2.6 12.94 2.6h13.75c1.52 0 2.75 1.23 2.75 2.75v6.25c0 2.21-1.79 4-4 4h-31.25c-1.52 0-2.75-1.23-2.75-2.75v-11.25-4.92m-1-1.33v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75z" style="fill:url(#0)"/>
-  <path d="m27.79 32.78l-9.14-1.57.21-1.21 9.14 1.57z" style="fill:url(#3)"/>
-  <path d="m.5 14.5h5v35h-5z" style="fill:#845340"/>
-  <path d="m5 15v34h-4v-34h4m1-1h-6v36h6v-36z" style="fill:#663629"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.png
deleted file mode 100644
index 23b832011..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.svg
deleted file mode 100644
index 216d44695..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_blue.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
-      <stop style="stop-color:#fff"/>
-      <stop offset="1" style="stop-color:#c8c8c8"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="2.4692" x2="9.8538" gradientTransform="matrix(1.2374.212-.1689.9856 18.7773 12.1372)">
-      <stop style="stop-color:#00255f"/>
-      <stop offset=".0124" style="stop-color:#00255e"/>
-      <stop offset=".6276" style="stop-color:#001945"/>
-      <stop offset="1" style="stop-color:#00143c"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="18" x2="58" xlink:href="#2"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="24.75" x2="0" y2="46">
-      <stop style="stop-color:#0062ca"/>
-      <stop offset=".28" style="stop-color:#004ca0"/>
-      <stop offset=".5974" style="stop-color:#003678"/>
-      <stop offset=".8485" style="stop-color:#00295e"/>
-      <stop offset="1" style="stop-color:#002455"/>
-    </linearGradient>
-  </defs>
-  <path d="m58.5 25.5h5v24h-5z" style="fill:#845340"/>
-  <path d="m63 26v23h-4v-23h4m1-1h-6v25h6v-25z" style="fill:#663629"/>
-  <path d="m20.75 36.92c-.5 0-.98-.11-1.43-.33l-11.38-5.62c-.78-.38-1.36-1.05-1.64-1.87-.28-.82-.22-1.71.16-2.48l.71-1.45c.54-1.1 1.69-1.81 2.93-1.81.5 0 .98.11 1.43.33l11.38 5.61c.78.38 1.36 1.05 1.64 1.87.28.83.22 1.71-.16 2.48l-.71 1.45c-.54 1.1-1.69 1.82-2.93 1.82" style="fill:url(#3)"/>
-  <path d="m10.1 23.11v.5c.46 0 .9.1 1.32.31l11.39 5.61c.72.35 1.25.97 1.51 1.73s.21 1.57-.15 2.29l-.71 1.45c-.5 1.02-1.56 1.67-2.7 1.67-.46 0-.9-.1-1.32-.31l-11.39-5.61c-1.48-.73-2.1-2.53-1.37-4.02l.71-1.45c.5-1.02 1.56-1.67 2.7-1.67v-.5m.01 0c-1.29 0-2.54.72-3.15 1.95l-.71 1.45c-.85 1.73-.13 3.84 1.59 4.69l11.39 5.61c.49.24 1.02.36 1.54.36 1.29 0 2.54-.72 3.15-1.95l.71-1.45c.85-1.73.13-3.84-1.59-4.69l-11.39-5.61c-.5-.24-1.02-.36-1.54-.36" style="fill:#bebebe"/>
-  <path d="m5.5 32.5h53v10h-53z" style="fill:#845340"/>
-  <path d="m58 33v9h-52v-9h52m1-1h-54v11h54v-11z" style="fill:#663629"/>
-  <path d="m54.25 31h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75" style="fill:url(#1)"/>
-  <path d="m19 26.08c1.8.55 5.25 1.69 8.56 3.32 5.04 2.46 12.61 2.6 12.94 2.6h13.75c1.52 0 2.75 1.23 2.75 2.75v6.25c0 2.21-1.79 4-4 4h-31.25c-1.52 0-2.75-1.23-2.75-2.75v-11.25-4.92m-1-1.33v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75z" style="fill:url(#0)"/>
-  <path d="m27.79 32.78l-9.14-1.57.21-1.21 9.14 1.57z" style="fill:url(#2);opacity:.6"/>
-  <path d="m.5 14.5h5v35h-5z" style="fill:#845340"/>
-  <path d="m5 15v34h-4v-34h4m1-1h-6v36h6v-36z" style="fill:#663629"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.png
deleted file mode 100644
index bcff1afb1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.svg
deleted file mode 100644
index 3cc743fa8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_orange.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
-      <stop style="stop-color:#fff"/>
-      <stop offset="1" style="stop-color:#c8c8c8"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="19.6626" x2="27.0472" gradientTransform="matrix(1.2374.212-.1689.9856-.2171-4.8231)">
-      <stop style="stop-color:#cc9200"/>
-      <stop offset=".5481" style="stop-color:#de820f"/>
-      <stop offset="1" style="stop-color:#e77a17"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="18" x2="58" xlink:href="#2"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="24.75" x2="0" y2="46">
-      <stop style="stop-color:#f6b501"/>
-      <stop offset=".3311" style="stop-color:#f09c0a"/>
-      <stop offset=".7476" style="stop-color:#e98314"/>
-      <stop offset="1" style="stop-color:#e77a17"/>
-    </linearGradient>
-  </defs>
-  <path d="m58.5 25.5h5v24h-5z" style="fill:#845340"/>
-  <path d="m63 26v23h-4v-23h4m1-1h-6v25h6v-25z" style="fill:#663629"/>
-  <path d="m20.75 36.92c-.5 0-.98-.11-1.43-.33l-11.38-5.62c-.78-.38-1.36-1.05-1.64-1.87-.28-.82-.22-1.71.16-2.48l.71-1.45c.54-1.1 1.69-1.81 2.93-1.81.5 0 .98.11 1.43.33l11.38 5.61c.78.38 1.36 1.05 1.64 1.87.28.83.22 1.71-.16 2.48l-.71 1.45c-.54 1.1-1.69 1.82-2.93 1.82" style="fill:url(#3)"/>
-  <path d="m10.1 23.11v.5c.46 0 .9.1 1.32.31l11.39 5.61c.72.35 1.25.97 1.51 1.73s.21 1.57-.15 2.29l-.71 1.45c-.5 1.02-1.56 1.67-2.7 1.67-.46 0-.9-.1-1.32-.31l-11.39-5.61c-1.48-.73-2.1-2.53-1.37-4.02l.71-1.45c.5-1.02 1.56-1.67 2.7-1.67v-.5m.01 0c-1.29 0-2.54.72-3.15 1.95l-.71 1.45c-.85 1.73-.13 3.84 1.59 4.69l11.39 5.61c.49.24 1.02.36 1.54.36 1.29 0 2.54-.72 3.15-1.95l.71-1.45c.85-1.73.13-3.84-1.59-4.69l-11.39-5.61c-.5-.24-1.02-.36-1.54-.36" style="fill:#bebebe"/>
-  <path d="m5.5 32.5h53v10h-53z" style="fill:#845340"/>
-  <path d="m58 33v9h-52v-9h52m1-1h-54v11h54v-11z" style="fill:#663629"/>
-  <path d="m54.25 31h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75" style="fill:url(#1)"/>
-  <path d="m19 26.08c1.8.55 5.25 1.69 8.56 3.32 5.04 2.46 12.61 2.6 12.94 2.6h13.75c1.52 0 2.75 1.23 2.75 2.75v6.25c0 2.21-1.79 4-4 4h-31.25c-1.52 0-2.75-1.23-2.75-2.75v-11.25-4.92m-1-1.33v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75z" style="fill:url(#0)"/>
-  <path d="m27.79 32.78l-9.14-1.57.21-1.21 9.14 1.57z" style="fill:url(#2);opacity:.6"/>
-  <path d="m.5 14.5h5v35h-5z" style="fill:#845340"/>
-  <path d="m5 15v34h-4v-34h4m1-1h-6v36h6v-36z" style="fill:#663629"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.png
deleted file mode 100644
index 22cd81c88..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.svg
deleted file mode 100644
index e3bec8048..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bedroom_red.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="3" gradientUnits="userSpaceOnUse" x1="19.7097" y1="25.8555" x2="11.1442" y2="34.421">
-      <stop style="stop-color:#fff"/>
-      <stop offset="1" style="stop-color:#c8c8c8"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="-14.7243" x2="-7.3397" gradientTransform="matrix(1.2374.212-.1689.9856 37.7717 29.0976)">
-      <stop style="stop-color:#a10012"/>
-      <stop offset="1" style="stop-color:#7c0009"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="18" x2="58">
-      <stop style="stop-color:#880012"/>
-      <stop offset=".1945" style="stop-color:#7c000d"/>
-      <stop offset=".6962" style="stop-color:#630004"/>
-      <stop offset="1" style="stop-color:#5a0000"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="24.75" x2="0" y2="46">
-      <stop style="stop-color:#e9002d"/>
-      <stop offset=".3361" style="stop-color:#b2001e"/>
-      <stop offset=".6299" style="stop-color:#890012"/>
-      <stop offset=".8607" style="stop-color:#6f000c"/>
-      <stop offset="1" style="stop-color:#660009"/>
-    </linearGradient>
-  </defs>
-  <path d="m58.5 25.5h5v24h-5z" style="fill:#845340"/>
-  <path d="m63 26v23h-4v-23h4m1-1h-6v25h6v-25z" style="fill:#663629"/>
-  <path d="m20.75 36.92c-.5 0-.98-.11-1.43-.33l-11.38-5.62c-.78-.38-1.36-1.05-1.64-1.87-.28-.82-.22-1.71.16-2.48l.71-1.45c.54-1.1 1.69-1.81 2.93-1.81.5 0 .98.11 1.43.33l11.38 5.61c.78.38 1.36 1.05 1.64 1.87.28.83.22 1.71-.16 2.48l-.71 1.45c-.54 1.1-1.69 1.82-2.93 1.82" style="fill:url(#3)"/>
-  <path d="m10.1 23.11v.5c.46 0 .9.1 1.32.31l11.39 5.61c.72.35 1.25.97 1.51 1.73s.21 1.57-.15 2.29l-.71 1.45c-.5 1.02-1.56 1.67-2.7 1.67-.46 0-.9-.1-1.32-.31l-11.39-5.61c-1.48-.73-2.1-2.53-1.37-4.02l.71-1.45c.5-1.02 1.56-1.67 2.7-1.67v-.5m.01 0c-1.29 0-2.54.72-3.15 1.95l-.71 1.45c-.85 1.73-.13 3.84 1.59 4.69l11.39 5.61c.49.24 1.02.36 1.54.36 1.29 0 2.54-.72 3.15-1.95l.71-1.45c.85-1.73.13-3.84-1.59-4.69l-11.39-5.61c-.5-.24-1.02-.36-1.54-.36" style="fill:#bebebe"/>
-  <path d="m5.5 32.5h53v10h-53z" style="fill:#845340"/>
-  <path d="m58 33v9h-52v-9h52m1-1h-54v11h54v-11z" style="fill:#663629"/>
-  <path d="m54.25 31h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75" style="fill:url(#1)"/>
-  <path d="m19 26.08c1.79.55 5.24 1.69 8.56 3.32 5.04 2.46 12.61 2.6 12.94 2.6h13.75c1.52 0 2.75 1.23 2.75 2.75v6.25c0 2.21-1.79 4-4 4h-31.25c-1.52 0-2.75-1.23-2.75-2.75v-11.25-4.92m-1-1.33v6.25 11.25c0 2.07 1.68 3.75 3.75 3.75h31.25c2.76 0 5-2.24 5-5v-6.25c0-2.07-1.68-3.75-3.75-3.75h-13.75c0 0-7.6-.1-12.5-2.5-4.9-2.4-10-3.75-10-3.75z" style="fill:url(#0)"/>
-  <path d="m27.79 32.78l-9.14-1.57.21-1.21 9.14 1.57z" style="fill:url(#2);opacity:.6"/>
-  <path d="m.5 14.5h5v35h-5z" style="fill:#845340"/>
-  <path d="m5 15v34h-4v-34h4m1-1h-6v36h6v-36z" style="fill:#663629"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.png
deleted file mode 100644
index 451aa241d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.svg
deleted file mode 100644
index d22be37ed..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-0.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.png
deleted file mode 100644
index 1ccd1e95b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.svg
deleted file mode 100644
index cd808de5b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-10.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.png
deleted file mode 100644
index cb1be9e94..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.svg
deleted file mode 100644
index b8dfa323a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-100.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.png
deleted file mode 100644
index 9c91afed6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.svg
deleted file mode 100644
index f05db0f68..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-20.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.png
deleted file mode 100644
index dbd602c09..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.svg
deleted file mode 100644
index ecaccb327..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-30.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.png
deleted file mode 100644
index 680931759..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.svg
deleted file mode 100644
index 567a5bc07..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-40.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.png
deleted file mode 100644
index 8567e3a50..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.svg
deleted file mode 100644
index 517b70167..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-50.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.png
deleted file mode 100644
index bcc40e6c9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.svg
deleted file mode 100644
index 9a0900305..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-60.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.png
deleted file mode 100644
index 55f9d28c2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.svg
deleted file mode 100644
index 78b130269..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-70.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.png
deleted file mode 100644
index 97ee1f2e5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.svg
deleted file mode 100644
index 63c7dace8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-80.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.png
deleted file mode 100644
index 1953b2053..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.svg
deleted file mode 100644
index fdeb17174..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds-90.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.png
deleted file mode 100644
index 55f9d28c2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.svg
deleted file mode 100644
index 78b130269..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/blinds.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.png
deleted file mode 100644
index a0e1e3eb1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.svg
deleted file mode 100644
index ec60c1fa4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/bluetooth.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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">
-  <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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.png
deleted file mode 100644
index 05bdebfa2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.svg
deleted file mode 100644
index eee51b401..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boiler_viessmann.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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="10.5" x2="53.5">
-      <stop style="stop-color:#c9d0e4"/>
-      <stop offset=".0139" style="stop-color:#c4cadd"/>
-      <stop offset=".0797" style="stop-color:#b0b4c3"/>
-      <stop offset=".1524" style="stop-color:#a0a2af"/>
-      <stop offset=".2346" style="stop-color:#9596a1"/>
-      <stop offset=".3343" style="stop-color:#8e8e99"/>
-      <stop offset=".5" style="stop-color:#8c8c96"/>
-      <stop offset=".6327" style="stop-color:#8e8f99"/>
-      <stop offset=".7393" style="stop-color:#9698a3"/>
-      <stop offset=".8368" style="stop-color:#a4a6b4"/>
-      <stop offset=".9283" style="stop-color:#b6bbcc"/>
-      <stop offset="1" style="stop-color:#c9d0e4"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="15.8943" y1="30.223" x2="49.8127" y2="10.6401">
-      <stop style="stop-color:#ccd3e7"/>
-      <stop offset=".1314" style="stop-color:#bfc5d7"/>
-      <stop offset=".5145" style="stop-color:#9ea1af"/>
-      <stop offset=".8172" style="stop-color:#8a8a95"/>
-      <stop offset="1" style="stop-color:#82828c"/>
-    </linearGradient>
-  </defs>
-  <path d="m4.5 6.5h55v57h-55z" style="fill:#8b96ac"/>
-  <path d="m59 7v56h-54v-56h54m1-1h-1-54-1v1 56 1h1 54 1v-1-56-1z" style="fill:#676b72"/>
-  <path d="m10.5 59.5v-42.54c6.55-.3 14.14-.46 21.99-.46 7.43 0 14.68.14 21.01.41v42.59h-43" style="fill:url(#0)"/>
-  <path d="m32.49 17c7.25 0 14.31.14 20.51.39v41.61h-42v-41.57c6.42-.28 13.83-.43 21.49-.43m0-1c-8.33 0-16.07.18-22.49.48v43.52h44v-43.57c-6.22-.27-13.6-.43-21.51-.43z" style="fill:#666e7f"/>
-  <path d="m14.5 1.5h35v11h-35z" style="fill:#e8422e"/>
-  <path d="m49 2v10h-34v-10h34m1-1h-1-34-1v1 10 1h1 34 1v-1-10-1z" style="fill:#cc2215"/>
-  <path d="m17.5 41.5h14v14h-14z" style="fill:#737a8e"/>
-  <path d="m31 42v13h-13v-13h13m1-1h-15v15h15v-15z" style="fill:#3f434c"/>
-  <path d="m18 48h11v1h-11z" style="fill:#4b5059"/>
-  <circle cx="26" cy="48.5" r="2"/>
-  <path d="m32 32.78c-11.85 0-21.5-6.6-21.5-14.7 0-.36.03-.74.1-1.19 6.57-.26 14.14-.39 21.91-.39 7.36 0 14.58.12 20.9.35.07.47.1.86.1 1.23-.01 8.11-9.65 14.7-21.51 14.7" style="fill:url(#1)"/>
-  <path d="m32.5 17c7.2 0 14.25.12 20.45.34.03.27.04.51.04.74 0 7.83-9.42 14.2-21 14.2s-21-6.37-21-14.2c0-.22.01-.45.04-.71 6.47-.24 13.87-.37 21.47-.37m0-1c-8.23 0-15.9.15-22.34.41-.09.55-.17 1.1-.17 1.67 0 8.4 9.85 15.2 22 15.2s22-6.81 22-15.2c0-.58-.07-1.15-.17-1.71-6.22-.24-13.51-.37-21.32-.37z" style="fill:#666e7f"/>
-  <g style="fill:#cc2215">
-    <path d="m15 6h34v1h-34z"/>
-    <path d="m44 2h1v4h-1z"/>
-    <path d="m19 2h1v4h-1z"/>
-  </g>
-  <g transform="translate(106.80193-432.76044)">
-    <path d="m-79.16 442.8v-1.34h-.5v1.34h.5" id="2" style="fill:#fff"/>
-    <use xlink:href="#2"/>
-    <g style="fill:#fff">
-      <path d="m-73.43 441.46h-.67l-.21.55c-.02.05-.02.13-.02.13s-.01-.09-.02-.13l-.21-.55h-.67v1.34h.43v-.8c0 0 0 .05.02.09l.3.71h.29l.3-.72c.02-.04.02-.09.02-.09v.81h.43v-1.34"/>
-      <path d="m-73.43 441.46h-.67l-.21.55c-.02.05-.02.13-.02.13s-.01-.09-.02-.13l-.21-.55h-.67v1.34h.43v-.8c0 0 0 .05.02.09l.3.71h.29l.3-.72c.02-.04.02-.09.02-.09v.81h.43v-1.34z"/>
-    </g>
-    <path d="m-69.71 441.46h-.47v.74c0 0 0-.05-.03-.08l-.56-.65h-.5v1.34h.5v-.74c0 0 0 .05.03.08l.54.65h.49v-1.34" id="3" style="fill:#fff"/>
-    <use xlink:href="#3"/>
-    <path d="m-71.42 442.8l-.68-1.34h-.53l-.68 1.34h.45.07l.13-.25h.58l.13.25h.02.46.05m-1.11-.59c0 0 .12-.24.14-.28.02-.04.02-.09.02-.09s0 .05.02.09l.14.28h-.32" id="4" style="fill:#fff"/>
-    <use xlink:href="#4"/>
-    <path d="m-78.24 442.44v-.19h.75v-.3h-.75v-.17h.91v-.33h-1.38v1.34h1.42v-.36l-.95.01" id="5" style="fill:#fff"/>
-    <use xlink:href="#5"/>
-    <path d="m-81.88 441.46l.72 1.34h.58l.71-1.34h-.56l-.4.82c-.02.04-.02.09-.02.09s0-.05-.02-.09l-.4-.81-.61-.01" id="6" style="fill:#fff"/>
-    <use xlink:href="#6"/>
-    <path d="m-75.57 440.76h-1.1c0 0-.43.01-.43.44 0 .44.43.43.43.43h.65c0 0 .09 0 .09.09 0 .08-.09.08-.09.08h-1.05v.37h1.09c0 0 .46.02.46-.46 0-.41-.46-.42-.46-.42h-.62c0 0-.1 0-.1-.08 0-.08.1-.08.1-.08h1.03v-.37" id="7" style="fill:#fff"/>
-    <use xlink:href="#7"/>
-    <path d="m-67.73 441.46h-.47v.74c0 0 0-.05-.03-.08l-.56-.65h-.5v1.34h.5v-.74c0 0 0 .05.03.08l.54.65h.49v-1.34" id="8" style="fill:#fff"/>
-    <use xlink:href="#8"/>
-    <path d="m-75.57 442.36h-1.1c0 0-.43.01-.43.44 0 .44.43.43.43.43h.65c0 0 .09 0 .09.09 0 .08-.09.08-.09.08h-1.05v.37h1.09c0 0 .46.02.46-.46 0-.41-.46-.42-.46-.42h-.62c0 0-.1 0-.1-.08 0-.08.1-.08.1-.08h1.03v-.37" id="9" style="fill:#fff"/>
-    <use xlink:href="#9"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.png
deleted file mode 100644
index c0ebbf776..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.svg
deleted file mode 100644
index b15226ef5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_1.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#f4d0b1"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-4z" style="fill:#e5b795"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#f4d0b1"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#e5b795"/>
-  <path d="m25.9 11.3c-.3-.3-.5-.8-.5-1.4l.1-2.7-1 2.4c0-.2 0-.4 0-.6 0-4.1 3.4-7.5 7.5-7.5 3.4 0 6.2 2.2 7.2 5.3-.5-1.2-1.4-2.6-1.7-2.9-.9-.8-1.6-1.2-2.2-1.3l-1.1-.1.6.9c.1.2-.1 1-1.8 2.3-.7.5-1.5 1-2.3 1.5-2.1 1.4-4.1 2.7-4.8 4.1" style="fill:#e67831"/>
-  <path d="m32 2c.5 0 .9 0 1.4.1l.9 1.4c0 .2-.2.8-1.6 1.8-.7.5-1.4 1-2.3 1.5-1.8 1.2-3.5 2.3-4.4 3.5 0-.1 0-.2 0-.3l.2-4.8c1.2-1.9 3.4-3.2 5.8-3.2m0-1c-4.4 0-8 3.6-8 8 0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.4-.9.6-2 .6-3.1.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#dd6022"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-  <path d="m24 37v22h7v-15c0-.6.5-1 1-1s1 .4 1 1v15h7v-22h-16" style="fill:#527ecc"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.png
deleted file mode 100644
index 2413f5281..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.svg
deleted file mode 100644
index 4a917e3e5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_2.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#e7b48f"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-4z" style="fill:#d89f79"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#e7b48f"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#d89f79"/>
-  <path d="m25.9 11.3c-.3-.3-.5-.8-.5-1.4l.1-2.7-1 2.4c0-.2 0-.4 0-.6 0-4.1 3.4-7.5 7.5-7.5 3.4 0 6.2 2.2 7.2 5.3-.5-1.2-1.4-2.6-1.7-2.9-.9-.8-1.6-1.2-2.2-1.3l-1.1-.1.6.9c.1.2-.1 1-1.8 2.3-.7.5-1.5 1-2.3 1.5-2.1 1.4-4.1 2.7-4.8 4.1" style="fill:#edda7b"/>
-  <path d="m32 2c.5 0 .9 0 1.4.1l.9 1.4c0 .2-.2.8-1.6 1.8-.7.5-1.4 1-2.3 1.5-1.8 1.2-3.5 2.3-4.4 3.5 0-.1 0-.2 0-.3l.2-4.8c1.2-1.9 3.4-3.2 5.8-3.2m0-1c-4.4 0-8 3.6-8 8 0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.4-.9.6-2 .6-3.1.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#ccb966"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.png
deleted file mode 100644
index 501d6f342..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.svg
deleted file mode 100644
index c5a413237..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_3.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#d29e7c"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#c18a6b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#d29e7c"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#c18a6b"/>
-  <path d="m25.9 11.3c-.3-.3-.5-.8-.5-1.4l.1-2.7-1 2.4c0-.2 0-.4 0-.6 0-4.1 3.4-7.5 7.5-7.5 3.4 0 6.2 2.2 7.2 5.3-.5-1.2-1.4-2.6-1.7-2.9-.9-.8-1.6-1.2-2.2-1.3l-1.1-.1.6.9c.1.2-.1 1-1.8 2.3-.7.5-1.5 1-2.3 1.5-2.1 1.4-4.1 2.7-4.8 4.1" style="fill:#61452d"/>
-  <path d="m32 2c.5 0 .9 0 1.4.1l.9 1.4c0 .2-.2.8-1.6 1.8-.7.5-1.4 1-2.3 1.5-1.8 1.2-3.5 2.3-4.4 3.5 0-.1 0-.2 0-.3l.2-4.8c1.2-1.9 3.4-3.2 5.8-3.2m0-1c-4.4 0-8 3.6-8 8 0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.4-.9.6-2 .6-3.1.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#513624"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.png
deleted file mode 100644
index 49aadde61..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.svg
deleted file mode 100644
index 2a567eacd..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_4.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#ba7750"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#a35c3d"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#ba7750"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#a35c3d"/>
-  <path d="m25.9 11.3c-.3-.3-.5-.8-.5-1.4l.1-2.7-1 2.4c0-.2 0-.4 0-.6 0-4.1 3.4-7.5 7.5-7.5 3.4 0 6.2 2.2 7.2 5.3-.5-1.2-1.4-2.6-1.7-2.9-.9-.8-1.6-1.2-2.2-1.3l-1.1-.1.6.9c.1.2-.1 1-1.8 2.3-.7.5-1.5 1-2.3 1.5-2.1 1.4-4.1 2.7-4.8 4.1" style="fill:#472e18"/>
-  <path d="m32 2c.5 0 .9 0 1.4.1l.9 1.4c0 .2-.2.8-1.6 1.8-.7.5-1.4 1-2.3 1.5-1.8 1.2-3.5 2.3-4.4 3.5 0-.1 0-.2 0-.3l.2-4.8c1.2-1.9 3.4-3.2 5.8-3.2m0-1c-4.4 0-8 3.6-8 8 0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.4-.9.6-2 .6-3.1.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#382211"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.png
deleted file mode 100644
index 11a98687e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.svg
deleted file mode 100644
index 33df3253c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_5.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#a55d2b"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#89471b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#a55d2b"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#89471b"/>
-  <path d="m25.9 11.3c-.3-.3-.5-.8-.5-1.4l.1-2.7-1 2.4c0-.2 0-.4 0-.6 0-4.1 3.4-7.5 7.5-7.5 3.4 0 6.2 2.2 7.2 5.3-.5-1.2-1.4-2.6-1.7-2.9-.9-.8-1.6-1.2-2.2-1.3l-1.1-.1.6.9c.1.2-.1 1-1.8 2.3-.7.5-1.5 1-2.3 1.5-2.1 1.4-4.1 2.7-4.8 4.1" style="fill:#1c1914"/>
-  <path d="m32 2c.5 0 .9 0 1.4.1l.9 1.4c0 .2-.2.8-1.6 1.8-.7.5-1.4 1-2.3 1.5-1.8 1.2-3.5 2.3-4.4 3.5 0-.1 0-.2 0-.3l.2-4.8c1.2-1.9 3.4-3.2 5.8-3.2m0-1c-4.4 0-8 3.6-8 8 0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.4-.9.6-2 .6-3.1.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#0a0907"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.png
deleted file mode 100644
index 632653868..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.svg
deleted file mode 100644
index 915a376d3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/boy_6.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#3c201d"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#1e0e0e"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#000c51"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#3c201d"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#1e0e0e"/>
-  <path d="m40 9c0-4.4-3.6-8-8-8s-8 3.6-8 8c0 1 .2 1.9.5 2.8.1-1.1.4-1.9.4-1.9-.1 1.6 1.3 2.3 1.3 2.3 0-2 4.4-4.2 7-6.1s1.9-3 1.9-3c.7.1 1.7.9 1.9 1.1s1.4 1.9 1.8 3.1c.2.7.6 3 .5 4.7.5-.9.7-1.9.7-3"/>
-  <g style="fill:#fff;stroke-width:.99995145">
-    <path d="m28.63028 16.18004h3.06972v1.5h-4z"/>
-    <path d="m32.35823 18.69811h4.04177v1.5h-4z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.png
deleted file mode 100644
index 3bc58263a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.svg
deleted file mode 100644
index 1d261cd8b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/calendar.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="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"/>
-  <path d="M61,4v12H3V4H61 M62,3H2v14h60V3L62,3z" style="fill:#900"/>
-  <g style="fill:#c8c8c8">
-    <path d="m37 20h6v6h-6z"/>
-    <path d="m45 20h6v6h-6z"/>
-    <path d="m53 20h6v6h-6z"/>
-    <path d="m5 28h6v6h-6z"/>
-    <path d="m13 28h6v6h-6z"/>
-    <path d="m21 28h6v6h-6z"/>
-    <path d="m29 28h6v6h-6z"/>
-    <path d="m37 28h6v6h-6z"/>
-    <path d="m45 28h6v6h-6z"/>
-    <path d="m53 28h6v6h-6z"/>
-    <path d="m5 36h6v6h-6z"/>
-    <path d="m13 36h6v6h-6z"/>
-    <path d="m21 36h6v6h-6z"/>
-    <path d="m29 36h6v6h-6z"/>
-    <path d="m37 36h6v6h-6z"/>
-    <path d="m45 36h6v6h-6z"/>
-    <path d="m53 36h6v6h-6z"/>
-    <path d="m5 44h6v6h-6z"/>
-    <path d="m13 44h6v6h-6z"/>
-    <path d="m21 44h6v6h-6z"/>
-    <path d="m29 44h6v6h-6z"/>
-    <path d="m37 44h6v6h-6z"/>
-    <path d="m45 44h6v6h-6z"/>
-    <path d="m53 44h6v6h-6z"/>
-    <path d="m5 52h6v6h-6z"/>
-    <path d="m13 52h6v6h-6z"/>
-    <path d="m21 52h6v6h-6z"/>
-    <path d="m29 52h6v6h-6z"/>
-    <path d="m37 52h6v6h-6z"/>
-    <path d="m45 52h6v6h-6z"/>
-  </g>
-  <path d="m3 17h58v1h-58z" style="fill:#e6e6e6"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.png
deleted file mode 100644
index 5a0fce176..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.svg
deleted file mode 100644
index d173c99de..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/camera.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.png
deleted file mode 100644
index 3d2853bce..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.svg
deleted file mode 100644
index 30d8b91ef..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/carbondioxide.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.png
deleted file mode 100644
index 0892c480d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.svg
deleted file mode 100644
index fd2a8ca96..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cellar.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.19l19.5-9.75 19.5 9.75v45.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V59H13V14.62L32,5.12 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m17.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m25.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m30.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m38.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.47 23.47h6.06v6.06h-6.06z" style="fill:#f0f0f0"/>
-  <path d="m46.06 23.94v5.13h-5.13v-5.13h5.13m.94-.94h-7v7h7v-7z" style="fill:#c8c8c8"/>
-  <path d="m12.5 46.5h39v13h-39z" style="fill:#ffccd3"/>
-  <path d="m51 47v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#f66"/>
-  <path d="m44 41h1v1h-1z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.png
deleted file mode 100644
index 41d2027d6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.svg
deleted file mode 100644
index 6bbf32974..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/chart.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.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"/>
-  <path d="m40 17v45h-16v-45h16m1-1h-1-16-1v1 45 1h1 16 1v-1-45-1z" style="fill:#e57200"/>
-  <path d="m45.5 1.5h17v61h-17z" style="fill:#1e82ff"/>
-  <path d="m62 2v60h-16v-60h16m1-1h-1-16-1v1 60 1h1 16 1v-1-60-1z" style="fill:#1271d8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.png
deleted file mode 100644
index f32ee016d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.svg
deleted file mode 100644
index 85d221b2e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinema.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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="8" x2="56">
-      <stop/>
-      <stop offset="1" style="stop-opacity:.6"/>
-    </linearGradient>
-  </defs>
-  <path d="m32 27.64c-14.35 0-23.5-2.06-23.5-3.48s9.15-3.48 23.5-3.48 23.5 2.06 23.5 3.48-9.15 3.48-23.5 3.48" style="fill:#efe918"/>
-  <path d="m32 21.17c14.31 0 21.88 1.91 22.93 2.98-1.06 1.07-8.62 2.98-22.93 2.98s-21.88-1.91-22.93-2.98c1.05-1.07 8.62-2.98 22.93-2.98m0-1c-13.25 0-24 1.78-24 3.98s10.75 3.98 24 3.98c13.25 0 24-1.78 24-3.98s-10.75-3.98-24-3.98z" style="fill:#bfbfbf"/>
-  <path d="m25.61 16.94c-1.09 0-1.98-.88-1.98-1.97 0-.29.07-.59.21-.87l.22-.44-.48.08c-.05.01-.1.01-.16.02l-.09.01-.12.07c-.33.33-.76.51-1.22.51-.94 0-1.7-.76-1.7-1.69 0-.23.05-.45.13-.66l.04-.08-.03-.09c-.1-.31-.14-.57-.14-.83 0-1.55 1.26-2.81 2.82-2.81.39 0 .76.08 1.12.23l.24.1.09-.24c.4-1.07 1.4-1.76 2.54-1.76 1.5 0 2.72 1.22 2.72 2.71 0 .4-.1.8-.29 1.19l-.09.18.16.12c.61.47.96 1.17.96 1.93 0 1.34-1.1 2.43-2.45 2.43-.07 0-.14-.01-.2-.02l-.24-.03-.11.23c-.15.98-.97 1.68-1.95 1.68" style="fill:#fce857"/>
-  <path d="m27.1 6.76c1.36 0 2.47 1.1 2.47 2.46 0 .36-.09.73-.26 1.08l-.18.37.33.25c.55.42.87 1.05.87 1.73 0 1.2-.99 2.18-2.2 2.18-.05 0-.11-.01-.16-.02l-.1-.01-.48-.06-.07.47c-.13.84-.85 1.46-1.71 1.46-.96 0-1.73-.77-1.73-1.72 0-.25.06-.51.19-.76l.44-.88-.97.17c-.04.01-.08.01-.12.01l-.07.01-.18.02-.13.13c-.28.28-.65.44-1.04.44-.8 0-1.45-.65-1.45-1.44 0-.2.04-.39.11-.56l.07-.17-.06-.18c-.09-.28-.13-.52-.13-.76 0-1.41 1.15-2.56 2.57-2.56.35 0 .7.07 1.02.21l.48.21.19-.49c.35-.96 1.26-1.59 2.3-1.59m0-.5c-1.27 0-2.35.8-2.78 1.92-.37-.16-.79-.25-1.22-.25-1.69 0-3.07 1.37-3.07 3.06 0 .32.06.62.15.91-.1.23-.15.49-.15.76 0 1.07.87 1.94 1.95 1.94.55 0 1.04-.23 1.4-.59.08-.01.16-.01.24-.02-.15.3-.24.63-.24.98 0 1.23 1 2.22 2.23 2.22 1.11 0 2.03-.82 2.2-1.88.1.01.2.03.31.03 1.49 0 2.7-1.2 2.7-2.68 0-.87-.42-1.63-1.06-2.12.2-.4.32-.83.32-1.3-.01-1.65-1.34-2.98-2.98-2.98z" style="fill:#f4d731"/>
-  <path d="m34.91 28.88c-1.42 0-2.73-.72-3.49-1.94l-.17-.27-.22.23c-.65.68-1.52 1.05-2.45 1.05-1.86 0-3.37-1.51-3.37-3.36 0-1.85 1.51-3.36 3.37-3.36.98 0 1.92.44 2.57 1.21l.21.25.19-.26c.78-1.09 2.03-1.74 3.36-1.74 2.27 0 4.12 1.84 4.12 4.1 0 2.25-1.85 4.09-4.12 4.09" style="fill:#f8eec9"/>
-  <path d="m34.91 20.93c2.13 0 3.87 1.73 3.87 3.85 0 2.12-1.73 3.85-3.87 3.85-1.34 0-2.56-.68-3.28-1.82l-.34-.54-.44.46c-.6.63-1.4.97-2.26.97-1.72 0-3.12-1.4-3.12-3.11s1.4-3.11 3.12-3.11c.91 0 1.78.41 2.38 1.12l.42.49.37-.52c.72-1.03 1.9-1.64 3.15-1.64m0-.5c-1.48 0-2.78.73-3.57 1.85-.67-.78-1.65-1.29-2.76-1.29-2 0-3.62 1.62-3.62 3.61 0 2 1.62 3.61 3.62 3.61 1.04 0 1.97-.44 2.63-1.13.77 1.23 2.13 2.06 3.7 2.06 2.41 0 4.37-1.95 4.37-4.35 0-2.41-1.96-4.36-4.37-4.36z" style="fill:#eddca6"/>
-  <path d="m33.98 16.94c-.82 0-1.56-.46-1.93-1.19l-.08-.15-.31.03c-.06.01-.13.02-.2.02-2.07 0-3.75-1.67-3.75-3.73s1.68-3.73 3.75-3.73c.05 0 .1.01.15.01l.42.04-.02-.29c-.01-.14-.01-.17-.01-.21 0-1.29 1.06-2.34 2.35-2.34s2.35 1.05 2.35 2.34c0 .4-.11.78-.32 1.15l-.33.58.63-.22c.29-.1.56-.15.83-.15 1.4 0 2.54 1.13 2.54 2.53 0 .97-.55 1.84-1.44 2.26l-.11.05-.03.12c-.32 1.36-1.52 2.31-2.92 2.31l-.1-.01-.11.06c-.39.34-.86.52-1.36.52" style="fill:#f9ecb0"/>
-  <path d="m34.35 5.65c1.16 0 2.1.94 2.1 2.09 0 .35-.1.7-.28 1.03l-.66 1.15 1.26-.43c.27-.09.51-.14.75-.14 1.26 0 2.29 1.02 2.29 2.28 0 .87-.5 1.65-1.3 2.04l-.22.1-.05.23c-.29 1.25-1.39 2.12-2.63 2.12l-.05-.01h-.03-.18l-.14.12c-.35.29-.77.45-1.21.45-.72 0-1.38-.41-1.71-1.06l-.15-.3-.34.03c-.05 0-.1.01-.15.02-.05.01-.11.02-.16.02-1.93 0-3.5-1.56-3.5-3.48 0-1.92 1.57-3.48 3.5-3.48.04 0 .08.01.11.01.05.01.1.01.15.02l.59.04-.05-.58c0-.04-.01-.07-.01-.11 0-.02-.01-.04-.01-.07-.03-1.15.92-2.09 2.08-2.09m0-.5c-1.44 0-2.6 1.16-2.6 2.59 0 .07.02.14.02.22-.1-.01-.2-.03-.3-.03-2.21 0-4 1.78-4 3.98 0 2.2 1.79 3.98 4 3.98.12 0 .24-.03.36-.04.4.79 1.21 1.33 2.15 1.33.59 0 1.12-.22 1.53-.56.02 0 .03 0 .05 0 1.55 0 2.83-1.07 3.16-2.51.93-.45 1.58-1.39 1.58-2.49 0-1.53-1.25-2.78-2.79-2.78-.32 0-.62.06-.91.16.22-.38.35-.81.35-1.28 0-1.41-1.16-2.57-2.6-2.57z" style="fill:#efdc8f"/>
-  <path d="m32.77 25.46c-1.15 0-2.17-.7-2.6-1.79l-.09-.23-.23.09c-.29.11-.59.17-.88.17-.67 0-1.29-.27-1.76-.75-1.65-.85-2.64-2.43-2.64-4.19 0-2.57 2.1-4.66 4.67-4.66.46 0 .93.08 1.46.25l.16.05.11-.13c.38-.46.94-.73 1.53-.73 1.09 0 1.98.88 1.98 1.97 0 .28-.06.56-.19.83l-.17.37.4-.01.12-.01c1.96 0 3.56 1.59 3.56 3.55 0 1.62-1.11 3.03-2.7 3.43l-.12.03-.05.11c-.46 1-1.47 1.65-2.56 1.65" style="fill:#fce857"/>
-  <path d="m32.49 13.8c.95 0 1.73.77 1.73 1.72 0 .24-.06.49-.17.73l-.35.74.82-.03c.04 0 .08-.01.11-.01 1.83 0 3.31 1.48 3.31 3.3 0 1.51-1.03 2.81-2.51 3.18l-.23.06-.1.22c-.42.91-1.33 1.5-2.33 1.5-1.05 0-1.98-.64-2.37-1.63l-.18-.46-.46.18c-.26.1-.53.15-.79.15-.6 0-1.16-.24-1.58-.67l-.06-.06-.08-.04c-1.5-.76-2.43-2.26-2.43-3.91 0-2.43 1.98-4.41 4.42-4.41.43 0 .88.08 1.38.24l.32.11.22-.26c.33-.42.81-.65 1.33-.65m0-.5c-.7 0-1.31.32-1.72.82-.49-.16-1-.27-1.53-.27-2.72 0-4.92 2.2-4.92 4.91 0 1.91 1.11 3.55 2.71 4.36.49.51 1.17.83 1.94.83.34 0 .67-.07.97-.19.45 1.13 1.54 1.94 2.84 1.94 1.24 0 2.3-.74 2.79-1.79 1.65-.41 2.89-1.9 2.89-3.67 0-2.1-1.71-3.8-3.81-3.8-.04 0-.08.01-.12.01.13-.29.22-.6.22-.94-.03-1.22-1.03-2.21-2.26-2.21z" style="fill:#f4d731"/>
-  <path d="m20.38 25.32c-1.04 0-2.02-.41-2.74-1.15-.72-.73-1.11-1.7-1.1-2.72.01-1.02.42-1.98 1.15-2.7.39-.38.87-.67 1.42-.86l.26-.09-.11-.25c-.6-1.32-.3-2.88.73-3.88.65-.64 1.51-.99 2.43-.99.94 0 1.82.37 2.48 1.04.53.54.86 1.24.95 2.03l.03.27.27-.05c.08-.02.16-.02.23-.02.2 0 .49.05.72.29.33.34.38.86.12 1.27l-.17.27.31.1c.56.18 1.05.47 1.43.86.65.66 1 1.53.99 2.45-.01.92-.38 1.79-1.04 2.43-.65.63-1.51.98-2.42.98-.9 0-1.76-.34-2.41-.97l-.21-.2-.17.24c-.15.21-.3.39-.46.54-.72.72-1.68 1.11-2.69 1.11" style="fill:#e8d877"/>
-  <path d="m22.41 12.94c.87 0 1.69.34 2.3.96.49.5.8 1.15.88 1.88l.06.54.53-.11c.06-.01.12-.02.19-.02.15 0 .37.04.55.22.25.26.29.64.08.96l-.35.55.62.2c.52.17.97.43 1.33.8.6.61.93 1.42.92 2.27-.01.86-.35 1.66-.97 2.26-.6.59-1.4.91-2.24.91-.84 0-1.63-.32-2.24-.9l-.42-.4-.34.48c-.14.2-.28.37-.43.51-.68.66-1.57 1.02-2.52 1.02-.97 0-1.89-.38-2.57-1.07-.67-.68-1.03-1.59-1.02-2.54.01-.95.39-1.85 1.08-2.52.37-.36.81-.63 1.33-.81l.52-.18-.23-.5c-.55-1.22-.28-2.67.67-3.59.63-.59 1.43-.92 2.27-.92m0-.5c-.94 0-1.88.35-2.6 1.06-1.15 1.11-1.4 2.78-.78 4.16-.55.19-1.07.49-1.51.92-1.61 1.58-1.64 4.15-.06 5.77.8.81 1.86 1.22 2.92 1.22 1.03 0 2.07-.39 2.86-1.16.18-.18.34-.38.49-.58.72.69 1.65 1.04 2.58 1.04.93 0 1.87-.35 2.59-1.05 1.47-1.43 1.5-3.78.06-5.24-.44-.45-.97-.75-1.53-.92.31-.49.28-1.15-.15-1.58-.25-.25-.57-.37-.9-.37-.1 0-.19.01-.28.03-.09-.79-.42-1.56-1.02-2.17-.74-.76-1.7-1.13-2.67-1.13z" style="fill:#d6c056"/>
-  <path d="m40.02 30.83c-1.2 0-2.21-.86-2.41-2.05l-.02-.11-.09-.06c-1-.64-1.6-1.73-1.6-2.9 0-1.79 1.41-3.29 3.2-3.43l.15-.01.06-.14c.47-1.05 1.51-1.73 2.66-1.73 1.6 0 2.91 1.3 2.91 2.9 0 .53-.15 1.06-.44 1.52l-.16.26.28.11c.87.34 1.44 1.16 1.44 2.09 0 1.24-1.01 2.25-2.26 2.25-.39 0-.76-.1-1.12-.31l-.24-.14-.11.26c-.38.9-1.27 1.49-2.25 1.49" style="fill:#f9ecb0"/>
-  <path d="m41.98 20.65c1.47 0 2.66 1.19 2.66 2.65 0 .48-.14.96-.41 1.39l-.32.51.56.22c.78.3 1.28 1.03 1.28 1.86 0 1.1-.9 2-2.01 2-.34 0-.68-.09-.99-.27l-.49-.28-.22.51c-.35.81-1.14 1.33-2.02 1.33-1.08 0-1.99-.77-2.16-1.84l-.04-.22-.19-.12c-.93-.6-1.48-1.6-1.48-2.69 0-1.66 1.31-3.05 2.97-3.18l.3-.02.12-.27c.43-.96 1.39-1.58 2.44-1.58m0-.5c-1.29 0-2.4.78-2.89 1.88-1.92.15-3.43 1.73-3.43 3.68 0 1.31.69 2.45 1.71 3.11.21 1.28 1.31 2.26 2.65 2.26 1.11 0 2.07-.67 2.48-1.63.37.21.79.34 1.24.34 1.38 0 2.51-1.12 2.51-2.5 0-1.06-.66-1.96-1.6-2.32.3-.48.48-1.05.48-1.65.01-1.76-1.41-3.17-3.15-3.17z" style="fill:#efdc8f"/>
-  <path d="m37.14 22.49c-2.02 0-3.65-1.63-3.65-3.64 0-1.12.52-2.16 1.42-2.86l.11-.09-.02-.13c-.02-.13-.03-.19-.03-.25 0-.94.67-1.75 1.59-1.93l.15-.03.04-.15c.33-1.23 1.45-2.08 2.71-2.08 1.55 0 2.82 1.26 2.82 2.8 0 .39-.08.77-.24 1.13l-.1.23.23.1c.86.37 1.42 1.22 1.42 2.15 0 1.29-1.05 2.34-2.35 2.34-.15 0-.29-.02-.43-.04l-.2-.04-.08.19c-.56 1.4-1.89 2.3-3.39 2.3" style="fill:#e8d877"/>
-  <path d="m39.46 11.58c1.42 0 2.57 1.15 2.57 2.55 0 .35-.07.7-.22 1.03l-.21.46.46.2c.77.33 1.27 1.09 1.27 1.92 0 1.15-.94 2.09-2.1 2.09-.11 0-.23-.01-.38-.04l-.4-.07-.15.38c-.52 1.3-1.76 2.14-3.16 2.14-1.88 0-3.4-1.52-3.4-3.39 0-1.04.48-2.01 1.32-2.66l.23-.18-.04-.28-.01-.07c-.01-.05-.02-.1-.02-.15 0-.82.58-1.53 1.39-1.69l.3-.06.08-.3c.3-1.1 1.32-1.88 2.47-1.88m0-.5c-1.42 0-2.6.96-2.95 2.27-1.02.2-1.79 1.1-1.79 2.18 0 .1.02.19.03.28-.92.71-1.52 1.81-1.52 3.05 0 2.15 1.75 3.89 3.9 3.89 1.65 0 3.05-1.02 3.62-2.45.15.03.31.05.47.05 1.43 0 2.6-1.16 2.6-2.59 0-1.07-.65-1.98-1.57-2.38.17-.38.27-.79.27-1.24.01-1.69-1.36-3.06-3.06-3.06z" style="fill:#d6c056"/>
-  <path d="m47.55 22.31c-.99 0-1.94-.38-2.68-1.06l-.1-.09-.13.03c-.33.08-.64.12-.92.12-2.21 0-4.01-1.79-4.01-3.99 0-1.14.51-2.24 1.39-3l.17-.15-.13-.18c-.28-.4-.43-.86-.43-1.34 0-1.29 1.05-2.34 2.35-2.34 1 0 1.89.64 2.22 1.59l.07.2.2-.03c.14-.02.23-.03.33-.03 1.26 0 2.28 1.01 2.28 2.26v.2l.2.06c1.81.38 3.12 1.99 3.12 3.83 0 2.16-1.76 3.92-3.93 3.92" style="fill:#f9ecb0"/>
-  <path d="m43.07 10.55c.9 0 1.69.57 1.98 1.42l.17.39.41-.06c.08-.01.17-.03.26-.03 1.11 0 2.01.89 2.03 1.98v.01.04.41l.4.08c1.69.35 2.92 1.86 2.92 3.59 0 2.02-1.65 3.67-3.68 3.67-.93 0-1.82-.35-2.51-1l-.2-.18-.26.06c-.31.07-.6.11-.86.11-2.07 0-3.76-1.68-3.76-3.74 0-1.07.48-2.09 1.31-2.81l.34-.3-.26-.37c-.25-.35-.38-.77-.38-1.19-.01-1.14.93-2.08 2.09-2.08m0-.5c-1.43 0-2.6 1.16-2.6 2.59 0 .55.18 1.06.47 1.48-.9.78-1.48 1.91-1.48 3.19 0 2.34 1.9 4.24 4.26 4.24.34 0 .66-.05.98-.12.75.7 1.74 1.13 2.85 1.13 2.31 0 4.18-1.87 4.18-4.17 0-2.01-1.42-3.68-3.32-4.08 0-.01 0-.01 0-.02 0-1.39-1.13-2.51-2.53-2.51-.12 0-.24.02-.36.04-.34-1.03-1.3-1.77-2.45-1.77z" style="fill:#efdc8f"/>
-  <path d="m19.75 35.37c-2.74 0-4.99-2.14-5.12-4.87l-.01-.14-.12-.07c-1.2-.64-1.94-1.86-1.94-3.19 0-2.01 1.64-3.64 3.66-3.64.28 0 .56.04.9.13l.27.07.04-.28c.15-1.11 1.11-1.96 2.23-1.96 1.22 0 2.23.99 2.25 2.21v.27l.42-.05c.1-.01.19-.03.29-.03 2.37 0 4.3 1.92 4.3 4.28 0 1.56-.87 2.99-2.26 3.75l-.08.04-.03.09c-.73 2.03-2.66 3.39-4.8 3.39" style="fill:#f9ecb0"/>
-  <path d="m19.66 21.67c1.09 0 1.99.88 2.01 1.97l.01.54.54-.06c.06-.01.11-.01.17-.02.08-.01.17-.02.25-.02 2.24 0 4.05 1.81 4.05 4.03 0 1.46-.82 2.82-2.13 3.53l-.17.09-.07.18c-.71 1.92-2.55 3.21-4.58 3.21-2.6 0-4.74-2.04-4.87-4.63l-.01-.28-.25-.13c-1.11-.59-1.81-1.73-1.81-2.97 0-1.87 1.53-3.39 3.41-3.39.26 0 .52.04.84.12l.54.14.07-.56c.15-1 1-1.75 2-1.75m0-.5c-1.27 0-2.31.95-2.48 2.17-.31-.08-.63-.13-.96-.13-2.16 0-3.91 1.74-3.91 3.89 0 1.48.84 2.76 2.07 3.41.14 2.84 2.48 5.11 5.37 5.11 2.32 0 4.29-1.48 5.05-3.54 1.42-.77 2.39-2.25 2.39-3.97 0-2.5-2.04-4.53-4.55-4.53-.16 0-.31.03-.47.05-.03-1.36-1.14-2.46-2.51-2.46z" style="fill:#efdc8f"/>
-  <path d="m16.4 21.01c-2.5 0-4.58-1.95-4.74-4.45l-.01-.2-.19-.03c-1.3-.23-2.24-1.35-2.24-2.66 0-1.5 1.22-2.71 2.73-2.71l.19.02.24.02.02-.24c.12-1.15 1.08-2.02 2.24-2.02.78 0 1.5.4 1.92 1.07l.1.16.18-.06c.11-.03.21-.07.31-.07.58 0 1.05.47 1.05 1.05 0 .19-.07.38-.2.58l-.18.26.3.11c1.86.71 3.06 2.45 3.06 4.42-.01 2.62-2.15 4.75-4.78 4.75" style="fill:#f9ecb0"/>
-  <path d="m14.64 8.99c.7 0 1.33.36 1.7.95l.2.33.37-.11c.09-.03.17-.05.23-.05.44 0 .8.36.8.8 0 .14-.05.28-.16.43l-.36.52.59.23c1.76.68 2.9 2.32 2.9 4.19 0 2.48-2.03 4.5-4.52 4.5-2.37 0-4.34-1.85-4.49-4.22l-.02-.39-.39-.07c-1.18-.21-2.04-1.23-2.04-2.41 0-1.36 1.11-2.46 2.48-2.46.02 0 .04 0 .06.01.04.01.08.01.12.01l.48.03.05-.48c.11-1.04.97-1.81 2-1.81m0-.5c-1.3 0-2.35.98-2.49 2.24-.07-.01-.14-.02-.21-.02-1.64 0-2.98 1.33-2.98 2.96 0 1.46 1.06 2.66 2.45 2.91.17 2.61 2.33 4.68 4.99 4.68 2.77 0 5.02-2.24 5.02-5 0-2.13-1.34-3.93-3.22-4.66.14-.21.25-.45.25-.72 0-.72-.59-1.3-1.3-1.3-.14 0-.26.04-.38.08-.45-.7-1.23-1.17-2.13-1.17z" style="fill:#efdc8f"/>
-  <path d="m50.62 28.6c-.6 0-1.15-.28-1.51-.77l-.14-.19-.2.13c-.28.18-.6.28-.93.28-.94 0-1.7-.76-1.7-1.69 0-.14.02-.28.07-.45l.06-.22-.21-.08c-1.19-.47-1.96-1.59-1.96-2.86 0-1.68 1.38-3.06 3.07-3.08h.13l.07-.11c.78-1.21 2.11-1.93 3.54-1.93 2.32 0 4.21 1.88 4.21 4.19 0 1.7-1.02 3.22-2.61 3.88l-.23.1.09.23c.09.23.14.46.14.7 0 1.03-.85 1.87-1.89 1.87" style="fill:#fce857"/>
-  <path d="m50.9 17.87c2.18 0 3.96 1.77 3.96 3.94 0 1.6-.96 3.03-2.45 3.64l-.46.19.19.46c.08.2.12.4.12.61 0 .9-.74 1.63-1.64 1.63-.52 0-1-.25-1.31-.67l-.28-.38-.4.26c-.24.16-.51.24-.8.24-.8 0-1.45-.65-1.45-1.44 0-.11.02-.23.06-.38l.12-.43-.42-.16c-1.1-.43-1.81-1.46-1.81-2.63 0-1.55 1.27-2.82 2.82-2.83h.27l.15-.23c.74-1.14 1.98-1.82 3.33-1.82m0-.5c-1.57 0-2.95.82-3.75 2.04-1.84.01-3.32 1.5-3.32 3.33 0 1.41.88 2.61 2.12 3.1-.05.17-.08.34-.08.52 0 1.08.87 1.94 1.95 1.94.39 0 .76-.12 1.07-.32.39.53 1.01.88 1.72.88 1.19 0 2.14-.96 2.14-2.13 0-.28-.06-.55-.16-.8 1.62-.67 2.76-2.25 2.76-4.11.01-2.45-1.98-4.45-4.45-4.45z" style="fill:#f4d731"/>
-  <path d="m12.03 27.31c-1.5 0-2.72-1.22-2.72-2.71 0-.8.36-1.56.99-2.08l.22-.18-.21-.19c-.41-.38-.63-.89-.63-1.43 0-1.09.89-1.98 1.98-1.98.51 0 1 .2 1.37.56l.1.1.13-.03c.16-.04.3-.06.44-.06.95 0 1.73.74 1.78 1.68l.01.15.13.06c.84.39 1.35 1.2 1.35 2.12 0 1.26-1.03 2.31-2.3 2.34h-.15l-.07.14c-.44.92-1.38 1.51-2.42 1.51" style="fill:#fce857"/>
-  <path d="m11.66 18.98c.45 0 .87.17 1.2.49l.2.19.27-.07c.14-.04.26-.05.38-.05.81 0 1.49.64 1.53 1.45l.02.3.27.13c.75.35 1.21 1.07 1.21 1.89 0 1.12-.92 2.06-2.05 2.09l-.3.01-.13.27c-.42.86-1.27 1.39-2.22 1.39-1.36 0-2.47-1.11-2.47-2.46 0-.72.33-1.41.9-1.88l.44-.36-.42-.39c-.36-.33-.55-.78-.55-1.25-.01-.97.77-1.75 1.72-1.75m0-.5c-1.24 0-2.23 1-2.23 2.23 0 .64.28 1.21.71 1.62-.66.54-1.08 1.35-1.08 2.27 0 1.64 1.33 2.96 2.97 2.96 1.18 0 2.18-.69 2.67-1.67 1.41-.03 2.54-1.18 2.54-2.59 0-1.04-.62-1.93-1.5-2.34-.06-1.07-.95-1.92-2.03-1.92-.17 0-.34.03-.5.07-.4-.39-.95-.63-1.55-.63z" style="fill:#f4d731"/>
-  <g style="fill:#fff">
-    <path d="m16.9 58.81l-2.75-33.01c-2.94-.56-4.63-1.18-5.08-1.65.04-.04.11-.09.17-.14h-1.24l3.69 33.15c1.01.64 2.82 1.2 5.21 1.65"/>
-    <path d="m32 27.14v32.86h5l.92-32.98c-1.83.08-3.79.12-5.92.12"/>
-    <path d="m47.1 58.81l2.75-33.01c-1.62.31-3.62.59-6 .82l-1.83 32.9c1.89-.18 3.59-.42 5.08-.71"/>
-    <path d="m27 59.88l-.91-32.86c-2.19-.09-4.17-.23-5.94-.4l1.83 32.9c1.56.17 3.25.28 5.02.36"/>
-  </g>
-  <g style="fill:#f63000">
-    <path d="m21.97 59.53l-1.83-32.9c-2.38-.23-4.38-.51-6-.82l2.75 33.01c1.5.28 3.2.52 5.08.71"/>
-    <path d="m32 60v-32.86c-2.13 0-4.09-.05-5.92-.12l.92 32.86c1.6.08 3.27.12 5 .12"/>
-    <path d="m47.1 58.81c2.39-.45 4.21-1.02 5.22-1.65l3.68-33.14h-1.24c.06.05.13.09.17.14-.45.47-2.14 1.09-5.08 1.65l-2.75 33"/>
-    <path d="m42.03 59.53l1.83-32.9c-1.77.17-3.75.3-5.94.4l-.92 32.85c1.77-.08 3.46-.19 5.03-.35"/>
-  </g>
-  <g style="opacity:.4">
-    <path d="m54.84 25.4l-3.46 31.14c-2.5 1.23-9.36 2.46-19.38 2.46-10.02 0-16.88-1.23-19.38-2.46l-3.46-31.14c2.81 1.41 11.07 2.74 22.84 2.74 11.77 0 20.03-1.33 22.84-2.74m1.16-1.38h-1.24c.06.05.14.09.18.14-1.04 1.07-8.6 2.99-22.94 2.99-14.33 0-21.9-1.91-22.94-2.99.04-.04.11-.09.18-.14h-1.24l3.69 33.15c2.63 1.64 10.72 2.83 20.31 2.83 9.59 0 17.68-1.19 20.31-2.83l3.69-33.15z" style="fill:url(#0)"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.png
deleted file mode 100644
index cb94cbf1e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.svg
deleted file mode 100644
index dad4de886..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-0.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="m2.5 13.5h59v3h-59z" style="fill:#f0f0f0"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.png
deleted file mode 100644
index b6a237c43..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.svg
deleted file mode 100644
index d64213345..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-10.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.png
deleted file mode 100644
index 66807aca5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.svg
deleted file mode 100644
index 077b2836e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-100.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m56 19v30h-48v-30h48m2-2h-52v34h52v-34z" style="fill:#282828"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.png
deleted file mode 100644
index 6c08a6a61..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.svg
deleted file mode 100644
index 8c603c2cd..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-20.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.png
deleted file mode 100644
index 57e28f26b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.svg
deleted file mode 100644
index c7af162a9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-30.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.png
deleted file mode 100644
index 66d3730f5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.svg
deleted file mode 100644
index 39b66a9ae..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-40.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.png
deleted file mode 100644
index 8ad98cfb4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.svg
deleted file mode 100644
index efbbb8f79..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-50.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.png
deleted file mode 100644
index f0ecc1d71..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.svg
deleted file mode 100644
index 96448fb71..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-60.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.png
deleted file mode 100644
index 37ea256b5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.svg
deleted file mode 100644
index f4d298239..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-70.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.png
deleted file mode 100644
index 058dde073..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.svg
deleted file mode 100644
index 3a27bde0b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-80.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.png
deleted file mode 100644
index b89061013..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.svg
deleted file mode 100644
index 67153930c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen-90.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.png
deleted file mode 100644
index 8ad98cfb4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.svg
deleted file mode 100644
index efbbb8f79..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cinemascreen.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m61 14v2h-58v-2h58m1-1h-60v4h60v-4z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.png
deleted file mode 100644
index 21cec1b17..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.svg
deleted file mode 100644
index 1c4006eff..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-0.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.png
deleted file mode 100644
index 2fb44d018..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.svg
deleted file mode 100644
index 310a93430..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-10.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 55h44v5h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.png
deleted file mode 100644
index 1a942bb88..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.svg
deleted file mode 100644
index 9d6e8ac47..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-100.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 10h44v50h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.png
deleted file mode 100644
index 5960f279e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.svg
deleted file mode 100644
index df384d2f6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-20.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 50h44v10h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.png
deleted file mode 100644
index a04a09531..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.svg
deleted file mode 100644
index ee28f1edc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-30.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 45h44v15h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.png
deleted file mode 100644
index b9d8b9db8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.svg
deleted file mode 100644
index 6f37842a3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-40.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 40h44v20h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.png
deleted file mode 100644
index 9109e335b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.svg
deleted file mode 100644
index 1f263581e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-50.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 35h44v25h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.png
deleted file mode 100644
index e26f7ed54..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.svg
deleted file mode 100644
index 8cd1a35f7..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-60.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 30h44v30h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.png
deleted file mode 100644
index 7344abc14..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.svg
deleted file mode 100644
index 3644f2101..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-70.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 25h44v35h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.png
deleted file mode 100644
index 4c042c899..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.svg
deleted file mode 100644
index 401c7e5fa..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-80.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 20h44v40h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.png
deleted file mode 100644
index ac38c96bc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.svg
deleted file mode 100644
index 9c5b51ec6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern-90.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 15h44v45h-44z" style="fill:#1e82ff"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.png
deleted file mode 100644
index b5c87d9c7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.svg
deleted file mode 100644
index a41d5f526..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/cistern.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 35h44v25h-44z" style="fill:#c8c8c8"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.png
deleted file mode 100644
index 1c6525f47..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.svg
deleted file mode 100644
index 0e055ffb9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate-on.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.png
deleted file mode 100644
index ceb0192fc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.svg
deleted file mode 100644
index 9b4b7d99f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/climate.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.png
deleted file mode 100644
index 2be0feb7f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.svg
deleted file mode 100644
index 337a658ac..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock-on.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.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"/>
-  <path d="m32 10c12.15 0 22 9.85 22 22s-9.85 22-22 22-22-9.85-22-22 9.85-22 22-22m0-1c-12.68 0-23 10.32-23 23s10.32 23 23 23 23-10.32 23-23-10.32-23-23-23z" style="fill:#009949"/>
-  <g style="fill:#1a171b">
-    <path d="m31 13h2v24h-2z"/>
-    <path d="m27 31h20v2h-20z"/>
-  </g>
-  <path d="m23.89 15.95l-1.52-2.63-1.73 1 1.52 2.63c.55-.37 1.13-.7 1.73-1" style="opacity:.15"/>
-  <path d="m14.91 26.38l-2.93-.79-.52 1.93 2.92.78c.14-.64.32-1.29.53-1.92" style="opacity:.15"/>
-  <path d="m28.31 14.38l-.78-2.92-1.93.52.79 2.93c.62-.21 1.27-.39 1.92-.53" style="opacity:.15"/>
-  <path d="m20.01 18.6l-2.16-2.16-1.41 1.41 2.16 2.16c.44-.49.92-.97 1.41-1.41" style="opacity:.15"/>
-  <path d="m16.94 22.15l-2.63-1.52-1 1.73 2.63 1.52c.31-.59.64-1.17 1-1.73" style="opacity:.15"/>
-  <path d="m49.62 28.31l2.92-.78-.52-1.93-2.93.79c.21.62.39 1.27.53 1.92" style="opacity:.15"/>
-  <path d="m48.05 23.89l2.63-1.52-1-1.73-2.63 1.52c.37.55.7 1.13 1 1.73" style="opacity:.15"/>
-  <path d="m45.4 20.01l2.16-2.16-1.41-1.41-2.16 2.16c.49.44.97.92 1.41 1.41" style="opacity:.15"/>
-  <path d="m32 14c.34 0 .67.03 1 .05v-3.05h-2v3.05c.33-.02.66-.05 1-.05"/>
-  <path d="m14 32c0-.34.03-.67.05-1h-3.05v2h3.05c-.02-.33-.05-.66-.05-1"/>
-  <path d="m37.62 14.91l.79-2.93-1.93-.52-.78 2.92c.64.14 1.29.32 1.92.53" style="opacity:.15"/>
-  <path d="m41.85 16.94l1.52-2.63-1.73-1-1.52 2.63c.59.31 1.17.64 1.73 1" style="opacity:.15"/>
-  <path d="m32 50c-.34 0-.67-.03-1-.05v3.05h2v-3.05c-.33.02-.66.05-1 .05"/>
-  <path d="m47.06 41.85l2.63 1.52 1-1.73-2.63-1.52c-.31.59-.64 1.17-1 1.73" style="opacity:.15"/>
-  <path d="m43.99 45.4l2.16 2.16 1.41-1.41-2.16-2.16c-.44.49-.92.97-1.41 1.41" style="opacity:.15"/>
-  <path d="m49.09 37.62l2.93.79.52-1.93-2.92-.78c-.14.64-.32 1.29-.53 1.92" style="opacity:.15"/>
-  <path d="m49.95 31c.02.33.05.66.05 1s-.03.67-.05 1h3.05v-2h-3.05"/>
-  <path d="m40.11 48.05l1.52 2.63 1.73-1-1.52-2.63c-.55.37-1.13.7-1.73 1" style="opacity:.15"/>
-  <path d="m26.38 49.09l-.79 2.93 1.93.52.78-2.92c-.64-.14-1.29-.32-1.92-.53" style="opacity:.15"/>
-  <path d="m15.95 40.11l-2.63 1.52 1 1.73 2.63-1.52c-.37-.55-.7-1.13-1-1.73" style="opacity:.15"/>
-  <path d="m18.6 43.99l-2.16 2.16 1.41 1.41 2.16-2.16c-.49-.44-.97-.92-1.41-1.41" style="opacity:.15"/>
-  <path d="m35.69 49.62l.78 2.92 1.93-.52-.79-2.93c-.62.21-1.27.39-1.92.53" style="opacity:.15"/>
-  <path d="m14.38 35.69l-2.92.78.52 1.93 2.93-.79c-.21-.62-.39-1.27-.53-1.92" style="opacity:.15"/>
-  <path d="m22.15 47.06l-1.52 2.63 1.73 1 1.52-2.63c-.59-.31-1.17-.64-1.73-1" style="opacity:.15"/>
-  <path d="m28.856723 28.149073h20.773277v1h-24.75z" style="fill:#c80000;stroke-width:.99999041"/>
-  <circle cx="32" cy="32" r="1.5" style="fill:#ececed"/>
-  <path d="m32 31c.55 0 1 .45 1 1s-.45 1-1 1c-.55 0-1-.45-1-1s.45-1 1-1m0-1c-1.1 0-2 .9-2 2s.9 2 2 2c1.1 0 2-.9 2-2s-.9-2-2-2z" style="fill:#c80000"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.png
deleted file mode 100644
index 56e165e20..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.svg
deleted file mode 100644
index 080da521e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/clock.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.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"/>
-  <path d="m32 10c12.15 0 22 9.85 22 22s-9.85 22-22 22-22-9.85-22-22 9.85-22 22-22m0-1c-12.68 0-23 10.32-23 23s10.32 23 23 23 23-10.32 23-23-10.32-23-23-23z" style="fill:#9b9c9e"/>
-  <g style="fill:#1a171b">
-    <path d="m31 13h2v24h-2z"/>
-    <path d="m27 31h20v2h-20z"/>
-  </g>
-  <path d="m23.89 15.95l-1.52-2.63-1.73 1 1.52 2.63c.55-.37 1.13-.7 1.73-1" style="opacity:.15"/>
-  <path d="m14.91 26.38l-2.93-.79-.52 1.93 2.92.78c.14-.64.32-1.29.53-1.92" style="opacity:.15"/>
-  <path d="m28.31 14.38l-.78-2.92-1.93.52.79 2.93c.62-.21 1.27-.39 1.92-.53" style="opacity:.15"/>
-  <path d="m20.01 18.6l-2.16-2.16-1.41 1.41 2.16 2.16c.44-.49.92-.97 1.41-1.41" style="opacity:.15"/>
-  <path d="m16.94 22.15l-2.63-1.52-1 1.73 2.63 1.52c.31-.59.64-1.17 1-1.73" style="opacity:.15"/>
-  <path d="m49.62 28.31l2.92-.78-.52-1.93-2.93.79c.21.62.39 1.27.53 1.92" style="opacity:.15"/>
-  <path d="m48.05 23.89l2.63-1.52-1-1.73-2.63 1.52c.37.55.7 1.13 1 1.73" style="opacity:.15"/>
-  <path d="m45.4 20.01l2.16-2.16-1.41-1.41-2.16 2.16c.49.44.97.92 1.41 1.41" style="opacity:.15"/>
-  <path d="m32 14c.34 0 .67.03 1 .05v-3.05h-2v3.05c.33-.02.66-.05 1-.05"/>
-  <path d="m14 32c0-.34.03-.67.05-1h-3.05v2h3.05c-.02-.33-.05-.66-.05-1"/>
-  <path d="m37.62 14.91l.79-2.93-1.93-.52-.78 2.92c.64.14 1.29.32 1.92.53" style="opacity:.15"/>
-  <path d="m41.85 16.94l1.52-2.63-1.73-1-1.52 2.63c.59.31 1.17.64 1.73 1" style="opacity:.15"/>
-  <path d="m32 50c-.34 0-.67-.03-1-.05v3.05h2v-3.05c-.33.02-.66.05-1 .05"/>
-  <path d="m47.06 41.85l2.63 1.52 1-1.73-2.63-1.52c-.31.59-.64 1.17-1 1.73" style="opacity:.15"/>
-  <path d="m43.99 45.4l2.16 2.16 1.41-1.41-2.16-2.16c-.44.49-.92.97-1.41 1.41" style="opacity:.15"/>
-  <path d="m49.09 37.62l2.93.79.52-1.93-2.92-.78c-.14.64-.32 1.29-.53 1.92" style="opacity:.15"/>
-  <path d="m49.95 31c.02.33.05.66.05 1s-.03.67-.05 1h3.05v-2h-3.05"/>
-  <path d="m40.11 48.05l1.52 2.63 1.73-1-1.52-2.63c-.55.37-1.13.7-1.73 1" style="opacity:.15"/>
-  <path d="m26.38 49.09l-.79 2.93 1.93.52.78-2.92c-.64-.14-1.29-.32-1.92-.53" style="opacity:.15"/>
-  <path d="m15.95 40.11l-2.63 1.52 1 1.73 2.63-1.52c-.37-.55-.7-1.13-1-1.73" style="opacity:.15"/>
-  <path d="m18.6 43.99l-2.16 2.16 1.41 1.41 2.16-2.16c-.49-.44-.97-.92-1.41-1.41" style="opacity:.15"/>
-  <path d="m35.69 49.62l.78 2.92 1.93-.52-.79-2.93c-.62.21-1.27.39-1.92.53" style="opacity:.15"/>
-  <path d="m14.38 35.69l-2.92.78.52 1.93 2.93-.79c-.21-.62-.39-1.27-.53-1.92" style="opacity:.15"/>
-  <path d="m22.15 47.06l-1.52 2.63 1.73 1 1.52-2.63c-.59-.31-1.17-.64-1.73-1" style="opacity:.15"/>
-  <path d="m28.856723 28.149073h20.773277v1h-24.75z" style="fill:#c80000;stroke-width:.99999041"/>
-  <circle cx="32" cy="32" r="1.5" style="fill:#ececed"/>
-  <path d="m32 31c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1m0-1c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" style="fill:#c80000"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.png
deleted file mode 100644
index 684c419e3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.svg
deleted file mode 100644
index 3ac83c0f2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorlight.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.png
deleted file mode 100644
index 684c419e3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.svg
deleted file mode 100644
index 3ac83c0f2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/colorwheel.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.png
deleted file mode 100644
index 14178b6e4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.svg
deleted file mode 100644
index 987c0f1e6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-ajar.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.png
deleted file mode 100644
index 2734184a7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.svg
deleted file mode 100644
index bc0a688b8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-closed.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.png
deleted file mode 100644
index 82aea4ee1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.svg
deleted file mode 100644
index 0d780641d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact-open.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.png
deleted file mode 100644
index c3aade1f9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.svg
deleted file mode 100644
index 5f871f096..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/contact.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.png
deleted file mode 100644
index ba597ca22..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.svg
deleted file mode 100644
index 1a806f572..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/corridor.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="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">
-      <stop style="stop-color:#f0f0f0"/>
-      <stop offset="1" style="stop-color:#c8c8c8"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="57.6631" x2="0" y2="47.8379" xlink:href="#2"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="26.716" y1="50.0945" x2="29.7059" y2="41.8798" xlink:href="#2"/>
-  </defs>
-  <path d="m17.5 44.61v-35.2l46-8.81v55.76z" style="fill:#fafafa"/>
-  <path d="M63,1.21v54.5L18,44.22V9.83L63,1.21 M64,0L17,9v36l47,12V0L64,0z" style="fill:#aaa"/>
-  <path d="m23.5 56.48v-38.04l10-1.37v39.41z" style="fill:url(#2)"/>
-  <path d="m33 17.65v38.34h-9v-37.12l9-1.22m1-1.15l-11 1.5v38.98h11v-40.48z" style="fill:#aaa"/>
-  <path d="m.5 4.66l17 4.72v35.24l-17 4.72z" style="fill:#fafafa"/>
-  <path d="M1,5.32l16,4.44v34.48L1,48.68V5.32 M0,4v46l18-5V9L0,4L0,4z" style="fill:#aaa"/>
-  <path d="m45.5 57.1v-41.66l14-1.87v47.04z" style="fill:url(#3)"/>
-  <path d="m59 14.14v45.83l-13-3.26v-40.83l13-1.74m1-1.14l-15 2v42.49l15 3.76v-48.25z" style="fill:#aaa"/>
-  <path d="m20.27 47.75l13.23-4.49v8.24z" style="fill:url(#1)"/>
-  <path d="m33 43.96v6.88l-11.04-3.13 11.04-3.75m1-1.4l-15.41 5.23 15.41 4.37v-9.6z" style="fill:#aaa"/>
-  <path d="m41.22 53.19l18.28-5.35v9.82z" style="fill:url(#0)"/>
-  <path d="m59 48.51v8.52l-15.85-3.88 15.85-4.64m1-1.34l-20.71 6.07 20.71 5.06v-11.13z" style="fill:#aaa"/>
-  <path d="m.5 63.5v-13.13l16.51-4.85 46.49 11.87v6.11z" style="fill:#996d4d"/>
-  <path d="M17.02,46.04L63,57.78V63H1V50.75L17.02,46.04 M17,45L0,50v14h64v-7L17,45L17,45z" style="fill:#663629"/>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#663629">
-    <path d="M 64,61.25 14.67,46.3"/>
-    <path d="m60 64l-49.29-16.45"/>
-    <path d="M 46.08,64 6.65,48.75"/>
-    <path d="M 35.17,64.33 2.08,50"/>
-    <path d="M 21.42,64 0,53.17"/>
-    <path d="M 8.58,64 0,58.58"/>
-    <path d="m2.5 60.16l5.55-2.92"/>
-    <path d="m14.67 60.59l5.62-2.7"/>
-    <path d="m9.59 53.17l4.51-1.54"/>
-    <path d="m29.51 61.88l5.28-2.25"/>
-    <path d="m20.68 54.18l5.36-1.78"/>
-    <path d="m44.38 63.34l5.91-2.58"/>
-    <path d="m19.3 50.42l4.59-1.33"/>
-    <path d="m40.5 57.49l5.58-1.9"/>
-    <path d="m31.01 51.25l3.78-1.25"/>
-    <path d="m55.95 58.81l4.63-2.27"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.png
deleted file mode 100644
index f581dd94c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.svg
deleted file mode 100644
index 3853ad06b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-0.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.png
deleted file mode 100644
index 6a6641d37..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.svg
deleted file mode 100644
index 101b5b236..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-10.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-100.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.png
deleted file mode 100644
index b3a2c19ee..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.svg
deleted file mode 100644
index 3c3ca481c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-20.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.png
deleted file mode 100644
index 82bdc8a49..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.svg
deleted file mode 100644
index 5625e61d9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-30.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.png
deleted file mode 100644
index b2bc5b190..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.svg
deleted file mode 100644
index 1bc4e909e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-40.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.png
deleted file mode 100644
index c2bda42a1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.svg
deleted file mode 100644
index d0391a0dc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-50.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.png
deleted file mode 100644
index a5ba164a1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.svg
deleted file mode 100644
index 49e35c04f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-60.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.png
deleted file mode 100644
index a4ac4ceba..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.svg
deleted file mode 100644
index 2b348e730..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-70.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.png
deleted file mode 100644
index 4f97751b2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.svg
deleted file mode 100644
index 8818b22a1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-80.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.png
deleted file mode 100644
index f07ce5e7d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.svg
deleted file mode 100644
index 3d7f919a0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight-90.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dimmablelight.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.png
deleted file mode 100644
index e7a6240d3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.svg
deleted file mode 100644
index d98e396cb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-closed.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <g style="fill:#646464">
-    <path d="m46 9v49h-28v-49h28m1-1h-30v51h30v-51z"/>
-    <circle cx="43" cy="37" r="1"/>
-    <path d="m39.5 32h4c.28 0 .5.22.5.5 0 .28-.22.5-.5.5h-4c-.28 0-.5-.22-.5-.5 0-.28.22-.5.5-.5"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.png
deleted file mode 100644
index 668f9334f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.svg
deleted file mode 100644
index 869e59d08..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door-open.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <g style="fill:#646464">
-    <path d="m32 5.28v56.44l-14-3.5v-49.44l14-3.5m1-1.28l-16 4v51l16 4v-59z"/>
-    <circle cx="29" cy="37" r="1"/>
-    <path d="m26.05 31.84l3.99.33c.27.02.48.27.46.54-.02.27-.27.48-.54.46l-3.99-.33c-.27-.02-.48-.27-.46-.54.02-.28.26-.49.54-.46"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.png
deleted file mode 100644
index 668f9334f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.svg
deleted file mode 100644
index 869e59d08..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/door.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <g style="fill:#646464">
-    <path d="m32 5.28v56.44l-14-3.5v-49.44l14-3.5m1-1.28l-16 4v51l16 4v-59z"/>
-    <circle cx="29" cy="37" r="1"/>
-    <path d="m26.05 31.84l3.99.33c.27.02.48.27.46.54-.02.27-.27.48-.54.46l-3.99-.33c-.27-.02-.48-.27-.46-.54.02-.28.26-.49.54-.46"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.png
deleted file mode 100644
index 7a1902303..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.svg
deleted file mode 100644
index 827b1ecb0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-0.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.png
deleted file mode 100644
index e1108fbba..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.svg
deleted file mode 100644
index 0add846dc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-1.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.png
deleted file mode 100644
index 56e806098..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.svg
deleted file mode 100644
index 9f9dcecfe..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-2.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.png
deleted file mode 100644
index 10d213077..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.svg
deleted file mode 100644
index 3e076e644..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-3.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.png
deleted file mode 100644
index 0cb83a0e3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.svg
deleted file mode 100644
index 5fe0c4a39..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-4.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.png
deleted file mode 100644
index dc823a946..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.svg
deleted file mode 100644
index fb8998da6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer-5.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.png
deleted file mode 100644
index acf277681..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.svg
deleted file mode 100644
index f06749ae8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/dryer.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.png
deleted file mode 100644
index e1ded28f8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.svg
deleted file mode 100644
index 3e21e37dd..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/energy.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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.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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.png
deleted file mode 100644
index 07e703f92..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.svg
deleted file mode 100644
index 2574b5e60..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/error.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.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"/>
-  <path d="m34.81 24v7.68l-1.49 12.32h-2.72l-1.45-12.32v-7.68h5.66m1-1h-1-5.66-1v1 7.68.06l.01.06 1.45 12.32.1.88h.89 2.71.89l.11-.88 1.49-12.32.01-.06v-.06-7.68-1z" style="fill:#e58200"/>
-  <path d="m28.5 46.5h7v7h-7z" style="fill:#fff"/>
-  <path d="m35 47v6h-6v-6h6m1-1h-1-6-1v1 6 1h1 6 1v-1-6-1z" style="fill:#e58200"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.png
deleted file mode 100644
index 25e72ea59..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.svg
deleted file mode 100644
index f0a3b9084..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.png
deleted file mode 100644
index 25e72ea59..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.svg
deleted file mode 100644
index f0a3b9084..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_box.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.png
deleted file mode 100644
index a88ffdcd1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.svg
deleted file mode 100644
index 8aff83930..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fan_ceiling.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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="27.4999" x2="36.5001">
-      <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="30.5" x2="33.5" xlink:href="#0"/>
-    <radialGradient id="2" cx="32" cy="32" r="4.9244" gradientTransform="matrix(1 0 0 .5 0 16)" gradientUnits="userSpaceOnUse">
-      <stop style="stop-color:#ccd3e7"/>
-      <stop offset="1" style="stop-color:#82828c"/>
-    </radialGradient>
-  </defs>
-  <path d="m29 30.5c-.1 0-.2 0-.3-.1-.1-.1-.2-.2-.2-.4l-.5-7c0-.2.1-.5.4-.5l7-2c0 0 .1 0 .1 0 .1 0 .2 0 .3.1.1.1.2.3.2.4l-.5 8c0 .2-.2.4-.4.5l-6.1 1c.1 0 0 0 0 0" style="fill:#f0f0f0"/>
-  <path d="m35.5 21l-.5 8-6 1-.5-7 7-2m0-1c-.1 0-.2 0-.3 0l-7 2c-.5.1-.8.6-.7 1l.5 7c0 .3.2.5.4.7.2.1.4.2.6.2.1 0 .1 0 .2 0l6-1c.5-.1.8-.5.8-.9l.5-8c0-.3-.1-.6-.4-.8-.2-.1-.4-.2-.6-.2z" style="fill:#b4b4b4"/>
-  <path d="m22 31h20v2h-20z" style="fill:#666e7f"/>
-  <path d="m29 18.5c-.2 0-.5-.2-.5-.4l-1-6c0-.1 0-.3.1-.4.1-.1.2-.2.4-.2h8c.1 0 .3.1.4.2.1.1.1.3.1.4l-1 6c0 .2-.2.4-.5.4h-6" style="fill:url(#0)"/>
-  <path d="m36 12l-1 6h-6l-1-6h8m0-1h-8c-.3 0-.6.1-.8.4-.2.2-.2.5-.2.8l1 6c.1.5.5.8 1 .8h6c.5 0 .9-.4 1-.8l1-6c0-.3 0-.6-.2-.8s-.5-.4-.8-.4z" style="fill:#666e7f"/>
-  <path d="m30.5 18.5h3v11h-3z" style="fill:url(#1)"/>
-  <path d="m33 19v10h-2v-10h2m1-1h-4v12h4v-12z" style="fill:#666e7f"/>
-  <path d="m32 34.5c-3.8 0-6.5-1.3-6.5-2.5s2.7-2.5 6.5-2.5 6.5 1.3 6.5 2.5-2.7 2.5-6.5 2.5" style="fill:url(#2)"/>
-  <g style="fill:#666e7f">
-    <path d="m32 30c3.7 0 6 1.3 6 2s-2.3 2-6 2-6-1.3-6-2 2.3-2 6-2m0-1c-3.9 0-7 1.3-7 3s3.1 3 7 3 7-1.3 7-3-3.1-3-7-3z"/>
-    <path d="m31 33v1c0 .6.4 1 1 1 .6 0 1-.4 1-1v-1c0-.6-.4-1-1-1-.6 0-1 .4-1 1"/>
-  </g>
-  <path d="m36 47.5c0 0-.1 0-.1 0l-8-2c-.2-.1-.4-.3-.4-.5l1-11c0-.1.1-.3.2-.4.1-.1.2-.1.3-.1 0 0 .1 0 .1 0l6 1c.2 0 .4.2.4.5l1 12c0 .2-.1.3-.2.4-.1.1-.2.1-.3.1" style="fill:#f0f0f0"/>
-  <path d="m29 34l6 1 1 12-8-2 1-11m0-1c-.2 0-.4.1-.6.2-.2.2-.4.4-.4.7l-1 11c0 .5.3.9.8 1.1l8 2c.1 0 .2 0 .2 0 .2 0 .5-.1.6-.2.2-.2.4-.5.3-.8l-1-12c0-.5-.4-.8-.8-.9l-6-1c0-.1 0-.1-.1-.1z" style="fill:#b4b4b4"/>
-  <path d="m1 34.5c-.3 0-.5-.2-.5-.5v-4c0-.3.2-.5.5-.5h21c.3 0 .5.2.5.5v4c0 .3-.2.5-.5.5h-21" style="fill:#f0f0f0"/>
-  <path d="m22 30v4h-21v-4h21m0-1h-21c-.6 0-1 .4-1 1v4c0 .6.4 1 1 1h21c.6 0 1-.4 1-1v-4c0-.6-.4-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m42 34.5c-.3 0-.5-.2-.5-.5v-4c0-.3.2-.5.5-.5h21c.3 0 .5.2.5.5v4c0 .3-.2.5-.5.5h-21" style="fill:#f0f0f0"/>
-  <path d="m63 30v4h-21v-4h21m0-1h-21c-.6 0-1 .4-1 1v4c0 .6.4 1 1 1h21c.6 0 1-.4 1-1v-4c0-.6-.4-1-1-1z" style="fill:#b4b4b4"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.png
deleted file mode 100644
index 38327f459..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.svg
deleted file mode 100644
index bc7b70fc0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/faucet.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="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"/>
-  <path d="m33 17c.55 0 1 .45 1 1v4 1h1 11c6.07 0 11 4.93 11 11v5h-10v-3c0-1.65-1.35-3-3-3h-35v-10h14 1v-1-4c0-.55.45-1 1-1h8m0-1h-8c-1.1 0-2 .9-2 2v4h-15v12h36c1.1 0 2 .9 2 2v4h12v-6c0-6.63-5.37-12-12-12h-11v-4c0-1.1-.9-2-2-2z" style="fill:#676b72"/>
-  <path d="m51.55 59.5c0-.01-.1-.02-.19-.03-.15-.02-.3-.03-.4-.07l-.05-.02-.05-.01c-2.29-.41-4.25-2.72-4.36-5.17v-.75c.07-.4.16-.9.35-1.36.18-.34.37-.72.6-1.08l.74-1.03c1.58-1.94 2.85-3.85 3.85-5.8 1.03 2.43 2.61 4.51 3.89 6.05.15.23.34.49.55.75.24.38.53.85.75 1.35.12.33.22.75.27 1.22v.62c-.02.1-.03.19-.03.27 0 .03 0 .07-.01.1l-.03.06v.05c-.25 2.24-2.14 4.31-4.29 4.7l-.05.01-.05.02c-.1.04-.25.06-.4.07-.08.01-.15.02-.23.03h-.86z" style="fill:#1e82ff"/>
-  <path d="m52 45.31c1.03 2.08 2.38 3.84 3.5 5.21.17.26.35.5.54.74.25.4.51.82.71 1.25.11.31.19.66.24 1.05v.57c-.02.12-.03.22-.03.3l-.02.04-.02.14c-.23 2.04-1.93 3.91-3.89 4.26l-.12.03-.08.03c-.04.02-.18.03-.27.04-.07.01-.14.02-.21.02h-.76c-.07-.01-.14-.02-.21-.02-.09-.01-.22-.02-.27-.04l-.1-.04-.1-.02c-2.08-.37-3.85-2.47-3.94-4.65v-.7c.07-.41.15-.84.3-1.21.2-.39.37-.71.56-1.01l.72-1c1.39-1.67 2.52-3.32 3.45-4.99m.06-2.31c-1.11 2.41-2.59 4.63-4.28 6.69l-.75 1.05c-.24.37-.44.77-.64 1.16-.2.49-.3 1.03-.38 1.54v.78c.12 2.64 2.2 5.18 4.77 5.64.24.1.53.1.78.14h.91c.25-.04.53-.04.78-.14 2.38-.43 4.43-2.67 4.7-5.13.06-.15.02-.34.07-.48v-.75c-.06-.46-.16-.93-.31-1.36-.23-.52-.52-.99-.82-1.46-.2-.24-.38-.5-.55-.75-1.58-1.91-3.03-3.95-3.95-6.25l-.33-.68z" style="fill:#1271d8"/>
-  <path d="m41 13.5c-1.41 0-2.71-.66-3.58-1.8l-.15-.2h-5.77v-5h5.77l.15-.2c.87-1.15 2.17-1.8 3.58-1.8 2.48 0 4.5 2.02 4.5 4.5s-2.02 4.5-4.5 4.5" style="fill:#8b96ac"/>
-  <path d="m41 5c2.21 0 4 1.79 4 4s-1.79 4-4 4c-1.25 0-2.41-.58-3.18-1.6l-.3-.4h-.5-5.02v-4h5.02.5l.3-.4c.77-1.02 1.93-1.6 3.18-1.6m0-1c-1.63 0-3.06.79-3.98 2h-6.02v6h6.02c.91 1.21 2.35 2 3.98 2 2.76 0 5-2.24 5-5s-2.24-5-5-5z" style="fill:#676b72"/>
-  <path d="m19 13.5c-2.48 0-4.5-2.02-4.5-4.5s2.02-4.5 4.5-4.5c1.41 0 2.71.66 3.58 1.8l.15.2h3.77v5h-3.77l-.15.2c-.87 1.14-2.17 1.8-3.58 1.8" style="fill:#8b96ac"/>
-  <path d="m19 5c1.25 0 2.41.58 3.18 1.6l.3.4h.5 3.02v4h-3.02-.5l-.3.4c-.77 1.02-1.93 1.6-3.18 1.6-2.21 0-4-1.79-4-4s1.79-4 4-4m0-1c-2.76 0-5 2.24-5 5s2.24 5 5 5c1.63 0 3.06-.79 3.98-2h4.02v-6h-4.02c-.92-1.21-2.35-2-3.98-2z" style="fill:#676b72"/>
-  <path d="m29 13.5c-2.48 0-4.5-2.02-4.5-4.5s2.02-4.5 4.5-4.5 4.5 2.02 4.5 4.5-2.02 4.5-4.5 4.5" style="fill:#8b96ac"/>
-  <path d="m29 5c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4m0-1c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5z" style="fill:#676b72"/>
-  <path d="m23 22c3.32 2 8.68 2 12 0" style="fill:none;stroke-miterlimit:10;stroke:#676b72"/>
-  <path d="m4.5 38.5v-21h2.5c.83 0 1.5.67 1.5 1.5v18c0 .83-.67 1.5-1.5 1.5h-2.5" style="fill:#8b96ac"/>
-  <path d="m7 18c.55 0 1 .45 1 1v18c0 .55-.45 1-1 1h-2v-20h2m0-1h-3v22h3c1.1 0 2-.9 2-2v-18c0-1.1-.9-2-2-2z" style="fill:#676b72"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/favicon.ico b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/favicon.ico
deleted file mode 100644
index 98d739de9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/favicon.ico and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.png
deleted file mode 100644
index daa26137c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.svg
deleted file mode 100644
index c7f5858e2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-off.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.png
deleted file mode 100644
index 6dbc80c1a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.svg
deleted file mode 100644
index 69affd715..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire-on.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.png
deleted file mode 100644
index 6dbc80c1a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.svg
deleted file mode 100644
index 69affd715..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/fire.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.png
deleted file mode 100644
index 8abbeee71..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.svg
deleted file mode 100644
index 7ee4e9a57..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/firstfloor.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.19l19.5-9.75 19.5 9.75v45.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V59H13V14.62L32,5.12 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#ffccd3"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#f66"/>
-  <path d="m17.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m22 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m22.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m27 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m25.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m30.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m38.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m36 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m17.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 23.5h6v6h-6z" style="fill:#ffccd3"/>
-  <path d="m46 24v5h-5v-5h5m1-1h-7v7h7v-7z" style="fill:#f66"/>
-  <path d="m44 41h1v1h-1z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.png
deleted file mode 100644
index 36b15f023..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.svg
deleted file mode 100644
index 53d899cce..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flow.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.png
deleted file mode 100644
index 82afbed8e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.svg
deleted file mode 100644
index da8ae132d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/flowpipe.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.png
deleted file mode 100644
index 7ff2547b8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.svg
deleted file mode 100644
index 74ca4cf87..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-closed.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="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"/>
-  <path d="m46 9v49h-28v-49h28m1-1h-30v51h30v-51z" style="fill:#282828"/>
-  <ellipse cx="43.5" cy="34" rx=".5" ry="1" style="fill:#dcdcf0"/>
-  <path d="m36 13v41h-8v-41h8m1-1h-1-8-1v1 41 1h1 8 1v-1-41-1z" style="fill:#282828"/>
-  <path d="m28.5 13.5h7v40h-7z" style="fill:#d9f1ff"/>
-  <path d="m35 14v39h-6v-39h6m1-1h-8v41h8v-41z" style="fill:#7aadcc"/>
-  <path d="m40.5 15.5h2v36h-2z" style="fill:#dcdcf0"/>
-  <path d="m42 16v35h-1v-35h1m1-1h-1-1-1v1 35 1h1 1 1v-1-35-1z" style="fill:#595959"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.png
deleted file mode 100644
index 106000278..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.svg
deleted file mode 100644
index 8957a9e83..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor-open.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="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"/>
-  <path d="m32 5.28v56.44l-14-3.5v-49.44l14-3.5m1-1.28l-16 4v51l16 4v-59z" style="fill:#282828"/>
-  <ellipse cx="30.5" cy="34" rx=".5" ry="1" style="fill:#dcdcf0"/>
-  <path d="m26 12v43l-4-1v-41l4-1m1-1.28l-1.24.31-4 1-.76.19v.78 41 .78l.76.19 4 1 1.24.31v-1.28-43-1.28z" style="fill:#282828"/>
-  <path d="m22.5 53.61v-40.22l3-.75v41.72z" style="fill:#d9f1ff"/>
-  <path d="m25 13.28v40.44l-2-.5v-39.44l2-.5m1-1.28l-4 1v41l4 1v-43z" style="fill:#7aadcc"/>
-  <path d="m27.5 12.5h2v42h-2z" style="fill:#dcdcf0"/>
-  <path d="m29 13v41h-1v-41h1m1-1h-1-1-1v1 41 1h1 1 1v-1-41-1z" style="fill:#595959"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.png
deleted file mode 100644
index 106000278..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.svg
deleted file mode 100644
index 8957a9e83..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/frontdoor.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="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"/>
-  <path d="m32 5.28v56.44l-14-3.5v-49.44l14-3.5m1-1.28l-16 4v51l16 4v-59z" style="fill:#282828"/>
-  <ellipse cx="30.5" cy="34" rx=".5" ry="1" style="fill:#dcdcf0"/>
-  <path d="m26 12v43l-4-1v-41l4-1m1-1.28l-1.24.31-4 1-.76.19v.78 41 .78l.76.19 4 1 1.24.31v-1.28-43-1.28z" style="fill:#282828"/>
-  <path d="m22.5 53.61v-40.22l3-.75v41.72z" style="fill:#d9f1ff"/>
-  <path d="m25 13.28v40.44l-2-.5v-39.44l2-.5m1-1.28l-4 1v41l4 1v-43z" style="fill:#7aadcc"/>
-  <path d="m27.5 12.5h2v42h-2z" style="fill:#dcdcf0"/>
-  <path d="m29 13v41h-1v-41h1m1-1h-1-1-1v1 41 1h1 1 1v-1-41-1z" style="fill:#595959"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.png
deleted file mode 100644
index 798c073be..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.svg
deleted file mode 100644
index f84c65e81..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="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"/>
-  <path d="m39 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m39 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m39.5 46.5v-17.9l21 3.8v14.1z" style="fill:#ffccd3"/>
-  <path d="m40 29.2l20 3.6v13.2h-20v-16.8m-1-1.2v19h22v-15l-22-4z" style="fill:#f66"/>
-  <path d="m5.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m10.1 23.9v5.3h-4.2v-5.3h4.2m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m10.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m15.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m28.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m34 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m19.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m24.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m5.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m10.1 36.9v5.3h-4.2v-5.3h4.2m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m10.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m15.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m19.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m24.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m28.5 23.5h6.1v6.1h-6.1z" style="fill:#f0f0f0"/>
-  <g style="fill:#c8c8c8">
-    <path d="m34.1 23.9v5.1h-5.1v-5.1h5.1m.9-.9h-7v7h7v-7z"/>
-    <path d="m32 41h1v1h-1z"/>
-  </g>
-  <path d="m.5 20.5v-6.2l19.5-9.7 19.5 9.7v6.2z" style="fill:#f0f0f0"/>
-  <path d="M20,5.1l19,9.5V20H1v-5.4L20,5.1 M20,4L0,14v7h40v-7L20,4L20,4z" style="fill:#c8c8c8"/>
-  <path d="m46 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m13.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m18 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m21.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m26 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m42.5 36.5h15v10h-15z" style="fill:#ffccd3"/>
-  <path d="m57 37v9h-14v-9h14m1-1h-16v11h16v-11z" style="fill:#f66"/>
-  <path d="m39 28l25 4.5" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.png
deleted file mode 100644
index 18ada1d2d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.svg
deleted file mode 100644
index 1061617b8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="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"/>
-  <path d="m20.5 27.5h23v18h-23z" style="fill:#f0f0f0"/>
-  <path d="m43 28v17h-22v-17h22m1-1h-24v19h24v-19z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.png
deleted file mode 100644
index acd397d2b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.svg
deleted file mode 100644
index a253febcc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garage_detached_selected.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="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"/>
-  <path d="m20.5 27.5h23v18h-23z" style="fill:#ffccd3"/>
-  <path d="m43 28v17h-22v-17h22m1-1h-24v19h24v-19z" style="fill:#f66"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.png
deleted file mode 100644
index 68e420e75..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.svg
deleted file mode 100644
index 65c3c2c3e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-0.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.png
deleted file mode 100644
index 4b6139777..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.svg
deleted file mode 100644
index 1bcf69d86..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-10.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m39 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v7h-15z" style="fill:#282828"/>
-  <path d="m54 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.png
deleted file mode 100644
index 8af7a23c7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.svg
deleted file mode 100644
index 63811dbdb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-100.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m39 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 19.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.png
deleted file mode 100644
index 0314c32f6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.svg
deleted file mode 100644
index bde531990..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-20.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m39 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.png
deleted file mode 100644
index b12cb822a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.svg
deleted file mode 100644
index 31e8d8e1d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-30.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="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"/>
-  <path d="m39 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 19.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 15.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m24 16v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 15.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m39 16v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m54 16v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.png
deleted file mode 100644
index aa54c331c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.svg
deleted file mode 100644
index 0a94fee1c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-40.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="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"/>
-  <path d="m39 16v7h-14v-7h14m1-1h-1-14-1v1 7 1h1 14 1v-1-7-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v8h-15z" style="fill:#282828"/>
-  <path d="m54 16v7h-14v-7h14m1-1h-1-14-1v1 7 1h1 14 1v-1-7-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 23.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 24v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 23.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 24v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 23.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 24v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.png
deleted file mode 100644
index e1452f93d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.svg
deleted file mode 100644
index 3b6587430..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-50.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="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"/>
-  <path d="m39 15v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 14.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 15v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 25.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 26v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 25.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 26v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 25.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 26v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.png
deleted file mode 100644
index 381a8fc54..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.svg
deleted file mode 100644
index 9ff3cdba4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-60.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="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"/>
-  <path d="m39 17v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 16.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 17v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 27.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 28v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 27.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 28v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 27.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 28v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.png
deleted file mode 100644
index 5ab91e4db..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.svg
deleted file mode 100644
index 508d7c498..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-70.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m39 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 14.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m54 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.png
deleted file mode 100644
index 1b8704a83..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.svg
deleted file mode 100644
index 1e579c009..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-80.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m39 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v7h-15z" style="fill:#282828"/>
-  <path d="m54 16v6h-14v-6h14m1-1h-1-14-1v1 6 1h1 14 1v-1-6-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 22.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 23v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 22.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 23v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 22.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 23v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 33.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 34v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 33.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 34v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 33.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 34v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.png
deleted file mode 100644
index c4a6b9a17..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.svg
deleted file mode 100644
index 0201d63b1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-90.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m39 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 15.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 16v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 26.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 27v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 26.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 27v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 26.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 27v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 37.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 38v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 37.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 38v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 37.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 38v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.png
deleted file mode 100644
index 5ab91e4db..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.svg
deleted file mode 100644
index 508d7c498..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-ajar.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m39 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 14.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m54 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.png
deleted file mode 100644
index 8af7a23c7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.svg
deleted file mode 100644
index 63811dbdb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-closed.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m39 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 19.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 20v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 30.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 31v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 41.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 42v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.png
deleted file mode 100644
index 68e420e75..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.svg
deleted file mode 100644
index 65c3c2c3e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor-open.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.png
deleted file mode 100644
index 5ab91e4db..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.svg
deleted file mode 100644
index 508d7c498..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garagedoor.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m39 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 14.5h15v4h-15z" style="fill:#282828"/>
-  <path d="m54 15v3h-14v-3h14m1-1h-1-14-1v1 3 1h1 14 1v-1-3-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 18.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 19v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m9.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m24 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m24.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m39 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <path d="m39.5 29.5h15v11h-15z" style="fill:#282828"/>
-  <path d="m54 30v10h-14v-10h14m1-1h-1-14-1v1 10 1h1 14 1v-1-10-1z" style="fill:#3c3c3c"/>
-  <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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.png
deleted file mode 100644
index 204a8e5ca..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.svg
deleted file mode 100644
index 2eefe817c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/garden.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="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"/>
-      <path d="m47.16 17.62c.19-.32.31-.7.31-1.1 0-1.22-1.02-2.21-2.28-2.21-.48 0-.93.15-1.3.4l-3.89-3.26-7.66 1.02-7.23 5.19-10.81 7.76c-.38-.27-.84-.44-1.35-.44-1.26 0-2.28.99-2.28 2.21 0 1.22 1.02 2.21 2.28 2.21.32 0 .62-.07.9-.18l.66 2.07 9.35-1.21 1.31-4.03 15.32-2.91 7.47-4.8-.8-.72z"/>
-    </g>
-    <g style="stroke:#2aaa00">
-      <path d="m59.77 25.91c-.85-.96-1.93-1.45-2.73-1.33 1.16-1.09 1.42-2.8.53-4.03-.6-.83-1.58-1.24-2.59-1.18.22-.79.13-1.62-.34-2.28-.9-1.25-2.81-1.41-4.25-.37-.06.04-.1.09-.15.13-.05-.29-.16-.58-.35-.83-.71-.99-2.19-1.13-3.31-.33-.64.46-1.01 1.14-1.08 1.82-.58-.54-1.4-.88-2.32-.88-1.74 0-3.16 1.2-3.16 2.68 0 .69.32 1.31.82 1.79l-.02.02c-.73-.94-2.17-1.07-3.26-.28-1.11.8-1.44 2.26-.73 3.24.49.68 1.34.95 2.19.8l.26 3.38 7.52 2.42h6.74l.7-.37c.09.17.19.33.32.47.83.93 2.23 1.04 3.13.24.48-.43.72-1.03.71-1.64.78.38 1.55.41 2.02-.01.75-.65.46-2.21-.65-3.46z" style="fill:#00a532"/>
-      <path d="m58.06 35.69c-.59-.5-1.25-.81-1.86-.91.65-.79.95-1.82.69-2.84-.44-1.77-2.32-2.83-4.21-2.36-1.62.4-2.7 1.8-2.7 3.3l-8.96.2-2.97 2.17c-.26-.05-.53-.08-.81-.08-1.9 0-3.44 1.15-3.44 2.56 0 .84.55 1.58 1.4 2.05-.52.75-.69 1.61-.36 2.35.59 1.29 2.46 1.69 4.2.9.25-.11.48-.25.7-.4-.01.65.19 1.25.64 1.66 1.03.97 2.92.62 4.22-.77.2-.22.37-.45.52-.69.84.71 2.17 1.01 3.54.67 1.11-.28 1.99-.91 2.51-1.67.8.63 1.99.89 3.2.59 1.59-.4 2.69-1.62 2.77-2.92.79.21 1.53.09 1.94-.39.7-.82.24-2.35-1.02-3.42z" style="fill:#083"/>
-      <path d="m55.66 32.16c.16-1.35-.49-2.53-1.45-2.64-.2-.02-.39.01-.58.08.19-.28.3-.6.3-.93 0-1.2-1.34-2.17-2.98-2.17-.81 0-1.55.24-2.08.62.01-.38-.08-.74-.31-1.03-.68-.84-2.2-.74-3.4.23-.6.48-1 1.09-1.17 1.68-.38-.36-.88-.65-1.48-.82-1.48-.42-2.93.07-3.22 1.11s.66 2.23 2.15 2.65c.07.02.15.03.22.05l-.56.98 1.33 1.34c-.18.66-.09 1.5.31 2.3.57 1.14 1.58 1.81 2.46 1.75-.07.94.4 1.82 1.24 2.15 1.06.42 2.3-.2 2.76-1.38.03-.08.05-.17.07-.25.25.2.55.38.88.53 1.28.58 2.57.48 2.9-.23.16-.34.05-.76-.23-1.16 1.19.49 2.37.36 2.69-.32.32-.7-.39-1.71-1.59-2.28.84-.11 1.6-1.04 1.74-2.26z" style="fill:#16bf2e"/>
-    </g>
-  </g>
-  <path d="m33.31 63.25c-.07 0-.14-.03-.19-.09-.01-.01-.95-1.12-2.72-1.12-.82 0-1.7.24-2.62.7-.04.02-.07.03-.11.03-.08 0-.16-.04-.21-.11-.07-.1-.05-.25.04-.33.02-.02 2.1-1.89 2.1-5.39 0-3.48-1.01-4.59-1.02-4.6-.09-.1-.09-.26.01-.35l.56-.53c.05-.05.11-.07.17-.07.06 0 .12.02.17.06.04.03.2.19.38.4v-7c0-.04.13-2.99-.67-4.36-.55-.94-1.19-1.43-2.07-2.09-.42-.32-.9-.68-1.43-1.14-.36-.31-.57-.55-.48-.79.03-.08.12-.22.38-.22.59 0 2.39.79 2.59.88.52.37 1.75 1.22 2.38 1.57.22-1.03.3-2.15.07-2.33-.08-.07-.12-.18-.08-.28s.13-.17.24-.17h1.27c.07 0 .14.03.19.08s.07.12.06.2c0 .01-.13 1.11.06 2.1.42-.98 1.08-2.29 1.59-2.38.01 0 .03 0 .04 0 .04 0 .09.01.12.03l1.38.79c.1.06.15.18.11.3-.03.1-.13.17-.24.17-.01 0-.03 0-.03 0-.21 0-1.85.14-1.85 4.61v4.99c.07-.05.14-.1.21-.13.03-.01.07-.02.1-.02.05 0 .09.01.14.04.07.05.11.12.11.21v.75c0 .11-.07.21-.18.24.01 0-.59.44-.59 3.79 0 4.21.31 8.39 2.57 10.54.06.06.09.14.08.22-.01.08-.06.15-.13.19-.03.01-.19.09-.5.09-.41 0-1.09-.13-2.08-.71.05.23.14.53.34.88.06.11.03.25-.08.33-.08.01-.13.02-.18.02" style="fill:#ad7440"/>
-  <path d="m33.99 36.16l1.38.79c0 0-.02 0-.05 0-.32 0-2.08.21-2.08 4.86v5.58c0 0 .34-.39.56-.48v.75c0 0-.78.22-.78 4.03s.19 8.39 2.64 10.72c0 0-.12.06-.39.06-.41 0-1.18-.15-2.38-.94 0 0-.07.61.41 1.48 0 0-.99-1.22-2.92-1.22-.77 0-1.68.19-2.73.73 0 0 2.18-1.92 2.18-5.58s-1.09-4.78-1.09-4.78l.56-.53c0 0 .7.63.8 1.14v-7.93c0 0 .15-3.03-.7-4.49s-1.9-1.87-3.56-3.3c-.49-.42-.49-.57-.26-.57.55 0 2.49.86 2.49.86s2.07 1.48 2.66 1.7c0 0 .6-2.45.05-2.89h1.27c0 0-.22 1.72.27 2.89 0 0 1.09-2.78 1.67-2.88m-1.93-.5h-1.27c-.21 0-.4.13-.47.34s-.01.42.16.56c.1.16.06.92-.09 1.74-.59-.36-1.46-.95-2.01-1.35-.03-.02-.06-.04-.09-.05-.48-.21-2.08-.9-2.69-.9-.43 0-.58.29-.61.38-.17.45.26.82.55 1.07.54.47 1.02.83 1.45 1.15.86.65 1.48 1.12 2.01 2.02.63 1.09.67 3.41.64 4.21v6.41c-.09-.07-.19-.1-.3-.1-.12 0-.25.05-.35.14l-.56.53c-.1.09-.15.22-.15.35 0 .13.05.26.14.36 0 0 .95 1.08.95 4.43 0 3.37-1.99 5.18-2.01 5.2-.19.17-.22.45-.08.66.1.14.25.22.41.22.08 0 .15-.02.23-.05.88-.45 1.72-.68 2.51-.68 1.67 0 2.52 1.02 2.53 1.03.1.12.24.18.39.18.1 0 .19-.03.28-.09.21-.15.28-.43.16-.66-.05-.09-.09-.17-.13-.25.75.36 1.3.45 1.65.45.35 0 .55-.08.62-.12.14-.07.24-.21.27-.37s-.03-.32-.15-.43c-2.19-2.08-2.49-6.2-2.49-10.35 0-2.83.44-3.5.52-3.59.16-.09.26-.25.26-.44v-.76c0-.17-.09-.33-.23-.42-.08-.05-.18-.08-.27-.08-.02 0-.04 0-.06 0v-4.6c0-2.3.44-3.38.82-3.87.35-.47.7-.49.76-.49.03.01.06.01.09.01.2 0 .38-.13.45-.33.08-.23-.03-.49-.24-.61l-1.38-.79c-.08-.04-.16-.07-.25-.07-.03 0-.05 0-.08.01-.17.03-.62.1-1.4 1.69-.02-.45.01-.86.03-1.09.01-.03.01-.07.01-.11-.03-.27-.26-.49-.53-.49z" style="fill:#724524"/>
-  <path d="m25.85 37.06c1.65 1.43 2.71 1.84 3.56 3.3.85 1.45.7 4.49.7 4.49v3.22c.19.43.42.82.67.98.69.44.89 2.33.76 4.07-.13 1.75.84 2.09.84 2.09s.34-.38.68-1.04c-.04-.84-.05-1.67-.05-2.47 0-3.81.78-4.03.78-4.03v-.77c-.22.1-.56.48-.56.48v-5.58c0-5.12 2.13-4.86 2.13-4.86l-1.38-.79c-.58.1-1.67 2.89-1.67 2.89-.48-1.16-.27-2.89-.27-2.89h-1.27c.55.44-.05 2.89-.05 2.89-.59-.22-2.66-1.7-2.66-1.7s-3.86-1.72-2.21-.28" style="fill:#99561f"/>
-  <g style="stroke-miterlimit:10;stroke-width:.25">
-    <g style="stroke:#2aaa00">
-      <path d="m44.16 11.48c-.77-.15-1.51-.12-2.14.04.93-1.68.22-4.06-1.74-5.5-1.53-1.12-3.38-1.34-4.76-.72.06-.87-.21-1.84-.84-2.68-1.19-1.58-3.17-2.09-4.42-1.15-.91.68-1.17 1.94-.8 3.19-.32-.21-.67-.33-1.04-.33-1.42 0-2.57 1.72-2.57 3.83 0 1.56.63 2.89 1.52 3.49l-.51 1.11-1.5-.34c.3-.45.49-.96.49-1.52 0-1.65-1.53-2.98-3.42-2.98-1.89 0-3.42 1.34-3.42 2.98s1.53 2.98 3.42 2.98c.78 0 1.5-.24 2.07-.63l.51.63 1.65.54c-1.01.88-1.54 1.74-1.27 2.31.47.99 3.1.73 5.88-.59 1.36-.64 2.5-1.41 3.25-2.15-.15.4-.17.79-.01 1.13.47.99 2.2 1.15 3.86.37.84-.4 1.5-.96 1.89-1.54.34.95 1.49 1.8 2.99 2.09 1.94.37 3.71-.34 3.95-1.6.27-1.26-1.1-2.58-3.04-2.96z" style="fill:#16bf2e"/>
-      <path d="m26.49 38.11c-.4-.85-1.04-1.44-1.64-1.6l-.56-3.42-10.14.58-4.23 1.59c-.59-.64-1.46-1.06-2.46-1.06-1.77 0-3.2 1.3-3.2 2.9 0 1.6 1.43 2.9 3.2 2.9.01 0 .01 0 .01 0-.31.61-.37 1.27-.11 1.84.55 1.2 2.3 1.58 3.91.84.7 1.1 2.37 1.8 4.27 1.64 1.57-.13 2.89-.82 3.59-1.73.66.51 1.84.65 3.06.29 1.45-.43 2.47-1.43 2.49-2.36.51.45 1.08.63 1.52.42.75-.35.87-1.62.29-2.83z" style="fill:#083"/>
-      <path d="m25.85 31.48l-3.93-6.01-5.24 1.17c-.13-.72-.5-1.31-1.1-1.56-1.11-.47-2.52.39-3.16 1.91-.29.69-.36 1.4-.26 2.01-.53-.7-1.45-1.17-2.48-1.17-1.65 0-2.98 1.17-2.98 2.62 0 .33.08.65.21.94-.17-.04-.34-.08-.51-.1-1.64-.18-3.07.63-3.21 1.83-.1.9.57 1.76 1.61 2.2.06.34.2.64.44.88.7.7 1.92.64 2.99-.05-.17 1.18.24 2.25 1.11 2.62.92.39 2.06-.15 2.78-1.22-.05 1.14.38 2.09 1.15 2.31.89.26 1.92-.54 2.47-1.83.23.52.59.88 1.03.94.74.11 1.48-.61 1.89-1.71.27.91.9 1.59 1.72 1.71 1.25.19 2.47-.99 2.71-2.62.11-.73-.01-1.42-.27-1.98l3.03-2.89z" style="fill:#16bf2e"/>
-    </g>
-    <path d="m30.89 18.86c.95-.44 1.6-1.32 1.6-2.34 0-1.46-1.31-2.64-2.93-2.64-1.62 0-2.93 1.18-2.93 2.64 0 .12.02.24.04.36l-11.85 3.47c-.4-1.22-1.48-2.11-2.75-2.11-1.62 0-2.93 1.41-2.93 3.15 0 1.22.65 2.26 1.6 2.79-.36.36-.59.8-.59 1.28 0 1.2 1.34 2.17 2.98 2.17.75 0 1.42-.21 1.94-.54.15 1.09 1.33 1.94 2.78 1.94 1.55 0 2.81-.97 2.81-2.17 0-.07-.02-.14-.03-.21l5.56-.76 1.79-2.2c.56.2 1.19.33 1.88.33 2.18 0 3.95-1.18 3.95-2.64-.01-1.2-1.25-2.21-2.92-2.52z" style="fill:#007f33;stroke:#009949"/>
-    <path d="m31.23 14.5c-.47-.75-1.29-1.1-1.94-.87.06-.13.11-.26.14-.4.25-1.18-.69-2.38-2.1-2.68-1.07-.23-2.1.12-2.65.81-.39-.98-1.3-1.66-2.36-1.66-1.38 0-2.5 1.17-2.56 2.63-.54-.72-1.44-1.19-2.46-1.19-1.65 0-2.98 1.23-2.98 2.74 0 .43.11.82.3 1.18-.1-.03-.2-.07-.3-.09-1.61-.34-3.13.33-3.38 1.51-.16.75.22 1.51.93 2.06-1.31-.11-2.47.56-2.7 1.62-.25 1.18.75 2.39 2.23 2.71.79.17 1.55.04 2.13-.28.17.91.98 1.72 2.1 1.96 1.35.29 2.64-.36 2.97-1.45.73.52 1.9.41 2.8-.32.83-.68 1.18-1.67.95-2.47.44.44 1.07.8 1.81.95 1.44.31 2.79-.2 3.25-1.15.12.17.27.28.45.33.69.18 1.51-.68 1.83-1.92.16-.62.17-1.22.05-1.69.41.16.84.15 1.19-.06.69-.4.82-1.43.3-2.27z" style="fill:#00a532;stroke:#2aaa00"/>
-    <path d="m44.06 30.72c-.89-1.01-2.24-1.28-3.02-.59-.05.05-.09.1-.14.15l-.56-.53-3.56-1.47-8.9.25-3.55.91c-.55-.7-1.38-1.15-2.33-1.15-1.65 0-2.98 1.35-2.98 3.01 0 1.11.61 2.07 1.5 2.6-.64.73-.93 1.56-.66 2.28.49 1.32 2.61 1.75 4.73.97.23-.09.45-.19.66-.29-.06.54.06 1.04.37 1.43.81 1 2.62.88 4.04-.27.32-.26.59-.55.81-.86.74.45 1.72.68 2.76.58 1.3-.13 2.4-.75 3.01-1.59.73.42 1.66.63 2.66.53 1.8-.18 3.19-1.3 3.48-2.63.68.26 1.38.2 1.86-.22.8-.73.71-2.1-.18-3.11z" style="fill:#007f33;stroke:#009949"/>
-    <path d="m41.13 28.74c.09-.05.18-.1.26-.17 1.1-.91 1.14-2.66.11-3.92-.73-.89-1.81-1.27-2.77-1.11.26-.69.24-1.45-.14-2.08-.71-1.16-2.36-1.44-3.68-.63-.27.17-.5.38-.7.6.02-.34-.04-.66-.22-.94-.58-.94-2.07-1.09-3.32-.32-.74.46-1.23 1.13-1.38 1.8-.01-.01-.01-.02-.02-.03-.76-1.06-2.47-1.14-3.83-.17-1.14.81-1.65 2.1-1.34 3.12-1.29-.53-2.68-.23-3.24.78-.46.83-.23 1.89.49 2.7-1.26.3-2.16 1.24-2.12 2.32.05 1.27 1.39 2.24 2.98 2.18.15-.01.3-.03.45-.06-.18.52-.18 1.04.07 1.45.58.94 2.19 1.01 3.6.14.36-.22.67-.48.92-.76-.04.5.08.98.38 1.36.78.98 2.46.93 3.75-.1.14-.11.26-.23.37-.35.22.14.45.25.72.31 1.42.32 2.87-.72 3.23-2.34.07-.31.08-.61.07-.9.08.13.16.25.26.37.94 1.13 2.39 1.48 3.24.77.53-.44.71-1.19.53-1.96.11.05.22.08.34.12.97.26 1.89-.04 2.06-.68.17-.55-.3-1.17-1.07-1.5z" style="fill:#00b22e;stroke:#2aaa00"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.png
deleted file mode 100644
index 40022e3e3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.svg
deleted file mode 100644
index 826316182..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/gas.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.png
deleted file mode 100644
index 5018b5d15..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.svg
deleted file mode 100644
index 410cb01ea..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_1.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#f4d0b1"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#e5b795"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#f4d0b1"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#e5b795"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#f4d0b1"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#e5b795"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m41.1 16.5c-.8 0-1.4-.2-1.7-.5-.1-.1-.1-.2-.1-.3.2-1.4-.9-4.7-1.2-5.3l-.2-2.4 1.8.4c0 .6-.1 1.6-.1 2.6-.1 1.4 1.3 3.3 2.3 4.6l.4.5c.1.1.1.1.1.1s-.1.1-.5.2c-.2.1-.4.1-.8.1" style="fill:#e67831"/>
-  <path d="m38.5 8.6l.7.1c0 .6-.1 1.4-.1 2.2-.1 1.6 1.3 3.5 2.4 4.9 0 0 .1.1.1.1-.1 0-.3 0-.5 0-.7 0-1.1-.1-1.3-.2.2-1.5-.9-4.6-1.2-5.5l-.1-1.6m-1.1-1.2l.3 3.1c0 0 1.4 3.7 1.2 5.2-.2 1 1.2 1.3 2.3 1.3.4 0 .7 0 .9-.1.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.9-.5z" style="fill:#dd6022"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#f4d0b1"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#e5b795"/>
-  <path d="m22 16.4c-.1 0-.1 0-.2 0 0-.2.2-.6 1-1.6.5-.6 1-1.7 1.8-3.4l.1-.2-.1-.2c-.4-.9-1.1-3.2.4-6.2 1.8-3.7 5.9-4.2 5.9-4.2 0 0 1-.1 2.2-.1.7 0 1.3 0 1.8.1.8.1 1.9.5 2.3 1 .1.2.1.4.1.6l-.1.3.2.2c.7.6 1.3 1.5 1.9 2.7.4.9.5 2.1.5 3.1-.3-2.4-1.2-4.2-2.6-5.3l-.4-.3-.3.3c-.3.3-.6.6-1.1.9l-.3.2.1.3c0 0 .1 1.5-4.1 4.2-.1.1-2.3 1.5-2.6 1.8 0 0-.1.1-.2.1-.5.3-1.5.8-2 1.8-.1-.4-.3-.8-.4-1.2l-.5-2-.4 2.1c-.2 1.1-.2 2.5-.3 3.5 0 .4 0 .8 0 1-.3.2-1.8.5-2.7.5" style="fill:#e67831"/>
-  <path d="m33.1 1c.7 0 1.2 0 1.7.1 1 .2 1.8.5 2 .8 0 0 0 .1 0 .2l-.1.3-.5.5c-.3.3-.6.6-1 .9l-.5.4.1.5c0 .2-.4 1.5-3.8 3.8-.2.2-2.3 1.5-2.6 1.8 0 0-.1 0-.1.1-.3.2-1 .6-1.6 1.2 0-.1 0-.2-.1-.3l-1.1-4.1-.6 3c-.3-1.1-.5-2.9.6-5.2 1.7-3.5 5.4-3.9 5.6-3.9-.1 0 .9-.1 2-.1m-8.8 12.1c0 .6 0 1.2 0 1.7 0 .2 0 .5 0 .7-.4.1-1 .3-1.6.3.1-.2.3-.5.5-.8.3-.3.7-1 1.1-1.9m8.8-13.1c-1.2 0-2.3.1-2.3.1s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4.1 0 .2 0 .4 0 1 0 3-.4 3.2-.8.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0 0 .5-3-.4-4.8-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-.5-.2-1.1-.2-1.7-.2z" style="fill:#dd6022"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.png
deleted file mode 100644
index 6b5054085..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.svg
deleted file mode 100644
index 279cc47e1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_2.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#e7b48f"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#d89f79"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#e7b48f"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#d89f79"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#e7b48f"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#d89f79"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m41.1 16.5c-.8 0-1.4-.2-1.7-.5-.1-.1-.1-.2-.1-.3.2-1.4-.9-4.7-1.2-5.3l-.2-2.4 1.8.4c0 .6-.1 1.6-.1 2.6-.1 1.4 1.3 3.3 2.3 4.6l.4.5c.1.1.1.1.1.1s-.1.1-.5.2c-.2.1-.4.1-.8.1" style="fill:#edda7b"/>
-  <path d="m38.5 8.6l.7.1c0 .6-.1 1.4-.1 2.2-.1 1.6 1.3 3.5 2.4 4.9 0 0 .1.1.1.1-.1 0-.3 0-.5 0-.7 0-1.1-.1-1.3-.2.2-1.5-.9-4.6-1.2-5.5l-.1-1.6m-1.1-1.2l.3 3.1c0 0 1.4 3.7 1.2 5.2-.2 1 1.2 1.3 2.3 1.3.4 0 .7 0 .9-.1.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.9-.5z" style="fill:#ccb966"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#e7b48f"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#d89f79"/>
-  <path d="m22 16.4c-.1 0-.1 0-.2 0 0-.2.2-.6 1-1.6.5-.6 1-1.7 1.8-3.4l.1-.2-.1-.2c-.4-.9-1.1-3.2.4-6.2 1.8-3.7 5.9-4.2 5.9-4.2 0 0 1-.1 2.2-.1.7 0 1.3 0 1.8.1.8.1 1.9.5 2.3 1 .1.2.1.4.1.6l-.1.3.2.2c.7.6 1.3 1.5 1.9 2.7.4.9.5 2.1.5 3.1-.3-2.4-1.2-4.2-2.6-5.3l-.4-.3-.3.3c-.3.3-.6.6-1.1.9l-.3.2.1.3c0 0 .1 1.5-4.1 4.2-.1.1-2.3 1.5-2.6 1.8 0 0-.1.1-.2.1-.5.3-1.5.8-2 1.8-.1-.4-.3-.8-.4-1.2l-.5-2-.4 2.1c-.2 1.1-.2 2.5-.3 3.5 0 .4 0 .8 0 1-.3.2-1.8.5-2.7.5" style="fill:#edda7b"/>
-  <path d="m33.1 1c.7 0 1.2 0 1.7.1 1 .2 1.8.5 2 .8 0 0 0 .1 0 .2l-.1.3-.5.5c-.3.3-.6.6-1 .9l-.5.4.1.5c0 .2-.4 1.5-3.8 3.8-.2.2-2.3 1.5-2.6 1.8 0 0-.1 0-.1.1-.3.2-1 .6-1.6 1.2 0-.1 0-.2-.1-.3l-1.1-4.1-.6 3c-.3-1.1-.5-2.9.6-5.2 1.7-3.5 5.4-3.9 5.6-3.9-.1 0 .9-.1 2-.1m-8.8 12.1c0 .6 0 1.2 0 1.7 0 .2 0 .5 0 .7-.4.1-1 .3-1.6.3.1-.2.3-.5.5-.8.3-.3.7-1 1.1-1.9m8.8-13.1c-1.2 0-2.3.1-2.3.1s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4.1 0 .2 0 .4 0 1 0 3-.4 3.2-.8.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0 0 .5-3-.4-4.8-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-.5-.2-1.1-.2-1.7-.2z" style="fill:#ccb966"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.png
deleted file mode 100644
index 3b871799b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.svg
deleted file mode 100644
index 3cc58400f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_3.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#d29e7c"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#c18a6b"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#d29e7c"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#c18a6b"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#d29e7c"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#c18a6b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m41.1 16.5c-.8 0-1.4-.2-1.7-.5-.1-.1-.1-.2-.1-.3.2-1.4-.9-4.7-1.2-5.3l-.2-2.4 1.8.4c0 .6-.1 1.6-.1 2.6-.1 1.4 1.3 3.3 2.3 4.6l.4.5c.1.1.1.1.1.1s-.1.1-.5.2c-.2.1-.4.1-.8.1" style="fill:#61452d"/>
-  <path d="m38.5 8.6l.7.1c0 .6-.1 1.4-.1 2.2-.1 1.6 1.3 3.5 2.4 4.9 0 0 .1.1.1.1-.1 0-.3 0-.5 0-.7 0-1.1-.1-1.3-.2.2-1.5-.9-4.6-1.2-5.5l-.1-1.6m-1.1-1.2l.3 3.1c0 0 1.4 3.7 1.2 5.2-.2 1 1.2 1.3 2.3 1.3.4 0 .7 0 .9-.1.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.9-.5z" style="fill:#513624"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#d29e7c"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#c18a6b"/>
-  <path d="m22 16.4c-.1 0-.1 0-.2 0 0-.2.2-.6 1-1.6.5-.6 1-1.7 1.8-3.4l.1-.2-.1-.2c-.4-.9-1.1-3.2.4-6.2 1.8-3.7 5.9-4.2 5.9-4.2 0 0 1-.1 2.2-.1.7 0 1.3 0 1.8.1.8.1 1.9.5 2.3 1 .1.2.1.4.1.6l-.1.3.2.2c.7.6 1.3 1.5 1.9 2.7.4.9.5 2.1.5 3.1-.3-2.4-1.2-4.2-2.6-5.3l-.4-.3-.3.3c-.3.3-.6.6-1.1.9l-.3.2.1.3c0 0 .1 1.5-4.1 4.2-.1.1-2.3 1.5-2.6 1.8 0 0-.1.1-.2.1-.5.3-1.5.8-2 1.8-.1-.4-.3-.8-.4-1.2l-.5-2-.4 2.1c-.2 1.1-.2 2.5-.3 3.5 0 .4 0 .8 0 1-.3.2-1.8.5-2.7.5" style="fill:#61452d"/>
-  <path d="m33.1 1c.7 0 1.2 0 1.7.1 1 .2 1.8.5 2 .8 0 0 0 .1 0 .2l-.1.3-.5.5c-.3.3-.6.6-1 .9l-.5.4.1.5c0 .2-.4 1.5-3.8 3.8-.2.2-2.3 1.5-2.6 1.8 0 0-.1 0-.1.1-.3.2-1 .6-1.6 1.2 0-.1 0-.2-.1-.3l-1.1-4.1-.6 3c-.3-1.1-.5-2.9.6-5.2 1.7-3.5 5.4-3.9 5.6-3.9-.1 0 .9-.1 2-.1m-8.8 12.1c0 .6 0 1.2 0 1.7 0 .2 0 .5 0 .7-.4.1-1 .3-1.6.3.1-.2.3-.5.5-.8.3-.3.7-1 1.1-1.9m8.8-13.1c-1.2 0-2.3.1-2.3.1s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4.1 0 .2 0 .4 0 1 0 3-.4 3.2-.8.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0 0 .5-3-.4-4.8-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-.5-.2-1.1-.2-1.7-.2z" style="fill:#513624"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.png
deleted file mode 100644
index 97e8709d1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.svg
deleted file mode 100644
index d1f0925c0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_4.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#ba7750"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#a35c3d"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#ba7750"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#a35c3d"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#ba7750"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#a35c3d"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m41.1 16.5c-.8 0-1.4-.2-1.7-.5-.1-.1-.1-.2-.1-.3.2-1.4-.9-4.7-1.2-5.3l-.2-2.4 1.8.4c0 .6-.1 1.6-.1 2.6-.1 1.4 1.3 3.3 2.3 4.6l.4.5c.1.1.1.1.1.1s-.1.1-.5.2c-.2.1-.4.1-.8.1" style="fill:#472e18"/>
-  <path d="m38.5 8.6l.7.1c0 .6-.1 1.4-.1 2.2-.1 1.6 1.3 3.5 2.4 4.9 0 0 .1.1.1.1-.1 0-.3 0-.5 0-.7 0-1.1-.1-1.3-.2.2-1.5-.9-4.6-1.2-5.5l-.1-1.6m-1.1-1.2l.3 3.1c0 0 1.4 3.7 1.2 5.2-.2 1 1.2 1.3 2.3 1.3.4 0 .7 0 .9-.1.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.9-.5z" style="fill:#382211"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#ba7750"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#a35c3d"/>
-  <path d="m22 16.4c-.1 0-.1 0-.2 0 0-.2.2-.6 1-1.6.5-.6 1-1.7 1.8-3.4l.1-.2-.1-.2c-.4-.9-1.1-3.2.4-6.2 1.8-3.7 5.9-4.2 5.9-4.2 0 0 1-.1 2.2-.1.7 0 1.3 0 1.8.1.8.1 1.9.5 2.3 1 .1.2.1.4.1.6l-.1.3.2.2c.7.6 1.3 1.5 1.9 2.7.4.9.5 2.1.5 3.1-.3-2.4-1.2-4.2-2.6-5.3l-.4-.3-.3.3c-.3.3-.6.6-1.1.9l-.3.2.1.3c0 0 .1 1.5-4.1 4.2-.1.1-2.3 1.5-2.6 1.8 0 0-.1.1-.2.1-.5.3-1.5.8-2 1.8-.1-.4-.3-.8-.4-1.2l-.5-2-.4 2.1c-.2 1.1-.2 2.5-.3 3.5 0 .4 0 .8 0 1-.3.2-1.8.5-2.7.5" style="fill:#472e18"/>
-  <path d="m33.1 1c.7 0 1.2 0 1.7.1 1 .2 1.8.5 2 .8 0 0 0 .1 0 .2l-.1.3-.5.5c-.3.3-.6.6-1 .9l-.5.4.1.5c0 .2-.4 1.5-3.8 3.8-.2.2-2.3 1.5-2.6 1.8 0 0-.1 0-.1.1-.3.2-1 .6-1.6 1.2 0-.1 0-.2-.1-.3l-1.1-4.1-.6 3c-.3-1.1-.5-2.9.6-5.2 1.7-3.5 5.4-3.9 5.6-3.9-.1 0 .9-.1 2-.1m-8.8 12.1c0 .6 0 1.2 0 1.7 0 .2 0 .5 0 .7-.4.1-1 .3-1.6.3.1-.2.3-.5.5-.8.3-.3.7-1 1.1-1.9m8.8-13.1c-1.2 0-2.3.1-2.3.1s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4.1 0 .2 0 .4 0 1 0 3-.4 3.2-.8.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0 0 .5-3-.4-4.8-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-.5-.2-1.1-.2-1.7-.2z" style="fill:#382211"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.png
deleted file mode 100644
index 842b5b55f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.svg
deleted file mode 100644
index 085fc4571..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_5.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#a55d2b"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#89471b"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#a55d2b"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#89471b"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#a55d2b"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#89471b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m41.1 16.5c-.8 0-1.4-.2-1.7-.5-.1-.1-.1-.2-.1-.3.2-1.4-.9-4.7-1.2-5.3l-.2-2.4 1.8.4c0 .6-.1 1.6-.1 2.6-.1 1.4 1.3 3.3 2.3 4.6l.4.5c.1.1.1.1.1.1s-.1.1-.5.2c-.2.1-.4.1-.8.1" style="fill:#1c1914"/>
-  <path d="m38.5 8.6l.7.1c0 .6-.1 1.4-.1 2.2-.1 1.6 1.3 3.5 2.4 4.9 0 0 .1.1.1.1-.1 0-.3 0-.5 0-.7 0-1.1-.1-1.3-.2.2-1.5-.9-4.6-1.2-5.5l-.1-1.6m-1.1-1.2l.3 3.1c0 0 1.4 3.7 1.2 5.2-.2 1 1.2 1.3 2.3 1.3.4 0 .7 0 .9-.1.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.9-.5z" style="fill:#0a0907"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#a55d2b"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#89471b"/>
-  <path d="m22 16.4c-.1 0-.1 0-.2 0 0-.2.2-.6 1-1.6.5-.6 1-1.7 1.8-3.4l.1-.2-.1-.2c-.4-.9-1.1-3.2.4-6.2 1.8-3.7 5.9-4.2 5.9-4.2 0 0 1-.1 2.2-.1.7 0 1.3 0 1.8.1.8.1 1.9.5 2.3 1 .1.2.1.4.1.6l-.1.3.2.2c.7.6 1.3 1.5 1.9 2.7.4.9.5 2.1.5 3.1-.3-2.4-1.2-4.2-2.6-5.3l-.4-.3-.3.3c-.3.3-.6.6-1.1.9l-.3.2.1.3c0 0 .1 1.5-4.1 4.2-.1.1-2.3 1.5-2.6 1.8 0 0-.1.1-.2.1-.5.3-1.5.8-2 1.8-.1-.4-.3-.8-.4-1.2l-.5-2-.4 2.1c-.2 1.1-.2 2.5-.3 3.5 0 .4 0 .8 0 1-.3.2-1.8.5-2.7.5" style="fill:#1c1914"/>
-  <path d="m33.1 1c.7 0 1.2 0 1.7.1 1 .2 1.8.5 2 .8 0 0 0 .1 0 .2l-.1.3-.5.5c-.3.3-.6.6-1 .9l-.5.4.1.5c0 .2-.4 1.5-3.8 3.8-.2.2-2.3 1.5-2.6 1.8 0 0-.1 0-.1.1-.3.2-1 .6-1.6 1.2 0-.1 0-.2-.1-.3l-1.1-4.1-.6 3c-.3-1.1-.5-2.9.6-5.2 1.7-3.5 5.4-3.9 5.6-3.9-.1 0 .9-.1 2-.1m-8.8 12.1c0 .6 0 1.2 0 1.7 0 .2 0 .5 0 .7-.4.1-1 .3-1.6.3.1-.2.3-.5.5-.8.3-.3.7-1 1.1-1.9m8.8-13.1c-1.2 0-2.3.1-2.3.1s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4.1 0 .2 0 .4 0 1 0 3-.4 3.2-.8.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0 0 .5-3-.4-4.8-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-.5-.2-1.1-.2-1.7-.2z" style="fill:#0a0907"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.png
deleted file mode 100644
index a03a74ea6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.svg
deleted file mode 100644
index 60c02bd5d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/girl_6.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.7 1.5-1.5 1.5" style="fill:#3c201d"/>
-  <path d="m44 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#1e0e0e"/>
-  <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-11.5h3v11.5c0 .8-.6 1.5-1.5 1.5" style="fill:#3c201d"/>
-  <path d="m22 28v11c0 .6-.4 1-1 1s-1-.4-1-1v-11h2m1-1h-4v12c0 1.1.9 2 2 2s2-.9 2-2v-12z" style="fill:#1e0e0e"/>
-  <path d="m24.5 22.5h15v18h-15z" style="fill:#3c201d"/>
-  <path d="m39 23v17h-14v-17h14m1-1h-16v19h16v-19z" style="fill:#1e0e0e"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v2.8h4v1.6-3.8c0-1.2.4-2.2 1-3.1v11.3h16v-11.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v2.8h4v-2.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#da4168"/>
-  <path d="m37.7 10.5c0 0 1.4 3.7 1.2 5.2s2.5 1.5 3.2 1.2c.7-.2 1.1-.6.7-1.2-.9-1.3-2.6-3.3-2.6-4.8s.1-3 .1-3l-2.8-.6.2 3.2"/>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#3c201d"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#1e0e0e"/>
-  <path d="m39.8 5.2c-.7-1.4-1.3-2.3-2.1-2.9.3-1.4-1.6-2-2.8-2.2-1.7-.3-4.1 0-4.1 0s-4.3.4-6.3 4.4c-1.6 3.2-.8 5.7-.4 6.7-.6 1.3-1.2 2.6-1.7 3.3-1.2 1.6-1.3 2.2-.8 2.4s3.4-.3 3.6-.8c.2-.4-.1-2.8.3-4.6.4 1.5 1.1 2.7 1.1 2.7-.3-2 2-2.9 2.3-3.1.3-.2 2.6-1.8 2.6-1.8 4.6-3.1 4.3-4.8 4.3-4.8.5-.3.8-.7 1.1-1 1 .9 2.1 2.5 2.4 5.5 0 0 .7.5.8 1.1 0-.1.6-3-.3-4.9"/>
-  <path d="m40 37h-16l-4 10h24z" style="fill:#b6384d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.png
deleted file mode 100644
index 102cdbd05..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.svg
deleted file mode 100644
index c2513ecb3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/grass.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.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">
-      <path d="m10.92 3.96c.68.29 1.39.52 2.03.88 2.75 1.52 5.1 3.54 7.23 5.81 4.99 5.32 8.46 11.57 10.97 18.37 1.87 5.07 3.1 10.29 3.89 15.63.73 4.94 1.04 9.9 1.08 14.89 0 .14 0 .29 0 .48-2.71 0-5.38 0-8.09 0-.02-.1-.05-.22-.05-.35-.15-3.88-.18-7.76-.47-11.62-.68-9.06-2.23-17.97-5.5-26.49-2.16-5.62-5.02-10.83-9.18-15.24-.52-.55-1.06-1.07-1.58-1.61-.16-.17-.3-.35-.45-.53.03-.08.07-.15.12-.22z" style="fill:#16bf2e"/>
-      <path d="m40.9 60.02c.08-1.53.11-3.02.24-4.49.34-3.71 1.08-7.33 2.28-10.86 2.27-6.67 5.84-12.53 10.88-17.47 1.37-1.34 2.81-2.6 4.56-3.43.34-.16.75-.16 1.13-.23-.12.35-.18.73-.37 1.03-1.13 1.87-2.37 3.68-3.44 5.58-2.77 4.93-4.51 10.23-5.61 15.75-.87 4.37-1.24 8.8-1.31 13.25 0 .27 0 .55 0 .87-2.76 0-5.51 0-8.36 0z" style="fill:#00a532"/>
-      <path d="m25.29 60.04c-2.82 0-5.54 0-8.28 0-.13-2.2-.18-4.4-.41-6.58-.23-2.19-.54-4.38-1-6.53-.46-2.15-1.03-4.29-1.75-6.36-.72-2.07-1.57-4.12-2.57-6.08-.99-1.96-2.2-3.81-3.38-5.67-1.16-1.85-2.73-3.4-3.89-5.27.82-.09 1.44.27 2.05.62 2.24 1.27 4.2 2.91 6.02 4.71 4.86 4.8 8.5 10.39 10.77 16.84 1.24 3.52 2.02 7.13 2.27 10.85.06 1.14.1 2.28.17 3.47z" style="fill:#083"/>
-    </g>
-    <path d="m38.58 41.09c-.59-2.62-1.17-5.24-1.76-7.87-.01-.04-.01-.08-.02-.11-.88-1.72-.42-3.32.34-4.96 1.55-3.29 3.3-6.44 5.74-9.17 2.03-2.27 4.33-4.2 7.21-5.31.53-.21 1.11-.32 1.66-.47.03.05.06.1.09.15-.08.11-.13.24-.23.32-4.99 4.23-8.08 9.68-10.22 15.76-1.28 3.63-2.12 7.37-2.72 11.17-.03.18-.06.35-.09.49z" style="fill:#063;stroke:#009949"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.png
deleted file mode 100644
index 644ce35cb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.svg
deleted file mode 100644
index 606a255d2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/greenhouse.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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 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"/>
-  <path d="m47 11v13h-30v-13h30m0-1h-30l-1 1v13l1 1h30l1-1v-13l-1-1z" style="fill:#7aadcc"/>
-  <path d="m2.5 24.5h15v35h-15z" style="fill:#d9f1ff"/>
-  <path d="m17 25v34h-14v-34h14m1-1h-1-14-1v1 34 1h1 14 1v-1-34-1z" style="fill:#7aadcc"/>
-  <path d="m46.5 24.5h15v35h-15z" style="fill:#d9f1ff"/>
-  <path d="m61 25v34h-14v-34h14m1-1h-1-14-1v1 34 1h1 14 1v-1-34-1z" style="fill:#7aadcc"/>
-  <path d="m16.5 24.5h31v35h-31z" style="fill:#d9f1ff"/>
-  <path d="m47 25v34h-30v-34h30m1-1h-1-30-1v1 34 1h1 30 1v-1-34-1z" style="fill:#7aadcc"/>
-  <path d="m25.5 36.5h13v23h-13z" style="fill:#c99a61"/>
-  <path d="m38 37v22h-12v-22h12m1-1h-1-12-1v1 22 1h1 12 1v-1-22-1z" style="fill:#664b3d"/>
-  <g style="fill:#734a00">
-    <path d="m35 47h2v1h-2z"/>
-    <path d="m36 49h1v1h-1z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.png
deleted file mode 100644
index 96cec61b9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.svg
deleted file mode 100644
index 0e46f14c4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/groundfloor.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.19l19.5-9.75 19.5 9.75v45.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V59H13V14.62L32,5.12 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#ffccd3"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#f66"/>
-  <path d="m17.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m25.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m30.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.43 12.43h5.14v5.14h-5.14z" style="fill:#f0f0f0"/>
-  <path d="m38.14 12.86v4.29h-4.29v-4.29h4.29m.86-.86h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#ffccd3"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#f66"/>
-  <path d="m31.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m22 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m22.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m27 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m31.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m36 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m40.47 23.47h6.06v6.06h-6.06z" style="fill:#f0f0f0"/>
-  <path d="m46.06 23.94v5.13h-5.13v-5.13h5.13m.94-.94h-7v7h7v-7z" style="fill:#c8c8c8"/>
-  <path d="m44 41h1v1h-1z" style="fill:#f66"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.png
deleted file mode 100644
index d7f7de1d8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.svg
deleted file mode 100644
index 4e20e334e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/group.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.2l19.5-9.7 19.5 9.7v45.2z" style="fill:#f0f0f0"/>
-  <path d="M32,5.1l19,9.5V59H13V14.6L32,5.1 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m17.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m22.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m27.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m36.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m22.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m27.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m36.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 23.5h6.1v6.1h-6.1z" style="fill:#f0f0f0"/>
-  <g style="fill:#c8c8c8">
-    <path d="m46.1 23.9v5.1h-5.1v-5.1h5.1m.9-.9h-7v7h7v-7z"/>
-    <path d="m44 41h1v1h-1z"/>
-  </g>
-  <path d="m12.5 20.5v-6.2l19.5-9.7 19.5 9.7v6.2z" style="fill:#f0f0f0"/>
-  <path d="m32 5.1l19 9.5v5.4h-38v-5.4l19-9.5m0-1.1l-20 10v7h40v-7l-20-10z" style="fill:#c8c8c8"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.png
deleted file mode 100644
index 16519ae94..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.svg
deleted file mode 100644
index 991a13e6e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-0.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 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">
-    <g style="fill:#1a171b">
-      <path d="m22.37 43.7l-2.37 1.53.51.78 2.35-1.53c-.17-.25-.34-.51-.49-.78"/>
-      <path d="m35.46 48.65c-.15.05-.3.08-.45.12l.87 2.69.89-.29-.87-2.69c-.15.06-.29.12-.44.17"/>
-      <path d="m24.17 46l-1.88 2.09.69.62 1.89-2.09c-.24-.2-.48-.4-.7-.62"/>
-      <path d="m29.22 48.84l-.59 2.76.91.19.59-2.75c-.31-.05-.61-.12-.91-.2"/>
-      <path d="m32.12 49.2l.15 2.8.93-.05-.15-2.81c-.31.03-.62.06-.93.06"/>
-      <path d="m26.51 47.75l-1.28 2.51.83.42 1.28-2.51c-.28-.13-.56-.27-.83-.42"/>
-      <path d="m24 30.17l-2.09-1.88-.62.69 2.09 1.89c.2-.24.4-.48.62-.7"/>
-      <path d="m26.3 28.37l-1.53-2.37-.78.51 1.53 2.35c.25-.17.51-.34.78-.49"/>
-      <path d="m22.25 32.51l-2.51-1.28-.42.83 2.51 1.28c.13-.28.27-.56.42-.83"/>
-      <path d="m21.16 35.22l-2.76-.59-.19.91 2.75.59c.05-.31.12-.61.2-.91"/>
-      <path d="m20.8 38.12l-2.8.15.05.93 2.81-.15c-.03-.31-.06-.62-.06-.93"/>
-    </g>
-    <path d="m29.06 38.96c-.1-.32-.14-.65-.22-.98l-10.46 3.4.62 1.9 10.46-3.4c-.13-.31-.3-.6-.4-.92"/>
-    <g style="fill:#1a171b">
-      <path d="m34.78 27.16l.59-2.76-.91-.19-.59 2.75c.31.05.61.12.91.2"/>
-      <path d="m41.63 32.3l2.37-1.53-.51-.78-2.35 1.53c.17.25.34.51.49.78"/>
-      <path d="m39.83 30l1.88-2.09-.69-.62-1.89 2.09c.24.2.48.4.7.62"/>
-      <path d="m37.49 28.25l1.28-2.51-.83-.42-1.28 2.51c.28.13.56.27.83.42"/>
-      <path d="m31.88 26.8l-.15-2.8-.93.05.15 2.81c.31-.03.62-.06.93-.06"/>
-      <path d="m28.1 27.51c.15-.05.29-.12.44-.17s.3-.08.45-.12l-.87-2.69-.89.29.87 2.69"/>
-      <path d="m42.84 40.78l2.76.59.19-.91-2.75-.59c-.05.31-.12.61-.2.91"/>
-      <path d="m40 45.83l2.09 1.88.62-.69-2.09-1.89c-.2.24-.4.48-.62.7"/>
-      <path d="m42.65 34.54c.05.15.08.3.12.45l2.69-.87-.29-.89-2.69.87c.06.15.12.29.17.44"/>
-      <path d="m41.75 43.49l2.51 1.28.42-.83-2.51-1.28c-.13.28-.27.56-.42.83"/>
-      <path d="m43.2 37.88l2.8-.15-.05-.93-2.81.15c.03.31.06.62.06.93"/>
-      <path d="m37.7 47.63l1.53 2.37.78-.51-1.53-2.35c-.25.17-.51.34-.78.49"/>
-    </g>
-  </g>
-  <g style="fill:#c4cacc">
-    <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"/>
-    <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54"/>
-    <path d="m47.12 28.26c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89"/>
-    <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88"/>
-    <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.69-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.png
deleted file mode 100644
index 447aeadbe..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.svg
deleted file mode 100644
index cccd8c74c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-100.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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 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"/>
-  <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54" style="fill:#ff6400"/>
-  <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89" style="fill:#f00014"/>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#ffd200"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m41.63 32.3l2.37-1.53-.51-.78-2.35 1.53c.17.25.34.51.49.78"/>
-      <path d="m28.54 27.35c.15-.05.3-.08.45-.12l-.87-2.69-.89.29.87 2.69c.15-.06.29-.12.44-.17"/>
-      <path d="m39.83 30l1.88-2.09-.69-.62-1.89 2.09c.24.2.48.4.7.62"/>
-      <path d="m34.78 27.16l.59-2.76-.91-.19-.59 2.75c.31.05.61.12.91.2"/>
-      <path d="m31.88 26.8l-.15-2.8-.93.05.15 2.81c.31-.03.62-.06.93-.06"/>
-      <path d="m37.49 28.25l1.28-2.51-.83-.42-1.28 2.51c.28.13.56.27.83.42"/>
-      <path d="m40 45.83l2.09 1.88.62-.69-2.09-1.89c-.2.24-.4.48-.62.7"/>
-      <path d="m37.7 47.63l1.53 2.37.78-.51-1.53-2.35c-.25.17-.51.34-.78.49"/>
-      <path d="m41.75 43.49l2.51 1.28.42-.83-2.51-1.28c-.13.28-.27.56-.42.83"/>
-      <path d="m42.84 40.78l2.76.59.19-.91-2.75-.59c-.05.31-.12.61-.2.91"/>
-      <path d="m43.2 37.88l2.8-.15-.05-.93-2.81.15c.03.31.06.62.06.93"/>
-    </g>
-    <path d="m34.94 37.04c.1.32.14.65.22.98l10.46-3.4-.62-1.9-10.46 3.4c.13.31.3.6.4.92"/>
-    <g style="fill:#1a171b">
-      <path d="m29.22 48.84l-.59 2.76.91.19.59-2.75c-.31-.05-.61-.12-.91-.2"/>
-      <path d="m22.37 43.7l-2.37 1.53.51.78 2.35-1.53c-.17-.25-.34-.51-.49-.78"/>
-      <path d="m24.17 46l-1.88 2.09.69.62 1.89-2.09c-.24-.2-.48-.4-.7-.62"/>
-      <path d="m26.51 47.75l-1.28 2.51.83.42 1.28-2.51c-.28-.13-.56-.27-.83-.42"/>
-      <path d="m32.12 49.2l.15 2.8.93-.05-.15-2.81c-.31.03-.62.06-.93.06"/>
-      <path d="m35.9 48.49c-.15.05-.29.12-.44.17s-.3.08-.45.12l.87 2.69.89-.29-.87-2.69"/>
-      <path d="m21.16 35.22l-2.76-.59-.19.91 2.75.59c.05-.31.12-.61.2-.91"/>
-      <path d="m24 30.17l-2.09-1.88-.62.69 2.09 1.89c.2-.24.4-.48.62-.7"/>
-      <path d="m21.35 41.46c-.05-.15-.08-.3-.12-.45l-2.69.87.29.89 2.69-.87c-.06-.15-.12-.29-.17-.44"/>
-      <path d="m22.25 32.51l-2.51-1.28-.42.83 2.51 1.28c.13-.28.27-.56.42-.83"/>
-      <path d="m20.8 38.12l-2.8.15.05.93 2.81-.15c-.03-.31-.06-.62-.06-.93"/>
-      <path d="m26.3 28.37l-1.53-2.37-.78.51 1.53 2.35c.25-.17.51-.34.78-.49"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.png
deleted file mode 100644
index 014b435a8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.svg
deleted file mode 100644
index 0837cd69f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-20.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 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"/>
-  <g style="fill:#c4cacc">
-    <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54"/>
-    <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89"/>
-    <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88"/>
-    <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54"/>
-  </g>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m20.86 36.95l-2.81-.15-.05.93 2.8.15c0-.31.03-.62.06-.93"/>
-      <path d="m28.54 48.65c-.15-.05-.29-.11-.44-.17l-.87 2.69.89.29.87-2.69c-.15-.04-.3-.07-.45-.12"/>
-      <path d="m20.96 39.87l-2.75.59.19.91 2.76-.59c-.08-.3-.15-.6-.2-.91"/>
-      <path d="m23.38 45.13l-2.09 1.89.62.69 2.09-1.88c-.22-.22-.42-.46-.62-.7"/>
-      <path d="m25.51 47.13l-1.53 2.35.79.52 1.53-2.36c-.27-.16-.53-.33-.79-.51"/>
-      <path d="m21.83 42.66l-2.51 1.28.42.83 2.51-1.28c-.15-.27-.29-.55-.42-.83"/>
-      <path d="m30.13 26.96l-.59-2.75-.91.19.59 2.76c.3-.08.6-.15.91-.2"/>
-      <path d="m33.05 26.86l.15-2.81-.93-.05-.15 2.8c.31 0 .62.03.93.06"/>
-      <path d="m27.34 27.83l-1.28-2.51-.83.42 1.28 2.51c.27-.15.55-.29.83-.42"/>
-      <path d="m24.87 29.38l-1.89-2.09-.69.62 1.88 2.09c.22-.22.46-.42.7-.62"/>
-      <path d="m22.87 31.51l-2.35-1.53-.52.79 2.36 1.53c.16-.27.33-.53.51-.79"/>
-    </g>
-    <path d="m29.06 37.04c.1-.32.27-.61.4-.92l-10.46-3.4-.62 1.9 10.46 3.4c.08-.32.12-.65.22-.98"/>
-    <g style="fill:#1a171b">
-      <path d="m40.62 30.87l2.09-1.89-.62-.69-2.09 1.88c.22.22.42.46.62.7"/>
-      <path d="m43.14 39.05l2.81.15.05-.93-2.8-.15c0 .31-.03.62-.06.93"/>
-      <path d="m43.04 36.13l2.75-.59-.19-.91-2.76.59c.08.3.15.6.2.91"/>
-      <path d="m42.17 33.34l2.51-1.28-.42-.83-2.51 1.28c.15.27.29.55.42.83"/>
-      <path d="m38.49 28.87l1.53-2.35-.79-.52-1.53 2.36c.27.16.53.33.79.51"/>
-      <path d="m35.01 27.23c.15.04.3.07.45.12s.29.11.44.17l.87-2.69-.89-.29-.87 2.69"/>
-      <path d="m39.13 46.62l1.89 2.09.69-.62-1.88-2.09c-.22.22-.46.42-.7.62"/>
-      <path d="m33.87 49.04l.59 2.75.91-.19-.59-2.76c-.3.08-.6.15-.91.2"/>
-      <path d="m42.65 41.46c-.05.15-.11.29-.17.44l2.69.87.29-.89-2.69-.87c-.04.15-.07.3-.12.45"/>
-      <path d="m36.66 48.17l1.28 2.51.83-.42-1.28-2.51c-.27.15-.55.29-.83.42"/>
-      <path d="m41.13 44.49l2.35 1.53.52-.79-2.36-1.53c-.16.27-.33.53-.51.79"/>
-      <path d="m30.95 49.14l-.15 2.81.93.05.15-2.8c-.31 0-.62-.03-.93-.06"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.png
deleted file mode 100644
index d2abb27a2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.svg
deleted file mode 100644
index f2d83314e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-40.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.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"/>
-  <g style="fill:#c4cacc">
-    <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54"/>
-    <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89"/>
-  </g>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#c4cacc"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m23.6 30.6l-2.19-1.77-.59.73 2.18 1.77c.19-.26.39-.5.6-.73"/>
-      <path d="m22.94 44.58c-.09-.13-.17-.26-.26-.39l-2.28 1.66.55.76 2.28-1.66c-.09-.13-.2-.24-.29-.37"/>
-      <path d="m21.97 33.02l-2.57-1.14-.38.85 2.58 1.15c.11-.29.23-.58.37-.86"/>
-      <path d="m20.83 38.7l-2.8.3.1.93 2.8-.29c-.05-.32-.08-.63-.1-.94"/>
-      <path d="m21.38 41.58l-2.62 1.01.33.87 2.63-1.01c-.12-.29-.24-.58-.34-.87"/>
-      <path d="m21.03 35.79l-2.79-.44-.15.92 2.79.44c.04-.31.09-.61.15-.92"/>
-      <path d="m36.98 27.97l1.14-2.57-.85-.38-1.15 2.58c.29.11.58.23.86.37"/>
-      <path d="m39.4 29.6l1.77-2.19-.73-.59-1.77 2.18c.26.19.5.39.73.6"/>
-      <path d="m34.21 27.03l.44-2.79-.92-.15-.44 2.79c.31.04.61.09.92.15"/>
-      <path d="m31.3 26.83l-.3-2.8-.93.1.29 2.8c.32-.05.63-.08.94-.1"/>
-      <path d="m28.42 27.38l-1.01-2.62-.87.33 1.01 2.63c.29-.12.58-.24.87-.34"/>
-    </g>
-    <path d="m30.18 35.5c.27-.2.58-.34.86-.51l-6.47-8.9-1.62 1.18 6.47 8.9c.26-.23.49-.47.76-.67"/>
-    <g style="fill:#1a171b">
-      <path d="m43.17 37.3l2.8-.29-.1-.93-2.8.29c.05.31.08.62.1.93"/>
-      <path d="m40.4 45.4l2.19 1.77.59-.73-2.18-1.77c-.19.26-.39.5-.6.73"/>
-      <path d="m42.03 42.98l2.57 1.14.38-.85-2.58-1.15c-.11.29-.23.58-.37.86"/>
-      <path d="m42.97 40.21l2.79.44.15-.92-2.79-.44c-.04.31-.09.61-.15.92"/>
-      <path d="m42.62 34.42l2.62-1.01-.33-.87-2.63 1.01c.12.29.24.58.34.87"/>
-      <path d="m40.77 31.05c.1.12.2.24.29.36s.17.26.26.39l2.28-1.66-.55-.76-2.28 1.67"/>
-      <path d="m32.7 49.17l.29 2.8.93-.1-.29-2.8c-.31.05-.62.08-.93.1"/>
-      <path d="m27.02 48.03l-1.14 2.57.85.38 1.15-2.58c-.29-.11-.58-.23-.86-.37"/>
-      <path d="m38.58 47.06c-.13.09-.26.17-.39.26l1.66 2.28.76-.55-1.66-2.28c-.13.09-.24.2-.37.29"/>
-      <path d="m29.79 48.97l-.44 2.79.92.15.44-2.79c-.31-.04-.61-.09-.92-.15"/>
-      <path d="m35.58 48.62l1.01 2.62.87-.33-1.01-2.63c-.29.12-.58.24-.87.34"/>
-      <path d="m24.6 46.4l-1.77 2.19.73.59 1.77-2.18c-.26-.19-.5-.39-.73-.6"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.png
deleted file mode 100644
index c4b3372ba..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.svg
deleted file mode 100644
index a9b8e418d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-60.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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,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"/>
-  <g style="fill:#c4cacc">
-    <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54"/>
-    <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89"/>
-  </g>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#ffd200"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m29.56 27.08l-.73-2.72-.9.24.73 2.71c.29-.09.59-.17.9-.23"/>
-      <path d="m20.8 38c0-.16.02-.31.02-.47h-2.82v.93h2.82c0-.15-.02-.3-.02-.46"/>
-      <path d="m26.81 28.08l-1.41-2.44-.81.47 1.41 2.44c.27-.17.53-.33.81-.47"/>
-      <path d="m22.55 32.01l-2.44-1.41-.47.81 2.44 1.41c.14-.29.3-.55.47-.81"/>
-      <path d="m21.31 34.65l-2.71-.73-.24.9 2.72.73c.06-.3.14-.6.23-.9"/>
-      <path d="m24.43 29.77l-2-2-.66.66 2 2c.21-.23.43-.45.66-.66"/>
-      <path d="m41.92 32.81l2.44-1.41-.47-.81-2.44 1.41c.17.27.33.53.47.81"/>
-      <path d="m42.92 35.56l2.72-.73-.24-.9-2.71.73c.09.29.17.59.23.9"/>
-      <path d="m40.23 30.43l2-2-.66-.66-2 2c.23.21.45.43.66.66"/>
-      <path d="m37.99 28.55l1.41-2.44-.81-.47-1.41 2.44c.29.14.55.3.81.47"/>
-      <path d="m35.35 27.31l.73-2.71-.9-.24-.73 2.72c.3.06.6.14.9.23"/>
-    </g>
-    <path d="m32 34.91c.34 0 .67.07 1 .09v-11h-2v11c.33-.03.66-.09 1-.09"/>
-    <g style="fill:#1a171b">
-      <path d="m41.45 43.99l2.44 1.41.47-.81-2.44-1.41c-.14.29-.3.55-.47.81"/>
-      <path d="m34.44 48.92l.73 2.72.9-.24-.73-2.71c-.29.09-.59.17-.9.23"/>
-      <path d="m37.19 47.92l1.41 2.44.81-.47-1.41-2.44c-.27.17-.53.33-.81.47"/>
-      <path d="m39.57 46.23l2 2 .66-.66-2-2c-.21.23-.43.45-.66.66"/>
-      <path d="m42.69 41.35l2.71.73.24-.9-2.72-.73c-.06.3-.14.6-.23.9"/>
-      <path d="m43.18 37.53c.01.16.02.31.02.47s-.02.31-.02.47h2.82v-.93h-2.82z"/>
-      <path d="m26.01 47.45l-1.41 2.44.81.47 1.41-2.44c-.29-.14-.55-.3-.81-.47"/>
-      <path d="m22.08 43.19l-2.44 1.41.47.81 2.44-1.41c-.17-.27-.33-.53-.47-.81"/>
-      <path d="m32 49.2c-.16 0-.31-.02-.47-.02v2.82h.93v-2.82c-.15 0-.3.02-.46.02"/>
-      <path d="m23.77 45.57l-2 2 .66.66 2-2c-.23-.21-.45-.43-.66-.66"/>
-      <path d="m28.65 48.69l-.73 2.71.9.24.73-2.72c-.3-.06-.6-.14-.9-.23"/>
-      <path d="m21.08 40.44l-2.72.73.24.9 2.71-.73c-.09-.29-.17-.59-.23-.9"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.png
deleted file mode 100644
index f6445e854..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.svg
deleted file mode 100644
index ddf682b5f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-80.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="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"/>
-  <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54" style="fill:#ff6400"/>
-  <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89" style="fill:#c4cacc"/>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#ffd200"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m36.44 27.73l1.01-2.63-.87-.33-1.01 2.62c.3.09.59.21.87.34"/>
-      <path d="m22.94 31.42c.09-.13.2-.24.29-.36l-2.28-1.66-.55.76 2.28 1.66c.09-.14.17-.28.26-.4"/>
-      <path d="m33.63 26.92l.29-2.8-.92-.09-.29 2.8c.3.02.61.05.92.09"/>
-      <path d="m27.88 27.6l-1.15-2.58-.85.38 1.14 2.57c.28-.14.57-.26.86-.37"/>
-      <path d="m25.32 29.01l-1.77-2.18-.73.59 1.77 2.19c.24-.22.48-.42.73-.6"/>
-      <path d="m30.71 26.89l-.44-2.79-.92.15.44 2.79c.31-.07.61-.12.92-.15"/>
-      <path d="m43.08 39.63l2.8.29.1-.93-2.8-.29c-.03.31-.06.62-.1.93"/>
-      <path d="m42.27 42.44l2.63 1.01.33-.87-2.62-1.01c-.09.3-.21.59-.34.87"/>
-      <path d="m43.11 36.71l2.79-.44-.15-.92-2.79.44c.07.31.12.61.15.92"/>
-      <path d="m42.4 33.88l2.58-1.15-.38-.85-2.57 1.14c.14.28.26.57.37.86"/>
-      <path d="m40.99 31.32l2.18-1.77-.59-.73-2.18 1.78c.21.23.41.47.59.72"/>
-    </g>
-    <path d="m33.82 35.5c.27.2.5.45.76.66l6.47-8.9-1.62-1.18-6.47 8.9c.28.18.58.32.86.52"/>
-    <g style="fill:#1a171b">
-      <path d="m36.12 48.4l1.15 2.58.85-.38-1.14-2.57c-.28.14-.57.26-.86.37"/>
-      <path d="m27.56 48.27l-1.01 2.63.87.33 1.01-2.62c-.3-.09-.59-.21-.87-.34"/>
-      <path d="m30.37 49.08l-.29 2.8.93.1.29-2.8c-.31-.03-.62-.06-.93-.1"/>
-      <path d="m33.29 49.11l.44 2.79.92-.15-.44-2.79c-.31.07-.61.12-.92.15"/>
-      <path d="m38.68 46.99l1.77 2.18.73-.59-1.78-2.18c-.23.21-.47.41-.72.59"/>
-      <path d="m41.32 44.19c-.09.13-.16.26-.26.39s-.2.24-.29.36l2.28 1.66.55-.76-2.28-1.65"/>
-      <path d="m21.6 42.12l-2.58 1.15.38.85 2.57-1.14c-.14-.28-.26-.57-.37-.86"/>
-      <path d="m20.92 36.37l-2.8-.29-.09.92 2.8.29c.02-.3.05-.61.09-.92"/>
-      <path d="m25.42 47.06c-.13-.09-.24-.2-.36-.29l-1.66 2.28.76.55 1.66-2.28c-.14-.09-.28-.17-.4-.26"/>
-      <path d="m20.89 39.29l-2.79.44.15.92 2.79-.44c-.07-.31-.12-.61-.15-.92"/>
-      <path d="m23.01 44.68l-2.18 1.77.59.73 2.19-1.77c-.22-.24-.42-.48-.6-.73"/>
-      <path d="m21.73 33.56l-2.63-1.01-.33.87 2.62 1.01c.09-.3.21-.59.34-.87"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.png
deleted file mode 100644
index 16519ae94..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.svg
deleted file mode 100644
index 991a13e6e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-off.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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 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">
-    <g style="fill:#1a171b">
-      <path d="m22.37 43.7l-2.37 1.53.51.78 2.35-1.53c-.17-.25-.34-.51-.49-.78"/>
-      <path d="m35.46 48.65c-.15.05-.3.08-.45.12l.87 2.69.89-.29-.87-2.69c-.15.06-.29.12-.44.17"/>
-      <path d="m24.17 46l-1.88 2.09.69.62 1.89-2.09c-.24-.2-.48-.4-.7-.62"/>
-      <path d="m29.22 48.84l-.59 2.76.91.19.59-2.75c-.31-.05-.61-.12-.91-.2"/>
-      <path d="m32.12 49.2l.15 2.8.93-.05-.15-2.81c-.31.03-.62.06-.93.06"/>
-      <path d="m26.51 47.75l-1.28 2.51.83.42 1.28-2.51c-.28-.13-.56-.27-.83-.42"/>
-      <path d="m24 30.17l-2.09-1.88-.62.69 2.09 1.89c.2-.24.4-.48.62-.7"/>
-      <path d="m26.3 28.37l-1.53-2.37-.78.51 1.53 2.35c.25-.17.51-.34.78-.49"/>
-      <path d="m22.25 32.51l-2.51-1.28-.42.83 2.51 1.28c.13-.28.27-.56.42-.83"/>
-      <path d="m21.16 35.22l-2.76-.59-.19.91 2.75.59c.05-.31.12-.61.2-.91"/>
-      <path d="m20.8 38.12l-2.8.15.05.93 2.81-.15c-.03-.31-.06-.62-.06-.93"/>
-    </g>
-    <path d="m29.06 38.96c-.1-.32-.14-.65-.22-.98l-10.46 3.4.62 1.9 10.46-3.4c-.13-.31-.3-.6-.4-.92"/>
-    <g style="fill:#1a171b">
-      <path d="m34.78 27.16l.59-2.76-.91-.19-.59 2.75c.31.05.61.12.91.2"/>
-      <path d="m41.63 32.3l2.37-1.53-.51-.78-2.35 1.53c.17.25.34.51.49.78"/>
-      <path d="m39.83 30l1.88-2.09-.69-.62-1.89 2.09c.24.2.48.4.7.62"/>
-      <path d="m37.49 28.25l1.28-2.51-.83-.42-1.28 2.51c.28.13.56.27.83.42"/>
-      <path d="m31.88 26.8l-.15-2.8-.93.05.15 2.81c.31-.03.62-.06.93-.06"/>
-      <path d="m28.1 27.51c.15-.05.29-.12.44-.17s.3-.08.45-.12l-.87-2.69-.89.29.87 2.69"/>
-      <path d="m42.84 40.78l2.76.59.19-.91-2.75-.59c-.05.31-.12.61-.2.91"/>
-      <path d="m40 45.83l2.09 1.88.62-.69-2.09-1.89c-.2.24-.4.48-.62.7"/>
-      <path d="m42.65 34.54c.05.15.08.3.12.45l2.69-.87-.29-.89-2.69.87c.06.15.12.29.17.44"/>
-      <path d="m41.75 43.49l2.51 1.28.42-.83-2.51-1.28c-.13.28-.27.56-.42.83"/>
-      <path d="m43.2 37.88l2.8-.15-.05-.93-2.81.15c.03.31.06.62.06.93"/>
-      <path d="m37.7 47.63l1.53 2.37.78-.51-1.53-2.35c-.25.17-.51.34-.78.49"/>
-    </g>
-  </g>
-  <g style="fill:#c4cacc">
-    <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"/>
-    <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54"/>
-    <path d="m47.12 28.26c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89"/>
-    <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88"/>
-    <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.69-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.png
deleted file mode 100644
index 447aeadbe..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.svg
deleted file mode 100644
index cccd8c74c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating-on.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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 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"/>
-  <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54" style="fill:#ff6400"/>
-  <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89" style="fill:#f00014"/>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#ffd200"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m41.63 32.3l2.37-1.53-.51-.78-2.35 1.53c.17.25.34.51.49.78"/>
-      <path d="m28.54 27.35c.15-.05.3-.08.45-.12l-.87-2.69-.89.29.87 2.69c.15-.06.29-.12.44-.17"/>
-      <path d="m39.83 30l1.88-2.09-.69-.62-1.89 2.09c.24.2.48.4.7.62"/>
-      <path d="m34.78 27.16l.59-2.76-.91-.19-.59 2.75c.31.05.61.12.91.2"/>
-      <path d="m31.88 26.8l-.15-2.8-.93.05.15 2.81c.31-.03.62-.06.93-.06"/>
-      <path d="m37.49 28.25l1.28-2.51-.83-.42-1.28 2.51c.28.13.56.27.83.42"/>
-      <path d="m40 45.83l2.09 1.88.62-.69-2.09-1.89c-.2.24-.4.48-.62.7"/>
-      <path d="m37.7 47.63l1.53 2.37.78-.51-1.53-2.35c-.25.17-.51.34-.78.49"/>
-      <path d="m41.75 43.49l2.51 1.28.42-.83-2.51-1.28c-.13.28-.27.56-.42.83"/>
-      <path d="m42.84 40.78l2.76.59.19-.91-2.75-.59c-.05.31-.12.61-.2.91"/>
-      <path d="m43.2 37.88l2.8-.15-.05-.93-2.81.15c.03.31.06.62.06.93"/>
-    </g>
-    <path d="m34.94 37.04c.1.32.14.65.22.98l10.46-3.4-.62-1.9-10.46 3.4c.13.31.3.6.4.92"/>
-    <g style="fill:#1a171b">
-      <path d="m29.22 48.84l-.59 2.76.91.19.59-2.75c-.31-.05-.61-.12-.91-.2"/>
-      <path d="m22.37 43.7l-2.37 1.53.51.78 2.35-1.53c-.17-.25-.34-.51-.49-.78"/>
-      <path d="m24.17 46l-1.88 2.09.69.62 1.89-2.09c-.24-.2-.48-.4-.7-.62"/>
-      <path d="m26.51 47.75l-1.28 2.51.83.42 1.28-2.51c-.28-.13-.56-.27-.83-.42"/>
-      <path d="m32.12 49.2l.15 2.8.93-.05-.15-2.81c-.31.03-.62.06-.93.06"/>
-      <path d="m35.9 48.49c-.15.05-.29.12-.44.17s-.3.08-.45.12l.87 2.69.89-.29-.87-2.69"/>
-      <path d="m21.16 35.22l-2.76-.59-.19.91 2.75.59c.05-.31.12-.61.2-.91"/>
-      <path d="m24 30.17l-2.09-1.88-.62.69 2.09 1.89c.2-.24.4-.48.62-.7"/>
-      <path d="m21.35 41.46c-.05-.15-.08-.3-.12-.45l-2.69.87.29.89 2.69-.87c-.06-.15-.12-.29-.17-.44"/>
-      <path d="m22.25 32.51l-2.51-1.28-.42.83 2.51 1.28c.13-.28.27-.56.42-.83"/>
-      <path d="m20.8 38.12l-2.8.15.05.93 2.81-.15c-.03-.31-.06-.62-.06-.93"/>
-      <path d="m26.3 28.37l-1.53-2.37-.78.51 1.53 2.35c.25-.17.51-.34.78-.49"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.png
deleted file mode 100644
index 447aeadbe..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.svg
deleted file mode 100644
index cccd8c74c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/heating.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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 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"/>
-  <path d="m38.5 21.23c2.93 1.14 5.49 3.01 7.45 5.4l8.1-5.88c-3.19-4.08-7.49-7.25-12.44-9.06l-3.11 9.54" style="fill:#ff6400"/>
-  <path d="m47.12 28.25c1.65 2.55 2.65 5.53 2.83 8.75h10.03c-.19-5.41-1.91-10.43-4.75-14.64l-8.11 5.89" style="fill:#f00014"/>
-  <path d="m18.05 26.63c1.95-2.39 4.52-4.26 7.45-5.4l-3.1-9.54c-4.95 1.81-9.25 4.98-12.44 9.06l8.09 5.88" style="fill:#00c83c"/>
-  <path d="m27.4 20.62c1.47-.39 3.01-.62 4.6-.62s3.13.23 4.6.62l3.1-9.54c-2.45-.7-5.03-1.08-7.7-1.08s-5.25.38-7.7 1.08l3.1 9.54" style="fill:#ffd200"/>
-  <g style="opacity:.6">
-    <g style="fill:#1a171b">
-      <path d="m41.63 32.3l2.37-1.53-.51-.78-2.35 1.53c.17.25.34.51.49.78"/>
-      <path d="m28.54 27.35c.15-.05.3-.08.45-.12l-.87-2.69-.89.29.87 2.69c.15-.06.29-.12.44-.17"/>
-      <path d="m39.83 30l1.88-2.09-.69-.62-1.89 2.09c.24.2.48.4.7.62"/>
-      <path d="m34.78 27.16l.59-2.76-.91-.19-.59 2.75c.31.05.61.12.91.2"/>
-      <path d="m31.88 26.8l-.15-2.8-.93.05.15 2.81c.31-.03.62-.06.93-.06"/>
-      <path d="m37.49 28.25l1.28-2.51-.83-.42-1.28 2.51c.28.13.56.27.83.42"/>
-      <path d="m40 45.83l2.09 1.88.62-.69-2.09-1.89c-.2.24-.4.48-.62.7"/>
-      <path d="m37.7 47.63l1.53 2.37.78-.51-1.53-2.35c-.25.17-.51.34-.78.49"/>
-      <path d="m41.75 43.49l2.51 1.28.42-.83-2.51-1.28c-.13.28-.27.56-.42.83"/>
-      <path d="m42.84 40.78l2.76.59.19-.91-2.75-.59c-.05.31-.12.61-.2.91"/>
-      <path d="m43.2 37.88l2.8-.15-.05-.93-2.81.15c.03.31.06.62.06.93"/>
-    </g>
-    <path d="m34.94 37.04c.1.32.14.65.22.98l10.46-3.4-.62-1.9-10.46 3.4c.13.31.3.6.4.92"/>
-    <g style="fill:#1a171b">
-      <path d="m29.22 48.84l-.59 2.76.91.19.59-2.75c-.31-.05-.61-.12-.91-.2"/>
-      <path d="m22.37 43.7l-2.37 1.53.51.78 2.35-1.53c-.17-.25-.34-.51-.49-.78"/>
-      <path d="m24.17 46l-1.88 2.09.69.62 1.89-2.09c-.24-.2-.48-.4-.7-.62"/>
-      <path d="m26.51 47.75l-1.28 2.51.83.42 1.28-2.51c-.28-.13-.56-.27-.83-.42"/>
-      <path d="m32.12 49.2l.15 2.8.93-.05-.15-2.81c-.31.03-.62.06-.93.06"/>
-      <path d="m35.9 48.49c-.15.05-.29.12-.44.17s-.3.08-.45.12l.87 2.69.89-.29-.87-2.69"/>
-      <path d="m21.16 35.22l-2.76-.59-.19.91 2.75.59c.05-.31.12-.61.2-.91"/>
-      <path d="m24 30.17l-2.09-1.88-.62.69 2.09 1.89c.2-.24.4-.48.62-.7"/>
-      <path d="m21.35 41.46c-.05-.15-.08-.3-.12-.45l-2.69.87.29.89 2.69-.87c-.06-.15-.12-.29-.17-.44"/>
-      <path d="m22.25 32.51l-2.51-1.28-.42.83 2.51 1.28c.13-.28.27-.56.42-.83"/>
-      <path d="m20.8 38.12l-2.8.15.05.93 2.81-.15c-.03-.31-.06-.62-.06-.93"/>
-      <path d="m26.3 28.37l-1.53-2.37-.78.51 1.53 2.35c.25-.17.51-.34.78-.49"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.png
deleted file mode 100644
index d7f7de1d8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.svg
deleted file mode 100644
index 4e20e334e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/house.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.2l19.5-9.7 19.5 9.7v45.2z" style="fill:#f0f0f0"/>
-  <path d="M32,5.1l19,9.5V59H13V14.6L32,5.1 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m17.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m22.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m27.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.4 23.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m36.1 23.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m22.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m27.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.4 36.4h5.1v6.1h-5.1z" style="fill:#f0f0f0"/>
-  <path d="m36.1 36.9v5.3h-4.3v-5.3h4.3m.9-.9h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 23.5h6.1v6.1h-6.1z" style="fill:#f0f0f0"/>
-  <g style="fill:#c8c8c8">
-    <path d="m46.1 23.9v5.1h-5.1v-5.1h5.1m.9-.9h-7v7h7v-7z"/>
-    <path d="m44 41h1v1h-1z"/>
-  </g>
-  <path d="m12.5 20.5v-6.2l19.5-9.7 19.5 9.7v6.2z" style="fill:#f0f0f0"/>
-  <path d="m32 5.1l19 9.5v5.4h-38v-5.4l19-9.5m0-1.1l-20 10v7h40v-7l-20-10z" style="fill:#c8c8c8"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.png
deleted file mode 100644
index fd57d5de2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.svg
deleted file mode 100644
index cca34f2bb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-0.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3 0-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.3v3.8c.3 0 .5 0 .7 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="M17,47l16.8-13.2c-0.2-0.1-1.7-1.5-1.9-1.7s-1.6-1.7-1.7-1.9L17,47z"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7-1 .7-1.7.7c-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4s-.4.6-.4 1c0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.png
deleted file mode 100644
index 8bfed78cf..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.svg
deleted file mode 100644
index 8d921da29..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-10.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m11.8 38.6l21-4.2c-.1-.2-.8-2.1-.9-2.3-.1-.2-.6-2.2-.6-2.4l-19.5 8.9"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4s-.4.6-.4 1 .1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.png
deleted file mode 100644
index d89fa7cf8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.svg
deleted file mode 100644
index dbee856e6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-100.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m47 47l-13.2-16.7c-.1.2-1.5 1.7-1.7 1.9-.1.1-1.7 1.6-1.9 1.7l16.8 13.1"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7-1 .7-1.7.7c-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7s.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4s-.4.6-.4 1 .1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.png
deleted file mode 100644
index 9befb7066..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.svg
deleted file mode 100644
index f28d9046a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-20.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <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"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4s-.4.6-.4 1 .1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.png
deleted file mode 100644
index c358fb14d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.svg
deleted file mode 100644
index 67bc1947c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-30.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m14.8 19.5l15.7 14.5c.1-.2 1.2-1.9 1.4-2.1.1-.2 1.4-1.8 1.6-1.9l-18.7-10.5"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4s-.4.6-.4 1 .1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.png
deleted file mode 100644
index 62186a710..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.svg
deleted file mode 100644
index 6b8b2d18d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-40.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m22.4 13.1l7.4 20c.2-.1 2-1.2 2.2-1.3.2-.1 2.1-1 2.3-1l-11.9-17.7"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7-1 .7-1.7.7c-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7s.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.png
deleted file mode 100644
index af178ce59..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.svg
deleted file mode 100644
index ff58aa955..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-50.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m32 10.7l-2.5 21.3c.2 0 2.3-.1 2.5-.1.2 0 2.3.1 2.5.1l-2.5-21.3"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.png
deleted file mode 100644
index d703403ff..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.svg
deleted file mode 100644
index 5da6b7dc8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-60.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m41.6 13.1l-11.8 17.7c.2.1 2.1.9 2.3 1 .2.1 2 1.1 2.2 1.3l7.3-20"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.png
deleted file mode 100644
index 4e6affe5f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.svg
deleted file mode 100644
index d958741db..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-70.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.2v3.8c.2 0 .4 0 .6 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m49.2 19.5l-18.6 10.5c.2.1 1.5 1.8 1.6 1.9.1.2 1.3 1.9 1.4 2.1l15.6-14.5"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.png
deleted file mode 100644
index c2c46fcce..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.svg
deleted file mode 100644
index 690121fd3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-80.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3-.1-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.3v3.8c.3 0 .5 0 .7 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m53 28.7l-21.3.9c.1.2.5 2.2.5 2.4s.3 2.3.3 2.5l20.5-5.8"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.png
deleted file mode 100644
index e62127854..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.svg
deleted file mode 100644
index e8adbc2d3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity-90.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"/>
-  <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"/>
-  <path d="m17.5 20.1l-3.5-3.5c-3.5 4.1-5.7 9.5-5.7 15.4 0 6.6 2.7 12.5 7 16.8l3.5-3.5c-3.4-3.4-5.5-8.1-5.5-13.3 0-4.5 1.5-8.6 4.2-11.9" style="fill:#f00014"/>
-  <path d="m32 8.2c-5.9 0-11.3 2.2-15.4 5.7l3.5 3.5c3.2-2.6 7.4-4.2 11.9-4.2s8.6 1.6 11.9 4.2l3.5-3.5c-4.1-3.5-9.5-5.7-15.4-5.7" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m19.9 35.3l-3.6 1.2.4 1.2 3.6-1.2c-.1-.4-.2-.8-.4-1.2"/>
-    <path d="m22.7 40.4l-2.6 2.6.9.9 2.7-2.7c-.4-.2-.7-.5-1-.8"/>
-    <path d="m26.9 20.6l-1.7-3.4-1.1.6 1.7 3.4c.3-.2.7-.4 1.1-.6"/>
-    <path d="m22.3 24.2l-3.1-2.2-.7 1 3.1 2.2c.2-.4.4-.7.7-1"/>
-    <path d="m19.8 29.4l-3.8-.6-.2 1.2 3.7.6c.1-.4.2-.8.3-1.2"/>
-    <path d="m42.5 25.2l3.1-2.2-.7-1-3.1 2.2c.2.3.4.6.7 1"/>
-    <path d="m32 19.5c.2 0 .4 0 .6 0v-3.8h-1.3v3.8c.3 0 .5 0 .7 0"/>
-    <path d="m38.2 21.2l1.7-3.4-1.1-.6-1.7 3.4c.4.2.8.4 1.1.6"/>
-    <path d="m44.4 30.7l3.7-.6-.1-1.3-3.7.6c0 .4.1.8.1 1.3"/>
-    <path d="m44.1 35.3c-.1.4-.2.8-.4 1.2l3.6 1.2.4-1.2-3.6-1.2"/>
-    <path d="m40.4 41.3l2.7 2.7.9-.9-2.7-2.7c-.3.3-.6.6-.9.9"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m52.2 38.6l-19.4-8.9c0 .2-.6 2.2-.6 2.4-.1.2-.8 2.2-.9 2.3l20.9 4.2"/>
-    <circle cx="32" cy="32" r="2.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m30.3 46.7c.5.5.7 1 .7 1.7s-.2 1.2-.7 1.7c-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7s-.7-1-.7-1.7.2-1.2.7-1.7c.5-.5 1-.7 1.7-.7.7 0 1.3.2 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1 0 .4.1.7.4 1 .3.3.6.4 1 .4.4 0 .8-.1 1-.4m4.8-3.6h.8l-5.5 10h-.8l5.5-10m2.6 5.6c.5.5.7 1 .7 1.7 0 .7-.2 1.2-.7 1.7-.5.5-1 .7-1.7.7-.7 0-1.2-.2-1.7-.7-.5-.5-.7-1-.7-1.7 0-.7.2-1.2.7-1.7.5-.5 1-.7 1.7-.7.7 0 1.3.3 1.7.7m-.7 2.7c.3-.3.4-.6.4-1s-.1-.7-.4-1-.6-.4-1-.4c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4.4 0 .8-.1 1-.4" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.png
deleted file mode 100644
index cea7341e8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.svg
deleted file mode 100644
index b6fbc9524..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/humidity.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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="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"/>
-  <path d="m52.1 27.4c2.1 4.9 5.2 9 7.7 12.1.3.5.7 1 1.1 1.5.5.8 1.1 1.8 1.5 2.7.3.7.4 1.5.6 2.4v1.3c0 .2-.1.4-.1.5 0 .1 0 .1 0 .2l-.1.1v.1c-.5 4.5-4.3 8.6-8.6 9.4h-.1-.1c-.2.1-.5.1-.8.1-.2 0-.3 0-.5.1h-1.7c-.1 0-.3 0-.5-.1-.3 0-.6-.1-.8-.1h-.1-.1c-4.6-.8-8.5-5.4-8.7-10.3v-1.4c.1-.9.3-1.9.7-2.8.4-.8.8-1.5 1.2-2.2l1.5-2.1c3.3-3.8 5.9-7.6 7.9-11.5m0-2.4c-2.2 4.8-5.2 9.3-8.6 13.4l-1.5 2.1c-.5.7-.9 1.5-1.3 2.3-.4 1-.6 2.1-.8 3.1v1.6c.2 5.3 4.4 10.4 9.5 11.3.5.2 1.1.2 1.6.3h1.8c.5-.1 1.1-.1 1.6-.3 4.8-.9 8.9-5.3 9.4-10.3.1-.3 0-.7.1-1v-1.5c-.1-.9-.3-1.9-.6-2.7-.5-1-1-2-1.6-2.9-.4-.5-.8-1-1.1-1.5-3.2-3.8-6.1-7.9-7.9-12.5l-.6-1.4z" style="fill:#1271d8"/>
-  <path d="m38.4 16.7l-2.8 2.8c2.1 2.6 3.4 5.9 3.4 9.5 0 4.1-1.7 7.9-4.4 10.6l2.8 2.8c3.5-3.4 5.6-8.2 5.6-13.4 0-4.7-1.7-9-4.6-12.3" style="fill:#2e7de5"/>
-  <path d="M12.4,19.5l-2.8-2.8C6.7,20,5,24.3,5,29c0,5.2,2.1,10,5.6,13.4l2.8-2.8C10.7,36.9,9,33.1,9,29    C9,25.4,10.3,22.1,12.4,19.5z" style="fill:#f00014"/>
-  <path d="m24 10c-4.7 0-9 1.7-12.3 4.6l2.8 2.8c2.6-2.1 5.9-3.4 9.5-3.4s6.9 1.3 9.5 3.4l2.8-2.8c-3.3-2.9-7.6-4.6-12.3-4.6" style="fill:#00c83c"/>
-  <g style="fill:#1a171b;opacity:.6">
-    <path d="m14.4 31.6l-2.9.9.3 1 2.9-.9c-.2-.4-.3-.7-.3-1"/>
-    <path d="m16.6 35.7l-2.1 2.1.7.7 2.1-2.1c-.2-.2-.5-.5-.7-.7"/>
-    <path d="m19.9 19.9l-1.4-2.7-.9.5 1.4 2.7c.3-.2.6-.4.9-.5"/>
-    <path d="m16.2 22.7l-2.4-1.7-.6.8 2.4 1.8c.2-.3.4-.6.6-.9"/>
-    <path d="m14.2 26.9l-3-.5-.2 1 3 .5c.1-.3.1-.6.2-1"/>
-    <path d="m32.4 23.5l2.4-1.8-.6-.7-2.4 1.8c.2.2.4.5.6.7"/>
-    <path d="m24 19c.2 0 .3 0 .5 0v-3h-1v3c.2 0 .3 0 .5 0"/>
-    <path d="m29 20.3l1.4-2.7-.9-.5-1.4 2.7c.3.2.6.4.9.5"/>
-    <path d="m33.9 27.9l3-.5-.2-1-3 .5c.2.4.2.7.2 1"/>
-    <path d="m33.6 31.6c-.1.3-.2.6-.3 1l2.9.9.3-1-2.9-.9"/>
-    <path d="m30.7 36.4l2.1 2.1.7-.7-2.1-2.1c-.2.2-.5.5-.7.7"/>
-  </g>
-  <g style="fill:#1a171b">
-    <path d="m24 28.9c.2 0 1.8.5 1.9.6l1.1-13.1-5 12.1c.2 0 1.9.3 2 .4"/>
-    <circle cx="24" cy="29" r="2"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m22.7 40.8c.4.4.6.8.6 1.3 0 .5-.2 1-.6 1.3-.4.4-.8.6-1.3.6-.5 0-1-.2-1.3-.6-.4-.4-.6-.8-.6-1.3 0-.5.2-1 .6-1.3.4-.4.8-.6 1.3-.6.4 0 .9.2 1.3.6m-.6 2.1c.2-.2.3-.5.3-.8 0-.3-.1-.6-.3-.8-.2-.2-.5-.3-.8-.3-.3 0-.6.1-.8.3-.2.2-.3.5-.3.8 0 .3.1.6.3.8.2.2.5.3.8.3.3 0 .6-.1.8-.3m3.8-2.9h.6l-4.4 8h-.6l4.4-8m2.1 4.5c.4.4.6.8.6 1.3 0 .5-.2 1-.6 1.3-.4.4-.8.6-1.3.6-.5 0-1-.2-1.3-.6-.4-.4-.6-.8-.6-1.3 0-.5.2-1 .6-1.3.4-.4.8-.6 1.3-.6.5.1 1 .3 1.3.6m-.5 2.2c.2-.2.3-.5.3-.8s-.1-.6-.3-.8-.5-.3-.8-.3c-.3 0-.6.1-.8.3s-.3.5-.3.8.1.6.3.8.5.3.8.3c.3 0 .6-.1.8-.3" style="fill:#1a171b"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.png
deleted file mode 100644
index 403d92f4e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.svg
deleted file mode 100644
index e5f1ce2c1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/incline.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="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">
-    <path d="m28.5 47v2" style="opacity:.4"/>
-    <path d="m20.5 47v2" style="opacity:.4"/>
-    <path d="m51.5 47v2" style="opacity:.4"/>
-    <path d="m43.5 47v2" style="opacity:.4"/>
-    <path d="m59.5 47v2" style="opacity:.4"/>
-    <path d="m4.5 47v2" style="opacity:.4"/>
-    <path d="m12.5 47v2" style="opacity:.4"/>
-    <path d="m35.5 47v2" style="opacity:.4"/>
-  </g>
-  <g style="opacity:.4">
-    <path d="m26.57 15.47l1.04 5.85m-6.26-4.46l2.05 5.58m-6.94-3.31l3 5.15m-7.42-2.07l3.86 4.55m-7.68-.75l4.6 3.82m-7.69.58l5.19 2.97m-7.48 1.9l5.64 2.03m-7.03 3.16l5.91 1.03m55.09-1.03l-5.91 1.03m4.51-6.22l-5.64 2.03m3.36-6.9l-5.19 2.97m2.09-7.37l-4.6 3.82m.78-7.62l-3.85 4.55m-.57-7.63l-3 5.15m-1.89-7.42l-2.05 5.58m-3.17-6.97l-1.04 5.85m-4.33-6.32v5.94" style="fill:none;stroke-miterlimit:10;stroke:#000;stroke-width:.5"/>
-  </g>
-  <g style="opacity:.6">
-    <path d="m32 44.5c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1m0-.5c-.83 0-1.5.67-1.5 1.5s.67 1.5 1.5 1.5 1.5-.67 1.5-1.5-.67-1.5-1.5-1.5z" style="fill:#1a171b"/>
-  </g>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b;stroke-width:.5">
-    <path d="m3 45.5h26" style="opacity:.15"/>
-    <path d="m35 45.5h26" style="opacity:.15"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.png
deleted file mode 100644
index d749af4f8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.svg
deleted file mode 100644
index fa71dc4d8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/keyring.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="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"/>
-  <path d="m5.5 23.5h29v17h-29z" style="fill:#ececed"/>
-  <path d="m34 24v16h-28v-16h28m1-1h-30v18h30v-18z" style="fill:#9b9c9e"/>
-  <g style="fill:#646464">
-    <path d="m9 28h22v2h-22z"/>
-    <path d="m9 34h16v2h-16z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.png
deleted file mode 100644
index 752930515..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.svg
deleted file mode 100644
index 20f830635..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/kitchen.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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="21.8288" y1="4.055" x2="42.1712" y2="59.945">
-      <stop/>
-      <stop offset=".5" style="stop-color:#191919"/>
-      <stop offset=".5"/>
-      <stop offset="1"/>
-    </linearGradient>
-  </defs>
-  <path d="m0 12h64v40h-64z" style="fill:url(#0)"/>
-  <circle cx="32" cy="45" r="2" style="fill:#c8c8c8"/>
-  <g style="opacity:.5">
-    <path d="m52 16c3.87 0 7 3.13 7 7s-3.13 7-7 7-7-3.13-7-7 3.13-7 7-7m0-1c-4.41 0-8 3.59-8 8s3.59 8 8 8 8-3.59 8-8-3.59-8-8-8z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m14 34c3.87 0 7 3.13 7 7s-3.13 7-7 7-7-3.13-7-7 3.13-7 7-7m0-1c-4.41 0-8 3.59-8 8s3.59 8 8 8 8-3.59 8-8-3.59-8-8-8z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m14 37.5c1.93 0 3.5 1.57 3.5 3.5s-1.57 3.5-3.5 3.5-3.5-1.57-3.5-3.5 1.57-3.5 3.5-3.5m0-1c-2.48 0-4.5 2.02-4.5 4.5s2.02 4.5 4.5 4.5 4.5-2.02 4.5-4.5-2.02-4.5-4.5-4.5z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m50 40c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3m0-1c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m50 37c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6 2.69-6 6-6m0-1c-3.86 0-7 3.14-7 7s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m14 16c3.87 0 7 3.13 7 7s-3.13 7-7 7-7-3.13-7-7 3.13-7 7-7m0-1c-4.41 0-8 3.59-8 8s3.59 8 8 8 8-3.59 8-8-3.59-8-8-8z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m14 19c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4m0-1c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m14 22c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1m0-1c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m52 19c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4m0-1c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.5">
-    <path d="m52 22c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1m0-1c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" style="fill:#c8c8c8"/>
-  </g>
-  <g style="opacity:.3">
-    <path d="m32 41c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4m0-1c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5z" style="fill:#fff"/>
-  </g>
-  <path d="m46.5 15.5h-4v.03c-.17-.01-2.33-.03-2.5-.03-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5c.17 0 2.33-.01 2.5-.03v.03h4" style="fill:none;opacity:.5;stroke-miterlimit:10;stroke:#c8c8c8;stroke-linecap:round"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.png
deleted file mode 100644
index f581dd94c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.svg
deleted file mode 100644
index 3853ad06b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-off.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light-on.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/light.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.png
deleted file mode 100644
index 065102dfd..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.svg
deleted file mode 100644
index 2e147aa43..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-decline.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.png
deleted file mode 100644
index d72bfe7ac..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.svg
deleted file mode 100644
index a175851c1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-incline.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.png
deleted file mode 100644
index 3ad0ba429..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.svg
deleted file mode 100644
index a2f85f4c4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line-stagnation.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.png
deleted file mode 100644
index 2e834936f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.svg
deleted file mode 100644
index df32f8d43..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/line.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.png
deleted file mode 100644
index e533f717f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.svg
deleted file mode 100644
index 2e88b59ad..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-closed.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.png
deleted file mode 100644
index 518f8a813..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.svg
deleted file mode 100644
index d5c9e3e57..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock-open.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.png
deleted file mode 100644
index e533f717f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.svg
deleted file mode 100644
index 2e88b59ad..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/lock.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.png
deleted file mode 100644
index 89c294070..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.svg
deleted file mode 100644
index e06019f74..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_1.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#f4d0b1"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-4z" style="fill:#e5b795"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#f4d0b1"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#e5b795"/>
-  <path d="m24.5 8.8c.1-4.1 3.4-7.3 7.5-7.3 4.1 0 7.4 3.2 7.5 7.3-1-1-1.8-2.2-2.2-3.5l-.1-.3h-.4c-.6 0-1.1.1-1.6.1-.8 0-1.5-.1-2.2-.2l-2.7-.4 2.4 1.3c.3.2.6.4.9.5-.5 0-1 0-1.4 0-2 0-3.7-.3-5.3-.9l-.5-.2-.2.5c-.4 1.3-1 2.3-1.7 3.1" style="fill:#e67831"/>
-  <path d="m32 2c2.1 0 4 .9 5.3 2.4l-.6.1c-.5 0-1.1.1-1.6.1-.7 0-1.5-.1-2.1-.2l-5.4-.8 4 2.3c-1.7 0-3.3-.3-4.6-.8l-.7-.2c1.4-1.8 3.4-2.9 5.7-2.9m5.7 2.9c.5.7.9 1.4 1.1 2.2-.4-.6-.7-1.3-1-2l-.1-.2m-5.7-3.9c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 1.4.5 3.2.9 5.4.9 1 0 2.2-.1 3.4-.2 0 0-1.3-.4-2.7-1.2.7.1 1.5.2 2.3.2.5 0 1.1 0 1.7-.1.5 1.4 1.5 2.9 3.2 4.3 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8z" style="fill:#dd6022"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.png
deleted file mode 100644
index 84a38844e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.svg
deleted file mode 100644
index 41bcfdabd..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_2.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#e7b48f"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-4z" style="fill:#d89f79"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#e7b48f"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#d89f79"/>
-  <path d="m24.5 8.8c.1-4.1 3.4-7.3 7.5-7.3 4.1 0 7.4 3.2 7.5 7.3-1-1-1.8-2.2-2.2-3.5l-.1-.3h-.4c-.6 0-1.1.1-1.6.1-.8 0-1.5-.1-2.2-.2l-2.7-.4 2.4 1.3c.3.2.6.4.9.5-.5 0-1 0-1.4 0-2 0-3.7-.3-5.3-.9l-.5-.2-.2.5c-.4 1.3-1 2.3-1.7 3.1" style="fill:#edda7b"/>
-  <path d="m32 2c2.1 0 4 .9 5.3 2.4l-.6.1c-.5 0-1.1.1-1.6.1-.7 0-1.5-.1-2.1-.2l-5.4-.8 4 2.3c-1.7 0-3.3-.3-4.6-.8l-.7-.2c1.4-1.8 3.4-2.9 5.7-2.9m5.7 2.9c.5.7.9 1.4 1.1 2.2-.4-.6-.7-1.3-1-2l-.1-.2m-5.7-3.9c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 1.4.5 3.2.9 5.4.9 1 0 2.2-.1 3.4-.2 0 0-1.3-.4-2.7-1.2.7.1 1.5.2 2.3.2.5 0 1.1 0 1.7-.1.5 1.4 1.5 2.9 3.2 4.3 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8z" style="fill:#ccb966"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.png
deleted file mode 100644
index 4e2450f19..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.svg
deleted file mode 100644
index 03d637f4a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_3.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#d29e7c"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#c18a6b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#d29e7c"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#c18a6b"/>
-  <path d="m24.5 8.8c.1-4.1 3.4-7.3 7.5-7.3 4.1 0 7.4 3.2 7.5 7.3-1-1-1.8-2.2-2.2-3.5l-.1-.3h-.4c-.6 0-1.1.1-1.6.1-.8 0-1.5-.1-2.2-.2l-2.7-.4 2.4 1.3c.3.2.6.4.9.5-.5 0-1 0-1.4 0-2 0-3.7-.3-5.3-.9l-.5-.2-.2.5c-.4 1.3-1 2.3-1.7 3.1" style="fill:#61452d"/>
-  <path d="m32 2c2.1 0 4 .9 5.3 2.4l-.6.1c-.5 0-1.1.1-1.6.1-.7 0-1.5-.1-2.1-.2l-5.4-.8 4 2.3c-1.7 0-3.3-.3-4.6-.8l-.7-.2c1.4-1.8 3.4-2.9 5.7-2.9m5.7 2.9c.5.7.9 1.4 1.1 2.2-.4-.6-.7-1.3-1-2l-.1-.2m-5.7-3.9c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 1.4.5 3.2.9 5.4.9 1 0 2.2-.1 3.4-.2 0 0-1.3-.4-2.7-1.2.7.1 1.5.2 2.3.2.5 0 1.1 0 1.7-.1.5 1.4 1.5 2.9 3.2 4.3 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8z" style="fill:#513624"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.png
deleted file mode 100644
index c3b8c1e92..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.svg
deleted file mode 100644
index 6ada7545a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_4.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#ba7750"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#a35c3d"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#ba7750"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#a35c3d"/>
-  <path d="m24.5 8.8c.1-4.1 3.4-7.3 7.5-7.3 4.1 0 7.4 3.2 7.5 7.3-1-1-1.8-2.2-2.2-3.5l-.1-.3h-.4c-.6 0-1.1.1-1.6.1-.8 0-1.5-.1-2.2-.2l-2.7-.4 2.4 1.3c.3.2.6.4.9.5-.5 0-1 0-1.4 0-2 0-3.7-.3-5.3-.9l-.5-.2-.2.5c-.4 1.3-1 2.3-1.7 3.1" style="fill:#472e18"/>
-  <path d="m32 2c2.1 0 4 .9 5.3 2.4l-.6.1c-.5 0-1.1.1-1.6.1-.7 0-1.5-.1-2.1-.2l-5.4-.8 4 2.3c-1.7 0-3.3-.3-4.6-.8l-.7-.2c1.4-1.8 3.4-2.9 5.7-2.9m5.7 2.9c.5.7.9 1.4 1.1 2.2-.4-.6-.7-1.3-1-2l-.1-.2m-5.7-3.9c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 1.4.5 3.2.9 5.4.9 1 0 2.2-.1 3.4-.2 0 0-1.3-.4-2.7-1.2.7.1 1.5.2 2.3.2.5 0 1.1 0 1.7-.1.5 1.4 1.5 2.9 3.2 4.3 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8z" style="fill:#382211"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.png
deleted file mode 100644
index d4873c9dc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.svg
deleted file mode 100644
index e70b57b2b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_5.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#a55d2b"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#89471b"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#a55d2b"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#89471b"/>
-  <path d="m24.5 8.8c.1-4.1 3.4-7.3 7.5-7.3 4.1 0 7.4 3.2 7.5 7.3-1-1-1.8-2.2-2.2-3.5l-.1-.3h-.4c-.6 0-1.1.1-1.6.1-.8 0-1.5-.1-2.2-.2l-2.7-.4 2.4 1.3c.3.2.6.4.9.5-.5 0-1 0-1.4 0-2 0-3.7-.3-5.3-.9l-.5-.2-.2.5c-.4 1.3-1 2.3-1.7 3.1" style="fill:#1c1914"/>
-  <path d="m32 2c2.1 0 4 .9 5.3 2.4l-.6.1c-.5 0-1.1.1-1.6.1-.7 0-1.5-.1-2.1-.2l-5.4-.8 4 2.3c-1.7 0-3.3-.3-4.6-.8l-.7-.2c1.4-1.8 3.4-2.9 5.7-2.9m5.7 2.9c.5.7.9 1.4 1.1 2.2-.4-.6-.7-1.3-1-2l-.1-.2m-5.7-3.9c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 1.4.5 3.2.9 5.4.9 1 0 2.2-.1 3.4-.2 0 0-1.3-.4-2.7-1.2.7.1 1.5.2 2.3.2.5 0 1.1 0 1.7-.1.5 1.4 1.5 2.9 3.2 4.3 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8z" style="fill:#0a0907"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.png
deleted file mode 100644
index 3c8f63a7a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.svg
deleted file mode 100644
index ef90c4544..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/man_6.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m21 40.5c-.8 0-1.5-.7-1.5-1.5v-3.5h3v3.5c0 .8-.6 1.5-1.5 1.5" style="fill:#3c201d"/>
-  <path d="m22 36v3c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-3h2m1-1h-4v4c0 1.1.9 2 2 2s2-.9 2-2v-4z" style="fill:#1e0e0e"/>
-  <path d="m35.8 17h-7.5c-5.1 0-9.2 4.1-9.2 9.2v.6c0 .1-.1.3-.1.4v9.8h4v-5.4-3.8c0-1.2.4-2.2 1-3.1v12.3h16v-12.4c.5.7.9 1.6 1 2.5 0 .1 0 .1 0 .1v9.8h4v-9.2-.6-1.1c0-5-4.1-9.1-9.2-9.1" style="fill:#00783c"/>
-  <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"/>
-  <path d="m36.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"/>
-  <ellipse cx="32" cy="17" rx="3.5" ry="2" style="fill:#fff"/>
-  <path d="m24 37v22h7v-17c0-.6.5-1 1-1s1 .4 1 1v17h7v-22h-16" style="fill:#505050"/>
-  <path d="m31 20h1v17h-1z" style="opacity:.2"/>
-  <path d="m32.5 34c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 32c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 30c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m32.5 28c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m30 17l1.5 2-1.5 3 2 6 2-6-1.5-3 1.5-2z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m32.64596 17.12745h3.45404v1.5h-3.3z"/>
-    <path d="m28.15956 15.96335h2.94044v1.5h-3.3z"/>
-  </g>
-  <path d="m32 16.5c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.4 7.5-7.5 7.5" style="fill:#3c201d"/>
-  <path d="m32 2c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.1-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#1e0e0e"/>
-  <path d="m32 1c-4.4 0-8 3.6-8 8 0 .3 0 .6.1.9.9-.7 1.9-1.9 2.6-3.9 2.1.8 5 1.2 8.8.6 0 0-1.3-.4-2.7-1.2 1.1.2 2.4.2 4 .1.5 1.5 1.5 3 3.2 4.4 0-.3 0-.6 0-.9 0-4.4-3.6-8-8-8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.png
deleted file mode 100644
index c1bbba7f2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.svg
deleted file mode 100644
index c8f05303b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/microphone.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.png
deleted file mode 100644
index d569dd9b5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.svg
deleted file mode 100644
index 11fb3acfb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/moon.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.png
deleted file mode 100644
index 0d6be3d37..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.svg
deleted file mode 100644
index f628483f4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/motion.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.png
deleted file mode 100644
index 4f7f2ea3a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.svg
deleted file mode 100644
index 94e696dae..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/movecontrol.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.png
deleted file mode 100644
index d8aa7c8da..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.svg
deleted file mode 100644
index 38535ba73..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-off.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m32 36c4.2 0 8.2 1.5 11.3 4.3l-2.8 2.8c-2.4-2-5.3-3.1-8.5-3.1s-6.1 1.1-8.5 3.1l-2.8-2.8c3.1-2.8 7.1-4.3 11.3-4.3m0-1c-4.6 0-9.2 1.8-12.7 5.3l4.2 4.2c2.3-2.3 5.4-3.5 8.5-3.5 3.1 0 6.1 1.2 8.5 3.5l4.2-4.2c-3.5-3.5-8.1-5.3-12.7-5.3z" style="fill:#990025"/>
-  <path d="m49 35.3c-4.6-4.4-10.6-6.8-17-6.8s-12.4 2.4-17 6.8l-3.5-3.5c5.5-5.3 12.8-8.3 20.5-8.3s15 2.9 20.5 8.3l-3.5 3.5" style="fill:#c80028"/>
-  <path d="m32 24c7.4 0 14.4 2.8 19.8 7.8l-2.8 2.8c-4.7-4.3-10.7-6.6-17-6.6s-12.3 2.3-17 6.6l-2.8-2.8c5.4-5 12.4-7.8 19.8-7.8m0-1c-7.7 0-15.4 2.9-21.2 8.8l4.2 4.2c4.7-4.7 10.8-7 17-7s12.3 2.3 17 7l4.2-4.2c-5.8-5.9-13.5-8.8-21.2-8.8z" style="fill:#990025"/>
-  <path d="m57.5 26.8c-6.9-6.6-15.9-10.3-25.5-10.3s-18.6 3.7-25.5 10.3l-3.5-3.5c7.8-7.6 18.1-11.8 29-11.8s21.2 4.2 29 11.8l-3.5 3.5" style="fill:#c80028"/>
-  <path d="m32 12c10.6 0 20.6 4 28.3 11.3l-2.8 2.8c-7-6.5-16-10.1-25.5-10.1s-18.5 3.6-25.4 10.1l-2.8-2.8c7.6-7.3 17.6-11.3 28.2-11.3m0-1c-10.8 0-21.5 4.1-29.7 12.3l4.2 4.2c7-7 16.2-10.5 25.5-10.5s18.4 3.5 25.5 10.5l4.2-4.2c-8.2-8.2-19-12.3-29.7-12.3z" style="fill:#990025"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.png
deleted file mode 100644
index 87f6e06a2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.svg
deleted file mode 100644
index 0fa706a7c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network-on.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m32 36c4.2 0 8.2 1.5 11.3 4.3l-2.8 2.8c-2.4-2-5.3-3.1-8.5-3.1s-6.1 1.1-8.5 3.1l-2.8-2.8c3.1-2.8 7.1-4.3 11.3-4.3m0-1c-4.6 0-9.2 1.8-12.7 5.3l4.2 4.2c2.3-2.3 5.4-3.5 8.5-3.5 3.1 0 6.1 1.2 8.5 3.5l4.2-4.2c-3.5-3.5-8.1-5.3-12.7-5.3z" style="fill:#009949"/>
-  <path d="m49 35.3c-4.6-4.4-10.6-6.8-17-6.8s-12.4 2.4-17 6.8l-3.5-3.5c5.5-5.3 12.8-8.3 20.5-8.3s15 2.9 20.5 8.3l-3.5 3.5" style="fill:#00c864"/>
-  <path d="m32 24c7.4 0 14.4 2.8 19.8 7.8l-2.8 2.8c-4.7-4.3-10.7-6.6-17-6.6s-12.3 2.3-17 6.6l-2.8-2.8c5.4-5 12.4-7.8 19.8-7.8m0-1c-7.7 0-15.4 2.9-21.2 8.8l4.2 4.2c4.7-4.7 10.8-7 17-7s12.3 2.3 17 7l4.2-4.2c-5.8-5.9-13.5-8.8-21.2-8.8z" style="fill:#009949"/>
-  <path d="m57.5 26.8c-6.9-6.6-15.9-10.3-25.5-10.3s-18.6 3.7-25.5 10.3l-3.5-3.5c7.8-7.6 18.1-11.8 29-11.8s21.2 4.2 29 11.8l-3.5 3.5" style="fill:#00c864"/>
-  <path d="m32 12c10.6 0 20.6 4 28.3 11.3l-2.8 2.8c-7-6.5-16-10.1-25.5-10.1s-18.5 3.6-25.4 10.1l-2.8-2.8c7.6-7.3 17.6-11.3 28.2-11.3m0-1c-10.8 0-21.5 4.1-29.7 12.3l4.2 4.2c7-7 16.2-10.5 25.5-10.5s18.4 3.5 25.5 10.5l4.2-4.2c-8.2-8.2-19-12.3-29.7-12.3z" style="fill:#009949"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.png
deleted file mode 100644
index f463f248d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.svg
deleted file mode 100644
index 0580abcdc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/network.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m32 36c4.2 0 8.2 1.5 11.3 4.3l-2.8 2.8c-2.4-2-5.3-3.1-8.5-3.1s-6.1 1.1-8.5 3.1l-2.8-2.8c3.1-2.8 7.1-4.3 11.3-4.3m0-1c-4.6 0-9.2 1.8-12.7 5.3l4.2 4.2c2.3-2.3 5.4-3.5 8.5-3.5 3.1 0 6.1 1.2 8.5 3.5l4.2-4.2c-3.5-3.5-8.1-5.3-12.7-5.3z"/>
-  <path d="m49 35.3c-4.6-4.4-10.6-6.8-17-6.8s-12.4 2.4-17 6.8l-3.5-3.5c5.5-5.3 12.8-8.3 20.5-8.3s15 2.9 20.5 8.3l-3.5 3.5" style="fill:#323232"/>
-  <path d="m32 24c7.4 0 14.4 2.8 19.8 7.8l-2.8 2.8c-4.7-4.3-10.7-6.6-17-6.6-6.3 0-12.3 2.3-17 6.6l-2.8-2.8c5.4-5 12.4-7.8 19.8-7.8m0-1c-7.7 0-15.4 2.9-21.2 8.8l4.2 4.2c4.7-4.7 10.8-7 17-7 6.1 0 12.3 2.3 17 7l4.2-4.2c-5.8-5.9-13.5-8.8-21.2-8.8z"/>
-  <path d="m57.5 26.8c-6.9-6.6-15.9-10.3-25.5-10.3s-18.6 3.7-25.5 10.3l-3.5-3.5c7.8-7.6 18.1-11.8 29-11.8s21.2 4.2 29 11.8l-3.5 3.5" style="fill:#323232"/>
-  <path d="m32 12c10.6 0 20.6 4 28.3 11.3l-2.8 2.8c-7-6.5-16-10.1-25.5-10.1-9.5 0-18.5 3.6-25.4 10.1l-2.8-2.8c7.6-7.3 17.6-11.3 28.2-11.3m0-1c-10.8 0-21.5 4.1-29.7 12.3l4.2 4.2c7-7 16.2-10.5 25.5-10.5s18.4 3.5 25.5 10.5l4.2-4.2c-8.2-8.2-19-12.3-29.7-12.3z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.png
deleted file mode 100644
index 65d64e5d6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.svg
deleted file mode 100644
index f3c744c97..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/niveau.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="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"/>
-  <circle cx="16.4" cy="47.51" r="4" style="fill:#fff"/>
-  <path d="m16.44 43.56c1.02 0 2.05.39 2.83 1.17 1.56 1.56 1.56 4.09 0 5.66-.78.78-1.8 1.17-2.83 1.17-1.02 0-2.05-.39-2.83-1.17-1.56-1.56-1.56-4.09 0-5.66.79-.78 1.81-1.17 2.83-1.17m0-1c-1.34 0-2.59.52-3.54 1.46s-1.46 2.2-1.46 3.54c0 1.34.52 2.59 1.46 3.54.94.94 2.2 1.46 3.54 1.46 1.34 0 2.59-.52 3.54-1.46.94-.94 1.46-2.2 1.46-3.54 0-1.34-.52-2.59-1.46-3.54s-2.2-1.46-3.54-1.46z"/>
-  <g style="stroke-width:.99999041">
-    <path d="m12.9077 45.440052h4.5323v8h-2z" style="fill:#c4e500"/>
-    <path d="m14.320857 45.437961h1.559143v2h-1z" style="fill:#f1ff33"/>
-  </g>
-  <path d="m12.59 46.53c-.35 1.33-.02 2.81 1.02 3.85 1.04 1.04 2.52 1.37 3.85 1.02l-4.87-4.87"/>
-  <path d="m15.42 43.71l4.87 4.87c.35-1.33.02-2.81-1.02-3.85-1.04-1.05-2.52-1.38-3.85-1.02"/>
-  <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-.71.71 2.12 2.12c.78.78 2.05.78 2.83 0l8.49-8.49c.78-.78.78-2.05 0-2.83l-2.12-2.12-.71.71"/>
-  <g style="stroke-width:.99999041">
-    <path d="m22.80765 32.70271h5.39235v14h-3z" style="fill:#c4e500"/>
-    <path d="m25.636 28.469272h1.704v4h-2z" style="fill:#f1ff33"/>
-    <path d="m14.32195 48.267454h1.55805v2h-1z" style="opacity:.2"/>
-    <path d="m24.929208 26.34315h2.060792v1h-2z" style="opacity:.2"/>
-    <path d="m21.39774 29.879938h1.91226v3h-1z" style="opacity:.2"/>
-    <path d="m29.17584 22.099262h1.91416v3h-1z" style="opacity:.2"/>
-    <path d="m12.197416 47.555324h2.062584v1h-2z" style="opacity:.2"/>
-    <path d="m15.739284 51.090824h2.060716v1h-2z" style="opacity:.2"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.png
deleted file mode 100644
index 0d93883e2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.svg
deleted file mode 100644
index a9984321c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/none.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg"/>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.png
deleted file mode 100644
index 88ad2530e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.svg
deleted file mode 100644
index 2c220830c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/office.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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 8.5h13v43h-13z" style="fill:#ff4545"/>
-  <path d="M17,9v42H5V9H17 M18,8H4v44h14V8L18,8z" style="fill:#d82b2b"/>
-  <path d="m20.5 8.5h13v43h-13z" style="fill:#70ce2e"/>
-  <path d="m33 9v42h-12v-42h12m1-1h-14v44h14v-44z" style="fill:#62b224"/>
-  <path d="m34.8 11.8l12.3-4.3 14.3 40.5-12.3 4.3-14.3-40.5" style="fill:#1e82ff"/>
-  <path d="m46.8 8.1l14 39.6-11.3 4-14-39.6 11.3-4m.6-1.3l-13.2 4.7 14.6 41.5 13.2-4.7-14.6-41.5z" style="fill:#1271d8"/>
-  <g style="fill:#828b7d">
-    <circle cx="11" cy="44" r="3"/>
-    <circle cx="27" cy="44" r="3"/>
-    <circle cx="52.7" cy="43.1" r="3"/>
-  </g>
-  <circle cx="11" cy="44" r="2"/>
-  <circle cx="27" cy="44" r="2"/>
-  <circle cx="52.7" cy="43.1" r="2"/>
-  <g style="fill:#e7f4f5">
-    <path d="m6 14h10v16h-10z"/>
-    <path d="m22 14h10v16h-10z"/>
-    <path d="m52.8 28.3l-9.4 3.3-5.4-15.1 9.4-3.3 5.4 15.1"/>
-  </g>
-  <g style="fill:#c8c8c8">
-    <path d="m7 21h8v1h-8z"/>
-    <path d="m7 24h8v1h-8z"/>
-    <path d="m7 27h8v1h-8z"/>
-    <path d="m23 21h8v1h-8z"/>
-    <path d="m23 24h8v1h-8z"/>
-    <path d="m23 27h8v1h-8z"/>
-    <path d="m41.4 22.7l7.5-2.7.3.9-7.5 2.7-.3-.9"/>
-    <path d="m42.3 25.5l7.5-2.7.3.9-7.5 2.7-.3-.9"/>
-    <path d="m43.4 28.4l7.5-2.7.3.9-7.5 2.7-.3-.9"/>
-  </g>
-  <path d="m8 16h6v3h-6z" style="fill:#fadc00"/>
-  <path d="m24 16h6v3h-6z" style="fill:#ff845c"/>
-  <path d="m40.6 17.7l5.7-2 1 2.8-5.7 2-1-2.8" style="fill:#5fbc15"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.png
deleted file mode 100644
index 6153e128c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.svg
deleted file mode 100644
index 0ef1d4281..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/oil.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.png
deleted file mode 100644
index 40f9f03a9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.svg
deleted file mode 100644
index 129807060..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/outdoorlight.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="64" x2="0" y2="6">
-      <stop style="stop-color:#ff0;stop-opacity:.6"/>
-      <stop offset="1" style="stop-color:#ffff64;stop-opacity:.4"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="64" x2="0" y2="6" xlink:href="#1"/>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.19l19.5-9.75 19.5 9.75v45.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V59H13V14.62L32,5.12 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#f0f0f0"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#c8c8c8"/>
-  <path d="m17.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#f0f0f0"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#c8c8c8"/>
-  <path d="m31.43 23.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 23.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m17.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m22.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m22.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m27.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m31.43 36.43h5.13v6.13h-5.13z" style="fill:#f0f0f0"/>
-  <path d="m36.13 36.87v5.27h-4.27v-5.27h4.27m.87-.87h-6v7h6v-7z" style="fill:#c8c8c8"/>
-  <path d="m40.47 23.47h6.06v6.06h-6.06z" style="fill:#f0f0f0"/>
-  <g style="fill:#c8c8c8">
-    <path d="m46.06 23.94v5.13h-5.13v-5.13h5.13m.94-.94h-7v7h7v-7z"/>
-    <path d="m44 41h1v1h-1z"/>
-  </g>
-  <path d="m12.5 20.5v-6.19l19.5-9.75 19.5 9.75v6.19z" style="fill:#f0f0f0"/>
-  <path d="M32,5.12l19,9.5V20H13v-5.38L32,5.12 M32,4L12,14v7h40v-7L32,4L32,4z" style="fill:#c8c8c8"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#f0f0f0"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#c8c8c8"/>
-  <path d="m20 64l-8-49 18-9-6 58z" style="fill:url(#1)"/>
-  <path d="m44 64l8-49-18-9 6 58z" style="fill:url(#2)"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.png
deleted file mode 100644
index 444b02e75..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.svg
deleted file mode 100644
index f809341b5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pantry.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?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>
-    <clipPath id="0">
-      <use xlink:href="#1"/>
-    </clipPath>
-    <ellipse id="1" cx="25" cy="40" rx="8" ry="2"/>
-    <radialGradient id="3" cx="35" cy="33" r="5.831" gradientTransform="matrix(1 0 0 .25 0 24.75)" gradientUnits="userSpaceOnUse" xlink:href="#4"/>
-    <radialGradient id="2" cx="25" cy="40.0799" r="5.831" gradientTransform="matrix(1 0 0 .25 0 30.0599)" gradientUnits="userSpaceOnUse" xlink:href="#4"/>
-    <radialGradient id="4" cx="19" cy="28" r="5.831" gradientTransform="matrix(1 0 0 .25 0 21)" gradientUnits="userSpaceOnUse">
-      <stop style="stop-color:#f0f0f0"/>
-      <stop offset="1" style="stop-color:#a0a0a0"/>
-    </radialGradient>
-  </defs>
-  <path d="m7 20.5c-.2 0-.38-.12-.46-.31s-.03-.4.11-.54l4-4c.09-.09.22-.15.35-.15h26c.2 0 .38.12.46.31s.03.4-.11.54l-4 4c-.09.09-.22.15-.35.15h-26" style="fill:#315c99"/>
-  <path d="m37 16l-4 4h-26l4-4h26m0-1h-26c-.27 0-.52.11-.71.29l-4 4c-.29.29-.37.72-.22 1.09.16.38.53.62.93.62h26c.27 0 .52-.11.71-.29l4-4c.29-.29.37-.72.22-1.09-.16-.38-.53-.62-.93-.62z" style="fill:#172982"/>
-  <path d="m27 7.5c-.2 0-.38-.12-.46-.31s-.03-.4.11-.54l4-4c.09-.1.22-.15.35-.15h26c.2 0 .38.12.46.31s.03.4-.11.54l-4 4c-.09.1-.22.15-.35.15h-26" style="fill:#ffd773"/>
-  <path d="m57 3l-4 4h-26l4-4h26m0-1h-26c-.27 0-.52.11-.71.29l-4 4c-.29.29-.37.72-.22 1.09.16.38.53.62.93.62h26c.27 0 .52-.11.71-.29l4-4c.29-.29.37-.72.22-1.09-.16-.38-.53-.62-.93-.62z" style="fill:#e5b12e"/>
-  <path d="m53 45.5c-.08 0-.15-.02-.22-.05-.17-.08-.28-.26-.28-.45v-38c0-.13.05-.26.15-.35l4-4c.1-.1.22-.15.35-.15.06 0 .13.01.19.04.19.08.31.26.31.46v39c0 .16-.07.31-.2.4l-4 3c-.09.07-.19.1-.3.1" style="fill:#efbd50"/>
-  <path d="m57 3v39l-4 3v-38l4-4m0-1c-.26 0-.52.1-.71.29l-4 4c-.18.19-.29.44-.29.71v38c0 .38.21.73.55.89.14.08.3.11.45.11.21 0 .42-.07.6-.2l4-3c.25-.19.4-.49.4-.8v-39c0-.4-.24-.77-.62-.92-.12-.06-.25-.08-.38-.08z" style="fill:#e5b12e"/>
-  <path d="m6.5 19.5h23v21h-23z" style="fill:#294a84"/>
-  <path d="m29 20v20h-22v-20h22m1-1h-1-22-1v1 20 1h1 22 1v-1-20-1z" style="fill:#172982"/>
-  <path d="m8 21h20v18h-20z" style="fill:#6690cc"/>
-  <path d="m26.5 6.5h27v39h-27z" style="fill:#ffd45c"/>
-  <path d="m53 7v38h-26v-38h26m1-1h-1-26-1v1 38 1h1 26 1v-1-38-1z" style="fill:#e5b12e"/>
-  <path d="m29 9h22v34h-22z" style="fill:#ffe3a6"/>
-  <path d="m27 28v19h-.01c0 .02.01.03.01.05 0 1.1-3.58 2-8 2s-8-.9-8-2c0-.02.01-.03.01-.05h-.01v-19h16m0-1h-16c-.55 0-1 .45-1 1v19c0 .01 0 .02 0 .02 0 .01 0 .01 0 .02 0 2.86 7.5 3 9 3s9-.14 9-3c0-.01 0-.01 0-.02 0-.01 0-.02 0-.02v-19c0-.55-.45-1-1-1z" style="fill:#666"/>
-  <g style="fill:#66ccca">
-    <ellipse cx="19" cy="47" rx="8" ry="2"/>
-    <path d="m11 28h16v19h-16z"/>
-  </g>
-  <g style="fill:#fcb11a">
-    <ellipse cx="19" cy="37" rx="8" ry="2"/>
-    <path d="m11 28h16v9h-16z"/>
-  </g>
-  <path d="m19.5 42h-1c-1.38 0-2.5-1.12-2.5-2.5v-1c0-1.37 1.12-2.5 2.5-2.5h1c1.38 0 2.5 1.12 2.5 2.5v1c0 1.38-1.12 2.5-2.5 2.5" style="fill:#e54545"/>
-  <ellipse cx="19" cy="28" rx="8" ry="2" style="fill:url(#4)"/>
-  <g style="fill:#666">
-    <path d="m19 26c4.42 0 8 .9 8 2s-3.58 2-8 2-8-.9-8-2 3.58-2 8-2m0-1c-1.5 0-9 .14-9 3s7.5 3 9 3 9-.14 9-3-7.5-3-9-3z"/>
-    <path d="m43 32.95v19h-.01c0 .02.01.03.01.05 0 1.1-3.58 2-8 2s-8-.9-8-2c0-.02.01-.03.01-.05h-.01v-19h16m0-1h-16c-.55 0-1 .45-1 1v19c0 .01 0 .02 0 .02 0 .01 0 .01 0 .02 0 2.86 7.5 3 9 3s9-.14 9-3c0-.01 0-.01 0-.02 0-.01 0-.02 0-.02v-19c0-.55-.45-1-1-1z"/>
-  </g>
-  <g style="fill:#0056bc">
-    <ellipse cx="35" cy="52" rx="8" ry="2"/>
-    <path d="m27 33h16v19h-16z"/>
-  </g>
-  <g style="fill:#2fa528">
-    <ellipse cx="35" cy="42.08" rx="8" ry="2"/>
-    <path d="m27 33h16v9h-16z"/>
-  </g>
-  <path d="m35.5 47h-1c-1.37 0-2.5-1.12-2.5-2.5v-1c0-1.37 1.12-2.5 2.5-2.5h1c1.37 0 2.5 1.12 2.5 2.5v1c0 1.38-1.12 2.5-2.5 2.5" style="fill:#ff80e7"/>
-  <ellipse cx="35" cy="33" rx="8" ry="2" style="fill:url(#3)"/>
-  <g style="fill:#666">
-    <path d="m35 31c4.42 0 8 .9 8 2s-3.58 2-8 2-8-.9-8-2 3.58-2 8-2m0-1c-1.5 0-9 .14-9 3s7.5 3 9 3 9-.14 9-3-7.5-3-9-3z"/>
-    <path d="m33 39.95v19h-.01c0 .02.01.03.01.05 0 1.1-3.58 2-8 2s-8-.9-8-2c0-.02.01-.03.01-.05h-.01v-19h16m0-1h-16c-.55 0-1 .45-1 1v19c0 .01 0 .02 0 .02 0 .01 0 .01 0 .02 0 2.86 7.5 3 9 3s9-.14 9-3c0-.01 0-.01 0-.02 0-.01 0-.02 0-.02v-19c0-.55-.45-1-1-1z"/>
-  </g>
-  <g style="fill:#f5f5f5">
-    <ellipse cx="25" cy="59" rx="8" ry="2"/>
-    <path d="m17 40h16v19h-16z"/>
-  </g>
-  <g style="fill:#c80028">
-    <ellipse cx="25" cy="49" rx="8" ry="2"/>
-    <path d="m17 40h16v9h-16z"/>
-  </g>
-  <path d="m25.5 54h-1c-1.38 0-2.5-1.12-2.5-2.5v-1c0-1.37 1.12-2.5 2.5-2.5h1c1.38 0 2.5 1.12 2.5 2.5v1c0 1.38-1.12 2.5-2.5 2.5" style="fill:#ffd35c"/>
-  <ellipse cx="25" cy="40.08" rx="8" ry="2" style="fill:url(#2)"/>
-  <path d="m25 38c4.42 0 8 .9 8 2s-3.58 2-8 2-8-.9-8-2 3.58-2 8-2m0-1c-1.5 0-9 .14-9 3s7.5 3 9 3 9-.14 9-3-7.5-3-9-3z" style="fill:#666"/>
-  <g style="fill:#a0a0a0">
-    <path d="m17 38h16v4h-16z" style="clip-path:url(#0)"/>
-    <ellipse cx="25" cy="40" rx="5.83" ry="1.46" style="clip-path:url(#0)"/>
-  </g>
-  <ellipse cx="25" cy="40" rx="5.76" ry="1.44" style="clip-path:url(#0);fill:#a1a1a1"/>
-  <ellipse cx="25" cy="40" rx="5.69" ry="1.42" style="clip-path:url(#0);fill:#a2a2a2"/>
-  <ellipse cx="25" cy="40" rx="5.61" ry="1.4" style="clip-path:url(#0);fill:#a3a3a3"/>
-  <ellipse cx="25" cy="40" rx="5.54" ry="1.38" style="clip-path:url(#0);fill:#a4a4a4"/>
-  <ellipse cx="25" cy="40" rx="5.47" ry="1.37" style="clip-path:url(#0);fill:#a5a5a5"/>
-  <ellipse cx="25" cy="40" rx="5.39" ry="1.35" style="clip-path:url(#0);fill:#a6a6a6"/>
-  <ellipse cx="25" cy="40" rx="5.32" ry="1.33" style="clip-path:url(#0);fill:#a7a7a7"/>
-  <ellipse cx="25" cy="40" rx="5.25" ry="1.31" style="clip-path:url(#0);fill:#a8a8a8"/>
-  <ellipse cx="25" cy="40" rx="5.17" ry="1.29" style="clip-path:url(#0);fill:#a9a9a9"/>
-  <ellipse cx="25" cy="40" rx="5.1" ry="1.28" style="clip-path:url(#0);fill:#aaa"/>
-  <ellipse cx="25" cy="40" rx="5.03" ry="1.26" style="clip-path:url(#0);fill:#ababab"/>
-  <ellipse cx="25" cy="40" rx="4.96" ry="1.24" style="clip-path:url(#0);fill:#acacac"/>
-  <ellipse cx="25" cy="40" rx="4.88" ry="1.22" style="clip-path:url(#0);fill:#adadad"/>
-  <ellipse cx="25" cy="40" rx="4.81" ry="1.2" style="clip-path:url(#0);fill:#aeaeae"/>
-  <ellipse cx="25" cy="40" rx="4.74" ry="1.18" style="clip-path:url(#0);fill:#afafaf"/>
-  <ellipse cx="25" cy="40" rx="4.66" ry="1.17" style="clip-path:url(#0);fill:#b0b0b0"/>
-  <ellipse cx="25" cy="40" rx="4.59" ry="1.15" style="clip-path:url(#0);fill:#b1b1b1"/>
-  <ellipse cx="25" cy="40" rx="4.52" ry="1.13" style="clip-path:url(#0);fill:#b2b2b2"/>
-  <ellipse cx="25" cy="40" rx="4.45" ry="1.11" style="clip-path:url(#0);fill:#b3b3b3"/>
-  <ellipse cx="25" cy="40" rx="4.37" ry="1.09" style="clip-path:url(#0);fill:#b4b4b4"/>
-  <ellipse cx="25" cy="40" rx="4.3" ry="1.08" style="clip-path:url(#0);fill:#b5b5b5"/>
-  <ellipse cx="25" cy="40" rx="4.23" ry="1.06" style="clip-path:url(#0);fill:#b6b6b6"/>
-  <ellipse cx="25" cy="40" rx="4.15" ry="1.04" style="clip-path:url(#0);fill:#b7b7b7"/>
-  <ellipse cx="25" cy="40" rx="4.08" ry="1.02" style="clip-path:url(#0);fill:#b8b8b8"/>
-  <ellipse cx="25" cy="40" rx="4.01" ry="1" style="clip-path:url(#0);fill:#b9b9b9"/>
-  <ellipse cx="25" cy="40" rx="3.94" ry=".98" style="clip-path:url(#0);fill:#bababa"/>
-  <ellipse cx="25" cy="40" rx="3.86" ry=".97" style="clip-path:url(#0);fill:#bbb"/>
-  <ellipse cx="25" cy="40" rx="3.79" ry=".95" style="clip-path:url(#0);fill:#bcbcbc"/>
-  <ellipse cx="25" cy="40" rx="3.72" ry=".93" style="clip-path:url(#0);fill:#bdbdbd"/>
-  <ellipse cx="25" cy="40" rx="3.64" ry=".91" style="clip-path:url(#0);fill:#bebebe"/>
-  <ellipse cx="25" cy="40" rx="3.57" ry=".89" style="clip-path:url(#0);fill:#bfbfbf"/>
-  <ellipse cx="25" cy="40" rx="3.5" ry=".87" style="clip-path:url(#0);fill:#c0c0c0"/>
-  <ellipse cx="25" cy="40" rx="3.43" ry=".86" style="clip-path:url(#0);fill:#c1c1c1"/>
-  <ellipse cx="25" cy="40" rx="3.35" ry=".84" style="clip-path:url(#0);fill:#c2c2c2"/>
-  <ellipse cx="25" cy="40" rx="3.28" ry=".82" style="clip-path:url(#0);fill:#c3c3c3"/>
-  <ellipse cx="25" cy="40" rx="3.21" ry=".8" style="clip-path:url(#0);fill:#c4c4c4"/>
-  <ellipse cx="25" cy="40" rx="3.13" ry=".78" style="clip-path:url(#0);fill:#c5c5c5"/>
-  <ellipse cx="25" cy="40" rx="3.06" ry=".77" style="clip-path:url(#0);fill:#c6c6c6"/>
-  <ellipse cx="25" cy="40" rx="2.99" ry=".75" style="clip-path:url(#0);fill:#c7c7c7"/>
-  <ellipse cx="25" cy="40" rx="2.92" ry=".73" style="clip-path:url(#0);fill:#c8c8c8"/>
-  <ellipse cx="25" cy="40" rx="2.84" ry=".71" style="clip-path:url(#0);fill:#c9c9c9"/>
-  <ellipse cx="25" cy="40" rx="2.77" ry=".69" style="clip-path:url(#0);fill:#cacaca"/>
-  <ellipse cx="25" cy="40" rx="2.7" ry=".67" style="clip-path:url(#0);fill:#cbcbcb"/>
-  <ellipse cx="25" cy="40" rx="2.62" ry=".66" style="clip-path:url(#0);fill:#ccc"/>
-  <ellipse cx="25" cy="40" rx="2.55" ry=".64" style="clip-path:url(#0);fill:#cdcdcd"/>
-  <ellipse cx="25" cy="40" rx="2.48" ry=".62" style="clip-path:url(#0);fill:#cecece"/>
-  <ellipse cx="25" cy="40" rx="2.41" ry=".6" style="clip-path:url(#0);fill:#cfcfcf"/>
-  <ellipse cx="25" cy="40" rx="2.33" ry=".58" style="clip-path:url(#0);fill:#d0d0d0"/>
-  <ellipse cx="25" cy="40" rx="2.26" ry=".56" style="clip-path:url(#0);fill:#d2d2d2"/>
-  <ellipse cx="25" cy="40" rx="2.19" ry=".55" style="clip-path:url(#0);fill:#d3d3d3"/>
-  <ellipse cx="25" cy="40" rx="2.11" ry=".53" style="clip-path:url(#0);fill:#d4d4d4"/>
-  <ellipse cx="25" cy="40" rx="2.04" ry=".51" style="clip-path:url(#0);fill:#d5d5d5"/>
-  <ellipse cx="25" cy="40" rx="1.97" ry=".49" style="clip-path:url(#0);fill:#d6d6d6"/>
-  <ellipse cx="25" cy="40" rx="1.9" ry=".47" style="clip-path:url(#0);fill:#d7d7d7"/>
-  <ellipse cx="25" cy="40" rx="1.82" ry=".46" style="clip-path:url(#0);fill:#d8d8d8"/>
-  <ellipse cx="25" cy="40" rx="1.75" ry=".44" style="clip-path:url(#0);fill:#d9d9d9"/>
-  <ellipse cx="25" cy="40" rx="1.68" ry=".42" style="clip-path:url(#0);fill:#dadada"/>
-  <ellipse cx="25" cy="40" rx="1.6" ry=".4" style="clip-path:url(#0);fill:#dbdbdb"/>
-  <ellipse cx="25" cy="40" rx="1.53" ry=".38" style="clip-path:url(#0);fill:#dcdcdc"/>
-  <ellipse cx="25" cy="40" rx="1.46" ry=".36" style="clip-path:url(#0);fill:#ddd"/>
-  <ellipse cx="25" cy="40" rx="1.38" ry=".35" style="clip-path:url(#0);fill:#dedede"/>
-  <ellipse cx="25" cy="40" rx="1.31" ry=".33" style="clip-path:url(#0);fill:#dfdfdf"/>
-  <ellipse cx="25" cy="40" rx="1.24" ry=".31" style="clip-path:url(#0);fill:#e0e0e0"/>
-  <ellipse cx="25" cy="40" rx="1.17" ry=".29" style="clip-path:url(#0);fill:#e1e1e1"/>
-  <ellipse cx="25" cy="40" rx="1.09" ry=".27" style="clip-path:url(#0);fill:#e2e2e2"/>
-  <ellipse cx="25" cy="40" rx="1.02" ry=".26" style="clip-path:url(#0);fill:#e3e3e3"/>
-  <ellipse cx="25" cy="40" rx=".95" ry=".24" style="clip-path:url(#0);fill:#e4e4e4"/>
-  <ellipse cx="25" cy="40" rx=".87" ry=".22" style="clip-path:url(#0);fill:#e5e5e5"/>
-  <ellipse cx="25" cy="40" rx=".8" ry=".2" style="clip-path:url(#0);fill:#e6e6e6"/>
-  <ellipse cx="25" cy="40" rx=".73" ry=".18" style="clip-path:url(#0);fill:#e7e7e7"/>
-  <ellipse cx="25" cy="40" rx=".66" ry=".16" style="clip-path:url(#0);fill:#e8e8e8"/>
-  <ellipse cx="25" cy="40" rx=".58" ry=".15" style="clip-path:url(#0);fill:#e9e9e9"/>
-  <ellipse cx="25" cy="40" rx=".51" ry=".13" style="clip-path:url(#0);fill:#eaeaea"/>
-  <ellipse cx="25" cy="40" rx=".44" ry=".11" style="clip-path:url(#0);fill:#ebebeb"/>
-  <ellipse cx="25" cy="40" rx=".36" ry=".09" style="clip-path:url(#0);fill:#ececec"/>
-  <ellipse cx="25" cy="40" rx=".29" ry=".07" style="clip-path:url(#0);fill:#ededed"/>
-  <ellipse cx="25" cy="40" rx=".22" ry=".05" style="clip-path:url(#0);fill:#eee"/>
-  <ellipse cx="25" cy="40" rx=".15" ry=".04" style="clip-path:url(#0);fill:#efefef"/>
-  <ellipse cx="25" cy="40" rx=".07" ry=".02" style="clip-path:url(#0);fill:#f0f0f0"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.png
deleted file mode 100644
index 3d0435d21..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.svg
deleted file mode 100644
index 3cae6a594..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents-off.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#dae1e4"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c4cacc"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#dae1e4"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#c4cacc"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#787878"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#ccc"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#dae1e4"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c4cacc"/>
-  <g style="fill:#b2b2b2">
-    <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-    <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  </g>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#dae1e4"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c4cacc"/>
-  <g style="fill:#787878">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#dae1e4"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c4cacc"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10" style="fill:#b2b2b2"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#fff"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#4d4d4d"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.png
deleted file mode 100644
index 5c8d0bc3b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.svg
deleted file mode 100644
index 48a9d98c3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_1.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#f4d0b1"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.png
deleted file mode 100644
index 1abe63d31..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.svg
deleted file mode 100644
index 512d6a81f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_2.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.png
deleted file mode 100644
index ecd0ef4a7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.svg
deleted file mode 100644
index 1c6f955e4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_3.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.png
deleted file mode 100644
index fccc4706a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.svg
deleted file mode 100644
index 2ebed5986..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_4.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.png
deleted file mode 100644
index 51655daf7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.svg
deleted file mode 100644
index 243222d45..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_5.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.png
deleted file mode 100644
index e573a1c3f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.svg
deleted file mode 100644
index 536258e6d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_1_6.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#e67831"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#dd6022"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#f4d0b1"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#f4d0b1"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#e67831"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#dd6022"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.png
deleted file mode 100644
index 12ff163cb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.svg
deleted file mode 100644
index 91a3f8544..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_1.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 23h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="23.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 29h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 38c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 41c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 44c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 23.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 23.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34293 22.17076h3.65707v1.8h-4.1z"/>
-  </g>
-  <path d="m42 22.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:#f4d0b1"/>
-  <path d="m42 4c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 13c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 4c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m22 31.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 22.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 58.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 30.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 55h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 55h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 28.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:#e7b48f"/>
-  <path d="m22 10c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 20.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 10c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 29.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 49.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.png
deleted file mode 100644
index 174a44a99..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.svg
deleted file mode 100644
index bb7d6f586..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_2.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#e7b48f"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.png
deleted file mode 100644
index bce02af0c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.svg
deleted file mode 100644
index bcfa0b5c6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_3.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#e7b48f"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.png
deleted file mode 100644
index 3b02ae348..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.svg
deleted file mode 100644
index e298d0f7b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_4.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#e7b48f"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.png
deleted file mode 100644
index 538acab5d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.svg
deleted file mode 100644
index 4107a8113..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_5.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#e7b48f"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.png
deleted file mode 100644
index dec144bb6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.svg
deleted file mode 100644
index 6030e3af5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_2_6.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#edda7b"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#ccb966"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#e7b48f"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#d89f79"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#e7b48f"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#edda7b"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#ccb966"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.png
deleted file mode 100644
index 491a891af..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.svg
deleted file mode 100644
index f1d1afd66..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_1.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 23h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="23.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 29h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 38c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 41c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 44c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 23.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 23.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 22.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 22.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:#f4d0b1"/>
-  <path d="m42 4c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 13c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 4c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m22 31.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 22.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 58.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 30.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 55h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 55h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 28.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:#d29e7c"/>
-  <path d="m22 10c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 20.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 10c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 29.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 49.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.png
deleted file mode 100644
index 97fdffe82..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.svg
deleted file mode 100644
index 382c37a5a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_2.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#d29e7c"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.png
deleted file mode 100644
index db57101e2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.svg
deleted file mode 100644
index 4acea8b2e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_3.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#d29e7c"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.png
deleted file mode 100644
index cdd71013c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.svg
deleted file mode 100644
index f29de5ac9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_4.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#d29e7c"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.png
deleted file mode 100644
index 704bbeffb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.svg
deleted file mode 100644
index b241e857c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_5.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#d29e7c"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.png
deleted file mode 100644
index 43bd7faa4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.svg
deleted file mode 100644
index 4ba459346..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_3_6.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#61452d"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#513624"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#d29e7c"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#d29e7c"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#61452d"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#513624"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.png
deleted file mode 100644
index 9b77a8ecf..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.svg
deleted file mode 100644
index 519d7d291..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_1.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 23h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="23.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 29h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 38c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 41c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 44c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 23.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 23.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 22.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 22.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:#f4d0b1"/>
-  <path d="m42 4c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 13c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 4c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m22 31.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 22.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 58.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 30.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 55h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 55h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 28.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:#ba7750"/>
-  <path d="m22 10c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 20.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 10c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 29.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 49.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.png
deleted file mode 100644
index 0c2def841..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.svg
deleted file mode 100644
index 377b84e90..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_2.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#ba7750"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.png
deleted file mode 100644
index b1836bf18..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.svg
deleted file mode 100644
index e45f00f78..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_3.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#ba7750"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.png
deleted file mode 100644
index 9c1ca3aea..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.svg
deleted file mode 100644
index 9394eb785..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_4.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#ba7750"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.png
deleted file mode 100644
index 7cc9ffa16..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.svg
deleted file mode 100644
index dd890181a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_5.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#ba7750"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.png
deleted file mode 100644
index 55c5e21fb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.svg
deleted file mode 100644
index 631544049..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_4_6.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#472e18"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#382211"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#ba7750"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#ba7750"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#472e18"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#382211"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.png
deleted file mode 100644
index 339a804c6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.svg
deleted file mode 100644
index 81c4a25e7..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_1.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 23h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="23.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 29h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 38c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 41c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 44c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 23.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 23.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 22.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 22.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:#f4d0b1"/>
-  <path d="m42 4c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 13c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 4c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m22 31.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 22.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 58.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 30.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 55h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 55h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 28.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:#a55d2b"/>
-  <path d="m22 10c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 20.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 10c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 29.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 49.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.png
deleted file mode 100644
index e3683a1ab..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.svg
deleted file mode 100644
index 783eb1e98..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_2.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2s-8.7-1.5-11.9-4.2c2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#a55d2b"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.png
deleted file mode 100644
index f27bce9e2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.svg
deleted file mode 100644
index aa1f92fd3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_3.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#a55d2b"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.png
deleted file mode 100644
index 1b9438d08..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.svg
deleted file mode 100644
index 14c3ba0e5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_4.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#a55d2b"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.png
deleted file mode 100644
index ea2a3d742..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.svg
deleted file mode 100644
index df8af225a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_5.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#a55d2b"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.png
deleted file mode 100644
index 0880b0e55..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.svg
deleted file mode 100644
index 9890fad77..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_5_6.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m22 32.9c-4.9 0-9.5-1.7-12.8-4.8 2.5-1 4.1-2.8 4.3-4.9h16.9c.2 2.1 1.9 3.9 4.3 4.9-3.2 3-7.8 4.8-12.7 4.8" style="fill:#1c1914"/>
-  <path d="m30 23.7c.4 1.9 1.8 3.5 3.8 4.5-3.1 2.7-7.4 4.2-11.9 4.2-4.5 0-8.7-1.5-11.9-4.2 2.1-1 3.5-2.7 3.8-4.5h16.2m1-1h-17.9c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5 5.5 0 10.4-2.1 13.7-5.5-2.8-.9-4.7-2.9-4.7-5.2z" style="fill:#0a0907"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#a55d2b"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#a55d2b"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m12.7 21.9c-.1-.6-.2-1.3-.2-1.9 0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 .2 0 .4 0 .7v-.1l-.1-.1c-1.1-1.2-2.1-2.8-2.9-4.8l-.2-.4-.4.1c-.7.2-1.6.3-2.5.3-1.5 0-3.2-.3-5-.9l-3-1 2.6 1.9c1.2.9 2.3 1.4 3.3 1.7-.3 0-.7 0-1 0-2.3 0-4.5-.5-6.5-1.5l-.5-.2-.2.5c-.7 2.1-1.5 4-2.4 5.7" style="fill:#1c1914"/>
-  <path d="m22 11c4.7 0 8.6 3.6 9 8.2-.8-1-1.4-2.3-2.1-3.8l-.3-.8-.9.3c-.7.2-1.5.3-2.3.3-1.4 0-3-.3-4.8-.9l-4.1-1.4c1.5-1.2 3.4-1.9 5.5-1.9m-6.1 2.4l3.7 2.7c.4.3.8.6 1.2.8-1.7-.2-3.3-.6-4.9-1.4l-.9-.5-.4 1.1c-.5 1.4-1 2.8-1.6 4.1 0-.1 0-.1 0-.2 0-2.6 1.1-5 2.9-6.6m6.1-3.4c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 1.8.9 4.1 1.5 6.7 1.5 1.3 0 2.7-.2 4.1-.5 0 0 0 0-.1 0-.5 0-3.2-.1-6.1-2.2 1.6.5 3.4.9 5.1.9.9 0 1.8-.1 2.6-.4.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.5-.9.7-1.9.7-2.9 0-5.5-4.5-10-10-10z" style="fill:#0a0907"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.png
deleted file mode 100644
index ca6a571a1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.svg
deleted file mode 100644
index 6a9451107..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_1.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m30 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m55.5 52.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#f4d0b1"/>
-  <path d="m57 46.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5s2.5-1.1 2.5-2.5v-5z" style="fill:#e5b795"/>
-  <path d="m46.7 23h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="23.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 29h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 38c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 41c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 44c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 23.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 23.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 22.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 22.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:#f4d0b1"/>
-  <path d="m42 4c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#e5b795"/>
-  <path d="m32.5 13c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#e67831"/>
-  <path d="m42 4c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#dd6022"/>
-  <path d="m31 21.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 58.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 30.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 55h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 55h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 28.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:#3c201d"/>
-  <path d="m22 10c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 9c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 29.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 49.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.png
deleted file mode 100644
index 3459bc417..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.svg
deleted file mode 100644
index b6e1aaf6c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_2.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#e7b48f"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#d89f79"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#e7b48f"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#d89f79"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#edda7b"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#ccb966"/>
-  <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#3c201d"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.png
deleted file mode 100644
index 340874fe0..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.svg
deleted file mode 100644
index 53efb7410..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_3.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#d29e7c"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#c18a6b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#d29e7c"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#c18a6b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#61452d"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#513624"/>
-  <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#3c201d"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.png
deleted file mode 100644
index 4e3f2d247..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.svg
deleted file mode 100644
index 6e3786b59..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_4.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#ba7750"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#a35c3d"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#ba7750"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#a35c3d"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#472e18"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#382211"/>
-  <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#3c201d"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.png
deleted file mode 100644
index ded80ff0e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.svg
deleted file mode 100644
index af87513b0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_5.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#a55d2b"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#89471b"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#a55d2b"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#89471b"/>
-  <path d="m32.5 14c0-5.2 4.3-9.5 9.5-9.5s9.5 4.3 9.5 9.5c0 0 0 0 0 0-1.4-1.3-2.4-2.8-3-4.6l-.1-.4h-.4c-.7.1-1.4.1-2 .1-1 0-1.9-.1-2.8-.2l-2.7-.4 2.4 1.3c.6.3 1.1.6 1.6.8-.8.1-1.5.1-2.3.1-2.5 0-4.7-.4-6.6-1.1l-.5-.2-.2.5c-.6 1.7-1.4 3-2.4 4 0 .2 0 .1 0 .1" style="fill:#1c1914"/>
-  <path d="m42 5c4.5 0 8.3 3.3 8.9 7.7-.9-1-1.5-2.2-1.9-3.4l-.3-.7-.8.1c-.7.1-1.4.1-2 .1-.9 0-1.9-.1-2.7-.2l-5.4-.8 4.7 2.6c-.1 0-.2 0-.4 0-2.4 0-4.6-.4-6.4-1l-.9-.4-.3.9c-.4 1-.8 1.9-1.3 2.6.6-4.2 4.3-7.5 8.8-7.5m0-1c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 1.8.7 4 1.1 6.8 1.1 1.3 0 2.7-.1 4.2-.3 0 0-1.6-.6-3.3-1.5.9.1 1.8.2 2.9.2.7 0 1.4 0 2.1-.1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1z" style="fill:#0a0907"/>
-  <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#3c201d"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.png
deleted file mode 100644
index 52ee69b69..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.svg
deleted file mode 100644
index f5ca7a22a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/parents_6_6.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <path d="m28.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m30 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m55.5 53.5c-1.1 0-2-.9-2-2v-4.5h4v4.5c0 1.1-.9 2-2 2" style="fill:#3c201d"/>
-  <path d="m57 47.5v4c0 .9-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-4h3m1-1h-5v5c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-5z" style="fill:#1e0e0e"/>
-  <path d="m46.7 24h-9.3c-6.3 0-11.3 5.2-11.3 11.5v.8c0 .2-.1.4-.1.6v12.1h4.9v-6.7-4.8c0-1.5.5-2.8 1.3-3.9v15.4h19.7v-15.5c.6.9 1.1 2 1.2 3.2 0 .1 0 .1 0 .2v12.1h4.9v-11.4-.7-1.3c0-6.4-5.1-11.6-11.3-11.6" style="fill:#00783c"/>
-  <ellipse cx="42" cy="24.4" rx="4.3" ry="2.5" style="fill:#fff"/>
-  <path d="m41 30h1v19h-1z" style="opacity:.2"/>
-  <path d="m42.5 39c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 42c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path d="m42.5 45c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5" style="opacity:.2"/>
-  <path 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" style="clip-path:url(#1);fill:#fff"/>
-  <path d="m39.5 24.4l1.9 2.5-1.9 3.7 2.5 7.4 2.4-7.4-1.8-3.7 1.8-2.5z" style="clip-path:url(#1);fill:#e70003"/>
-  <g style="fill:#fff">
-    <path d="m42.8029 24.56356h4.2971v1.8h-4.1z"/>
-    <path d="m37.34303 23.17076h3.65697v1.8h-4.1z"/>
-  </g>
-  <path d="m42 23.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:#3c201d"/>
-  <path d="m42 5c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m42 4c-5.5 0-10 4.5-10 10 0 .4 0 .8.1 1.2 1.1-.9 2.4-2.4 3.3-4.9 2.6 1 6.2 1.5 11 .8 0 0-1.6-.6-3.3-1.5 1.4.2 3 .3 5 .1.7 1.9 1.9 3.8 3.9 5.5 0-.4.1-.7.1-1.1-.1-5.6-4.6-10.1-10.1-10.1"/>
-  <path d="m31 22.7c0 0 0 0 0 0h-17.8c0 0 0 0 0 0 0 2.3-2 4.3-4.8 5.2 3.3 3.4 8.2 5.5 13.7 5.5s10.4-2.1 13.7-5.5c-2.9-.9-4.8-2.9-4.8-5.2"/>
-  <path d="m35.5 59.5c-1.1 0-2-.9-2-2v-14.7c-.2-1.3-.6-2.4-1.2-3.3l-.3-.5-10 8-9.9-8-.3.4c-.8 1.2-1.3 2.6-1.3 4.2v13.9c0 1.1-.9 2-2 2-1.1 0-2-.9-2-2v-15.3c4.4-.2 5.6-3.6 6.6-6.6.9-2.5 1.7-4.7 4.2-4.7h9.3c2.6 0 3.3 2.2 4.2 4.7 1.1 3 2.2 6.3 6.6 6.6v15.3c.1 1.1-.8 2-1.9 2" style="fill:#3c201d"/>
-  <path d="m26.7 31.4c2.1 0 2.8 1.6 3.8 4.4.3.9.7 1.9 1.2 2.9l-.4.3-9.3 7.4-9.2-7.4-.4-.3c.5-.9.8-1.9 1.2-2.9 1-2.8 1.7-4.4 3.8-4.4h9.3m-16.4 10c-.2.7-.3 1.4-.3 2.2v13.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.8c1.4-.2 2.4-.6 3.3-1.3m23.5 0c.8.6 1.9 1.1 3.2 1.2v14.9c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5v-14.5-.3-.1-.1c-.1-.3-.1-.7-.2-1.1m-7.1-11h-9.3c-6.3 0-3.1 11.3-11.4 11.3v15.8c0 1.4 1.1 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-13.9c0-1.4.4-2.8 1.2-3.9l9.8 7.9 9.9-7.9c.6.9 1 1.9 1.1 3v.3 14.5c0 1.4 1.2 2.5 2.5 2.5 1.4 0 2.5-1.1 2.5-2.5v-15.8c-8.2 0-5.1-11.3-11.3-11.3z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m33.1 56h-11.1v-14.5c3.9-3.9 5.3-7.2 5.9-9.4.1-.3.1-.6.2-.8 0-.3.1-.5.1-.8 6.1 0 9.8 9.3 9.8 11.2l-4.9 1.9c0-1.4-.5-2.8-1.2-3.9l-2.4 7.9 2.5 3.7 1.1 4.7"/>
-    <path d="m10.9 56h11.1v-14.5c-3.9-3.9-5.3-7.2-5.9-9.4-.1-.3-.1-.6-.2-.8 0-.3-.1-.5-.1-.8-6.1 0-9.8 9.3-9.8 11.2l4.9 1.9c0-1.4.5-2.8 1.2-3.9l2.4 7.9-2.5 3.7-1.1 4.7"/>
-  </g>
-  <path d="m22 29.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:#3c201d"/>
-  <path d="m22 11c5 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 10 0 5.5 4.5 10 10 10s10-4.5 10-10c0-5.5-4.5-10-10-10z" style="fill:#1e0e0e"/>
-  <path d="m22 10c-5.5 0-10 4.5-10 10 0 1.1.2 2.2.5 3.3.1-.2.2-.3.3-.5 1.2-2.1 2-4.3 2.7-6.4 2.8 1.3 6.4 2.1 10.9 1 0 0-3 .1-6.2-2.2 2.4.8 5.3 1.3 7.7.6.8 1.9 1.8 3.6 3 5 .2.8.3 1.5.5 2.2.4-1 .6-2 .6-3 0-5.5-4.5-10-10-10"/>
-  <path d="m18.3 30.4c0 0 0 6.2 3.7 6.2 3.7 0 3.7-6.2 3.7-6.2" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m30.6 50.1h-17.2l1.2-2.4h14.8z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.png
deleted file mode 100644
index e3e6d4f29..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.svg
deleted file mode 100644
index 20cb21e26..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/party.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="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"/>
-    <path d="m11 8.5l22 25 22-25" style="opacity:.9"/>
-    <path d="m35 31v29h-4v-29" style="opacity:.8"/>
-  </g>
-  <path d="M19,8.5C19,3.81,15.19,0,10.5,0S2,3.81,2,8.5c0,4.69,3.81,8.5,8.5,8.5c2.35,0,4.47-0.95,6.01-2.49    L10.5,8.5H19z" style="fill:#f7ad39"/>
-  <path d="m10.5 16.5c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8v.5h-6.79l4.8 4.8-.35.35c-1.51 1.52-3.52 2.35-5.66 2.35" style="fill:#f7ce52"/>
-  <path d="m10.5 1c4.14 0 7.5 3.36 7.5 7.5h-7.5l5.3 5.3c-1.36 1.36-3.23 2.2-5.3 2.2-4.14 0-7.5-3.36-7.5-7.5s3.36-7.5 7.5-7.5m0-1c-4.69 0-8.5 3.81-8.5 8.5s3.81 8.5 8.5 8.5c2.27 0 4.4-.88 6.01-2.49l.71-.71-.71-.71-3.6-3.6h5.09 1v-1c0-4.68-3.81-8.49-8.5-8.49z" style="fill:#f7ad39"/>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#fff;stroke-width:.5">
-    <path d="m8 2l2 5" style="opacity:.6"/>
-    <path d="m15 4l-3 3" style="opacity:.6"/>
-    <path d="m4 8l5 .5" style="opacity:.6"/>
-    <path d="m10 10l-4 4" style="opacity:.6"/>
-    <path d="m11 10l2 5" style="opacity:.6"/>
-  </g>
-  <g style="opacity:.8">
-    <path d="m35 57.25c7.13.31 10.31 2.16 10.31 2.85 0 .87-4.19 2.9-12.31 2.9s-12.31-2.03-12.31-2.9c0-.69 3.18-2.54 10.31-2.85v1.75 1h1 2 1v-1-1.75m-1-1.03v2.78h-2v-2.78c-6.88.15-12.31 1.83-12.31 3.88 0 2.15 5.96 3.9 13.31 3.9s13.31-1.75 13.31-3.9c0-2.05-5.43-3.73-12.31-3.88z" style="fill:#cec6c6"/>
-  </g>
-  <g style="opacity:.8">
-    <path d="m35 57.24c6.18.21 9.61 1.34 10.25 1.99-.74.77-5.15 2.02-12.25 2.02s-11.51-1.25-12.25-2.02c.63-.65 4.07-1.78 10.25-1.99v1.76 1h1 2 1v-1-1.76m-1-1.03v2.79h-2v-2.79c-6.88.12-12.31 1.42-12.31 3.01 0 1.67 5.96 3.02 13.31 3.02s13.31-1.35 13.31-3.02c0-1.59-5.43-2.89-12.31-3.01z" style="fill:#cec6c6"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.png
deleted file mode 100644
index 1b897c180..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.svg
deleted file mode 100644
index e269418a5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pie.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="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"/>
-  <path d="M32,3c4.75,0,9.44,1.17,13.62,3.4L32,30H3.08c0.49-7.15,3.57-13.8,8.74-18.82C17.26,5.9,24.42,3,32,3     M32,2C15.77,2,2.55,14.9,2.03,31h30.55L47,6.02C42.58,3.47,37.47,2,32,2L32,2z" style="fill:#008c39"/>
-  <path d="m32 61.5c-16.1 0-29.23-12.96-29.5-29h59c-.27 16.04-13.4 29-29.5 29" style="fill:#1e82ff"/>
-  <path d="m60.98 33c-.53 15.53-13.32 28-28.98 28s-28.45-12.47-28.98-28h28.98 9 19.98m1.02-1h-21-9-30c0 16.57 13.43 30 30 30s30-13.43 30-30z" style="fill:#1271d8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.png
deleted file mode 100644
index 369ac6293..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.svg
deleted file mode 100644
index 11d91fb81..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/piggybank.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="m18 24h18v4h-18z" style="fill:#633833"/>
-  <g style="fill:#fff">
-    <circle cx="51" cy="36" r="2"/>
-    <circle cx="51" cy="36" r="2"/>
-  </g>
-  <circle cx="51.75" cy="36.75" r=".75"/>
-  <circle cx="51.75" cy="36.75" r=".75"/>
-  <path d="m10.26 59.5c-2.12-3.15-3.03-8.19-3.42-11.9l-.02-.15-.1-.12c-2.11-2.52-3.22-5.4-3.22-8.33 0-2.47.76-4.84 2.26-7.06l.23-.34-.28-.29c-.55-.56-1.21-1.42-1.21-2.31 0-.95.51-1.58 1.08-1.97-.31.55-.53 1.21-.39 1.82.16.65.67 1.12 1.53 1.38l.3.09.21-.23c4.37-4.75 11.75-7.59 19.77-7.59 6.31 0 12.24 1.74 16.69 4.9l.34.24.3-.29c2.45-2.38 4.64-3.68 6.53-3.87-.75.99-1.69 2.82-1.42 5.65l.03.27.24.12c3.68 1.88 6.52 5.4 8.25 8.03l.16.25.3-.03c.46-.04.92-.06 1.37-.06 1.75 0 2.35.38 2.55.61.09.1.2.28.16.62-.3 2.43-2.6 10.66-19.47 14.63l-.45.1.83 5.83-7.06-.04c-.37-.46-1.41-1.88-2.19-4.03l-.13-.37-.39.04c-1 .11-1.97.2-2.93.27l.07-.05-1.72.1c-.68.05-1.36.08-2.06.08-3.24 0-6.38-.46-9.34-1.36l-.24-.07-.97.73 1.02 4.63-7.21.07m40.74-26c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5 2.5-1.12 2.5-2.5-1.12-2.5-2.5-2.5m-24-9.72c-3.01 0-5.94.54-8.47 1.56-.64.26-.95.99-.69 1.63.19.47.65.78 1.16.78.16 0 .32-.03.47-.09 2.24-.9 4.84-1.38 7.53-1.38s5.29.48 7.53 1.38c.15.06.31.09.47.09.51 0 .97-.31 1.16-.78.26-.64-.05-1.37-.69-1.63-2.53-1.02-5.46-1.56-8.47-1.56" style="fill:#f9b1a2"/>
-  <path d="m27 23c6.21 0 12.04 1.71 16.4 4.8l.68.48.6-.58c1.87-1.81 3.61-3 5.14-3.49-.59 1.14-1.08 2.78-.87 4.96l.05.55.49.25c3.58 1.83 6.36 5.28 8.06 7.86l.33.5.59-.05c.48-.04.92-.06 1.32-.06 1.7 0 2.11.37 2.18.44.02.02.06.07.04.23-.29 2.35-2.54 10.31-19.09 14.2l-.89.21.13.91.69 4.8-6.24-.03c-.43-.57-1.3-1.85-1.96-3.7l-.27-.74-.78.08c-.37.04-.75.08-1.11.11l-3.45.21c-.74.04-1.4.06-2.04.06-3.19 0-6.29-.45-9.2-1.34l-.49-.15-.41.3-.5.39-.52.39.14.63.82 3.71-6.31.07c-1.56-2.46-2.66-6.4-3.2-11.45l-.03-.3-.2-.23c-2.03-2.44-3.1-5.21-3.1-8.02 0-2.37.73-4.65 2.18-6.78l.46-.68-.57-.58c-.25-.26-.53-.59-.74-.94.28.27.69.51 1.25.69l.6.19.43-.47c4.26-4.65 11.51-7.43 19.39-7.43m-8 5.25c.23 0 .45-.04.66-.13 2.18-.88 4.72-1.35 7.34-1.35s5.17.47 7.35 1.35c.21.08.43.13.65.13.72 0 1.35-.43 1.62-1.09.36-.89-.07-1.92-.97-2.28-2.59-1.05-5.58-1.6-8.66-1.6s-6.07.55-8.66 1.6c-.89.36-1.33 1.38-.97 2.28.29.66.92 1.09 1.64 1.09m32 10.75c1.65 0 3-1.35 3-3s-1.35-3-3-3-3 1.35-3 3 1.35 3 3 3m-24-17c-8.44 0-15.85 3.09-20.13 7.75-2.83-.88.13-3.75.13-3.75-.83 0-3 .83-3 3 0 1.01.65 1.94 1.35 2.66-1.51 2.22-2.35 4.71-2.35 7.34 0 3.16 1.22 6.11 3.34 8.65.44 4.12 1.43 9.2 3.66 12.35l8.08-.08-1.08-4.92.51-.38c2.91.89 6.12 1.38 9.49 1.38.71 0 1.4-.03 2.09-.07l-.09.07c1.65-.1 3.21-.24 4.7-.4 1 2.77 2.42 4.35 2.42 4.35l7.88.05-.85-5.95c17.02-4 19.51-12.34 19.85-15.05.17-1.39-1.36-1.79-3.21-1.79-.46 0-.93.02-1.41.07-1.68-2.55-4.61-6.24-8.44-8.2-.41-4.21 2.06-6.08 2.06-6.08-.22-.03-.44-.05-.66-.05-2.5 0-5.15 1.89-7.36 4.03-4.34-3.07-10.35-4.98-16.98-4.98zm-8 5.25c-.3 0-.58-.18-.69-.47-.16-.38.03-.82.41-.98 2.52-1.02 5.4-1.53 8.28-1.53s5.76.51 8.28 1.53c.38.16.57.59.41.98-.12.29-.4.47-.7.47-.09 0-.19-.02-.28-.05-2.34-.95-5.03-1.42-7.72-1.42s-5.38.47-7.72 1.42c-.08.03-.18.05-.27.05m32 10.75c-1.1 0-2-.9-2-2 0-1.1.9-2 2-2s2 .9 2 2c0 1.1-.9 2-2 2" style="fill:#cc7266"/>
-  <path d="m27 18.5c-4.69 0-8.5-3.81-8.5-8.5s3.81-8.5 8.5-8.5 8.5 3.81 8.5 8.5-3.81 8.5-8.5 8.5" style="fill:#eec165"/>
-  <path d="m27 2c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8 3.58-8 8-8m0-1c-4.96 0-9 4.04-9 9s4.04 9 9 9 9-4.04 9-9-4.04-9-9-9z" style="fill:#eda526"/>
-  <path d="m27 15.5c-3.03 0-5.5-2.47-5.5-5.5s2.47-5.5 5.5-5.5 5.5 2.47 5.5 5.5-2.47 5.5-5.5 5.5" style="fill:#b2b2b2"/>
-  <path d="m27 5c2.76 0 5 2.24 5 5s-2.24 5-5 5-5-2.24-5-5 2.24-5 5-5m0-1c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6z" style="fill:#8c8c8c"/>
-  <g style="font-family:'TimesNewRomanPS-BoldItalicMT'">
-    <text transform="translate(21 15)" style="font-size:12;opacity:.2">1</text>
-    <text transform="translate(28 12)" style="font-size:2;opacity:.2">EURO</text>
-  </g>
-  <path d="m53 45c0 0 1.33 2 4 2" style="fill:none;stroke-miterlimit:10;stroke:#cc7266"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.png
deleted file mode 100644
index 9ba2bacfb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.svg
deleted file mode 100644
index 108824cee..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/player.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.png
deleted file mode 100644
index f476b43d3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.svg
deleted file mode 100644
index 6a81bbf80..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-au.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.png
deleted file mode 100644
index 8c9c0c8f6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.svg
deleted file mode 100644
index ceb8d17b3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-eu.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.png
deleted file mode 100644
index 79102c04a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.svg
deleted file mode 100644
index e54794d27..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-off.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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="14"/>
-    <clipPath id="1">
-      <use xlink:href="#0"/>
-    </clipPath>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="46" x2="0" y2="18">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="57" x2="0" y2="7">
-      <stop style="stop-color:#cac7b9"/>
-      <stop offset="1" style="stop-color:#f8f5e5"/>
-    </linearGradient>
-    <linearGradient id="5" gradientUnits="userSpaceOnUse" y1="48" x2="0" y2="16" xlink:href="#2"/>
-  </defs>
-  <path d="m16 7h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#4)"/>
-  <path d="m21 16h22c2.76 0 5 2.24 5 5v22c0 2.76-2.24 5-5 5h-22c-2.76 0-5-2.24-5-5v-22c0-2.76 2.24-5 5-5z" style="fill:url(#5);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <circle cx="32" cy="32" r="14" style="fill:url(#3)"/>
-  <g style="fill:#1a171b">
-    <circle cx="26.91" cy="32" r="1.91"/>
-    <circle cx="37.09" cy="32" r="1.91"/>
-  </g>
-  <g style="fill:#8c8c8c">
-    <path d="m31.36 19.27h1.27v2.55h-1.27z"/>
-    <path d="m31.36 42.18h1.27v2.55h-1.27z"/>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m17.23 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m17.23 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m42.68 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m42.68 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <circle cx="32" cy="32" r="14" style="fill:none;stroke-miterlimit:10;stroke:#5e5549;stroke-width:.5"/>
-  <circle cx="44.5" cy="19.5" r="1.5" style="fill:#f00"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.png
deleted file mode 100644
index 05d6922de..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.svg
deleted file mode 100644
index 92b7854ad..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-on.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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="14"/>
-    <clipPath id="1">
-      <use xlink:href="#0"/>
-    </clipPath>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="46" x2="0" y2="18">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="57" x2="0" y2="7">
-      <stop style="stop-color:#cac7b9"/>
-      <stop offset="1" style="stop-color:#f8f5e5"/>
-    </linearGradient>
-    <linearGradient id="5" gradientUnits="userSpaceOnUse" y1="48" x2="0" y2="16" xlink:href="#2"/>
-  </defs>
-  <path d="m16 7h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#4)"/>
-  <path d="m21 16h22c2.76 0 5 2.24 5 5v22c0 2.76-2.24 5-5 5h-22c-2.76 0-5-2.24-5-5v-22c0-2.76 2.24-5 5-5z" style="fill:url(#5);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <circle cx="32" cy="32" r="14" style="fill:url(#3)"/>
-  <g style="fill:#1a171b">
-    <circle cx="26.91" cy="32" r="1.91"/>
-    <circle cx="37.09" cy="32" r="1.91"/>
-  </g>
-  <g style="fill:#8c8c8c">
-    <path d="m31.36 19.27h1.27v2.55h-1.27z"/>
-    <path d="m31.36 42.18h1.27v2.55h-1.27z"/>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m17.23 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m17.23 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m42.68 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m42.68 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <circle cx="32" cy="32" r="14" style="fill:none;stroke-miterlimit:10;stroke:#5e5549;stroke-width:.5"/>
-  <circle cx="44.5" cy="19.5" r="1.5" style="fill:#00ff46"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.png
deleted file mode 100644
index 9ae5e6118..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.svg
deleted file mode 100644
index 2312cfa41..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-uk.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.png
deleted file mode 100644
index d8a02283c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.svg
deleted file mode 100644
index bd54a6b59..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet-us.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.png
deleted file mode 100644
index 13fe074e6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.svg
deleted file mode 100644
index 7dc9449f0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/poweroutlet.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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="14"/>
-    <clipPath id="1">
-      <use xlink:href="#0"/>
-    </clipPath>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="46" x2="0" y2="18">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="57" x2="0" y2="7">
-      <stop style="stop-color:#cac7b9"/>
-      <stop offset="1" style="stop-color:#f8f5e5"/>
-    </linearGradient>
-    <linearGradient id="5" gradientUnits="userSpaceOnUse" y1="48" x2="0" y2="16" xlink:href="#2"/>
-  </defs>
-  <path d="m16 7h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#4)"/>
-  <path d="m21 16h22c2.76 0 5 2.24 5 5v22c0 2.76-2.24 5-5 5h-22c-2.76 0-5-2.24-5-5v-22c0-2.76 2.24-5 5-5z" style="fill:url(#5);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <circle cx="32" cy="32" r="14" style="fill:url(#3)"/>
-  <g style="fill:#1a171b">
-    <circle cx="26.91" cy="32" r="1.91"/>
-    <circle cx="37.09" cy="32" r="1.91"/>
-  </g>
-  <g style="fill:#8c8c8c">
-    <path d="m31.36 19.27h1.27v2.55h-1.27z"/>
-    <path d="m31.36 42.18h1.27v2.55h-1.27z"/>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m17.23 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m17.23 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m20.82 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <g style="clip-path:url(#1)">
-    <g>
-      <path d="m42.68 17.23h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 17.73v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-    <g>
-      <path d="m42.68 33.14h4.09v13.64h-4.09z" style="fill:#ccbeae"/>
-      <path d="m46.27 33.64v12.64h-3.09v-12.64h3.09m1-1h-5.09v14.64h5.09v-14.64z" style="fill:#a59988"/>
-    </g>
-  </g>
-  <circle cx="32" cy="32" r="14" style="fill:none;stroke-miterlimit:10;stroke:#5e5549;stroke-width:.5"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.png
deleted file mode 100644
index dff5a610f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.svg
deleted file mode 100644
index 7dbdf0035..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present-off.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.2l19.5-9.7 19.5 9.7v45.2z" style="fill:#ffccd3"/>
-  <path d="M32,5.1l19,9.5V59H13V14.6L32,5.1 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#f66"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#ffccd3"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#f66"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#ffccd3"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#f66"/>
-  <path d="m17.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m22 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m22.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m27 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#ffccd3"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#f66"/>
-  <path d="m31.5 23.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m36 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m17.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m22 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m22.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m27 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m31.5 36.5h5v6h-5z" style="fill:#ffccd3"/>
-  <path d="m36 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#f66"/>
-  <path d="m40.5 23.5h6v6h-6z" style="fill:#ffccd3"/>
-  <path d="m46 24v5h-5v-5h5m1-1h-7v7h7v-7z" style="fill:#f66"/>
-  <g style="fill:#ffccd3">
-    <path d="m44 41h1v1h-1z" style="stroke-miterlimit:10;stroke:#f66"/>
-    <path d="m12.5 20.5v-6.2l19.5-9.7 19.5 9.7v6.2z"/>
-  </g>
-  <path d="m32 5.1l19 9.5v5.4h-38v-5.4l19-9.5m0-1.1l-20 10v7h40v-7l-20-10z" style="fill:#f66"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#ffccd3"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#f66"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#ffccd3"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#f66"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.png
deleted file mode 100644
index 0240eeef6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.svg
deleted file mode 100644
index 905a666f0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/present.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".2"/>
-      <stop offset=".8"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m3 46h58v1h-58z" style="fill:url(#0)"/>
-  <path d="m12.5 59.5v-45.2l19.5-9.7 19.5 9.7v45.2z" style="fill:#c8ffc8"/>
-  <path d="M32,5.1l19,9.5V59H13V14.6L32,5.1 M32,4L12,14v46h40V14L32,4L32,4z" style="fill:#52cc78"/>
-  <path d="m12.5 33.5h39v13h-39z" style="fill:#c8ffc8"/>
-  <path d="m51 34v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#52cc78"/>
-  <path d="m12.5 20.5h39v13h-39z" style="fill:#c8ffc8"/>
-  <path d="m51 21v12h-38v-12h38m1-1h-40v14h40v-14z" style="fill:#52cc78"/>
-  <path d="m17.5 23.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m22 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m22.5 23.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m27 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m40.5 36.5h6v10h-6z" style="fill:#c8ffc8"/>
-  <path d="m46 37v9h-5v-9h5m1-1h-7v11h7v-11z" style="fill:#52cc78"/>
-  <path d="m31.5 23.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m36 24v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m17.5 36.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m22 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m22.5 36.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m27 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m31.5 36.5h5v6h-5z" style="fill:#c8ffc8"/>
-  <path d="m36 37v5h-4v-5h4m1-1h-6v7h6v-7z" style="fill:#52cc78"/>
-  <path d="m40.5 23.5h6v6h-6z" style="fill:#c8ffc8"/>
-  <path d="m46 24v5h-5v-5h5m1-1h-7v7h7v-7z" style="fill:#52cc78"/>
-  <g style="fill:#c8ffc8">
-    <path d="m44 41h1v1h-1z" style="stroke-miterlimit:10;stroke:#52cc78"/>
-    <path d="m12.5 20.5v-6.2l19.5-9.7 19.5 9.7v6.2z"/>
-  </g>
-  <path d="m32 5.1l19 9.5v5.4h-38v-5.4l19-9.5m0-1.1l-20 10v7h40v-7l-20-10z" style="fill:#52cc78"/>
-  <path d="m58 17.5l-26-13-26 13" style="fill:none;stroke-miterlimit:10;stroke:#2e7de5;stroke-width:1.5"/>
-  <path d="m25.5 12.5h5v5h-5z" style="fill:#c8ffc8"/>
-  <path d="m30 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#52cc78"/>
-  <path d="m33.5 12.5h5v5h-5z" style="fill:#c8ffc8"/>
-  <path d="m38 13v4h-4v-4h4m1-1h-6v6h6v-6z" style="fill:#52cc78"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.png
deleted file mode 100644
index 33320386f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.svg
deleted file mode 100644
index 73517d0f5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pressure.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.png
deleted file mode 100644
index 8f378abc6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.svg
deleted file mode 100644
index e1a1d6e34..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/projector_benq.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="3" x2="61">
-      <stop style="stop-color:#1d1a1e"/>
-      <stop offset=".0305" style="stop-color:#444145"/>
-      <stop offset=".0676" style="stop-color:#242424"/>
-      <stop offset=".2319"/>
-      <stop offset=".4164" style="stop-color:#282629"/>
-      <stop offset="1" style="stop-color:#38373a"/>
-    </linearGradient>
-  </defs>
-  <g style="stroke-miterlimit:10;stroke:#000;stroke-width:.5">
-    <path d="m5.24 29.78l-.19 3.41.01.15.52 5.6c0 0-.09 1.81 2.94 1.81h44.97c0 0 3.66.12 4.31-.84s.94-4.59.94-4.59v-5.16l-53.5-.38z" style="fill:#212121"/>
-    <path d="m3.49 23.28l-.42 8.67c0 0-.59 1.97 1.77 2.59s30.59 3.93 41.15 3.84 13.67-2.86 13.67-2.86 1.5-.65 1.33-4.38l-.51-8.54c0 0-6.78-1.99-18.78-1.54s-38.21 2.22-38.21 2.22z" style="fill:url(#0)"/>
-  </g>
-  <path d="m29 41h8v2h-8z"/>
-  <path d="m51 41h2v1h-2z"/>
-  <circle cx="56" cy="35.08" r="1"/>
-  <path d="m47 36.88c-3.79 0-6.88-3.08-6.88-6.88s3.08-6.88 6.88-6.88 6.88 3.08 6.88 6.88-3.09 6.88-6.88 6.88" style="fill:#222"/>
-  <path d="m47 23.25c3.72 0 6.75 3.03 6.75 6.75s-3.03 6.75-6.75 6.75-6.75-3.03-6.75-6.75 3.03-6.75 6.75-6.75m0-.25c-3.87 0-7 3.13-7 7s3.13 7 7 7 7-3.13 7-7-3.13-7-7-7z"/>
-  <path d="m47 34.87c-2.69 0-4.88-2.19-4.88-4.87s2.19-4.87 4.88-4.87 4.88 2.19 4.88 4.87-2.19 4.87-4.88 4.87" style="fill:#dadada"/>
-  <path d="m47 25.25c2.62 0 4.75 2.13 4.75 4.75s-2.13 4.75-4.75 4.75-4.75-2.13-4.75-4.75 2.13-4.75 4.75-4.75m0-.25c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5z" style="fill:#6d6d6d"/>
-  <path d="m47 32.88c-1.59 0-2.88-1.29-2.88-2.88s1.29-2.88 2.88-2.88 2.88 1.29 2.88 2.88-1.29 2.88-2.88 2.88" style="fill:#797689"/>
-  <path d="m47 27.25c1.52 0 2.75 1.23 2.75 2.75s-1.23 2.75-2.75 2.75-2.75-1.23-2.75-2.75 1.23-2.75 2.75-2.75m0-.25c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/>
-  <circle cx="47" cy="30" r="1.75" style="fill:#4f3542"/>
-  <circle cx="47" cy="30" r="1.05"/>
-  <g style="fill:#c8c8c8">
-    <path d="m13.7 28.01c-.52 0-.89.38-.89.93v.06c0 .55.38.91.97.91.13 0 .45 0 .75-.23v-.41c-.25.19-.41.21-.62.21-.31 0-.51-.12-.55-.4h1.2c0-.03 0-.06 0-.09.02-.63-.38-.98-.86-.98m-.32.73c.03-.16.15-.28.31-.28.16 0 .28.12.31.28h-.62"/>
-    <path d="m15.79 28.02c-.22 0-.39.09-.56.29v-.24h-.54v1.79h.54v-1.12c.14-.23.24-.3.38-.3.15 0 .27.1.27.36v1.06h.54v-1.15c0-.53-.36-.69-.63-.69"/>
-    <path d="m12.45 28.88c.15-.08.24-.22.24-.4 0-.26-.18-.37-.35-.43-.1-.03-.18-.03-.29-.03h-1.05v1.85h1.09c.15 0 .3-.01.45-.12.16-.12.2-.29.2-.42 0-.17-.08-.28-.16-.35-.03-.05-.08-.07-.13-.1m-.93-.42h.41c.09 0 .22.02.22.14 0 .14-.13.14-.22.14h-.41v-.28m.45 1h-.45v-.37h.45c.11 0 .22.05.22.19 0 .14-.11.18-.22.18"/>
-    <path d="m17.95 29.82c.32-.12.54-.43.54-.86 0-.71-.55-.96-.98-.96-.52 0-.99.33-.99.95 0 .57.42.95.99.95.08.1.54.49 1.24.27l.08-.59c-.34.28-.81.26-.88.24m-.17-.45c-.07.09-.18.13-.29.13-.14 0-.25-.07-.33-.18-.06-.09-.09-.21-.09-.33 0-.16.05-.3.14-.4.08-.09.16-.13.28-.13.08 0 .16.02.22.07.12.1.19.27.19.46.01.14-.04.29-.12.38"/>
-  </g>
-  <path d="m47 29h1v1h-1z" style="fill:#fff"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.png
deleted file mode 100644
index 130e68e6f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.svg
deleted file mode 100644
index afb2267b5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/pump.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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="5" gradientUnits="userSpaceOnUse" x1="29" x2="58">
-      <stop style="stop-color:#82828c;stop-opacity:0"/>
-      <stop offset=".25" style="stop-color:#666e7f"/>
-      <stop offset="1" style="stop-color:#666e7f"/>
-    </linearGradient>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="18.4618" y1="60.8841" x2="8.1831" y2="53.6869" xlink:href="#4"/>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" y1="27.5" x2="0" y2="3.5">
-      <stop style="stop-color:#82828c"/>
-      <stop offset=".5" style="stop-color:#ccd3e7"/>
-      <stop offset="1" style="stop-color:#82828c"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" y1="63.5" x2="0" y2="61.5" xlink:href="#4"/>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="45.8168" y1="53.6869" x2="35.5382" y2="60.8841" xlink:href="#4"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="25" x2="0" y2="6" xlink:href="#4"/>
-    <radialGradient id="8" cx="27" cy="32" r="26.5" gradientUnits="userSpaceOnUse">
-      <stop offset=".2965" style="stop-color:#82828c"/>
-      <stop offset=".65" style="stop-color:#ccd3e7"/>
-      <stop offset="1" style="stop-color:#82828c"/>
-    </radialGradient>
-    <radialGradient id="7" cx="27" cy="32" r="23.5" gradientUnits="userSpaceOnUse">
-      <stop offset=".5" style="stop-color:#82828c"/>
-      <stop offset=".7902" style="stop-color:#ccd3e7"/>
-      <stop offset="1" style="stop-color:#82828c"/>
-    </radialGradient>
-    <radialGradient id="6" cx="27" cy="32" r="10.5" gradientUnits="userSpaceOnUse">
-      <stop offset=".55"/>
-      <stop offset="1" style="stop-color:#1a1a1a"/>
-    </radialGradient>
-  </defs>
-  <path d="m6.68 62.5l3.65-11.88 12.77 3.64-7.32 8.24z" style="fill:url(#3)"/>
-  <path d="m10.67 51.23l11.53 3.29-6.65 7.48h-8.2l3.32-10.77m-.67-1.23l-4 13h10l8-9-14-4z" style="fill:#666e7f"/>
-  <path d="m38.22 62.5l-7.32-8.24 12.77-3.64 3.65 11.88z" style="fill:url(#2)"/>
-  <path d="m43.33 51.23l3.32 10.77h-8.2l-6.64-7.48 11.52-3.29m.67-1.23l-14 4 8 9h10l-4-13z" style="fill:#666e7f"/>
-  <path d="m1.5 61.5h17v2h-17z" style="fill:url(#0)"/>
-  <path d="m18 62v1h-16v-1h16m1-1h-18v3h18v-3z" style="fill:#666e7f"/>
-  <path d="m35.5 61.5h17v2h-17z" style="fill:url(#0)"/>
-  <path d="m52 62v1h-16v-1h16m1-1h-18v3h18v-3z" style="fill:#666e7f"/>
-  <path d="m57 6v19h-27v-19h27m1-1h-29v21h29v-21z" style="fill:url(#5)"/>
-  <path d="M27,58.5C12.39,58.5,0.5,46.61,0.5,32S12.39,5.5,27,5.5S53.5,17.39,53.5,32S41.61,58.5,27,58.5z" style="fill:url(#8)"/>
-  <path d="m27 6c14.34 0 26 11.66 26 26 0 14.34-11.66 26-26 26s-26-11.66-26-26c0-14.34 11.66-26 26-26m0-1c-14.91 0-27 12.09-27 27s12.09 27 27 27 27-12.09 27-27-12.09-27-27-27z" style="fill:#666e7f"/>
-  <path d="M27,55.5C14.04,55.5,3.5,44.96,3.5,32S14.04,8.5,27,8.5S50.5,19.04,50.5,32S39.96,55.5,27,55.5z" style="fill:url(#7)"/>
-  <path d="m27 9c12.68 0 23 10.32 23 23s-10.32 23-23 23-23-10.32-23-23 10.32-23 23-23m0-1c-13.25 0-24 10.75-24 24s10.75 24 24 24 24-10.75 24-24-10.75-24-24-24z" style="fill:#666e7f"/>
-  <path d="M27,42.5c-5.79,0-10.5-4.71-10.5-10.5S21.21,21.5,27,21.5S37.5,26.21,37.5,32S32.79,42.5,27,42.5z" style="fill:url(#6)"/>
-  <path d="m27 22c5.51 0 10 4.49 10 10 0 5.51-4.49 10-10 10s-10-4.49-10-10c0-5.51 4.49-10 10-10m0-1c-6.08 0-11 4.92-11 11s4.92 11 11 11 11-4.92 11-11-4.92-11-11-11z" style="fill:#191919"/>
-  <circle cx="27" cy="32" r="2.5" style="fill:#d8bb41;stroke-miterlimit:10;stroke:#484e59"/>
-  <path d="m57.5 3.5h6v24h-6z" style="fill:url(#4)"/>
-  <path d="m63 4v23h-5v-23h5m1-1h-7v25h7v-25z" style="fill:#666e7f"/>
-  <path d="M27,6c10.85,0,19.98,8.04,22.76,19H57V6H27z" style="fill:url(#1)"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.png
deleted file mode 100644
index f6b863b35..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.svg
deleted file mode 100644
index f99a0a6ad..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-0.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.png
deleted file mode 100644
index bad50efbb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.svg
deleted file mode 100644
index 8c39ed13e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-1.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.png
deleted file mode 100644
index 14d8bba37..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.svg
deleted file mode 100644
index 7e453d965..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-2.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.png
deleted file mode 100644
index ac693442a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.svg
deleted file mode 100644
index 382e256e0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-3.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.png
deleted file mode 100644
index b224da1cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.svg
deleted file mode 100644
index 706468276..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice-4.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.png
deleted file mode 100644
index b224da1cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.svg
deleted file mode 100644
index 706468276..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/qualityofservice.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.png
deleted file mode 100644
index ded5bbf2a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.svg
deleted file mode 100644
index 9ea82ed6a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/radiator.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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="5" gradientUnits="userSpaceOnUse" y1="10.5" x2="0" y2="53.5">
-      <stop style="stop-color:#fafafa"/>
-      <stop offset="1" style="stop-color:#dcdcdc"/>
-    </linearGradient>
-    <linearGradient id="4" gradientUnits="userSpaceOnUse" x1="14.5" x2="18.5">
-      <stop style="stop-color:#dcdcdc"/>
-      <stop offset="1" style="stop-color:#fafafa"/>
-    </linearGradient>
-    <linearGradient id="6" gradientUnits="userSpaceOnUse" x1="22.5" x2="26.5" xlink:href="#4"/>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" x1="30.5" x2="34.5" xlink:href="#4"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="38.5" x2="42.5" xlink:href="#4"/>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="46.5" x2="50.5" xlink:href="#4"/>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="54.5" x2="58.5" xlink:href="#4"/>
-  </defs>
-  <g style="fill:#505050">
-    <path d="m6 13h6v3h-6z"/>
-    <path d="m6 49h6v3h-6z"/>
-  </g>
-  <path d="m12 53.5c-.83 0-1.5-.67-1.5-1.5v-40c0-.83.67-1.5 1.5-1.5h49c.83 0 1.5.67 1.5 1.5v40c0 .83-.67 1.5-1.5 1.5h-49" style="fill:url(#5)"/>
-  <path d="m61 11c.55 0 1 .45 1 1v40c0 .55-.45 1-1 1h-49c-.55 0-1-.45-1-1v-40c0-.55.45-1 1-1h49m0-1h-49c-1.1 0-2 .9-2 2v40c0 1.1.9 2 2 2h49c1.1 0 2-.9 2-2v-40c0-1.1-.9-2-2-2z" style="fill:#a0a0a0"/>
-  <path d="m15 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#4)"/>
-  <path d="m18 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m23 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#6)"/>
-  <path d="m26 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m31 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#3)"/>
-  <path d="m34 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m39 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#1)"/>
-  <path d="m42 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m47 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#0)"/>
-  <path d="m50 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m55 51.5c-.28 0-.5-.22-.5-.5v-38c0-.28.22-.5.5-.5h3c.28 0 .5.22.5.5v38c0 .28-.22.5-.5.5h-3" style="fill:url(#2)"/>
-  <path d="m58 13v38h-3v-38h3m0-1h-3c-.55 0-1 .45-1 1v38c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-38c0-.55-.45-1-1-1z" style="fill:#b4b4b4"/>
-  <path d="m2 17.5c-1.03 0-1.5-1.54-1.5-2.97 0-1.46.47-3.03 1.5-3.03h6.5v6h-6.5" style="fill:#fff"/>
-  <g style="fill:#a0a0a0">
-    <path d="m8 12v5h-6c-.55 0-1-1.09-1-2.47 0-1.38.45-2.53 1-2.53h6m1-1h-1-6c-1.38 0-2 1.77-2 3.53 0 2.08.8 3.47 2 3.47h6 1v-1-5-1z"/>
-    <circle cx="6.5" cy="50.5" r="2.5"/>
-  </g>
-  <circle cx="6.5" cy="50.5" r="1.5" style="fill:#505050"/>
-  <g style="fill:#c8c8c8">
-    <path d="m2 13h6v1h-6z"/>
-    <path d="m2 15h6v1h-6z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.png
deleted file mode 100644
index f46b6eb3c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.svg
deleted file mode 100644
index 3c5dd287c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rain.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.png
deleted file mode 100644
index 8339d680e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.svg
deleted file mode 100644
index fea71552a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-off.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.png
deleted file mode 100644
index 9ba2bacfb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.svg
deleted file mode 100644
index 108824cee..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver-on.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.png
deleted file mode 100644
index 9ba2bacfb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.svg
deleted file mode 100644
index 108824cee..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/receiver.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.png
deleted file mode 100644
index c1bbba7f2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.svg
deleted file mode 100644
index c8f05303b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/recorder.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.png
deleted file mode 100644
index c1d2859cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.svg
deleted file mode 100644
index c9fe853db..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/returnpipe.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.png
deleted file mode 100644
index 7877f1496..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.svg
deleted file mode 100644
index 50cd84993..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rgb.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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 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"/>
-  <path d="m32 3.61c-9.94 0-18 8.06-18 18 0 1.27.14 2.5.39 3.69 1.77-.58 3.65-.9 5.61-.9 4.62 0 8.81 1.75 12 4.61 3.19-2.86 7.38-4.61 12-4.61 1.96 0 3.85.33 5.62.91.25-1.19.38-2.43.38-3.69 0-9.95-8.06-18.01-18-18.01" style="fill:#0f0"/>
-  <path d="m44 24.39c-4.62 0-8.81 1.75-12 4.61 2.8 2.51 4.82 5.88 5.62 9.7 6.05-1.99 10.68-7.08 12-13.4-1.77-.58-3.66-.91-5.62-.91" style="fill:#0ff"/>
-  <path d="m49.62 25.3c-1.32 6.32-5.96 11.42-12.01 13.4.25 1.19.39 2.43.39 3.69 0 5.32-2.33 10.09-6 13.39 3.19 2.86 7.38 4.61 12 4.61 9.94 0 18-8.06 18-18 0-7.98-5.19-14.73-12.38-17.09" style="fill:#00f"/>
-  <path d="m32 29c-3.19-2.86-7.38-4.61-12-4.61-1.96 0-3.85.33-5.62.91 1.32 6.32 5.96 11.41 12 13.4.8-3.82 2.82-7.19 5.62-9.7" style="fill:#ff0"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.png
deleted file mode 100644
index 451aa241d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.svg
deleted file mode 100644
index d22be37ed..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-0.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.png
deleted file mode 100644
index 1ccd1e95b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.svg
deleted file mode 100644
index cd808de5b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-10.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.png
deleted file mode 100644
index cb1be9e94..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.svg
deleted file mode 100644
index b8dfa323a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-100.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.png
deleted file mode 100644
index 9c91afed6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.svg
deleted file mode 100644
index f05db0f68..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-20.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.png
deleted file mode 100644
index dbd602c09..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.svg
deleted file mode 100644
index ecaccb327..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-30.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.png
deleted file mode 100644
index 680931759..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.svg
deleted file mode 100644
index 567a5bc07..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-40.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.png
deleted file mode 100644
index 8567e3a50..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.svg
deleted file mode 100644
index 517b70167..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-50.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.png
deleted file mode 100644
index bcc40e6c9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.svg
deleted file mode 100644
index 9a0900305..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-60.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.png
deleted file mode 100644
index 55f9d28c2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.svg
deleted file mode 100644
index 78b130269..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-70.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.png
deleted file mode 100644
index 97ee1f2e5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.svg
deleted file mode 100644
index 63c7dace8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-80.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.png
deleted file mode 100644
index 1953b2053..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.svg
deleted file mode 100644
index fdeb17174..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter-90.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.png
deleted file mode 100644
index 55f9d28c2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.svg
deleted file mode 100644
index 78b130269..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/rollershutter.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.png
deleted file mode 100644
index bea0f1e66..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.svg
deleted file mode 100644
index 7269223a5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/settings.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.png
deleted file mode 100644
index 21cec1b17..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.svg
deleted file mode 100644
index 1c4006eff..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-0.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.png
deleted file mode 100644
index 6543145e3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.svg
deleted file mode 100644
index b756d0ab9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-10.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 55h44v5h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.png
deleted file mode 100644
index 3adf7ba47..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.svg
deleted file mode 100644
index d6dcffd9a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-100.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 10h44v50h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.png
deleted file mode 100644
index 3f2af2c1d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.svg
deleted file mode 100644
index 1e82a22d7..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-20.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 50h44v10h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.png
deleted file mode 100644
index 2d1b68508..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.svg
deleted file mode 100644
index d6071780b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-30.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 45h44v15h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.png
deleted file mode 100644
index be76aafb6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.svg
deleted file mode 100644
index bf4ceb8f3..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-40.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 40h44v20h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.png
deleted file mode 100644
index a805d2a1a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.svg
deleted file mode 100644
index e5a7ad655..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-50.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 35h44v25h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.png
deleted file mode 100644
index 5222c7e89..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.svg
deleted file mode 100644
index 5e6850b84..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-60.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 30h44v30h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.png
deleted file mode 100644
index 18e8f4a3c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.svg
deleted file mode 100644
index 0f0901bcc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-70.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 25h44v35h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.png
deleted file mode 100644
index be45b152e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.svg
deleted file mode 100644
index 836d8326b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-80.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 20h44v40h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.png
deleted file mode 100644
index b622a2c0b..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.svg
deleted file mode 100644
index 491bbfd30..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage-90.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 15h44v45h-44z" style="fill:#c1b584"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.png
deleted file mode 100644
index b5c87d9c7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.svg
deleted file mode 100644
index a41d5f526..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sewerage.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <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">
-      <use xlink:href="#0"/>
-    </clipPath>
-  </defs>
-  <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"/>
-  <path d="m49 4c.55 0 1 .45 1 1v1c0 .55-.45 1-1 1h-34c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1h34m0-1h-34c-1.1 0-2 .9-2 2v1c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-1c0-1.1-.9-2-2-2z" style="fill:#c8c8c8"/>
-  <g style="clip-path:url(#1)">
-    <path d="m10 35h44v25h-44z" style="fill:#c8c8c8"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.png
deleted file mode 100644
index f42293f8f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.svg
deleted file mode 100644
index b27035092..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-0.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="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"/>
-  </g>
-  <path d="m32 58.37c-13.41-10.22-21.1-25.71-21.1-42.57 0-.22.01-.43.02-.64v-.08c7.72-1.63 14.81-4.81 21.08-9.45 6.27 4.64 13.36 7.82 21.08 9.45v.08c.01.21.02.43.02.64 0 16.86-7.69 32.35-21.1 42.57" style="fill:#c80028"/>
-  <path d="m32 6.24c6.15 4.49 13.07 7.6 20.59 9.24 0 .11.01.21.01.32 0 16.57-7.5 31.82-20.6 41.94-13.1-10.12-20.6-25.37-20.6-41.94 0-.11 0-.21.01-.32 7.52-1.64 14.44-4.74 20.59-9.24m0-1.24c-6.27 4.71-13.6 8.04-21.57 9.67-.01.38-.03.75-.03 1.13 0 17.67 8.48 33.35 21.6 43.2 13.12-9.85 21.6-25.53 21.6-43.2 0-.38-.03-.75-.03-1.13-7.97-1.63-15.3-4.96-21.57-9.67z" style="fill:#990025"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.png
deleted file mode 100644
index 25b37c9e1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.svg
deleted file mode 100644
index 940afd839..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield-1.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="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"/>
-  </g>
-  <path d="m32 58.37c-13.41-10.22-21.1-25.71-21.1-42.57 0-.22.01-.43.02-.64v-.08c7.72-1.63 14.81-4.81 21.08-9.45 6.27 4.64 13.36 7.82 21.08 9.45v.08c.01.21.02.43.02.64 0 16.86-7.69 32.35-21.1 42.57" style="fill:#00c864"/>
-  <path d="m32 6.24c6.15 4.49 13.07 7.6 20.59 9.24 0 .11.01.21.01.32 0 16.57-7.5 31.82-20.6 41.94-13.1-10.12-20.6-25.37-20.6-41.94 0-.11 0-.21.01-.32 7.52-1.64 14.44-4.74 20.59-9.24m0-1.24c-6.27 4.71-13.61 8.04-21.57 9.67-.01.38-.03.75-.03 1.13 0 17.67 8.48 33.35 21.6 43.2 13.12-9.85 21.6-25.53 21.6-43.2 0-.38-.03-.75-.03-1.13-7.96-1.63-15.3-4.96-21.57-9.67z" style="fill:#009949"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.png
deleted file mode 100644
index 853e96444..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.svg
deleted file mode 100644
index 69f277ae0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/shield.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="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"/>
-  </g>
-  <path d="m32 58.37c-13.41-10.22-21.1-25.71-21.1-42.57 0-.22.01-.43.02-.64v-.08c7.72-1.63 14.81-4.81 21.08-9.45 6.27 4.64 13.36 7.82 21.08 9.45v.08c.01.21.02.43.02.64 0 16.86-7.69 32.35-21.1 42.57" style="fill:#323232"/>
-  <path d="m32 6.24c6.15 4.49 13.07 7.6 20.59 9.24 0 .11.01.21.01.32 0 16.57-7.5 31.82-20.6 41.94-13.1-10.12-20.6-25.37-20.6-41.94 0-.11 0-.21.01-.32 7.52-1.64 14.44-4.74 20.59-9.24m0-1.24c-6.27 4.71-13.6 8.04-21.57 9.67-.01.38-.03.75-.03 1.13 0 17.67 8.48 33.35 21.6 43.2 13.12-9.85 21.6-25.53 21.6-43.2 0-.38-.03-.75-.03-1.13-7.97-1.63-15.3-4.96-21.57-9.67z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.png
deleted file mode 100644
index f6b863b35..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.svg
deleted file mode 100644
index f99a0a6ad..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-0.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.png
deleted file mode 100644
index bad50efbb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.svg
deleted file mode 100644
index 8c39ed13e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-1.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.png
deleted file mode 100644
index 14d8bba37..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.svg
deleted file mode 100644
index 7e453d965..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-2.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.png
deleted file mode 100644
index ac693442a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.svg
deleted file mode 100644
index 382e256e0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-3.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.png
deleted file mode 100644
index b224da1cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.svg
deleted file mode 100644
index 706468276..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal-4.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.png
deleted file mode 100644
index b224da1cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.svg
deleted file mode 100644
index 706468276..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/signal.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.png
deleted file mode 100644
index cb41fd2c6..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.svg
deleted file mode 100644
index 1c01c241c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-off.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.png
deleted file mode 100644
index f4ac89270..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.svg
deleted file mode 100644
index ca0ea0ba5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren-on.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.png
deleted file mode 100644
index f4ac89270..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.svg
deleted file mode 100644
index ca0ea0ba5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/siren.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.png
deleted file mode 100644
index f581dd94c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.svg
deleted file mode 100644
index 3853ad06b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-0.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.png
deleted file mode 100644
index 6a6641d37..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.svg
deleted file mode 100644
index 101b5b236..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-10.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-100.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.png
deleted file mode 100644
index b3a2c19ee..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.svg
deleted file mode 100644
index 3c3ca481c..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-20.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.png
deleted file mode 100644
index 82bdc8a49..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.svg
deleted file mode 100644
index 5625e61d9..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-30.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.png
deleted file mode 100644
index b2bc5b190..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.svg
deleted file mode 100644
index 1bc4e909e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-40.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.png
deleted file mode 100644
index c2bda42a1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.svg
deleted file mode 100644
index d0391a0dc..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-50.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.png
deleted file mode 100644
index a5ba164a1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.svg
deleted file mode 100644
index 49e35c04f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-60.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.png
deleted file mode 100644
index a4ac4ceba..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.svg
deleted file mode 100644
index 2b348e730..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-70.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.png
deleted file mode 100644
index 4f97751b2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.svg
deleted file mode 100644
index 8818b22a1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-80.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.png
deleted file mode 100644
index f07ce5e7d..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.svg
deleted file mode 100644
index 3d7f919a0..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider-90.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.png
deleted file mode 100644
index 0e9964872..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.svg
deleted file mode 100644
index a2797c506..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/slider.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.png
deleted file mode 100644
index a7cedf10e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.svg
deleted file mode 100644
index 966543150..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smiley.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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">
-  <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">
-    <circle cx="23" cy="18" r="4"/>
-    <circle cx="41" cy="18" r="4"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.png
deleted file mode 100644
index f1f9e3cc5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.svg
deleted file mode 100644
index 8a8970b1d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/smoke.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.png
deleted file mode 100644
index 8b0c89cd2..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.svg
deleted file mode 100644
index d1ded1622..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sofa.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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" y1="36" x2="0" y2="46">
-      <stop style="stop-color:#c80000"/>
-      <stop offset=".1" style="stop-color:#a60000"/>
-      <stop offset=".5817" style="stop-color:#950000"/>
-      <stop offset="1" style="stop-color:#8c0000"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" y1="20.54" x2="0" y2="42.54">
-      <stop style="stop-color:#c80000"/>
-      <stop offset=".2659" style="stop-color:#a60000"/>
-      <stop offset=".6588" style="stop-color:#950000"/>
-      <stop offset="1" style="stop-color:#8c0000"/>
-    </linearGradient>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="9.5" x2="1.5" xlink:href="#3"/>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="54.5" x2="62.5" xlink:href="#3"/>
-  </defs>
-  <path d="m15 42.54c-3.58 0-6.5-2.92-6.5-6.5v-9c0-3.58 2.92-6.5 6.5-6.5h34c3.58 0 6.5 2.92 6.5 6.5v9c0 3.58-2.92 6.5-6.5 6.5h-34" style="fill:url(#2)"/>
-  <path d="m49 21.04c3.31 0 6 2.69 6 6v9c0 3.31-2.69 6-6 6h-34c-3.31 0-6-2.69-6-6v-9c0-3.31 2.69-6 6-6h34m0-1h-34c-3.85 0-7 3.15-7 7v9c0 3.85 3.15 7 7 7h34c3.85 0 7-3.15 7-7v-9c0-3.85-3.15-7-7-7z" style="fill:#8c0000"/>
-  <path d="m7 36h50v10h-50z" style="fill:url(#3)"/>
-  <path d="m54.5 46.5v-16h.06l-.01-.56-.02-.16c-.01-.09-.03-.19-.03-.28 0-2.21 1.79-4 4-4s4 1.79 4 4c0 2.03-1.53 3.73-3.56 3.95l-.44.05v13h-4" style="fill:url(#1)"/>
-  <path d="m58.5 26c1.93 0 3.5 1.57 3.5 3.5 0 1.77-1.34 3.26-3.11 3.46l-.89.1v.89 12.05h-3v-15h.17l-.12-1.11-.02-.17c-.02-.07-.03-.14-.03-.22 0-1.93 1.57-3.5 3.5-3.5m0-1c-2.49 0-4.5 2.01-4.5 4.5 0 .17.03.33.05.5h-.05v17h5v-13.05c2.25-.25 4-2.14 4-4.45 0-2.49-2.01-4.5-4.5-4.5z" style="fill:#8c0000"/>
-  <path d="m5.5 46.5v-13l-.44-.05c-2.03-.22-3.56-1.92-3.56-3.95 0-2.21 1.79-4 4-4s4 1.79 4 4c0 .1-.01.19-.03.28l-.08.72h.11v16h-4" style="fill:url(#0)"/>
-  <path d="m5.5 26c1.93 0 3.5 1.57 3.5 3.5 0 .08-.01.15-.02.22l-.02.17-.13 1.11h.17v15h-3v-12.05-.89l-.89-.1c-1.77-.2-3.11-1.69-3.11-3.46 0-1.93 1.57-3.5 3.5-3.5m0-1c-2.49 0-4.5 2.01-4.5 4.5 0 2.31 1.75 4.2 4 4.45v13.05h5v-17h-.05c.02-.17.05-.33.05-.5 0-2.49-2.01-4.5-4.5-4.5z" style="fill:#8c0000"/>
-  <path d="m13 46h4v1h-4z"/>
-  <path d="m47 46h4v1h-4z"/>
-  <g style="fill:#845340;stroke-miterlimit:10;stroke:#663629">
-    <circle cx="5.5" cy="29.5" r="2.04"/>
-    <circle cx="58.5" cy="29.5" r="2.04"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.png
deleted file mode 100644
index ddba4fc00..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.svg
deleted file mode 100644
index 8d718a0e6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/softener.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="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"/>
-  <path d="m50 32c1.1 0 2 .9 2 2v20c0 1.1-.9 2-2 2h-36c-1.1 0-2-.9-2-2v-20c0-1.1.9-2 2-2h36m0-1h-36c-1.65 0-3 1.35-3 3v20c0 1.65 1.35 3 3 3h36c1.65 0 3-1.35 3-3v-20c0-1.65-1.35-3-3-3z" style="fill:#2b8ed8"/>
-  <path d="m21.5 11.5h21v15h-21z" style="fill:#646464"/>
-  <path d="m42 12v14h-20v-14h20m1-1h-1-20-1v1 14 1h1 20 1v-1-14-1z" style="fill:#282828"/>
-  <path d="m24.5 14.5h15v9h-15z" style="fill:#ececed"/>
-  <path d="m39 15v8h-14v-8h14m1-1h-16v10h16v-10z" style="fill:#9b9c9e"/>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#c56c33;stroke-width:3">
-    <path d="M24.5,11c0-1.93-1.57-3.5-3.5-3.5H7"/>
-    <path d="m39.5 11c0-1.93 1.57-3.5 3.5-3.5h15"/>
-  </g>
-  <g style="fill:#646464">
-    <path d="m26 16h9v1h-9z"/>
-    <path d="m26 18h5v1h-5z"/>
-    <path d="m26 20h7v1h-7z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.png
deleted file mode 100644
index ac802f7c5..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.svg
deleted file mode 100644
index 88697196f..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/solarplant.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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="16.3333" cy="15.1667" r="43.6679" gradientUnits="userSpaceOnUse">
-      <stop style="stop-color:#6c9ac2"/>
-      <stop offset="1" style="stop-color:#005096"/>
-    </radialGradient>
-  </defs>
-  <path d="m2.5 2.5h59v59h-59z" style="fill:#ececed"/>
-  <path d="M61,3v58H3V3H61 M62,2H2v60h60V2L62,2z" style="fill:#9b9c9e"/>
-  <path d="m5 5h54v54h-54z" style="fill:url(#0)"/>
-  <g style="fill:#ececed">
-    <path d="m15 3h1v58h-1z"/>
-    <path d="m7 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m12 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m18 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m23 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m29 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m34 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m40 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m45 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m51 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m56 3h1v58h-1z" style="opacity:.25"/>
-    <path d="m26 3h1v58h-1z"/>
-    <path d="m48 3h1v58h-1z"/>
-    <path d="m37 3h1v58h-1z"/>
-    <path d="m3 48h58v1h-58z"/>
-    <path d="m3 37h58v1h-58z"/>
-    <path d="m3 26h58v1h-58z"/>
-    <path d="m3 15h58v1h-58z"/>
-    <g style="stroke-width:.99999041">
-      <path d="m15.5 13.3785h1.5v3h-3z"/>
-      <path d="m26.4999 13.3784h1.5001v3h-3z"/>
-      <path d="m37.4999 13.3783h1.5001v3h-3z"/>
-      <path d="m48.4998 13.3783h1.5002v3h-3z"/>
-      <path d="m15.5001 24.3784h1.4999v3h-3z"/>
-      <path d="m26.5 24.3783h1.5v3h-3z"/>
-      <path d="m37.4999 24.3783h1.5001v3h-3z"/>
-      <path d="m48.4999 24.3782h1.5001v3h-3z"/>
-      <path d="m15.5002 35.3783h1.4998v3h-3z"/>
-      <path d="m26.5001 35.3783h1.4999v3h-3z"/>
-      <path d="m35.3782 37.5h3.6218v3h-3z"/>
-      <path d="m46.3781 37.5001h3.6219v3h-3z"/>
-      <path d="m15.5002 46.3783h1.4998v3h-3z"/>
-      <path d="m26.5002 46.3782h1.4998v3h-3z"/>
-      <path d="m37.5001 46.3781h1.4999v3h-3z"/>
-      <path d="m48.5 46.378h1.5v3h-3z"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.png
deleted file mode 100644
index 00b7c73b4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.svg
deleted file mode 100644
index c4c6a8fd4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-0.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.png
deleted file mode 100644
index a002d09ae..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.svg
deleted file mode 100644
index 46125af69..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-100.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m37.18 25.24c.22 0 .33.04.36.06l.04.02.04.02c1.32.51 2.35 1.36 3.16 2.62.82 1.26 1.22 2.58 1.22 4.04 0 1.46-.4 2.77-1.21 4.03-.81 1.25-1.85 2.11-3.17 2.64l-.04.02-.04.02c-.03.02-.14.06-.36.06-.3 0-.53-.1-.76-.31-.22-.21-.31-.44-.31-.76 0-.29.09-.43.16-.51.19-.23.42-.43.69-.6.39-.24.78-.5 1.17-.79.49-.36.9-.86 1.23-1.49.33-.64.5-1.41.5-2.31 0-.89-.17-1.67-.5-2.31-.33-.63-.74-1.13-1.23-1.49-.39-.28-.78-.55-1.17-.79-.27-.17-.51-.37-.69-.6-.07-.08-.16-.22-.16-.51 0-.31.1-.55.31-.76.22-.21.46-.3.76-.3m0-1c-.56 0-1.05.2-1.46.6-.41.4-.61.89-.61 1.47 0 .45.13.84.39 1.15.26.31.57.58.94.81.37.23.73.47 1.1.74.37.27.68.65.94 1.15.26.5.39 1.11.39 1.84 0 .73-.13 1.35-.39 1.84-.26.5-.57.88-.94 1.15-.37.27-.73.52-1.1.74-.37.23-.68.5-.94.81-.26.31-.39.7-.39 1.15 0 .58.2 1.07.61 1.47.41.4.89.6 1.46.6.32 0 .59-.05.81-.16 1.51-.6 2.72-1.61 3.64-3.02.91-1.42 1.37-2.94 1.37-4.58s-.46-3.17-1.37-4.59c-.92-1.42-2.13-2.43-3.64-3.01-.22-.11-.49-.16-.81-.16z"/>
-  <path d="m40.16 46.9c-.45 0-.82-.15-1.13-.47-.32-.31-.47-.68-.47-1.1 0-.65.31-1.12.99-1.46 1.24-.64 2.07-1.12 2.53-1.47 1.65-1.2 2.96-2.74 3.88-4.56.93-1.82 1.4-3.79 1.4-5.84s-.47-4.02-1.4-5.84c-.93-1.82-2.23-3.35-3.89-4.56-.45-.34-1.28-.82-2.52-1.46-.68-.35-.99-.81-.99-1.46 0-.43.15-.79.47-1.1.31-.32.68-.47 1.1-.47.22 0 .44.04.66.13 2.9 1.22 5.27 3.21 7.04 5.91 1.77 2.7 2.67 5.68 2.67 8.86s-.9 6.17-2.67 8.86c-1.77 2.7-4.14 4.68-7.06 5.91-.2.07-.41.12-.61.12" style="fill:#282828"/>
-  <path d="m40.13 17.6c.16 0 .32.03.45.08 2.82 1.19 5.12 3.11 6.83 5.72 1.72 2.62 2.59 5.51 2.59 8.6s-.87 5.98-2.59 8.59c-1.71 2.61-4.01 4.54-6.8 5.71-.16.06-.32.1-.45.1-.32 0-.56-.1-.78-.32-.22-.22-.32-.45-.32-.75 0-.34.09-.7.72-1.02 1.27-.66 2.12-1.15 2.59-1.5 1.72-1.25 3.08-2.85 4.04-4.74.96-1.89 1.45-3.93 1.45-6.07s-.49-4.17-1.45-6.07c-.96-1.89-2.32-3.48-4.03-4.73-.48-.36-1.33-.85-2.6-1.51-.63-.32-.72-.68-.72-1.02 0-.3.1-.53.32-.75.22-.22.46-.32.75-.32m0-1c-.56 0-1.05.2-1.46.61-.41.41-.61.89-.61 1.46 0 .84.42 1.48 1.26 1.91 1.21.63 2.03 1.1 2.46 1.42 1.6 1.16 2.84 2.63 3.74 4.38.89 1.76 1.34 3.63 1.34 5.61s-.45 3.85-1.34 5.61c-.89 1.76-2.14 3.22-3.74 4.38-.43.32-1.25.8-2.46 1.42-.84.43-1.26 1.07-1.26 1.91 0 .56.2 1.05.61 1.46.41.41.91.61 1.49.61.26 0 .53-.05.81-.16 3.02-1.27 5.45-3.3 7.28-6.1 1.83-2.77 2.75-5.82 2.75-9.12s-.92-6.35-2.75-9.14c-1.83-2.79-4.26-4.83-7.28-6.1-.28-.1-.56-.16-.84-.16z"/>
-  <path d="m43.12 54.5c-.43 0-.79-.15-1.1-.47s-.47-.68-.47-1.1c0-.59.33-1.08 1.02-1.48.13-.08.36-.18.67-.31.36-.15.62-.27.78-.37 1-.54 1.91-1.11 2.7-1.68 2.71-2 4.85-4.53 6.36-7.52 1.52-2.99 2.29-6.21 2.29-9.57s-.77-6.58-2.29-9.57c-1.52-2.99-3.66-5.52-6.36-7.52-.79-.57-1.7-1.14-2.71-1.69-.15-.09-.41-.21-.77-.36-.31-.13-.53-.23-.67-.31-.68-.4-1.01-.88-1.01-1.47 0-.43.15-.79.47-1.1s.68-.47 1.1-.47c.22 0 .44.04.66.13 4.42 1.91 8.02 4.93 10.7 8.98 2.67 4.05 4.03 8.55 4.03 13.39s-1.35 9.34-4.03 13.39c-2.67 4.05-6.28 7.07-10.71 8.99-.22.07-.45.11-.66.11" style="fill:#282828"/>
-  <path d="m43.12 10c.16 0 .32.03.45.08 4.35 1.87 7.88 4.84 10.5 8.8 2.6 3.97 3.93 8.38 3.93 13.12 0 4.74-1.33 9.15-3.94 13.12-2.62 3.97-6.15 6.93-10.46 8.79-.17.06-.32.1-.48.1-.3 0-.53-.1-.75-.32-.22-.22-.32-.45-.32-.75 0-.28.09-.64.76-1.04.06-.04.23-.12.62-.29.38-.16.65-.29.82-.38 1.02-.56 1.95-1.13 2.77-1.72 2.77-2.05 4.96-4.64 6.51-7.69 1.55-3.06 2.34-6.36 2.34-9.8s-.79-6.74-2.34-9.8c-1.55-3.06-3.74-5.65-6.52-7.7-.81-.58-1.74-1.16-2.74-1.71-.19-.11-.46-.24-.84-.39-.39-.16-.55-.25-.61-.28-.68-.4-.77-.77-.77-1.05 0-.3.1-.53.32-.75.22-.24.45-.34.75-.34m0-1c-.56 0-1.05.2-1.46.61-.41.41-.61.89-.61 1.46 0 .78.42 1.41 1.26 1.91.15.09.39.2.73.34.33.14.58.25.73.34.99.54 1.88 1.09 2.65 1.65 2.65 1.96 4.72 4.41 6.21 7.34 1.49 2.93 2.23 6.05 2.23 9.35s-.74 6.42-2.23 9.35c-1.49 2.93-3.56 5.38-6.21 7.34-.78.56-1.66 1.11-2.65 1.65-.15.09-.39.2-.73.34-.33.14-.58.25-.73.34-.84.5-1.26 1.13-1.26 1.91 0 .56.2 1.05.61 1.46.41.41.9.61 1.46.61.28 0 .56-.05.84-.16 4.55-1.96 8.2-5.02 10.93-9.17 2.74-4.15 4.11-8.71 4.11-13.67 0-4.96-1.37-9.52-4.11-13.67-2.74-4.15-6.38-7.21-10.93-9.17-.28-.11-.56-.16-.84-.16z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.png
deleted file mode 100644
index 558b351bd..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.svg
deleted file mode 100644
index b5a53de61..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-33.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m37.18 25.24c.22 0 .33.04.36.06l.04.02.04.02c1.32.51 2.35 1.36 3.16 2.62.82 1.26 1.22 2.58 1.22 4.04 0 1.46-.4 2.77-1.21 4.03-.81 1.25-1.85 2.11-3.17 2.64l-.04.02-.04.02c-.03.02-.14.06-.36.06-.3 0-.53-.1-.76-.31-.22-.21-.31-.44-.31-.76 0-.29.09-.43.16-.51.19-.23.42-.43.69-.6.39-.24.78-.5 1.17-.79.49-.36.9-.86 1.23-1.49.33-.64.5-1.41.5-2.31s-.17-1.67-.5-2.31c-.33-.63-.74-1.13-1.23-1.49-.39-.28-.78-.55-1.17-.79-.27-.17-.51-.37-.69-.6-.07-.08-.16-.22-.16-.51 0-.31.1-.55.31-.76.22-.21.46-.3.76-.3m0-1c-.56 0-1.05.2-1.46.6-.41.4-.61.89-.61 1.47 0 .45.13.84.39 1.15.26.31.57.58.94.81.37.23.73.47 1.1.74.37.27.68.65.94 1.15.26.5.39 1.11.39 1.84s-.13 1.35-.39 1.84c-.26.5-.57.88-.94 1.15-.37.27-.73.52-1.1.74s-.68.5-.94.81-.39.7-.39 1.15c0 .58.2 1.07.61 1.47.41.4.89.6 1.46.6.32 0 .59-.05.81-.16 1.51-.6 2.72-1.61 3.64-3.02s1.37-2.94 1.37-4.58-.46-3.17-1.37-4.59c-.92-1.42-2.13-2.43-3.64-3.01-.22-.11-.49-.16-.81-.16z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.png
deleted file mode 100644
index f78db4712..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.svg
deleted file mode 100644
index 08fcbabf7..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume-66.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="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"/>
-  <path d="m37.18 25.24c.22 0 .33.04.36.06l.04.02.04.02c1.32.51 2.35 1.36 3.16 2.62.82 1.26 1.22 2.58 1.22 4.04 0 1.46-.4 2.77-1.21 4.03-.81 1.25-1.85 2.11-3.17 2.64l-.04.02-.04.02c-.03.02-.14.06-.36.06-.3 0-.53-.1-.76-.31-.22-.21-.31-.44-.31-.76 0-.29.09-.43.16-.51.19-.23.42-.43.69-.6.39-.24.78-.5 1.17-.79.49-.36.9-.86 1.23-1.49.33-.64.5-1.41.5-2.31 0-.89-.17-1.67-.5-2.31-.33-.63-.74-1.13-1.23-1.49-.39-.28-.78-.55-1.17-.79-.27-.17-.51-.37-.69-.6-.07-.08-.16-.22-.16-.51 0-.31.1-.55.31-.76.22-.21.46-.3.76-.3m0-1c-.56 0-1.05.2-1.46.6-.41.4-.61.89-.61 1.47 0 .45.13.84.39 1.15.26.31.57.58.94.81.37.23.73.47 1.1.74.37.27.68.65.94 1.15.26.5.39 1.11.39 1.84 0 .73-.13 1.35-.39 1.84-.26.5-.57.88-.94 1.15-.37.27-.73.52-1.1.74-.37.23-.68.5-.94.81-.26.31-.39.7-.39 1.15 0 .58.2 1.07.61 1.47.41.4.89.6 1.46.6.32 0 .59-.05.81-.16 1.51-.6 2.72-1.61 3.64-3.02s1.37-2.94 1.37-4.58-.46-3.17-1.37-4.59c-.92-1.42-2.13-2.43-3.64-3.01-.22-.11-.49-.16-.81-.16z"/>
-  <path d="m40.16 46.9c-.45 0-.82-.15-1.13-.47-.32-.31-.47-.68-.47-1.1 0-.65.31-1.12.99-1.46 1.24-.64 2.07-1.12 2.53-1.47 1.65-1.2 2.96-2.74 3.88-4.56.93-1.82 1.4-3.79 1.4-5.84s-.47-4.02-1.4-5.84c-.93-1.82-2.23-3.35-3.89-4.56-.45-.34-1.28-.82-2.52-1.46-.68-.35-.99-.81-.99-1.46 0-.43.15-.79.47-1.1.31-.32.68-.47 1.1-.47.22 0 .44.04.66.13 2.9 1.22 5.27 3.21 7.04 5.91 1.77 2.7 2.67 5.68 2.67 8.86s-.9 6.17-2.67 8.86c-1.77 2.7-4.14 4.68-7.06 5.91-.2.07-.41.12-.61.12" style="fill:#282828"/>
-  <path d="m40.13 17.6c.16 0 .32.03.45.08 2.82 1.19 5.12 3.11 6.83 5.72 1.72 2.62 2.59 5.51 2.59 8.6s-.87 5.98-2.59 8.59c-1.71 2.61-4.01 4.54-6.8 5.71-.16.06-.32.1-.45.1-.32 0-.56-.1-.78-.32-.22-.22-.32-.45-.32-.75 0-.34.09-.7.72-1.02 1.27-.66 2.12-1.15 2.59-1.5 1.72-1.25 3.08-2.85 4.04-4.74.96-1.89 1.45-3.93 1.45-6.07s-.49-4.17-1.45-6.07c-.96-1.89-2.32-3.48-4.03-4.73-.48-.36-1.33-.85-2.6-1.51-.63-.32-.72-.68-.72-1.02 0-.3.1-.53.32-.75.22-.22.46-.32.75-.32m0-1c-.56 0-1.05.2-1.46.61-.41.41-.61.89-.61 1.46 0 .84.42 1.48 1.26 1.91 1.21.63 2.03 1.1 2.46 1.42 1.6 1.16 2.84 2.63 3.74 4.38.89 1.76 1.34 3.63 1.34 5.61s-.45 3.85-1.34 5.61c-.89 1.76-2.14 3.22-3.74 4.38-.43.32-1.25.8-2.46 1.42-.84.43-1.26 1.07-1.26 1.91 0 .56.2 1.05.61 1.46.41.41.91.61 1.49.61.26 0 .53-.05.81-.16 3.02-1.27 5.45-3.3 7.28-6.1 1.83-2.77 2.75-5.82 2.75-9.12s-.92-6.35-2.75-9.14c-1.83-2.79-4.26-4.83-7.28-6.1-.28-.1-.56-.16-.84-.16z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.png
deleted file mode 100644
index a002d09ae..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.svg
deleted file mode 100644
index 46125af69..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m37.18 25.24c.22 0 .33.04.36.06l.04.02.04.02c1.32.51 2.35 1.36 3.16 2.62.82 1.26 1.22 2.58 1.22 4.04 0 1.46-.4 2.77-1.21 4.03-.81 1.25-1.85 2.11-3.17 2.64l-.04.02-.04.02c-.03.02-.14.06-.36.06-.3 0-.53-.1-.76-.31-.22-.21-.31-.44-.31-.76 0-.29.09-.43.16-.51.19-.23.42-.43.69-.6.39-.24.78-.5 1.17-.79.49-.36.9-.86 1.23-1.49.33-.64.5-1.41.5-2.31 0-.89-.17-1.67-.5-2.31-.33-.63-.74-1.13-1.23-1.49-.39-.28-.78-.55-1.17-.79-.27-.17-.51-.37-.69-.6-.07-.08-.16-.22-.16-.51 0-.31.1-.55.31-.76.22-.21.46-.3.76-.3m0-1c-.56 0-1.05.2-1.46.6-.41.4-.61.89-.61 1.47 0 .45.13.84.39 1.15.26.31.57.58.94.81.37.23.73.47 1.1.74.37.27.68.65.94 1.15.26.5.39 1.11.39 1.84 0 .73-.13 1.35-.39 1.84-.26.5-.57.88-.94 1.15-.37.27-.73.52-1.1.74-.37.23-.68.5-.94.81-.26.31-.39.7-.39 1.15 0 .58.2 1.07.61 1.47.41.4.89.6 1.46.6.32 0 .59-.05.81-.16 1.51-.6 2.72-1.61 3.64-3.02.91-1.42 1.37-2.94 1.37-4.58s-.46-3.17-1.37-4.59c-.92-1.42-2.13-2.43-3.64-3.01-.22-.11-.49-.16-.81-.16z"/>
-  <path d="m40.16 46.9c-.45 0-.82-.15-1.13-.47-.32-.31-.47-.68-.47-1.1 0-.65.31-1.12.99-1.46 1.24-.64 2.07-1.12 2.53-1.47 1.65-1.2 2.96-2.74 3.88-4.56.93-1.82 1.4-3.79 1.4-5.84s-.47-4.02-1.4-5.84c-.93-1.82-2.23-3.35-3.89-4.56-.45-.34-1.28-.82-2.52-1.46-.68-.35-.99-.81-.99-1.46 0-.43.15-.79.47-1.1.31-.32.68-.47 1.1-.47.22 0 .44.04.66.13 2.9 1.22 5.27 3.21 7.04 5.91 1.77 2.7 2.67 5.68 2.67 8.86s-.9 6.17-2.67 8.86c-1.77 2.7-4.14 4.68-7.06 5.91-.2.07-.41.12-.61.12" style="fill:#282828"/>
-  <path d="m40.13 17.6c.16 0 .32.03.45.08 2.82 1.19 5.12 3.11 6.83 5.72 1.72 2.62 2.59 5.51 2.59 8.6s-.87 5.98-2.59 8.59c-1.71 2.61-4.01 4.54-6.8 5.71-.16.06-.32.1-.45.1-.32 0-.56-.1-.78-.32-.22-.22-.32-.45-.32-.75 0-.34.09-.7.72-1.02 1.27-.66 2.12-1.15 2.59-1.5 1.72-1.25 3.08-2.85 4.04-4.74.96-1.89 1.45-3.93 1.45-6.07s-.49-4.17-1.45-6.07c-.96-1.89-2.32-3.48-4.03-4.73-.48-.36-1.33-.85-2.6-1.51-.63-.32-.72-.68-.72-1.02 0-.3.1-.53.32-.75.22-.22.46-.32.75-.32m0-1c-.56 0-1.05.2-1.46.61-.41.41-.61.89-.61 1.46 0 .84.42 1.48 1.26 1.91 1.21.63 2.03 1.1 2.46 1.42 1.6 1.16 2.84 2.63 3.74 4.38.89 1.76 1.34 3.63 1.34 5.61s-.45 3.85-1.34 5.61c-.89 1.76-2.14 3.22-3.74 4.38-.43.32-1.25.8-2.46 1.42-.84.43-1.26 1.07-1.26 1.91 0 .56.2 1.05.61 1.46.41.41.91.61 1.49.61.26 0 .53-.05.81-.16 3.02-1.27 5.45-3.3 7.28-6.1 1.83-2.77 2.75-5.82 2.75-9.12s-.92-6.35-2.75-9.14c-1.83-2.79-4.26-4.83-7.28-6.1-.28-.1-.56-.16-.84-.16z"/>
-  <path d="m43.12 54.5c-.43 0-.79-.15-1.1-.47s-.47-.68-.47-1.1c0-.59.33-1.08 1.02-1.48.13-.08.36-.18.67-.31.36-.15.62-.27.78-.37 1-.54 1.91-1.11 2.7-1.68 2.71-2 4.85-4.53 6.36-7.52 1.52-2.99 2.29-6.21 2.29-9.57s-.77-6.58-2.29-9.57c-1.52-2.99-3.66-5.52-6.36-7.52-.79-.57-1.7-1.14-2.71-1.69-.15-.09-.41-.21-.77-.36-.31-.13-.53-.23-.67-.31-.68-.4-1.01-.88-1.01-1.47 0-.43.15-.79.47-1.1s.68-.47 1.1-.47c.22 0 .44.04.66.13 4.42 1.91 8.02 4.93 10.7 8.98 2.67 4.05 4.03 8.55 4.03 13.39s-1.35 9.34-4.03 13.39c-2.67 4.05-6.28 7.07-10.71 8.99-.22.07-.45.11-.66.11" style="fill:#282828"/>
-  <path d="m43.12 10c.16 0 .32.03.45.08 4.35 1.87 7.88 4.84 10.5 8.8 2.6 3.97 3.93 8.38 3.93 13.12 0 4.74-1.33 9.15-3.94 13.12-2.62 3.97-6.15 6.93-10.46 8.79-.17.06-.32.1-.48.1-.3 0-.53-.1-.75-.32-.22-.22-.32-.45-.32-.75 0-.28.09-.64.76-1.04.06-.04.23-.12.62-.29.38-.16.65-.29.82-.38 1.02-.56 1.95-1.13 2.77-1.72 2.77-2.05 4.96-4.64 6.51-7.69 1.55-3.06 2.34-6.36 2.34-9.8s-.79-6.74-2.34-9.8c-1.55-3.06-3.74-5.65-6.52-7.7-.81-.58-1.74-1.16-2.74-1.71-.19-.11-.46-.24-.84-.39-.39-.16-.55-.25-.61-.28-.68-.4-.77-.77-.77-1.05 0-.3.1-.53.32-.75.22-.24.45-.34.75-.34m0-1c-.56 0-1.05.2-1.46.61-.41.41-.61.89-.61 1.46 0 .78.42 1.41 1.26 1.91.15.09.39.2.73.34.33.14.58.25.73.34.99.54 1.88 1.09 2.65 1.65 2.65 1.96 4.72 4.41 6.21 7.34 1.49 2.93 2.23 6.05 2.23 9.35s-.74 6.42-2.23 9.35c-1.49 2.93-3.56 5.38-6.21 7.34-.78.56-1.66 1.11-2.65 1.65-.15.09-.39.2-.73.34-.33.14-.58.25-.73.34-.84.5-1.26 1.13-1.26 1.91 0 .56.2 1.05.61 1.46.41.41.9.61 1.46.61.28 0 .56-.05.84-.16 4.55-1.96 8.2-5.02 10.93-9.17 2.74-4.15 4.11-8.71 4.11-13.67 0-4.96-1.37-9.52-4.11-13.67-2.74-4.15-6.38-7.21-10.93-9.17-.28-.11-.56-.16-.84-.16z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.png
deleted file mode 100644
index 0cf4440c9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.svg
deleted file mode 100644
index 701785d15..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/soundvolume_mute.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="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"/>
-  <path d="m55.54 22.1l1.41 1.41-7.78 7.78-.7.71.71.71 7.78 7.78-1.41 1.41-7.78-7.78-.71-.71-.71.71-7.78 7.78-1.41-1.41 7.78-7.78.7-.71-.71-.71-7.78-7.78 1.41-1.41 7.78 7.78.71.71.71-.71 7.78-7.78m0-1.41l-8.49 8.49-8.49-8.49-2.83 2.83 8.5 8.48-8.49 8.49 2.83 2.83 8.49-8.49 8.49 8.49 2.83-2.83-8.5-8.49 8.49-8.49-2.83-2.82z"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.png
deleted file mode 100644
index fe4661d3e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.svg
deleted file mode 100644
index 554924513..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/status.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m35 6c0 0-4.33-.08-5 2s-.42 26 8 26 5 0 5 0-3.65 0 4.77 0 8.67-23.92 8-26c-.67-2.08-5-2-5-2" style="fill:none;stroke-miterlimit:10;stroke:#b4b4b4"/>
-  <g style="fill:#1a171b">
-    <ellipse cx="35.5" cy="6.5" rx="3.5" ry="2.5"/>
-    <ellipse cx="50.5" cy="6.5" rx="3.5" ry="2.5"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.png
deleted file mode 100644
index 87ae7c25a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.svg
deleted file mode 100644
index 0f6014834..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/suitcase.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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="4" gradientUnits="userSpaceOnUse" y1="57" x2="0" y2="12">
-      <stop style="stop-color:#a35c48"/>
-      <stop offset="1" style="stop-color:#cd814c"/>
-    </linearGradient>
-    <linearGradient id="5" gradientUnits="userSpaceOnUse" x1="56.5858" y1="17.4142" x2="61.3284" y2="12.6716" xlink:href="#3"/>
-    <linearGradient id="3" gradientUnits="userSpaceOnUse" y1="18" x2="0" y2="11.5">
-      <stop style="stop-color:#4d2c19"/>
-      <stop offset="1" style="stop-color:#793b20"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="57.5" x2="0" y2="11.5" xlink:href="#3"/>
-    <linearGradient id="0" gradientUnits="userSpaceOnUse" x1="3.6716" y1="56.3284" x2="8.4142" y2="51.5858" xlink:href="#3"/>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="55.7925" y1="55.4996" x2="62.4297" y2="52.4046" xlink:href="#3"/>
-  </defs>
-  <path d="m39 18h-14c-1.1 0-2-.9-2-2v-6c0-1.66 1.34-3 3-3h12c1.66 0 3 1.34 3 3v6c0 1.1-.9 2-2 2" style="fill:#4b2b1e"/>
-  <path d="m37 20h-10c-.55 0-1-.45-1-1v-8c0-1.1.9-2 2-2h8c1.1 0 2 .9 2 2v8c0 .55-.45 1-1 1" style="fill:#f3f3f3"/>
-  <path d="m56 57h-47c-3.31 0-6-2.69-6-6v-33c0-3.31 2.69-6 6-6h47c3.31 0 6 2.69 6 6v33c0 3.31-2.69 6-6 6" style="fill:url(#4)"/>
-  <path d="m7 18h-2.5c-1.1 0-2-.9-2-2v-.5c0-2.21 1.79-4 4-4h.5c1.1 0 2 .9 2 2v2.5c0 1.1-.9 2-2 2" style="fill:url(#3)"/>
-  <path d="m60.5 18h-2.5c-1.1 0-2-.9-2-2v-2.5c0-1.1.9-2 2-2h.5c2.21 0 4 1.79 4 4v.5c0 1.1-.9 2-2 2" style="fill:url(#5)"/>
-  <path d="m58.5 57.5h-.5c-1.1 0-2-.9-2-2v-2.5c0-1.1.9-2 2-2h2.5c1.1 0 2 .9 2 2v.5c0 2.21-1.79 4-4 4" style="fill:url(#2)"/>
-  <path d="m7 57.5h-.5c-2.21 0-4-1.79-4-4v-.5c0-1.1.9-2 2-2h2.5c1.1 0 2 .9 2 2v2.5c0 1.1-.9 2-2 2" style="fill:url(#0)"/>
-  <path d="m14 11.5h4v46h-4z" style="fill:url(#1)"/>
-  <g style="fill:#4d2c19">
-    <path d="m10 27h12v2h-12z"/>
-    <path d="m42 27h12v2h-12z"/>
-  </g>
-  <path d="m46 11.5h4v46h-4z" style="fill:url(#1)"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.png
deleted file mode 100644
index 8cde0aa64..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.svg
deleted file mode 100644
index 391a7a31a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="31.99981448" cy="31.99994737" r="30.99998789" gradientUnits="userSpaceOnUse">
-      <stop offset=".8" style="stop-color:#f8f5e5;stop-opacity:0"/>
-      <stop offset=".8" style="stop-color:#ffde52;stop-opacity:.2"/>
-      <stop offset="1" style="stop-color:#ffde52;stop-opacity:0"/>
-    </radialGradient>
-  </defs>
-  <circle cx="32" cy="32" r="31" style="fill:url(#0)"/>
-  <circle cx="32" cy="32" r="23" style="fill:#ffde52"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.png
deleted file mode 100644
index 8a63263cb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.svg
deleted file mode 100644
index 84d8de4b4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sun_clouds.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="33" cy="30" r="25" gradientUnits="userSpaceOnUse">
-      <stop offset=".8" style="stop-color:#f8f5e5;stop-opacity:0"/>
-      <stop offset=".8" style="stop-color:#ffde52;stop-opacity:.2"/>
-      <stop offset="1" style="stop-color:#ffde52;stop-opacity:0"/>
-    </radialGradient>
-  </defs>
-  <circle cx="33" cy="30" r="25" style="fill:url(#0)"/>
-  <circle cx="33" cy="30" r="18" style="fill:#ffde52"/>
-  <g style="fill:#d9f1ff;stroke-miterlimit:10;stroke:#7aadcc;stroke-linejoin:bevel">
-    <path d="m25.98 44.7c.01-.07.02-.13.02-.2 0-2.49-4.03-4.5-9-4.5s-9 2.01-9 4.5c0 .4.11.78.31 1.15-2.57.86-4.31 2.49-4.31 4.35 0 2.76 3.81 5 8.5 5 3.09 0 5.78-.97 7.27-2.42.83.27 1.75.42 2.73.42 3.59 0 6.5-2.01 6.5-4.5 0-1.6-1.21-3-3.02-3.8z"/>
-    <path d="m59 44.5c0-3.04-2.46-5.5-5.5-5.5-.71 0-1.39.14-2.02.39-1.37-1.45-3.54-2.39-5.98-2.39-.75 0-1.47.09-2.15.25-1.37-1.37-3.48-2.25-5.85-2.25-3.27 0-6.04 1.67-7.07 4-4.11.03-7.43 2.7-7.43 6s3.32 5.97 7.43 6c1.03 2.33 3.8 4 7.07 4 1.69 0 3.25-.45 4.5-1.21 1.25.76 2.81 1.21 4.5 1.21 3.72 0 6.81-2.17 7.39-5.02 2.86-.2 5.11-2.57 5.11-5.48z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.png
deleted file mode 100644
index f59062258..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.svg
deleted file mode 100644
index 7caff13a4..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunrise.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="64" x2="0">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".1" style="stop-opacity:.6"/>
-      <stop offset=".9" style="stop-opacity:.6"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m0 44h64v1h-64z" style="fill:url(#0)"/>
-  <path d="m32 19c-13.81 0-25 11.19-25 25h50c0-13.81-11.19-25-25-25" style="fill:#ffd833"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.png
deleted file mode 100644
index 340411530..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.svg
deleted file mode 100644
index e238d1de6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/sunset.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="0" x2="64">
-      <stop style="stop-color:#fff;stop-opacity:0"/>
-      <stop offset=".1"/>
-      <stop offset=".9"/>
-      <stop offset="1" style="stop-color:#fff;stop-opacity:0"/>
-    </linearGradient>
-  </defs>
-  <path d="m0 19h64v1h-64z" style="fill:url(#0)"/>
-  <path d="M32,45c13.81,0,25-11.19,25-25H7C7,33.81,18.19,45,32,45z" style="fill:#ff8d27"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.png
deleted file mode 100644
index 80091fa02..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.svg
deleted file mode 100644
index 714172c87..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-off.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="54.364" y1="9.636" x2="9.636" y2="54.364">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="49.7525" y1="42.0381" x2="14.7475" y2="21.8279" xlink:href="#0"/>
-  </defs>
-  <path d="m48 57h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9z" style="fill:url(#0);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#1)"/>
-  <path d="m44 47h-24c-2.76 0-5-2.24-5-5l1-21c0-2.76 2.24-5 5-5h22c2.76 0 5 2.24 5 5l1 21c0 2.76-2.24 5-5 5z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.png
deleted file mode 100644
index eef0e9bbe..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.svg
deleted file mode 100644
index 920b7bba5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch-on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="54.364" y1="9.636" x2="9.636" y2="54.364">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="49.2525" y1="42.1721" x2="14.2475" y2="21.9619" xlink:href="#0"/>
-  </defs>
-  <path d="m16 7h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9z" style="fill:url(#0);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#1)"/>
-  <path d="m20 17h24c2.76 0 5 2.24 5 5l-1 21c0 2.76-2.24 5-5 5h-22c-2.76 0-5-2.24-5-5l-1-21c0-2.76 2.24-5 5-5z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.png
deleted file mode 100644
index 37dc380cf..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.svg
deleted file mode 100644
index 7f87bf14b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/switch.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="54.364" y1="9.636" x2="9.636" y2="54.364">
-      <stop style="stop-color:#f8f5e5"/>
-      <stop offset="1" style="stop-color:#cac7b9"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" y1="15" x2="0" y2="49">
-      <stop style="stop-color:#4e493f"/>
-      <stop offset=".7677" style="stop-color:#3b3732"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="49.344" y1="42.0136" x2="14.656" y2="21.9864" xlink:href="#0"/>
-  </defs>
-  <path d="m16 7h32c4.97 0 9 4.03 9 9v32c0 4.97-4.03 9-9 9h-32c-4.97 0-9-4.03-9-9v-32c0-4.97 4.03-9 9-9z" style="fill:url(#0);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-  <path d="m44 49h-24c-2.76 0-5-2.24-5-5v-24c0-2.76 2.24-5 5-5h24c2.76 0 5 2.24 5 5v24c0 2.76-2.24 5-5 5" style="fill:url(#1)"/>
-  <path d="m21 16h22c2.76 0 5 2.24 5 5v22c0 2.76-2.24 5-5 5h-22c-2.76 0-5-2.24-5-5v-22c0-2.76 2.24-5 5-5z" style="fill:url(#2);stroke-miterlimit:10;stroke:#7c715e;stroke-width:.25"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.png
deleted file mode 100644
index fe2019a76..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.svg
deleted file mode 100644
index dc5b049f5..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/television-on.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.png
deleted file mode 100644
index 15a1ff240..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.svg
deleted file mode 100644
index e8cc52c45..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/televison-off.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.png
deleted file mode 100644
index 46851d751..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.svg
deleted file mode 100644
index b6d434e2b..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
-  <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"/>
-  <path d="m27 6h10v48.94h-10z" style="fill:#c4cacc"/>
-  <circle cx="32" cy="55" r="9" style="fill:#dae1e4"/>
-  <g style="fill:#a34cb5">
-    <circle cx="32" cy="55" r="8"/>
-    <path d="m27 29h10v22h-10z"/>
-  </g>
-  <g style="fill:#fff">
-    <path d="m33 9h5v2h-5z"/>
-    <path d="m33 17h5v2h-5z"/>
-    <path d="m33 25h5v2h-5z"/>
-    <path d="m33 33h5v2h-5z"/>
-    <path d="m33 41h5v2h-5z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.png
deleted file mode 100644
index 785dc9ad4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.svg
deleted file mode 100644
index 610f1c560..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_cold.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
-  <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"/>
-  <path d="m27 6h10v48.94h-10z" style="fill:#c4cacc"/>
-  <circle cx="32" cy="55" r="9" style="fill:#dae1e4"/>
-  <g style="fill:#2e7de5">
-    <circle cx="32" cy="55" r="8"/>
-    <path d="m27 39h10v12h-10z"/>
-  </g>
-  <g style="fill:#fff">
-    <path d="m33 9h5v2h-5z"/>
-    <path d="m33 17h5v2h-5z"/>
-    <path d="m33 25h5v2h-5z"/>
-    <path d="m33 33h5v2h-5z"/>
-    <path d="m33 41h5v2h-5z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.png
deleted file mode 100644
index 2f620cb2e..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.svg
deleted file mode 100644
index cae85bf4e..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/temperature_hot.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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">
-    <circle cx="32" cy="55" r="9"/>
-    <circle cx="32" cy="6" r="6"/>
-  </g>
-  <circle cx="32" cy="6" r="5" style="fill:#d20014"/>
-  <path d="m26 6h12v50h-12z" style="fill:#dae1e4"/>
-  <g style="fill:#d20014">
-    <path d="m27 6h10v48.94h-10z"/>
-    <circle cx="32" cy="55" r="8"/>
-  </g>
-  <g style="fill:#fff">
-    <path d="m33 9h5v2h-5z"/>
-    <path d="m33 17h5v2h-5z"/>
-    <path d="m33 25h5v2h-5z"/>
-    <path d="m33 33h5v2h-5z"/>
-    <path d="m33 41h5v2h-5z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.png
deleted file mode 100644
index 0be2bf98f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.svg
deleted file mode 100644
index 2c9735e25..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/terrace.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="31" x2="33">
-      <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="24" x2="40" xlink:href="#0"/>
-  </defs>
-  <path d="m20.92 50.47v-1h-13.55v1.51h11.44c.68-.23 1.41-.39 2.11-.51" style="fill:#f9aa43"/>
-  <path d="m17.5 40.5h29v2h-29z" style="fill:#fff"/>
-  <path d="m46 41v1h-28v-1h28m1-1h-30v3h30v-3z" style="fill:#ccc"/>
-  <g style="fill:url(#0)">
-    <path d="m31 43h2v16h-2z"/>
-    <path d="m33 40h-2v-35.16c0-.55.45-1 1-1 .55 0 1 .45 1 1v35.16"/>
-  </g>
-  <path d="m24 59h16v1h-16z" style="fill:url(#1)"/>
-  <path d="m1 19.42c-.24 0-.44-.17-.49-.4s.08-.47.3-.56l31-12.92c.06-.03.12-.04.19-.04s.13.01.19.04l31 13c.22.09.34.33.3.56s-.25.4-.49.4l-62-.08" style="fill:#ffd45a"/>
-  <g style="fill:#f9aa43">
-    <path d="m32 6l31 13-62-.08 31-12.92m0-1c-.13 0-.26.03-.38.08l-31 12.92c-.44.18-.69.65-.6 1.12.09.47.5.8.98.8l62 .08c0 0 0 0 0 0 .48 0 .89-.34.98-.8.09-.47-.15-.94-.59-1.12l-31-13c-.13-.05-.26-.08-.39-.08z"/>
-    <path d="m2.69 31.5c0 0 .97.06 5.87 18.92v1.49l-4.14-7.73c0-.01-2.1-7.35-1.73-12.68"/>
-  </g>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#663014;stroke-linecap:round;stroke-linejoin:round">
-    <path d="m3.66 47.03c0 0 12.85-6.4 18.12 3.29-3.58.28-6.07 1.79-10.16 4.94s-10.12 4.24-10.12 4.24"/>
-    <path d="m2.39 31.88c0 0 .42 25.93 19.39 27.62"/>
-  </g>
-  <g style="fill:#f9aa43">
-    <path d="m43.08 50.47v-1h13.55v1.51h-11.44c-.68-.23-1.41-.39-2.11-.51"/>
-    <path d="m61.31 31.5c0 0-.97.06-5.87 18.92v1.49l4.14-7.73c0-.01 2.1-7.35 1.73-12.68"/>
-  </g>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#663014;stroke-linecap:round;stroke-linejoin:round">
-    <path d="m60.34 47.03c0 0-12.85-6.4-18.12 3.29 3.58.28 6.07 1.79 10.16 4.94s10.12 4.24 10.12 4.24"/>
-    <path d="m61.61 31.88c0 0-.42 25.93-19.39 27.62"/>
-  </g>
-  <g style="fill:#f9aa43">
-    <path d="m32 5l6 14h12z" style="opacity:.5"/>
-    <path d="m14 19h12l6-14z" style="opacity:.5"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.png
deleted file mode 100644
index 3ccc8bf5f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.svg
deleted file mode 100644
index d8c138243..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/text.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="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"/>
-  <path d="m15 6h30v3h-30z" style="fill:#787878"/>
-  <g style="fill:#505050">
-    <path d="m15 15h33v1h-33z"/>
-    <path d="m15 17h34v1h-34z"/>
-    <path d="m15 19h32v1h-32z"/>
-    <path d="m15 21h26v1h-26z"/>
-    <path d="m15 25h31v1h-31z"/>
-    <path d="m15 27h10v1h-10z"/>
-    <path d="m15 31h33v1h-33z"/>
-    <path d="m15 33h30v1h-30z"/>
-    <path d="m15 35h34v1h-34z"/>
-    <path d="m15 37h32v1h-32z"/>
-    <path d="m15 39h30v1h-30z"/>
-    <path d="m15 41h28v1h-28z"/>
-    <path d="m15 45h30v1h-30z"/>
-    <path d="m15 47h32v1h-32z"/>
-    <path d="m15 49h20v1h-20z"/>
-    <path d="m15 53h30v1h-30z"/>
-    <path d="m15 55h33v1h-33z"/>
-    <path d="m15 57h8v1h-8z"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.png
deleted file mode 100644
index 41446c3f8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.svg
deleted file mode 100644
index f9e1c3f18..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/toilet.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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" y1="8" x2="0" y2="16">
-      <stop style="stop-color:#dcdcdc"/>
-      <stop offset="1" style="stop-color:#646464"/>
-    </linearGradient>
-    <linearGradient id="1" gradientUnits="userSpaceOnUse" x1="1.251" x2="23.5496">
-      <stop style="stop-color:#fafafa"/>
-      <stop offset="1" style="stop-color:#dcdcdc"/>
-    </linearGradient>
-    <linearGradient id="2" gradientUnits="userSpaceOnUse" x1="18.375" x2="61.625">
-      <stop style="stop-color:#dcdcdc"/>
-      <stop offset=".5" style="stop-color:#fafafa"/>
-      <stop offset="1" style="stop-color:#dcdcdc"/>
-    </linearGradient>
-  </defs>
-  <path d="m6.49 58.78c-.83 0-1.49-.09-1.87-.15l.71-3.1-2.67-2.27 2.83-4.33-3.5-3 3.43-5.01-3.52-2.76 2.81-4.79-3.46-3.79 4.05-4.71-3.24-4.82c8.25-1.32 16.5-10.41 17.61-11.67h3.87c.02 3.31.05 27.87-4.4 40-3.31 9.05-9.35 10.4-12.65 10.4" style="fill:url(#1)"/>
-  <path d="m23.17 8.75c.02 4.45-.09 27.8-4.37 39.49-3.24 8.84-9.11 10.16-12.31 10.16-.57 0-1.05-.04-1.41-.09l.57-2.48.1-.45-.35-.3-2.25-1.91 2.47-3.78.36-.55-.5-.43-2.98-2.54 3.04-4.44.4-.58-.55-.43-2.99-2.35 2.5-4.27.28-.48-.38-.41-3.05-3.34 3.65-4.25.37-.43-.32-.47-2.76-4.11c7.95-1.61 15.7-9.93 17.15-11.56h3.33m.75-.75h-4.42c0 0-9.25 10.75-18.09 11.75l3.42 5.08-4.08 4.75 3.5 3.83-2.83 4.83 3.5 2.76-3.42 5 3.5 3-2.83 4.33 2.75 2.33-.75 3.25c0 0 .91.24 2.32.24 3.38 0 9.61-1.37 13.01-10.66 4.83-13.16 4.42-40.49 4.42-40.49z" style="fill:#828282"/>
-  <path d="M40,60.62c-11.92,0-21.62-4.77-21.62-10.62V12.38h43.25V50C61.62,55.86,51.92,60.62,40,60.62z" style="fill:url(#2)"/>
-  <path d="m61.25 12.75v37.25c0 5.56-9.73 10.25-21.25 10.25s-21.25-4.69-21.25-10.25v-37.25h42.5m.75-.75h-44v38c0 6.08 9.85 11 22 11s22-4.92 22-11v-38z" style="fill:#828282"/>
-  <path d="M40,22.62c-11.92,0-21.62-4.77-21.62-10.62S28.08,1.38,40,1.38S61.62,6.14,61.62,12S51.92,22.62,40,22.62z    " style="fill:#fafafa"/>
-  <path d="M40,1.75c11.52,0,21.25,4.69,21.25,10.25S51.52,22.25,40,22.25S18.75,17.56,18.75,12S28.48,1.75,40,1.75     M40,1C27.85,1,18,5.92,18,12s9.85,11,22,11s22-4.92,22-11S52.15,1,40,1L40,1z" style="fill:#828282"/>
-  <g style="stroke-miterlimit:10">
-    <ellipse cx="40" cy="12" rx="8" ry="4" style="fill:url(#0);stroke:#828282;stroke-width:.75"/>
-    <g style="fill:none;stroke:#aaa">
-      <path d="m31 22v.5"/>
-      <path d="m31 24.45v34.08" style="stroke-dasharray:0.9737 1.9474"/>
-      <path d="m31 59.5v.5"/>
-      <path d="m58 18v.5"/>
-      <path d="m58 20.45v34.08" style="stroke-dasharray:0.9737 1.9474"/>
-      <path d="m58 55.5v.5"/>
-    </g>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.png
deleted file mode 100644
index f46614034..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.svg
deleted file mode 100644
index 969fcc135..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/vacation.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="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="5" gradientUnits="userSpaceOnUse" x1="25.2326" x2="34.6551">
-      <stop style="stop-color:#4d2c19"/>
-      <stop offset="1" style="stop-color:#793b20"/>
-    </linearGradient>
-    <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(#6);stroke:url(#5)"/>
-    <g style="fill:none">
-      <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(#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"/>
-  <path d="m18.96 6.61l13.95 4.98.09.04.08-.03 5.96-1.99c9.75.38 12.07 8.21 12.58 10.89-.4-.48-.81-.95-1.24-1.42l-.13-.77-.08-.48-.34.34-.15.15c-6.75-7.02-12.03-7.22-12.61-7.22h-.08l-.33.02.1.31c1.38 4.23 2.2 8.54 2.45 12.81l-1.35.9-.5.33.59.12 1.33.27c.01.33.01.66.01.97l-1.35.27-.71.14.65.33 1.38.69c-.07 2.25-.3 3.86-.43 4.59-1.17-1.13-2.26-2.39-3.23-3.75l.63-1.67.24-.65-.6.34-1.16.66c-3.97-6.24-4.46-12.4-4.47-12.46l-.01-.19-.19-.04-5-1-.26-.05-.04.26c-1.23 7.99-8.64 12.58-10.46 13.6.1-1.04.23-2.07.37-3.06l1.5-1.31.78-.68-1 .25-1.04.26c1.75-10.12 5.17-11.77 5.2-11.79l.92-.4-1.01-.08c-.43-.03-.88-.05-1.33-.05-4.65 0-9.06 1.78-10.9 2.64 4.96-6.55 10.64-7.04 11.19-7.07m.04-.25c0 0-6.56.12-12 8 0 0 5.61-3.05 11.69-3.05.43 0 .87.02 1.31.05 0 0-3.63 1.58-5.41 12.35l1.41-.35-1.57 1.37c-.16 1.12-.31 2.32-.43 3.63 0 0 9.56-4.69 11-14l5 1c0 0 .46 6.34 4.64 12.78l1.36-.78-.67 1.79c1.02 1.44 2.23 2.86 3.67 4.21 0 0 .44-1.94.53-5.24l-1.53-.76 1.55-.31c0-.44 0-.9-.02-1.39l-1.53-.3 1.47-.98c-.2-3.58-.85-8.03-2.47-13.02 0 0 .02 0 .06 0 .63 0 5.86.22 12.61 7.33l.33-.33.14.84c.61.66 1.23 1.38 1.86 2.16 0 0-1.06-11.56-13-12l-6 2-14-5z" style="fill:#009949"/>
-  <path d="m61.64 21.84c-.87-.81-3-2.64-6.12-4.34l-.43-3.41-2.16 2.16c-.68-.29-1.41-.57-2.15-.83l.4-2.42-1.94 1.94c-.7-.2-1.41-.38-2.13-.53v-3.35l-2.89 2.89c-1.02-.11-2.05-.16-3.08-.16-1.71 0-3.45.15-5.18.45-2.83.49-5 .74-6.43.74-1.65 0-1.97-.33-2.02-.53-.18-.71 2.07-2.2 3.53-2.98.09-.08 5.85-5.74 12.97-5.74 7.11 0 13.03 5.42 17.63 16.11" style="fill:#083"/>
-  <path d="m44.02 5.86c6.92 0 12.73 5.21 17.27 15.5-1.05-.92-2.99-2.47-5.66-3.93l-.39-3.1-.06-.51-.36.36-1.92 1.92c-.64-.27-1.3-.53-1.98-.77l.32-1.93.13-.77-.55.55-1.61 1.61c-.65-.18-1.3-.35-1.97-.49v-2.94-.6l-.43.43-2.63 2.63c-1-.1-2.02-.16-3.03-.16-1.72 0-3.47.15-5.2.45-2.83.49-4.98.74-6.41.74-1.66 0-1.88-.33-1.9-.44-.13-.54 1.7-1.89 3.47-2.84l.03-.02.03-.03c.06-.04 5.79-5.66 12.85-5.66m0-.25c-7.25 0-13.02 5.75-13.02 5.75s-7.04 3.74-1.45 3.74c1.34 0 3.4-.21 6.45-.74 1.79-.31 3.51-.45 5.15-.45 1.08 0 2.12.06 3.13.17l2.72-2.72v3.15c.79.16 1.55.35 2.29.56l1.71-1.71-.36 2.14c.81.28 1.59.58 2.32.9l2.04-2.04.4 3.22c4.22 2.28 6.6 4.78 6.6 4.78-5.49-13.1-12.2-16.75-17.98-16.75z" style="fill:#2aaa00"/>
-  <path d="m22.71 10.64c-4.16 0-8.33-.39-12.4-1.17l2.27-2.59-3.98 2.28c-.71-.19-1.43-.36-2.09-.53l1.95-3.91-3.47 3.5c-1.45-.43-2.42-.77-2.78-.91 2.76-3.24 6.19-4.89 10.18-4.89 8.01 0 15.94 6.64 17.32 7.84-2.31.26-4.66.38-7 .38" style="fill:#083"/>
-  <path d="m12.39 2.55c7.61 0 15.18 6.05 17.02 7.63-2.21.23-4.46.35-6.7.35-4.08 0-8.17-.38-12.16-1.12l1.64-1.87.98-1.12-1.29.74-3.26 1.84c-.66-.14-1.31-.3-1.93-.45l1.54-3.07.7-1.4-1.1 1.11-2.87 2.88c-1.23-.36-2.1-.66-2.54-.82 2.72-3.12 6.07-4.7 9.97-4.7m0-.25c-3.62 0-7.27 1.33-10.39 5.06 0 0 1.08.44 3.03.99l2.97-2.99-1.67 3.35c.7.18 1.48.37 2.34.56l3.33-1.91-1.92 2.2c3.4.66 7.71 1.21 12.63 1.21 2.31 0 4.75-.12 7.29-.41 0 0-8.7-8.06-17.61-8.06z" style="fill:#2aaa00"/>
-  <path d="m16.13 41.18c.52-25.53 12.32-30.18 13.76-30.65.37 4.48.2 8.63-.5 12.35l-3.67 1.47 2.9 1.74c-.79 2.71-1.91 5.17-3.34 7.32l-3.6-2.41 2.17 4.35c-.17.21-.35.41-.52.61l-2.49-1.86.39 3.94c-2.38 2.04-4.51 2.92-5.1 3.14" style="fill:#16bf2e"/>
-  <path d="m29.78 10.7c.35 4.38.18 8.44-.5 12.08l-3.37 1.35-.47.19.43.26 2.6 1.56c-.77 2.62-1.86 5-3.22 7.09l-3.11-2.07-.78-.52.42.84 1.93 3.86c-.13.16-.26.31-.39.46l-2.17-1.62-.45-.34.06.57.36 3.59c-2.16 1.85-4.1 2.73-4.85 3.03.54-24.56 11.58-29.64 13.51-30.33m.22-.34c0 0-13.5 3.38-14 31 0 0 2.48-.78 5.37-3.28-.2-2.01-.37-3.72-.37-3.72l2.35 1.76c.22-.24.43-.5.65-.76l-2-4 3.32 2.21c1.34-2 2.56-4.49 3.45-7.55l-2.77-1.66 3.5-1.4c.67-3.52.91-7.68.5-12.6z" style="fill:#2aaa00"/>
-  <path d="m48.13 36.94c-.02-1.4-.26-2.9-.73-4.45l1.87-2.25h-2.68c-.43-1.02-.96-2.08-1.57-3.15l2.35-4.12-3.46 2.31c-.29-.45-.59-.89-.9-1.33l2.29-2.75-3.92.56c-4.15-5.29-8.95-9.37-10.07-10.29.31-.02.84-.05 1.53-.05 3.52 0 12.12.78 16.05 8.01 4.45 8.19.29 15.81-.76 17.51" style="fill:#00a532"/>
-  <path d="m32.84 11.53c3.49 0 12.04.77 15.94 7.95 4.15 7.65.75 14.8-.54 17.03-.06-1.27-.29-2.61-.71-3.99l1.66-1.99.34-.41h-.53-2.33c-.42-.98-.92-2-1.51-3.03l2.06-3.6.53-.92-.88.59-2.92 1.94c-.26-.4-.52-.78-.77-1.15l2.02-2.43.42-.5-.64.09-3.52.5c-3.9-4.95-8.35-8.84-9.8-10.05.28-.01.69-.03 1.18-.03m0-.25c-1.14 0-1.84.08-1.84.08s5.57 4.44 10.33 10.52l3.67-.52-2.14 2.57c.35.5.69 1 1.02 1.51l3.12-2.08-2.13 3.72c.61 1.07 1.17 2.17 1.63 3.28h2.5l-1.75 2.1c.5 1.64.78 3.28.75 4.9 0 0 6.12-8.56 1-18-3.93-7.23-12.41-8.08-16.16-8.08z" style="fill:#2aaa00"/>
-  <path d="m4.18 31.96c1.19-8.55 5.33-22.37 19.7-22.37 2.43 0 4.42.43 5.41.69-2.08.31-5.14 2.17-9.12 5.52l-1.29-.64v1.76c-.56.5-1.13 1.01-1.69 1.53l-1.24-2.48-.73 4.38c-.92.86-1.86 1.79-2.76 2.7l-2.69-2.02 1.19 3.56-.49.51-1.52-2.03-.95 4.67c-1.85 1.98-3.25 3.57-3.82 4.22" style="fill:#00a532"/>
-  <path d="m23.88 9.72c2.04 0 3.76.3 4.84.55-2.07.52-4.94 2.33-8.57 5.39l-1.04-.52-.36-.18v.4 1.5c-.51.45-1.02.91-1.53 1.38l-1-1.99-.34-.69-.13.76-.65 3.92c-.87.84-1.76 1.72-2.67 2.64l-2.28-1.71-.64-.48.25.76 1.04 3.11-.33.35-1.27-1.7-.34-.45-.11.55-.87 4.33c-1.6 1.73-2.85 3.15-3.53 3.92 1.19-8.18 3.92-14.16 8.13-17.79 3.12-2.69 6.95-4.05 11.4-4.05m0-.25c-6.85 0-17.33 3.33-19.88 22.89 0 0 1.64-1.91 4.12-4.6l.88-4.4 1.44 1.92c.21-.22.43-.44.64-.67l-1.08-3.25 2.46 1.84c.93-.94 1.89-1.9 2.87-2.85l.67-4 1.14 2.29c.62-.57 1.24-1.13 1.86-1.68v-1.61l1.18.59c3.78-3.2 7.38-5.59 9.7-5.59.04 0 .08 0 .12 0 0 .01-2.58-.88-6.12-.88z" style="fill:#2aaa00"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.png
deleted file mode 100644
index 4a792becb..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.svg
deleted file mode 100644
index b2dbe086d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/video.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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"/>
-  <path d="m44 52v8h-24v-8h24m1-1h-26v10h26v-10z" style="fill:#2b8ed8"/>
-  <path d="m19.5 3.5h25v9h-25z" style="fill:#36aeff"/>
-  <path d="m44 4v8h-24v-8h24m1-1h-26v10h26v-10z" style="fill:#2b8ed8"/>
-  <path d="m19.5 15.5h25v33h-25z" style="fill:#36aeff"/>
-  <path d="m44 16v32h-24v-32h24m1-1h-26v34h26v-34z" style="fill:#2b8ed8"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.png
deleted file mode 100644
index a8394c5a3..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.svg
deleted file mode 100644
index b37e650c1..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wardrobe.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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 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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.png
deleted file mode 100644
index b53aded48..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.svg
deleted file mode 100644
index 0cef7157d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="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"/>
-  <g style="fill:#b2b2b2">
-    <path d="m53 14.12h-42v.76h42v-.76"/>
-    <path d="m23 5h-1v10h1v-10"/>
-  </g>
-  <circle cx="44.5" cy="9.5" r="2" style="fill:#fff"/>
-  <path d="m44.5 8c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5-1.5-.67-1.5-1.5.67-1.5 1.5-1.5m0-1c-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5 2.5-1.12 2.5-2.5-1.12-2.5-2.5-2.5z" style="fill:#666"/>
-  <path d="m25 7h11v4h-11z"/>
-  <g style="fill:#999">
-    <path d="m48 7h4v1h-4z"/>
-    <path d="m48 9h4v1h-4z"/>
-    <path d="m48 11h4v1h-4z"/>
-    <path d="m37 7h4v1h-4z"/>
-    <path d="m37 9h4v1h-4z"/>
-    <path d="m37 11h4v1h-4z"/>
-  </g>
-  <path d="M32,46.5c-8,0-14.5-6.5-14.5-14.5S24,17.5,32,17.5S46.5,24,46.5,32S40,46.5,32,46.5z" style="fill:#acacb7"/>
-  <path d="m32 18c7.73 0 14 6.27 14 14s-6.27 14-14 14-14-6.27-14-14 6.27-14 14-14m0-1c-8.27 0-15 6.73-15 15s6.73 15 15 15c8.27 0 15-6.73 15-15s-6.73-15-15-15z" style="fill:#646464"/>
-  <circle cx="32" cy="32" r="11" style="fill:#494949"/>
-  <circle cx="32" cy="32" r="9" style="fill:#e1f5ff"/>
-  <path d="m13 59h4v2h-4z"/>
-  <path d="m47 59h4v2h-4z"/>
-  <text transform="translate(27 9)">
-    <tspan x="0" y="0" style="font-size:.9197;font-family:'MyriadPro-Regular';fill:#fff">W</tspan>
-    <tspan x=".75" y="0" style="font-size:.9197;font-family:'MyriadPro-Regular';fill:#fff">aschen</tspan>
-  </text>
-  <g style="fill:#b2b2b2">
-    <path d="m22 49v6h-8v-6h8m0-1h-8c-.55 0-1 .45-1 1v6c0 .55.45 1 1 1h8c.55 0 1-.45 1-1v-6c0-.55-.45-1-1-1z"/>
-    <path d="m20 7v1h-7v-1h7m0-1h-7c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1h7c.55 0 1-.45 1-1v-1c0-.55-.45-1-1-1z"/>
-    <path d="m20 51c-.55 0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1"/>
-  </g>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.png
deleted file mode 100644
index 71fcd64ff..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.svg
deleted file mode 100644
index 09f0cc122..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-0.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.png
deleted file mode 100644
index c3f132883..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.svg
deleted file mode 100644
index fa7b9e6ae..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-1.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.png
deleted file mode 100644
index c5a0d37cd..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.svg
deleted file mode 100644
index cce1294cb..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-2.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.png
deleted file mode 100644
index de228b5cc..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.svg
deleted file mode 100644
index a44eace41..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2-3.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.png
deleted file mode 100644
index f0b30a0c8..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.svg
deleted file mode 100644
index 616a40869..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/washingmachine_2.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.png
deleted file mode 100644
index c3deef616..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.svg
deleted file mode 100644
index d4aa29c71..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/water.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.png
deleted file mode 100644
index c24c63650..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.svg
deleted file mode 100644
index c23ffedd2..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/wind.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="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">
-    <path d="m61.55 22.14c-1.77-.48-3.92-1.13-5.82-1.84.77 1.74.88 3.69.16 5.5-.46 1.15-1.2 2.1-2.12 2.84 1.58.07 3.84.09 6.97-.07.31-.43.57-.91.77-1.43.66-1.7.63-3.48.04-5"/>
-    <path d="m50.1 17.36c-1.98-1.03-3.21-1.17-5-1.75-.5-.16-1.01-.35-1.49-.54 1.27 2.47 1.49 5.53.35 8.41-.67 1.68-1.73 3.09-3.01 4.15 1.08.08 2.29.12 3.51.03 1.07-.08 2.02-.06 2.84.01 1.21-.93 2.19-2.2 2.8-3.73.89-2.21.82-4.56 0-6.58"/>
-    <path d="m37.81 12c-1.06-.5-2.42-1-3.99-1.24-.84-.13-1.57-.32-2.22-.54 1.6 2.52 1.73 6.77.05 10.99-.89 2.24-2.16 4.14-3.59 5.53.42 0 .83-.01 1.23-.05 1.8-.18 3.45-.15 4.76-.04 1.75-1.09 3.32-2.98 4.29-5.4 1.4-3.53 1.1-7.14-.53-9.25"/>
-    <path d="m24.53 15.02c-1.09 2.73-1.32 5.44-.8 7.43 1.21-1.31 2.34-3.11 3.18-5.22 1.08-2.72 1.47-5.4 1.2-7.46-1.4 1.19-2.7 3.02-3.58 5.25"/>
-  </g>
-  <g style="fill:none;stroke-miterlimit:10;stroke:#1a171b">
-    <path d="m13.55 10.5l4.7 2.19"/>
-    <path d="m13.55 10.5l13.28-3.87"/>
-    <path d="m13.55 10.5l8.74 13.45"/>
-    <path d="M 13.55,10.5 7,9"/>
-  </g>
-  <path d="M4.5,59.5V9c0-1.38,1.12-2.5,2.5-2.5S9.5,7.62,9.5,9c0,1.21-0.86,2.22-2,2.45V59.5H4.5z" style="fill:#8b96ac"/>
-  <path d="m7 7c1.1 0 2 .9 2 2 0 1.1-.9 2-2 2v48h-2v-30-20c0-1.1.9-2 2-2m0-1c-1.65 0-3 1.35-3 3v20 30 1h1 2 1v-1-47.17c1.16-.41 2-1.52 2-2.83 0-1.65-1.35-3-3-3z" style="fill:#676b72"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.png
deleted file mode 100644
index 14178b6e4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.svg
deleted file mode 100644
index 987c0f1e6..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-ajar.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.png
deleted file mode 100644
index 2734184a7..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.svg
deleted file mode 100644
index bc0a688b8..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-closed.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.png
deleted file mode 100644
index 82aea4ee1..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.svg
deleted file mode 100644
index 0d780641d..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window-open.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.png
deleted file mode 100644
index c3aade1f9..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.svg
deleted file mode 100644
index 5f871f096..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/window.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.png
deleted file mode 100644
index 4e38e21c4..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.svg
deleted file mode 100644
index 663035f95..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_1.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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"/>
-  <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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#f4d0b1"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#f4d0b1"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#e5b795"/>
-  <path d="m24.6 10.5c-.1-.4-.1-.8-.1-1.2 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5c0 .1 0 .2 0 .2-.8-.9-1.6-2.2-2.3-3.8l-.2-.4-.4.1c-.6.2-1.2.3-1.9.3-1.2 0-2.5-.2-3.9-.7l-3-1 2.6 1.9c.8.6 1.5.9 2.2 1.2-.1 0-.2 0-.3 0-1.8 0-3.6-.4-5.2-1.2l-.5-.2-.2.5c-.5 1.6-1.1 3-1.8 4.3" style="fill:#e67831"/>
-  <path d="m32 2.3c2.1 0 4 1 5.3 2.5l-.8.2c-.5.2-1.1.2-1.8.2-1.1 0-2.4-.2-3.8-.7l-3-1c1.2-.7 2.6-1.2 4.1-1.2m-4.8 1.9l2.8 2.1c.1 0 .1.1.2.1-1-.2-2-.5-2.9-.9l-.9-.4c.3-.3.5-.6.8-.9m10.2.6c.7.9 1.2 1.9 1.5 3-.4-.7-.8-1.4-1.1-2.3l-.4-.7m-11.3.8l-.2.5c-.3.8-.5 1.5-.8 2.2.1-1 .5-1.9 1-2.7m5.9-4.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 1.5.7 3.3 1.2 5.4 1.2 1 0 2.1-.1 3.3-.4 0 0 0 0-.1 0-.4 0-2.6-.1-4.9-1.7 1.3.4 2.7.7 4.1.7.7 0 1.4-.1 2.1-.3.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#dd6022"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.png
deleted file mode 100644
index 9d9705c6c..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.svg
deleted file mode 100644
index 1bc91b02a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_2.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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"/>
-  <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:#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"/>
-  <path d="m36.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:#e5b795"/>
-  <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#f4d0b1"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#e5b795"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#f4d0b1"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8 4.4 0 8-3.6 8-8 0-4.4-3.6-8-8-8z" style="fill:#e5b795"/>
-  <path d="m24.6 10.5c-.1-.4-.1-.8-.1-1.2 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5c0 .1 0 .2 0 .2-.8-.9-1.6-2.2-2.3-3.8l-.2-.4-.4.1c-.6.2-1.2.3-1.9.3-1.2 0-2.5-.2-3.9-.7l-3-1 2.6 1.9c.8.6 1.5.9 2.2 1.2-.1 0-.2 0-.3 0-1.8 0-3.6-.4-5.2-1.2l-.5-.2-.2.5c-.5 1.6-1.1 3-1.8 4.3" style="fill:#edda7b"/>
-  <path d="m32 2.3c2.1 0 4 1 5.3 2.5l-.8.2c-.5.2-1.1.2-1.8.2-1.1 0-2.4-.2-3.8-.7l-3-1c1.2-.7 2.6-1.2 4.1-1.2m-4.8 1.9l2.8 2.1c.1 0 .1.1.2.1-1-.2-2-.5-2.9-.9l-.9-.4c.3-.3.5-.6.8-.9m10.2.6c.7.9 1.2 1.9 1.5 3-.4-.7-.8-1.4-1.1-2.3l-.4-.7m-11.3.8l-.2.5c-.3.8-.5 1.5-.8 2.2.1-1 .5-1.9 1-2.7m5.9-4.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 1.5.7 3.3 1.2 5.4 1.2 1 0 2.1-.1 3.3-.4 0 0 0 0-.1 0-.4 0-2.6-.1-4.9-1.7 1.3.4 2.7.7 4.1.7.7 0 1.4-.1 2.1-.3.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#ccb966"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.png
deleted file mode 100644
index ea2d3f77a..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.svg
deleted file mode 100644
index e2aa46368..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_3.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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"/>
-  <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"/>
-  <path d="m36.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="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#d29e7c"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#c18a6b"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5s3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#d29e7c"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#c18a6b"/>
-  <path d="m24.6 10.5c-.1-.4-.1-.8-.1-1.2 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5c0 .1 0 .2 0 .2-.8-.9-1.6-2.2-2.3-3.8l-.2-.4-.4.1c-.6.2-1.2.3-1.9.3-1.2 0-2.5-.2-3.9-.7l-3-1 2.6 1.9c.8.6 1.5.9 2.2 1.2-.1 0-.2 0-.3 0-1.8 0-3.6-.4-5.2-1.2l-.5-.2-.2.5c-.5 1.6-1.1 3-1.8 4.3" style="fill:#61452d"/>
-  <path d="m32 2.3c2.1 0 4 1 5.3 2.5l-.8.2c-.5.2-1.1.2-1.8.2-1.1 0-2.4-.2-3.8-.7l-3-1c1.2-.7 2.6-1.2 4.1-1.2m-4.8 1.9l2.8 2.1c.1 0 .1.1.2.1-1-.2-2-.5-2.9-.9l-.9-.4c.3-.3.5-.6.8-.9m10.2.6c.7.9 1.2 1.9 1.5 3-.4-.7-.8-1.4-1.1-2.3l-.4-.7m-11.3.8l-.2.5c-.3.8-.5 1.5-.8 2.2.1-1 .5-1.9 1-2.7m5.9-4.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 1.5.7 3.3 1.2 5.4 1.2 1 0 2.1-.1 3.3-.4 0 0 0 0-.1 0-.4 0-2.6-.1-4.9-1.7 1.3.4 2.7.7 4.1.7.7 0 1.4-.1 2.1-.3.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#513624"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#ffbc00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.png
deleted file mode 100644
index b7dd8a186..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.svg
deleted file mode 100644
index 8c608ec89..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_4.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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"/>
-  <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:#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"/>
-  <path d="m36.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:#a35c3d"/>
-  <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#ba7750"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1s-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#a35c3d"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#ba7750"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#a35c3d"/>
-  <path d="m24.6 10.5c-.1-.4-.1-.8-.1-1.2 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5c0 .1 0 .2 0 .2-.8-.9-1.6-2.2-2.3-3.8l-.2-.4-.4.1c-.6.2-1.2.3-1.9.3-1.2 0-2.5-.2-3.9-.7l-3-1 2.6 1.9c.8.6 1.5.9 2.2 1.2-.1 0-.2 0-.3 0-1.8 0-3.6-.4-5.2-1.2l-.5-.2-.2.5c-.5 1.6-1.1 3-1.8 4.3" style="fill:#472e18"/>
-  <path d="m32 2.3c2.1 0 4 1 5.3 2.5l-.8.2c-.5.2-1.1.2-1.8.2-1.1 0-2.4-.2-3.8-.7l-3-1c1.2-.7 2.6-1.2 4.1-1.2m-4.8 1.9l2.8 2.1c.1 0 .1.1.2.1-1-.2-2-.5-2.9-.9l-.9-.4c.3-.3.5-.6.8-.9m10.2.6c.7.9 1.2 1.9 1.5 3-.4-.7-.8-1.4-1.1-2.3l-.4-.7m-11.3.8l-.2.5c-.3.8-.5 1.5-.8 2.2.1-1 .5-1.9 1-2.7m5.9-4.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 1.5.7 3.3 1.2 5.4 1.2 1 0 2.1-.1 3.3-.4 0 0 0 0-.1 0-.4 0-2.6-.1-4.9-1.7 1.3.4 2.7.7 4.1.7.7 0 1.4-.1 2.1-.3.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#382211"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.png
deleted file mode 100644
index 1bec49b32..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.svg
deleted file mode 100644
index 7e385d93a..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_5.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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"/>
-  <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:#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"/>
-  <path d="m36.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:#89471b"/>
-  <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#a55d2b"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1s-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#89471b"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#a55d2b"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#89471b"/>
-  <path d="m24.6 10.5c-.1-.4-.1-.8-.1-1.2 0-4.1 3.4-7.5 7.5-7.5s7.5 3.4 7.5 7.5c0 .1 0 .2 0 .2-.8-.9-1.6-2.2-2.3-3.8l-.2-.4-.4.1c-.6.2-1.2.3-1.9.3-1.2 0-2.5-.2-3.9-.7l-3-1 2.6 1.9c.8.6 1.5.9 2.2 1.2-.1 0-.2 0-.3 0-1.8 0-3.6-.4-5.2-1.2l-.5-.2-.2.5c-.5 1.6-1.1 3-1.8 4.3" style="fill:#1c1914"/>
-  <path d="m32 2.3c2.1 0 4 1 5.3 2.5l-.8.2c-.5.2-1.1.2-1.8.2-1.1 0-2.4-.2-3.8-.7l-3-1c1.2-.7 2.6-1.2 4.1-1.2m-4.8 1.9l2.8 2.1c.1 0 .1.1.2.1-1-.2-2-.5-2.9-.9l-.9-.4c.3-.3.5-.6.8-.9m10.2.6c.7.9 1.2 1.9 1.5 3-.4-.7-.8-1.4-1.1-2.3l-.4-.7m-11.3.8l-.2.5c-.3.8-.5 1.5-.8 2.2.1-1 .5-1.9 1-2.7m5.9-4.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 1.5.7 3.3 1.2 5.4 1.2 1 0 2.1-.1 3.3-.4 0 0 0 0-.1 0-.4 0-2.6-.1-4.9-1.7 1.3.4 2.7.7 4.1.7.7 0 1.4-.1 2.1-.3.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4.1-4.3-3.5-7.9-7.9-7.9z" style="fill:#0a0907"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.png
deleted file mode 100644
index 9f9df4935..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.svg
deleted file mode 100644
index 2cd5cf305..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/woman_6.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="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"/>
-  <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"/>
-  <path d="m36.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"/>
-  <path d="m43 40.5c-.8 0-1.5-.7-1.5-1.5v-12c-.1-1-.5-1.9-1-2.7l-.3-.4-8.2 6.5-8.1-6.5-.3.4c-.7 1-1.1 2.2-1.1 3.4v11.3c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5v-11.8-.1-.1-.1-.3c3.5-.2 4.5-3.1 5.3-5.4.8-2.3 1.4-3.8 3.3-3.8h7.5c1.9 0 2.5 1.4 3.3 3.8.8 2.3 1.8 5.1 5.3 5.4v12.4c.3.8-.4 1.5-1.2 1.5" style="fill:#3c201d"/>
-  <path d="m35.8 18c1.5 0 2 1.1 2.9 3.4.2.7.5 1.5.9 2.2l-.2.1-7.4 6-7.3-5.9-.2-.1c.4-.8.6-1.5.9-2.2.8-2.4 1.4-3.4 2.9-3.4h7.5m6.1 8.3c.6.4 1.3.6 2.1.7v.1.6 2.2 9c0 .6-.4 1-1 1-.6 0-1-.4-1-1v-9-2.8-.2-.1c-.1-.2-.1-.3-.1-.5m-19.7 0c-.1.4-.1.9-.1 1.3v2.3 9c0 .6-.4 1-1 1s-1-.4-1-1v-11.7-.1c0 0 0 0 0 0 .8-.2 1.5-.4 2.1-.8m13.6-9.4h-7.5c-5.1 0-2.5 9.2-9.2 9.2v.6c0 .1 0 .1 0 .2v12c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.3c0-1.2.4-2.2 1-3.1l8 6.4 8-6.4c.5.7.8 1.5.9 2.4v.2 2.8 9c0 1.1.9 2 2 2 1.1 0 2-.9 2-2v-9-2.2-.6-.2-.8c-6.7 0-4.1-9.2-9.2-9.2z" style="fill:#1e0e0e"/>
-  <g style="fill:#bd0926">
-    <path d="m41 38h-9v-12c3.1-3.1 4.3-5.8 4.8-7.6.1-.2.1-.4.1-.7 0-.2.1-.4.1-.6 5 0 7.9 7.6 7.9 9.1l-3.9 1.5c0-1.2-.4-2.2-1-3.1l-2 6.4 2 3 1 4"/>
-    <path d="m23 38h9v-12c-3.1-3.1-4.3-5.8-4.8-7.6-.1-.2-.1-.4-.1-.7 0-.2-.1-.4-.1-.6-5 0-7.9 7.6-7.9 9.1l3.9 1.5c0-1.2.4-2.2 1-3.1l2 6.4-2 3-1 4"/>
-  </g>
-  <g style="fill:#660619">
-    <path d="m30 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-    <path d="m39 60v.5c0 1.4-1.1 2.5-2.5 2.5s-2.5-1.1-2.5-2.5v-.5h5m1-1h-7v1.5c0 1.9 1.6 3.5 3.5 3.5 1.9 0 3.5-1.6 3.5-3.5v-1.5z"/>
-  </g>
-  <path d="m32 16.8c-4.1 0-7.5-3.4-7.5-7.5s3.4-7.5 7.5-7.5 7.5 3.4 7.5 7.5-3.3 7.5-7.5 7.5" style="fill:#3c201d"/>
-  <path d="m32 2.3c3.9 0 7 3.1 7 7s-3.1 7-7 7-7-3.1-7-7 3.2-7 7-7m0-1c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8z" style="fill:#1e0e0e"/>
-  <path d="m32 1.3c-4.4 0-8 3.6-8 8 0 .9.2 1.8.4 2.6.1-.1.2-.3.2-.4.9-1.7 1.6-3.5 2.2-5.1 2.2 1.1 5.1 1.7 8.7.8 0 0-2.4.1-4.9-1.7 1.9.6 4.2 1.1 6.2.5.6 1.5 1.4 2.9 2.4 4 .1.6.3 1.2.4 1.7.2-.8.4-1.6.4-2.4 0-4.4-3.6-8-8-8"/>
-  <path d="m37 52v-7l1-4v11h2v-5l1-9h-18l1 9v5z" style="fill:#bd0926"/>
-  <path d="m29 17c0 0 0 5 3 5 3 0 3-5 3-5" style="fill:none;stroke-miterlimit:10;stroke:#e5ae00"/>
-  <path d="m39 33h-14l1-2h12z" style="fill:#660619"/>
-</svg>
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.png b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.png
deleted file mode 100644
index 92226b08f..000000000
Binary files a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.png and /dev/null differ
diff --git a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.svg b/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.svg
deleted file mode 100644
index 272ff2c78..000000000
--- a/features/iconsets/org.eclipse.smarthome.ui.iconset.classic/icons/zoom.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
diff --git a/features/io.md b/features/io.md
new file mode 100644
index 000000000..241eb71e3
--- /dev/null
+++ b/features/io.md
@@ -0,0 +1,14 @@
+---
+layout: documentation
+---
+
+{% include base.html %}
+
+# List of System integrations
+
+## System Integration
+
+| Extension | Description |
+|-------|----------------------|
+| [HomeKit]({{docu}}/features/io/homekit/readme.html) | Exposes openHAB items to HomeKit, so that it can be used with Siri on iOS. |
+| [Amazon Echo]({{docu}}/features/io/hueemulation/readme.html) | Emulates a Philips hue bridge, so that devices like Amazon Echo can discover and use it. |
diff --git a/features/io/homekit/readme.md b/features/io/homekit/readme.md
new file mode 100644
index 000000000..8464585b5
--- /dev/null
+++ b/features/io/homekit/readme.md
@@ -0,0 +1,110 @@
+---
+layout: documentation
+---
+
+{% include base.html %}
+
+# HomeKit Add-on
+
+This is an add-on that exposes your openHAB system as a bridge over the HomeKit protocol.
+
+Using this add-on, you will be able to control your openHAB system using Apple's Siri, or any of a number of HomeKit enabled iOS apps. In order to do so, you will need to make some configuration changes. HomeKit organizes your home into "accessories" that are made up of a number of "characteristics". Some accessory types require a specific set of characteristics.
+
+## Global Configuration
+Your first step will be to create the homekit.cfg in your conf/services folder. At the very least, you will need to define a pin number for the bridge. This will be used in iOS when pairing. The pin code is in the form "###-##-###". Requirements beyond this are not clear, and Apple enforces limitations on eligible pins within iOS. At the very least, you cannot use repeating (111-11-111) or sequential (123-45-678) pin codes. If your home network is secure, a good starting point is the pin code used in most sample applications: 031-45-154.
+
+Other settings, such as using fahrenheit temperatures, customizing the thermostat heat/cool/auto modes, and specifying the interface to advertise the Homekit bridge on are also illustrated in the following sample:
+```
+org.openhab.homekit:port=9124
+org.openhab.homekit:pin=031-45-154
+org.openhab.homekit:useFahrenheitTemperature=true
+org.openhab.homekit:thermostatCoolMode=CoolOn
+org.openhab.homekit:thermostatHeatMode=HeatOn
+org.openhab.homekit:thermostatAutoMode=Auto
+org.openhab.homekit:thermostatOffMode=Off
+org.openhab.homekit:networkInterface=192.168.0.6
+```
+
+## Item Configuration
+After setting this global configuration, you will need to tag your openHAB items in order to map them to an ontology. For our purposes, you may consider HomeKit accessories to be of two forms: simple and complex.
+
+A simple accessory will be mapped to a single openHAB item (i.e. a Lighbulb is mapped to a Switch, Dimmer, or Color item). A complex accessory will be made up of multiple openHAB items (i.e. a Thermostat is composed of Heating and Cooling thresholds, a mode, and current temperature). Complex accessories require a tag on a Group indicating the accessory type, as well as tags on the items it composes.
+
+A full list of supported accessory types can be found in the table below.
+
+<table>
+ <tr>
+  <td><b>tag</b></td>
+  <td><b>child tag</b></td>
+  <td><b>supported items</b></td>
+  <td><b>description</b></td>
+ </tr>
+ <tr>
+  <td>Lighting</td>
+  <td>&nbsp;</td>
+  <td>Switch, Dimmer, Color</td>
+  <td>A lightbulb, either switchable or dimmable</td>
+ </tr>
+ <tr>
+  <td>Switchable</td>
+  <td>&nbsp;</td>
+  <td>Switch, Dimmer, Color</td>
+  <td>An accessory that can be turned off and on. While similar to a lightbulb, this will be presented differently in the Siri grammar and iOS apps</td>
+ </tr>
+ <tr>
+  <td>CurrentTemperature</td>
+  <td>&nbsp;</td>
+  <td>Number</td>
+  <td>An accessory that provides a single read-only temperature value. The units default to celsius but can be overridden globally using the useFahrenheitTemperature global property</td>
+ </tr>
+ <tr>
+  <td>CurrentHumidity</td>
+  <td>&nbsp;</td>
+  <td>Number</td>
+  <td>An accessory that provides a single read-only value indicating the relative humidity.</td>
+ </tr>
+ <tr>
+  <td>Thermostat</td>
+  <td>&nbsp;</td>
+  <td>Group</td>
+  <td>A thermostat requires all child tags defined below</td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+  <td>CurrentTemperature</td>
+  <td>Number</td>
+  <td>The current temperature, same as above</td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+  <td>homekit:HeatingCoolingMode</td>
+  <td>String</td>
+  <td>Indicates the current mode of the device: OFF, AUTO, HEAT, COOL. The string's value must match those defined in the thermostat*Mode properties. This is a homekit-specific term and therefore the tags needs to be prefixed with "homekit:"</td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+  <td>TargetTemperature</td>
+  <td>Number</td>
+  <td>A target temperature that will engage the thermostat's heating and cooling actions as necessary, depending on the heatingCoolingMode</td>
+ </tr>
+</table>
+
+See the sample below for example items:
+
+```
+Switch KitchenLights "Kitchen Lights" <light> (gKitchen) [ "Lighting" ]
+Dimmer BedroomLights "Bedroom Lights" <light> (gBedroom) [ "Lighting" ]
+Number BedroomTemperature "Bedroom Temperature" (gBedroom) [ "CurrentTemperature" ]
+Group gDownstairsThermostat "Downstairs Thermostat" (gFF) [ "Thermostat" ]
+Number DownstairsThermostatCurrentTemp "Downstairs Thermostat Current Temperature" (gDownstairsThermostat) [ "CurrentTemperature" ]
+Number DownstairsThermostatTargetTemperature "Downstairs Thermostat Target Temperature" (gDownstairsThermostat) [ "TargetTemperature" ]
+String DownstairsThermostatHeatingCoolingMode "Downstairs Thermostat Heating/Cooling Mode" (gDownstairsThermostat) [ "homekit:HeatingCoolingMode" ]
+```
+
+## Additional Notes
+HomeKit allows only a single pairing to be established with the bridge. This pairing is normally shared across devices via iCloud. If you need to establish a new pairing, you'll need to clear the existing pairings. To do this, you can issue the command ```smarthome homekit clearPairings``` from the OSGi console.
+
+HomeKit requires a unique identifier for each accessory advertised by the bridge. This unique identifier is hashed from the Item's name. For that reason, it is important that the name of your Items exposed to HomeKit remain consistent.
+
+If you encounter any issues with the add-on and need support, it may be important to get detailed logs of your device's communication with openHAB. In order to get logs from the underlying library used to implement the HomeKit protocol, enable trace logging using the following command:
+```openhab> log:set TRACE com.beowulfe.hap```
diff --git a/features/io/hueemulation/readme.md b/features/io/hueemulation/readme.md
new file mode 100644
index 000000000..84b36527f
--- /dev/null
+++ b/features/io/hueemulation/readme.md
@@ -0,0 +1,36 @@
+---
+layout: documentation
+---
+
+{% include base.html %}
+
+
+
+# openHAB Hue Emulation Service
+
+Hue Emulation exposes openHAB items as Hue devices to other Hue HTTP API compatible applications like an Amazon Echo.  
+
+## Features:
+
+* UPNP automatic discovery 
+* Support ON/OFF and Percent/Decimal item types
+* Can expose any type of item, not just lights
+* Pairing (security) can be enabled/disabled in real time using the configuration service (under services in the PaperUI for example)  
+
+## Configuration:
+
+Pairing can be turned on and off:
+
+```
+org.openhab.hueemulation:pairingEnabled=false
+```
+
+## Device Taging
+To expose an item on the service apply a supported tag (which are "Lighting", "Switchable", "TargetTemperature") to it.  The item label will be used as the Hue device name.
+
+```
+Switch  TestSwitch1     "Kitchen Switch" [ "Switchable" ]
+Switch  TestSwitch2     "Bathroom" [ "Lighting" ]
+Dimmer  TestDimmer3     "Hallway" [ "Lighting" ]
+Number  TestNumber4     "Temperature Set Point" [ "TargetTemperature" ]
+```
diff --git a/features/uis/org.eclipse.smarthome.ui.basic/README.md b/features/uis/org.eclipse.smarthome.ui.basic/README.md
deleted file mode 100644
index 57d67cf1c..000000000
--- a/features/uis/org.eclipse.smarthome.ui.basic/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: documentation
----
-
-{% include base.html %}
-
-## Eclipse Smarthome BasicUI
-
-BasicUI is a web interface for Eclipse Smarthome based on Material Design Lite from Google.
-
-Features:
-* Responsive layout suitable for various screen sizes
-* AJAX navigation
-* Live update<sup>1</sup>
-
-<sup>1</sup>: as for now, only control states and icons are updated. Visibility changes require a page reload.
-
-Configuration:
-```
-org.eclipse.smarthome.basicui:defaultSitemap=demo
-# Icons can be disabled
-org.eclipse.smarthome.basicui:enableIcons=true
-# Icons can be shown as PNG or SVG images
-# Default: PNG
-org.eclipse.smarthome.basicui:iconType=svg
-```
-
-Screenshots:
-
-[![Screenshot 1](doc/screenshot-1.png)](doc/screenshot-1-full.png)
-[![Screenshot 2](doc/screenshot-2.png)](doc/screenshot-2-full.png)
-
diff --git a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1-full.png b/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1-full.png
deleted file mode 100644
index 27de40518..000000000
Binary files a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1-full.png and /dev/null differ
diff --git a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1.png b/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1.png
deleted file mode 100644
index 396a8b915..000000000
Binary files a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-1.png and /dev/null differ
diff --git a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2-full.png b/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2-full.png
deleted file mode 100644
index 7e94fb4a1..000000000
Binary files a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2-full.png and /dev/null differ
diff --git a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2.png b/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2.png
deleted file mode 100644
index 52edc2c25..000000000
Binary files a/features/uis/org.eclipse.smarthome.ui.basic/doc/screenshot-2.png and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 12e325e32..cdc17f024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,9 @@
             <fileset>
               <directory>${basedir}/features/uis/</directory>
             </fileset>
+            <fileset>
+              <directory>${basedir}/features/io/</directory>
+            </fileset>
             <fileset>
               <directory>${basedir}/features/iconsets/</directory>
             </fileset>
@@ -129,6 +132,26 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-io-docs</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/features/io</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/_repos/openhab2-addons/addons/io</directory>
+                  <includes>
+                    <include>**/README.md</include>
+                    <include>**/doc/**</include>
+                    <include>**/cfg/**</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
 	  </plugin>
       <plugin>
@@ -246,6 +269,38 @@
               </source>
             </configuration>
           </execution>
+          <execution>
+            <id>rename-io-files</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                def uis = new File(project.basedir, 'features/io')
+
+                uis.eachFile
+                {
+                def name = it.name
+                if(name.contains('org.openhab.io.')) {
+                def uiId =
+                it.name.replace('org.openhab.io.', '')
+                def simpleUiNameDir = new
+                File(uis.path, uiId)
+                it.renameTo(simpleUiNameDir)
+                def readme = new File(simpleUiNameDir.path, 'README.md')
+                if(readme.exists()) {
+                println readme
+                readme.renameTo(new File(simpleUiNameDir.path, 'readme.md'))
+                if(!readme.text.startsWith('---')) {
+                	readme.write("---\nlayout: documentation\n---\n\n{% include base.html %}\n\n" + readme.text)
+                }
+                }
+                }
+                }
+              </source>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>