diff --git a/data/keyboards/ar.xml b/data/keyboards/ar.xml
index e920683d..10e892e9 100644
--- a/data/keyboards/ar.xml
+++ b/data/keyboards/ar.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/as-inscript.xml b/data/keyboards/as-inscript.xml
index 1d213483..7946a591 100644
--- a/data/keyboards/as-inscript.xml
+++ b/data/keyboards/as-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/be.xml b/data/keyboards/be.xml
index 0e2d2bd4..4ad49363 100644
--- a/data/keyboards/be.xml
+++ b/data/keyboards/be.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/bn-inscript.xml b/data/keyboards/bn-inscript.xml
index 2c69b7f3..0eccc65e 100644
--- a/data/keyboards/bn-inscript.xml
+++ b/data/keyboards/bn-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/fa.xml b/data/keyboards/fa.xml
index c346362e..a4fb9bcc 100644
--- a/data/keyboards/fa.xml
+++ b/data/keyboards/fa.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/gu-inscript.xml b/data/keyboards/gu-inscript.xml
index 276cbb0b..e35f7956 100644
--- a/data/keyboards/gu-inscript.xml
+++ b/data/keyboards/gu-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/he.xml b/data/keyboards/he.xml
index 705ea145..bc9fdb22 100644
--- a/data/keyboards/he.xml
+++ b/data/keyboards/he.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/hi-inscript.xml b/data/keyboards/hi-inscript.xml
index d80d76f3..9739f8a6 100644
--- a/data/keyboards/hi-inscript.xml
+++ b/data/keyboards/hi-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/kk.xml b/data/keyboards/kk.xml
index ecfce6c1..df075515 100644
--- a/data/keyboards/kk.xml
+++ b/data/keyboards/kk.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/kn-inscript.xml b/data/keyboards/kn-inscript.xml
index 7d1421e8..a2c0fde9 100644
--- a/data/keyboards/kn-inscript.xml
+++ b/data/keyboards/kn-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ks-inscript.xml b/data/keyboards/ks-inscript.xml
index dd1c081b..cf174062 100644
--- a/data/keyboards/ks-inscript.xml
+++ b/data/keyboards/ks-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ks.xml b/data/keyboards/ks.xml
index 626ff49f..65605568 100644
--- a/data/keyboards/ks.xml
+++ b/data/keyboards/ks.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/mai-inscript.xml b/data/keyboards/mai-inscript.xml
index d80d76f3..9739f8a6 100644
--- a/data/keyboards/mai-inscript.xml
+++ b/data/keyboards/mai-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ml-inscript.xml b/data/keyboards/ml-inscript.xml
index 5e3813e3..0130cebc 100644
--- a/data/keyboards/ml-inscript.xml
+++ b/data/keyboards/ml-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/mr-inscript.xml b/data/keyboards/mr-inscript.xml
index 270c290e..9998fbc9 100644
--- a/data/keyboards/mr-inscript.xml
+++ b/data/keyboards/mr-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/my.xml b/data/keyboards/my.xml
index 040a0069..0e748897 100644
--- a/data/keyboards/my.xml
+++ b/data/keyboards/my.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/or-inscript.xml b/data/keyboards/or-inscript.xml
index 6539a00c..a4e44eac 100644
--- a/data/keyboards/or-inscript.xml
+++ b/data/keyboards/or-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/pa-inscript.xml b/data/keyboards/pa-inscript.xml
index 6c933da6..5c0b6465 100644
--- a/data/keyboards/pa-inscript.xml
+++ b/data/keyboards/pa-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ru.xml b/data/keyboards/ru.xml
index d036745d..3e126b17 100644
--- a/data/keyboards/ru.xml
+++ b/data/keyboards/ru.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/sd-inscript.xml b/data/keyboards/sd-inscript.xml
index deaab2ec..8452910a 100644
--- a/data/keyboards/sd-inscript.xml
+++ b/data/keyboards/sd-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ta-inscript.xml b/data/keyboards/ta-inscript.xml
index b7a2019a..e1d5eb4c 100644
--- a/data/keyboards/ta-inscript.xml
+++ b/data/keyboards/ta-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/te-inscript.xml b/data/keyboards/te-inscript.xml
index 78bde412..4bf5abc4 100644
--- a/data/keyboards/te-inscript.xml
+++ b/data/keyboards/te-inscript.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ua.xml b/data/keyboards/ua.xml
index d6fd35aa..e12533ba 100644
--- a/data/keyboards/ua.xml
+++ b/data/keyboards/ua.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/ug.xml b/data/keyboards/ug.xml
index 8352a945..2e0fa2b0 100644
--- a/data/keyboards/ug.xml
+++ b/data/keyboards/ug.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">
diff --git a/data/keyboards/zh-bopomofo.xml b/data/keyboards/zh-bopomofo.xml
index 7b9cfeda..19005965 100644
--- a/data/keyboards/zh-bopomofo.xml
+++ b/data/keyboards/zh-bopomofo.xml
@@ -547,8 +547,8 @@
             <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
             <oref>outline1</oref>
             <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" label="☺" category="keyname">preferences</symbol>
+                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
+                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
             </symbols>
         </key>
         <key id="keycode133" name="keycode133" column="1" row="4">