diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css
index d746eb8f..7b6a2eb8 100644
--- a/res/app/control-panes/device-control/device-control.css
+++ b/res/app/control-panes/device-control/device-control.css
@@ -183,7 +183,6 @@ device-screen input {
 
 .stf-device-control .kick-device {
   color: #9c9c9c;
-  margin-left: 25px;
 }
 
 .stf-device-control .kick-device:hover {
@@ -269,6 +268,10 @@ device-screen input {
   width: 12px;
 }
 
+.dropdown-menu > li > a.stf-device-control {
+  margin-left: 7px;
+}
+
 .no-transition {
   -webkit-transition: none !important;
   -moz-transition: none !important;
diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index 1ef2aff2..53fdb8a6 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -15,7 +15,7 @@
             i(ng-show='showScreen', tooltip-html-unsafe='{{"Hide Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye
             i(ng-show='!showScreen', tooltip-html-unsafe='{{"Show Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye-slash
 
-        .device-name-container(dropdown)
+        .device-name-container.pull-left(dropdown)
           a.stf-vnc-device-name.pointer.unselectable(dropdown-toggle)
             p
               .device-small-image
@@ -25,7 +25,7 @@
 
           ul.dropdown-menu(role='menu', data-toggle='dropdown', ng-show='groupDevices.length > 0').pointer.unselectable
             li(ng-repeat='groupDevice in groupDevices')
-              a(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
+              a.stf-device-control(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
                 .pull-left
                   .device-small-image
                     img(ng-src='/static/app/devices/icon/x24/{{ groupDevice.image || "E30HT.jpg" }}')