diff --git a/graphics/Icons/v2/SVG/Encode2.svg b/graphics/Icons/v2/SVG/Encode2.svg
new file mode 100644
index 000000000..958849ed0
--- /dev/null
+++ b/graphics/Icons/v2/SVG/Encode2.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg3465"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   sodipodi:docname="Encode2.svg"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3469"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient9542"><stop
+         style="stop-color:#000000;stop-opacity:0.15805045;"
+         offset="0"
+         id="stop9538" /><stop
+         style="stop-color:#000000;stop-opacity:0.1;"
+         offset="1"
+         id="stop9540" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient8049"><stop
+         style="stop-color:#f2fecf;stop-opacity:1;"
+         offset="0"
+         id="stop8045" /><stop
+         style="stop-color:#7dc051;stop-opacity:1;"
+         offset="1"
+         id="stop8047" /></linearGradient><linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-48,-48,0,31.999512,56)"
+       spreadMethod="pad"
+       id="linearGradient3495"><stop
+         style="stop-opacity:1;stop-color:#f99a9a"
+         offset="0"
+         id="stop3491" /><stop
+         style="stop-opacity:1;stop-color:#df281c"
+         offset="1"
+         id="stop3493" /></linearGradient><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3517"><path
+         d="M 10.106,42.7568 H 54 V 10 H 10.106 Z"
+         id="path3515" /></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8049"
+       id="linearGradient8051"
+       x1="-39.283281"
+       y1="-35.993961"
+       x2="5.0244694"
+       y2="-35.993961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-22.870971,11.994335)" /><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath9530"><g
+         id="g9534"
+         style="stroke-width:0.923077"
+         transform="matrix(1.0833333,0,0,1.0833333,6.0005001,-11.333333)"><path
+           d="M -5.5389233,69.538463 H 53.538001 V 10.461538 H -5.5389233 Z"
+           id="path9532"
+           style="stroke-width:0.923074" /></g></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9542"
+       id="linearGradient9544"
+       x1="28.825684"
+       y1="-19.585272"
+       x2="28.825684"
+       y2="-49.737534"
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+     id="namedview3467"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="3.3766425"
+     inkscape:cx="-25.469086"
+     inkscape:cy="55.232379"
+     inkscape:current-layer="g3473"><inkscape:page
+       x="0"
+       y="0"
+       id="page3471"
+       width="64"
+       height="64" /></sodipodi:namedview><g
+     id="g3473"
+     inkscape:groupmode="layer"
+     inkscape:label="Page 1"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4653"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       rx="24"
+       ry="24.000002" /><circle
+       style="opacity:1;fill:url(#linearGradient8051);fill-opacity:1;fill-rule:evenodd;stroke-width:0.750001;stroke-linecap:round;stroke-linejoin:round"
+       id="path4655"
+       cx="-40.000378"
+       cy="-23.999626"
+       transform="matrix(0,-1,-1,0,0,0)"
+       r="22.153875" /><circle
+       style="opacity:1;fill:#a8dc6f;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4657"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       r="20.307751" /><path
+       id="path4657-3"
+       style="fill:url(#linearGradient9544);fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+       d="M 41.805177 -49.76172 C 27.976262 -47.336438 15.405714 -41.278638 5.0961915 -32.609864 A 20.307751 20.307751 0 0 0 24.000001 -19.692871 A 20.307751 20.307751 0 0 0 44.30713 -40.000001 A 20.307751 20.307751 0 0 0 41.805177 -49.76172 z "
+       transform="scale(1,-1)" /><path
+       sodipodi:type="star"
+       style="opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path15093"
+       inkscape:flatsided="false"
+       sodipodi:sides="3"
+       sodipodi:cx="25.499998"
+       sodipodi:cy="20.000002"
+       sodipodi:r1="16.5"
+       sodipodi:r2="8.25"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 41.999998,20.000002 -12.375,7.14471 -12.375,7.144709 0,-14.289419 0,-14.2894193 12.375,7.1447103 z"
+       transform="matrix(0.75000002,0,0,-0.75000002,3.9834586,55.000002)"
+       inkscape:transform-center-x="-4.1249999" /></g></svg>
diff --git a/graphics/Icons/v2/SVG/PauseEncode2.svg b/graphics/Icons/v2/SVG/PauseEncode2.svg
new file mode 100644
index 000000000..69fb09b44
--- /dev/null
+++ b/graphics/Icons/v2/SVG/PauseEncode2.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg3465"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   sodipodi:docname="PauseEncode2.svg"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3469"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient9542"><stop
+         style="stop-color:#000000;stop-opacity:0.15805045;"
+         offset="0"
+         id="stop9538" /><stop
+         style="stop-color:#000000;stop-opacity:0.1;"
+         offset="1"
+         id="stop9540" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient8049"><stop
+         style="stop-color:#f2fecf;stop-opacity:1;"
+         offset="0"
+         id="stop8045" /><stop
+         style="stop-color:#7dc051;stop-opacity:1;"
+         offset="1"
+         id="stop8047" /></linearGradient><linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-48,-48,0,31.999512,56)"
+       spreadMethod="pad"
+       id="linearGradient3495"><stop
+         style="stop-opacity:1;stop-color:#f99a9a"
+         offset="0"
+         id="stop3491" /><stop
+         style="stop-opacity:1;stop-color:#df281c"
+         offset="1"
+         id="stop3493" /></linearGradient><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3517"><path
+         d="M 10.106,42.7568 H 54 V 10 H 10.106 Z"
+         id="path3515" /></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8049"
+       id="linearGradient8051"
+       x1="-39.283281"
+       y1="-35.993961"
+       x2="5.0244694"
+       y2="-35.993961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-22.870971,11.994335)" /><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath9530"><g
+         id="g9534"
+         style="stroke-width:0.923077"
+         transform="matrix(1.0833333,0,0,1.0833333,6.0005001,-11.333333)"><path
+           d="M -5.5389233,69.538463 H 53.538001 V 10.461538 H -5.5389233 Z"
+           id="path9532"
+           style="stroke-width:0.923074" /></g></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9542"
+       id="linearGradient9544"
+       x1="28.825684"
+       y1="-19.585272"
+       x2="28.825684"
+       y2="-49.737534"
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+     id="namedview3467"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.0326223"
+     inkscape:cx="-251.78617"
+     inkscape:cy="126.37729"
+     inkscape:current-layer="g3473"><inkscape:page
+       x="0"
+       y="0"
+       id="page3471"
+       width="64"
+       height="64" /></sodipodi:namedview><g
+     id="g3473"
+     inkscape:groupmode="layer"
+     inkscape:label="Page 1"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4653"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       rx="24"
+       ry="24.000002" /><circle
+       style="opacity:1;fill:url(#linearGradient8051);fill-opacity:1;fill-rule:evenodd;stroke-width:0.750001;stroke-linecap:round;stroke-linejoin:round"
+       id="path4655"
+       cx="-40.000378"
+       cy="-23.999626"
+       transform="matrix(0,-1,-1,0,0,0)"
+       r="22.153875" /><circle
+       style="opacity:1;fill:#a8dc6f;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4657"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       r="20.307751" /><path
+       id="path4657-3"
+       style="fill:url(#linearGradient9544);fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+       d="M 41.805177 -49.76172 C 27.976262 -47.336438 15.405714 -41.278638 5.0961915 -32.609864 A 20.307751 20.307751 0 0 0 24.000001 -19.692871 A 20.307751 20.307751 0 0 0 44.30713 -40.000001 A 20.307751 20.307751 0 0 0 41.805177 -49.76172 z "
+       transform="scale(1,-1)" /><rect
+       style="opacity:0.6;fill:#000000;fill-opacity:0.963406;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="rect13462"
+       width="5.25"
+       height="18"
+       x="16.5"
+       y="-49"
+       transform="scale(1,-1)" /><rect
+       style="opacity:0.6;fill:#000000;fill-opacity:0.963406;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="rect13464"
+       width="5.25"
+       height="18"
+       x="26.25"
+       y="-49"
+       transform="scale(1,-1)" /></g></svg>
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index ee58b9741..7ca56751c 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,38 +4,38 @@ icons =	\
 	hb-icon.svg fr.handbrake.ghb.svg
 
 icons_dep =	\
-	icons/24x24/apps/hb-advanced.symbolic.png \
-	icons/32x32/apps/hb-source.symbolic.png \
-	icons/32x32/apps/hb-picture.symbolic.png \
-	icons/32x32/apps/hb-add-queue.symbolic.png \
-	icons/32x32/apps/hb-showqueue.symbolic.png \
-	icons/32x32/apps/hb-activity.symbolic.png \
-	icons/32x32/apps/hb-presets.symbolic.png \
+	icons/24x24/apps/hb-advanced-symbolic.symbolic.png \
+	icons/32x32/apps/hb-source-symbolic.symbolic.png \
+	icons/32x32/apps/hb-picture-symbolic.symbolic.png \
+	icons/32x32/apps/hb-add-queue-symbolic.symbolic.png \
+	icons/32x32/apps/hb-showqueue-symbolic.symbolic.png \
+	icons/32x32/apps/hb-activity-symbolic.symbolic.png \
+	icons/32x32/apps/hb-presets-symbolic.symbolic.png \
 	icons/32x32/apps/hb-start.png \
 	icons/32x32/apps/hb-stop.png \
 	icons/32x32/apps/hb-pause.png \
-	icons/48x48/apps/hb-advanced.symbolic.png \
-	icons/64x64/apps/hb-source.symbolic.png \
-	icons/64x64/apps/hb-picture.symbolic.png \
-	icons/64x64/apps/hb-add-queue.symbolic.png \
-	icons/64x64/apps/hb-showqueue.symbolic.png \
-	icons/64x64/apps/hb-activity.symbolic.png \
-	icons/64x64/apps/hb-presets.symbolic.png \
+	icons/48x48/apps/hb-advanced-symbolic.symbolic.png \
+	icons/64x64/apps/hb-source-symbolic.symbolic.png \
+	icons/64x64/apps/hb-picture-symbolic.symbolic.png \
+	icons/64x64/apps/hb-add-queue-symbolic.symbolic.png \
+	icons/64x64/apps/hb-showqueue-symbolic.symbolic.png \
+	icons/64x64/apps/hb-activity-symbolic.symbolic.png \
+	icons/64x64/apps/hb-presets-symbolic.symbolic.png \
 	icons/64x64/apps/hb-start.png \
 	icons/64x64/apps/hb-stop.png \
 	icons/64x64/apps/hb-pause.png \
-	icons/symbolic/apps/hb-source.svg \
-	icons/symbolic/apps/hb-activity.svg \
-	icons/symbolic/apps/hb-picture.svg \
-	icons/symbolic/apps/hb-add-queue.svg \
-	icons/symbolic/apps/hb-showqueue.svg \
-	icons/symbolic/apps/hb-presets.svg \
+	icons/scalable/apps/hb-advanced-symbolic.svg \
+	icons/scalable/apps/hb-source-symbolic.svg \
+	icons/scalable/apps/hb-picture-symbolic.svg \
+	icons/scalable/apps/hb-add-queue-symbolic.svg \
+	icons/scalable/apps/hb-showqueue-symbolic.svg \
+	icons/scalable/apps/hb-activity-symbolic.svg \
+	icons/scalable/apps/hb-presets-symbolic.svg \
 	icons/scalable/apps/hb-start.svg \
 	icons/scalable/apps/hb-stop.svg \
 	icons/scalable/apps/hb-pause.svg \
 	icons/scalable/apps/hb-complete.svg \
 	icons/scalable/apps/hb-icon.svg \
-	icons/symbolic/apps/hb-advanced.svg \
 	icons/scalable/apps/fr.handbrake.ghb.svg
 
 hb_menu = fr.handbrake.ghb.desktop
diff --git a/gtk/src/ghb3.ui b/gtk/src/ghb3.ui
index b0e579e66..361e3d6c3 100644
--- a/gtk/src/ghb3.ui
+++ b/gtk/src/ghb3.ui
@@ -624,6 +624,7 @@ Resets the queue job to pending and ready to run again.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="hexpand">False</property>
+                                        <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkImage" id="queue_actions_menu_button_image">
                                             <property name="visible">True</property>
diff --git a/gtk/src/icon_res.gresource.xml b/gtk/src/icon_res.gresource.xml
index 0628b8a7d..336ed2130 100644
--- a/gtk/src/icon_res.gresource.xml
+++ b/gtk/src/icon_res.gresource.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/fr/handbrake/ghb">
-    <file>icons/24x24/apps/hb-advanced.symbolic.png</file>
-    <file>icons/32x32/apps/hb-source.symbolic.png</file>
-    <file>icons/32x32/apps/hb-picture.symbolic.png</file>
-    <file>icons/32x32/apps/hb-add-queue.symbolic.png</file>
-    <file>icons/32x32/apps/hb-showqueue.symbolic.png</file>
-    <file>icons/32x32/apps/hb-activity.symbolic.png</file>
-    <file>icons/32x32/apps/hb-presets.symbolic.png</file>
+    <file>icons/24x24/apps/hb-advanced-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-source-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-picture-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-add-queue-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-showqueue-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-activity-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/hb-presets-symbolic.symbolic.png</file>
     <file>icons/32x32/apps/hb-start.png</file>
     <file>icons/32x32/apps/hb-stop.png</file>
     <file>icons/32x32/apps/hb-pause.png</file>
-    <file>icons/48x48/apps/hb-advanced.symbolic.png</file>
-    <file>icons/64x64/apps/hb-source.symbolic.png</file>
-    <file>icons/64x64/apps/hb-picture.symbolic.png</file>
-    <file>icons/64x64/apps/hb-add-queue.symbolic.png</file>
-    <file>icons/64x64/apps/hb-showqueue.symbolic.png</file>
-    <file>icons/64x64/apps/hb-activity.symbolic.png</file>
-    <file>icons/64x64/apps/hb-presets.symbolic.png</file>
+    <file>icons/48x48/apps/hb-advanced-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-source-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-picture-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-add-queue-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-showqueue-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-activity-symbolic.symbolic.png</file>
+    <file>icons/64x64/apps/hb-presets-symbolic.symbolic.png</file>
     <file>icons/64x64/apps/hb-start.png</file>
     <file>icons/64x64/apps/hb-stop.png</file>
     <file>icons/64x64/apps/hb-pause.png</file>
-    <file>icons/symbolic/apps/hb-source.svg</file>
-    <file>icons/symbolic/apps/hb-picture.svg</file>
-    <file>icons/symbolic/apps/hb-add-queue.svg</file>
-    <file>icons/symbolic/apps/hb-showqueue.svg</file>
-    <file>icons/symbolic/apps/hb-activity.svg</file>
-    <file>icons/symbolic/apps/hb-presets.svg</file>
+    <file>icons/scalable/apps/hb-advanced-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-source-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-picture-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-add-queue-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-showqueue-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-activity-symbolic.svg</file>
+    <file>icons/scalable/apps/hb-presets-symbolic.svg</file>
     <file>icons/scalable/apps/hb-start.svg</file>
     <file>icons/scalable/apps/hb-stop.svg</file>
     <file>icons/scalable/apps/hb-pause.svg</file>
     <file>icons/scalable/apps/hb-complete.svg</file>
-    <file>icons/symbolic/apps/hb-advanced.svg</file>
     <file>icons/scalable/apps/hb-icon.svg</file>
     <file>icons/scalable/apps/fr.handbrake.ghb.svg</file>
   </gresource>
diff --git a/gtk/src/icons/24x24/apps/hb-advanced.symbolic.png b/gtk/src/icons/24x24/apps/hb-advanced-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/24x24/apps/hb-advanced.symbolic.png
rename to gtk/src/icons/24x24/apps/hb-advanced-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-activity.symbolic.png b/gtk/src/icons/32x32/apps/hb-activity-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-activity.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-activity-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-add-queue.symbolic.png b/gtk/src/icons/32x32/apps/hb-add-queue-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-add-queue.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-add-queue-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-picture.symbolic.png b/gtk/src/icons/32x32/apps/hb-picture-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-picture.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-picture-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-presets.symbolic.png b/gtk/src/icons/32x32/apps/hb-presets-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-presets.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-presets-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-showqueue.symbolic.png b/gtk/src/icons/32x32/apps/hb-showqueue-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-showqueue.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-showqueue-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-source.symbolic.png b/gtk/src/icons/32x32/apps/hb-source-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/32x32/apps/hb-source.symbolic.png
rename to gtk/src/icons/32x32/apps/hb-source-symbolic.symbolic.png
diff --git a/gtk/src/icons/32x32/apps/hb-stop.png b/gtk/src/icons/32x32/apps/hb-stop.png
index e94a4a728..32de6bb74 100644
Binary files a/gtk/src/icons/32x32/apps/hb-stop.png and b/gtk/src/icons/32x32/apps/hb-stop.png differ
diff --git a/gtk/src/icons/48x48/apps/hb-advanced.symbolic.png b/gtk/src/icons/48x48/apps/hb-advanced-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/48x48/apps/hb-advanced.symbolic.png
rename to gtk/src/icons/48x48/apps/hb-advanced-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-activity.symbolic.png b/gtk/src/icons/64x64/apps/hb-activity-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-activity.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-activity-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-add-queue.symbolic.png b/gtk/src/icons/64x64/apps/hb-add-queue-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-add-queue.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-add-queue-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-picture.symbolic.png b/gtk/src/icons/64x64/apps/hb-picture-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-picture.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-picture-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-presets.symbolic.png b/gtk/src/icons/64x64/apps/hb-presets-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-presets.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-presets-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-showqueue.symbolic.png b/gtk/src/icons/64x64/apps/hb-showqueue-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-showqueue.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-showqueue-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-source.symbolic.png b/gtk/src/icons/64x64/apps/hb-source-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/icons/64x64/apps/hb-source.symbolic.png
rename to gtk/src/icons/64x64/apps/hb-source-symbolic.symbolic.png
diff --git a/gtk/src/icons/64x64/apps/hb-stop.png b/gtk/src/icons/64x64/apps/hb-stop.png
index 1e980f0b4..d7b6fa59a 100644
Binary files a/gtk/src/icons/64x64/apps/hb-stop.png and b/gtk/src/icons/64x64/apps/hb-stop.png differ
diff --git a/gtk/src/icons/symbolic/apps/hb-activity.svg b/gtk/src/icons/scalable/apps/hb-activity-symbolic.svg
similarity index 78%
rename from gtk/src/icons/symbolic/apps/hb-activity.svg
rename to gtk/src/icons/scalable/apps/hb-activity-symbolic.svg
index a55639fce..ea7968657 100644
--- a/gtk/src/icons/symbolic/apps/hb-activity.svg
+++ b/gtk/src/icons/scalable/apps/hb-activity-symbolic.svg
@@ -11,8 +11,6 @@
    viewBox="0 0 64 64"
    enable-background="new 0 0 64 64"
    xml:space="preserve"
-   sodipodi:docname="hb-activity.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -26,31 +24,10 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="12.046875"
-   inkscape:cx="30.63035"
-   inkscape:cy="32.083009"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="33"
-   y1="10"
-   x2="33"
-   y2="58">
-	<stop
-   offset="0"
-   style="stop-color:#595959"
-   id="stop895" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop897" />
-</linearGradient>
+   showgrid="false" />
 <path
    fill-rule="evenodd"
    clip-rule="evenodd"
-   fill="url(#SVGID_1_)"
    d="M48.019,38c5.521,0,10,4.478,10,10s-4.479,10-10,10  c-5.523,0-10-4.478-10-10S42.495,38,48.019,38z M46,55h4v-8h-4V55z M45.86,43c0,1.182,0.958,2.14,2.14,2.14s2.14-0.958,2.14-2.14  c0-1.183-0.958-2.141-2.14-2.141S45.86,41.817,45.86,43z M47.984,36c-6.628,0-12,5.373-12,12c0,3.078,1.168,5.876,3.073,8H12  c-2,0-4-2-4-4c0,0,0-38,0-38.022C8,11.953,10,10,12,10h40c2,0,4,2,4,4v25.089C53.874,37.175,51.069,36,47.984,36z M14,16h4v-2h-4V16  z M20,16h2v-2h-2V16z M26,16h8v-2h-8V16z M36,16h4v-2h-4V16z M14,22h4v-2h-4V22z M20,22h6v-2h-6V22z M26,26h6c0,0,0-1.334,0-2  c-2,0-6,0-6,0V26z M14,26h6v-2h-6V26z M22,26h2v-2h-2V26z M14,36h6v-2h-6V36z M14,32h4v-2h-4V32z M20,32h8v-2h-8V32z M32,32h4v-2h-4  V32z M30,22h6v-2h-6V22z M36,36h2v-2h-2V36z M14,42h2v-2h-2V42z M20,42h12v-2H20V42z M14,46h4v-2h-4V46z M20,46h2v-2h-2V46z M24,46  h8v-2h-8V46z M14,52h12v-2H14V52z M38,32h10v-2H38V32z M28,36h4v-2h-4V36z M36,26h8v-2h-8V26z M24,36h2v-2h-2V36z M38,22h4v-2h-4V22  z M44,22h4v-2h-4V22z M30,52h2v-2h-2V52z M46,26h4v-2h-4V26z M44,16h6v-2h-6V16z"
    id="path900"
    style="fill:#000000;fill-opacity:1" />
diff --git a/gtk/src/icons/symbolic/apps/hb-add-queue.svg b/gtk/src/icons/scalable/apps/hb-add-queue-symbolic.svg
similarity index 79%
rename from gtk/src/icons/symbolic/apps/hb-add-queue.svg
rename to gtk/src/icons/scalable/apps/hb-add-queue-symbolic.svg
index 0f2c845e6..a4007de7e 100644
--- a/gtk/src/icons/symbolic/apps/hb-add-queue.svg
+++ b/gtk/src/icons/scalable/apps/hb-add-queue-symbolic.svg
@@ -11,8 +11,6 @@
    viewBox="0 0 48 48"
    enable-background="new 0 0 48.007 48"
    xml:space="preserve"
-   sodipodi:docname="hb-add-queue.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -26,31 +24,10 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="16.0625"
-   inkscape:cx="24.031128"
-   inkscape:cy="24.062257"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="24"
-   y1="6"
-   x2="24"
-   y2="43.5">
-	<stop
-   offset="0"
-   style="stop-color:#595959"
-   id="stop1024" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop1026" />
-</linearGradient>
+   showgrid="false"/>
 <path
    fill-rule="evenodd"
    clip-rule="evenodd"
-   fill="url(#SVGID_1_)"
    d="M39.005,27.004v-2.251c0,0,0-9.001,0-9.741  s-0.75-1.51-1.5-1.51c-0.75,0-26.254,0-27.004,0s-1.5,0.75-1.5,1.5c0,0.75,0,18.752,0,19.502s0.75,1.5,1.5,1.5h19.491l0,0  c0,1.054,0.19,2.061,0.523,3c-4.166,0-20.21,0-21.514,0c-1.5,0-3-1.5-3-3c0-1.5,0-3,0-3H4.5c-1.5,0-3-1.5-3-3  c0-1.5,0-19.503,0-21.003c0-1.5,1.5-3,3-3c1.5,0,27.004,0,28.504,0c1.5,0,3,1.5,3,3v1.5c0,0,1.5,0,3,0c1.5,0,3,1.5,3,3  c0,1.255,0,10.91,0,14.03C41.066,27.197,40.06,27.006,39.005,27.004z M33.004,10.501c0-0.75-0.75-1.5-1.5-1.5s-24.753,0-25.503,0  c-0.75,0-1.5,0.75-1.5,1.5c0,0.75,0,17.252,0,18.002c0,0.75,0.75,1.5,1.5,1.5V13.502c0-1.5,1.5-3,3-3H33.004z M15.565,27.006  l3.188,2.998l3.75-6.001l4.501,4.5l6-10.501l4.501,7.501c0,0,0,0.681,0,1.633c-3.772,0.629-6.744,3.597-7.378,7.368  c-7.537,0-19.626,0-19.626,0L15.565,27.006z M16.509,15.752c2.071,0,3.75,1.679,3.75,3.75s-1.679,3.75-3.75,3.75  c-2.072,0-3.751-1.679-3.751-3.75S14.438,15.752,16.509,15.752z M39.019,28.504c4.143,0,7.501,3.358,7.501,7.501  c0,4.143-3.358,7.501-7.501,7.501c-4.143,0-7.501-3.358-7.501-7.501C31.518,31.862,34.876,28.504,39.019,28.504z M43.506,37.505h-3  v3h-3v-3h-3v-3h3v-3h3v3h3V37.505z"
    id="path1029"
    style="fill:#000000" />
diff --git a/gtk/src/icons/symbolic/apps/hb-advanced.svg b/gtk/src/icons/scalable/apps/hb-advanced-symbolic.svg
similarity index 83%
rename from gtk/src/icons/symbolic/apps/hb-advanced.svg
rename to gtk/src/icons/scalable/apps/hb-advanced-symbolic.svg
index 8e30c79d4..3c6637595 100644
--- a/gtk/src/icons/symbolic/apps/hb-advanced.svg
+++ b/gtk/src/icons/scalable/apps/hb-advanced-symbolic.svg
@@ -7,8 +7,6 @@
    width="64"
    height="64"
    viewBox="0 0 64 64"
-   sodipodi:docname="hb-advanced.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -37,22 +35,8 @@
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="810"
-     inkscape:window-height="480"
      id="namedview4"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32.271186"
-     inkscape:cy="32.40678"
-     inkscape:window-x="1741"
-     inkscape:window-y="872"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     showgrid="false" />
   <path
      style="fill:#000000"
      d="M 28.287214,60.801065 C 27.713874,60.085479 26.943202,58.515303 26.574611,57.311784 25.75105,54.62271 19.419325,52.180675 17.707936,53.892064 16.023372,55.576628 12.50655,55.217212 10.654988,53.171259 8.7080886,51.01996 8.5483069,48.696138 10.168864,46.101213 11.907407,43.317364 9.6307366,38.639872 5.6933488,36.906125 3.3672208,35.881863 2.4124842,34.736757 2.1777424,32.689528 1.8020818,29.413318 3.4644072,27 6.0967646,27 c 1.0718725,0 2.5487308,-1.34757 3.5063436,-3.199389 1.3986858,-2.704759 1.4632758,-3.728125 0.4177848,-6.619378 -1.1394815,-3.15118 -1.0410885,-3.615583 1.251834,-5.908506 2.298172,-2.2981714 2.752054,-2.393222 5.933887,-1.242656 4.35493,1.574763 9.119933,-0.3301501 9.620341,-3.8459396 0.729953,-5.1285296 9.616137,-5.1285296 10.34609,0 0.500408,3.5157895 5.265411,5.4207026 9.620341,3.8459396 3.181833,-1.150566 3.635715,-1.0555154 5.933887,1.242656 2.292922,2.292923 2.391316,2.757326 1.251834,5.908506 -1.045491,2.891253 -0.980901,3.914619 0.417785,6.619378 C 55.354505,25.65243 56.831363,27 57.903235,27 c 2.632358,0 4.294683,2.413318 3.919023,5.689528 -0.234742,2.047229 -1.189479,3.192335 -3.515607,4.216597 -3.937388,1.733747 -6.214058,6.411239 -4.475515,9.195088 1.682411,2.693969 1.441152,5.342395 -0.659877,7.243799 -2.104788,1.904808 -5.269753,2.156494 -6.879195,0.547052 -1.989822,-1.989822 -7.752461,0.703071 -9.370605,4.378902 -1.096477,2.490793 -2.12681,3.297865 -4.506634,3.530099 -1.696846,0.165586 -3.554271,-0.284414 -4.127611,-1 z m 8.723282,-20.466336 c 4.791774,-2.830571 6.209191,-8.075433 3.5645,-13.189704 -3.441533,-6.655191 -13.708459,-6.655191 -17.149992,0 C 21.102837,31.635602 21.658511,34.858511 25.4,38.6 c 3.835911,3.835911 7.20207,4.33885 11.610496,1.734729 z"
diff --git a/gtk/src/icons/scalable/apps/hb-pause.svg b/gtk/src/icons/scalable/apps/hb-pause.svg
index 24f694bd2..a1eef29e2 100644
--- a/gtk/src/icons/scalable/apps/hb-pause.svg
+++ b/gtk/src/icons/scalable/apps/hb-pause.svg
@@ -2,139 +2,102 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.039505"
-   height="63.091442"
-   id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-pause.svg">
-  <defs
-     id="defs4">
-    <linearGradient
+   id="svg3465"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3469"><linearGradient
        inkscape:collect="always"
-       id="linearGradient4106">
-      <stop
-         style="stop-color:#98cc69;stop-opacity:1;"
+       id="linearGradient9542"><stop
+         style="stop-color:#000000;stop-opacity:0.15805045;"
          offset="0"
-         id="stop4108" />
-      <stop
-         style="stop-color:#98cc69;stop-opacity:0;"
+         id="stop9538" /><stop
+         style="stop-color:#000000;stop-opacity:0.1;"
          offset="1"
-         id="stop4110" />
-    </linearGradient>
-    <linearGradient
+         id="stop9540" /></linearGradient><linearGradient
        inkscape:collect="always"
-       id="linearGradient4092">
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:1;"
+       id="linearGradient8049"><stop
+         style="stop-color:#f2fecf;stop-opacity:1;"
          offset="0"
-         id="stop4094" />
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:0;"
+         id="stop8045" /><stop
+         style="stop-color:#7dc051;stop-opacity:1;"
          offset="1"
-         id="stop4096" />
-    </linearGradient>
-    <linearGradient
+         id="stop8047" /></linearGradient><linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4092"
-       id="linearGradient4098"
-       x1="47.222271"
-       y1="25.042967"
-       x2="42.65625"
-       y2="11.961781"
+       xlink:href="#linearGradient8049"
+       id="linearGradient8051"
+       x1="-39.283279"
+       y1="-35.993961"
+       x2="5.0244694"
+       y2="-35.993961"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73331)" />
-    <linearGradient
+       gradientTransform="translate(-22.870971,11.994335)" /><linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4106"
-       id="linearGradient4112"
-       x1="41.413502"
-       y1="12.430531"
-       x2="42.273998"
-       y2="-5.2882195"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
+       xlink:href="#linearGradient9542"
+       id="linearGradient9544"
+       x1="28.825684"
+       y1="-19.585272"
+       x2="28.825684"
+       y2="-49.737534"
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+     id="namedview3467"
      pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
      inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.963498"
-     inkscape:cy="14.251699"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
      showgrid="false"
-     inkscape:window-width="2985"
-     inkscape:window-height="1606"
-     inkscape:window-x="169"
-     inkscape:window-y="88"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
+     inkscape:zoom="1.0326223"
+     inkscape:cx="-251.78617"
+     inkscape:cy="126.37729"
+     inkscape:current-layer="g3473" /><g
+     id="g3473"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.518748,-986.11151)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3096"
-       sodipodi:cx="46.578125"
-       sodipodi:cy="13.180531"
-       sodipodi:rx="12.515625"
-       sodipodi:ry="12.515625"
-       d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
-       transform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73326)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.4374342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37.813612,1027.7016 c 27.609847,-21.2574 55.526469,-19.8956 55.526469,-19.8956"
-       id="path4068"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07556046;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 63.104846,1046.5393 c -1.150252,-0.1051 -2.87356,-0.3639 -3.834702,-0.5731 -9.131727,-1.9878 -16.778886,-8.1344 -20.584912,-16.5457 -0.381156,-0.8425 -0.413139,-0.9508 -0.23877,-0.808 0.09466,0.078 0.381477,-0.1027 1.706441,-1.0744 4.32925,-3.1744 7.884669,-5.4105 12.50085,-7.8622 8.960431,-4.7591 19.123843,-8.1529 29.049394,-9.7003 3.788721,-0.5905 6.947442,-0.8708 11.005589,-0.9759 l 0.651899,-0.024 0.04003,-0.2647 c 0.03419,-0.2249 0.08725,-0.098 0.362968,0.8698 0.860355,3.0233 1.128237,4.9393 1.126336,8.0567 -0.0013,2.1542 -0.09635,3.3071 -0.420071,5.0954 -0.702826,3.8827 -2.194424,7.5466 -4.439182,10.9045 -3.597826,5.3819 -9.019159,9.476 -15.230031,11.5016 -1.935985,0.6313 -3.637313,1.0097 -5.790398,1.2876 -1.12016,0.1442 -4.77869,0.2102 -5.905439,0.1051 z"
-       id="path4074"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.11172702;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4137"
-       width="7.0125442"
-       height="23.877636"
-       x="56.445675"
-       y="1005.7939" />
-    <rect
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.10703696;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4139"
-       width="6.9940414"
-       height="23.877363"
-       x="67.598469"
-       y="1005.7939" />
-  </g>
-</svg>
+     inkscape:label="Page 1"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4653"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       rx="24"
+       ry="24.000002" /><circle
+       style="opacity:1;fill:url(#linearGradient8051);fill-opacity:1;fill-rule:evenodd;stroke-width:0.750001;stroke-linecap:round;stroke-linejoin:round"
+       id="path4655"
+       cx="-40.000378"
+       cy="-23.999626"
+       transform="matrix(0,-1,-1,0,0,0)"
+       r="22.153875" /><circle
+       style="opacity:1;fill:#a8dc6f;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4657"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       r="20.307751" /><path
+       id="path4657-3"
+       style="fill:url(#linearGradient9544);fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       d="m 41.805177,-49.76172 c -13.828915,2.425282 -26.399463,8.483082 -36.7089855,17.151856 a 20.307751,20.307751 0 0 0 18.9038095,12.916993 20.307751,20.307751 0 0 0 20.307129,-20.30713 20.307751,20.307751 0 0 0 -2.501953,-9.761719 z"
+       transform="scale(1,-1)" /><rect
+       style="opacity:0.6;fill:#000000;fill-opacity:0.963406;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="rect13462"
+       width="5.25"
+       height="18"
+       x="16.5"
+       y="-49"
+       transform="scale(1,-1)" /><rect
+       style="opacity:0.6;fill:#000000;fill-opacity:0.963406;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="rect13464"
+       width="5.25"
+       height="18"
+       x="26.25"
+       y="-49"
+       transform="scale(1,-1)" /></g></svg>
diff --git a/gtk/src/icons/symbolic/apps/hb-picture.svg b/gtk/src/icons/scalable/apps/hb-picture-symbolic.svg
similarity index 73%
rename from gtk/src/icons/symbolic/apps/hb-picture.svg
rename to gtk/src/icons/scalable/apps/hb-picture-symbolic.svg
index 51bf64454..b59e4e7da 100644
--- a/gtk/src/icons/symbolic/apps/hb-picture.svg
+++ b/gtk/src/icons/scalable/apps/hb-picture-symbolic.svg
@@ -11,8 +11,6 @@
    viewBox="0 0 64 64"
    enable-background="new 0 0 64 64"
    xml:space="preserve"
-   sodipodi:docname="hb-picture.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -26,29 +24,8 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="12.046875"
-   inkscape:cx="32.041505"
-   inkscape:cy="32.083009"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="32"
-   y1="10"
-   x2="32"
-   y2="58">
-	<stop
-   offset="0"
-   style="stop-color:#595959"
-   id="stop1153" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop1155" />
-</linearGradient>
+   showgrid="false" />
 <path
-   fill="url(#SVGID_1_)"
    d="M52,54l2,4H10l2-4H52z M26,22v14l14-7L26,22z M60,14c0,2,0,28,0,30s-2,4-4,4c-0.569,0-4.553,0-10,0  l1,2l1,1v1H16v-1l1-1l1-2c-5.447,0-9.43,0-10,0c-2,0-4-2-4-4s0-28,0-30s1-4,4-4s46,0,48,0S60,12,60,14z M10,40H8v2h2V40z M10,36H8v2  h2V36z M10,32H8v2h2V32z M10,28H8v2h2V28z M10,24H8v2h2V24z M10,20H8v2h2V20z M10,16H8v2h2V16z M32,47.774  c0.704,0,1.274-0.57,1.274-1.274s-0.57-1.274-1.274-1.274s-1.275,0.57-1.275,1.274S31.296,47.774,32,47.774z M52,16H12v26h40V16z   M56,40h-2v2h2V40z M56,36h-2v2h2V36z M56,32h-2v2h2V32z M56,28h-2v2h2V28z M56,24h-2v2h2V24z M56,20h-2v2h2V20z M56,16h-2v2h2V16z"
    id="path1158"
    style="fill:#000000" />
diff --git a/gtk/src/icons/symbolic/apps/hb-presets.svg b/gtk/src/icons/scalable/apps/hb-presets-symbolic.svg
similarity index 85%
rename from gtk/src/icons/symbolic/apps/hb-presets.svg
rename to gtk/src/icons/scalable/apps/hb-presets-symbolic.svg
index fe06eab4e..720cf7fa9 100644
--- a/gtk/src/icons/symbolic/apps/hb-presets.svg
+++ b/gtk/src/icons/scalable/apps/hb-presets-symbolic.svg
@@ -11,8 +11,6 @@
    viewBox="0 0 64 64"
    enable-background="new 0 0 64 64"
    xml:space="preserve"
-   sodipodi:docname="hb-presets.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -26,29 +24,8 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="12.046875"
-   inkscape:cx="32.041505"
-   inkscape:cy="32.083009"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="34"
-   y1="10"
-   x2="34"
-   y2="60">
-	<stop
-   offset="0"
-   style="stop-color:#595959"
-   id="stop1282" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop1284" />
-</linearGradient>
+   showgrid="false" />
 <path
-   fill="url(#SVGID_1_)"
    d="M41,30H21v-2h20V30z M41,24H21v2h20V24z M41,20H21v2h20V20z M41,16H21v2h20V16z M16,51V15  c0-1,1-2,2-2h26c1,0,2,1,2,2v18.631c0.054,0.008,0.1,0.01,0.155,0.018c1.044,0.153,1.88,0.946,2.088,1.981l0.219,1.092  c0.112,0.044,0.224,0.09,0.335,0.138l0.944-0.626c0.081-0.054,0.173-0.078,0.258-0.121V14c0-2-2-4-4-4H16c-2,0-4,1.954-4,3.977  C12,14,12,52,12,52c0,2,2,4,4,4h16.062c-0.338-0.771-0.277-1.675,0.206-2.396L32.673,53H18C17,53,16,52,16,51z M39.203,36.86  c0.111-0.047,0.223-0.093,0.335-0.138L39.683,36H37.76c0.171,0.065,0.342,0.13,0.5,0.234L39.203,36.86z M21,48v2h8.655  c-0.107-0.738-0.159-1.38-0.163-2H21z M30.846,44H21v2h8.635c0.011-0.08,0.015-0.149,0.027-0.231  C29.774,45.017,30.22,44.378,30.846,44z M41,33.941V32H21v2h19.9C40.933,33.979,40.966,33.96,41,33.941z M33.744,37.701  c0.472-0.47,0.996-0.913,1.648-1.395c0.177-0.13,0.37-0.228,0.567-0.306H21v2h12.467C33.56,37.902,33.65,37.795,33.744,37.701z   M31.989,40H21v2h11.138C31.809,41.376,31.758,40.651,31.989,40z M53.213,50.273c-0.227,0.926-0.594,1.813-1.09,2.634l0.002,0.107  l1.399,2.098c-0.386,0.516-0.739,0.931-1.11,1.301c-0.37,0.371-0.785,0.725-1.301,1.11l-2.097-1.399l-0.107-0.002  c-0.819,0.496-1.706,0.863-2.635,1.091l-0.074,0.078l-0.495,2.472C45.065,59.856,44.522,59.9,44,59.9s-1.065-0.043-1.705-0.137  l-0.495-2.472l-0.074-0.078c-0.926-0.227-1.813-0.594-2.634-1.09l-0.107,0.002l-2.098,1.399c-0.516-0.386-0.931-0.739-1.301-1.11  c-0.371-0.37-0.725-0.785-1.11-1.301l1.399-2.098l0.002-0.107c-0.497-0.821-0.863-1.708-1.09-2.634l-0.078-0.074l-2.473-0.494  C32.143,49.062,32.1,48.519,32.1,48c0-0.518,0.043-1.062,0.136-1.705l2.473-0.494l0.078-0.074c0.228-0.93,0.595-1.816,1.091-2.634  l-0.002-0.107l-1.399-2.098c0.386-0.517,0.74-0.932,1.11-1.301c0.37-0.37,0.784-0.724,1.301-1.11l2.098,1.399l0.107,0.002  c0.821-0.497,1.708-0.863,2.634-1.09l0.074-0.078l0.494-2.473C42.938,36.143,43.481,36.1,44,36.1s1.062,0.043,1.705,0.136  l0.494,2.473l0.074,0.078c0.93,0.228,1.816,0.595,2.634,1.091l0.107-0.002l2.098-1.399c0.517,0.386,0.932,0.74,1.301,1.11  c0.37,0.37,0.724,0.784,1.11,1.301l-1.399,2.098l-0.002,0.107c0.496,0.818,0.863,1.705,1.091,2.634l0.078,0.074l2.472,0.495  C55.856,46.935,55.9,47.478,55.9,48c0,0.522-0.043,1.065-0.137,1.705l-2.472,0.495L53.213,50.273z M48.1,48  c0-2.26-1.839-4.1-4.1-4.1s-4.1,1.839-4.1,4.1c0,2.261,1.839,4.101,4.1,4.101S48.1,50.261,48.1,48z"
    id="path1287"
    style="fill:#000000" />
diff --git a/gtk/src/icons/symbolic/apps/hb-showqueue.svg b/gtk/src/icons/scalable/apps/hb-showqueue-symbolic.svg
similarity index 80%
rename from gtk/src/icons/symbolic/apps/hb-showqueue.svg
rename to gtk/src/icons/scalable/apps/hb-showqueue-symbolic.svg
index 6209a112b..c6161ed46 100644
--- a/gtk/src/icons/symbolic/apps/hb-showqueue.svg
+++ b/gtk/src/icons/scalable/apps/hb-showqueue-symbolic.svg
@@ -11,8 +11,6 @@
    viewBox="0 0 48 48"
    enable-background="new 0 0 48 48"
    xml:space="preserve"
-   sodipodi:docname="hb-showqueue.svg"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -26,31 +24,10 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="16.0625"
-   inkscape:cx="24.031128"
-   inkscape:cy="24.062257"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="24"
-   y1="6"
-   x2="24"
-   y2="43.5">
-	<stop
-   offset="0"
-   style="stop-color:#595959"
-   id="stop1411" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop1413" />
-</linearGradient>
+   showgrid="false" />
 <path
    fill-rule="evenodd"
    clip-rule="evenodd"
-   fill="url(#SVGID_1_)"
    d="M43.506,15.002c-0.816,0-3,0-3,0v-1.5c0-1.5-1.5-3-3-3  c-1.5,0-3,0-3,0s0,0,0-1.5c0-1.5-1.5-3-3-3s-25.503,0-27.004,0c-1.5,0-3,1.5-3,3c0,1.5,0,16.502,0,18.002s1.5,3,3,3h1.5  c0,0,0,1.5,0,3c0,1.5,1.5,3,3,3h1.5c0,0,0,3,0,4.5c0,1.5,1.5,3,3,3c1.5,0,28.504,0,30.004,0c1.5,0,3-1.5,3-3  c0-1.5,0-21.003,0-22.503C46.506,16.502,45.006,15.002,43.506,15.002z M6.001,13.502c0,1.5,0,13.502,0,13.502  c-0.75,0-1.5-0.75-1.5-1.5c0-0.75,0-14.252,0-15.002c0-0.75,0.75-1.5,1.5-1.5c0.75,0,23.253,0,24.003,0c0.75,0,1.5,0.75,1.5,1.5  c0,0-21.003,0-22.503,0C7.501,10.501,6.001,12.002,6.001,13.502z M10.501,18.002c0,1.5,0,15.002,0,15.002c-0.75,0-1.5-0.75-1.5-1.5  s0-15.752,0-16.502c0-0.75,0.75-1.5,1.5-1.5s24.753,0,25.503,0s1.5,0.75,1.5,1.5c0,0-22.503,0-24.003,0  C12.001,15.002,10.501,16.502,10.501,18.002z M43.506,39.033c0,0.723-0.75,1.473-1.5,1.473s-26.253,0-27.004,0  c-0.75,0-1.5-0.75-1.5-1.5c0-0.75,0-18.676,0-19.464s0.75-1.539,1.5-1.539c0.75,0,26.254,0,27.004,0s1.5,0.647,1.5,1.449  C43.506,20.253,43.506,38.31,43.506,39.033z M37.505,22.503l4.5,7.501v7.22c0,0.75-1.031,1.781-1.781,1.781l-25.222,0l5.063-7.499  l3.188,2.998l3.75-6.001l4.5,4.501L37.505,22.503z M17.259,24.003c0-2.071,1.679-3.75,3.75-3.75s3.75,1.679,3.75,3.75  s-1.679,3.75-3.75,3.75S17.259,26.075,17.259,24.003z"
    id="path1416"
    style="fill:#000000" />
diff --git a/gtk/src/icons/symbolic/apps/hb-source.svg b/gtk/src/icons/scalable/apps/hb-source-symbolic.svg
similarity index 73%
rename from gtk/src/icons/symbolic/apps/hb-source.svg
rename to gtk/src/icons/scalable/apps/hb-source-symbolic.svg
index ebdce9f61..f41352682 100644
--- a/gtk/src/icons/symbolic/apps/hb-source.svg
+++ b/gtk/src/icons/scalable/apps/hb-source-symbolic.svg
@@ -11,11 +11,6 @@
    viewBox="0 0 64 64"
    enable-background="new 0 0 64 64"
    xml:space="preserve"
-   sodipodi:docname="hb-source-symbolic.svg"
-   inkscape:export-filename="hb-source-symbolic.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -29,29 +24,8 @@
    inkscape:pageopacity="0.0"
    inkscape:pagecheckerboard="0"
    inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="12.046875"
-   inkscape:cx="32.041505"
-   inkscape:cy="32.166018"
-   inkscape:current-layer="Layer_1" />
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="32"
-   y1="3"
-   x2="32"
-   y2="58">
-	<stop
-   offset="0"
-   style="stop-color:#000000;stop-opacity:1;"
-   id="stop2" />
-	<stop
-   offset="1"
-   style="stop-color:#333333"
-   id="stop4" />
-</linearGradient>
+   showgrid="false" />
 <path
-   fill="url(#SVGID_1_)"
    d="M8,37h4v1H8V37z M26,38h4v-1h-4V38z M48,37h-4v1h4V37z M12,47H8v1h4V47z M12,31H8v1h4V31z M40,47h-4  v1h4V47z M62,22c0,1,0,32,0,32c0,2-2,4-4,4H6c-2,0-4-2-4-4c0,0,0-38.333,0-40.333s2-4,4-4L59.667,3l1.583,11.083L14,20  c0,0,45,0,46,0S62,21,62,22z M44,28h4l3.998-6h-4L44,28z M36,28h4l3.998-6h-4L36,28z M28,28h4l3.998-6h-4L28,28z M20,28h4l3.998-6  h-4L20,28z M52,6l3.998,6h2.335l-1.279-4.418L56,6H52z M44,7l3.998,6h4L48,7H44z M36,8l3.998,6h4L40,8H36z M28,9l3.998,6h4L32,9H28z   M20,10l3.998,6h4L24,10H20z M12,11l3.998,6h4L16,11H12z M12,28h4l3.998-6h-4L12,28z M6,15c0,1.104,0.896,2,2,2s2-0.896,2-2  s-0.896-2-2-2S6,13.896,6,15z M6,25c0,1.104,0.896,2,2,2s2-0.896,2-2s-0.896-2-2-2S6,23.896,6,25z M6,42h16v-6H6V42z M6,44h16v-1H6  V44z M32,53H6v1h26V53z M32,46H6v6h26V46z M24,43v1h16v-1H24z M40,42v-6H24v6H40z M58,53H34v1h24V53z M58,46H34v6h24V46z M58,43H42  v1h16V43z M58,36H42v6h16V36z M58,30H6v4h52V30z M58,22h-2.002L52,28h4l2-3V22z"
    id="path7"
    style="fill:#000000" />
diff --git a/gtk/src/icons/scalable/apps/hb-start.svg b/gtk/src/icons/scalable/apps/hb-start.svg
index d718e503f..4980fa59e 100644
--- a/gtk/src/icons/scalable/apps/hb-start.svg
+++ b/gtk/src/icons/scalable/apps/hb-start.svg
@@ -2,143 +2,104 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.03373"
-   height="63.961697"
-   id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-start.svg">
-  <defs
-     id="defs4">
-    <linearGradient
+   id="svg3465"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3469"><linearGradient
        inkscape:collect="always"
-       id="linearGradient4106">
-      <stop
-         style="stop-color:#98cc69;stop-opacity:1;"
+       id="linearGradient9542"><stop
+         style="stop-color:#000000;stop-opacity:0.15805045;"
          offset="0"
-         id="stop4108" />
-      <stop
-         style="stop-color:#98cc69;stop-opacity:0;"
+         id="stop9538" /><stop
+         style="stop-color:#000000;stop-opacity:0.1;"
          offset="1"
-         id="stop4110" />
-    </linearGradient>
-    <linearGradient
+         id="stop9540" /></linearGradient><linearGradient
        inkscape:collect="always"
-       id="linearGradient4092">
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:1;"
+       id="linearGradient8049"><stop
+         style="stop-color:#f2fecf;stop-opacity:1;"
          offset="0"
-         id="stop4094" />
-      <stop
-         style="stop-color:#6e9e41;stop-opacity:0;"
+         id="stop8045" /><stop
+         style="stop-color:#7dc051;stop-opacity:1;"
          offset="1"
-         id="stop4096" />
-    </linearGradient>
-    <linearGradient
+         id="stop8047" /></linearGradient><linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4092"
-       id="linearGradient4098"
-       x1="47.222271"
-       y1="25.042967"
-       x2="42.65625"
-       y2="11.961781"
+       xlink:href="#linearGradient8049"
+       id="linearGradient8051"
+       x1="-39.283279"
+       y1="-35.993961"
+       x2="5.0244694"
+       y2="-35.993961"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4539872,0,0,2.454166,-48.760714,984.90034)" />
-    <linearGradient
+       gradientTransform="translate(-22.870971,11.994335)" /><linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4106"
-       id="linearGradient4112"
-       x1="41.413502"
-       y1="12.430531"
-       x2="42.273998"
-       y2="-5.2882195"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
+       xlink:href="#linearGradient9542"
+       id="linearGradient9544"
+       x1="28.825684"
+       y1="-19.585272"
+       x2="28.825684"
+       y2="-49.737534"
+       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+     id="namedview3467"
      pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
      inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-2.8809072"
-     inkscape:cy="30.683019"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
      showgrid="false"
-     inkscape:window-width="2985"
-     inkscape:window-height="1606"
-     inkscape:window-x="79"
-     inkscape:window-y="82"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
+     inkscape:zoom="3.3766425"
+     inkscape:cx="-25.469086"
+     inkscape:cy="55.232379"
+     inkscape:current-layer="g3473" /><g
+     id="g3473"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.524546,-985.28365)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3096"
-       sodipodi:cx="46.578125"
-       sodipodi:cy="13.180531"
-       sodipodi:rx="12.515625"
-       sodipodi:ry="12.515625"
-       d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
-       transform="matrix(2.4539873,0,0,2.4541658,-48.760716,984.90019)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.45407653px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37.819025,1027.4477 c 27.60736,-21.5508 55.521465,-20.1705 55.521465,-20.1705"
-       id="path4068"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07607639;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 63.107977,1046.5446 c -1.150144,-0.106 -2.873296,-0.3686 -3.834351,-0.581 -9.130906,-2.0151 -16.777376,-8.2465 -20.583059,-16.7737 -0.381123,-0.8538 -0.413103,-0.9638 -0.238747,-0.8191 0.09467,0.079 0.381441,-0.104 1.706284,-1.0895 4.328861,-3.2178 7.88396,-5.4846 12.499724,-7.9704 8.959623,-4.825 19.122121,-8.2654 29.046775,-9.834 3.788382,-0.5985 6.946818,-0.8829 11.0046,-0.9896 l 0.651841,-0.024 0.04003,-0.2682 c 0.03419,-0.2286 0.08726,-0.097 0.362938,0.882 0.860277,3.0647 1.128136,5.0075 1.126236,8.1676 -0.0013,2.184 -0.09636,3.3525 -0.420036,5.1653 -0.702762,3.9366 -2.194226,7.6509 -4.438785,11.0554 -3.597498,5.456 -9.018342,9.6068 -15.228656,11.6602 -1.93581,0.6399 -3.636986,1.0232 -5.789874,1.3054 -1.120061,0.1463 -4.778261,0.2133 -5.904912,0.1062 z"
-       id="path4074"
-       inkscape:connector-curvature="0" />
-    <path
+     inkscape:label="Page 1"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4653"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       rx="24"
+       ry="24.000002" /><circle
+       style="opacity:1;fill:url(#linearGradient8051);fill-opacity:1;fill-rule:evenodd;stroke-width:0.750001;stroke-linecap:round;stroke-linejoin:round"
+       id="path4655"
+       cx="-40.000378"
+       cy="-23.999626"
+       transform="matrix(0,-1,-1,0,0,0)"
+       r="22.153875" /><circle
+       style="opacity:1;fill:#a8dc6f;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path4657"
+       cx="24"
+       cy="-40"
+       transform="scale(1,-1)"
+       r="20.307751" /><path
+       id="path4657-3"
+       style="fill:url(#linearGradient9544);fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       d="m 41.805177,-49.76172 c -13.828915,2.425282 -26.399463,8.483082 -36.7089855,17.151856 a 20.307751,20.307751 0 0 0 18.9038095,12.916993 20.307751,20.307751 0 0 0 20.307129,-20.30713 20.307751,20.307751 0 0 0 -2.501953,-9.761719 z"
+       transform="scale(1,-1)" /><path
        sodipodi:type="star"
-       style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4116"
-       sodipodi:sides="3"
-       sodipodi:cx="45.59375"
-       sodipodi:cy="10.180531"
-       sodipodi:r1="6.0857315"
-       sodipodi:r2="3.0596068"
-       sodipodi:arg1="2.0803885"
-       sodipodi:arg2="3.0635412"
+       style="opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round"
+       id="path15093"
        inkscape:flatsided="false"
+       sodipodi:sides="3"
+       sodipodi:cx="25.499998"
+       sodipodi:cy="20.000002"
+       sodipodi:r1="16.5"
+       sodipodi:r2="8.25"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
        inkscape:rounded="0"
        inkscape:randomized="0"
-       d="m 42.625001,15.49303 -0.08154,-5.073935 -0.06609,-5.4658267 4.434928,2.4663498 4.766592,2.6756749 -4.353386,2.607586 z"
-       transform="matrix(2.4539873,0,0,2.4541658,-46.153355,991.57212)"
-       inkscape:transform-center-x="-0.45436515"
-       inkscape:transform-center-y="-0.93242328" />
-  </g>
-</svg>
+       d="m 41.999998,20.000002 -12.375,7.14471 -12.375,7.144709 0,-14.289419 0,-14.2894193 12.375,7.1447103 z"
+       transform="matrix(0.75000002,0,0,-0.75000002,3.9834586,55.000002)"
+       inkscape:transform-center-x="-4.1249999" /></g></svg>
diff --git a/gtk/src/icons/scalable/apps/hb-stop.svg b/gtk/src/icons/scalable/apps/hb-stop.svg
index fe6078c63..e84547b1f 100644
--- a/gtk/src/icons/scalable/apps/hb-stop.svg
+++ b/gtk/src/icons/scalable/apps/hb-stop.svg
@@ -2,150 +2,125 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64.138466"
-   height="64.204422"
-   id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hb-stop.svg">
+   id="svg3465"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs4">
+     id="defs3469">
     <linearGradient
-       id="linearGradient4812">
-      <stop
-         style="stop-color:#f43536;stop-opacity:0.96774191;"
-         offset="0"
-         id="stop4814" />
-      <stop
-         style="stop-color:#ef8283;stop-opacity:0.99641579;"
-         offset="1"
-         id="stop4816" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4796">
-      <stop
-         style="stop-color:#941010;stop-opacity:1;"
-         offset="0"
-         id="stop4798" />
-      <stop
-         style="stop-color:#f03030;stop-opacity:0.99283153;"
-         offset="1"
-         id="stop4800" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4796"
-       id="linearGradient4802"
-       x1="41.226849"
-       y1="24.896255"
-       x2="36.870567"
-       y2="13.563606"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4812"
-       id="linearGradient4818"
-       x1="38.954006"
-       y1="10.785687"
-       x2="33.934811"
-       y2="2.2940922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
+       gradientTransform="matrix(0,-48,-48,0,31.999512,56)"
+       spreadMethod="pad"
+       id="linearGradient3495">
+      <stop
+         style="stop-opacity:1;stop-color:#f99a9a"
+         offset="0"
+         id="stop3491" />
+      <stop
+         style="stop-opacity:1;stop-color:#df281c"
+         offset="1"
+         id="stop3493" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3509">
+      <path
+         d="M 0,64 H 64 V 0 H 0 Z"
+         id="path3507" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3517">
+      <path
+         d="M 10.106,42.7568 H 54 V 10 H 10.106 Z"
+         id="path3515" />
+    </clipPath>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-6.9528851"
-     inkscape:cy="29.325436"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="3066"
-     inkscape:window-height="1678"
-     inkscape:window-x="44"
-     inkscape:window-y="76"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-387.73031,-488.0452)">
-    <path
-       sodipodi:type="star"
-       style="fill:#be3232;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4770"
-       sodipodi:sides="8"
-       sodipodi:cx="38.070126"
-       sodipodi:cy="2.5466304"
-       sodipodi:r1="13.571502"
-       sodipodi:r2="12.538433"
-       sodipodi:arg1="1.1768998"
-       sodipodi:arg2="1.5695989"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 43.278725,15.078835 -10.38717,0.01244 -7.353634,-7.3360434 -0.01244,-10.3871703 7.336043,-7.3536336 10.387171,-0.012438 7.353633,7.3360435 0.01244,10.3871702 z"
-       transform="matrix(2.5459342,0,0,2.5459004,322.89492,513.66332)" />
-    <path
-       sodipodi:type="star"
-       style="fill:#f63638;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4786"
-       sodipodi:sides="8"
-       sodipodi:cx="35.229069"
-       sodipodi:cy="5.1982808"
-       sodipodi:r1="9.8153391"
-       sodipodi:r2="9.0681906"
-       sodipodi:arg1="1.1675937"
-       sodipodi:arg2="1.5602928"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 39.080276,14.226519 -7.511921,0.07891 -5.367525,-5.2559363 -0.0789,-7.5119209 5.255936,-5.3675243 7.511921,-0.078905 5.367524,5.2559362 0.07891,7.5119209 z"
-       transform="matrix(3.1320997,0,0,3.0346077,309.47717,504.76027)" />
-    <path
-       style="opacity:0;fill:none;stroke:#000000;stroke-width:2.28744435px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 393.66948,534.19475 c 21.33847,-21.26451 54.32271,-25.44534 54.32271,-25.44534"
-       id="path4788"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4818);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 392.22542,532.75113 -0.60356,-0.55698 -0.12491,-11.35308 -0.1249,-11.3531 6.91302,-6.84433 c 3.80215,-3.76439 7.50185,-7.42353 8.22155,-8.13139 l 1.30852,-1.28704 9.39689,-0.10224 c 5.16827,-0.0564 10.45474,-0.10109 11.74771,-0.0994 l 2.35084,0.002 7.69149,7.30539 c 4.23034,4.01795 7.69693,7.33159 7.70356,7.36364 0.007,0.0322 -0.24833,0.10018 -0.5666,0.15154 -1.07427,0.17332 -3.60755,0.67402 -5.06337,1.00081 -12.47298,2.7997 -24.2674,7.45681 -33.99689,13.42388 -4.88606,2.9966 -9.5559,6.57032 -13.3066,10.18321 -0.48898,0.47103 -0.90122,0.85565 -0.91611,0.85473 -0.0149,-9.2e-4 -0.29866,-0.2523 -0.63062,-0.55864 l 0,0 z"
-       id="path4792"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient4802);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 401.61754,541.67395 c -3.71976,-3.53335 -6.82712,-6.48705 -6.90523,-6.56379 -0.14083,-0.13846 -0.13362,-0.14763 0.868,-1.10069 6.52689,-6.21111 14.60479,-11.45739 24.1762,-15.70147 7.63917,-3.38731 16.44003,-6.14823 24.755,-7.76594 1.69053,-0.3289 3.46205,-0.62203 3.49767,-0.57875 0.0133,0.0161 0.0752,4.88792 0.13774,10.82628 l 0.11366,10.79706 -5.65398,5.59965 c -3.1097,3.07982 -6.80953,6.74043 -8.22185,8.13469 l -2.56785,2.53503 -8.57156,0.0807 c -4.71436,0.0442 -9.98749,0.0988 -11.71809,0.12105 l -3.14651,0.0405 -6.76321,-6.42425 z"
-       id="path4794"
-       inkscape:connector-curvature="0" />
+     id="g3473"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)">
+    <g
+       id="g3475"
+       transform="matrix(0.92307695,0,0,0.92307695,14.058462,16)"
+       style="stroke-width:1.08333">
+      <path
+         d="M 0,0 -15.23,15.23 V 36.77 L 0,52 H 21.539 L 36.77,36.77 V 15.23 L 21.539,0 Z"
+         style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.08333"
+         id="path3477" />
+    </g>
+    <g
+       id="g3479"
+       transform="matrix(0.92307695,0,0,0.92307695,-5.5389233,10.461538)"
+       style="stroke-width:1.08333">
+      <g
+         id="g3481"
+         style="stroke-width:1.08333">
+        <g
+           id="g3487"
+           style="stroke-width:1.08333">
+          <g
+             id="g3489"
+             style="stroke-width:1.08333">
+            <path
+               d="M 22.059,8 8,22.059 V 41.942 L 22.059,56 H 41.941 L 56,41.942 V 22.059 L 41.941,8 Z"
+               style="fill:url(#linearGradient3495);fill-rule:evenodd;stroke:none;stroke-width:1.08333"
+               id="path3497" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g3499"
+       transform="matrix(0.92307695,0,0,0.92307695,15.587723,19.692308)"
+       style="stroke-width:1.08333">
+      <path
+         d="M 0,0 -12.887,12.888 V 31.113 L 0,44 H 18.225 L 31.113,31.113 V 12.888 L 18.225,0 Z"
+         style="fill:#ee3333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.08333"
+         id="path3501" />
+    </g>
+    <g
+       id="g3503"
+       transform="matrix(0.92307695,0,0,0.92307695,-5.5389233,10.461538)"
+       style="stroke-width:1.08333">
+      <g
+         id="g3505"
+         clip-path="url(#clipPath3509)"
+         style="stroke-width:1.08333">
+        <g
+           id="g3511"
+           style="stroke-width:1.08333">
+          <g
+             id="g3513"
+             style="stroke-width:1.08333" />
+          <g
+             id="g3525"
+             style="stroke-width:1.08333">
+            <g
+               clip-path="url(#clipPath3517)"
+               opacity="0.0899963"
+               id="g3523"
+               style="stroke-width:1.12757">
+              <g
+                 transform="translate(22.8872,10)"
+                 id="g3521"
+                 style="stroke-width:1.08333">
+                <path
+                   d="m 0,0 h 18.225 l 12.888,12.888 v 18.225 l -1.644,1.644 C 13.427,30.155 -1.097,23.05 -12.781,12.782 Z"
+                   style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.08333"
+                   id="path3519" />
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index e2d251e28..a6b0eba1a 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -1528,7 +1528,7 @@ add_to_queue_list(signal_user_data_t *ud, GhbValue *queueDict)
     ebox = gtk_event_box_new();
 #endif
 
-    status_icon = ghb_image_new_from_icon_name("hb-source",
+    status_icon = ghb_image_new_from_icon_name("hb-source-symbolic",
                                                GHB_ICON_SIZE_BUTTON);
 
     gtk_widget_set_name(status_icon, "queue_item_status");