diff --git a/AUTHORS.md b/AUTHORS.md
index 8b1055196..d24321739 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -17,3 +17,4 @@ Contributors to LibreNMS:
 
 [1]: http://observium.org/ "Observium web site"
 
+
diff --git a/html/images/16/http.png b/html/images/16/http.png
new file mode 100644
index 000000000..58781b355
Binary files /dev/null and b/html/images/16/http.png differ
diff --git a/html/images/16/ssh.png b/html/images/16/ssh.png
new file mode 100644
index 000000000..3fbd369c5
Binary files /dev/null and b/html/images/16/ssh.png differ
diff --git a/html/images/16/telnet.png b/html/images/16/telnet.png
new file mode 100644
index 000000000..e654b5e24
Binary files /dev/null and b/html/images/16/telnet.png differ
diff --git a/html/includes/hostbox-menu.inc.php b/html/includes/hostbox-menu.inc.php
index a053421e7..aa1e3025e 100644
--- a/html/includes/hostbox-menu.inc.php
+++ b/html/includes/hostbox-menu.inc.php
@@ -14,11 +14,30 @@
 
 echo('<td>');
     if (device_permitted($device['device_id'])) {
+        echo ('<div class="row">
+                   <div class="col-xs-1">');
         echo '<a href="'.generate_device_url($device).'"> <img src="images/16/server.png" border="0" align="absmiddle" alt="View device" /></a> ';
+        echo ('</div>
+               <div class="col-xs-1">');
         echo '<a href="'.generate_device_url($device, array('tab' => 'alerts')).'"> <img src="images/16/bell.png" border="0" align="absmiddle" alt="View alerts"  /></a> ';
+        echo '</div>';
         if ($_SESSION['userlevel'] >= "7") {
-            echo '<a href="'.generate_device_url($device, array('tab' => 'edit')).'"> <img src="images/16/wrench.png" border="0" align="absmiddle" alt="Edit device" /></a> ';
+            echo ('<div class="col-xs-1">
+                       <a href="'.generate_device_url($device, array('tab' => 'edit')).'"> <img src="images/16/wrench.png" border="0" align="absmiddle" alt="Edit device" /></a>
+                   </div>');
         }
+        echo ('</div>
+               <div class="row">
+                   <div class="col-xs-1">
+                       <a href="telnet://' . $device['hostname']  . '"><img src="images/16/telnet.png" alt="telnet" border="0" width="16" height="16"></a>
+                   </div>
+                   <div class="col-xs-1">
+                       <a href="ssh://' . $device['hostname']  . '"><img src="images/16/ssh.png" alt="ssh" border="0" width="16" height="16"></a>
+                   </div>
+                   <div class="col-xs-1">
+                       <a href="https://' . $device['hostname']  . '"><img src="images/16/http.png" alt="https" border="0" width="16" height="16" target="_blank"></a>
+                   </div>
+               </div>');
     }
 echo('</td>');
 
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 92d7a36a1..396b43f20 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -367,6 +367,10 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
+    echo ('<li style="float: right;"><a href="https://' . $device['hostname']  . '"><img src="images/16/http.png" alt="https" border="0" width="16" height="16" target="_blank"></a></li>
+           <li style="float: right;"><a href="ssh://' . $device['hostname']  . '"><img src="images/16/ssh.png" alt="ssh" border="0" width="16" height="16"></a></li>
+           <li style="float: right;"><a href="telnet://' . $device['hostname']  . '"><img src="images/16/telnet.png" alt="telnet" border="0" width="16" height="16"></a></li>');
+
     if ($_SESSION['userlevel'] >= "7")
     {
       echo('<li class="' . $select['edit'] . '" style="float: right;">