diff --git a/lib/middleware/device-icons.js b/lib/middleware/device-icons.js
index 332acb7d..bc604ade 100644
--- a/lib/middleware/device-icons.js
+++ b/lib/middleware/device-icons.js
@@ -4,5 +4,5 @@ var pathutil = require('../util/pathutil')
 
 module.exports = function() {
   return express.static(
-    pathutil.root('node_modules/stf-device-db/data/small'))
+    pathutil.root('node_modules/stf-device-db/dist'))
 }
diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index 9dd45653..0e7d1dfa 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -20,7 +20,7 @@
           a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle
             p
               .device-small-image
-                img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
+                img(ng-src='{{device.image ? "/static/devices/icon/x24/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
               span.device-name-text {{ device.name }}
               span.caret(ng-show='groupDevices.length > 0')
             span(ng-show='device && !device.present', translate) (Absent)
@@ -29,7 +29,7 @@
             li(ng-repeat='groupDevice in groupDevices')
               a(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
                 .device-small-image
-                  img(ng-src='{{groupDevice.image ? "/static/devices/" + groupDevice.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
+                  img(ng-src='{{groupDevice.image ? "/static/devices/icon/x24/" + groupDevice.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
                 span(ng-class='{"current-device": groupDevice.serial === device.serial }') {{ groupDevice.name }}
 
                 span.pull-right(ng-click='kickDevice(groupDevice); $event.stopPropagation()').kick-device
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 08d343aa..1410a10c 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -16,7 +16,7 @@ div.stf-device-list
                   ng-click='toggle(device)',
                   ).cursor-select.pointer.thumbnail
                     .device-photo-small
-                      img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
+                      img(ng-src='{{device.image ? "/static/devices/icon/x120/" + 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 }}')
                     button(ng-class='{"btn-primary": device.state == "using", "btn-primary-outline": device.state == "available"}').btn.btn-xs.device-status {{device.state|statusName}}
@@ -28,7 +28,7 @@ div.stf-device-list
                   ng-disabled='true',
                   ).cursor-select.pointer.thumbnail.device-is-busy
                     .device-photo-small
-                      img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
+                      img(ng-src='{{device.image ? "/static/devices/icon/x120/" + 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 }}')
                     //button.btn.btn-default.btn-xs.device-status {{statusName(device)}}