diff --git a/lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html b/lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html
index 084f5a23..4723e806 100644
--- a/lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html
+++ b/lib/gui/app/components/drive-selector/templates/drive-selector-modal.tpl.html
@@ -11,7 +11,7 @@
       ng-click="modal.toggleDrive(drive)">
         <img class="list-group-item-section" alt="Drive device type logo"
           ng-if="drive.icon"
-          ng-src="./assets/{{drive.icon}}.svg"
+          ng-src="../assets/{{drive.icon}}.svg"
           width="25"
           height="30">
         <div
diff --git a/lib/gui/app/modules/drive-scanner.js b/lib/gui/app/modules/drive-scanner.js
index 6bc9e516..df72113c 100644
--- a/lib/gui/app/modules/drive-scanner.js
+++ b/lib/gui/app/modules/drive-scanner.js
@@ -22,13 +22,14 @@ const fs = Bluebird.promisifyAll(require('fs'))
 const path = require('path')
 const settings = require('../models/settings')
 const SDK = require('../../../sdk')
+const permissions = require('../../../shared/permissions')
 
 /**
  * @summary The Etcher "blobs" directory path
  * @type {String}
  * @constant
  */
-const BLOBS_DIRECTORY = path.join(__dirname, '..', '..', 'blobs')
+const BLOBS_DIRECTORY = path.join(__dirname, '..', '..', '..', 'blobs')
 
 const scanner = SDK.createScanner({
   blockdevice: {
@@ -51,4 +52,17 @@ const scanner = SDK.createScanner({
   }
 })
 
+// NOTE: Enable USBBoot on Linux if run as root
+permissions.isElevated().then((elevated) => {
+  if (elevated && process.platform === 'linux') {
+    const UsbbootAdapter = require('../../../sdk/adapters/usbboot')
+    const adapter = new UsbbootAdapter()
+    scanner.stop()
+    scanner.subscribe(adapter)
+    scanner.start()
+  }
+}).catch((error) => {
+  console.warn('Could not add usbboot adapter:', error)
+})
+
 module.exports = scanner