diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml
index a16e6fa16..f0bf289c9 100644
--- a/data/gnome-shell-icons.gresource.xml
+++ b/data/gnome-shell-icons.gresource.xml
@@ -42,18 +42,20 @@
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-high-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-medium-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-off-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-caps-lock-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-enter-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-hide-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-layout-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-shift-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/keyboard-zwnj-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/message-indicator-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/no-notifications-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-caps-lock-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-delete-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-emoji-picker-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-enter-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-hide-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-layout-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-shift-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/osk-zwnj-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/screen-privacy-disabled-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/screen-privacy-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">scalable/status/switch-on-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/switch-off-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/switch-on-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/wellbeing-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/data/icons/scalable/status/keyboard-enter-symbolic.svg b/data/icons/scalable/status/keyboard-enter-symbolic.svg
deleted file mode 100644
index 7fe839b4a..000000000
--- a/data/icons/scalable/status/keyboard-enter-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 19 6 v 6.003906 c 0.007812 0.996094 -1 0.996094 -1 0.996094 h -11.585938 l 1.292969 -1.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 l -3 3 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 3 3 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -1.289062 -1.292969 h 11.582031 c 3.007812 0 3 -3 3 -3 v -6 z m 0 0" fill="#241f31"/>
-</svg>
diff --git a/data/icons/scalable/status/keyboard-hide-symbolic.svg b/data/icons/scalable/status/keyboard-hide-symbolic.svg
deleted file mode 100644
index d18bfab5d..000000000
--- a/data/icons/scalable/status/keyboard-hide-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 2.49705,2.00665 c -0.554,0 -1,0.446 -1,1 v 11 c 0,0.554 0.446,1 1,1 h 19.0059 c 0.554,0 1,-0.446 1,-1 v -11 c 0,-0.554 -0.446,-1 -1,-1 z m 1.3653,2 h 1.6562 v 2 h -2 v -1.6074 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z m 2.6562,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1.6563 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.6074 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -13.9844,3 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -9.6621,4 h 10.3125 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.2148 c 0,0.218 -0.1537,0.3926 -0.3437,0.3926 H 6.84085 c -0.19,0 -0.3438,-0.1746 -0.3438,-0.3926 v -1.2148 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z" fill="#241f31"/>
-    <path d="m 17,17.99335 -4.99512,4 -5.00488,-4 z" fill="#241f31"/>
-</svg>
diff --git a/data/icons/scalable/status/keyboard-layout-symbolic.svg b/data/icons/scalable/status/keyboard-layout-symbolic.svg
deleted file mode 100644
index c93f9355e..000000000
--- a/data/icons/scalable/status/keyboard-layout-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 2985,-2801.6382 c -0.2187,0 -0.4414,0.012 -0.6562,0.031 l -0.4063,2.0938 c -0.332,0.07 -0.6562,0.1758 -0.9687,0.3125 l -1.5313,-1.4648 c -0.3867,0.2265 -0.7266,0.5117 -1.0625,0.8085 l 0.9063,1.9063 c -0.2227,0.25 -0.4219,0.5234 -0.5938,0.8125 l -2.0937,-0.2773 c -0.1758,0.4101 -0.3125,0.8398 -0.4063,1.2773 l 1.8438,1 c -0.02,0.168 -0.027,0.332 -0.031,0.5 0,0.1719 0.016,0.332 0.031,0.5 l -1.8438,1 c 0.098,0.4453 0.2266,0.8711 0.4063,1.2812 l 2.0937,-0.2812 c 0.1719,0.2891 0.3711,0.5625 0.5938,0.8125 l -0.9063,1.9062 c 0.3359,0.3008 0.6758,0.5821 1.0625,0.8125 l 1.5313,-1.4687 c 0.3046,0.1367 0.6328,0.2383 0.9687,0.3125 l 0.4063,2.0937 c 0.4375,0.043 0.875,0.043 1.3125,0 l 0.4062,-2.0937 c 0.3359,-0.074 0.6641,-0.1758 0.9688,-0.3125 l 1.5312,1.4687 c 0.3867,-0.2304 0.7266,-0.5117 1.0625,-0.8125 l -0.9062,-1.9062 c 0.2226,-0.25 0.4218,-0.5234 0.5937,-0.8125 l 2.0938,0.2812 c 0.1757,-0.414 0.3125,-0.8398 0.4062,-1.2812 l -1.8437,-1 c 0.016,-0.168 0.031,-0.3281 0.031,-0.5 0,-0.1719 -0.016,-0.332 -0.031,-0.5 l 1.8437,-1 c -0.094,-0.4375 -0.2305,-0.8672 -0.4062,-1.2813 l -2.0938,0.2813 c -0.1719,-0.2891 -0.3672,-0.5625 -0.5937,-0.8125 l 0.9062,-1.9063 c -0.3359,-0.2968 -0.6758,-0.582 -1.0625,-0.8125 l -1.5312,1.4688 c -0.3125,-0.1367 -0.6368,-0.2422 -0.9688,-0.3125 l -0.4062,-2.0938 c -0.2188,-0.019 -0.4375,-0.031 -0.6563,-0.031 z m 0,4 c 1.6563,0 3,1.3437 3,3 0,1.6562 -1.3437,3 -3,3 -1.6562,0 -3,-1.3438 -3,-3 0,-1.6563 1.3438,-3 3,-3 z m 0,0" transform="matrix(1.5,0,0,1.5,-4465.5,4203.9569)" fill="#241f31"/>
-</svg>
diff --git a/data/icons/scalable/status/keyboard-zwnj-symbolic.svg b/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
deleted file mode 100644
index 7204f474c..000000000
--- a/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
-  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
-</svg>
diff --git a/data/icons/scalable/status/keyboard-caps-lock-symbolic.svg b/data/icons/scalable/status/osk-caps-lock-symbolic.svg
similarity index 83%
rename from data/icons/scalable/status/keyboard-caps-lock-symbolic.svg
rename to data/icons/scalable/status/osk-caps-lock-symbolic.svg
index 9efd39432..b98ef7521 100644
--- a/data/icons/scalable/status/keyboard-caps-lock-symbolic.svg
+++ b/data/icons/scalable/status/osk-caps-lock-symbolic.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 12 2 l -7.5 8 h 4.5 v 5 h 6 v -5 h 4.5 z m -3 16 v 3 h 6 v -3 z m 0 0" fill="#241f31"/>
+    <path d="m 12 2 l -7.5 8 h 4.5 v 5 h 6 v -5 h 4.5 z m -3 16 v 3 h 6 v -3 z m 0 0"/>
 </svg>
diff --git a/data/icons/scalable/status/osk-delete-symbolic.svg b/data/icons/scalable/status/osk-delete-symbolic.svg
new file mode 100644
index 000000000..f05dfc9e3
--- /dev/null
+++ b/data/icons/scalable/status/osk-delete-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 10 5 c -1.109375 0 -2.019531 0.453125 -2.804688 0.921875 c -0.8125 0.484375 -1.582031 1.085937 -2.285156 1.714844 c -0.699218 0.632812 -1.328125 1.289062 -1.824218 1.921875 c -0.246094 0.3125 -0.472657 0.628906 -0.660157 0.96875 c -0.144531 0.261718 -0.425781 0.796875 -0.425781 1.472656 s 0.28125 1.207031 0.425781 1.46875 c 0.1875 0.34375 0.414063 0.65625 0.660157 0.96875 c 0.496093 0.632812 1.125 1.292969 1.824218 1.921875 c 0.703125 0.632813 1.472656 1.234375 2.285156 1.714844 c 0.785157 0.46875 1.695313 0.925781 2.804688 0.925781 h 8 c 2.195312 0 4 -1.804688 4 -4 v -6 c 0 -2.195312 -1.804688 -4 -4 -4 z m 2 3 c 0.265625 0 0.519531 0.105469 0.707031 0.292969 l 2.292969 2.292969 l 2.292969 -2.292969 c 0.1875 -0.1875 0.441406 -0.292969 0.707031 -0.292969 s 0.519531 0.105469 0.707031 0.292969 c 0.390625 0.390625 0.390625 1.023437 0 1.414062 l -2.292969 2.292969 l 2.292969 2.292969 c 0.390625 0.390625 0.390625 1.023437 0 1.414062 s -1.023437 0.390625 -1.414062 0 l -2.292969 -2.292969 l -2.292969 2.292969 c -0.390625 0.390625 -1.023437 0.390625 -1.414062 0 s -0.390625 -1.023437 0 -1.414062 l 2.292969 -2.292969 l -2.292969 -2.292969 c -0.390625 -0.390625 -0.390625 -1.023437 0 -1.414062 c 0.1875 -0.1875 0.441406 -0.292969 0.707031 -0.292969 z m 0 0"/>
+</svg>
diff --git a/data/icons/scalable/status/osk-emoji-picker-symbolic.svg b/data/icons/scalable/status/osk-emoji-picker-symbolic.svg
new file mode 100644
index 000000000..fdc8715fc
--- /dev/null
+++ b/data/icons/scalable/status/osk-emoji-picker-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 12 2 c -5.511719 0 -10 4.488281 -10 10 s 4.488281 10 10 10 s 10 -4.488281 10 -10 s -4.488281 -10 -10 -10 z m 0 2 c 4.429688 0 8 3.570312 8 8 s -3.570312 8 -8 8 s -8 -3.570312 -8 -8 s 3.570312 -8 8 -8 z m -2.5 4.25 c -0.691406 0 -1.25 0.558594 -1.25 1.25 s 0.558594 1.25 1.25 1.25 s 1.25 -0.558594 1.25 -1.25 s -0.558594 -1.25 -1.25 -1.25 z m 5 0 c -0.691406 0 -1.25 0.558594 -1.25 1.25 s 0.558594 1.25 1.25 1.25 s 1.25 -0.558594 1.25 -1.25 s -0.558594 -1.25 -1.25 -1.25 z m -6.246094 5 c -0.121094 -0.007812 -0.242187 0.019531 -0.355468 0.085938 c -0.300782 0.171874 -0.402344 0.550781 -0.226563 0.851562 c 0.890625 1.546875 2.542969 2.5 4.328125 2.5 s 3.4375 -0.953125 4.328125 -2.5 c 0.175781 -0.300781 0.074219 -0.679688 -0.226563 -0.851562 c -0.300781 -0.175782 -0.683593 -0.074219 -0.855468 0.226562 c -0.671875 1.160156 -1.90625 1.875 -3.246094 1.875 s -2.578125 -0.714844 -3.25 -1.875 c -0.105469 -0.1875 -0.296875 -0.296875 -0.496094 -0.3125 z m 0 0"/>
+</svg>
diff --git a/data/icons/scalable/status/osk-enter-symbolic.svg b/data/icons/scalable/status/osk-enter-symbolic.svg
new file mode 100644
index 000000000..557b220de
--- /dev/null
+++ b/data/icons/scalable/status/osk-enter-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 17 5 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 1 c 1.117188 0 2 0.882812 2 2 v 4 c 0 1.117188 -0.882812 2 -2 2 h -11.585938 l 2.292969 -2.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 l -4 4 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 4 4 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -2.289062 -2.292969 h 11.582031 c 2.199219 0 4 -1.800781 4 -4 v -4 c 0 -2.199219 -1.800781 -4 -4 -4 z m 0 0"/>
+</svg>
diff --git a/data/icons/scalable/status/osk-hide-symbolic.svg b/data/icons/scalable/status/osk-hide-symbolic.svg
new file mode 100644
index 000000000..e7cc0c48d
--- /dev/null
+++ b/data/icons/scalable/status/osk-hide-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 5.570312 6.25 c -0.003906 0 -0.007812 0.003906 -0.011718 0.003906 c -0.066406 0.023438 -0.09375 0.011719 -0.117188 0.011719 c -0.105468 0.019531 -0.191406 0.113281 -0.191406 0.234375 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 2.929688 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m -12 3 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m -12 3 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 3 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 7 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 9 0 c -0.144531 0 -0.25 0.105469 -0.25 0.25 v 1 c 0 0.144531 0.105469 0.25 0.25 0.25 h 1 c 0.144531 0 0.25 -0.105469 0.25 -0.25 v -1 c 0 -0.144531 -0.105469 -0.25 -0.25 -0.25 z m 0 0"/>
+    <path d="m 5 3 c -1.644531 0 -3 1.355469 -3 3 v 8 c 0 1.644531 1.355469 3 3 3 h 14 c 1.644531 0 3 -1.355469 3 -3 v -8 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 14 c 0.570312 0 1 0.429688 1 1 v 8 c 0 0.570312 -0.429688 1 -1 1 h -14 c -0.570312 0 -1 -0.429688 -1 -1 v -8 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0"/>
+    <path d="m 9.984375 19 c -0.265625 0 -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 2 2 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 2 -2 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 s -1.023437 -0.390625 -1.414062 0 l -1.292969 1.292969 l -1.292969 -1.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 z m 0 0"/>
+</svg>
diff --git a/data/icons/scalable/status/osk-layout-symbolic.svg b/data/icons/scalable/status/osk-layout-symbolic.svg
new file mode 100644
index 000000000..ddcc17e5e
--- /dev/null
+++ b/data/icons/scalable/status/osk-layout-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 12 2 c -5.511719 0 -10 4.488281 -10 10 s 4.488281 10 10 10 s 10 -4.488281 10 -10 s -4.488281 -10 -10 -10 z m -0.5 2.050781 v 3.199219 h -3.105469 c 0.152344 -0.359375 0.320313 -0.699219 0.5 -1.007812 c 0.726563 -1.230469 1.636719 -1.992188 2.605469 -2.191407 z m 1 0 c 0.96875 0.199219 1.878906 0.960938 2.605469 2.191407 c 0.179687 0.308593 0.347656 0.648437 0.5 1.007812 h -3.105469 z m -3.707031 0.617188 c -0.277344 0.320312 -0.53125 0.679687 -0.761719 1.070312 c -0.269531 0.460938 -0.507812 0.96875 -0.710938 1.511719 h -1.765624 c 0.828124 -1.121094 1.945312 -2.019531 3.238281 -2.582031 z m 6.414062 0 c 1.292969 0.5625 2.410157 1.460937 3.238281 2.582031 h -1.765624 c -0.203126 -0.542969 -0.441407 -1.050781 -0.710938 -1.511719 c -0.230469 -0.390625 -0.484375 -0.75 -0.761719 -1.070312 z m -10.28125 3.582031 h 2.0625 c -0.273437 1 -0.441406 2.097656 -0.480469 3.25 h -2.492187 c 0.070313 -1.171875 0.394531 -2.269531 0.910156 -3.25 z m 3.109375 0 h 3.464844 v 3.25 h -3.988281 c 0.039062 -1.171875 0.226562 -2.273438 0.523437 -3.25 z m 4.464844 0 h 3.464844 c 0.296875 0.976562 0.484375 2.078125 0.523437 3.25 h -3.988281 z m 4.511719 0 h 2.0625 c 0.515625 0.980469 0.839843 2.078125 0.910156 3.25 h -2.492187 c -0.039063 -1.152344 -0.207032 -2.25 -0.480469 -3.25 z m -12.996094 4.25 h 2.492187 c 0.039063 1.15625 0.207032 2.25 0.480469 3.25 h -2.0625 c -0.515625 -0.980469 -0.839843 -2.078125 -0.910156 -3.25 z m 3.496094 0 h 3.988281 v 3.25 h -3.464844 c -0.296875 -0.976562 -0.484375 -2.078125 -0.523437 -3.25 z m 4.988281 0 h 3.988281 c -0.039062 1.171875 -0.226562 2.273438 -0.523437 3.25 h -3.464844 z m 4.992188 0 h 2.492187 c -0.070313 1.171875 -0.394531 2.269531 -0.910156 3.25 h -2.0625 c 0.273437 -1 0.441406 -2.09375 0.480469 -3.25 z m -11.9375 4.25 h 1.765624 c 0.203126 0.542969 0.441407 1.050781 0.710938 1.511719 c 0.230469 0.390625 0.484375 0.75 0.761719 1.070312 c -1.292969 -0.5625 -2.410157 -1.460937 -3.238281 -2.582031 z m 2.839843 0 h 3.105469 v 3.199219 c -0.96875 -0.199219 -1.878906 -0.960938 -2.605469 -2.191407 c -0.183593 -0.308593 -0.347656 -0.648437 -0.5 -1.007812 z m 4.105469 0 h 3.105469 c -0.152344 0.359375 -0.316407 0.699219 -0.5 1.007812 c -0.726563 1.230469 -1.636719 1.992188 -2.605469 2.191407 z m 4.179688 0 h 1.765624 c -0.828124 1.121094 -1.945312 2.019531 -3.238281 2.582031 c 0.277344 -0.320312 0.53125 -0.679687 0.761719 -1.070312 c 0.269531 -0.460938 0.507812 -0.96875 0.710938 -1.511719 z m 0 0"/>
+</svg>
diff --git a/data/icons/scalable/status/keyboard-shift-symbolic.svg b/data/icons/scalable/status/osk-shift-symbolic.svg
similarity index 62%
rename from data/icons/scalable/status/keyboard-shift-symbolic.svg
rename to data/icons/scalable/status/osk-shift-symbolic.svg
index 7255259bd..eb5c3bfc2 100644
--- a/data/icons/scalable/status/keyboard-shift-symbolic.svg
+++ b/data/icons/scalable/status/osk-shift-symbolic.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 12 4 l -7.5 8 h 4.5 v 7 h 6 v -7 h 4.5 z m 0 0" fill="#241f31"/>
+    <path d="m 12 4 l -7.5 8 h 4.5 v 7 h 6 v -7 h 4.5 z m 0 0"/>
 </svg>
diff --git a/data/icons/scalable/status/osk-zwnj-symbolic.svg b/data/icons/scalable/status/osk-zwnj-symbolic.svg
new file mode 100644
index 000000000..fee0a7338
--- /dev/null
+++ b/data/icons/scalable/status/osk-zwnj-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 8 3 c -0.40625 0 -0.769531 0.242188 -0.921875 0.617188 c -0.15625 0.375 -0.070313 0.804687 0.214844 1.089843 l 4 4 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 4 -4 c 0.285157 -0.285156 0.371094 -0.714843 0.214844 -1.089843 c -0.152344 -0.375 -0.515625 -0.617188 -0.921875 -0.617188 z m 4 7 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 s 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m 0 3 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 s 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m 0 3 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 s 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m 0 3 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 s 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m 0 0"/>
+</svg>
diff --git a/data/org.gnome.Shell-symbolic.Source.svg b/data/org.gnome.Shell-symbolic.Source.svg
index ece7af062..3a5b69a48 100644
--- a/data/org.gnome.Shell-symbolic.Source.svg
+++ b/data/org.gnome.Shell-symbolic.Source.svg
@@ -14,152 +14,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs4"><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0.93704032,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,6.666667,0,1 @ F,0,0,1,0,6.6666667,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.93704032,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect6"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,8,0,1 @ F,0,1,1,0,8,0,1 @ F,0,1,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect3"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect59"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,1.6535329,0,1 @ F,0,1,1,0,1.6535329,0,1 @ F,0,1,1,0,1.6535329,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect61"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="3.7816264"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect63"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect65"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect67"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect69"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect83"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4.0423292"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect85"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="join_type"
-       id="path-effect69-3"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="round"
-       line_width="1.9999956"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1-6"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0.93704032,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,6.6666683,0,1 @ F,0,0,1,0,6.6666683,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.93704032,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /></defs><sodipodi:namedview
+     id="defs4" /><sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -193,7 +48,8 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="false"
      inkscape:showpageshadow="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
+     inkscape:deskcolor="#d1d1d1"
+     showguides="false"><inkscape:grid
        type="xygrid"
        id="grid4514"
        empspacing="4"
@@ -234,10 +90,10 @@
          id="rect15794"
          style="fill:none;stroke-width:0.666667" /><path
          id="path29"
-         style="color:#000000;fill:#241f31;fill-opacity:0.80000001;stroke-width:1.33333;stroke-linejoin:round;-inkscape-stroke:none"
-         d="M 320.21875 478.86665 C 318.00275 478.86665 316.21875 480.65066 316.21875 482.86665 L 316.21875 484.65832 C 309.22498 486.36705 304 492.69659 304 500.19999 L 304 513.93176 L 300.42188 518.40311 C 298.66539 520.59867 300.39398 524.20001 303.20573 524.19999 L 336.79167 524.19999 C 339.60337 524.20001 341.33463 520.59867 339.57812 518.40311 L 336 513.93176 L 336 500.19999 C 336 492.85485 330.99047 486.63509 324.21875 484.7729 L 324.21875 482.86665 C 324.21875 480.65066 322.43475 478.86665 320.21875 478.86665 z M 319.95052 488.19999 C 327.10438 488.33362 332 493.81804 332 500.19999 L 332 513.93176 L 332 513.93436 C 332.001 514.84059 332.31136 515.72171 332.8776 516.42915 L 335.89323 520.19999 L 304.10677 520.19999 L 307.11979 516.43176 L 307.1224 516.42915 C 307.68864 515.72171 307.99868 514.84059 308 513.93436 L 308 513.93176 L 308 500.19999 C 308 492.76006 314.53939 488.09882 319.95052 488.19999 z M 314.88542 526.86665 A 5.333333 5.333333 0 0 0 317.55208 531.48645 A 5.333333 5.333333 0 0 0 322.88542 531.48645 A 5.333333 5.333333 0 0 0 325.55208 526.86665 L 320.21875 526.86665 L 314.88542 526.86665 z " /></g><g
+         style="color:#000000;fill:#000000;fill-opacity:0.80000001;stroke-width:1.33333;stroke-linejoin:round;-inkscape-stroke:none"
+         d="m 320.219,478.86616 c -2.216,0 -4,1.78401 -4,4 v 1.79167 c -6.99377,1.70873 -12.21875,8.03827 -12.21875,15.54167 v 13.73177 l -3.57812,4.47135 c -1.75649,2.19556 -0.0279,5.7969 2.78385,5.79688 h 33.58594 c 2.8117,2e-5 4.54295,-3.60132 2.78645,-5.79688 l -3.57812,-4.47135 V 500.1995 c 0,-7.34514 -5.00953,-13.5649 -11.78125,-15.42709 v -1.90625 c 0,-2.21599 -1.784,-4 -4,-4 z m -5.33333,48 a 5.333333,5.333333 0 0 0 2.66666,4.6198 5.333333,5.333333 0 0 0 5.33334,0 5.333333,5.333333 0 0 0 2.66666,-4.6198 H 320.219 Z" /></g><g
        id="g21075"
-       transform="translate(0,-340)"
+       transform="translate(0,-320)"
        inkscape:label="notifications alerts calendar events"><title
          id="title36429">message-indicator</title><rect
          transform="scale(-1,1)"
@@ -249,10 +105,10 @@
          style="fill:none" /><path
          d="M 12,609.53332 A 3.9999999,3.9999999 0 0 1 8.0000002,613.53331 3.9999999,3.9999999 0 0 1 4.0000003,609.53332 3.9999999,3.9999999 0 0 1 8.0000002,605.53334 3.9999999,3.9999999 0 0 1 12,609.53332 Z"
          id="path4485"
-         style="fill:#241f31;fill-opacity:1;stroke-width:3.77953" /></g><g
+         style="fill:#000000;fill-opacity:1;stroke-width:3.77953" /></g><g
        id="g36685"
        inkscape:label="screen shield privacy active"
-       transform="translate(-40,-402)"><title
+       transform="translate(-40,-382)"><title
          id="title41631">screen-privacy</title><rect
          transform="scale(-1,1)"
          y="663.53333"
@@ -262,11 +118,11 @@
          id="rect36558"
          style="fill:none" /><path
          id="path113"
-         style="fill:#241f31;fill-opacity:1"
+         style="fill:#000000;fill-opacity:1"
          d="m 64,664.53331 c -1.660156,0 -3,1.33984 -3,3 v 6 c 0,1.66016 1.339844,3 3,3 h 8 c 1.660156,0 3,-1.33984 3,-3 v -6 c 0,-1.66016 -1.339844,-3 -3,-3 z m 0,2 h 0.261719 L 63,667.79503 v -0.26172 c 0,-0.55469 0.445312,-1 1,-1 z m 2.738281,0 H 67.4375 L 63,670.97081 v -0.69922 z m 2.824219,0 h 1.230469 l -7.585938,7.58203 C 63.085938,673.95128 63,673.75597 63,673.53331 v -0.4375 z m 2.609375,0.0352 c 0.316406,0.0547 0.578125,0.24609 0.714844,0.52343 l -7.441407,7.44141 H 64.207031 Z M 73,667.68956 v 5.84375 c 0,0.55469 -0.445312,1 -1,1 h -5.84375 z m -5,9.84375 c -5,0 -5,1 -5,1 0,1 1,1 1,1 h 8 c 1,0 1,-1 1,-1 0,0 0,-1 -5,-1 z" /></g><g
        id="g41416"
-       inkscape:label="status"
-       transform="translate(-40,-402)"><title
+       inkscape:label="screen shield privacy inactive"
+       transform="translate(-40,-382)"><title
          id="title41633">screen-privacy-disabled</title><rect
          transform="scale(-1,1)"
          y="663.53333"
@@ -279,11 +135,11 @@
          fill="#2e3436"
          fill-rule="evenodd"
          id="path113-6"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g8970"
        transform="translate(-24,-214.46669)"
-       inkscape:label="on-screen keyboard keys"><title
-         id="title14941">keyboard-shift</title><rect
+       inkscape:label="on-screen keyboard keys shift uppercase"><title
+         id="title14941">osk-shift</title><rect
          width="23.999996"
          height="23.999996"
          x="23.99999"
@@ -292,11 +148,11 @@
          style="fill:none" /><path
          d="m 36,448 -7.5,8 H 33 v 7 h 6 v -7 h 4.5 z"
          id="path1150"
-         style="fill:#241f31;fill-opacity:1;stroke-width:0.666667" /></g><g
+         style="fill:#000000;fill-opacity:1;stroke-width:0.666667" /></g><g
        id="g8978"
        transform="translate(8,-214.46669)"
-       inkscape:label="on-screen keyboard keys"><title
-         id="title14939">keyboard-caps-lock</title><rect
+       inkscape:label="on-screen keyboard keys caps lock"><title
+         id="title14939">osk-caps-lock</title><rect
          width="23.999996"
          height="23.999996"
          x="23.99999"
@@ -305,24 +161,11 @@
          style="fill:none" /><path
          id="path8974"
          d="m 36,446 -7.5,8 H 33 v 5 h 6 v -5 h 4.5 z m -3,16 v 3 h 6 v -3 z"
-         style="fill:#241f31;fill-opacity:1" /></g><g
-       id="g13560"
-       inkscape:label="on-screen keyboard keys"
-       transform="translate(-40,-234.46669)"><title
-         id="title14945">keyboard-layout</title><rect
-         width="23.999996"
-         height="23.999996"
-         x="103.99999"
-         y="463.99997"
-         id="rect13441"
-         style="fill:none" /><path
-         d="m 109,467 v 19 h 2 v -8 h 4.383 l 0.722,1.447 c 0.16942,0.33905 0.51597,0.55318 0.895,0.553 h 7 c 0.55228,0 1,-0.44772 1,-1 v -9 c 0,-0.55228 -0.44772,-1 -1,-1 h -5.383 l -0.722,-1.447 C 117.72558,467.21395 117.37903,466.99982 117,467 h -7 z"
-         id="path1085"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1;stroke:none" /></g><g
        id="g13796"
-       inkscape:label="on-screen keyboard keys"
-       transform="translate(-40,-234.46669)"><title
-         id="title14943">keyboard-enter</title><rect
+       inkscape:label="on-screen keyboard keys return enter"
+       transform="translate(-12,-234.46654)"><title
+         id="title14943">osk-enter</title><rect
          width="23.999996"
          height="23.999996"
          x="-487.99997"
@@ -331,12 +174,13 @@
          transform="matrix(0,-1,-1,0,0,0)"
          style="fill:none" /><path
          id="path955"
-         style="fill:#241f31;fill-opacity:1"
-         d="m 187,470 v 6.00391 c 0.006,0.996 -1,0.99609 -1,0.99609 h -11.58594 l 1.29297,-1.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 175,474 a 1,1 0 0 0 -0.70703,0.29297 l -3,3 a 1.0001,1.0001 0 0 0 0,1.41406 l 3,3 a 1,1 0 0 0 1.41406,0 1,1 0 0 0 0,-1.41406 L 174.41602,479 H 186 c 3.006,0 3,-3 3,-3 v -6 z" /></g><g
+         style="fill:#000000;fill-opacity:1"
+         d="m 185,468.99985 c -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 h 1 c 1.11641,0 2,0.88359 2,2 v 4 c 0,1.11642 -0.88359,2 -2,2 h -11.58594 l 2.29297,-2.29297 c 0.39042,-0.39051 0.39042,-1.02355 0,-1.41406 -0.1875,-0.18755 -0.44183,-0.29293 -0.70703,-0.29297 -0.2652,4e-5 -0.51953,0.10542 -0.70703,0.29297 l -4,4 c -0.39037,0.39053 -0.39037,1.02353 0,1.41406 l 4,4 c 0.39051,0.39042 1.02355,0.39042 1.41406,0 0.39042,-0.39051 0.39042,-1.02355 0,-1.41406 l -2.29101,-2.29297 H 186 c 2.19729,0 4,-1.8027 4,-4 v -4 c 0,-2.19729 -1.80271,-4 -4,-4 z"
+         sodipodi:nodetypes="sssssssccsccccccccsssss" /></g><g
        id="g14"
-       transform="translate(-64,-20.000063)"
-       inkscape:label="on-screen keyboard keys"><title
-         id="title14">keyboard-hide</title><rect
+       transform="translate(-35.999996,-20.000015)"
+       inkscape:label="on-screen keyboard keys hide"><title
+         id="title14">osk-hide</title><rect
          width="23.999996"
          height="23.999996"
          x="-273.53329"
@@ -344,30 +188,89 @@
          id="rect14"
          transform="matrix(0,-1,-1,0,0,0)"
          style="fill:none" /><path
-         d="m 162.49704,251.53995 c -0.554,0 -1,0.446 -1,1 v 11 c 0,0.554 0.446,1 1,1 h 19.0059 c 0.554,0 1,-0.446 1,-1 v -11 c 0,-0.554 -0.446,-1 -1,-1 z m 1.3653,2 h 1.6562 v 2 h -2 v -1.6074 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z m 2.6562,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1.6563 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.6074 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -13.9844,3 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 2.9844,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m -9.6621,4 h 10.3125 c 0.19,0 0.3437,0.1746 0.3437,0.3926 v 1.2148 c 0,0.218 -0.1537,0.3926 -0.3437,0.3926 h -10.3125 c -0.19,0 -0.3438,-0.1746 -0.3438,-0.3926 v -1.2148 c 0,-0.218 0.1538,-0.3926 0.3438,-0.3926 z"
-         fill="#241f31"
-         id="path1" /><path
-         d="m 176.99999,267.52665 -4.99512,4 -5.00488,-4 z"
-         fill="#241f31"
-         id="path2-6" /></g></g><g
+         id="path25976"
+         style="fill:#000000;fill-opacity:1"
+         d="m 165.56836,255.78332 c -0.003,0.001 -0.006,0.005 -0.008,0.006 -0.0699,0.0211 -0.0974,0.0108 -0.11914,0.008 -0.10421,0.0233 -0.1914,0.11521 -0.1914,0.23632 v 1 c 0,0.14358 0.10645,0.25 0.25,0.25 h 1 c 0.14355,0 0.25,-0.10642 0.25,-0.25 v -1 c 0,-0.14353 -0.10647,-0.25 -0.25,-0.25 z m 2.93164,0 c -0.14353,1e-5 -0.25,0.10647 -0.25,0.25 v 1 c 0,0.14358 0.10645,0.25 0.25,0.25 h 1 c 0.14355,0 0.25,-0.10642 0.25,-0.25 v -1 c 0,-0.14353 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,1e-5 -0.25,0.10647 -0.25,0.25 v 1 c 0,0.14358 0.10645,0.25 0.25,0.25 h 1 c 0.14355,0 0.25,-0.10642 0.25,-0.25 v -1 c 0,-0.14353 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,1e-5 -0.25,0.10647 -0.25,0.25 v 1 c 0,0.14358 0.10645,0.25 0.25,0.25 h 1 c 0.14355,0 0.25,-0.10642 0.25,-0.25 v -1 c 0,-0.14353 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,1e-5 -0.25,0.10647 -0.25,0.25 v 1 c 0,0.14358 0.10645,0.25 0.25,0.25 h 1 c 0.14355,0 0.25,-0.10642 0.25,-0.25 v -1 c 0,-0.14353 -0.10647,-0.25 -0.25,-0.25 z m -12,3 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m -12,3 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 3,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 7 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z m 9,0 c -0.14353,0 -0.25,0.10648 -0.25,0.25 v 1 c 0,0.14354 0.10647,0.25 0.25,0.25 h 1 c 0.14353,0 0.25,-0.10646 0.25,-0.25 v -1 c 0,-0.14352 -0.10647,-0.25 -0.25,-0.25 z" /><path
+         style="stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
+         d="m 165,252.5332 c -1.6447,0 -3,1.3553 -3,3 v 8 c 0,1.64471 1.3553,3 3,3 h 14 c 1.6447,0 3,-1.35529 3,-3 v -8 c 0,-1.6447 -1.3553,-3 -3,-3 z m 0,2 h 14 c 0.5713,0 1,0.42871 1,1 v 8 c 0,0.5713 -0.4287,1 -1,1 h -14 c -0.5713,0 -1,-0.4287 -1,-1 v -8 c 0,-0.57129 0.4287,-1 1,-1 z"
+         id="rect13" /><path
+         id="path20"
+         style="fill:#000000;fill-opacity:1"
+         d="m 169.98438,268.53332 c -0.2652,4e-5 -0.51953,0.10542 -0.70704,0.29298 -0.39043,0.39051 -0.39043,1.02355 0,1.41406 l 2,2 c 0.39053,0.39038 1.02354,0.39038 1.41407,0 l 2,-2 c 0.39043,-0.39051 0.39043,-1.02355 0,-1.41406 -0.39051,-0.39043 -1.02356,-0.39043 -1.41407,0 l -1.29296,1.29296 -1.29297,-1.29297 c -0.1875,-0.18755 -0.44183,-0.29293 -0.70703,-0.29297 z"
+         sodipodi:nodetypes="scccccccccs" /></g><g
+       id="g16"
+       inkscape:label="on-screen keyboard keys zero with non-joiner"
+       transform="translate(28)"><title
+         id="title18">osk-zwnj</title><rect
+         width="23.999996"
+         height="23.999996"
+         x="-253.53328"
+         y="-183.99998"
+         id="rect2"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none" /><path
+         id="path2"
+         style="baseline-shift:baseline;display:inline;overflow:visible;vector-effect:none;fill:#000000;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 168,232.53331 a 1.0001,1.0001 0 0 0 -0.70703,1.70703 l 4,4 a 1.0001,1.0001 0 0 0 1.41406,0 l 4,-4 A 1.0001,1.0001 0 0 0 176,232.53331 Z m 4,7 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z" /></g><g
+       id="g40"
+       inkscape:label="on-screen keyboard keys language layout"
+       transform="translate(-128)"><title
+         id="title40">osk-layout</title><rect
+         width="23.999996"
+         height="23.999996"
+         x="-253.53328"
+         y="-215.99998"
+         id="rect20"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none" /><path
+         id="path24"
+         style="fill:#000000;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;fill-opacity:1"
+         d="m 204,231.53331 c -5.511,0 -10,4.489 -10,10 0,5.51101 4.489,10 10,10 5.511,0 10,-4.48899 10,-10 0,-5.511 -4.489,-10 -10,-10 z m -0.5,2.05273 v 3.19727 h -3.10547 c 0.15137,-0.35981 0.3186,-0.69748 0.5,-1.00586 0.72474,-1.23204 1.63739,-1.99459 2.60547,-2.19141 z m 1,0 c 0.96808,0.19682 1.88073,0.95937 2.60547,2.19141 0.1814,0.30838 0.34863,0.64605 0.5,1.00586 H 204.5 Z m -3.70703,0.61329 c -0.27578,0.32157 -0.53044,0.68045 -0.75977,1.07031 -0.27143,0.46143 -0.50959,0.96926 -0.71484,1.51367 h -1.76172 c 0.82749,-1.12238 1.94164,-2.01932 3.23633,-2.58398 z m 6.41406,0 c 1.29469,0.56466 2.40884,1.4616 3.23633,2.58398 h -1.76172 c -0.20525,-0.54441 -0.44341,-1.05224 -0.71484,-1.51367 -0.22933,-0.38986 -0.48399,-0.74874 -0.75977,-1.07031 z m -10.2793,3.58398 h 2.0625 c -0.27701,1.00011 -0.44475,2.09627 -0.48242,3.25 h -2.49219 c 0.0717,-1.17017 0.3935,-2.27088 0.91211,-3.25 z m 3.10743,0 H 203.5 v 3.25 h -3.99023 c 0.0418,-1.17054 0.22848,-2.272 0.52539,-3.25 z m 4.46484,0 h 3.46484 c 0.29691,0.978 0.48362,2.07946 0.52539,3.25 H 204.5 Z m 4.50977,0 h 2.0625 c 0.51861,0.97912 0.8404,2.07983 0.91211,3.25 h -2.49219 c -0.0377,-1.15373 -0.20541,-2.24989 -0.48242,-3.25 z m -12.99415,4.25 h 2.49219 c 0.0377,1.1543 0.20517,2.24949 0.48242,3.25 h -2.0625 c -0.51861,-0.97912 -0.8404,-2.07983 -0.91211,-3.25 z m 3.49415,0 H 203.5 v 3.25 h -3.46484 c -0.29673,-0.97824 -0.48364,-2.07972 -0.52539,-3.25 z m 4.99023,0 h 3.99023 c -0.0418,1.17028 -0.22866,2.27176 -0.52539,3.25 H 204.5 Z m 4.99219,0 h 2.49219 c -0.0717,1.17017 -0.3935,2.27088 -0.91211,3.25 h -2.0625 c 0.27725,-1.00051 0.44474,-2.0957 0.48242,-3.25 z m -11.93555,4.25 h 1.76172 c 0.20525,0.54441 0.44341,1.05224 0.71484,1.51367 0.22933,0.38986 0.48399,0.74874 0.75977,1.07031 -1.29469,-0.56465 -2.40884,-1.4616 -3.23633,-2.58398 z m 2.83789,0 H 203.5 v 3.19727 c -0.96808,-0.1964 -1.88073,-0.95742 -2.60547,-2.18946 -0.18168,-0.30885 -0.34844,-0.64723 -0.5,-1.00781 z m 4.10547,0 h 3.10547 c -0.15156,0.36058 -0.31832,0.69896 -0.5,1.00781 -0.72474,1.23204 -1.63739,1.99306 -2.60547,2.18946 z m 4.18164,0 h 1.76172 c -0.82749,1.12238 -1.94164,2.01933 -3.23633,2.58398 0.27578,-0.32157 0.53044,-0.68045 0.75977,-1.07031 0.27143,-0.46143 0.50959,-0.96926 0.71484,-1.51367 z" /></g><g
+       inkscape:label="on-screen keyboard keys delete remove backspace"
+       id="g135021"
+       transform="rotate(90,184.30284,250.70034)"><title
+         id="title135007">osk-delete</title><path
+         id="rect298747-1"
+         d="m 168.13581,209.00318 c 0,1.10838 0.45443,2.01938 0.92187,2.80469 0.48247,0.81055 1.08418,1.58245 1.71485,2.2832 0.63099,0.70111 1.29055,1.32876 1.92187,1.82617 0.31372,0.24717 0.62865,0.47122 0.97071,0.66016 0.26101,0.14418 0.79647,0.42578 1.4707,0.42578 0.67423,0 1.20774,-0.2816 1.46875,-0.42578 0.34205,-0.18894 0.65698,-0.41299 0.9707,-0.66016 0.63132,-0.49741 1.29089,-1.12506 1.92188,-1.82617 0.63066,-0.70075 1.23238,-1.47265 1.71484,-2.2832 0.46745,-0.78531 0.92383,-1.69631 0.92383,-2.80469 v -8 c 0,-2.19406 -1.80594,-4 -4,-4 h -6 c -2.19406,0 -4,1.80594 -4,4 z m 3,-2 c 4e-5,-0.2652 0.10542,-0.51953 0.29297,-0.70703 l 2.29297,-2.29297 -2.29297,-2.29297 c -0.18755,-0.1875 -0.29293,-0.44183 -0.29297,-0.70703 4e-5,-0.2652 0.10542,-0.51953 0.29297,-0.70703 0.39051,-0.39042 1.02355,-0.39042 1.41406,0 l 2.29297,2.29297 2.29297,-2.29297 c 0.39051,-0.39042 1.02355,-0.39042 1.41406,0 0.39042,0.39051 0.39042,1.02355 0,1.41406 l -2.29297,2.29297 2.29297,2.29297 c 0.39042,0.39051 0.39042,1.02355 0,1.41406 -0.39051,0.39042 -1.02355,0.39042 -1.41406,0 l -2.29297,-2.29297 -2.29297,2.29297 c -0.39051,0.39042 -1.02355,0.39042 -1.41406,0 -0.18755,-0.1875 -0.29293,-0.44183 -0.29297,-0.70703 z" /><rect
+         y="195.00317"
+         x="163.1358"
+         height="24"
+         width="24"
+         id="rect135009"
+         style="fill:none;fill-opacity:1" /></g><g
+       id="g26"
+       inkscape:label="on-screen keyboard keys emoji picker"
+       transform="translate(30,-28)"><title
+         id="title27">osk-emoji-picker</title><rect
+         width="23.999996"
+         height="23.999996"
+         x="-281.53326"
+         y="-87.999985"
+         id="rect25"
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="fill:none" /><path
+         id="path67373"
+         mask="none"
+         style="fill:#000000;fill-opacity:1;stroke-width:1"
+         d="m 76,259.53331 c -5.511002,0 -10,4.489 -10,10 0,5.511 4.488998,10 10,10 5.511002,0 10,-4.489 10,-10 0,-5.511 -4.488998,-10 -10,-10 z m 0,2 c 4.430123,0 8,3.56989 8,8 0,4.43012 -3.569877,8 -8,8 -4.430123,0 -8,-3.56988 -8,-8 0,-4.43011 3.569877,-8 8,-8 z m -2.5,4.25 c -0.69035,0 -1.25,0.55966 -1.25,1.25 0,0.69036 0.55965,1.25 1.25,1.25 0.69035,0 1.25,-0.55964 1.25,-1.25 0,-0.69034 -0.55965,-1.25 -1.25,-1.25 z m 5,0 c -0.69035,0 -1.25,0.55966 -1.25,1.25 0,0.69036 0.55965,1.25 1.25,1.25 0.69035,0 1.25,-0.55964 1.25,-1.25 0,-0.69034 -0.55965,-1.25 -1.25,-1.25 z m -6.246094,5 c -0.120225,-0.009 -0.243238,0.0191 -0.355468,0.084 -0.29963,0.17236 -0.401476,0.55424 -0.228516,0.85352 0.89266,1.54615 2.544748,2.5 4.330078,2.5 1.78533,0 3.437418,-0.95385 4.330078,-2.5 0.17296,-0.29928 0.07107,-0.68116 -0.228516,-0.85352 -0.299279,-0.17296 -0.683108,-0.0711 -0.855468,0.22852 -0.67037,1.16112 -1.905344,1.875 -3.246094,1.875 -1.34075,0 -2.577667,-0.71388 -3.248047,-1.875 -0.107725,-0.18727 -0.297671,-0.29827 -0.498047,-0.3125 z" /></g></g><g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="actions"><text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:16px;line-height:1.25;font-family:sans-serif;fill:#241f31;fill-opacity:1;stroke:none"
        x="-4"
-       y="164"
+       y="204"
        id="text12715"><tspan
          sodipodi:role="line"
          id="tspan12713"
          x="-4"
-         y="164"
+         y="204"
          style="font-size:16px;fill:#241f31;fill-opacity:1">actions</tspan></text><g
        id="g13439"
-       transform="matrix(-1,0,0,1,111.99998,-116)"
+       transform="matrix(-1,0,0,1,111.99998,-76)"
        inkscape:label="overview next right forward"><title
          id="title15446">carousel-arrow-next</title><path
-         style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;fill-opacity:1"
          d="m 50,504 a 1,1 0 0 0 -0.707031,0.29297 l -7,7 a 1.0001,1.0001 0 0 0 0,1.41406 l 7,7 a 1,1 0 0 0 1.414062,0 1,1 0 0 0 0,-1.41406 L 44.414062,512 l 6.292969,-6.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 50,504 Z"
          id="path6-4" /><rect
          width="15.999988"
@@ -378,11 +281,11 @@
          style="fill:none;stroke-width:0.999999" /></g><g
        id="g29998"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(28,-216)"><title
+       transform="translate(28,-176)"><title
          id="title39373">pointer-secondary-click</title><path
          d="m 16,640 v 19.77148 l -4.24414,-4.14258 c -0.612408,1.21538 -1.173049,2.46023 -1.819709,3.6561 -1.141947,1.47628 -3.975266,0.38901 -3.846009,-1.47361 0.09413,-0.82252 0.594755,-1.52142 0.899969,-2.2776 l 0.896608,-1.92051 H 2.617188 Z m -1.5,3.72656 -8.359375,8.38672 h 4.101563 c -0.885072,1.9032 -1.781799,3.80152 -2.659622,5.70774 -0.0349,0.56609 1.149057,0.98883 1.282093,0.29797 l 2.455699,-5.01348 3.179687,3.10351 z"
          id="path5851"
-         style="fill:#241f31;fill-opacity:1" /><rect
+         style="fill:#000000;fill-opacity:1" /><rect
          width="20"
          height="20"
          x="-7.6293945e-06"
@@ -391,7 +294,7 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /></g><g
        id="g29992"
        inkscape:label="mouse pointer dwell click"
-       transform="translate(-28,-216)"><title
+       transform="translate(-28,-176)"><title
          id="title39371">pointer-primary-click</title><rect
          width="20"
          height="20"
@@ -401,10 +304,10 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /><path
          d="m 32,640 v 19.64648 l 4.24414,-4.14257 c 0.612408,1.21537 1.173049,2.46022 1.819709,3.65609 1.141947,1.47628 3.975266,0.38901 3.846009,-1.47361 -0.09413,-0.82252 -0.594755,-1.52142 -0.899969,-2.2776 l -0.896608,-1.92051 h 5.269531 z m 1.5,3.72656 8.359375,8.26172 h -4.101563 c 0.885072,1.9032 1.781799,3.80152 2.659622,5.70774 0.0349,0.56609 -1.149057,0.98883 -1.282093,0.29798 l -2.455699,-5.01349 -3.179687,3.10352 z"
          id="path5565"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g14643"
        inkscape:label="mouse pointer dwell click drag"
-       transform="translate(0,-216)"><title
+       transform="translate(0,-176)"><title
          id="title39369">pointer-drag</title><rect
          width="20"
          height="20"
@@ -414,10 +317,10 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /><path
          d="m 66.92607,642.31969 c -0.836524,0.0747 -1.818151,-0.13657 -2.447266,0.57617 -0.179249,0.5031 -0.39107,0.72969 -0.945312,0.61718 -0.793816,-0.0511 -1.701912,0.0538 -2.1875,0.77344 -0.554908,0.83096 -0.313681,1.85623 -0.367187,2.79297 v 1.50195 c -0.509721,-0.31797 -1.13192,-0.13205 -1.699219,-0.18164 -0.442833,-0.0207 -0.881113,0.0252 -1.31836,0.0918 0.05693,2.68593 0.07373,5.37334 0.121094,8.05859 0.09369,1.3023 1.232044,2.40482 2.544922,2.42383 0.632949,0.0151 1.48233,0.007 2.224609,0.0117 3.221817,-0.0121 6.446114,0.0498 9.666016,-0.0566 1.162213,-0.12022 2.213268,-1.18845 2.070313,-2.39648 v -9.48047 c -0.706809,-0.94069 -1.815276,-1.78087 -3.058594,-1.57032 -0.299549,-0.45356 -0.486118,-1.47311 -1.226563,-1.79882 -0.354855,-0.29104 -0.839588,-0.10977 -1.259765,-0.16211 -0.297442,-0.0727 -0.8559,0.19254 -0.869141,-0.25196 -0.157351,-0.52152 -0.715235,-0.90856 -1.248047,-0.94921 z m -0.105469,1.5039 c 0.164522,0.27146 0.182773,0.75372 0.21875,1.125 0.0066,0.007 0.0198,0.006 0.02734,0.0117 -0.0091,-1.7e-4 -0.01824,1.7e-4 -0.02734,0 l 0.494141,5.90039 0.664062,-5.8418 1.345704,0.004 c 0.536079,0.38955 0.412986,1.14048 0.554687,1.72266 -0.01113,0.0675 0.0064,0.096 0.01563,0.13672 -6.5e-4,-10e-6 -0.0013,0 -0.002,0 l 0.01172,0.0859 0.482422,3.86524 0.664062,-3.91993 c 0.574035,-0.0371 1.157689,0.0385 1.558594,0.50196 0.40964,0.21686 0.215641,0.68897 0.259766,1.05859 v 8.3418 c -0.337059,0.96368 -1.599977,0.54827 -2.375,0.66016 -3.370517,0.0131 -6.742137,0.0338 -10.111329,-0.0137 -0.975625,-0.0283 -1.141898,-1.06997 -1.040974,-1.84179 -0.01164,-1.90706 -0.04474,-3.81393 -0.07813,-5.72071 0.326364,0.006 0.675958,-0.0127 0.988281,0.01 0.493884,0.91523 0.484615,2.00119 0.507813,3.01563 0.492636,-0.007 1.043381,0.0398 1.5,0 0.0091,-2.51961 -0.01844,-5.04003 0.01367,-7.5586 0.104898,-0.5199 0.730745,-0.30916 1.111329,-0.35352 h 0.675781 l 0.488281,5.84766 0.669922,-5.87695 h -0.0039 c 0.03095,-0.38284 -0.150626,-0.89584 0.24805,-1.11914 z"
          id="path5630"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g30454"
        inkscape:label="mouse pointer dwell click double"
-       transform="translate(0,-216)"><title
+       transform="translate(0,-176)"><title
          id="title39367">pointer-double-click</title><rect
          width="20"
          height="20"
@@ -427,9 +330,9 @@
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.781;marker:none;enable-background:new" /><path
          d="m 85,640 v 19.70898 l 4.24414,-4.14453 c 0.5882,1.18866 1.158389,2.38656 1.758464,3.56913 1.108631,1.64026 4.157538,0.46513 3.89799,-1.49586 0.01057,-0.47022 -0.405577,-0.90844 -0.434651,-1.31364 l 0.778203,-0.75963 c 0.5882,1.18866 1.158389,2.38656 1.758464,3.56913 1.108631,1.64026 4.15754,0.46513 3.89799,-1.49586 -0.19232,-0.9043 -0.71785,-1.69802 -1.068629,-2.54897 l -0.716725,-1.53797 h 4.830074 L 91,640 v 6.24414 z m 1.5,3.72656 6,6.24414 v -6.24414 l 7.92188,8.32422 h -3.662115 c 0.883468,1.90344 1.781983,3.80027 2.656081,5.70782 0.0065,0.62278 -1.227555,0.98057 -1.325116,0.20712 l -2.412991,-4.92076 -3.060547,2.98633 c 0.263642,0.60805 0.596803,1.19246 0.814693,1.81614 -0.182662,0.60103 -1.26833,0.8373 -1.365856,0.0679 l -2.388284,-4.87037 -3.177734,3.10156 z"
          id="path5565-5"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g1429"
-       transform="translate(-132,-180)"
+       transform="translate(-132,-140)"
        inkscape:label="screenshooter capture area "><title
          id="title1423">screenshot-ui-area</title><rect
          width="31.999998"
@@ -441,10 +344,10 @@
          style="fill:none;stroke-width:1" /><path
          d="m 135.5,462 a 3.515,3.515 0 0 0 -3.5,3.5 c 0,1.385 0.822,2.593 2,3.158 V 472 h 2 v -3.037 A 3.521,3.521 0 0 0 138.963,466 H 141 v -2 h -2.342 a 3.516,3.516 0 0 0 -3.158,-2 z m 25,0 a 3.516,3.516 0 0 0 -3.158,2 H 155 v 2 h 2.037 A 3.521,3.521 0 0 0 160,468.963 V 472 h 2 v -3.342 a 3.516,3.516 0 0 0 2,-3.158 c 0,-1.921 -1.579,-3.5 -3.5,-3.5 z m -25,2 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m 7.5,0 v 2 h 4 v -2 z m 6,0 v 2 h 4 v -2 z m 11.5,0 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z M 134,474 v 4 h 2 v -4 z m 26,0 v 4 h 2 v -4 z m -26,6 v 3.342 a 3.516,3.516 0 0 0 -2,3.158 c 0,1.921 1.579,3.5 3.5,3.5 a 3.516,3.516 0 0 0 3.158,-2 H 141 v -2 h -2.037 A 3.521,3.521 0 0 0 136,483.037 V 480 Z m 26,0 v 3.037 A 3.521,3.521 0 0 0 157.037,486 H 155 v 2 h 2.342 a 3.516,3.516 0 0 0 3.158,2 c 1.921,0 3.5,-1.579 3.5,-3.5 a 3.516,3.516 0 0 0 -2,-3.158 V 480 Z m -24.5,5 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m 25,0 c 0.84,0 1.5,0.66 1.5,1.5 0,0.84 -0.66,1.5 -1.5,1.5 -0.84,0 -1.5,-0.66 -1.5,-1.5 0,-0.84 0.66,-1.5 1.5,-1.5 z m -17.5,1 v 2 h 4 v -2 z m 6,0 v 2 h 4 v -2 z"
          id="path2-3"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g22"
        inkscape:label="screenshooter capture display screen "
-       transform="translate(0,-32)"><title
+       transform="translate(0,8)"><title
          id="title22">screenshot-ui-display</title><g
          id="g4349"
          transform="translate(-92,-148)"
@@ -458,12 +361,12 @@
            transform="matrix(0,-1,-1,0,0,0)"
            style="fill:none;stroke-width:1" /></g><path
          id="path22-6"
-         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:1.01058;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         style="color:#000000;display:inline;fill:#000000;fill-opacity:1;stroke-width:1.01058;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
          d="m 45,315 c -2.263717,0 -4.095702,1.84635 -4.095702,4.07617 v 13.82812 c 0,2.22982 1.831985,4.07422 4.095702,4.07422 h 5.892581 v 2.46875 c 0,1.40837 1.134592,2.54297 2.542968,2.54297 h 5.414062 c 1.408371,0 2.542968,-1.1346 2.542968,-2.54297 v -2.46875 h 5.392579 c 2.263716,0 4.095702,-1.8444 4.095702,-4.07422 V 319.07617 C 70.88086,316.84635 69.048874,315 66.785158,315 Z m 0,1.97851 h 21.785158 c 1.155876,0 2.076169,0.90787 2.076169,2.09766 v 13.82812 c 0,1.18978 -0.920293,2.09571 -2.076169,2.09571 H 45 c -1.155875,0 -2.076171,-0.90593 -2.076171,-2.09571 v -13.82812 c 0,-1.18979 0.920296,-2.09766 2.076171,-2.09766 z m 7.892578,20 h 6.5 v 2.46875 c 0,0.30143 -0.241543,0.54297 -0.542967,0.54297 h -5.414062 c -0.301429,0 -0.542971,-0.24154 -0.542971,-0.54297 z"
          sodipodi:nodetypes="sssscsssscssssssssssssssccssssc" /></g><g
        id="g47"
        inkscape:label="display mirror"
-       transform="matrix(0.5,0,0,0.5,-40,-27.2598)"
+       transform="matrix(0.5,0,0,0.5,-40,12.7402)"
        style="display:inline;stroke-width:2"><title
          id="title47">shell-display-mirror</title><rect
          style="display:inline;fill:none;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
@@ -472,13 +375,13 @@
          height="64"
          x="80"
          y="694.51965" /><path
-         style="color:#000000;fill:#241f31;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;fill-opacity:1"
          d="m 172.96094,706.89258 c -4.65133,0 -8.46193,3.81209 -8.46289,8.46289 l -0.004,23.38476 c -9.7e-4,4.65185 3.80961,8.46289 8.46094,8.46289 h 4.23633 a 2.11549,2.11549 0 0 0 2.11523,-2.11523 2.11549,2.11549 0 0 0 -2.11523,-2.11523 h -4.23633 c -2.38055,0 -4.23096,-1.85047 -4.23047,-4.23047 l 0.006,-23.38672 c 4.9e-4,-2.38108 1.84992,-4.23242 4.23047,-4.23242 h 38.07812 c 2.38055,0 4.23292,1.8524 4.23242,4.23242 l -0.006,23.38476 c -4.9e-4,2.38107 -1.84991,4.23243 -4.23046,4.23243 h -4.22657 a 2.11549,2.11549 0 0 0 -2.11523,2.11523 2.11549,2.11549 0 0 0 2.11523,2.11523 h 4.22657 c 4.65132,0 8.45997,-3.81014 8.46093,-8.46093 l 0.006,-23.38672 c 9.7e-4,-4.65185 -3.81156,-8.46289 -8.46289,-8.46289 z M 192,736.63867 c -1.02704,4.5e-4 -2.05429,0.45695 -2.67969,1.36914 l -7.44922,10.86524 c -1.29025,1.88193 0.18114,4.67578 2.46289,4.67578 h 15.34961 c 2.28197,0 3.75296,-2.79481 2.46094,-4.67578 l -7.46484,-10.86719 c -0.6262,-0.91164 -1.65265,-1.36764 -2.67969,-1.36719 z m 0.002,4.93945 5.31641,7.74024 h -10.62305 z"
          id="path47"
          transform="matrix(0.9454066,0,0,0.9454066,-69.518062,36.109126)" /></g><g
        id="g54"
        inkscape:label="display extend all join displays"
-       transform="matrix(0.5,0,0,0.5,0,-27.2598)"
+       transform="matrix(0.5,0,0,0.5,0,12.7402)"
        style="display:inline;fill:#241f31;fill-opacity:1;stroke-width:2"><title
          id="title48">shell-display-extend-all</title><rect
          style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
@@ -488,19 +391,16 @@
          x="80"
          y="694.51965" /><path
          id="path48"
-         style="color:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
-         d="m 88,736.5196 c -3.289397,0 -6,2.7106 -6,6 v 11.17187 l -1.414062,1.41407 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69147 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14259,0 2,0.85741 2,2 v 10 H 86 v -10 c 0,-1.14259 0.857415,-2 2,-2 z" /><path
-         id="path50"
-         style="color:#000000;stroke-width:2.02116;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
-         d="m 104.21484,696.53913 c -4.527432,0 -8.191402,3.69271 -8.191402,8.15234 v 19.65625 c 0,4.45963 3.66397,8.14844 8.191402,8.14844 H 112 v 2.9375 c 0,2.81674 2.26919,5.08594 5.08594,5.08594 h 6.82812 c 2.81675,0 5.08594,-2.2692 5.08594,-5.08594 v -2.9375 h 6.78516 c 4.52743,0 8.1914,-3.68881 8.1914,-8.14844 v -19.65625 c 0,-4.45963 -3.66397,-8.15234 -8.1914,-8.15234 z m 0,3.95703 h 31.57032 c 2.31175,0 4.15234,1.81574 4.15234,4.19531 v 19.65625 c 0,2.37956 -1.84059,4.19141 -4.15234,4.19141 h -31.57032 c -2.31175,0 -4.15234,-1.81185 -4.15234,-4.19141 v -19.65625 c 0,-2.37957 1.84059,-4.19531 4.15234,-4.19531 z m 11.78516,32 h 9 v 2.9375 c 0,0.60285 -0.48309,1.08594 -1.08594,1.08594 h -6.82812 c -0.60286,0 -1.08594,-0.48309 -1.08594,-1.08594 z" /><g
+         style="color:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill;fill:#000000;fill-opacity:1"
+         d="M 104.21484 696.53913 C 99.687412 696.53913 96.023438 700.23185 96.023438 704.69147 L 96.023438 724.34772 C 96.023438 728.80735 99.687412 732.49616 104.21484 732.49616 L 112 732.49616 L 112 735.43366 C 112 738.2504 114.26919 740.5196 117.08594 740.5196 L 123.91406 740.5196 C 126.73081 740.5196 129 738.2504 129 735.43366 L 129 732.49616 L 135.78516 732.49616 C 140.31259 732.49616 143.97656 728.80735 143.97656 724.34772 L 143.97656 704.69147 C 143.97656 700.23185 140.31259 696.53913 135.78516 696.53913 L 104.21484 696.53913 z M 104.21484 700.49616 L 135.78516 700.49616 C 138.09691 700.49616 139.9375 702.3119 139.9375 704.69147 L 139.9375 724.34772 C 139.9375 726.72728 138.09691 728.53913 135.78516 728.53913 L 104.21484 728.53913 C 101.90309 728.53913 100.0625 726.72728 100.0625 724.34772 L 100.0625 704.69147 C 100.0625 702.31191 101.90309 700.49616 104.21484 700.49616 z M 116 732.49616 L 125 732.49616 L 125 735.43366 C 125 736.03651 124.51691 736.5196 123.91406 736.5196 L 117.08594 736.5196 C 116.48308 736.5196 116 736.03651 116 735.43366 L 116 732.49616 z M 88 736.5196 C 84.710603 736.5196 82 739.2302 82 742.5196 L 82 753.69147 L 80.585938 755.10554 A 2.0002 2.0002 0 0 0 82 758.5196 L 110 758.5196 A 2.0002 2.0002 0 0 0 111.41406 755.10554 L 110 753.69147 L 110 742.5196 C 110 739.2302 107.2894 736.5196 104 736.5196 L 88 736.5196 z M 88 740.5196 L 104 740.5196 C 105.14259 740.5196 106 741.37701 106 742.5196 L 106 752.5196 L 86 752.5196 L 86 742.5196 C 86 741.37701 86.857415 740.5196 88 740.5196 z " /><g
          id="g23" /></g><g
        id="g78"
        inkscape:label="display extend all join displays"
-       transform="matrix(0.5,0,0,0.5,40,-27.2598)"
+       transform="matrix(0.5,0,0,0.5,40,12.7402)"
        style="display:inline;fill:#241f31;fill-opacity:1;stroke-width:2"><title
          id="title75">shell-display-external-only</title><path
          id="path22-61"
-         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:2.02116;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         style="color:#000000;display:inline;fill:#000000;fill-opacity:1;stroke-width:2.02116;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
          d="m 104,696.5196 c -4.52744,0 -8.1914,3.69272 -8.1914,8.15234 v 19.65626 c 0,4.45962 3.66396,8.14844 8.1914,8.14844 h 7.78516 v 2.9375 c 0,2.81672 2.26918,5.08592 5.08594,5.08592 h 6.82812 c 2.81674,0 5.08594,-2.26918 5.08594,-5.08592 v -2.9375 h 6.78516 c 4.52744,0 8.1914,-3.68882 8.1914,-8.14844 v -19.65626 c 0,-4.45962 -3.66396,-8.15234 -8.1914,-8.15234 z m 0,3.95704 h 31.57032 c 2.31176,0 4.15234,1.81574 4.15234,4.1953 v 19.65626 c 0,2.37954 -1.84058,4.1914 -4.15234,4.1914 H 104 c -2.31174,0 -4.15234,-1.81186 -4.15234,-4.1914 v -19.65626 c 0,-2.37956 1.8406,-4.1953 4.15234,-4.1953 z m 11.78516,32 h 9 v 2.9375 c 0,0.60284 -0.48308,1.08592 -1.08594,1.08592 h -6.82812 c -0.60286,0 -1.08594,-0.48308 -1.08594,-1.08592 z" /><rect
          style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
          id="rect75"
@@ -509,18 +409,18 @@
          x="80"
          y="694.51965" /><path
          id="path48-7"
-         style="color:#000000;fill:#242032;fill-opacity:0.2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         style="color:#000000;fill:#000000;fill-opacity:0.2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
          d="m 88,736.5196 c -3.289399,0 -6,2.7106 -6,6 v 11.17187 l -1.414062,1.41407 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69147 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14259,0 2,0.85741 2,2 v 10 H 86 v -10 c 0,-1.14259 0.857408,-2 2,-2 z" /></g><g
        id="g88"
        inkscape:label="display extend all join displays"
-       transform="matrix(0.5,0,0,0.5,80,-27.2598)"
+       transform="matrix(0.5,0,0,0.5,80,12.7402)"
        style="display:inline;stroke-width:2"><title
          id="title85">shell-display-built-in-only</title><path
          id="path22-61-8"
-         style="color:#000000;display:inline;fill:#242032;fill-opacity:0.2;stroke-width:2.022;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         style="color:#000000;display:inline;fill:#000000;fill-opacity:0.2;stroke-width:2.022;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
          d="m 104.20783,696.5196 c -4.529457,0 -8.195045,3.69436 -8.195045,8.15596 v 19.665 c 0,4.4616 3.665588,8.15206 8.195045,8.15206 h 7.78862 v 2.9388 c 0,2.81797 2.27019,5.08818 5.0882,5.08818 h 6.83115 c 2.81798,0 5.08819,-2.27019 5.08819,-5.08818 v -2.9388 h 6.78819 c 4.52944,0 8.19504,-3.69046 8.19504,-8.15206 v -19.665 c 0,-4.4616 -3.6656,-8.15596 -8.19504,-8.15596 z m 0,3.9588 h 31.58435 c 2.31278,0 4.15417,1.81654 4.15417,4.19716 v 19.665 c 0,2.38059 -1.84139,4.19326 -4.15417,4.19326 h -31.58435 c -2.31277,0 -4.15419,-1.81267 -4.15419,-4.19326 v -19.665 c 0,-2.38062 1.84142,-4.19716 4.15419,-4.19716 z m 11.7904,32.01422 h 9.00399 v 2.9388 c 0,0.60311 -0.48329,1.0864 -1.08642,1.0864 h -6.83115 c -0.60313,0 -1.08642,-0.48329 -1.08642,-1.0864 z" /><path
          id="path48-9"
-         style="color:#000000;display:inline;fill:#241f31;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
+         style="color:#000000;display:inline;fill:#000000;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;paint-order:stroke markers fill"
          d="m 88,736.5196 c -3.2894,0 -6,2.7106 -6,6 v 11.17186 l -1.41406,1.41408 A 2.0002,2.0002 0 0 0 82,758.5196 h 28 a 2.0002,2.0002 0 0 0 1.41406,-3.41406 L 110,753.69146 V 742.5196 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 16 c 1.14258,0 2,0.8574 2,2 v 10 H 86 v -10 c 0,-1.1426 0.8574,-2 2,-2 z" /><rect
          style="display:inline;fill:none;stroke:none;stroke-width:12;-inkscape-stroke:none;stop-color:#000000"
          id="rect85"
@@ -529,12 +429,12 @@
          x="80"
          y="694.51965" /></g><g
        id="g4445"
-       transform="translate(-52,-180)"
+       transform="translate(-52,-140)"
        inkscape:label="screenshooter capture windows"><title
          id="title4439">screenshot-ui-window</title><path
          id="rect28516"
          d="m 135,463 c -1.6447,0 -3,1.3553 -3,3 v 14 c 0,1.6447 1.3553,3 3,3 h 3.99805 v 3 c 0,1.6447 1.3553,3 3,3 h 18.99804 c 1.6447,0 3,-1.3553 3,-3 v -14 c 0,-1.6447 -1.3553,-3 -3,-3 h -4 v -3 c 0,-1.6447 -1.3553,-3 -3,-3 z m 0,2 h 18.99609 c 0.5713,0 1,0.4287 1,1 v 3 h -12.99804 c -1.6447,0 -3,1.3553 -3,3 v 9 H 135 c -0.5713,0 -1,-0.4287 -1,-1 v -14 c 0,-0.5713 0.4287,-1 1,-1 z m 6.99805,6 h 18.99804 c 0.5713,0 1,0.4287 1,1 v 14 c 0,0.5713 -0.4287,1 -1,1 h -18.99804 c -0.5713,0 -1,-0.4287 -1,-1 v -14 c 0,-0.5713 0.4287,-1 1,-1 z"
-         style="fill:#241f31;fill-opacity:1" /><rect
+         style="fill:#000000;fill-opacity:1" /><rect
          width="31.999998"
          height="31.999998"
          x="-491.99994"
@@ -543,11 +443,11 @@
          transform="matrix(0,-1,-1,0,0,0)"
          style="fill:none;stroke-width:1" /></g><g
        id="g42319"
-       transform="matrix(1,0,0,-1,-11.99998,671.99988)"
+       transform="matrix(1,0,0,-1,-11.99998,711.99988)"
        inkscape:label="focus management windows"><title
          id="title42313">shell-focus-windows</title><path
          id="path42315"
-         style="fill:#241f31;fill-opacity:1"
+         style="fill:#222222;fill-opacity:1"
          d="m 152.99597,462 c 1.6447,0 2.99671,1.3553 3,3 l 0.004,2 h -2 l -0.004,-2 c -0.001,-0.5713 -0.4287,-1 -1,-1 h -17.996 c -0.5713,0 -1,0.4287 -1,1 v 13 c 0,0.5713 0.4287,1 1,1 h 3 v 3 h -3 c -1.6447,0 -3,-1.3553 -3,-3 v -14 c 0,-1.6447 1.3553,-3 3,-3 z m 8.00009,7 c 1.6447,0 3,1.3553 3,3 v 14 c 0,1.6447 -1.3553,3 -3,3 h -17.99804 c -1.6447,0 -3,-1.3553 -3,-3 v -14 c 0,-1.6447 1.3553,-3 3,-3 z m 0,2 h -17.99804 c -0.5713,0 -1,0.4287 -1,1 v 13 c 0,0.5713 0.4287,1 1,1 h 17.99804 c 0.5713,0 1,-0.4287 1,-1 v -13 c 0,-0.5713 -0.4287,-1 -1,-1 z"
          sodipodi:nodetypes="ssccssssssccsssssssssssssssssssssss" /><rect
          width="31.999998"
@@ -559,7 +459,7 @@
          style="fill:none;stroke-width:1" /></g><g
        id="g42429"
        inkscape:label="screenshooter capture display screen "
-       transform="translate(-80,-207.53331)"><title
+       transform="translate(-80,-167.53331)"><title
          id="title42423">screenshot-ui-show-pointer</title><rect
          transform="scale(-1,1)"
          y="663.53333"
@@ -570,8 +470,9 @@
          style="fill:none" /><path
          d="m 82.95312,664.60753 2.41797,13.21094 3.23828,-2.39844 2.05469,2.64844 c 1.03125,1.43359 3.14844,-0.21094 2.01172,-1.5625 l -2.01562,-2.59375 2.98437,-2.17579 z m 0,0"
          fill="#2e3436"
-         id="path2-35" /></g><g
-       transform="matrix(-1,0,0,1,196.0059,-7)"
+         id="path2-35"
+         style="fill:#000000;fill-opacity:1" /></g><g
+       transform="matrix(-1,0,0,1,196.0059,33)"
        inkscape:label="menu item check radio"
        id="g4179-7-8"><title
          id="title146367">ornament-dot-unchecked</title><rect
@@ -583,10 +484,10 @@
          style="fill:none" /><path
          d="m 168.00586,487 c -4.40435,0 -8,3.59563 -8,8 0,4.40433 3.59565,8 8,8 4.40433,0 8,-3.59567 8,-8 0,-4.40437 -3.59568,-8 -8,-8 z m 0,2 c 3.32155,0 6,2.6784 6,6 0,3.32154 -2.67846,6 -6,6 -3.32158,0 -6,-2.67845 -6,-6 0,-3.3216 2.67842,-6 6,-6 z"
          id="path8781"
-         style="fill:#2e3435;fill-opacity:0.2" /></g><g
+         style="fill:#000000;fill-opacity:0.2" /></g><g
        id="g13"
        inkscape:label="window close exit"
-       transform="translate(-64,88)"><title
+       transform="translate(-64,128)"><title
          id="title13">preview-close</title><g
          id="g14227"
          transform="translate(-71.999987,-167.99997)"
@@ -601,12 +502,12 @@
            style="fill:none" /></g><path
          id="path986"
          d="m 71,302 a 1,1 0 0 0 -0.707031,0.29297 1,1 0 0 0 0,1.41406 L 74.585938,308 l -4.292969,4.29297 a 1,1 0 0 0 0,1.41406 1,1 0 0 0 1.414062,0 L 76,309.41406 l 4.292969,4.29297 a 1,1 0 0 0 1.414062,0 1,1 0 0 0 0,-1.41406 L 77.414062,308 l 4.292969,-4.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 81,302 1,1 0 0 0 80.292969,302.29297 L 76,306.58594 71.707031,302.29297 A 1,1 0 0 0 71,302 Z"
-         style="fill:#241f31;fill-opacity:1" /></g><g
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g691"
-       transform="translate(-3.99999,-116)"
+       transform="translate(-3.99999,-76)"
        inkscape:label="overview previous left backward"><title
          id="title685">carousel-arrow-previous</title><path
-         style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;fill-opacity:1"
          d="m 50,504 a 1,1 0 0 0 -0.707031,0.29297 l -7,7 a 1.0001,1.0001 0 0 0 0,1.41406 l 7,7 a 1,1 0 0 0 1.414062,0 1,1 0 0 0 0,-1.41406 L 44.414062,512 l 6.292969,-6.29297 a 1,1 0 0 0 0,-1.41406 A 1,1 0 0 0 50,504 Z"
          id="path6-4-7" /><rect
          width="15.999988"
@@ -617,7 +518,7 @@
          style="fill:none;stroke-width:0.999999" /></g><g
        id="g8"
        inkscape:label="focus dash dock"
-       transform="translate(-80,-32)"><title
+       transform="translate(-80,8)"><title
          id="title8">shell-focus-dash</title><rect
          width="31.999998"
          height="31.999998"
@@ -627,13 +528,13 @@
          transform="rotate(-90)"
          style="fill:none;stroke-width:1" /><path
          id="rect5"
-         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         style="color:#000000;fill:#000000;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none;fill-opacity:1"
          d="m 120,215 v 2 h 25 c 2.78729,0 5,2.21271 5,5 v 12 c 0,2.78729 -2.21271,5 -5,5 h -25 v 2 h 25 c 3.8607,0 7,-3.1393 7,-7 v -12 c 0,-3.8607 -3.1393,-7 -7,-7 z m 15,8 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z" /><path
          id="rect9"
-         style="opacity:1;fill:#241f31;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
+         style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
          d="m 120,219 v 18 h 5 c 1.662,0 3,-1.338 3,-3 v -12 c 0,-1.662 -1.338,-3 -3,-3 z" /></g><g
        inkscape:label="focus applications grid overview"
-       transform="matrix(2,0,0,2,-304.01212,-796)"
+       transform="matrix(2,0,0,2,-304.01212,-756)"
        id="g3941"
        style="stroke-width:0.5"><title
          id="title9844">shell-focus-app-grid</title><rect
@@ -645,10 +546,10 @@
          style="fill:none;stroke-width:0.5" /><path
          id="rect3972"
          d="m 196,491 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
-         style="fill:#241f31;fill-opacity:1;stroke-width:0.5" /></g><g
+         style="fill:#000000;fill-opacity:1;stroke-width:0.5" /></g><g
        id="g19"
        inkscape:label="focus management search"
-       transform="translate(0,-32)"><title
+       transform="translate(0,8)"><title
          id="title19">shell-focus-search</title><rect
          width="31.999998"
          height="31.999998"
@@ -657,16 +558,16 @@
          id="rect10"
          transform="rotate(-90)"
          style="fill:none;stroke-width:1" /><path
-         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         style="color:#000000;fill:#222222;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none;fill-opacity:1"
          d="m 173.5,215 c -5.78714,0 -10.5,4.71286 -10.5,10.5 0,5.78714 4.71286,10.5 10.5,10.5 2.6227,0 4.95218,-1.06098 6.79492,-2.6582 -0.0231,0.12059 -0.0238,0.2444 -0.002,0.36523 l 6,6 c 0.2538,0.24699 0.6193,0.34134 0.96094,0.24805 0.73461,-0.2008 0.98418,-1.11626 0.45312,-1.66211 l -6,-6 c -0.12083,-0.0218 -0.24464,-0.0211 -0.36523,0.002 C 182.93902,230.45218 184,228.1227 184,225.5 184,219.71286 179.28714,215 173.5,215 Z m 0,2 c 4.70626,0 8.5,3.79374 8.5,8.5 0,4.70626 -3.79374,8.5 -8.5,8.5 -4.70626,0 -8.5,-3.79374 -8.5,-8.5 0,-4.70626 3.79374,-8.5 8.5,-8.5 z"
          id="path11"
          sodipodi:nodetypes="ssscccccccsssssss" /></g><g
        id="g15"
-       transform="matrix(-1,0,0,1,163.99997,-280)"
+       transform="matrix(-1,0,0,1,163.99997,-240)"
        inkscape:label="focus management top bar panel"><title
          id="title15">shell-focus-top-bar</title><path
          id="path15"
-         style="fill:#241f31;fill-opacity:1;stroke-width:1"
+         style="fill:#000000;fill-opacity:1;stroke-width:1"
          d="m 161.99997,463 c 2,0 2,1.71498 2,2 v 22 h -2 v -17 c 0,-1 -1,-1 -1,-1 h -29 v -6 z m -2,2 h -4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -7,0.25 c -0.41421,0 -0.75,0.33579 -0.75,0.75 0,0.41421 0.33579,0.75 0.75,0.75 0.41421,0 0.75,-0.33579 0.75,-0.75 0,-0.41421 -0.33579,-0.75 -0.75,-0.75 z"
          sodipodi:nodetypes="scccccccsssssssssssss" /><rect
          width="31.999998"
@@ -681,7 +582,7 @@
          d="m 152.99997,465 h -1 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 1 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
          sodipodi:nodetypes="sssssss" /></g><g
        id="g3"
-       transform="translate(68,-280)"
+       transform="translate(68,-240)"
        inkscape:label="focus desktop tasks screen "><title
          id="title1">shell-focus-desktop</title><rect
          width="31.999998"
@@ -693,23 +594,14 @@
          style="fill:none;stroke-width:1" /><path
          id="path3"
          d="m 135,463 c -1.662,0 -3,1.338 -3,3 v 19 c 0,1.662 1.338,3 3,3 h 26 c 1.662,0 3,-1.338 3,-3 v -19 c 0,-1.662 -1.338,-3 -3,-3 z m 0,3 h 26 c 0.554,0 1,0.446 1,1 v 18 c 0,0.554 -0.446,1 -1,1 h -26 c -0.554,0 -1,-0.446 -1,-1 v -18 c 0,-0.554 0.446,-1 1,-1 z"
-         style="fill:#241f31;fill-opacity:1"
+         style="fill:#222222;fill-opacity:1"
          sodipodi:nodetypes="ssssssssssssssssss" /><path
          id="rect6"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 136.75,468 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /><path
-         id="path4"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 136.75,472 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /><path
-         id="path5"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 136.75,476 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /></g><g
+         style="opacity:1;fill:#222222;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="M 136.75 468 C 136.3345 468 136 468.3345 136 468.75 L 136 470.25 C 136 470.6655 136.3345 471 136.75 471 L 138.25 471 C 138.6655 471 139 470.6655 139 470.25 L 139 468.75 C 139 468.3345 138.6655 468 138.25 468 L 136.75 468 z M 136.75 472 C 136.3345 472 136 472.3345 136 472.75 L 136 474.25 C 136 474.6655 136.3345 475 136.75 475 L 138.25 475 C 138.6655 475 139 474.6655 139 474.25 L 139 472.75 C 139 472.3345 138.6655 472 138.25 472 L 136.75 472 z M 136.75 476 C 136.3345 476 136 476.3345 136 476.75 L 136 478.25 C 136 478.6655 136.3345 479 136.75 479 L 138.25 479 C 138.6655 479 139 478.6655 139 478.25 L 139 476.75 C 139 476.3345 138.6655 476 138.25 476 L 136.75 476 z " /></g><g
        id="g17"
        inkscape:label="focus dash dock"
-       transform="matrix(-1,0,0,1,191.99999,8)"><title
+       transform="matrix(-1,0,0,1,191.99999,48)"><title
          id="title16">shell-focus-dash-rtl</title><rect
          width="31.999998"
          height="31.999998"
@@ -719,17 +611,17 @@
          transform="rotate(-90)"
          style="fill:none;stroke-width:1" /><path
          id="path16"
-         style="color:#000000;fill:#241f31;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none"
+         style="color:#000000;fill:#000000;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2;-inkscape-stroke:none;fill-opacity:1"
          d="m 120,215 v 2 h 25 c 2.78729,0 5,2.21271 5,5 v 12 c 0,2.78729 -2.21271,5 -5,5 h -25 v 2 h 25 c 3.8607,0 7,-3.1393 7,-7 v -12 c 0,-3.8607 -3.1393,-7 -7,-7 z m 15,8 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -8,4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m 4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z" /><path
          id="path17"
-         style="opacity:1;fill:#241f31;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
+         style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1"
          d="m 120,219 v 18 h 5 c 1.662,0 3,-1.338 3,-3 v -12 c 0,-1.662 -1.338,-3 -3,-3 z" /></g><g
        id="g20"
-       transform="translate(-131.99998,-240)"
+       transform="translate(-131.99998,-200)"
        inkscape:label="focus management top bar panel"><title
          id="title17">shell-focus-top-bar-rtl</title><path
          id="path18"
-         style="fill:#241f31;fill-opacity:1;stroke-width:1"
+         style="fill:#000000;fill-opacity:1;stroke-width:1"
          d="m 161.99997,463 c 2,0 2,1.71498 2,2 v 22 h -2 v -17 c 0,-1 -1,-1 -1,-1 h -29 v -6 z m -2,2 h -4 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z m -7,0.25 c -0.41421,0 -0.75,0.33579 -0.75,0.75 0,0.41421 0.33579,0.75 0.75,0.75 0.41421,0 0.75,-0.33579 0.75,-0.75 0,-0.41421 -0.33579,-0.75 -0.75,-0.75 z"
          sodipodi:nodetypes="scccccccsssssssssssss" /><rect
          width="31.999998"
@@ -744,7 +636,7 @@
          d="m 152.99997,465 h -1 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 1 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 z"
          sodipodi:nodetypes="sssssss" /></g><g
        id="g10"
-       transform="translate(68,-240)"
+       transform="translate(68,-200)"
        inkscape:label="focus desktop tasks screen "><title
          id="title7">shell-focus-desktop-rtl</title><rect
          width="31.999998"
@@ -756,21 +648,12 @@
          style="fill:none;stroke-width:1" /><path
          id="path7"
          d="m 135,463 c -1.662,0 -3,1.338 -3,3 v 19 c 0,1.662 1.338,3 3,3 h 26 c 1.662,0 3,-1.338 3,-3 v -19 c 0,-1.662 -1.338,-3 -3,-3 z m 0,3 h 26 c 0.554,0 1,0.446 1,1 v 18 c 0,0.554 -0.446,1 -1,1 h -26 c -0.554,0 -1,-0.446 -1,-1 v -18 c 0,-0.554 0.446,-1 1,-1 z"
-         style="fill:#241f31;fill-opacity:1"
+         style="fill:#222222;fill-opacity:1"
          sodipodi:nodetypes="ssssssssssssssssss" /><path
          id="path8"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 157.75,468 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /><path
-         id="path9"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 157.75,472 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /><path
-         id="path10"
-         style="opacity:1;fill:#231e2d;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
-         d="m 157.75,476 h 1.5 c 0.4155,0 0.75,0.3345 0.75,0.75 v 1.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -1.5 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -1.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z"
-         sodipodi:nodetypes="sssssssss" /></g><g
-       transform="matrix(-1,0,0,1,216.0059,-7)"
+         style="opacity:1;fill:#222222;fill-opacity:0.2;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:2"
+         d="M 157.75 468 C 157.3345 468 157 468.3345 157 468.75 L 157 470.25 C 157 470.6655 157.3345 471 157.75 471 L 159.25 471 C 159.6655 471 160 470.6655 160 470.25 L 160 468.75 C 160 468.3345 159.6655 468 159.25 468 L 157.75 468 z M 157.75 472 C 157.3345 472 157 472.3345 157 472.75 L 157 474.25 C 157 474.6655 157.3345 475 157.75 475 L 159.25 475 C 159.6655 475 160 474.6655 160 474.25 L 160 472.75 C 160 472.3345 159.6655 472 159.25 472 L 157.75 472 z M 157.75 476 C 157.3345 476 157 476.3345 157 476.75 L 157 478.25 C 157 478.6655 157.3345 479 157.75 479 L 159.25 479 C 159.6655 479 160 478.6655 160 478.25 L 160 476.75 C 160 476.3345 159.6655 476 159.25 476 L 157.75 476 z " /></g><g
+       transform="matrix(-1,0,0,1,216.0059,33)"
        inkscape:label="menu item check radio"
        id="g12"><title
          id="title10">ornament-check</title><rect
@@ -782,18 +665,19 @@
          style="fill:none" /><path
          d="m 162.2479,491.66197 c -0.17578,-0.19922 -0.26171,-0.46094 -0.24609,-0.72657 0.0195,-0.26562 0.14063,-0.51172 0.33984,-0.6875 0.19922,-0.17578 0.46094,-0.26172 0.72657,-0.24609 0.26562,0.0195 0.51172,0.14062 0.6875,0.33984 l 6.29687,7.19532 2.24219,-2.24219 c 0.39062,-0.39063 1.02344,-0.39063 1.41406,0 0.1875,0.1875 0.29297,0.4414 0.29297,0.70703 0,0.26562 -0.10547,0.51953 -0.29297,0.70703 l -3,3 c -0.19531,0.19531 -0.46484,0.30469 -0.73828,0.29297 -0.27734,-0.008 -0.53906,-0.13281 -0.72266,-0.33984 z m 0,0"
          fill="#2e3436"
-         id="path1-3" /></g><g
+         id="path1-3"
+         style="fill:#000000;fill-opacity:1" /></g><g
        id="g21"
        inkscape:label="menu item check radio"
-       transform="translate(0,28)"><title
+       transform="translate(0,68)"><title
          id="title21">ornament-dot-checked</title><path
          id="path9555"
          d="m 8.006,457 c 1.65555,0 3,1.34444 3,3 0,1.65555 -1.34445,3 -3,3 -1.65555,0 -3,-1.34445 -3,-3 0,-1.65556 1.34445,-3 3,-3 z"
-         style="fill:#2e3436;fill-opacity:1"
+         style="fill:#000000;fill-opacity:1"
          sodipodi:nodetypes="sssss" /><path
          id="path12"
          d="m 8,452 c 4.40433,0 8,3.59566 8,8 0,4.40433 -3.59566,8 -8,8 -4.40434,0 -8,-3.59566 -8,-8 0,-4.40435 3.59566,-8 8,-8 z m 0,2 c -3.32157,0 -6,2.67843 -6,6 0,3.32156 2.67843,6 6,6 3.32156,0 6,-2.67844 6,-6 0,-3.32157 -2.67844,-6 -6,-6 z"
-         style="fill:#2e3435;fill-opacity:0.2"
+         style="fill:#000000;fill-opacity:0.2"
          sodipodi:nodetypes="ssssssssss" /><rect
          id="rect19"
          width="16"
diff --git a/data/osk-layouts/am.json b/data/osk-layouts/am.json
index 90859c682..4cc446120 100644
--- a/data/osk-layouts/am.json
+++ b/data/osk-layouts/am.json
@@ -57,7 +57,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -114,7 +114,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -175,7 +175,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -221,7 +221,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -251,15 +251,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -321,7 +321,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -378,7 +378,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -439,7 +439,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -485,7 +485,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -515,15 +515,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -600,7 +600,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -669,7 +669,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -788,15 +788,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -865,7 +865,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -926,7 +926,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1036,15 +1036,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ara.json b/data/osk-layouts/ara.json
index 5178c9499..b0cb022df 100644
--- a/data/osk-layouts/ara.json
+++ b/data/osk-layouts/ara.json
@@ -68,7 +68,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -144,7 +144,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -245,15 +245,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -330,7 +330,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -402,7 +402,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -526,15 +526,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -599,7 +599,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -660,7 +660,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -777,15 +777,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/at.json b/data/osk-layouts/at.json
index 059e35d7a..13cf8d474 100644
--- a/data/osk-layouts/at.json
+++ b/data/osk-layouts/at.json
@@ -75,7 +75,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -138,7 +138,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -146,7 +146,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -206,7 +206,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -220,7 +220,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -231,12 +231,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -317,7 +317,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -380,7 +380,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -388,7 +388,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -448,7 +448,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -462,7 +462,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -473,12 +473,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -556,7 +556,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -625,7 +625,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -728,15 +728,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -805,7 +805,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -867,7 +867,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -963,15 +963,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/be.json b/data/osk-layouts/be.json
index 3dec4867e..2507fce24 100644
--- a/data/osk-layouts/be.json
+++ b/data/osk-layouts/be.json
@@ -94,7 +94,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -152,7 +152,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -160,7 +160,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -227,7 +227,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -241,7 +241,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -252,12 +252,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -357,7 +357,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -414,7 +414,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -422,7 +422,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -489,7 +489,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -503,7 +503,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -514,12 +514,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -597,7 +597,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -666,7 +666,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -769,15 +769,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -846,7 +846,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -908,7 +908,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1004,15 +1004,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/bg.json b/data/osk-layouts/bg.json
index 8c85e1328..fe3c37d4d 100644
--- a/data/osk-layouts/bg.json
+++ b/data/osk-layouts/bg.json
@@ -63,7 +63,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -124,7 +124,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -132,7 +132,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -195,7 +195,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -209,7 +209,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -220,12 +220,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -294,7 +294,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -355,7 +355,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -363,7 +363,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -409,7 +409,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 3
           }
@@ -447,15 +447,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -532,7 +532,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -601,7 +601,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -704,15 +704,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -781,7 +781,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -842,7 +842,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -938,15 +938,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/by.json b/data/osk-layouts/by.json
index 429eef51b..8bda91000 100644
--- a/data/osk-layouts/by.json
+++ b/data/osk-layouts/by.json
@@ -63,7 +63,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -124,7 +124,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -132,7 +132,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -184,7 +184,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -222,15 +222,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -298,7 +298,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -359,7 +359,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -367,7 +367,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -419,7 +419,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -457,15 +457,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -542,7 +542,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -611,7 +611,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -714,15 +714,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -791,7 +791,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -852,7 +852,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -948,15 +948,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ca.json b/data/osk-layouts/ca.json
index ed946ade6..bde46c6b1 100644
--- a/data/osk-layouts/ca.json
+++ b/data/osk-layouts/ca.json
@@ -90,7 +90,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -152,7 +152,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -160,7 +160,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -221,7 +221,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -235,7 +235,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -246,12 +246,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -347,7 +347,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -409,7 +409,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -417,7 +417,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -478,7 +478,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -492,7 +492,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -503,12 +503,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -586,7 +586,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -655,7 +655,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -758,15 +758,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -835,7 +835,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -896,7 +896,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -992,15 +992,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ch+fr.json b/data/osk-layouts/ch+fr.json
index 0ef9c4526..6db43e6a8 100644
--- a/data/osk-layouts/ch+fr.json
+++ b/data/osk-layouts/ch+fr.json
@@ -75,7 +75,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -138,7 +138,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -146,7 +146,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -206,7 +206,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -220,7 +220,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -231,12 +231,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -317,7 +317,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -380,7 +380,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -388,7 +388,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -448,7 +448,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -462,7 +462,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -473,12 +473,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -556,7 +556,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -625,7 +625,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -728,15 +728,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -805,7 +805,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -867,7 +867,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -963,15 +963,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ch.json b/data/osk-layouts/ch.json
index 8b8bffd5f..698017a9b 100644
--- a/data/osk-layouts/ch.json
+++ b/data/osk-layouts/ch.json
@@ -75,7 +75,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -138,7 +138,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -146,7 +146,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -206,7 +206,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -220,7 +220,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -231,12 +231,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -317,7 +317,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -380,7 +380,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -388,7 +388,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -448,7 +448,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -462,7 +462,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -473,12 +473,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -556,7 +556,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -625,7 +625,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -728,15 +728,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -805,7 +805,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -867,7 +867,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -963,15 +963,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/cz.json b/data/osk-layouts/cz.json
index 711977a96..d1a978f14 100644
--- a/data/osk-layouts/cz.json
+++ b/data/osk-layouts/cz.json
@@ -90,7 +90,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -154,7 +154,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -162,7 +162,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -228,7 +228,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -242,7 +242,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -253,12 +253,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -354,7 +354,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -418,7 +418,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -426,7 +426,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -492,7 +492,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -506,7 +506,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -517,12 +517,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -600,7 +600,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -669,7 +669,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -772,15 +772,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -849,7 +849,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -910,7 +910,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1006,15 +1006,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/de.json b/data/osk-layouts/de.json
index 79a85eacf..ff29518ab 100644
--- a/data/osk-layouts/de.json
+++ b/data/osk-layouts/de.json
@@ -75,7 +75,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -138,7 +138,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -146,7 +146,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -206,7 +206,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -220,7 +220,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -231,12 +231,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -317,7 +317,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -380,7 +380,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -388,7 +388,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -448,7 +448,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -462,7 +462,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -473,12 +473,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -556,7 +556,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -625,7 +625,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -728,15 +728,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -805,7 +805,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -867,7 +867,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -963,15 +963,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/digits.json b/data/osk-layouts/digits.json
index a2303a0b2..a61606a66 100644
--- a/data/osk-layouts/digits.json
+++ b/data/osk-layouts/digits.json
@@ -22,7 +22,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic"
+            "iconName": "osk-delete-symbolic"
           }
         ],
         [
@@ -42,7 +42,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "height": 2
           }
@@ -73,7 +73,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/dk.json b/data/osk-layouts/dk.json
index ce23a094d..a507d7eca 100644
--- a/data/osk-layouts/dk.json
+++ b/data/osk-layouts/dk.json
@@ -79,7 +79,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -153,7 +153,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -161,7 +161,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -222,7 +222,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -236,7 +236,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -247,12 +247,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -337,7 +337,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -411,7 +411,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -419,7 +419,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -480,7 +480,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -494,7 +494,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -505,12 +505,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -588,7 +588,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -657,7 +657,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -760,15 +760,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -837,7 +837,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -899,7 +899,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -995,15 +995,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ee.json b/data/osk-layouts/ee.json
index d98d8dea7..7c7e475b4 100644
--- a/data/osk-layouts/ee.json
+++ b/data/osk-layouts/ee.json
@@ -100,7 +100,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -183,7 +183,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -191,7 +191,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -260,7 +260,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -274,7 +274,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -285,12 +285,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -396,7 +396,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -479,7 +479,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -487,7 +487,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -556,7 +556,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -570,7 +570,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -581,12 +581,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -664,7 +664,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -733,7 +733,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -836,15 +836,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -913,7 +913,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -975,7 +975,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1071,15 +1071,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/email.json b/data/osk-layouts/email.json
index ddc066b1f..65f7c1dd7 100644
--- a/data/osk-layouts/email.json
+++ b/data/osk-layouts/email.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -141,7 +141,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -149,7 +149,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -209,7 +209,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -235,12 +235,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -326,7 +326,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -387,7 +387,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -395,7 +395,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -455,7 +455,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -481,12 +481,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -564,7 +564,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -633,7 +633,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -736,15 +736,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -813,7 +813,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -874,7 +874,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -970,15 +970,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/epo.json b/data/osk-layouts/epo.json
index 2428c934f..54926d9af 100644
--- a/data/osk-layouts/epo.json
+++ b/data/osk-layouts/epo.json
@@ -109,7 +109,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -196,7 +196,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -204,7 +204,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -278,7 +278,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -292,7 +292,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -303,12 +303,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -423,7 +423,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -510,7 +510,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -518,7 +518,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -592,7 +592,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -606,7 +606,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -617,12 +617,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -700,7 +700,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -769,7 +769,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -872,15 +872,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -949,7 +949,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -1010,7 +1010,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1106,15 +1106,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/es+cat.json b/data/osk-layouts/es+cat.json
index ad27f982f..08d5cae4d 100644
--- a/data/osk-layouts/es+cat.json
+++ b/data/osk-layouts/es+cat.json
@@ -84,7 +84,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -152,7 +152,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -160,7 +160,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -222,7 +222,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -236,7 +236,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -247,12 +247,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -342,7 +342,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -410,7 +410,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -418,7 +418,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -480,7 +480,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -494,7 +494,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -505,12 +505,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -588,7 +588,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -657,7 +657,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -761,15 +761,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -838,7 +838,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -900,7 +900,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -997,15 +997,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/es.json b/data/osk-layouts/es.json
index fb14b77e4..9a3e21461 100644
--- a/data/osk-layouts/es.json
+++ b/data/osk-layouts/es.json
@@ -84,7 +84,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -150,7 +150,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -158,7 +158,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -221,7 +221,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -235,7 +235,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -246,12 +246,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -341,7 +341,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -407,7 +407,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -415,7 +415,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -478,7 +478,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -492,7 +492,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -503,12 +503,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -586,7 +586,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -655,7 +655,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -761,15 +761,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -838,7 +838,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -900,7 +900,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -999,15 +999,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/fi.json b/data/osk-layouts/fi.json
index be32e5b77..aac0064c1 100644
--- a/data/osk-layouts/fi.json
+++ b/data/osk-layouts/fi.json
@@ -70,7 +70,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -142,7 +142,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -150,7 +150,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -212,7 +212,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -226,7 +226,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -237,12 +237,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -318,7 +318,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -390,7 +390,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -398,7 +398,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -460,7 +460,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -474,7 +474,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -485,12 +485,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -568,7 +568,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -637,7 +637,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -740,15 +740,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -817,7 +817,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -879,7 +879,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -975,15 +975,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/fr.json b/data/osk-layouts/fr.json
index a439175bc..4497e88cc 100644
--- a/data/osk-layouts/fr.json
+++ b/data/osk-layouts/fr.json
@@ -100,7 +100,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -156,7 +156,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -164,7 +164,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -229,7 +229,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -243,7 +243,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -254,12 +254,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -365,7 +365,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -421,7 +421,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -429,7 +429,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -494,7 +494,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -508,7 +508,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -519,12 +519,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -602,7 +602,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -671,7 +671,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -774,15 +774,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -851,7 +851,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -913,7 +913,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1009,15 +1009,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ge.json b/data/osk-layouts/ge.json
index 4eb35f4b2..29ae4b004 100644
--- a/data/osk-layouts/ge.json
+++ b/data/osk-layouts/ge.json
@@ -60,7 +60,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -117,7 +117,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -125,7 +125,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -186,7 +186,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
             "width": 1.5
           }
@@ -200,7 +200,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -211,12 +211,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -279,7 +279,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -331,7 +331,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -339,7 +339,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -397,7 +397,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -411,7 +411,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -422,12 +422,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -505,7 +505,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -574,7 +574,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -677,15 +677,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -754,7 +754,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -815,7 +815,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -911,15 +911,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/gr.json b/data/osk-layouts/gr.json
index 81aa91184..c189ab3aa 100644
--- a/data/osk-layouts/gr.json
+++ b/data/osk-layouts/gr.json
@@ -66,7 +66,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -120,7 +120,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -128,7 +128,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -187,7 +187,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -201,7 +201,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -212,12 +212,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -289,7 +289,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -343,7 +343,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -351,7 +351,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -410,7 +410,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -424,7 +424,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -435,12 +435,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -518,7 +518,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -587,7 +587,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -690,15 +690,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -767,7 +767,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -829,7 +829,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -925,15 +925,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/hr.json b/data/osk-layouts/hr.json
index c264ea33f..463d0dfdc 100644
--- a/data/osk-layouts/hr.json
+++ b/data/osk-layouts/hr.json
@@ -60,7 +60,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -116,7 +116,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -124,7 +124,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -187,7 +187,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -201,7 +201,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -212,12 +212,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -283,7 +283,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -339,7 +339,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -347,7 +347,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -410,7 +410,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -424,7 +424,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -435,12 +435,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -518,7 +518,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -587,7 +587,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -690,15 +690,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -767,7 +767,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -828,7 +828,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -924,15 +924,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/hu.json b/data/osk-layouts/hu.json
index b7b303e22..3d1c1d4b0 100644
--- a/data/osk-layouts/hu.json
+++ b/data/osk-layouts/hu.json
@@ -85,7 +85,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -145,7 +145,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -153,7 +153,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -211,7 +211,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -225,7 +225,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -236,12 +236,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -332,7 +332,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -392,7 +392,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -400,7 +400,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -458,7 +458,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -472,7 +472,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -483,12 +483,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -566,7 +566,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -635,7 +635,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -738,15 +738,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -815,7 +815,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -876,7 +876,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -972,15 +972,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/id.json b/data/osk-layouts/id.json
index 4a36ebe13..14679859a 100644
--- a/data/osk-layouts/id.json
+++ b/data/osk-layouts/id.json
@@ -57,7 +57,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -109,7 +109,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -117,7 +117,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -175,7 +175,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -189,7 +189,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -200,12 +200,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -268,7 +268,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -320,7 +320,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -328,7 +328,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -386,7 +386,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -400,7 +400,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -411,12 +411,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -494,7 +494,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -563,7 +563,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -666,15 +666,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -743,7 +743,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -804,7 +804,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -900,15 +900,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/il.json b/data/osk-layouts/il.json
index cda90d301..7d2a0f730 100644
--- a/data/osk-layouts/il.json
+++ b/data/osk-layouts/il.json
@@ -59,7 +59,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -118,7 +118,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -208,15 +208,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -293,7 +293,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -364,7 +364,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -466,15 +466,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -543,7 +543,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -605,7 +605,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -702,15 +702,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/in+bolnagri.json b/data/osk-layouts/in+bolnagri.json
index b6c21ff0a..e205eb159 100644
--- a/data/osk-layouts/in+bolnagri.json
+++ b/data/osk-layouts/in+bolnagri.json
@@ -74,7 +74,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -140,7 +140,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -226,7 +226,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -237,12 +237,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -320,7 +320,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -390,7 +390,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -493,15 +493,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -570,7 +570,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -632,7 +632,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -728,15 +728,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/in+mal.json b/data/osk-layouts/in+mal.json
index 1a77b1e8b..2d3144109 100644
--- a/data/osk-layouts/in+mal.json
+++ b/data/osk-layouts/in+mal.json
@@ -68,7 +68,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -129,7 +129,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -137,7 +137,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1
           },
@@ -208,7 +208,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -222,7 +222,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -233,12 +233,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -306,7 +306,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 2.5
           }
         ],
@@ -367,7 +367,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -375,7 +375,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -444,7 +444,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -458,7 +458,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -469,12 +469,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -562,7 +562,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -632,7 +632,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -735,15 +735,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -812,7 +812,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -873,7 +873,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -969,15 +969,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ir.json b/data/osk-layouts/ir.json
index 436aa74a6..8510d1c0b 100644
--- a/data/osk-layouts/ir.json
+++ b/data/osk-layouts/ir.json
@@ -68,7 +68,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1
           }
         ],
@@ -137,7 +137,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -230,20 +230,20 @@
             ]
           },
           {
-            "iconName": "keyboard-zwnj-symbolic",
+            "iconName": "osk-zwnj-symbolic",
             "keyval": "0x100200c"
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -320,7 +320,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -395,7 +395,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -519,15 +519,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -592,7 +592,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -654,7 +654,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -771,15 +771,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/is.json b/data/osk-layouts/is.json
index 9d96f0207..e660eb8fa 100644
--- a/data/osk-layouts/is.json
+++ b/data/osk-layouts/is.json
@@ -86,7 +86,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -147,7 +147,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -155,7 +155,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -213,7 +213,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -227,7 +227,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -238,12 +238,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -335,7 +335,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -396,7 +396,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -404,7 +404,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -462,7 +462,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -476,7 +476,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -487,12 +487,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -570,7 +570,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -639,7 +639,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -742,15 +742,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -819,7 +819,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -880,7 +880,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -976,15 +976,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/it.json b/data/osk-layouts/it.json
index 3137bf0cc..5889c5e66 100644
--- a/data/osk-layouts/it.json
+++ b/data/osk-layouts/it.json
@@ -84,7 +84,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -145,7 +145,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -153,7 +153,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -211,7 +211,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -225,7 +225,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -236,12 +236,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -331,7 +331,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -392,7 +392,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -400,7 +400,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -458,7 +458,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -472,7 +472,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -483,12 +483,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -566,7 +566,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -635,7 +635,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -738,15 +738,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -815,7 +815,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -877,7 +877,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -973,15 +973,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ke.json b/data/osk-layouts/ke.json
index 91360a787..a6829e68f 100644
--- a/data/osk-layouts/ke.json
+++ b/data/osk-layouts/ke.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -142,7 +142,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -150,7 +150,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -210,7 +210,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -224,7 +224,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -235,12 +235,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -326,7 +326,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -388,7 +388,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -396,7 +396,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -456,7 +456,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -470,7 +470,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -481,12 +481,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -564,7 +564,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -633,7 +633,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -736,15 +736,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -813,7 +813,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -874,7 +874,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -970,15 +970,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/kg.json b/data/osk-layouts/kg.json
index 3ae363cc2..7ac38a3c9 100644
--- a/data/osk-layouts/kg.json
+++ b/data/osk-layouts/kg.json
@@ -65,7 +65,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -127,7 +127,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -135,7 +135,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -187,7 +187,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -225,15 +225,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -303,7 +303,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -365,7 +365,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -373,7 +373,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -425,7 +425,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -463,15 +463,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -548,7 +548,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -617,7 +617,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -720,15 +720,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -797,7 +797,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -858,7 +858,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -954,15 +954,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/kh.json b/data/osk-layouts/kh.json
index 4f24754a3..45a036e5d 100644
--- a/data/osk-layouts/kh.json
+++ b/data/osk-layouts/kh.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -151,7 +151,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -299,7 +299,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -310,12 +310,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -393,7 +393,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -463,7 +463,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -566,15 +566,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -643,7 +643,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -704,7 +704,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -800,15 +800,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/kr.json b/data/osk-layouts/kr.json
index 9a27c94d5..51d5640f1 100644
--- a/data/osk-layouts/kr.json
+++ b/data/osk-layouts/kr.json
@@ -66,7 +66,7 @@
             ]
           },
           {
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "keyval": "0xff08",
             "width": 1.5
           }
@@ -128,7 +128,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -136,7 +136,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -201,7 +201,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -215,7 +215,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -226,12 +226,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -303,7 +303,7 @@
             ]
           },
           {
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "keyval": "0xff08",
             "width": 1.5
           }
@@ -365,7 +365,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -373,7 +373,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -438,7 +438,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -452,7 +452,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -463,12 +463,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -545,7 +545,7 @@
             ]
           },
           {
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "keyval": "0xff08",
             "width": 1.5
           }
@@ -615,7 +615,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -718,15 +718,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -794,7 +794,7 @@
             ]
           },
           {
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "keyval": "0xff08",
             "width": 1.5
           }
@@ -856,7 +856,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -952,15 +952,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/la.json b/data/osk-layouts/la.json
index 6af1f5c82..8b59be3ba 100644
--- a/data/osk-layouts/la.json
+++ b/data/osk-layouts/la.json
@@ -76,7 +76,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -143,7 +143,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -289,7 +289,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -300,12 +300,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -383,7 +383,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -453,7 +453,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -556,15 +556,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -633,7 +633,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -695,7 +695,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -791,15 +791,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/latam.json b/data/osk-layouts/latam.json
index 8bea79011..c19051a0b 100644
--- a/data/osk-layouts/latam.json
+++ b/data/osk-layouts/latam.json
@@ -84,7 +84,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -150,7 +150,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -158,7 +158,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -221,7 +221,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -235,7 +235,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -246,12 +246,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -341,7 +341,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -407,7 +407,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -415,7 +415,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -478,7 +478,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -492,7 +492,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -503,12 +503,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -586,7 +586,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -655,7 +655,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -761,15 +761,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -838,7 +838,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -899,7 +899,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -998,15 +998,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/lt.json b/data/osk-layouts/lt.json
index 1d1a666ac..606513dad 100644
--- a/data/osk-layouts/lt.json
+++ b/data/osk-layouts/lt.json
@@ -96,7 +96,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -169,7 +169,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -177,7 +177,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -245,7 +245,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -259,7 +259,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -270,12 +270,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -377,7 +377,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -450,7 +450,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -458,7 +458,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -526,7 +526,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -540,7 +540,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -551,12 +551,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -634,7 +634,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -703,7 +703,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -806,15 +806,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -883,7 +883,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -944,7 +944,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1040,15 +1040,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/lv.json b/data/osk-layouts/lv.json
index a3c9095ba..1c2a85b2f 100644
--- a/data/osk-layouts/lv.json
+++ b/data/osk-layouts/lv.json
@@ -95,7 +95,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -168,7 +168,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -176,7 +176,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -244,7 +244,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -258,7 +258,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -269,12 +269,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -375,7 +375,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -448,7 +448,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -456,7 +456,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -524,7 +524,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -538,7 +538,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -549,12 +549,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -632,7 +632,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -701,7 +701,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -804,15 +804,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -881,7 +881,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -942,7 +942,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1038,15 +1038,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/mk.json b/data/osk-layouts/mk.json
index e9d6ea99f..123899443 100644
--- a/data/osk-layouts/mk.json
+++ b/data/osk-layouts/mk.json
@@ -64,7 +64,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -125,7 +125,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -133,7 +133,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -184,7 +184,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -222,15 +222,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -299,7 +299,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -360,7 +360,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -368,7 +368,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -419,7 +419,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -457,15 +457,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -542,7 +542,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -611,7 +611,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -714,15 +714,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -791,7 +791,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -852,7 +852,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -948,15 +948,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/mn.json b/data/osk-layouts/mn.json
index c62c673a6..c2eeec707 100644
--- a/data/osk-layouts/mn.json
+++ b/data/osk-layouts/mn.json
@@ -63,7 +63,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -124,7 +124,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -132,7 +132,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -186,7 +186,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -224,15 +224,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -300,7 +300,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -361,7 +361,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -369,7 +369,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -423,7 +423,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -461,15 +461,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -546,7 +546,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -616,7 +616,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -719,15 +719,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -796,7 +796,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -858,7 +858,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -954,15 +954,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/my.json b/data/osk-layouts/my.json
index d5e31c670..ca7fdfc59 100644
--- a/data/osk-layouts/my.json
+++ b/data/osk-layouts/my.json
@@ -57,7 +57,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -109,7 +109,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -117,7 +117,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -175,7 +175,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -189,7 +189,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -200,12 +200,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -268,7 +268,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -320,7 +320,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -328,7 +328,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -386,7 +386,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -400,7 +400,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -411,12 +411,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -494,7 +494,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -563,7 +563,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -666,15 +666,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -743,7 +743,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -804,7 +804,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -900,15 +900,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/nl.json b/data/osk-layouts/nl.json
index 9f5c5144f..cd285206d 100644
--- a/data/osk-layouts/nl.json
+++ b/data/osk-layouts/nl.json
@@ -85,7 +85,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -145,7 +145,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -153,7 +153,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -213,7 +213,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -227,7 +227,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -238,12 +238,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -334,7 +334,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -394,7 +394,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -402,7 +402,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -462,7 +462,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -476,7 +476,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -487,12 +487,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -570,7 +570,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -639,7 +639,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -742,15 +742,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -819,7 +819,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -881,7 +881,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -977,15 +977,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/no.json b/data/osk-layouts/no.json
index 005d95284..770c795e7 100644
--- a/data/osk-layouts/no.json
+++ b/data/osk-layouts/no.json
@@ -79,7 +79,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -153,7 +153,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -161,7 +161,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -222,7 +222,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -236,7 +236,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -247,12 +247,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -337,7 +337,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -411,7 +411,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -419,7 +419,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -480,7 +480,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -494,7 +494,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -505,12 +505,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -588,7 +588,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -657,7 +657,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -760,15 +760,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -837,7 +837,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -899,7 +899,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -995,15 +995,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/number.json b/data/osk-layouts/number.json
index ab68e0ad5..00dba4eff 100644
--- a/data/osk-layouts/number.json
+++ b/data/osk-layouts/number.json
@@ -22,7 +22,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic"
+            "iconName": "osk-delete-symbolic"
           }
         ],
         [
@@ -42,7 +42,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "height": 2
           }
@@ -85,7 +85,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ph.json b/data/osk-layouts/ph.json
index 35b76811c..1788db497 100644
--- a/data/osk-layouts/ph.json
+++ b/data/osk-layouts/ph.json
@@ -57,7 +57,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -109,7 +109,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -117,7 +117,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -175,7 +175,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -189,7 +189,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -200,12 +200,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -268,7 +268,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -320,7 +320,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -328,7 +328,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -386,7 +386,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -400,7 +400,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -411,12 +411,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -494,7 +494,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -563,7 +563,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -666,15 +666,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -743,7 +743,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -804,7 +804,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -900,15 +900,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/phone.json b/data/osk-layouts/phone.json
index 812f36bd0..367df3668 100644
--- a/data/osk-layouts/phone.json
+++ b/data/osk-layouts/phone.json
@@ -22,7 +22,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic"
+            "iconName": "osk-delete-symbolic"
           }
         ],
         [
@@ -42,7 +42,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "height": 2
           }
@@ -83,7 +83,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/pl.json b/data/osk-layouts/pl.json
index d18727d55..55b046852 100644
--- a/data/osk-layouts/pl.json
+++ b/data/osk-layouts/pl.json
@@ -72,7 +72,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -137,7 +137,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -145,7 +145,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -211,7 +211,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -225,7 +225,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -236,12 +236,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -319,7 +319,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -384,7 +384,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -392,7 +392,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -458,7 +458,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -472,7 +472,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -483,12 +483,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -566,7 +566,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -635,7 +635,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -738,15 +738,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -815,7 +815,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -876,7 +876,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -972,15 +972,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/pt.json b/data/osk-layouts/pt.json
index d5b9d0b69..aa75bae58 100644
--- a/data/osk-layouts/pt.json
+++ b/data/osk-layouts/pt.json
@@ -84,7 +84,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -144,7 +144,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -152,7 +152,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -213,7 +213,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -227,7 +227,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -238,12 +238,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -333,7 +333,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -393,7 +393,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -401,7 +401,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -462,7 +462,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -476,7 +476,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -487,12 +487,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -570,7 +570,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -639,7 +639,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -742,15 +742,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -819,7 +819,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -881,7 +881,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -977,15 +977,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ro.json b/data/osk-layouts/ro.json
index 5c5a4ca31..4889ef247 100644
--- a/data/osk-layouts/ro.json
+++ b/data/osk-layouts/ro.json
@@ -64,7 +64,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -129,7 +129,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -137,7 +137,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -195,7 +195,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -209,7 +209,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -220,12 +220,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -295,7 +295,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -360,7 +360,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -368,7 +368,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -426,7 +426,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -440,7 +440,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -451,12 +451,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -534,7 +534,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -603,7 +603,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -706,15 +706,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -783,7 +783,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -844,7 +844,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -940,15 +940,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/rs.json b/data/osk-layouts/rs.json
index d4a1117ef..2af98fffd 100644
--- a/data/osk-layouts/rs.json
+++ b/data/osk-layouts/rs.json
@@ -64,7 +64,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -125,7 +125,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -133,7 +133,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -184,7 +184,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -222,15 +222,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -299,7 +299,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -360,7 +360,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -368,7 +368,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -419,7 +419,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -457,15 +457,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -542,7 +542,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -611,7 +611,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -714,15 +714,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -791,7 +791,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -852,7 +852,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -948,15 +948,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ru.json b/data/osk-layouts/ru.json
index 2ba50246f..eaafab017 100644
--- a/data/osk-layouts/ru.json
+++ b/data/osk-layouts/ru.json
@@ -63,7 +63,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -124,7 +124,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -132,7 +132,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -184,7 +184,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -222,15 +222,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -298,7 +298,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -359,7 +359,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -367,7 +367,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -419,7 +419,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -457,15 +457,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -542,7 +542,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -611,7 +611,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -714,15 +714,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -791,7 +791,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -852,7 +852,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -948,15 +948,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/se.json b/data/osk-layouts/se.json
index 1adbe8b67..7d419c213 100644
--- a/data/osk-layouts/se.json
+++ b/data/osk-layouts/se.json
@@ -87,7 +87,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -163,7 +163,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -171,7 +171,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -239,7 +239,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -253,7 +253,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -264,12 +264,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -362,7 +362,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -438,7 +438,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -446,7 +446,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -514,7 +514,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -528,7 +528,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -539,12 +539,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -622,7 +622,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -691,7 +691,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -794,15 +794,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -871,7 +871,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -933,7 +933,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1029,15 +1029,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/si.json b/data/osk-layouts/si.json
index 6c0e36757..6eb7d3d29 100644
--- a/data/osk-layouts/si.json
+++ b/data/osk-layouts/si.json
@@ -57,7 +57,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -111,7 +111,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -119,7 +119,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -180,7 +180,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -194,7 +194,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -205,12 +205,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -273,7 +273,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -327,7 +327,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -335,7 +335,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -396,7 +396,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -410,7 +410,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -421,12 +421,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -504,7 +504,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -573,7 +573,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -676,15 +676,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -753,7 +753,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -815,7 +815,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -911,15 +911,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/sk.json b/data/osk-layouts/sk.json
index 5378f8e2e..78e62bd53 100644
--- a/data/osk-layouts/sk.json
+++ b/data/osk-layouts/sk.json
@@ -95,7 +95,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -168,7 +168,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -176,7 +176,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -245,7 +245,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -259,7 +259,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -270,12 +270,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -376,7 +376,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -449,7 +449,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -457,7 +457,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -526,7 +526,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -540,7 +540,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -551,12 +551,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -634,7 +634,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -703,7 +703,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -806,15 +806,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -883,7 +883,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -945,7 +945,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1041,15 +1041,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/th.json b/data/osk-layouts/th.json
index 5774396de..0d0ba4460 100644
--- a/data/osk-layouts/th.json
+++ b/data/osk-layouts/th.json
@@ -76,7 +76,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -143,7 +143,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -214,7 +214,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -270,7 +270,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -312,15 +312,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -392,7 +392,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -458,7 +458,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -529,7 +529,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -585,7 +585,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -627,15 +627,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -712,7 +712,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -782,7 +782,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -885,15 +885,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -962,7 +962,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -1024,7 +1024,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1120,15 +1120,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/tr.json b/data/osk-layouts/tr.json
index 1117875a6..b16479e00 100644
--- a/data/osk-layouts/tr.json
+++ b/data/osk-layouts/tr.json
@@ -77,7 +77,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -135,7 +135,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -143,7 +143,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -204,7 +204,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -218,7 +218,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -229,12 +229,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -317,7 +317,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -375,7 +375,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -383,7 +383,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -444,7 +444,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -458,7 +458,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -469,12 +469,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -552,7 +552,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -621,7 +621,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -724,15 +724,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -801,7 +801,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -863,7 +863,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -959,15 +959,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/ua.json b/data/osk-layouts/ua.json
index 14c36bf2a..0a9f1d45d 100644
--- a/data/osk-layouts/ua.json
+++ b/data/osk-layouts/ua.json
@@ -63,7 +63,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -125,7 +125,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -133,7 +133,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -185,7 +185,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -223,15 +223,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -299,7 +299,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -361,7 +361,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 1.5
           }
@@ -369,7 +369,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -421,7 +421,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -459,15 +459,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -544,7 +544,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -614,7 +614,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -717,15 +717,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -794,7 +794,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -856,7 +856,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -952,15 +952,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/uk.json b/data/osk-layouts/uk.json
index 77f7d8e47..526d5087d 100644
--- a/data/osk-layouts/uk.json
+++ b/data/osk-layouts/uk.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -141,7 +141,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -149,7 +149,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -209,7 +209,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -223,7 +223,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -234,12 +234,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -325,7 +325,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -386,7 +386,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -394,7 +394,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -454,7 +454,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -468,7 +468,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -479,12 +479,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -562,7 +562,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -631,7 +631,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -734,15 +734,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -811,7 +811,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -873,7 +873,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -969,15 +969,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/url.json b/data/osk-layouts/url.json
index 5e6cc79f2..81dcb2949 100644
--- a/data/osk-layouts/url.json
+++ b/data/osk-layouts/url.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -141,7 +141,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -149,7 +149,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -209,7 +209,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -245,12 +245,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -336,7 +336,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -397,7 +397,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -405,7 +405,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -465,7 +465,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -501,12 +501,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -584,7 +584,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -653,7 +653,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -756,15 +756,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -833,7 +833,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -894,7 +894,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -990,15 +990,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/us-extended.json b/data/osk-layouts/us-extended.json
index d4eab99e2..8727f1c91 100644
--- a/data/osk-layouts/us-extended.json
+++ b/data/osk-layouts/us-extended.json
@@ -85,14 +85,14 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 2
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-caps-lock-symbolic",
+            "iconName": "osk-caps-lock-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -151,7 +151,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -159,7 +159,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           },
@@ -220,7 +220,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -249,11 +249,11 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "iconName": "go-previous-symbolic",
@@ -269,7 +269,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -359,14 +359,14 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 2
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-caps-lock-symbolic",
+            "iconName": "osk-caps-lock-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -425,7 +425,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -433,7 +433,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           },
@@ -494,7 +494,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -523,11 +523,11 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "iconName": "go-previous-symbolic",
@@ -543,7 +543,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -620,7 +620,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -689,7 +689,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -792,15 +792,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -869,7 +869,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -930,7 +930,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1026,15 +1026,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/us.json b/data/osk-layouts/us.json
index 35c5b985c..21dd29dcd 100644
--- a/data/osk-layouts/us.json
+++ b/data/osk-layouts/us.json
@@ -80,7 +80,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -141,7 +141,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -149,7 +149,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -209,7 +209,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -223,7 +223,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -234,12 +234,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -325,7 +325,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -386,7 +386,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -394,7 +394,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -454,7 +454,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -468,7 +468,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -479,12 +479,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -562,7 +562,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -631,7 +631,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -734,15 +734,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -811,7 +811,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -872,7 +872,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -968,15 +968,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/vn.json b/data/osk-layouts/vn.json
index f6487bb16..27f595197 100644
--- a/data/osk-layouts/vn.json
+++ b/data/osk-layouts/vn.json
@@ -106,7 +106,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -176,7 +176,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -184,7 +184,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -242,7 +242,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -256,7 +256,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -267,12 +267,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -384,7 +384,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -454,7 +454,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -462,7 +462,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -520,7 +520,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -534,7 +534,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -545,12 +545,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -628,7 +628,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -698,7 +698,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -801,15 +801,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -878,7 +878,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -940,7 +940,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1036,15 +1036,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/za-extended.json b/data/osk-layouts/za-extended.json
index fd0583584..0e45fef30 100644
--- a/data/osk-layouts/za-extended.json
+++ b/data/osk-layouts/za-extended.json
@@ -93,14 +93,14 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 2
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-caps-lock-symbolic",
+            "iconName": "osk-caps-lock-symbolic",
             "level": "shift",
             "width": 1.5
           },
@@ -158,7 +158,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -166,7 +166,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           },
@@ -227,7 +227,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 2
           }
@@ -256,11 +256,11 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "iconName": "go-previous-symbolic",
@@ -276,7 +276,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -374,14 +374,14 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 2
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-caps-lock-symbolic",
+            "iconName": "osk-caps-lock-symbolic",
             "level": "default",
             "width": 1.5
           },
@@ -439,7 +439,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2.5
           }
@@ -447,7 +447,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "width": 2,
             "level": "default"
           },
@@ -508,7 +508,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 2
           }
@@ -537,11 +537,11 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "iconName": "go-previous-symbolic",
@@ -557,7 +557,7 @@
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -634,7 +634,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -703,7 +703,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -806,15 +806,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -883,7 +883,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -944,7 +944,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -1040,15 +1040,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/osk-layouts/za.json b/data/osk-layouts/za.json
index 0cd486553..83a41966a 100644
--- a/data/osk-layouts/za.json
+++ b/data/osk-layouts/za.json
@@ -88,7 +88,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -148,7 +148,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -156,7 +156,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift"
           },
           {
@@ -216,7 +216,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "shift",
             "width": 1.5
           }
@@ -230,7 +230,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -241,12 +241,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -340,7 +340,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -400,7 +400,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -408,7 +408,7 @@
         [
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default"
           },
           {
@@ -468,7 +468,7 @@
           },
           {
             "action": "levelSwitch",
-            "iconName": "keyboard-shift-symbolic",
+            "iconName": "osk-shift-symbolic",
             "level": "default",
             "width": 1.5
           }
@@ -482,7 +482,7 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic",
+            "iconName": "osk-emoji-picker-symbolic",
             "width": 1.5
           },
           {
@@ -493,12 +493,12 @@
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic",
+            "iconName": "osk-layout-symbolic",
             "width": 1.5
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic",
+            "iconName": "osk-hide-symbolic",
             "width": 2
           }
         ]
@@ -576,7 +576,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -645,7 +645,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -748,15 +748,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
@@ -825,7 +825,7 @@
           },
           {
             "action": "delete",
-            "iconName": "edit-clear-symbolic",
+            "iconName": "osk-delete-symbolic",
             "width": 1.5
           }
         ],
@@ -886,7 +886,7 @@
             ]
           },
           {
-            "iconName": "keyboard-enter-symbolic",
+            "iconName": "osk-enter-symbolic",
             "keyval": "0xff0d",
             "width": 2
           }
@@ -982,15 +982,15 @@
           },
           {
             "action": "emoji",
-            "iconName": "face-smile-symbolic"
+            "iconName": "osk-emoji-picker-symbolic"
           },
           {
             "action": "languageMenu",
-            "iconName": "keyboard-layout-symbolic"
+            "iconName": "osk-layout-symbolic"
           },
           {
             "action": "hide",
-            "iconName": "keyboard-hide-symbolic"
+            "iconName": "osk-hide-symbolic"
           }
         ]
       ]
diff --git a/data/theme/gnome-shell-sass/widgets/_keyboard.scss b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
index 489da5791..d650c2cd0 100644
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -91,7 +91,7 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
   }
 
   // size of icons on keys
-  StIcon { icon-size: $medium_icon_size; }
+  StIcon { icon-size: $medium_scalable_icon_size; }
 }
 
 // long press on a key popup
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 180ff6b8d..47aae4612 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1017,7 +1017,7 @@ const EmojiSelection = GObject.registerClass({
             section.button = key;
         }
 
-        key = new Key({iconName: 'keyboard-hide-symbolic'});
+        key = new Key({iconName: 'osk-hide-symbolic'});
         key.keyButton.add_style_class_name('default-key');
         key.keyButton.add_style_class_name('hide-key');
         key.connect('released', () => {
@@ -1519,7 +1519,7 @@ export const Keyboard = GObject.registerClass({
                         this._setActiveLevel(key.level);
                         this._setLatched(
                             key.level === 1 &&
-                                key.iconName === 'keyboard-caps-lock-symbolic');
+                                key.iconName === 'osk-caps-lock-symbolic');
                     }
 
                     this._longPressed = false;
@@ -1540,7 +1540,7 @@ export const Keyboard = GObject.registerClass({
             }
 
             if (key.action === 'levelSwitch' &&
-                key.iconName === 'keyboard-shift-symbolic') {
+                key.iconName === 'osk-shift-symbolic') {
                 layout.shiftKeys.push(button);
                 if (key.level === 'shift') {
                     button.connect('long-press', () => {
@@ -1623,7 +1623,7 @@ export const Keyboard = GObject.registerClass({
             let key = layout.shiftKeys[i];
             key.setLatched(latched);
             key.iconName = latched
-                ? 'keyboard-caps-lock-symbolic' : 'keyboard-shift-symbolic';
+                ? 'osk-caps-lock-symbolic' : 'osk-shift-symbolic';
         }
     }