diff --git a/icons-dark/actions/16/configure-shortcuts.svg b/icons-dark/actions/16/configure-shortcuts.svg
index 55562a99..27290ec5 120000
--- a/icons-dark/actions/16/configure-shortcuts.svg
+++ b/icons-dark/actions/16/configure-shortcuts.svg
@@ -1 +1 @@
-../../devices/22/input-keyboard.svg
\ No newline at end of file
+../../devices/16/input-keyboard.svg
\ No newline at end of file
diff --git a/icons-dark/actions/16/dialog-input-devices.svg b/icons-dark/actions/16/dialog-input-devices.svg
index 965ee7c3..daf0e272 100644
--- a/icons-dark/actions/16/dialog-input-devices.svg
+++ b/icons-dark/actions/16/dialog-input-devices.svg
@@ -1,8 +1,11 @@
 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M3 2v4h11v5h-2V7h-1v4H7v1h4v1h1v-1h3V2zm1 1h1v1h2V3h4v1h2V3h1v2H4z"/>
+        <path d="M3.5 7A2.5 2.5 0 0 0 1 9.5v1.973a2.5 2.5 0 0 0 0 .027A2.5 2.5 0 0 0 3.5 14 2.5 2.5 0 0 0 6 11.5V9.527A2.5 2.5 0 0 0 6 9.5 2.5 2.5 0 0 0 3.5 7zm0 1A1.5 1.5 0 0 1 5 9.5v1.955a1.5 1.5 0 0 1 0 .045A1.5 1.5 0 0 1 3.5 13 1.5 1.5 0 0 1 2 11.5V9.545A1.5 1.5 0 0 1 2 9.5 1.5 1.5 0 0 1 3.5 8zM3 9v1h1V9z"/>
+    </g>
 </svg>
diff --git a/icons-dark/actions/22/dialog-input-devices.svg b/icons-dark/actions/22/dialog-input-devices.svg
index e9a47e6e..1d9aa656 100644
--- a/icons-dark/actions/22/dialog-input-devices.svg
+++ b/icons-dark/actions/22/dialog-input-devices.svg
@@ -1,8 +1,12 @@
-<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M5 3v5h15v8h-2v-5h-1v5H9v1h8v1h1v-1h3V3zm1 1h14v3H6V5zm1 1v1h2V5zm10 0v1h2V5z"/>
+        <path d="M4.5 9A3.5 3.5 0 0 0 1 12.5v3a3.5 3.5 0 1 0 7 0v-3A3.5 3.5 0 0 0 4.5 9zm0 1A2.5 2.5 0 0 1 7 12.5v3a2.5 2.5 0 1 1-5 0v-3A2.5 2.5 0 0 1 4.5 10z"/>
+        <path d="M4 11h1v2H4z"/>
+    </g>
 </svg>
diff --git a/icons-dark/devices/16/input-keyboard-virtual.svg b/icons-dark/devices/16/input-keyboard-virtual.svg
new file mode 100644
index 00000000..f21430ea
--- /dev/null
+++ b/icons-dark/devices/16/input-keyboard-virtual.svg
@@ -0,0 +1,11 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M1 2v9l3 3v-3h11V2zm1 1h12v7H2z"/>
+        <path d="M3 4v1h1V4zm2 0v1h1V4zm2 0v1h1V4zm2 0v1h1V4zm2 0v1h2V4zM3 6v1h2V6zm3 0v1h1V6zm2 0v1h1V6zm2 0v1h3V6zM3 8v1h1V8zm2 0v1h6V8zm7 0v1h1V8z"/>
+    </g>
+</svg>
diff --git a/icons-dark/devices/16/input-keyboard.svg b/icons-dark/devices/16/input-keyboard.svg
new file mode 100644
index 00000000..7eb96e17
--- /dev/null
+++ b/icons-dark/devices/16/input-keyboard.svg
@@ -0,0 +1,11 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M9 1a2 2 0 0 0-2 2H1v11h14V3H8a1 1 0 0 1 1-1h2a1 1 0 0 0 1-1zM2 4h12v1H2zm0 2h12v7H2z"/>
+        <path d="M3 7v1h1V7zm2 0v1h1V7zm2 0v1h1V7zm2 0v1h1V7zm2 0v1h2V7zM3 9v1h2V9zm3 0v1h1V9zm2 0v1h1V9zm2 0v1h3V9zm-7 2v1h1v-1zm2 0v1h6v-1zm7 0v1h1v-1z"/>
+    </g>
+</svg>
diff --git a/icons-dark/actions/16/dialog-input-devices.svg b/icons-dark/devices/16/input-mouse.svg
similarity index 100%
copy from icons-dark/actions/16/dialog-input-devices.svg
copy to icons-dark/devices/16/input-mouse.svg
diff --git a/icons-dark/devices/16/input-touchpad.svg b/icons-dark/devices/16/input-touchpad.svg
new file mode 100644
index 00000000..0215a699
--- /dev/null
+++ b/icons-dark/devices/16/input-touchpad.svg
@@ -0,0 +1,8 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <path d="M2 2v12h12V2zm1 1h10v10H3zm1 7v2h3v-2zm5 0v2h3v-2z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>
diff --git a/icons-dark/devices/22/input-keyboard-virtual.svg b/icons-dark/devices/22/input-keyboard-virtual.svg
index 9ebf924a..0dbb81e3 100644
--- a/icons-dark/devices/22/input-keyboard-virtual.svg
+++ b/icons-dark/devices/22/input-keyboard-virtual.svg
@@ -1,13 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
-  <defs id="defs3051">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#eff0f1;
-      }
-      </style>
-  </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" 
-          d="m 2,1038.3622 0,11 18,0 0,-11 z m 1,1 7,0 1,0 8,0 0,1 -16,0 z m 0,2 16,0 0,7 -4,0 -8,0 -4,0 z m 1,1 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m -12,2 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m -12,2 0,1 2,0 0,-1 z m 3,0 0,1 8,0 0,-1 z m 9,0 0,1 2,0 0,-1 z"
-          transform="translate(0,-1030.3622)"
-          class="ColorScheme-Text"/>
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M2 6v9l3 4v-4h15V6zm1 1h16v7H3z"/>
+        <path d="M4 8v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h2V8zM4 10v1h2v-1zm3 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h3v-1zM4 12v1h2v-1zm3 0v1h8v-1zm9 0v1h2v-1z"/>
+    </g>
 </svg>
diff --git a/icons-dark/devices/22/input-keyboard.svg b/icons-dark/devices/22/input-keyboard.svg
index 314a73c2..4cadb400 100644
--- a/icons-dark/devices/22/input-keyboard.svg
+++ b/icons-dark/devices/22/input-keyboard.svg
@@ -1,13 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
-  <defs id="defs3051">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#eff0f1;
-      }
-      </style>
-  </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" 
-          d="m 13,1033.3622 0,1 0,1 c 0,0.554 -0.446,1 -1,1 -1.108,0 -2,0.892 -2,2 l -8,0 0,11 18,0 0,-11 -9,0 c 0,-0.554 0.446,-1 1,-1 1.108,0 2,-0.892 2,-2 l 0,-1 0,-1 -1,0 z m -10,6 7,0 1,0 8,0 0,1 -16,0 0,-1 z m 0,2 16,0 0,7 -4,0 -8,0 -4,0 0,-7 z m 1,1 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m -12,2 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m -12,2 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 8,0 0,-1 -8,0 z m 9,0 0,1 2,0 0,-1 -2,0 z" 
-          transform="translate(0,-1030.3622)"
-          class="ColorScheme-Text"/>
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M13 3v2c0 .554-.446 1-1 1-1.108 0-2 .892-2 2H2v11h18V8h-9c0-.554.446-1 1-1 1.108 0 2-.892 2-2V3zM3 9h16v1H3zm0 2h16v7H3z"/>
+        <path d="M4 12v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2v-1zM4 14v1h2v-1zm3 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h3v-1zM4 16v1h2v-1zm3 0v1h8v-1zm9 0v1h2v-1z"/>
+    </g>
 </svg>
diff --git a/icons-dark/devices/22/input-mouse.svg b/icons-dark/devices/22/input-mouse.svg
deleted file mode 120000
index 5036f432..00000000
--- a/icons-dark/devices/22/input-mouse.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/transform-browse.svg
\ No newline at end of file
diff --git a/icons-dark/devices/22/input-mouse.svg b/icons-dark/devices/22/input-mouse.svg
new file mode 100644
index 00000000..e9a47e6e
--- /dev/null
+++ b/icons-dark/devices/22/input-mouse.svg
@@ -0,0 +1,8 @@
+<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#eff0f1;
+        }
+    </style>
+    <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
+</svg>
diff --git a/icons/actions/16/configure-shortcuts.svg b/icons/actions/16/configure-shortcuts.svg
index 55562a99..27290ec5 120000
--- a/icons/actions/16/configure-shortcuts.svg
+++ b/icons/actions/16/configure-shortcuts.svg
@@ -1 +1 @@
-../../devices/22/input-keyboard.svg
\ No newline at end of file
+../../devices/16/input-keyboard.svg
\ No newline at end of file
diff --git a/icons/actions/16/dialog-input-devices.svg b/icons/actions/16/dialog-input-devices.svg
index ed7f24e4..1740fcc3 100644
--- a/icons/actions/16/dialog-input-devices.svg
+++ b/icons/actions/16/dialog-input-devices.svg
@@ -1,8 +1,11 @@
 <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M3 2v4h11v5h-2V7h-1v4H7v1h4v1h1v-1h3V2zm1 1h1v1h2V3h4v1h2V3h1v2H4z"/>
+        <path d="M3.5 7A2.5 2.5 0 0 0 1 9.5v1.973a2.5 2.5 0 0 0 0 .027A2.5 2.5 0 0 0 3.5 14 2.5 2.5 0 0 0 6 11.5V9.527A2.5 2.5 0 0 0 6 9.5 2.5 2.5 0 0 0 3.5 7zm0 1A1.5 1.5 0 0 1 5 9.5v1.955a1.5 1.5 0 0 1 0 .045A1.5 1.5 0 0 1 3.5 13 1.5 1.5 0 0 1 2 11.5V9.545A1.5 1.5 0 0 1 2 9.5 1.5 1.5 0 0 1 3.5 8zM3 9v1h1V9z"/>
+    </g>
 </svg>
diff --git a/icons/actions/22/dialog-input-devices.svg b/icons/actions/22/dialog-input-devices.svg
index 345d61b1..21a7f983 100644
--- a/icons/actions/22/dialog-input-devices.svg
+++ b/icons/actions/22/dialog-input-devices.svg
@@ -1,8 +1,12 @@
-<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <style type="text/css" id="current-color-scheme">
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M5 3v5h15v8h-2v-5h-1v5H9v1h8v1h1v-1h3V3zm1 1h14v3H6V5zm1 1v1h2V5zm10 0v1h2V5z"/>
+        <path d="M4.5 9A3.5 3.5 0 0 0 1 12.5v3a3.5 3.5 0 1 0 7 0v-3A3.5 3.5 0 0 0 4.5 9zm0 1A2.5 2.5 0 0 1 7 12.5v3a2.5 2.5 0 1 1-5 0v-3A2.5 2.5 0 0 1 4.5 10z"/>
+        <path d="M4 11h1v2H4z"/>
+    </g>
 </svg>
diff --git a/icons/devices/16/input-keyboard-virtual.svg b/icons/devices/16/input-keyboard-virtual.svg
new file mode 100644
index 00000000..bc967532
--- /dev/null
+++ b/icons/devices/16/input-keyboard-virtual.svg
@@ -0,0 +1,11 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M1 2v9l3 3v-3h11V2zm1 1h12v7H2z"/>
+        <path d="M3 4v1h1V4zm2 0v1h1V4zm2 0v1h1V4zm2 0v1h1V4zm2 0v1h2V4zM3 6v1h2V6zm3 0v1h1V6zm2 0v1h1V6zm2 0v1h3V6zM3 8v1h1V8zm2 0v1h6V8zm7 0v1h1V8z"/>
+    </g>
+</svg>
diff --git a/icons/devices/16/input-keyboard.svg b/icons/devices/16/input-keyboard.svg
new file mode 100644
index 00000000..c9ee7790
--- /dev/null
+++ b/icons/devices/16/input-keyboard.svg
@@ -0,0 +1,11 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M9 1a2 2 0 0 0-2 2H1v11h14V3H8a1 1 0 0 1 1-1h2a1 1 0 0 0 1-1zM2 4h12v1H2zm0 2h12v7H2z"/>
+        <path d="M3 7v1h1V7zm2 0v1h1V7zm2 0v1h1V7zm2 0v1h1V7zm2 0v1h2V7zM3 9v1h2V9zm3 0v1h1V9zm2 0v1h1V9zm2 0v1h3V9zm-7 2v1h1v-1zm2 0v1h6v-1zm7 0v1h1v-1z"/>
+    </g>
+</svg>
diff --git a/icons/actions/16/dialog-input-devices.svg b/icons/devices/16/input-mouse.svg
similarity index 100%
copy from icons/actions/16/dialog-input-devices.svg
copy to icons/devices/16/input-mouse.svg
diff --git a/icons/devices/16/input-touchpad.svg b/icons/devices/16/input-touchpad.svg
new file mode 100644
index 00000000..8c24b1c4
--- /dev/null
+++ b/icons/devices/16/input-touchpad.svg
@@ -0,0 +1,8 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M2 2v12h12V2zm1 1h10v10H3zm1 7v2h3v-2zm5 0v2h3v-2z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>
diff --git a/icons/devices/22/input-keyboard-virtual.svg b/icons/devices/22/input-keyboard-virtual.svg
index 15ec5258..301e0025 100644
--- a/icons/devices/22/input-keyboard-virtual.svg
+++ b/icons/devices/22/input-keyboard-virtual.svg
@@ -1,13 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
-  <defs id="defs3051">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <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,1038.3622 0,11 18,0 0,-11 z m 1,1 7,0 1,0 8,0 0,1 -16,0 z m 0,2 16,0 0,7 -4,0 -8,0 -4,0 z m 1,1 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m -12,2 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m 3,0 0,1 2,0 0,-1 z m -12,2 0,1 2,0 0,-1 z m 3,0 0,1 8,0 0,-1 z m 9,0 0,1 2,0 0,-1 z"
-          transform="translate(0,-1030.3622)"
-          class="ColorScheme-Text"/>
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M2 6v9l3 4v-4h15V6zm1 1h16v7H3z"/>
+        <path d="M4 8v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h1V8zm2 0v1h2V8zM4 10v1h2v-1zm3 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h3v-1zM4 12v1h2v-1zm3 0v1h8v-1zm9 0v1h2v-1z"/>
+    </g>
 </svg>
diff --git a/icons/devices/22/input-keyboard.svg b/icons/devices/22/input-keyboard.svg
index 7139bc11..413727d4 100644
--- a/icons/devices/22/input-keyboard.svg
+++ b/icons/devices/22/input-keyboard.svg
@@ -1,13 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
-  <defs id="defs3051">
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
     <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 13,1033.3622 0,1 0,1 c 0,0.554 -0.446,1 -1,1 -1.108,0 -2,0.892 -2,2 l -8,0 0,11 18,0 0,-11 -9,0 c 0,-0.554 0.446,-1 1,-1 1.108,0 2,-0.892 2,-2 l 0,-1 0,-1 -1,0 z m -10,6 7,0 1,0 8,0 0,1 -16,0 0,-1 z m 0,2 16,0 0,7 -4,0 -8,0 -4,0 0,-7 z m 1,1 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m -12,2 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 2,0 0,-1 -2,0 z m -12,2 0,1 2,0 0,-1 -2,0 z m 3,0 0,1 8,0 0,-1 -8,0 z m 9,0 0,1 2,0 0,-1 -2,0 z" 
-          transform="translate(0,-1030.3622)"
-          class="ColorScheme-Text"/>
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g class="ColorScheme-Text" fill="currentColor">
+        <path d="M13 3v2c0 .554-.446 1-1 1-1.108 0-2 .892-2 2H2v11h18V8h-9c0-.554.446-1 1-1 1.108 0 2-.892 2-2V3zM3 9h16v1H3zm0 2h16v7H3z"/>
+        <path d="M4 12v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2v-1zM4 14v1h2v-1zm3 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h1v-1zm2 0v1h3v-1zM4 16v1h2v-1zm3 0v1h8v-1zm9 0v1h2v-1z"/>
+    </g>
 </svg>
diff --git a/icons/devices/22/input-mouse.svg b/icons/devices/22/input-mouse.svg
deleted file mode 120000
index 5036f432..00000000
--- a/icons/devices/22/input-mouse.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/transform-browse.svg
\ No newline at end of file
diff --git a/icons/devices/22/input-mouse.svg b/icons/devices/22/input-mouse.svg
new file mode 100644
index 00000000..345d61b1
--- /dev/null
+++ b/icons/devices/22/input-mouse.svg
@@ -0,0 +1,8 @@
+<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
+</svg>