diff --git a/fhem/FHEM/30_HUEBridge.pm b/fhem/FHEM/30_HUEBridge.pm
index 3571e6f06..91b36867a 100644
--- a/fhem/FHEM/30_HUEBridge.pm
+++ b/fhem/FHEM/30_HUEBridge.pm
@@ -730,6 +730,9 @@ HUEBridge_Autocreate($;$)
       $cmdret= CommandAttr(undef,"$devname group HUEGroup");
       $cmdret= CommandAttr(undef,"$devname IODev $name");
 
+      HUEDeviceSetIcon($devname);
+      $defs{$devname}{helper}{fromAutocreate} = 1 ;
+
       $autocreated++;
     }
   }
diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm
index 4da57396b..beb623e2d 100644
--- a/fhem/FHEM/31_HUEDevice.pm
+++ b/fhem/FHEM/31_HUEDevice.pm
@@ -956,15 +956,21 @@ HUEDeviceSetIcon($;$)
   return undef if( !$hash );
   my $name = $hash->{NAME};
 
-  return undef if( !$hash->{modelid} );
+  return if( defined($attr{$name}{icon}) && !$force );
 
-  my $model = $hueModels{$hash->{modelid}};
-  return undef if( !$model );
+  if( $hash->{modelid} ) {
+    my $model = $hueModels{$hash->{modelid}};
+    return undef if( !$model );
 
-  my $icon = $model->{icon};
-  return undef if( !$icon );
+    my $icon = $model->{icon};
+    return undef if( !$icon );
 
-  $attr{$name}{icon} = $icon if( $force || !defined($attr{$name}{icon}) );
+    $attr{$name}{icon} = $icon;
+  } elsif( $hash->{class} ) {
+    my $class = lc( $hash->{class} );
+
+    $attr{$name}{icon} = "hue_room_$class";
+  }
 }
 sub
 HUEDevice_Parse($$)
diff --git a/fhem/www/images/fhemSVG/hue_room_bathroom.svg b/fhem/www/images/fhemSVG/hue_room_bathroom.svg
new file mode 100644
index 000000000..5282f9151
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_bathroom.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<path fill="#000000" d="M23,14h-3V3.8c0-2-1.4-3.8-3.4-3.8c-2,0-3.6,2-3.6,4v0c-1.6,0.1-3.1,0.6-4,1.5V6h9V5.5c-0.9-0.8-2.4-1.4-4-1.5v0
+	c0-1.5,1.2-3,2.6-3C18,1,19,2.3,19,3.8V14H1c-0.6,0-1,0.4-1,1s0.4,1,1,1h0.2l0.7,5.9C2,22.6,2.6,23,3.3,23H4v1h1v-1h14v1h1v-1h0.7
+	c0.7,0,1.3-0.4,1.5-1.1l0.7-5.9H23c0.6,0,1-0.4,1-1S23.6,14,23,14z"/>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_bedroom.svg b/fhem/www/images/fhemSVG/hue_room_bedroom.svg
new file mode 100644
index 000000000..893b157c4
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_bedroom.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="#000000" d="M23,11.5H1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v1h1v-1h16v1h1v-1h2c0.6,0,1-0.4,1-1v-5C24,11.9,23.6,11.5,23,11.5z"/>
+	<path fill="#000000" d="M19,10.5h3v-3c0-1.7-1.3-3-3-3H5c-1.7,0-3,1.3-3,3v3h3c-0.6,0-1-0.4-1-1s0.4-1,1-1h5c0.6,0,1,0.4,1,1s-0.4,1-1,1h4
+		c-0.6,0-1-0.4-1-1s0.4-1,1-1h5c0.6,0,1,0.4,1,1S19.6,10.5,19,10.5z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_carport.svg b/fhem/www/images/fhemSVG/hue_room_carport.svg
new file mode 100644
index 000000000..f946bde34
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_carport.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="none" d="M5.5,15C4.7,15,4,15.7,4,16.5C4,17.3,4.7,18,5.5,18S7,17.3,7,16.5C7,15.7,6.3,15,5.5,15z"/>
+	<polygon fill="none" points="17,9 7,9 6,13 18,13 	"/>
+	<path fill="none" d="M18.5,15c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5C20,15.7,19.3,15,18.5,15z"/>
+	<path fill="#000000" d="M21.5,0h-19C1.1,0,0,1.1,0,2.5V21h1V4h22v17h1V2.5C24,1.1,22.9,0,21.5,0z"/>
+	<path fill="#000000" d="M20,23v-2h1c0.6,0,1-0.5,1-1v-4.9c0-2-2-2.1-2-2.1l-2-6H6l-2,6c-1,0-2,1-2,2.1V20c0,0.6,0.5,1,1,1h1v2c0,0.6,0.4,1,1,1h1
+		c0.6,0,1-0.4,1-1v-2h10v2c0,0.6,0.4,1,1,1h1C19.6,24,20,23.6,20,23z M5.5,18C4.7,18,4,17.3,4,16.5C4,15.7,4.7,15,5.5,15
+		S7,15.7,7,16.5C7,17.3,6.3,18,5.5,18z M6,13l1-4h10l1,4H6z M18.5,18c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5s1.5,0.7,1.5,1.5
+		C20,17.3,19.3,18,18.5,18z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_dining.svg b/fhem/www/images/fhemSVG/hue_room_dining.svg
new file mode 100644
index 000000000..3965883d5
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_dining.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="none" d="M16,9H8c-0.3,1.7,0.7,3.2,2.3,3.7c0.6,0.2,1.1,0.3,1.7,0.3c0.5,0,1.1-0.1,1.7-0.3C15.2,12.2,16.3,10.7,16,9z"
+		/>
+	<path fill="#000000" d="M13,22.1v-7c0.5-0.1,0.9-0.2,1.3-0.3c2.6-0.9,4.1-3.7,3.6-6.4L16.1,0H7.9L6.1,8.4c-0.6,2.7,0.9,5.5,3.6,6.4
+		c0.4,0.1,0.9,0.3,1.3,0.3v7c-1,0.3-1.9,1-2.4,1.9h6.9C14.9,23.1,14,22.4,13,22.1z M10.3,12.7C8.7,12.2,7.7,10.7,8,9h8
+		c0.3,1.7-0.8,3.2-2.4,3.7C13,12.9,12.5,13,11.9,13C11.4,13,10.8,12.9,10.3,12.7z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_driveway.svg b/fhem/www/images/fhemSVG/hue_room_driveway.svg
new file mode 100644
index 000000000..d710d7808
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_driveway.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="none" d="M17,9.5c0,0.8,0.7,1.5,1.5,1.5S20,10.3,20,9.5C20,8.7,19.3,8,18.5,8S17,8.7,17,9.5z"/>
+	<polygon fill="none" points="17,2 7,2 6,6 18,6 	"/>
+	<path fill="none" d="M5.5,11C6.3,11,7,10.3,7,9.5C7,8.7,6.3,8,5.5,8S4,8.7,4,9.5C4,10.3,4.7,11,5.5,11z"/>
+	<path fill="#000000" d="M19,18h-1c-1.1,0-2-0.9-2-2v-1H8v1c0,1.1-0.9,2-2,2H5c-1,0-1.9-1-2-2l-3,4.1V24l24,0v-4l-3-4C20.9,17,20,18,19,18z"/>
+	<path fill="#000000" d="M2,8.1V13c0,0.6,0.5,1,1,1h1v2c0,0.6,0.4,1,1,1h1c0.6,0,1-0.4,1-1v-2h10v2c0,0.6,0.4,1,1,1h1c0.6,0,1-0.4,1-1v-2h1
+		c0.6,0,1-0.5,1-1V8.1C22,6,20,6,20,6l-2-6H6L4,6C3,6,2,7,2,8.1z M18.5,8C19.3,8,20,8.7,20,9.5c0,0.8-0.7,1.5-1.5,1.5
+		S17,10.3,17,9.5C17,8.7,17.7,8,18.5,8z M7,2h10l1,4H6L7,2z M5.5,8C6.3,8,7,8.7,7,9.5C7,10.3,6.3,11,5.5,11S4,10.3,4,9.5
+		C4,8.7,4.7,8,5.5,8z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_frontdoor.svg b/fhem/www/images/fhemSVG/hue_room_frontdoor.svg
new file mode 100644
index 000000000..aaddef60b
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_frontdoor.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="none" d="M11.5,14.5c0.3,0,0.5-0.2,0.5-0.5v-4c0-0.3-0.2-0.5-0.5-0.5S11,9.7,11,10v4C11,14.3,11.2,14.5,11.5,14.5z"/>
+	<rect x="5" y="4" fill="none" width="4" height="16"/>
+	<path fill="#000000" d="M18,23c0.5-0.1,1-0.1,1-1V2c0,0,0-0.9-1-1l-8-1C9.9,0,9.9,0,9.8,0H9.8C9.4,0,9,0.2,9,1v1H3v20h6v1c0,1,0.5,1,1.1,1L18,23z
+		 M11,10c0-0.3,0.2-0.5,0.5-0.5S12,9.7,12,10v4c0,0.3-0.2,0.5-0.5,0.5S11,14.3,11,14V10z M9,20H5V4h4V20z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_garage.svg b/fhem/www/images/fhemSVG/hue_room_garage.svg
new file mode 100644
index 000000000..f8abe77a9
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_garage.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<path fill="#000000" d="M24,23L24,23l-1.4-3.2l-2.1-0.7l-6.7-6.7l3.8-3.8c0.9,0.4,2,0.6,3.2,0.3c1-0.3,1.9-1,2.5-1.9c0.8-1.2,0.9-2.3,0.7-3.3
+	l-2.2,2.2c-0.4,0.4-1,0.4-1.4,0l-2.1-2.1c-0.4-0.4-0.4-1,0-1.4l2.2-2.2c-1-0.2-2.2-0.1-3.4,0.8c-0.9,0.6-1.5,1.5-1.8,2.5
+	c-0.3,1.1-0.1,2.2,0.3,3.1l-3.4,3.4L8.4,5.6L3.5,0.7C2.8,0,1.7-0.2,0.8,0.4c-1,0.7-1.1,2.2-0.3,3l5,5l4.2,3.7l-3.4,3.4
+	c-0.9-0.4-2-0.6-3.2-0.3c-1,0.3-1.9,1-2.5,1.9c-0.8,1.2-0.9,2.3-0.7,3.3l2-2c0.4-0.4,1-0.4,1.4,0l2.1,2.1c0.4,0.4,0.4,1,0,1.4l-2,2
+	c1,0.2,2.2,0.1,3.4-0.8c0.9-0.6,1.5-1.5,1.8-2.5c0.3-1.1,0.1-2.2-0.3-3.1l3.8-3.8l6.7,6.7l0.7,2.1v0L23,24h0L24,23z"/>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_garden.svg b/fhem/www/images/fhemSVG/hue_room_garden.svg
new file mode 100644
index 000000000..3b40f2d99
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_garden.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<circle fill="none" cx="12" cy="12" r="3"/>
+	<path fill="#000000" d="M20.4,9.6c-1.1,0-2.6,0.2-3.9,0.5c1.2-0.7,2.4-1.7,3.1-2.4c1.8-1.8,1.9-3.2,0.9-4.2c-1-1-2.5-0.9-4.2,0.9
+		c-0.8,0.8-1.7,1.9-2.4,3.1c0.3-1.4,0.5-2.9,0.5-3.9C14.4,1.1,13.4,0,12,0S9.6,1.1,9.6,3.6c0,1.1,0.2,2.6,0.5,3.9
+		C9.4,6.4,8.5,5.2,7.7,4.4C6,2.6,4.5,2.5,3.5,3.5c-1,1-0.9,2.5,0.9,4.2c0.8,0.8,1.9,1.7,3.1,2.4C6.2,9.8,4.7,9.6,3.6,9.6
+		C1.1,9.6,0,10.6,0,12s1.1,2.4,3.6,2.4c1.1,0,2.6-0.2,3.9-0.5c-1.2,0.7-2.4,1.7-3.1,2.4c-1.8,1.8-1.9,3.2-0.9,4.2
+		c1,1,2.5,0.9,4.2-0.9c0.8-0.8,1.7-1.9,2.4-3.1c-0.3,1.4-0.5,2.9-0.5,3.9c0,2.5,0.9,3.6,2.4,3.6s2.4-1.1,2.4-3.6
+		c0-1.1-0.2-2.6-0.5-3.9c0.7,1.2,1.7,2.4,2.4,3.1c1.8,1.8,3.2,1.9,4.2,0.9c1-1,0.9-2.5-0.9-4.2c-0.8-0.8-1.9-1.7-3.1-2.4
+		c1.4,0.3,2.9,0.5,3.9,0.5c2.5,0,3.6-0.9,3.6-2.4S22.9,9.6,20.4,9.6z M12,15c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S13.7,15,12,15z"
+		/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_gym.svg b/fhem/www/images/fhemSVG/hue_room_gym.svg
new file mode 100644
index 000000000..156b3ea67
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_gym.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="#000000" d="M22,10V8.9C22,8.4,21.6,8,21.1,8H20v4v0v0v4h1.1c0.5,0,0.9-0.4,0.9-0.9V14c0.5,0,1-0.2,1.4-0.6C23.8,13,24,12.5,24,12
+		s-0.2-1-0.6-1.4C23,10.2,22.5,10,22,10z"/>
+	<path fill="#000000" d="M18,5h-2c-0.6,0-1,0.4-1,1v4H9V6c0-0.6-0.4-1-1-1H6C5.4,5,5,5.4,5,6v6v0v0v6c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4h6v4
+		c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1V6C19,5.4,18.6,5,18,5z"/>
+	<path fill="#000000" d="M2,14v1.1C2,15.6,2.4,16,2.9,16H4V8H2.9C2.4,8,2,8.4,2,8.9V10c-0.5,0-1,0.2-1.4,0.6C0.2,11,0,11.5,0,12s0.2,1,0.6,1.4
+		C1,13.8,1.5,14,2,14z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_hallway.svg b/fhem/www/images/fhemSVG/hue_room_hallway.svg
new file mode 100644
index 000000000..8ecf4b5e4
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_hallway.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="none" d="M12.5,16.1c0.3,0,0.5-0.3,0.5-0.6V13c0-0.3-0.2-0.6-0.5-0.6S12,12.7,12,13v2.5C12,15.8,12.2,16.1,12.5,16.1z"
+		/>
+	<path fill="#000000" d="M2,24h2v-2h3h1v-1V7h2v16.4c0,0.4,0.4,0.7,0.7,0.6l6.8-1.2c0.3-0.1,0.5-0.3,0.5-0.6V6c0-0.3-0.2-0.6-0.5-0.6l-6.8-0.9
+		c-0.4,0-0.7,0.2-0.7,0.6V6H8H7v1v14H4V2h16v22h2V0H2V24z M12,13c0-0.3,0.2-0.6,0.5-0.6S13,12.7,13,13v2.5c0,0.3-0.2,0.6-0.5,0.6
+		S12,15.8,12,15.5V13z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_kids_bedroom.svg b/fhem/www/images/fhemSVG/hue_room_kids_bedroom.svg
new file mode 100644
index 000000000..294d54842
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_kids_bedroom.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="#000000" d="M23,12.5H1c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2v1h1v-1h16v1h1v-1h2c0.6,0,1-0.4,1-1v-4C24,12.9,23.6,12.5,23,12.5z"/>
+	<path fill="#000000" d="M15,11.5h5V7.6c0-1.7-0.9-3.1-2.6-3.1H7.5C5.8,4.5,4,5.9,4,7.6v3.9h5c-0.6,0-1-0.4-1-1s0.4-1,1-1h6c0.6,0,1,0.4,1,1
+		S15.6,11.5,15,11.5z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_kitchen.svg b/fhem/www/images/fhemSVG/hue_room_kitchen.svg
new file mode 100644
index 000000000..c82e46035
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_kitchen.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<rect x="20" y="11" fill="none" width="2" height="2"/>
+	<rect x="2" y="11" fill="none" width="2" height="2"/>
+	<path fill="#000000" d="M22.3,9H20V8H4v1H1.7C0.8,9,0,9.8,0,10.7v2.6C0,14.2,0.8,15,1.7,15H4v3c0,1.7,1.3,3,3,3h10c1.7,0,3-1.3,3-3v-3h2.3
+		c0.9,0,1.7-0.8,1.7-1.7v-2.6C24,9.8,23.2,9,22.3,9z M4,13H2v-2h2V13z M22,13h-2v-2h2V13z"/>
+	<path fill="#000000" d="M13.3,3h-2.6C9.8,3,9,3.5,9,4.4V6H4v1h5h6h5V6h-5V4.4C15,3.5,14.2,3,13.3,3z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_living.svg b/fhem/www/images/fhemSVG/hue_room_living.svg
new file mode 100644
index 000000000..9b958eb98
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_living.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="#000000" d="M20,13.5V11c0-0.8,0.7-1.5,1.5-1.5H23V6.6c0-1.2-0.9-2.1-2.1-2.1H3.1C1.9,4.5,1,5.4,1,6.6v2.9h1.5C3.3,9.5,4,10.2,4,11v2.5
+		H20z"/>
+	<path fill="#000000" d="M23,10.5L23,10.5h-1.5c-0.3,0-0.5,0.2-0.5,0.5v3.5H3V11c0-0.3-0.2-0.5-0.5-0.5H1h0c-0.6,0-1,0.4-1,1v5c0,1.1,0.9,2,2,2h1v1
+		h1v-1h16v1h1v-1h1c1.1,0,2-0.9,2-2v-5C24,10.9,23.6,10.5,23,10.5z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_nursery.svg b/fhem/www/images/fhemSVG/hue_room_nursery.svg
new file mode 100644
index 000000000..c348a51b3
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_nursery.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<path fill="#000000" d="M21,6l-9-6L3,6v4c-1.7,0.2-3,1.7-3,3.5C0,15.4,1.6,17,3.5,17S7,15.4,7,13.5c0-1.8-1.3-3.2-3-3.5V7.7C4.3,7.9,4.6,8,5,8
+	c1.1,0,2-1,2-2c0,1,1.1,2,2.5,2c0.6,0,1.1-0.2,1.5-0.4v9l-0.5,1.1L7,18.1l2.5,2.4L8.9,24l3.1-1.6l3.1,1.6l-0.6-3.4l2.5-2.4l-3.5-0.5
+	L12,14.5V6c0,1,1.1,2,2.5,2S17,7,17,6c0,1,0.9,2,2,2c0.4,0,0.7-0.1,1-0.3v3.1L17,16h7l-3-5.2V6z"/>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_office.svg b/fhem/www/images/fhemSVG/hue_room_office.svg
new file mode 100644
index 000000000..e5fa9e56f
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_office.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<path fill="#000000" d="M1,8h3v1H1V8z M0,21h5V4H0V21z"/>
+<path fill="#000000" d="M16.7,7.6L19.6,7l0.2,1l-2.9,0.6L16.7,7.6z M15,4.3L18.4,21l4.9-1L19.9,3.3L15,4.3z"/>
+<path fill="#000000" d="M8,5h5v2H8V5z M7,21h7V0H7V21z"/>
+<rect y="22" width="24" height="2"/>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_other.svg b/fhem/www/images/fhemSVG/hue_room_other.svg
new file mode 100644
index 000000000..c0cf87924
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_other.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<rect x="5" y="4" fill="none" width="4" height="16"/>
+	<path fill="none" d="M11.5,9.5C11.2,9.5,11,9.7,11,10v4c0,0.3,0.2,0.5,0.5,0.5S12,14.3,12,14v-4C12,9.7,11.8,9.5,11.5,9.5z"/>
+	<path fill="#000000" d="M18,1l-8-1C9.5,0,9,0,9,1v1H3v20h6v1c0,0.8,0.4,1,0.8,1h0.1c0,0,0.1,0,0.1,0l7.9-1c0.5-0.1,1-0.1,1-1V2C19,2,19,1.1,18,1z
+		 M9,20H5V4h4V20z M12,14c0,0.3-0.2,0.5-0.5,0.5S11,14.3,11,14v-4c0-0.3,0.2-0.5,0.5-0.5S12,9.7,12,10V14z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_recreation.svg b/fhem/www/images/fhemSVG/hue_room_recreation.svg
new file mode 100644
index 000000000..80b84301e
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_recreation.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<polygon fill="none" points="5,7.5 4,7.5 4,6.5 3,6.5 3,7.5 2,7.5 2,8.5 3,8.5 3,9.5 4,9.5 4,8.5 5,8.5 	"/>
+	<circle fill="none" cx="6.5" cy="11" r="1.5"/>
+	<circle fill="none" cx="17.5" cy="11" r="1.5"/>
+	<path fill="#000000" d="M19.8,4.5h-0.1H4.9C2.4,4.5,0,6.5,0,9v7.8c0,1.6,1.5,2.7,3,2.7c1.1,0,2.2-0.7,2.6-1.7L7,13.5h10l1.9,4.3
+		c0.6,1,1.3,1.6,2.4,1.6c1.6,0,2.7-1.1,2.7-2.6V9C24,6.5,22.2,4.5,19.8,4.5z M4,8.5v1H3v-1H2v-1h1v-1h1v1h1v1H4z M6.5,12.5
+		C5.7,12.5,5,11.8,5,11s0.7-1.5,1.5-1.5S8,10.2,8,11S7.3,12.5,6.5,12.5z M17.5,12.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5
+		S19,10.2,19,11S18.3,12.5,17.5,12.5z"/>
+</g>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_terrace.svg b/fhem/www/images/fhemSVG/hue_room_terrace.svg
new file mode 100644
index 000000000..f45f9cd1e
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_terrace.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<polygon points="4,14 4,16 10.9,16 5.1,24 7.6,24 12,17.8 16.5,24 18.9,24 13.2,16 20,16 20,14 "/>
+<path fill="#000000" d="M0,7.1c0,1,0.9,2,2,2c1.1,0,2-1,2-2c0,1,0.9,2,2,2c1.1,0,2-1,2-2c0,1,0.9,2,2,2c0.4,0,0.7-0.1,1-0.3V13h2V8.8
+	c0.3,0.2,0.6,0.3,1,0.3c1.1,0,2-1,2-2c0,1,0.9,2,2,2c1.1,0,2-1,2-2c0,1,0.9,2,2,2c1.1,0,2-1,2-2L12,0L0,7.1z"/>
+</svg>
diff --git a/fhem/www/images/fhemSVG/hue_room_toilet.svg b/fhem/www/images/fhemSVG/hue_room_toilet.svg
new file mode 100644
index 000000000..398a5055f
--- /dev/null
+++ b/fhem/www/images/fhemSVG/hue_room_toilet.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="-2 -2 26 26" xml:space="preserve">
+<g>
+	<path fill="#000000" d="M11.5,20c0,0,0.2-1,1.7-1H14c9.5,0,9.1-6,9.1-6H5v11h5.7l0.7-3.6L11.5,20z"/>
+	<path fill="#000000" d="M1,1v10c0,0.6,0.4,1,1,1h7c0.6,0,1-0.4,1-1V1c0-0.6-0.4-1-1-1H2C1.4,0,1,0.4,1,1z"/>
+	<path fill="#000000" d="M16,11h-1h-4v1h4h1h6.5c0.3,0,0.5-0.2,0.5-0.5S22.8,11,22.5,11H16z"/>
+</g>
+</svg>