diff --git a/docs/pgm2-4.png b/docs/pgm2-4.png
index c09f1df06..9cd9b882d 100644
Binary files a/docs/pgm2-4.png and b/docs/pgm2-4.png differ
diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm
index b62f961f9..f0688fcec 100755
--- a/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/webfrontend/pgm2/01_FHEMWEB.pm
@@ -27,6 +27,8 @@ sub FW_fatal($);
 sub pF($@);
 sub pO(@);
 sub pH(@);
+sub pHPlain(@);
+sub pHJava(@);
 sub FW_AnswerCall($);
 sub FW_zoomLink($$$);
 sub FW_calcWeblink($$);
@@ -624,11 +626,10 @@ FW_doDetail($)
 
   my $pgm = "Javascript:" .
              "s=document.getElementById('edit').style;".
-             "if(s.display=='none') s.display='block'; else s.display='none';".
+             "s.display = s.display=='none' ? 'block' : 'none';".
              "s=document.getElementById('disp').style;".
-             "if(s.display=='none') s.display='block'; else s.display='none';";
-  pO "<a onClick=\"$pgm\">Modify $d</a>";
-
+             "s.display = s.display=='none' ? 'block' : 'none';";
+  pHJava $pgm, "Modify $d";
   pH "room=$FW_room", "Back:$FW_room" if($FW_ss);
 
   pO "</td></tr><tr><td>";
@@ -976,7 +977,7 @@ FW_logWrapper($)
       pO "<img src=\"$arg\"/>";
     }
 
-    pH "cmd=toweblink $d:$type:$file", "<br>Convert to weblink";
+    pH "cmd=toweblink $d:$type:$file", "Convert to weblink";
     pO "</td>";
     pO "</td></tr></table>";
     pO "</td></tr></table>";
@@ -1306,7 +1307,7 @@ FW_zoomLink($$$)
   }
 
 
-  pH "$cmd", "<img style=\"border-color:transparent\" alt=\"$alt\" ".
+  pHPlain "$cmd", "<img style=\"border-color:transparent\" alt=\"$alt\" ".
                 "src=\"$FW_ME/icons/$img\"/>";
 }
 
@@ -1527,6 +1528,32 @@ pH(@)
 {
    my ($link, $txt, $td) = @_;
 
+   pO "<td>" if($td);
+   if($FW_ss) {
+     pO "<a onClick=\"location.href='$FW_ME?$link'\"><div class=\"href\">$txt</div></a>";
+   } else {
+     pO "<a href=\"$FW_ME?$link\">$txt</a>";
+   }
+   pO "</td>" if($td);
+}
+
+sub
+pHJava(@)
+{
+   my ($link, $txt) = @_;
+
+   if($FW_ss) {
+     pO "<a onClick=\"$link\"><div class=\"href\">$txt</div></a>";
+   } else {
+     pO "<a onClick=\"$link\">$txt</a>";
+   }
+}
+
+sub
+pHPlain(@)
+{
+   my ($link, $txt, $td) = @_;
+
    pO "<td>" if($td);
    if($FW_ss) {
      pO "<a onClick=\"location.href='$FW_ME?$link'\">$txt</a>";
@@ -1536,6 +1563,7 @@ pH(@)
    pO "</td>" if($td);
 }
 
+
 ##################
 # print formatted
 sub
@@ -1581,7 +1609,7 @@ FW_showWeblink($$$)
       }
 
       if($FW_ss) {
-        pH "detail=$d", $d;
+        pHPlain "detail=$d", $d;
         pO "<br>";
       } else {
         pO "<table><tr><td>";
diff --git a/webfrontend/pgm2/style_smallscreen.css b/webfrontend/pgm2/style_smallscreen.css
index 1e5c31af1..f4feeba36 100644
--- a/webfrontend/pgm2/style_smallscreen.css
+++ b/webfrontend/pgm2/style_smallscreen.css
@@ -6,6 +6,14 @@ body     { background-color: #FFFFE7;}
 
 a {  color: #278727; }
 
+div.href { /* Push buttons */
+  padding:0; border:1px solid gray; height:1.5em;
+  -moz-border-radius:0.5em; -webkit-border-radius:0.5em;
+  display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center;
+  background-image:-webkit-gradient(linear, right top, right bottom, color-stop(0%,#fffff7), color-stop(49%,#ffffc7));
+  -webkit-box-shadow: 0 0.15em 0.15em rgba(0,0,0, .5);
+}
+
 table.block { border:1px solid gray; width: 100%; background: #F8F8E0; }
 table.block tr.odd { background: #F0F0D8; }
 table.block tr.sel { background: #F0F0D8; }