diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm
index b97ac43b0..3db6c10bc 100755
--- a/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/webfrontend/pgm2/01_FHEMWEB.pm
@@ -1868,6 +1868,8 @@ FW_devState($$)
   }
 
   if($link) {
+    my $room = AttrVal($d, "room", undef);
+    $link .= "&room=$room" if($room);
     if($FW_longpoll) {
       $txt = "<a onClick=\"cmd('$FW_ME?XHR=1&$link')\">$txt</a>";
 
diff --git a/webfrontend/pgm2/on-till.png b/webfrontend/pgm2/on-till.png
new file mode 100644
index 000000000..f54efc9f5
Binary files /dev/null and b/webfrontend/pgm2/on-till.png differ
diff --git a/webfrontend/pgm2/toggle.png b/webfrontend/pgm2/toggle.png
new file mode 100644
index 000000000..79cf50ca7
Binary files /dev/null and b/webfrontend/pgm2/toggle.png differ