diff --git a/extension/extension-kdeconnect.js b/extension/extension-kdeconnect.js
index ce509c26..f978c388 100644
--- a/extension/extension-kdeconnect.js
+++ b/extension/extension-kdeconnect.js
@@ -1,70 +1,98 @@
 /*
     Copyright (C) 2017 Kai Uwe Broulik <kde@privat.broulik.de>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 3 of
     the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var kdeConnectMenuIdPrefix = "kdeconnect_page_";
 var kdeConnectDevices = {};
 
 chrome.contextMenus.onClicked.addListener(function (info) {
     if (!info.menuItemId.startsWith(kdeConnectMenuIdPrefix)) {
         return;
     }
 
     var deviceId = info.menuItemId.substr(kdeConnectMenuIdPrefix.length);
 
     var url = info.linkUrl || info.srcUrl || info.pageUrl;
     console.log("Send url", url, "to kdeconnect device", deviceId);
     if (!url) {
         return;
     }
 
     port.postMessage({
         subsystem: "kdeconnect",
         event: "shareUrl",
         url: url,
         deviceId: deviceId
     });
 });
 
 addCallback("kdeconnect", "deviceAdded", function(message) {
     let deviceId = message.id;
     let name = message.name;
     let type = message.type;
 
     let menuEntryTitle = chrome.i18n.getMessage("kdeconnect_open_device", name);
     let menuId = kdeConnectMenuIdPrefix + deviceId;
 
-    chrome.contextMenus.create({
+    let props = {
         id: menuId,
         contexts: ["link", "page", "image", "audio", "video"],
         title: menuEntryTitle,
-    });
+    };
+
+    if (IS_FIREFOX) {
+        let iconName = "";
+        switch (type) {
+            case "smartphone":
+            case "phone":
+                iconName = "smartphone-symbolic";
+                break;
+            case "tablet":
+                iconName = "tablet-symbolic";
+                break;
+            case "desktop":
+            case "tv": // at this size you can't really tell desktop monitor icon from a TV
+                iconName = "computer-symbolic";
+                break;
+            case "laptop":
+                iconName = "computer-laptop-symbolic";
+                break;
+        }
+
+        if (iconName) {
+            props.icons = {
+                "16": "icons/" + iconName + ".svg"
+            };
+        }
+    }
+
+    chrome.contextMenus.create(props);
 
     kdeConnectDevices[deviceId] = {
         name, type
     };
 });
 
 addCallback("kdeconnect", "deviceRemoved", function(message) {
     let deviceId = message.id;
 
     if (!kdeConnectDevices[deviceId]) {
         return;
     }
 
     delete kdeConnectDevices[deviceId];
     chrome.contextMenus.remove(kdeConnectMenuIdPrefix + deviceId);
 });
diff --git a/extension/icons/computer-laptop-symbolic.svg b/extension/icons/computer-laptop-symbolic.svg
new file mode 100644
index 00000000..641d6576
--- /dev/null
+++ b/extension/icons/computer-laptop-symbolic.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 3 4 L 3 11 L 2 11 C 2 11.554 2.446 12 3 12 L 13 12 C 13.554 12 14 11.554 14 11 L 13 11 L 13 4 L 3 4 z M 4 5 L 12 5 L 12 10 L 4 10 L 4 5 z "
+        class="ColorScheme-Text"/>
+</svg>
diff --git a/extension/icons/computer-symbolic.svg b/extension/icons/computer-symbolic.svg
new file mode 100644
index 00000000..4f3e49c5
--- /dev/null
+++ b/extension/icons/computer-symbolic.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 2 3 L 2 11 L 7 11 L 7 12 L 5 12 L 5 13 L 11 13 L 11 12 L 9 12 L 9 11 L 14 11 L 14 3 L 2 3 z M 3 4 L 13 4 L 13 10 L 3 10 L 3 4 z " 
+        class="ColorScheme-Text"/>
+</svg>
diff --git a/extension/icons/smartphone-symbolic.svg b/extension/icons/smartphone-symbolic.svg
new file mode 100644
index 00000000..aaa163a7
--- /dev/null
+++ b/extension/icons/smartphone-symbolic.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 4 2 L 4 14 L 12 14 L 12 2 L 4 2 z M 7 3 L 9 3 L 9 4 L 7 4 L 7 3 z M 5 5 L 11 5 L 11 12 L 5 12 L 5 5 z "
+        class="ColorScheme-Text"/>
+</svg>
diff --git a/extension/icons/tablet-symbolic.svg b/extension/icons/tablet-symbolic.svg
new file mode 100644
index 00000000..49512ee3
--- /dev/null
+++ b/extension/icons/tablet-symbolic.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+    </defs>
+    <path d="m1 3v10h14v-10zm3 2h8v6h-8zm-2 2h1v2h-1zm11 0h1v2h-1z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Text"/>
+</svg>