diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index d3935b45..1aafd2ee 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -14,6 +14,10 @@
   margin: 0;
 }
 
+.stf-device-list .device-status {
+  margin-top: 4px;
+}
+
 ul.devices-icon-view {
   margin: 0;
   display: inline-block;
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 00a6d817..2ab50744 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -18,7 +18,7 @@ div.stf-device-list
                     img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
                   .device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }}
                   //raphael-status-icon.device-status-button(status='{{ deviceStatus(device) }}', title="{{ deviceStatusText(device) }}", tooltip='{{ deviceStatusText(device)|translate }}')
-                  p {{statusName(device)}}
+                  button(ng-class='{"btn-primary": device.state == "using", "btn-primary-outline": device.state == "available"}').btn.btn-xs.device-status {{statusName(device)}}
                 .clear-fix
               .clear-fix
               .line
@@ -30,7 +30,7 @@ div.stf-device-list
                     img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
                   .device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }}
                   //raphael-status-icon.device-status-button(status='{{ deviceStatus(device) }}', title="{{ deviceStatusText(device) }}", tooltip='{{ deviceStatusText(device)|translate }}')
-                  p {{statusName(device)}}
+                  button.btn.btn-default.btn-xs.device-status {{statusName(device)}}
                 .clear-fix
 
             tab(heading='Details')