diff --git a/data/mouse-left-symbolic.svg b/data/mouse-left-symbolic.svg
index bce62c28..04fa8c55 100644
--- a/data/mouse-left-symbolic.svg
+++ b/data/mouse-left-symbolic.svg
@@ -1,39 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   viewBox="0 0 32 32"
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+        xmlns='http://www.w3.org/2000/svg'
+        xmlns:svg='http://www.w3.org/2000/svg'
+        xmlns:gpa='https://www.gtk.org/grappa'
+        gpa:version='1'
+        gpa:state='0'
+        id='svg4354'
+        width='32'
+        height='32'
+        viewBox='0 0 32 32'>
   <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;enable-background:accumulate"
-     d="M 15.982422,3 C 14.886168,3.024976 13.746635,3.08305 12.671875,3.3652344 13.756132,3.1291686 14.877382,3.0075733 16,3.0078125 V 13.435547 a 1.5,1.5 0 0 1 -1.5,1.5 v 0.0039 c -1.873636,-0.08441 -3.716261,-0.311236 -5.4492186,-0.712891 -0.0026,-6e-4 -0.0052,-0.0014 -0.0078,-0.002 -0.009,0.541574 -0.01402,1.083309 -0.01563,1.625 -3.31e-4,0.08988 -0.0038,0.179646 -0.0039,0.269532 -4.74e-4,0.03971 5.26e-4,0.07943 0,0.11914 -0.0026,0.253879 -0.0088,0.507745 -0.0059,0.761719 h 0.0078 c 0.0097,0.954873 0.04327,1.909799 0.08984,2.863281 0.02414,0.613642 0.04586,1.227542 0.08594,1.839844 v 0.002 c 0.01044,0.03241 0.01768,0.06578 0.02148,0.09961 0.137132,1.197642 0.181451,2.425415 0.433594,3.617187 0.01421,0.09295 0.02233,0.18641 0.03711,0.279297 v 0.0059 c 0.09037,0.458848 0.258047,0.91929 0.5039066,1.332031 0.05927,0.100661 0.123857,0.195825 0.195312,0.28711 0.389801,0.52858 0.926747,0.946206 1.634766,1.115234 0.0013,10e-5 0.0026,-1.09e-4 0.0039,0 0.004,4e-4 0.0078,0.0016 0.01172,0.002 0.189502,0.06694 0.377904,0.138491 0.572265,0.181641 0.459595,0.101891 0.927542,0.17522 1.398438,0.234375 0.0046,6.37e-4 0.0091,0.0013 0.01367,0.002 0.02012,0.0028 0.04042,0.0033 0.06055,0.0059 0.0687,0.0092 0.138214,0.01138 0.207031,0.01953 0.240754,0.026 0.480583,0.05861 0.722656,0.07422 0.0084,5.44e-4 0.01695,-5.31e-4 0.02539,0 0.319155,0.02063 0.6386,0.03122 0.958984,0.03125 0.319731,-7e-5 0.638526,-0.01067 0.957031,-0.03125 0.0084,-5.3e-4 0.01695,5.44e-4 0.02539,0 0.242073,-0.01561 0.481902,-0.04821 0.722656,-0.07422 0.09365,-0.01011 0.187894,-0.01562 0.28125,-0.02734 0.470947,-0.05933 0.938893,-0.132656 1.398488,-0.234547 0.194361,-0.04315 0.382763,-0.114701 0.572265,-0.181641 0.0039,-4e-4 0.0077,-0.0016 0.01172,-0.002 0.0013,-1.09e-4 0.0026,10e-5 0.0039,0 0.708096,-0.169047 1.246908,-0.586571 1.636719,-1.115234 0.07319,-0.09352 0.138837,-0.191558 0.199219,-0.294922 0.243132,-0.410562 0.408291,-0.868416 0.498052,-1.324172 v -0.0059 c 0.01478,-0.09285 0.0229,-0.186308 0.03711,-0.279256 0.252143,-1.191772 0.296462,-2.419545 0.433594,-3.617187 0.0038,-0.03383 0.01104,-0.0672 0.02148,-0.09961 v -0.002 c 0.04007,-0.612255 0.06179,-1.226155 0.08594,-1.839797 0.04657,-0.953482 0.08011,-1.908408 0.08984,-2.863281 h 0.0078 c 0.0029,-0.253974 -0.0033,-0.50784 -0.0059,-0.761719 -5.27e-4,-0.03971 4.73e-4,-0.07943 0,-0.11914 -1.26e-4,-0.08989 -0.0036,-0.17965 -0.0039,-0.269532 -0.0016,-0.541691 -0.0066,-1.083426 -0.01563,-1.625 -0.0026,6.01e-4 -0.0052,0.0014 -0.0078,0.002 -0.0019,-0.102843 -0.0017,-0.205767 -0.0039,-0.308593 0.001,0.04432 0.0049,0.08849 0.0059,0.132812 0.0013,0.05797 0.0046,0.115858 0.0059,0.173828 -0.0032,-0.195391 -0.01131,-0.390588 -0.01563,-0.585937 -0.0042,-0.171935 -0.0085,-0.343756 -0.01367,-0.515625 -0.01706,-0.602582 -0.04214,-1.204838 -0.07813,-1.806641 -0.01326,-0.258967 -0.01934,-0.518636 -0.03516,-0.777344 -0.0027,-0.0083 -0.0039,-0.01693 -0.0059,-0.02539 -0.0024,-0.07232 -0.0051,-0.144641 -0.0098,-0.216797 v -0.002 c -0.01044,-0.03241 -0.01768,-0.06578 -0.02148,-0.09961 -0.02024,-0.176769 -0.03388,-0.3572619 -0.05078,-0.5351558 -0.0018,-0.018843 -0.0041,-0.037787 -0.0059,-0.056641 C 22.711336,9.4762317 22.69834,9.349725 22.6875,9.2226562 22.67652,9.1100521 22.66786,8.9973216 22.65625,8.8847656 c -0.0037,-0.043814 -0.01,-0.087296 -0.01563,-0.1308594 -0.03012,-0.3427391 -0.05904,-0.6833885 -0.09961,-1.0253906 -0.07579,-0.7050829 -0.186279,-1.4022823 -0.435547,-2.0566406 -0.01709,-0.051608 -0.02826,-0.1042589 -0.04297,-0.15625 -0.0044,-0.015665 -0.008,-0.031415 -0.01367,-0.046875 l -0.002,-0.00977 c -10e-5,-2.1e-4 -0.0051,-0.022453 -0.0078,-0.033203 -0.08515,-0.2514259 -0.215367,-0.4719587 -0.365234,-0.6777343 -0.07791,-0.1069725 -0.163586,-0.2078159 -0.255859,-0.3027344 -0.02841,-0.029223 -0.04849,-0.065657 -0.07813,-0.09375 -0.0018,-0.00215 -0.0041,-0.00371 -0.0059,-0.00586 -0.03932,-0.048152 -0.06549,-0.1011785 -0.107422,-0.1484375 -0.0038,-0.00315 -0.0071,-0.00698 -0.01172,-0.00977 -0.0059,-0.00379 -0.01178,-0.00769 -0.01758,-0.011719 -0.119307,-0.079329 -0.243646,-0.1446427 -0.367188,-0.2128906 -0.0038,-0.0021 -0.0079,-0.00375 -0.01172,-0.00586 -0.0061,-0.00367 -0.01152,-0.00803 -0.01758,-0.011719 -0.0069,-0.00431 -0.01456,-0.00745 -0.02148,-0.011719 0.0068,0.0042 0.01277,0.00942 0.01953,0.013672 C 20.610567,3.8294967 20.409555,3.7303752 20.203082,3.6425677 19.938703,3.5301267 19.665454,3.4368875 19.386719,3.375 19.377719,3.37301 19.368379,3.37306 19.359379,3.37109 19.350379,3.36869 19.341049,3.3676 19.332039,3.36523 18.256749,3.082644 17.116391,3.0249895 16.019531,3 h -0.0039 c -0.0029,-9.09e-5 -0.0069,-9.09e-5 -0.0098,0 -0.0032,-1.226e-4 -0.0066,1.215e-4 -0.0098,0 -0.0029,-9.09e-5 -0.0069,-9.09e-5 -0.0098,0 z m 4.220703,0.6425781 c 0.153267,0.069853 0.298723,0.1412161 0.439453,0.2148438 -0.07931,-0.044766 -0.157344,-0.091308 -0.240234,-0.1308594 -0.0062,-0.00415 -0.0098,-0.00714 -0.01367,-0.00977 -0.0027,-8.2e-4 -0.0088,-0.00245 -0.01367,-0.00391 -0.0022,-6.3e-4 -0.0058,-0.00194 -0.0059,-0.00195 l -0.0078,-0.00391 c -0.05164,-0.023974 -0.105695,-0.042253 -0.158203,-0.064453 z M 9.0429694,14.224609 c 0.0013,-0.05797 0.0046,-0.115858 0.0059,-0.173828 9.89e-4,-0.04432 0.0048,-0.0885 0.0059,-0.132812 0.02673,-1.137731 0.06794,-2.27508 0.138671,-3.410157 0.0045,-0.0181 0.0091,-0.03619 0.01172,-0.05469 0.03554,-0.257392 0.05462,-0.5234193 0.06836,-0.7929688 -0.0158,0.1789685 -0.03053,0.3583748 -0.05078,0.5351558 -0.0038,0.03383 -0.01104,0.0672 -0.02148,0.09961 v 0.002 c -0.0047,0.07216 -0.0073,0.144477 -0.0098,0.216797 -0.0019,0.0085 -0.0032,0.0171 -0.0059,0.02539 -0.01581,0.258709 -0.0219,0.518377 -0.03516,0.777344 -0.03599,0.601803 -0.06107,1.204059 -0.07813,1.806641 -0.0052,0.171869 -0.0094,0.34369 -0.01367,0.515625 -0.0043,0.195349 -0.01239,0.390546 -0.01563,0.585937 z M 11.798828,3.6425781 c -0.05251,0.0222 -0.106563,0.040479 -0.158203,0.064453 l -0.0078,0.00391 c -9.9e-5,1e-5 -0.0037,0.00132 -0.0059,0.00195 -0.0049,0.00146 -0.01097,0.00309 -0.01367,0.00391 -0.0039,0.00263 -0.0075,0.00562 -0.01367,0.00977 -0.08289,0.039551 -0.160924,0.086093 -0.240234,0.1308594 0.133191,-0.069684 0.271742,-0.1368587 0.416016,-0.203125 0.0081,-0.00347 0.01535,-0.00828 0.02344,-0.011719 z m -0.576172,0.2910157 c -0.0069,0.00427 -0.01458,0.00741 -0.02148,0.011719 -0.0061,0.00369 -0.01152,0.00805 -0.01758,0.011719 -0.0037,0.00227 -0.008,0.00359 -0.01172,0.00586 -0.123542,0.068248 -0.247881,0.1335612 -0.367187,0.2128906 -0.0058,0.00403 -0.01168,0.00793 -0.01758,0.011719 -0.0046,0.00279 -0.0079,0.00662 -0.01172,0.00977 -0.04193,0.047259 -0.0681,0.1002855 -0.107422,0.1484375 -0.0018,0.00215 -0.0041,0.00371 -0.0059,0.00586 -0.0286,0.027114 -0.04929,0.061172 -0.07617,0.089844 0.183682,-0.1870823 0.390707,-0.3526712 0.617187,-0.4941406 0.0068,-0.00425 0.01272,-0.00948 0.01953,-0.013672 z M 10.136719,5.0449219 C 10.068629,5.164999 10.008777,5.2902854 9.9628914,5.4257812 10.00866,5.290622 10.070977,5.1665775 10.136719,5.0449219 Z M 9.6464844,6.5644531 c -0.04252,0.198355 -0.07401,0.3994665 -0.103515,0.6015625 0.0316,-0.200726 0.06105,-0.4026013 0.103515,-0.6015625 z m -0.285156,2.1894531 c -0.0056,0.043564 -0.01191,0.087045 -0.01563,0.1308594 -0.01161,0.112556 -0.02027,0.2252864 -0.03125,0.3378906 -0.01084,0.1270688 -0.02384,0.2535755 -0.03516,0.3808594 0.02596,-0.2825133 0.05751,-0.5659135 0.08203,-0.8496094 z"
-     id="path4155-3" />
+          id='rect1-2-9-7'
+          class='foreground foreground-fill'
+          opacity='0.4'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='1'
+          fill-rule='nonzero'
+          d='M 12.7344 2.87305 C 10.8662 3.46716, 8.59463 4.84934, 8.50586 14.2285 C 10.2394 14.6283, 12.6311 14.8552, 13.9798 14.8954 C 15.3284 14.9356, 16 14.264, 16 13.4356 L 16 2.51953 C 15.1292 2.49726, 14.0021 2.56384, 12.7344 2.87305 Z'>
+  </path>
   <path
-     style="opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal"
-     d="M 15.999982,1.9863281 C 16.085615,1.986284 16.170261,1.99873 16.255841,2 h 0.744141 v 0.039063 c 0.88123,0.052474 1.756756,0.1512531 2.607422,0.3398437 1.374533,0.3051877 2.859605,1.1272599 3.398437,2.71875 0.0089,0.02636 0.01674,0.053078 0.02344,0.080078 0.0055,0.02202 0.0077,0.030282 0.0098,0.039063 9e-4,0.0035 0.0015,0.00591 0.002,0.00781 0.593847,1.698855 0.586168,3.3694147 0.75,4.8242183 0.01671,0.07044 0.02584,0.142464 0.02734,0.214844 5e-4,0.0065 0.0015,0.01303 0.002,0.01953 0.144868,2.230395 0.206158,4.472076 0.179688,6.716797 h -0.0078 c -0.03233,2.903924 -0.214837,5.814579 -0.666015,8.707031 -6.4e-4,0.0517 -0.0052,0.103287 -0.01367,0.154297 -0.0017,0.01436 -0.0036,0.02869 -0.0059,0.04297 -0.289586,1.470364 -1.268944,3.092253 -3.099609,3.529297 -0.03732,0.0093 -0.07515,0.01648 -0.113281,0.02148 -1.325827,0.38224 -2.699806,0.555594 -4.068359,0.558594 -1.385183,0.0013 -2.77511,-0.171669 -4.117188,-0.558594 -0.03813,-0.005 -0.07596,-0.01218 -0.113281,-0.02148 -1.8306646,-0.437044 -2.8100236,-2.058933 -3.0996096,-3.529297 -0.0023,-0.01428 -0.0042,-0.02861 -0.0059,-0.04297 -0.0085,-0.05101 -0.01303,-0.102597 -0.01367,-0.154297 C 8.2246324,22.81459 8.0420784,19.903924 8.0097474,17 h -0.0078 c -0.02647,-2.244721 0.03495,-4.486399 0.179688,-6.716797 5e-4,-0.0065 0.0015,-0.01303 0.002,-0.01953 0.0015,-0.07238 0.01063,-0.144404 0.02734,-0.214844 0.163832,-1.4548039 0.156153,-3.1253636 0.75,-4.8242186 5e-4,-0.0019 0.0011,-0.00431 0.002,-0.00781 0.0021,-0.00878 0.0043,-0.017043 0.0098,-0.039063 0.0067,-0.027 0.01454,-0.053718 0.02344,-0.080078 0.538673,-1.5914899 2.0237546,-2.4135623 3.3982876,-2.71875 1.171842,-0.2597947 2.386169,-0.3930921 3.605469,-0.3925781 z M 16.019513,3 h -0.0039 c -0.0029,-9.09e-5 -0.0069,-9.09e-5 -0.0098,0 -0.495527,0.018923 -1.005217,0.048133 -1.515625,0.089844 -0.09986,0.00955 -0.199277,0.015893 -0.298828,0.027344 -0.514927,0.051587 -1.026913,0.1231999 -1.527344,0.25 -0.01603,0.0035 -0.03281,0.00426 -0.04883,0.00781 -0.333733,0.074099 -0.662568,0.1871705 -0.974609,0.3320312 l -0.0078,0.00391 c -3.3e-5,1.51e-5 -0.0037,0.00132 -0.0059,0.00195 -0.0049,0.00146 -0.01102,0.00309 -0.01367,0.00391 -0.0039,0.00263 -0.0075,0.00562 -0.01367,0.00977 -0.137727,0.065717 -0.270308,0.1386233 -0.398437,0.21875 -0.05038,0.030675 -0.100907,0.060515 -0.148438,0.09375 -0.493884,0.3429066 -0.891547,0.8011241 -1.0898426,1.3867187 -0.0027,0.01075 -0.0077,0.032993 -0.0078,0.033203 l -0.002,0.00977 c -0.0056,0.01546 -0.0082,0.031394 -0.01367,0.046875 -0.121619,0.3098682 -0.200305,0.6320263 -0.265625,0.9570312 -0.05067,0.2275872 -0.08897,0.4574763 -0.125,0.6875 v 0.00195 c -0.08954,0.5722354 -0.154346,1.1459649 -0.203125,1.7226562 -0.01161,0.112556 -0.02027,0.2252862 -0.03125,0.3378906 -0.02768,0.3245765 -0.055,0.6513642 -0.0918,0.9726561 -0.0038,0.03383 -0.01104,0.0672 -0.02148,0.09961 v 0.002 c -0.0099,0.152097 -0.01059,0.304852 -0.01953,0.457031 -0.132703,1.824905 -0.166633,3.654954 -0.158204,5.484375 -0.0026,0.253879 -0.0088,0.507745 -0.0059,0.761719 h 0.0098 c 0.0099,0.707581 0.02541,1.41409 0.05273,2.121094 0.0028,0.07427 0.0087,0.148394 0.01172,0.222656 0.03233,0.786743 0.05798,1.574185 0.109375,2.359375 v 0.002 c 0.01044,0.03241 0.01768,0.06578 0.02148,0.09961 0.141003,1.231451 0.179346,2.495525 0.451172,3.71875 0.0092,0.05912 0.01403,0.118635 0.02344,0.177734 v 0.0059 c 0.05724,0.290635 0.144797,0.581662 0.263672,0.861328 5.95e-4,0.0025 0.0015,0.0039 0.002,0.0059 0.0014,0.0032 0.0025,0.0065 0.0039,0.0098 0.0026,0.0076 0.0071,0.01394 0.0098,0.02148 0.1495726,0.422436 0.4006066,0.779255 0.7187496,1.072265 0.289298,0.292712 0.642201,0.522976 1.056641,0.669922 0.06075,0.02614 0.125582,0.039 0.1875,0.0625 0.03174,0.0088 0.05936,0.02351 0.0918,0.03125 0.004,3.06e-4 0.0078,0.0016 0.01172,0.002 0.189502,0.06694 0.377904,0.138487 0.572265,0.181641 0.784958,0.174024 1.591162,0.283635 2.402344,0.335938 0.327005,0.02108 0.654403,0.03128 0.982422,0.03125 0.640769,-5.6e-5 1.279945,-0.04006 1.914062,-0.125 0.02013,-0.0026 0.04043,-0.0031 0.06055,-0.0059 0.263203,-0.03644 0.524877,-0.08296 0.785156,-0.134766 0.06366,-0.01255 0.127955,-0.02165 0.191407,-0.03516 0.312151,-0.06693 0.621757,-0.144391 0.927734,-0.234375 0.0012,-3.28e-4 0.0027,3.19e-4 0.0039,0 0.02883,-0.0076 0.05819,-0.01309 0.08789,-0.01563 0.0013,-1.09e-4 0.0026,10e-5 0.0039,0 1.350242,-0.32235 2.098167,-1.537022 2.333984,-2.734375 v -0.0059 C 22.766906,22.821544 22.946861,19.911616 22.976544,17 h 0.0078 c 0.0033,-0.293696 -0.0024,-0.587277 -0.0059,-0.880859 -0.0026,-1.862829 -0.04872,-3.725016 -0.162109,-5.580079 -0.0033,-0.01025 -0.0052,-0.02083 -0.0078,-0.03125 -0.0044,-0.0702 -0.0032,-0.140753 -0.0078,-0.210937 v -0.002 c -0.01044,-0.03241 -0.01768,-0.06578 -0.02148,-0.09961 C 22.685957,9.3803126 22.638595,8.5512318 22.540997,7.7285156 22.465204,7.0234327 22.354718,6.3262333 22.10545,5.671875 22.083213,5.604718 22.073135,5.5355239 22.04881,5.46875 l -0.002,-0.00977 c -10e-5,-2.1e-4 -0.0051,-0.022453 -0.0078,-0.033203 -0.143037,-0.4223704 -0.388136,-0.7793554 -0.699218,-1.0742187 -0.0018,-0.00215 -0.0041,-0.00371 -0.0059,-0.00586 -0.03932,-0.048152 -0.06549,-0.1011784 -0.107422,-0.1484375 -0.0038,-0.00315 -0.0071,-0.00698 -0.01172,-0.00977 -0.0059,-0.00379 -0.01178,-0.00769 -0.01758,-0.011719 C 21.074185,4.0939978 20.945614,4.0276148 20.818341,3.9570312 20.384641,3.68239 19.89019,3.4867894 19.386701,3.375 19.377701,3.37301 19.368331,3.37306 19.359361,3.37109 18.276177,3.0822916 17.125569,3.0251987 16.019513,3 Z"
-     id="path1092" />
-  <path
-     style="opacity:0.4;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal"
-     d="M 16,3.0078125 C 14.858081,3.0075692 13.716801,3.1307845 12.615234,3.375 12.354488,3.432893 12.097516,3.5182587 11.847656,3.6191406 11.641569,3.7121066 11.445243,3.806148 11.261719,3.90625 10.671546,4.2598649 10.188383,4.7598966 9.9628914,5.4257812 c -0.0027,0.01075 -0.0077,0.032993 -0.0078,0.033203 l -0.002,0.00977 c -0.486527,1.3355391 -0.546357,2.7474171 -0.673828,4.1347656 -0.01347,0.2895538 -0.03614,0.5738042 -0.07422,0.8496092 -0.0026,0.0185 -0.0072,0.03659 -0.01172,0.05469 -0.07349,1.17929 -0.118146,2.360882 -0.144531,3.542969 -0.0013,0.05797 -0.0046,0.115858 -0.0059,0.173828 1.7352186,0.402778 3.5805936,0.630312 5.4570306,0.714844 v -0.0039 a 1.5,1.5 0 0 0 1.5,-1.5 z"
-     id="rect1141" />
+          id='rect1-2-9'
+          class='foreground foreground-fill foreground-stroke'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='0.1'
+          fill-rule='nonzero'
+          stroke='url(#gpa:foreground) rgb(0,0,0)'
+          stroke-opacity='1'
+          stroke-width='1'
+          stroke-linecap='butt'
+          stroke-linejoin='miter'
+          stroke-miterlimit='4'
+          d='M 10.6531 28.3167 C 8.56745 27.0615, 8.5 20.5593, 8.5 16 C 8.5 11.4407, 8.56745 4.9385, 10.6531 3.68333 C 12.7388 2.42815, 16 2.5, 16 2.5 C 16 2.5, 19.2612 2.42815, 21.3469 3.68333 C 23.4325 4.9385, 23.5 11.4407, 23.5 16 C 23.5 20.5593, 23.4326 27.0615, 21.3469 28.3167 C 19.2612 29.5718, 16 29.5, 16 29.5 C 16 29.5, 12.7388 29.5718, 10.6531 28.3167 Z'
+          gpa:stroke-minwidth='25%'
+          gpa:stroke-maxwidth='150%'>
+  </path>
 </svg>
diff --git a/data/mouse-right-symbolic.svg b/data/mouse-right-symbolic.svg
index d9f5c49b..72e5d6bb 100644
--- a/data/mouse-right-symbolic.svg
+++ b/data/mouse-right-symbolic.svg
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   version="1.1"
+   gpa:version="1"
+   gpa:state="0"
+   id="svg4354"
    width="32"
    height="32"
-   id="svg4354"
-   viewBox="0 0 32 32">
+   viewBox="0 0 32 32"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:gpa="https://www.gtk.org/grappa">
   <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="path4155-3"
-     d="m 16.019642,3 c 1.096254,0.024976 2.235787,0.08305 3.310547,0.3652344 C 18.245932,3.1291686 17.124682,3.0075733 16.002064,3.0078125 V 13.435547 a 1.5,1.5 0 0 0 1.5,1.5 v 0.0039 c 1.873636,-0.08441 3.716261,-0.311236 5.449219,-0.712891 0.0026,-6e-4 0.0052,-0.0014 0.0078,-0.002 0.009,0.541574 0.01402,1.083309 0.01563,1.625 3.31e-4,0.08988 0.0038,0.179646 0.0039,0.269532 4.74e-4,0.03971 -5.26e-4,0.07943 0,0.11914 0.0026,0.253879 0.0088,0.507745 0.0059,0.761719 h -0.0078 c -0.0097,0.954873 -0.04327,1.909799 -0.08984,2.863281 -0.02414,0.613642 -0.04586,1.227542 -0.08594,1.839844 v 0.002 c -0.01044,0.03241 -0.01768,0.06578 -0.02148,0.09961 -0.137132,1.197642 -0.181451,2.425415 -0.433594,3.617187 -0.01421,0.09295 -0.02233,0.18641 -0.03711,0.279297 v 0.0059 c -0.09037,0.458848 -0.258047,0.91929 -0.503907,1.332031 -0.05927,0.100661 -0.123857,0.195825 -0.195312,0.28711 -0.389801,0.52858 -0.926747,0.946206 -1.634766,1.115234 -0.0013,10e-5 -0.0026,-1.09e-4 -0.0039,0 -0.004,4e-4 -0.0078,0.0016 -0.01172,0.002 -0.189502,0.06694 -0.377904,0.138491 -0.572265,0.181641 -0.459595,0.101891 -0.927542,0.17522 -1.398438,0.234375 -0.0046,6.37e-4 -0.0091,0.0013 -0.01367,0.002 -0.02012,0.0028 -0.04042,0.0033 -0.06055,0.0059 -0.0687,0.0092 -0.138214,0.01138 -0.207031,0.01953 -0.240754,0.026 -0.480583,0.05861 -0.722656,0.07422 -0.0084,5.44e-4 -0.01695,-5.31e-4 -0.02539,0 -0.319155,0.02063 -0.6386,0.03122 -0.958984,0.03125 -0.319731,-7e-5 -0.638526,-0.01067 -0.957031,-0.03125 -0.0084,-5.3e-4 -0.01695,5.44e-4 -0.02539,0 -0.242073,-0.01561 -0.481902,-0.04821 -0.722656,-0.07422 -0.09365,-0.01011 -0.187894,-0.01562 -0.28125,-0.02734 C 13.542886,28.80022 13.07494,28.726891 12.615345,28.625 12.420984,28.58185 12.232582,28.510299 12.04308,28.443359 c -0.0039,-4e-4 -0.0077,-0.0016 -0.01172,-0.002 -0.0013,-1.09e-4 -0.0026,10e-5 -0.0039,0 -0.708096,-0.169047 -1.246908,-0.586571 -1.636719,-1.115234 -0.07319,-0.09352 -0.138837,-0.191558 -0.199219,-0.294922 C 9.94839,26.620641 9.783231,26.162787 9.69347,25.707031 v -0.0059 C 9.678686,25.608285 9.67057,25.514823 9.656361,25.421875 9.404218,24.230103 9.359899,23.00233 9.222767,21.804688 c -0.0038,-0.03383 -0.011044,-0.0672 -0.021484,-0.09961 v -0.002 C 9.161208,21.090823 9.139489,20.476923 9.115345,19.863281 9.068771,18.909799 9.035235,17.954873 9.025502,17 h -0.00781 c -0.0029,-0.253974 0.00326,-0.50784 0.00586,-0.761719 5.27e-4,-0.03971 -4.73e-4,-0.07943 0,-0.11914 1.26e-4,-0.08989 0.00358,-0.17965 0.00391,-0.269532 0.0016,-0.541691 0.00664,-1.083426 0.015625,-1.625 0.00259,6.01e-4 0.00522,0.0014 0.00781,0.002 0.00192,-0.102843 0.00166,-0.205767 0.00391,-0.308593 -0.00104,0.04432 -0.00487,0.08849 -0.00586,0.132812 -0.0013,0.05797 -0.00456,0.115858 -0.00586,0.173828 0.00323,-0.195391 0.011307,-0.390588 0.015625,-0.585937 0.00424,-0.171935 0.00849,-0.343756 0.013671,-0.515625 0.017058,-0.602582 0.042138,-1.204838 0.078126,-1.806641 0.01326,-0.258967 0.019343,-0.518636 0.035156,-0.777344 0.00267,-0.0083 0.00391,-0.01693 0.00586,-0.02539 0.00242,-0.07232 0.00506,-0.144641 0.00977,-0.216797 v -0.002 c 0.01044,-0.03241 0.017684,-0.06578 0.021484,-0.09961 0.020237,-0.176769 0.033884,-0.3572619 0.050781,-0.5351558 0.00179,-0.018843 0.00409,-0.037787 0.00586,-0.056641 C 9.290728,9.4762317 9.303724,9.349725 9.314564,9.2226562 9.325544,9.1100521 9.334204,8.9973216 9.345814,8.8847656 9.349501,8.8409512 9.355799,8.7974696 9.361439,8.7539062 9.391561,8.4111671 9.420476,8.0705177 9.461048,7.7285156 9.536841,7.0234327 9.647327,6.3262333 9.896595,5.671875 9.913686,5.6202672 9.924853,5.5676161 9.939564,5.515625 9.943996,5.4999604 9.947603,5.4842105 9.953236,5.46875 l 0.00195,-0.00977 c 10e-5,-2.1e-4 0.00511,-0.022453 0.00781,-0.033203 0.085146,-0.2514259 0.215367,-0.4719587 0.365234,-0.6777343 0.07791,-0.1069725 0.163586,-0.2078159 0.255859,-0.3027344 0.02841,-0.029223 0.04849,-0.065657 0.07813,-0.09375 0.0018,-0.00215 0.0041,-0.00371 0.0059,-0.00586 0.03932,-0.048152 0.06549,-0.1011785 0.107422,-0.1484375 0.0038,-0.00315 0.0071,-0.00698 0.01172,-0.00977 0.0059,-0.00379 0.01178,-0.00769 0.01758,-0.011719 0.119307,-0.079329 0.243646,-0.1446427 0.367188,-0.2128906 0.0038,-0.0021 0.0079,-0.00375 0.01172,-0.00586 0.0061,-0.00367 0.01152,-0.00803 0.01758,-0.011719 0.0069,-0.00431 0.01456,-0.00745 0.02148,-0.011719 -0.0068,0.0042 -0.01277,0.00942 -0.01953,0.013672 0.188218,-0.1177585 0.38923,-0.21688 0.595703,-0.3046875 C 12.063361,3.5301267 12.33661,3.4368875 12.615345,3.375 c 0.009,-0.00199 0.01834,-0.00194 0.02734,-0.00391 0.009,-0.0024 0.01833,-0.00349 0.02734,-0.00586 C 13.745315,3.082644 14.885673,3.0249895 15.982533,3 h 0.0039 c 0.0029,-9.09e-5 0.0069,-9.09e-5 0.0098,0 0.0032,-1.226e-4 0.0066,1.215e-4 0.0098,0 0.0029,-9.09e-5 0.0069,-9.09e-5 0.0098,0 z m -4.220703,0.6425781 c -0.153267,0.069853 -0.298723,0.1412161 -0.439453,0.2148438 0.07931,-0.044766 0.157344,-0.091308 0.240234,-0.1308594 0.0062,-0.00415 0.0098,-0.00714 0.01367,-0.00977 0.0027,-8.2e-4 0.0088,-0.00245 0.01367,-0.00391 0.0022,-6.3e-4 0.0058,-0.00194 0.0059,-0.00195 l 0.0078,-0.00391 c 0.05164,-0.023974 0.105695,-0.042253 0.158203,-0.064453 z M 22.959095,14.224609 c -0.0013,-0.05797 -0.0046,-0.115858 -0.0059,-0.173828 -9.89e-4,-0.04432 -0.0048,-0.0885 -0.0059,-0.132812 -0.02673,-1.137731 -0.06794,-2.27508 -0.138671,-3.410157 -0.0045,-0.0181 -0.0091,-0.03619 -0.01172,-0.05469 -0.03554,-0.257392 -0.05462,-0.5234193 -0.06836,-0.7929688 0.0158,0.1789685 0.03053,0.3583748 0.05078,0.5351558 0.0038,0.03383 0.01104,0.0672 0.02148,0.09961 v 0.002 c 0.0047,0.07216 0.0073,0.144477 0.0098,0.216797 0.0019,0.0085 0.0032,0.0171 0.0059,0.02539 0.01581,0.258709 0.0219,0.518377 0.03516,0.777344 0.03599,0.601803 0.06107,1.204059 0.07813,1.806641 0.0052,0.171869 0.0094,0.34369 0.01367,0.515625 0.0043,0.195349 0.01239,0.390546 0.01563,0.585937 z M 20.203236,3.6425781 c 0.05251,0.0222 0.106563,0.040479 0.158203,0.064453 l 0.0078,0.00391 c 9.9e-5,1e-5 0.0037,0.00132 0.0059,0.00195 0.0049,0.00146 0.01097,0.00309 0.01367,0.00391 0.0039,0.00263 0.0075,0.00562 0.01367,0.00977 0.08289,0.039551 0.160924,0.086093 0.240234,0.1308594 -0.133191,-0.069684 -0.271742,-0.1368587 -0.416016,-0.203125 -0.0081,-0.00347 -0.01535,-0.00828 -0.02344,-0.011719 z m 0.576172,0.2910157 c 0.0069,0.00427 0.01458,0.00741 0.02148,0.011719 0.0061,0.00369 0.01152,0.00805 0.01758,0.011719 0.0037,0.00227 0.008,0.00359 0.01172,0.00586 0.123542,0.068248 0.247881,0.1335612 0.367187,0.2128906 0.0058,0.00403 0.01168,0.00793 0.01758,0.011719 0.0046,0.00279 0.0079,0.00662 0.01172,0.00977 0.04193,0.047259 0.0681,0.1002855 0.107422,0.1484375 0.0018,0.00215 0.0041,0.00371 0.0059,0.00586 0.0286,0.027114 0.04929,0.061172 0.07617,0.089844 -0.183682,-0.1870823 -0.390707,-0.3526712 -0.617187,-0.4941406 -0.0068,-0.00425 -0.01272,-0.00948 -0.01953,-0.013672 z m 1.085937,1.1113281 c 0.06809,0.1200771 0.127942,0.2453635 0.173828,0.3808593 C 21.993404,5.290622 21.931087,5.1665775 21.865345,5.0449219 Z m 0.490235,1.5195312 c 0.04252,0.198355 0.07401,0.3994665 0.103515,0.6015625 -0.0316,-0.200726 -0.06105,-0.4026013 -0.103515,-0.6015625 z m 0.285156,2.1894531 c 0.0056,0.043564 0.01191,0.087045 0.01563,0.1308594 0.01161,0.112556 0.02027,0.2252864 0.03125,0.3378906 0.01084,0.1270688 0.02384,0.2535755 0.03516,0.3808594 -0.02596,-0.2825133 -0.05751,-0.5659135 -0.08203,-0.8496094 z"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;enable-background:accumulate" />
+     id="defs1" />
   <path
-     id="path1092"
-     d="M 16.002082,1.9863281 C 15.916449,1.986284 15.831803,1.99873 15.746223,2 h -0.744141 v 0.039063 c -0.88123,0.052474 -1.756756,0.1512531 -2.607422,0.3398437 -1.374533,0.3051877 -2.859605,1.1272599 -3.398437,2.71875 -0.0089,0.02636 -0.01674,0.053078 -0.02344,0.080078 -0.0055,0.02202 -0.0077,0.030282 -0.0098,0.039063 -9e-4,0.0035 -0.0015,0.00591 -0.002,0.00781 -0.593847,1.698855 -0.586168,3.3694147 -0.75,4.8242183 -0.01671,0.07044 -0.02584,0.142464 -0.02734,0.214844 -5e-4,0.0065 -0.0015,0.01303 -0.002,0.01953 -0.144868,2.230395 -0.206158,4.472076 -0.179688,6.716797 h 0.0078 c 0.03233,2.903924 0.214837,5.814579 0.666015,8.707031 6.4e-4,0.0517 0.0052,0.103287 0.01367,0.154297 0.0017,0.01436 0.0036,0.02869 0.0059,0.04297 0.289586,1.470364 1.268944,3.092253 3.099609,3.529297 0.03732,0.0093 0.07515,0.01648 0.113281,0.02148 1.325827,0.38224 2.699806,0.555594 4.068359,0.558594 1.385183,0.0013 2.77511,-0.171669 4.117188,-0.558594 0.03813,-0.005 0.07596,-0.01218 0.113281,-0.02148 1.830665,-0.437044 2.810024,-2.058933 3.09961,-3.529297 0.0023,-0.01428 0.0042,-0.02861 0.0059,-0.04297 0.0085,-0.05101 0.01303,-0.102597 0.01367,-0.154297 C 23.777432,22.81459 23.959986,19.903924 23.992317,17 h 0.0078 c 0.02647,-2.244721 -0.03495,-4.486399 -0.179688,-6.716797 -5e-4,-0.0065 -0.0015,-0.01303 -0.002,-0.01953 -0.0015,-0.07238 -0.01063,-0.144404 -0.02734,-0.214844 -0.163832,-1.4548039 -0.156153,-3.1253636 -0.75,-4.8242186 -5e-4,-0.0019 -0.0011,-0.00431 -0.002,-0.00781 -0.0021,-0.00878 -0.0043,-0.017043 -0.0098,-0.039063 -0.0067,-0.027 -0.01454,-0.053718 -0.02344,-0.080078 C 22.467176,3.5061695 20.982094,2.6840971 19.607561,2.3789094 18.435719,2.1191147 17.221392,1.9858173 16.002092,1.9863313 Z M 15.982551,3 h 0.0039 c 0.0029,-9.09e-5 0.0069,-9.09e-5 0.0098,0 0.495527,0.018923 1.005217,0.048133 1.515625,0.089844 0.09986,0.00955 0.199277,0.015893 0.298828,0.027344 0.514927,0.051587 1.026913,0.1231999 1.527344,0.25 0.01603,0.0035 0.03281,0.00426 0.04883,0.00781 0.333733,0.074099 0.662568,0.1871705 0.974609,0.3320312 l 0.0078,0.00391 c 3.3e-5,1.51e-5 0.0037,0.00132 0.0059,0.00195 0.0049,0.00146 0.01102,0.00309 0.01367,0.00391 0.0039,0.00263 0.0075,0.00562 0.01367,0.00977 0.137727,0.065717 0.270308,0.1386233 0.398437,0.21875 0.05038,0.030675 0.100907,0.060515 0.148438,0.09375 0.493884,0.3429066 0.891547,0.8011241 1.089843,1.3867187 0.0027,0.01075 0.0077,0.032993 0.0078,0.033203 l 0.002,0.00977 c 0.0056,0.01546 0.0082,0.031394 0.01367,0.046875 0.121619,0.3098682 0.200305,0.6320263 0.265625,0.9570312 0.05067,0.2275872 0.08897,0.4574763 0.125,0.6875 v 0.00195 c 0.08954,0.5722354 0.154346,1.1459649 0.203125,1.7226562 0.01161,0.112556 0.02027,0.2252862 0.03125,0.3378906 0.02768,0.3245765 0.055,0.6513642 0.0918,0.9726561 0.0038,0.03383 0.01104,0.0672 0.02148,0.09961 v 0.002 c 0.0099,0.152097 0.01059,0.304852 0.01953,0.457031 0.132703,1.824905 0.166633,3.654954 0.158204,5.484375 0.0026,0.253879 0.0088,0.507745 0.0059,0.761719 h -0.0098 c -0.0099,0.707581 -0.02541,1.41409 -0.05273,2.121094 -0.0028,0.07427 -0.0087,0.148394 -0.01172,0.222656 -0.03233,0.786743 -0.05798,1.574185 -0.109375,2.359375 v 0.002 c -0.01044,0.03241 -0.01768,0.06578 -0.02148,0.09961 -0.141003,1.231451 -0.179346,2.495525 -0.451172,3.71875 -0.0092,0.05912 -0.01403,0.118635 -0.02344,0.177734 v 0.0059 c -0.05724,0.290635 -0.144797,0.581662 -0.263672,0.861328 -5.95e-4,0.0025 -0.0015,0.0039 -0.002,0.0059 -0.0014,0.0032 -0.0025,0.0065 -0.0039,0.0098 -0.0026,0.0076 -0.0071,0.01394 -0.0098,0.02148 -0.149573,0.422436 -0.400607,0.779255 -0.71875,1.072265 -0.289298,0.292712 -0.642201,0.522976 -1.056641,0.669922 -0.06075,0.02614 -0.125582,0.039 -0.1875,0.0625 -0.03174,0.0088 -0.05936,0.02351 -0.0918,0.03125 -0.004,3.06e-4 -0.0078,0.0016 -0.01172,0.002 -0.189502,0.06694 -0.377904,0.138487 -0.572265,0.181641 -0.784958,0.174024 -1.591162,0.283635 -2.402344,0.335938 -0.327005,0.02108 -0.654403,0.03128 -0.982422,0.03125 -0.640769,-5.6e-5 -1.279945,-0.04006 -1.914062,-0.125 -0.02013,-0.0026 -0.04043,-0.0031 -0.06055,-0.0059 -0.263203,-0.03644 -0.524877,-0.08296 -0.785156,-0.134766 -0.06366,-0.01255 -0.127955,-0.02165 -0.191407,-0.03516 -0.312151,-0.06693 -0.621757,-0.144391 -0.927734,-0.234375 -0.0012,-3.28e-4 -0.0027,3.19e-4 -0.0039,0 -0.02883,-0.0076 -0.05819,-0.01309 -0.08789,-0.01563 -0.0013,-1.09e-4 -0.0026,10e-5 -0.0039,0 -1.350242,-0.32235 -2.098167,-1.537022 -2.333984,-2.734375 v -0.0059 C 9.235158,22.821544 9.055203,19.911616 9.02552,17 h -0.0078 c -0.0033,-0.293696 0.0024,-0.587277 0.0059,-0.880859 0.0026,-1.862829 0.04872,-3.725016 0.162109,-5.580079 0.0033,-0.01025 0.0052,-0.02083 0.0078,-0.03125 0.0044,-0.0702 0.0032,-0.140753 0.0078,-0.210937 v -0.002 c 0.01044,-0.03241 0.01768,-0.06578 0.02148,-0.09961 C 9.316107,9.3803126 9.363469,8.5512318 9.461067,7.7285156 9.53686,7.0234327 9.647346,6.3262333 9.896614,5.671875 9.918851,5.604718 9.928929,5.5355239 9.953254,5.46875 l 0.002,-0.00977 c 10e-5,-2.1e-4 0.0051,-0.022453 0.0078,-0.033203 0.143037,-0.4223704 0.388136,-0.7793554 0.699218,-1.0742187 0.0018,-0.00215 0.0041,-0.00371 0.0059,-0.00586 0.03932,-0.048152 0.06549,-0.1011784 0.107422,-0.1484375 0.0038,-0.00315 0.0071,-0.00698 0.01172,-0.00977 0.0059,-0.00379 0.01178,-0.00769 0.01758,-0.011719 0.122985,-0.081774 0.251556,-0.148157 0.378829,-0.2187406 0.4337,-0.2746412 0.928151,-0.4702418 1.43164,-0.5820312 0.009,-0.00199 0.01837,-0.00194 0.02734,-0.00391 C 13.725887,3.0822916 14.876495,3.0251987 15.982551,3 Z"
-     style="opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
+     id="rect1-2-9-7"
+     class="foreground foreground-fill"
+     opacity="0.4"
+     fill="url(#gpa:foreground) #000000"
+     fill-opacity="1"
+     fill-rule="nonzero"
+     d="M 19.2656,2.87305 C 21.1338,3.46716 23.40537,4.84934 23.49414,14.2285 21.7606,14.6283 19.3689,14.8552 18.0202,14.8954 16.6716,14.9356 16,14.264 16,13.4356 V 2.51953 c 0.8708,-0.02227 1.9979,0.04431 3.2656,0.35352 z" />
   <path
-     id="rect1141"
-     d="m 16.002064,3.0078125 c 1.141919,-2.433e-4 2.283199,0.122972 3.384766,0.3671875 0.260746,0.057893 0.517718,0.1432587 0.767578,0.2441406 0.206087,0.092966 0.402413,0.1870074 0.585937,0.2871094 0.590173,0.3536149 1.073336,0.8536466 1.298828,1.5195312 0.0027,0.01075 0.0077,0.032993 0.0078,0.033203 l 0.002,0.00977 c 0.486527,1.3355391 0.546357,2.7474171 0.673828,4.1347656 0.01347,0.2895538 0.03614,0.5738044 0.07422,0.8496094 0.0026,0.0185 0.0072,0.03659 0.01172,0.05469 0.07349,1.17929 0.118146,2.360882 0.144531,3.542969 0.0013,0.05797 0.0046,0.115858 0.0059,0.173828 -1.735219,0.402778 -3.580594,0.630312 -5.457031,0.714844 v -0.0039 a 1.5,1.5 0 0 1 -1.5,-1.5 z"
-     style="opacity:0.4;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
+     id="rect1-2-9"
+     class="foreground foreground-fill foreground-stroke"
+     fill="url(#gpa:foreground) #000000"
+     fill-opacity="0.1"
+     fill-rule="nonzero"
+     stroke="url(#gpa:foreground) #000000"
+     stroke-opacity="1"
+     stroke-width="1"
+     stroke-linecap="butt"
+     stroke-linejoin="miter"
+     stroke-miterlimit="4"
+     d="M 21.3469,28.3167 C 23.43255,27.0615 23.5,20.5593 23.5,16 23.5,11.4407 23.43255,4.9385 21.3469,3.68333 19.2612,2.42815 16,2.5 16,2.5 16,2.5 12.7388,2.42815 10.6531,3.68333 8.5675,4.9385 8.5,11.4407 8.5,16 8.5,20.5593 8.5674,27.0615 10.6531,28.3167 12.7388,29.5718 16,29.5 16,29.5 c 0,0 3.2612,0.0718 5.3469,-1.1833 z"
+     gpa:stroke-minwidth="25%"
+     gpa:stroke-maxwidth="150%" />
 </svg>
diff --git a/data/mouse-touchpad.gresource.xml b/data/mouse-touchpad.gresource.xml
index 9d202b8b..3451732d 100644
--- a/data/mouse-touchpad.gresource.xml
+++ b/data/mouse-touchpad.gresource.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/settings/mouse-touchpad">
+    <file compressed="true" preprocess="xml-stripblanks">pointing/symbolic.svg</file>
+
     <file alias="32x32@2/categories/mouse-left-symbolic.svg" compressed="true" preprocess="xml-stripblanks">mouse-left-symbolic.svg</file>
     <file alias="32x32@2/categories/mouse-right-symbolic.svg" compressed="true" preprocess="xml-stripblanks">mouse-right-symbolic.svg</file>
     <file alias="32x32@2/categories/touchpad-click-areas-symbolic.svg" compressed="true" preprocess="xml-stripblanks">touchpad-click-areas-symbolic.svg</file>
     <file alias="32x32@2/categories/touchpad-click-multitouch-symbolic.svg" compressed="true" preprocess="xml-stripblanks">touchpad-click-multitouch-symbolic.svg</file>
     <file alias="32x32@2/categories/touchpad-scroll-edge-symbolic.svg" compressed="true" preprocess="xml-stripblanks">touchpad-scroll-edge-symbolic.svg</file>
     <file alias="32x32@2/categories/touchpad-scroll-two-finger-symbolic.svg" compressed="true" preprocess="xml-stripblanks">touchpad-scroll-two-finger-symbolic.svg</file>
-    <file alias="24x24/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/24-symbolic.svg</file>
-    <file alias="24x24@2/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/24-symbolic.svg</file>
     <file alias="32x32/categories/mouse-touchpad-pointing.svg" compressed="true" preprocess="xml-stripblanks">pointing/32.svg</file>
     <file alias="32x32@2/categories/mouse-touchpad-pointing.svg" compressed="true" preprocess="xml-stripblanks">pointing/32.svg</file>
-    <file alias="32x32/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/32-symbolic.svg</file>
-    <file alias="32x32@2/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/32-symbolic.svg</file>
     <file alias="48x48/categories/mouse-touchpad-pointing.svg" compressed="true" preprocess="xml-stripblanks">pointing/48.svg</file>
     <file alias="48x48@2/categories/mouse-touchpad-pointing.svg" compressed="true" preprocess="xml-stripblanks">pointing/48.svg</file>
-    <file alias="48x48/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/48-symbolic.svg</file>
-    <file alias="48x48@2/categories/mouse-touchpad-pointing-symbolic.svg" compressed="true" preprocess="xml-stripblanks">pointing/48-symbolic.svg</file>
     <file alias="32x32/categories/mouse-touchpad-clicking.svg" compressed="true" preprocess="xml-stripblanks">clicking/32.svg</file>
     <file alias="32x32@2/categories/mouse-touchpad-clicking.svg" compressed="true" preprocess="xml-stripblanks">clicking/32.svg</file>
     <file alias="48x48/categories/mouse-touchpad-clicking.svg" compressed="true" preprocess="xml-stripblanks">clicking/48.svg</file>
diff --git a/data/pointing/24-symbolic.svg b/data/pointing/24-symbolic.svg
deleted file mode 100644
index de9106a9..00000000
--- a/data/pointing/24-symbolic.svg
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.0"
-   id="svg2"
-   height="24"
-   width="24"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs4" />
-  <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:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://en.wikipedia.org/wiki/MIT_License" />
-        <dc:source>http://jimmac.musichall.cz/themes.php?skin=7</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>negative</rdf:li>
-            <rdf:li>inverted</rdf:li>
-            <rdf:li>cursor</rdf:li>
-            <rdf:li>theme</rdf:li>
-            <rdf:li>X</rdf:li>
-            <rdf:li>xorg</rdf:li>
-            <rdf:li>xcursor</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>Inverted variant of the DMZ cursor theme.</dc:description>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:none"
-     id="layer2"
-     transform="translate(-15,-160)">
-    <rect
-       y="160"
-       x="15"
-       height="24"
-       width="24"
-       id="left_ptr"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="hand1"
-       width="24"
-       height="24"
-       x="50"
-       y="160" />
-    <rect
-       y="160"
-       x="190"
-       height="24"
-       width="24"
-       id="hand2"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="160"
-       x="85"
-       height="24"
-       width="24"
-       id="grabbing"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="plus"
-       width="24"
-       height="24"
-       x="120"
-       y="160" />
-    <rect
-       y="160"
-       x="155"
-       height="24"
-       width="24"
-       id="right_ptr"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="pencil"
-       width="24.0625"
-       height="24"
-       x="224.9375"
-       y="160" />
-    <rect
-       y="160"
-       x="260"
-       height="24"
-       width="24"
-       id="xterm"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_ptr_watch_0001"
-       width="24"
-       height="24"
-       x="14"
-       y="364" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0001"
-       width="24"
-       height="24"
-       x="14"
-       y="337" />
-    <rect
-       y="195"
-       x="85"
-       height="24"
-       width="24"
-       id="bottom_side"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="top_side"
-       width="24"
-       height="24"
-       x="120"
-       y="195" />
-    <rect
-       y="195"
-       x="155"
-       height="24"
-       width="24"
-       id="right_side"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_side"
-       width="24.0625"
-       height="24"
-       x="189.9375"
-       y="195" />
-    <rect
-       y="195"
-       x="225"
-       height="24"
-       width="24"
-       id="bottom_left_corner"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="bottom_right_corner"
-       width="24"
-       height="24"
-       x="260"
-       y="195" />
-    <rect
-       y="195"
-       x="295"
-       height="24"
-       width="24"
-       id="top_left_corner"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="195"
-       x="15"
-       height="24"
-       width="24"
-       id="question_arrow"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="top_right_corner"
-       width="24"
-       height="24"
-       x="330"
-       y="195" />
-    <rect
-       y="160"
-       x="330"
-       height="24"
-       width="24"
-       id="X_cursor"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="230.06064"
-       x="50"
-       height="24"
-       width="24"
-       id="lr_angle"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="ul_angle"
-       width="24"
-       height="24"
-       x="85"
-       y="230.06064" />
-    <rect
-       y="230.06064"
-       x="120"
-       height="24"
-       width="24"
-       id="ur_angle"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="top_tee"
-       width="24"
-       height="24"
-       x="155"
-       y="230.06064" />
-    <rect
-       y="230.06064"
-       x="189.9375"
-       height="24"
-       width="24.0625"
-       id="bottom_tee"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_tee"
-       width="24"
-       height="24"
-       x="225"
-       y="230.06064" />
-    <rect
-       y="230.06064"
-       x="260"
-       height="24"
-       width="24"
-       id="right_tee"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="copy"
-       width="24"
-       height="23.939362"
-       x="295"
-       y="230.06064" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="ll_angle"
-       width="24"
-       height="24"
-       x="15"
-       y="230.06064" />
-    <rect
-       y="230.06064"
-       x="330"
-       height="24"
-       width="24"
-       id="move"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="circle"
-       width="24"
-       height="24"
-       x="50"
-       y="265.0329" />
-    <rect
-       y="265.0329"
-       x="15"
-       height="24"
-       width="24"
-       id="link"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="265"
-       x="85"
-       height="24.03289"
-       width="24"
-       id="crossed_circle"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="cross"
-       width="24"
-       height="24"
-       x="120"
-       y="265" />
-    <rect
-       y="265"
-       x="155"
-       height="24"
-       width="24"
-       id="crosshair"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="265.0329"
-       x="224"
-       height="24"
-       width="24"
-       id="dnd-ask"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="dnd-none"
-       width="24"
-       height="24"
-       x="189"
-       y="265.0329" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="dnd-copy"
-       width="24"
-       height="24.03289"
-       x="259"
-       y="265" />
-    <rect
-       y="265"
-       x="294"
-       height="24"
-       width="24"
-       id="dnd-link"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="dnd-move"
-       width="24"
-       height="24"
-       x="329"
-       y="265" />
-    <rect
-       y="300"
-       x="50"
-       height="24"
-       width="24"
-       id="bd_double_arrow"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="fd_double_arrow"
-       width="24"
-       height="24"
-       x="15"
-       y="300" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="sb_v_double_arrow"
-       width="24"
-       height="24.03289"
-       x="85"
-       y="299.9671" />
-    <rect
-       y="299.9671"
-       x="120"
-       height="24"
-       width="24"
-       id="sb_h_double_arrow"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="sb_right_arrow"
-       width="24"
-       height="24"
-       x="155"
-       y="299.9671" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="sb_up_arrow"
-       width="24"
-       height="24"
-       x="224"
-       y="300" />
-    <rect
-       y="300"
-       x="189"
-       height="24"
-       width="24"
-       id="sb_left_arrow"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="299.9671"
-       x="259"
-       height="24.03289"
-       width="24"
-       id="sb_down_arrow"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="tcross"
-       width="24"
-       height="24.03289"
-       x="294"
-       y="299.9671" />
-    <rect
-       y="300"
-       x="329"
-       height="23.999992"
-       width="24"
-       id="dotbox"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="337"
-       x="42"
-       height="24"
-       width="24"
-       id="watch_0002"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="337"
-       x="70"
-       height="24"
-       width="24"
-       id="watch_0003"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0004"
-       width="24"
-       height="24"
-       x="98"
-       y="337" />
-    <rect
-       y="337"
-       x="126"
-       height="24"
-       width="24"
-       id="watch_0005"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0006"
-       width="24"
-       height="24"
-       x="154"
-       y="337" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0007"
-       width="24"
-       height="24"
-       x="182"
-       y="337" />
-    <rect
-       y="337"
-       x="210"
-       height="24"
-       width="24"
-       id="watch_0008"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="364"
-       x="42"
-       height="24"
-       width="24"
-       id="left_ptr_watch_0002"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_ptr_watch_0003"
-       width="24"
-       height="24"
-       x="70"
-       y="364" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_ptr_watch_0004"
-       width="24"
-       height="24"
-       x="98"
-       y="364" />
-    <rect
-       y="364"
-       x="126"
-       height="24"
-       width="24"
-       id="left_ptr_watch_0005"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="left_ptr_watch_0006"
-       width="24"
-       height="24"
-       x="154"
-       y="364" />
-    <rect
-       y="364"
-       x="182"
-       height="24"
-       width="24"
-       id="left_ptr_watch_0007"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="364"
-       x="210"
-       height="24"
-       width="24"
-       id="left_ptr_watch_0008"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="337"
-       x="238"
-       height="24"
-       width="24"
-       id="watch_0009"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0010"
-       width="24"
-       height="24"
-       x="266"
-       y="337" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0011"
-       width="24"
-       height="24"
-       x="294"
-       y="337" />
-    <rect
-       y="337"
-       x="322"
-       height="24"
-       width="24"
-       id="watch_0012"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0013"
-       width="24"
-       height="24"
-       x="350"
-       y="337" />
-    <rect
-       y="337"
-       x="378"
-       height="24"
-       width="24"
-       id="watch_0014"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="337"
-       x="406"
-       height="24"
-       width="24"
-       id="watch_0015"
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="watch_0016"
-       width="24"
-       height="24"
-       x="434"
-       y="337" />
-  </g>
-  <path
-     id="path7371-7-0"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;opacity:1;marker:none;paint-order:normal;stop-opacity:1"
-     d="M 8.0507812 2 C 7.9383515 1.9965617 7.8259721 2.0043173 7.7148438 2.0195312 C 6.5514843 2.1501262 6 3.2753474 6 4.4550781 L 6.0546875 15.574219 C 6.2235341 16.981404 8.2617629 17.491354 9.0839844 16.341797 C 9.4436086 15.980236 9.8684841 15.135675 10.189453 15.0625 L 11.951172 19.113281 C 12.870943 20.463659 15.158352 20.226614 15.783203 18.716797 C 16.427149 17.350641 15.34654 16.044589 14.941406 14.783203 L 14.1875 12.966797 C 15.31432 12.864826 16.734794 13.357389 17.585938 12.365234 C 18.34985 11.515258 17.989537 10.154835 17.0625 9.5820312 L 9.0078125 2.2871094 C 8.7225571 2.1053844 8.3880705 2.010315 8.0507812 2 z M 7.9707031 2.9980469 C 8.1967354 2.9974862 8.4273889 3.0772492 8.6210938 3.2539062 L 16.75 10.666016 C 17.270115 11.140356 16.927188 12.002094 16.220703 11.996094 L 12.667969 11.966797 L 14.888672 17.304688 C 15.154208 17.942186 14.85247 18.674224 14.214844 18.939453 C 13.577882 19.203687 12.847259 18.902173 12.582031 18.265625 L 10.396484 13.015625 L 8.2734375 15.740234 C 7.8450978 16.25694 7 15.956091 7 15.287109 L 7 3.9589844 C 7 3.3847383 7.4734323 2.9992803 7.9707031 2.9980469 z " />
-  <path
-     id="path7371-6"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;opacity:0.1;marker:none;paint-order:normal;stop-opacity:1"
-     d="M 7.9707031,2.9979874 C 7.4734323,2.9992208 7,3.3846788 7,3.9589249 V 15.28705 c 0,0.668982 0.8450978,0.969831 1.2734375,0.453125 l 2.1230465,-2.724609 2.185547,5.249999 c 0.265228,0.636548 0.995851,0.938063 1.632813,0.673829 0.637626,-0.265229 0.939364,-0.997268 0.673828,-1.634766 l -2.220703,-5.337891 3.552735,0.0293 C 16.927189,12.002037 17.270115,11.1403 16.75,10.66596 L 8.6210938,3.2538468 C 8.427389,3.0771897 8.1967354,2.9974267 7.9707031,2.9979874 Z" />
-</svg>
diff --git a/data/pointing/32-symbolic.svg b/data/pointing/32-symbolic.svg
deleted file mode 100644
index b80ec8d1..00000000
--- a/data/pointing/32-symbolic.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="path2-1"
-     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="M 11.320312,4.0058594 C 11.179148,4.0012201 11.038106,4.0099055 10.898438,4.03125 9.5702316,4.1983977 9,5.3828418 9,6.4885475 9.020936,11.238579 8.958192,16.353946 9.03125,21.101562 c 0.1810249,1.643606 2.360787,2.485601 3.607422,1.416016 0.133142,-0.118216 0.52766,-0.601205 0.52766,-0.601205 0.480653,-0.492979 0.786303,-1.189934 1.24773,-1.705435 0.846708,1.796068 1.596525,3.666776 2.503907,5.416015 0.03186,0.135929 0.373625,0.640665 0.738281,0.861328 1.442058,1.111397 3.79092,0.300674 4.234375,-1.46875 0.461415,-1.434946 -0.624556,-2.669918 -1.109375,-3.93164 L 19.330078,18 c 1.30807,-0.121695 2.854677,0.371591 3.939453,-0.591797 1.075511,-0.927775 0.896733,-2.752112 -0.25,-3.541015 C 19.51233,10.715031 16.045246,7.5149132 12.513672,4.3925781 12.16438,4.149898 11.743806,4.0197771 11.320312,4.0058594 Z M 11.25,5 c 0.336782,1.56e-5 0.65931,0.1359278 0.894531,0.3769531 l 10.398438,9.4062499 c 0.0066,0.0052 0.01303,0.01032 0.01953,0.01563 l 0.01563,0.01563 C 22.846185,15.051536 22.999777,15.392139 23,15.75 23,16.440356 22.440356,17 21.75,17 h -3.994141 l 2.945313,6.271484 C 20.896034,23.560605 21.000091,23.901342 21,24.25 21,25.216498 20.216498,26 19.25,26 18.636209,25.999105 18.06766,25.676755 17.751953,25.150391 l -0.002,0.002 L 14.611281,18.228563 12.248,21.502 H 12.246 C 12.010445,21.814877 11.641729,21.999235 11.25,22 10.559644,22 10,21.440356 10,20.75 V 6.25 C 10,5.5596441 10.559644,5 11.25,5 Z" />
-  <path
-     id="path2"
-     style="fill:#555761;stroke-linejoin:round;font-variation-settings:normal;opacity:0.1;vector-effect:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="M 11.25,5 C 10.559644,5 10,5.5596441 10,6.25 v 14.5 c 0,0.690356 0.559644,1.25 1.25,1.25 0.391729,-7.65e-4 0.760445,-0.185123 0.996094,-0.498047 h 0.002 l 2.363281,-3.273437 3.138672,6.923828 0.002,-0.002 C 18.067754,25.676708 18.636209,25.999105 19.25,26 20.216498,26 21,25.216498 21,24.25 c 9.1e-5,-0.348658 -0.103966,-0.689395 -0.298828,-0.978516 L 17.755859,17 H 21.75 C 22.440356,17 23,16.440356 23,15.75 22.999777,15.392139 22.846185,15.051536 22.578125,14.814453 l -0.01563,-0.01563 c -0.0065,-0.0053 -0.01297,-0.01048 -0.01953,-0.01563 L 12.144531,5.3769531 C 11.90931,5.1359278 11.586782,5.0000156 11.25,5 Z" />
-</svg>
diff --git a/data/pointing/48-symbolic.svg b/data/pointing/48-symbolic.svg
deleted file mode 100644
index 93e12455..00000000
--- a/data/pointing/48-symbolic.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="svg4354"
-   height="48"
-   width="48"
-   version="1.1"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs4356" /><metadata
-     id="metadata4359"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><path
-     id="path10"
-     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="M 16.878906,6.9533394 C 15.300764,6.9533394 14,8.2541034 14,9.8322456 V 31.629121 c 0,1.578142 1.300764,2.878906 2.878906,2.878906 a 1.000095,1.000095 0 0 0 0.002,0 c 0.901238,-0.0018 1.752685,-0.428389 2.294922,-1.148437 l -0.0098,0.0039 a 1.000095,1.000095 0 0 0 0.02539,-0.01953 l 2.542969,-3.523438 4.005859,8.837891 a 1.000095,1.000095 0 0 0 0.140625,0.109375 l -0.08594,-0.0098 c 0.654258,1.090816 1.835539,1.759863 3.107421,1.761719 a 1.000095,1.000095 0 0 0 0.002,0 c 1.993224,0 3.630859,-1.637635 3.630859,-3.630859 1.81e-4,-0.694282 -0.200755,-1.371298 -0.574219,-1.955079 L 28.23443,26.992363 h 4.427734 c 1.578142,0 2.878906,-1.300764 2.878906,-2.878906 a 1.000095,1.000095 0 0 0 0,-0.002 c -5.11e-4,-0.821788 -0.352414,-1.604878 -0.966796,-2.150391 a 1.000095,1.000095 0 0 0 -0.04883,-0.04297 l -0.0098,-0.0098 c -0.0042,-0.0034 -0.0076,-0.0065 -0.01172,-0.0098 L 18.894531,7.7795112 C 18.357142,7.2521276 17.633395,6.9533744 16.878906,6.9533394 Z m 0,1 c 0.506232,2.35e-5 0.992132,0.2041103 1.345703,0.5664062 l 15.63086,14.1406254 c 0.0099,0.0077 0.0195,0.01544 0.0293,0.02344 l 0.02344,0.02344 c 0.402933,0.35637 0.632477,0.868333 0.632812,1.40625 0,1.037705 -0.841201,1.878906 -1.878906,1.878906 h -6.003906 l 4.427734,9.425782 c 0.292906,0.43459 0.449356,0.94662 0.449219,1.470703 0,1.452787 -1.178073,2.630859 -2.630859,2.630859 -0.922617,-0.0013 -1.7774,-0.486143 -2.251954,-1.277344 l -0.002,0.0039 -4.71875,-10.408203 -3.552734,4.919922 h -0.002 c -0.354215,0.47037 -0.909221,0.7488 -1.498047,0.75 -1.037705,0 -1.878906,-0.841201 -1.878906,-1.878906 V 9.8322456 c 0,-1.0377048 0.841201,-1.8789062 1.878906,-1.8789062 z" /><g
-     style="display:inline;stroke-width:0.665272"
-     id="g3532-1"
-     transform="matrix(1.6886956,0,-1.0727221,1.8950647,310.64616,-2.7192641)" /><g
-     style="display:inline;fill:#fce94f;stroke:none;stroke-width:0.665272"
-     id="g3557-05"
-     transform="matrix(1.6886956,0,-1.0727221,1.8950647,310.64616,-2.7192641)" /><g
-     id="layer10"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer13"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer14"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)"
-     style="stroke-width:0.665272" /><g
-     id="layer15"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="g71291"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="g4953"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer12"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     id="g3532-1-2"
-     transform="matrix(1.6886956,0,-1.0727221,1.8950647,310.64616,-2.7192624)" /><g
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke:none;stroke-width:0.665272"
-     id="g3557-05-9"
-     transform="matrix(1.6886956,0,-1.0727221,1.8950647,310.64616,-2.7192624)" /><g
-     id="layer10-2"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer13-5"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     style="fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     id="layer14-4"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer15-3"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="g71291-8"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="g4953-4"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer12-6"
-     style="display:inline;fill:#3a4351;fill-opacity:1;stroke-width:0.665272"
-     transform="matrix(1.7178796,0,0,1.7178796,-742.37343,764.49508)" /><g
-     id="layer10-9"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><g
-     id="layer13-6"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><g
-     id="layer14-1"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)"
-     style="stroke-width:0.665272" /><g
-     id="layer15-0"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><g
-     id="g71291-3"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><g
-     id="g4953-7"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><g
-     id="layer12-65"
-     style="display:inline;stroke-width:0.665272"
-     transform="matrix(1.5031447,0,0,1.5031447,-421.58603,872.52909)" /><path
-     id="path2"
-     style="font-variation-settings:normal;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="m 16.879594,7.9539044 c -1.037705,0 -1.878931,0.8412261 -1.878931,1.8789309 V 31.628434 c 0,1.037705 0.841226,1.878931 1.878931,1.878931 0.588826,-0.0012 1.143059,-0.278267 1.497274,-0.748637 h 0.003 l 3.552353,-4.920449 4.717878,10.407515 0.003,-0.003 c 0.474553,0.791201 1.329023,1.27581 2.25164,1.277156 1.452786,0 2.630503,-1.177717 2.630503,-2.630504 1.37e-4,-0.524083 -0.156276,-1.03626 -0.449182,-1.470851 l -4.427231,-9.426948 h 6.003772 c 1.037705,0 1.87893,-0.841226 1.87893,-1.878931 -3.35e-4,-0.537917 -0.231206,-1.049892 -0.634139,-1.406262 l -0.02349,-0.02349 c -0.0098,-0.008 -0.0195,-0.01575 -0.02936,-0.02349 L 18.224204,8.5205195 C 17.870633,8.1582236 17.385826,7.9539279 16.879594,7.9539044 Z" /></svg>
diff --git a/data/touchpad-click-areas-symbolic.svg b/data/touchpad-click-areas-symbolic.svg
index 2d447a04..6fa43b47 100644
--- a/data/touchpad-click-areas-symbolic.svg
+++ b/data/touchpad-click-areas-symbolic.svg
@@ -1,44 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   viewBox="0 0 32 32"
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+        xmlns='http://www.w3.org/2000/svg'
+        xmlns:svg='http://www.w3.org/2000/svg'
+        xmlns:gpa='https://www.gtk.org/grappa'
+        gpa:version='1'
+        gpa:state='0'
+        id='svg4354'
+        width='32'
+        height='32'
+        viewBox='0 0 32 32'>
   <path
-     id="rect913-9"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,4 C 3.338,4 2,5.3 2,7 v 19 c 0,1.7 1.338,3 3,3 h 22 c 1.662,0 3,-1.3 3,-3 V 7 C 30,5.3 28.662,4 27,4 Z m 0,1 h 22 c 1.108,0 2,0.9 2,2 v 19 c 0,1.1 -0.892,2 -2,2 H 5 C 3.892,28 3,27.1 3,26 V 7 C 3,5.9 3.892,5 5,5 Z" />
-  <path
-     id="rect913-6-2"
-     style="font-variation-settings:normal;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5 5 C 3.892 5 3 5.892 3 7 L 3 26 C 3 27.108 3.892 28 5 28 L 27 28 C 28.108 28 29 27.108 29 26 L 29 7 C 29 5.892 28.108 5 27 5 L 5 5 z M 18.023438 22 L 26.976562 22 C 27.543133 22 28 22.456867 28 23.023438 L 28 25.976562 C 28 26.543133 27.543133 27 26.976562 27 L 18.023438 27 C 17.456867 27 17 26.543133 17 25.976562 L 17 23.023438 C 17 22.456867 17.456867 22 18.023438 22 z " />
+          id='rect1'
+          class='foreground-stroke'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='0.1'
+          fill-rule='nonzero'
+          stroke='url(#gpa:foreground) rgb(0,0,0)'
+          stroke-opacity='1'
+          stroke-width='1'
+          stroke-linecap='butt'
+          stroke-linejoin='miter'
+          stroke-miterlimit='4'
+          d='M 5 4.5 L 27 4.5 C 28.385 4.5, 29.5 5.615, 29.5 7 L 29.5 26 C 29.5 27.385, 28.385 28.5, 27 28.5 L 5 28.5 C 3.615 28.5, 2.5 27.385, 2.5 26 L 2.5 7 C 2.5 5.615, 3.615 4.5, 5 4.5 Z'
+          gpa:stroke-minwidth='25%'
+          gpa:stroke-maxwidth='150%'>
+  </path>
   <rect
-     style="font-variation-settings:normal;opacity:0.8;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     id="rect835"
-     width="11"
-     height="5"
-     x="17"
-     y="22"
-     ry="1.0226908"
-     rx="1.0226908" />
+          id='rect835'
+          class="foreground foreground-fill"
+          opacity="0.8"
+          fill="url(#gpa:foreground) #000000"
+          fill-rule='nonzero'
+          x='17'
+          y='22'
+          width='11'
+          height='5'
+          rx='1.02269'
+          ry='1.02269'>
+  </rect>
 </svg>
diff --git a/data/touchpad-click-multitouch-symbolic.svg b/data/touchpad-click-multitouch-symbolic.svg
index 811f06d1..96c3e0af 100644
--- a/data/touchpad-click-multitouch-symbolic.svg
+++ b/data/touchpad-click-multitouch-symbolic.svg
@@ -1,39 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   viewBox="0 0 32 32"
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+        xmlns='http://www.w3.org/2000/svg'
+        xmlns:svg='http://www.w3.org/2000/svg'
+        xmlns:gpa='https://www.gtk.org/grappa'
+        gpa:version='1'
+        gpa:state='0'
+        id='svg4354'
+        width='32'
+        height='32'
+        viewBox='0 0 32 32'>
   <path
-     id="rect913-9-7"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,4 C 3.338,4 2,5.3 2,7 v 19 c 0,1.7 1.338,3 3,3 h 22 c 1.662,0 3,-1.3 3,-3 V 7 C 30,5.3 28.662,4 27,4 Z m 0,1 h 22 c 1.108,0 2,0.9 2,2 v 19 c 0,1.1 -0.892,2 -2,2 H 5 C 3.892,28 3,27.1 3,26 V 7 C 3,5.9 3.892,5 5,5 Z" />
+          id='rect1'
+          class='foreground-stroke'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='0.1'
+          fill-rule='nonzero'
+          stroke='url(#gpa:foreground) rgb(0,0,0)'
+          stroke-opacity='1'
+          stroke-width='1'
+          stroke-linecap='butt'
+          stroke-linejoin='miter'
+          stroke-miterlimit='4'
+          d='M 5 4.5 L 27 4.5 C 28.385 4.5, 29.5 5.615, 29.5 7 L 29.5 26 C 29.5 27.385, 28.385 28.5, 27 28.5 L 5 28.5 C 3.615 28.5, 2.5 27.385, 2.5 26 L 2.5 7 C 2.5 5.615, 3.615 4.5, 5 4.5 Z'
+          gpa:stroke-minwidth='25%'
+          gpa:stroke-maxwidth='150%'>
+  </path>
   <path
-     id="rect913-6-2-5"
-     style="font-variation-settings:normal;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,5 C 3.892,5 3,5.892 3,7 v 19 c 0,1.108 0.892,2 2,2 h 22 c 1.108,0 2,-0.892 2,-2 V 7 C 29,5.892 28.108,5 27,5 Z m 7.5,9 A 2.5,2.5 0 0 1 15,16.5 2.5,2.5 0 0 1 12.5,19 2.5,2.5 0 0 1 10,16.5 2.5,2.5 0 0 1 12.5,14 Z m 8,0 A 2.5,2.5 0 0 1 23,16.5 2.5,2.5 0 0 1 20.5,19 2.5,2.5 0 0 1 18,16.5 2.5,2.5 0 0 1 20.5,14 Z" />
-  <path
-     id="path925"
-     style="font-variation-settings:normal;opacity:0.8;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="M 12.5,14 A 2.5,2.5 0 0 0 10,16.5 2.5,2.5 0 0 0 12.5,19 2.5,2.5 0 0 0 15,16.5 2.5,2.5 0 0 0 12.5,14 Z m 8,0 A 2.5,2.5 0 0 0 18,16.5 2.5,2.5 0 0 0 20.5,19 2.5,2.5 0 0 0 23,16.5 2.5,2.5 0 0 0 20.5,14 Z" />
+          id='path925'
+          class="foreground foreground-fill"
+          opacity="0.8"
+          fill="url(#gpa:foreground) #000000"
+          fill-rule='nonzero'
+          d='M 12.5 14 A 2.5 2.5 0 0 0 10 16.5 A 2.5 2.5 0 0 0 12.5 19 A 2.5 2.5 0 0 0 15 16.5 A 2.5 2.5 0 0 0 12.5 14 Z M 20.5 14 A 2.5 2.5 0 0 0 18 16.5 A 2.5 2.5 0 0 0 20.5 19 A 2.5 2.5 0 0 0 23 16.5 A 2.5 2.5 0 0 0 20.5 14 Z'>
+  </path>
 </svg>
diff --git a/data/touchpad-scroll-edge-symbolic.svg b/data/touchpad-scroll-edge-symbolic.svg
index f7afd6e4..8ab2907e 100644
--- a/data/touchpad-scroll-edge-symbolic.svg
+++ b/data/touchpad-scroll-edge-symbolic.svg
@@ -1,39 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   viewBox="0 0 32 32"
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+        xmlns='http://www.w3.org/2000/svg'
+        xmlns:svg='http://www.w3.org/2000/svg'
+        xmlns:gpa='https://www.gtk.org/grappa'
+        gpa:version='1'
+        gpa:state='0'
+        id='svg4354'
+        width='32'
+        height='32'
+        viewBox='0 0 32 32'>
   <path
-     id="rect913-9"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,4 C 3.338,4 2,5.3 2,7 v 19 c 0,1.7 1.338,3 3,3 h 22 c 1.662,0 3,-1.3 3,-3 V 7 C 30,5.3 28.662,4 27,4 Z m 0,1 h 22 c 1.108,0 2,0.9 2,2 v 19 c 0,1.1 -0.892,2 -2,2 H 5 C 3.892,28 3,27.1 3,26 V 7 C 3,5.9 3.892,5 5,5 Z" />
+          id='rect1'
+          class='foreground-stroke'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='0.1'
+          fill-rule='nonzero'
+          stroke='url(#gpa:foreground) rgb(0,0,0)'
+          stroke-opacity='1'
+          stroke-width='1'
+          stroke-linecap='butt'
+          stroke-linejoin='miter'
+          stroke-miterlimit='4'
+          d='M 5 4.5 L 27 4.5 C 28.385 4.5, 29.5 5.615, 29.5 7 L 29.5 26 C 29.5 27.385, 28.385 28.5, 27 28.5 L 5 28.5 C 3.615 28.5, 2.5 27.385, 2.5 26 L 2.5 7 C 2.5 5.615, 3.615 4.5, 5 4.5 Z'
+          gpa:stroke-minwidth='25%'
+          gpa:stroke-maxwidth='150%'>
+  </path>
   <path
-     id="rect913-6-2"
-     style="font-variation-settings:normal;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5 5 C 3.892 5 3 5.892 3 7 L 3 26 C 3 27.108 3.892 28 5 28 L 27 28 C 28.108 28 29 27.108 29 26 L 29 7 C 29 5.892 28.108 5 27 5 L 5 5 z M 26.496094 7 C 26.562554 7 26.623179 6.9996094 26.667969 7.0996094 L 28.082031 8.5 C 28.133591 8.5999998 28.166016 8.6992188 28.166016 8.6992188 C 28.166016 8.8992186 28.054576 9 27.916016 9 L 27 9 L 27 22 L 27.916016 22 C 28.009608 22.102173 28.166016 22.100781 28.166016 22.300781 C 28.166016 22.300781 28.133601 22.4 28.082031 22.5 L 26.667969 23.900391 C 26.623175 24.000392 26.562554 24 26.496094 24 C 26.42963 24 26.370972 24.000391 26.326172 23.900391 L 24.917969 22.5 C 24.866409 22.400001 24.833984 22.300781 24.833984 22.300781 C 24.833984 22.100781 24.945425 22 25.083984 22 L 26 22 L 26 9 L 25.083984 9 C 24.945425 9 24.833979 8.8992186 24.833984 8.6992188 C 24.833984 8.6992188 24.866399 8.6 24.917969 8.5 L 26.326172 7.0996094 C 26.370962 6.9996098 26.429634 7 26.496094 7 z M 6.7421875 23.800781 C 6.8859275 23.800781 7 23.899609 7 24.099609 L 7 25 L 23 25 L 23 24.099609 C 23 23.899609 23.116027 23.800781 23.259766 23.800781 C 23.337235 23.800781 23.405665 23.900391 23.453125 23.900391 L 24.929688 25.300781 C 24.973567 25.40078 25.001953 25.4 25.001953 25.5 C 25.001953 25.599999 24.973568 25.599219 24.929688 25.699219 L 23.453125 27.099609 C 23.405663 27.099609 23.337236 27.199219 23.259766 27.199219 C 23.116027 27.199219 23 27.100391 23 26.900391 L 23 26 L 7 26 L 7 26.900391 C 6.999566 27.100389 6.8859275 27.199219 6.7421875 27.199219 C 6.6647175 27.199219 6.5962881 27.099609 6.5488281 27.099609 L 5.0703125 25.699219 C 5.0264335 25.59922 5 25.6 5 25.5 C 5 25.4 5.0264325 25.400781 5.0703125 25.300781 L 6.5488281 23.900391 C 6.5962881 23.900391 6.6647175 23.800781 6.7421875 23.800781 z " />
-  <path
-     id="path873-5-2"
-     style="fill:#555761;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;font-variation-settings:normal;opacity:0.8;vector-effect:none;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-opacity:1"
-     d="M 26.496094 7 C 26.429634 7 26.370962 6.9996094 26.326172 7.0996094 L 24.917969 8.5 C 24.866399 8.6 24.833984 8.6992188 24.833984 8.6992188 C 24.833984 8.8992187 24.945425 9 25.083984 9 L 26 9 L 26 22 L 25.083984 22 C 24.945425 22 24.833984 22.100781 24.833984 22.300781 C 24.833984 22.300781 24.866409 22.4 24.917969 22.5 L 26.326172 23.900391 C 26.370972 24.000391 26.42963 24 26.496094 24 C 26.562554 24 26.623175 24.000391 26.667969 23.900391 L 28.082031 22.5 C 28.133601 22.4 28.166016 22.300781 28.166016 22.300781 C 28.166016 22.100781 28.009608 22.102173 27.916016 22 L 27 22 L 27 9 L 27.916016 9 C 28.054576 9 28.166016 8.8992187 28.166016 8.6992188 C 28.166016 8.6992188 28.133591 8.6 28.082031 8.5 L 26.667969 7.0996094 C 26.623179 6.9996094 26.562554 7 26.496094 7 z M 6.7421875 23.800781 C 6.6647175 23.800781 6.5962881 23.900391 6.5488281 23.900391 L 5.0703125 25.300781 C 5.0264325 25.400781 5 25.4 5 25.5 C 5 25.6 5.0264325 25.599219 5.0703125 25.699219 L 6.5488281 27.099609 C 6.5962881 27.099609 6.6647175 27.199219 6.7421875 27.199219 C 6.8859275 27.199219 6.999566 27.100391 7 26.900391 L 7 26 L 23 26 L 23 26.900391 C 23 27.100391 23.116026 27.199219 23.259766 27.199219 C 23.337236 27.199219 23.405664 27.099609 23.453125 27.099609 L 24.929688 25.699219 C 24.973568 25.599219 25.001953 25.6 25.001953 25.5 C 25.001953 25.4 24.973568 25.400781 24.929688 25.300781 L 23.453125 23.900391 C 23.405665 23.900391 23.337235 23.800781 23.259766 23.800781 C 23.116026 23.800781 23 23.899609 23 24.099609 L 23 25 L 7 25 L 7 24.099609 C 7 23.899609 6.8859275 23.800781 6.7421875 23.800781 z " />
+          id='path873-5-2'
+          class="foreground foreground-fill"
+          opacity="0.8"
+          fill="url(#gpa:foreground) #000000"
+          fill-rule='nonzero'
+          d='M 26.4961 7 C 26.4296 7, 26.371 6.99961, 26.3262 7.09961 L 24.918 8.5 C 24.8664 8.6, 24.834 8.69922, 24.834 8.69922 C 24.834 8.89922, 24.9454 9, 25.084 9 L 26 9 L 26 22 L 25.084 22 C 24.9454 22, 24.834 22.1008, 24.834 22.3008 C 24.834 22.3008, 24.8664 22.4, 24.918 22.5 L 26.3262 23.9004 C 26.371 24.0004, 26.4296 24, 26.4961 24 C 26.5625 24, 26.6232 24.0004, 26.668 23.9004 L 28.082 22.5 C 28.1336 22.4, 28.166 22.3008, 28.166 22.3008 C 28.166 22.1008, 28.0096 22.1022, 27.916 22 L 27 22 L 27 9 L 27.916 9 C 28.0546 9, 28.166 8.89922, 28.166 8.69922 C 28.166 8.69922, 28.1336 8.6, 28.082 8.5 L 26.668 7.09961 C 26.6232 6.99961, 26.5626 7, 26.4961 7 Z M 6.74219 23.8008 C 6.66472 23.8008, 6.59629 23.9004, 6.54883 23.9004 L 5.07031 25.3008 C 5.02643 25.4008, 5 25.4, 5 25.5 C 5 25.6, 5.02643 25.5992, 5.07031 25.6992 L 6.54883 27.0996 C 6.59629 27.0996, 6.66472 27.1992, 6.74219 27.1992 C 6.88593 27.1992, 6.99957 27.1004, 7 26.9004 L 7 26 L 23 26 L 23 26.9004 C 23 27.1004, 23.116 27.1992, 23.2598 27.1992 C 23.3372 27.1992, 23.4057 27.0996, 23.4531 27.0996 L 24.9297 25.6992 C 24.9736 25.5992, 25.002 25.6, 25.002 25.5 C 25.002 25.4, 24.9736 25.4008, 24.9297 25.3008 L 23.4531 23.9004 C 23.4057 23.9004, 23.3372 23.8008, 23.2598 23.8008 C 23.116 23.8008, 23 23.8996, 23 24.0996 L 23 25 L 7 25 L 7 24.0996 C 7 23.8996, 6.88593 23.8008, 6.74219 23.8008 Z'>
+  </path>
 </svg>
diff --git a/data/touchpad-scroll-two-finger-symbolic.svg b/data/touchpad-scroll-two-finger-symbolic.svg
index c8514797..a3b944c0 100644
--- a/data/touchpad-scroll-two-finger-symbolic.svg
+++ b/data/touchpad-scroll-two-finger-symbolic.svg
@@ -1,39 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   viewBox="0 0 32 32"
-   id="svg4354"
-   height="32"
-   width="32"
-   version="1.1">
-  <defs
-     id="defs4356" />
-  <metadata
-     id="metadata4359">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+        xmlns='http://www.w3.org/2000/svg'
+        xmlns:svg='http://www.w3.org/2000/svg'
+        xmlns:gpa='https://www.gtk.org/grappa'
+        gpa:version='1'
+        gpa:state='0'
+        id='svg4354'
+        width='32'
+        height='32'
+        viewBox='0 0 32 32'>
   <path
-     id="rect913-2"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,4 C 3.338,4 2,5.338 2,7 v 19 c 0,1.662 1.338,3 3,3 h 22 c 1.662,0 3,-1.338 3,-3 V 7 C 30,5.338 28.662,4 27,4 Z m 0,1 h 22 c 1.108,0 2,0.892 2,2 v 19 c 0,1.108 -0.892,2 -2,2 H 5 C 3.892,28 3,27.108 3,26 V 7 C 3,5.892 3.892,5 5,5 Z" />
+          id='rect1'
+          class='foreground-stroke'
+          fill='url(#gpa:foreground) rgb(0,0,0)'
+          fill-opacity='0.1'
+          fill-rule='nonzero'
+          stroke='url(#gpa:foreground) rgb(0,0,0)'
+          stroke-opacity='1'
+          stroke-width='1'
+          stroke-linecap='butt'
+          stroke-linejoin='miter'
+          stroke-miterlimit='4'
+          d='M 5 4.5 L 27 4.5 C 28.385 4.5, 29.5 5.615, 29.5 7 L 29.5 26 C 29.5 27.385, 28.385 28.5, 27 28.5 L 5 28.5 C 3.615 28.5, 2.5 27.385, 2.5 26 L 2.5 7 C 2.5 5.615, 3.615 4.5, 5 4.5 Z'
+          gpa:stroke-minwidth='25%'
+          gpa:stroke-maxwidth='150%'>
+  </path>
   <path
-     id="rect913-6-9"
-     style="font-variation-settings:normal;opacity:0.1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000"
-     d="M 5,5 C 3.892,5 3,5.892 3,7 v 19 c 0,1.108 0.892,2 2,2 h 22 c 1.108,0 2,-0.892 2,-2 V 7 C 29,5.892 28.108,5 27,5 Z m 8.496094,1.9980469 c 0.06646,-4e-7 0.127085,0.028386 0.171875,0.072266 l 1.414062,1.4765625 c 0.05156,0.04746 0.08399,0.1158904 0.08399,0.1933594 0,0.14374 -0.11144,0.2597656 -0.25,0.2597656 H 14 v 5 h 3 V 9 h -0.916016 c -0.138559,0 -0.25,-0.1160256 -0.25,-0.2597656 0,-0.07747 0.03242,-0.1458984 0.08399,-0.1933594 l 1.408203,-1.4765625 c 0.04479,-0.04388 0.103462,-0.072266 0.169922,-0.072266 0.06646,0 0.127085,0.028386 0.171875,0.072266 l 1.414062,1.4765625 c 0.05156,0.04746 0.08398,0.1158904 0.08398,0.1933594 0,0.14374 -0.11144,0.2597656 -0.25,0.2597656 H 18 v 5 h 6.998047 v -0.916016 c 0,-0.13856 0.116025,-0.25 0.259765,-0.25 0.07747,0 0.1459,0.03242 0.19336,0.08399 l 1.478516,1.414062 C 26.973567,14.376825 27,14.437446 27,14.503906 c 0,0.06646 -0.02643,0.125127 -0.07031,0.169922 l -1.478516,1.408203 c -0.04746,0.05156 -0.11589,0.08398 -0.19336,0.08398 -0.143739,0 -0.259765,-0.111441 -0.259765,-0.25 V 15 H 18 v 3 h 6.998047 v -0.916016 c 0,-0.13856 0.116025,-0.25 0.259765,-0.25 0.07747,0 0.1459,0.03242 0.19336,0.08398 l 1.478516,1.414062 C 26.973567,18.376825 27,18.437446 27,18.503906 c 0,0.06646 -0.02643,0.125127 -0.07031,0.169922 l -1.478516,1.408203 c -0.04746,0.05156 -0.11589,0.08398 -0.19336,0.08398 -0.143739,0 -0.259765,-0.111441 -0.259765,-0.25 V 19 H 18 v 4.998047 h 0.916016 c 0.13856,0 0.25,0.116025 0.25,0.259765 0,0.07747 -0.03242,0.1459 -0.08398,0.19336 l -1.414062,1.478516 C 17.623175,25.973567 17.562554,26 17.496094,26 c -0.06646,0 -0.125127,-0.02643 -0.169922,-0.07031 l -1.408203,-1.478516 c -0.05156,-0.04746 -0.08399,-0.115889 -0.08399,-0.19336 0,-0.143739 0.111441,-0.259765 0.25,-0.259765 H 17 v -2.5 V 19 h -3 v 4.998047 h 0.916016 c 0.13856,0 0.25,0.116025 0.25,0.259765 0,0.07747 -0.03242,0.1459 -0.08399,0.19336 l -1.414062,1.478516 C 13.623175,25.973567 13.562554,26 13.496094,26 c -0.06646,0 -0.125127,-0.02643 -0.169922,-0.07031 l -1.408203,-1.478516 c -0.05156,-0.04746 -0.08399,-0.115889 -0.08399,-0.19336 0,-0.143739 0.111441,-0.259765 0.25,-0.259765 H 13 V 19 H 7.001953 v 0.916016 c 0,0.138559 -0.116025,0.25 -0.259765,0.25 -0.07747,0 -0.1459,-0.03242 -0.19336,-0.08398 L 5.070312,18.673828 C 5.026433,18.629038 5,18.570366 5,18.503906 5,18.437446 5.026433,18.37683 5.070312,18.332031 l 1.478516,-1.414062 c 0.04746,-0.05156 0.11589,-0.08398 0.19336,-0.08398 0.143739,0 0.259765,0.11144 0.259765,0.25 V 18 H 13 V 15 H 7.001953 v 0.916016 c 0,0.138559 -0.116025,0.25 -0.259765,0.25 -0.07747,0 -0.1459,-0.03242 -0.19336,-0.08398 L 5.070312,14.673828 C 5.026433,14.629038 5,14.570366 5,14.503906 5,14.437446 5.026433,14.37682 5.070312,14.332031 l 1.478516,-1.414062 c 0.04746,-0.05157 0.11589,-0.08399 0.19336,-0.08399 0.143739,0 0.259765,0.11144 0.259765,0.25 V 14 H 13 V 9 h -0.916016 c -0.138559,0 -0.25,-0.1160256 -0.25,-0.2597656 0,-0.07747 0.03242,-0.1458984 0.08399,-0.1933594 l 1.408203,-1.4765625 c 0.04479,-0.04388 0.103462,-0.072266 0.169922,-0.072266 z M 14,15 v 3 h 3 v -3 z" />
-  <path
-     id="path873-5-1"
-     style="font-variation-settings:normal;opacity:0.8;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;stop-color:#000000;stop-opacity:1"
-     d="m 13.496094,6.9980469 c -0.06646,0 -0.125132,0.028386 -0.169922,0.072266 L 11.917969,8.546875 c -0.05157,0.047461 -0.08398,0.1158894 -0.08398,0.1933594 0,0.14374 0.111441,0.2597656 0.25,0.2597656 H 13 v 5 H 7.001953 v -0.916016 c 0,-0.13856 -0.116025,-0.25 -0.259765,-0.25 -0.07747,0 -0.1459,0.03242 -0.19336,0.08399 L 5.070312,14.332036 C 5.026433,14.376825 5,14.437446 5,14.503906 c 0,0.06646 0.02643,0.125132 0.07031,0.169922 l 1.478516,1.408203 c 0.04746,0.05157 0.11589,0.08398 0.19336,0.08398 0.14374,0 0.259765,-0.111441 0.259765,-0.25 V 15 H 13 v 3 H 7.001953 v -0.916016 c 0,-0.13856 -0.116025,-0.25 -0.259765,-0.25 -0.07747,0 -0.1459,0.03242 -0.19336,0.08398 L 5.070312,18.332026 C 5.026433,18.376825 5,18.437446 5,18.503906 c 0,0.06646 0.02643,0.125132 0.07031,0.169922 l 1.478516,1.408203 c 0.04746,0.05157 0.11589,0.08398 0.19336,0.08398 0.14374,0 0.259765,-0.111441 0.259765,-0.25 V 19 H 13 v 4.998047 h -0.916016 c -0.138559,0 -0.25,0.116026 -0.25,0.259765 0,0.07747 0.03242,0.145899 0.08398,0.19336 l 1.408203,1.478516 C 13.370962,25.973568 13.42963,26 13.496094,26 c 0.06646,0 0.127081,-0.02643 0.171875,-0.07031 l 1.414062,-1.478516 c 0.05157,-0.04746 0.08398,-0.115891 0.08398,-0.19336 0,-0.14374 -0.11144,-0.259765 -0.25,-0.259765 H 14 V 19 h 3 v 2.499023 2.499024 h -0.916016 c -0.138559,0 -0.25,0.116026 -0.25,0.259765 0,0.07747 0.03242,0.145899 0.08398,0.19336 l 1.408203,1.478516 C 17.370962,25.973568 17.42963,26 17.496094,26 c 0.06646,0 0.127081,-0.02643 0.171875,-0.07031 l 1.414062,-1.478516 c 0.05157,-0.04746 0.08398,-0.115891 0.08398,-0.19336 0,-0.14374 -0.11144,-0.259765 -0.25,-0.259765 H 18 V 19 h 6.998047 v 0.916016 c 0,0.138559 0.116025,0.25 0.259765,0.25 0.07747,0 0.145899,-0.03242 0.19336,-0.08398 l 1.478516,-1.408203 C 26.973568,18.629038 27,18.57037 27,18.503906 c 0,-0.06646 -0.02643,-0.127081 -0.07031,-0.171875 l -1.478516,-1.414062 c -0.04746,-0.05157 -0.11589,-0.08398 -0.19336,-0.08398 -0.14374,0 -0.259765,0.11144 -0.259765,0.25 V 18 H 18 v -3 h 6.998047 v 0.916016 c 0,0.138559 0.116025,0.25 0.259765,0.25 0.07747,0 0.145899,-0.03242 0.19336,-0.08398 l 1.478516,-1.408203 C 26.973568,14.629038 27,14.57037 27,14.503906 c 0,-0.06646 -0.02643,-0.127081 -0.07031,-0.171875 l -1.478516,-1.414062 c -0.04746,-0.05157 -0.11589,-0.08399 -0.19336,-0.08399 -0.14374,0 -0.259765,0.11144 -0.259765,0.25 V 14 H 18 V 9 h 0.916016 c 0.13856,0 0.25,-0.1160256 0.25,-0.2597656 0,-0.077469 -0.03242,-0.1458994 -0.08398,-0.1933594 L 17.667969,7.0703125 c -0.04479,-0.04388 -0.105415,-0.072266 -0.171875,-0.072266 -0.06646,0 -0.125132,0.028386 -0.169922,0.072266 L 15.917969,8.546875 c -0.05157,0.047461 -0.08398,0.1158894 -0.08398,0.1933594 0,0.14374 0.111441,0.2597656 0.25,0.2597656 H 17 v 5 H 14 V 9 h 0.916016 c 0.13856,0 0.25,-0.1160256 0.25,-0.2597656 0,-0.077469 -0.03242,-0.1458994 -0.08398,-0.1933594 L 13.667969,7.0703125 c -0.04479,-0.04388 -0.105415,-0.072266 -0.171875,-0.072266 z M 14,15 h 3 v 3 h -3 z" />
+          id='path873-5-1'
+          class="foreground foreground-fill"
+          opacity="0.8"
+          fill="url(#gpa:foreground) #000000"
+          fill-rule='nonzero'
+          d='M 13.4961 6.99805 C 13.4296 6.99805, 13.371 7.02643, 13.3262 7.07031 L 11.918 8.54688 C 11.8664 8.59434, 11.834 8.66276, 11.834 8.74023 C 11.834 8.88397, 11.9454 9, 12.084 9 L 13 9 L 13 14 L 7.00195 14 L 7.00195 13.084 C 7.00195 12.9454, 6.88593 12.834, 6.74219 12.834 C 6.66472 12.834, 6.59629 12.8664, 6.54883 12.918 L 5.07031 14.332 C 5.02643 14.3768, 5 14.4374, 5 14.5039 C 5 14.5704, 5.02643 14.629, 5.07031 14.6738 L 6.54883 16.082 C 6.59629 16.1336, 6.66472 16.166, 6.74219 16.166 C 6.88593 16.166, 7.00195 16.0546, 7.00195 15.916 L 7.00195 15 L 13 15 L 13 18 L 7.00195 18 L 7.00195 17.084 C 7.00195 16.9454, 6.88593 16.834, 6.74219 16.834 C 6.66472 16.834, 6.59629 16.8664, 6.54883 16.918 L 5.07031 18.332 C 5.02643 18.3768, 5 18.4374, 5 18.5039 C 5 18.5704, 5.02643 18.629, 5.07031 18.6738 L 6.54883 20.082 C 6.59629 20.1336, 6.66472 20.166, 6.74219 20.166 C 6.88593 20.166, 7.00195 20.0546, 7.00195 19.916 L 7.00195 19 L 13 19 L 13 23.998 L 12.084 23.998 C 11.9454 23.998, 11.834 24.1141, 11.834 24.2578 C 11.834 24.3353, 11.8664 24.4037, 11.918 24.4512 L 13.3262 25.9297 C 13.371 25.9736, 13.4296 26, 13.4961 26 C 13.5626 26, 13.6232 25.9736, 13.668 25.9297 L 15.082 24.4512 C 15.1336 24.4037, 15.166 24.3353, 15.166 24.2578 C 15.166 24.1141, 15.0546 23.998, 14.916 23.998 L 14 23.998 L 14 19 L 17 19 L 17 21.499 L 17 23.998 L 16.084 23.998 C 15.9454 23.998, 15.834 24.1141, 15.834 24.2578 C 15.834 24.3353, 15.8664 24.4037, 15.918 24.4512 L 17.3262 25.9297 C 17.371 25.9736, 17.4296 26, 17.4961 26 C 17.5626 26, 17.6232 25.9736, 17.668 25.9297 L 19.082 24.4512 C 19.1336 24.4037, 19.166 24.3353, 19.166 24.2578 C 19.166 24.1141, 19.0546 23.998, 18.916 23.998 L 18 23.998 L 18 19 L 24.998 19 L 24.998 19.916 C 24.998 20.0546, 25.1141 20.166, 25.2578 20.166 C 25.3353 20.166, 25.4037 20.1336, 25.4512 20.082 L 26.9297 18.6738 C 26.9736 18.629, 27 18.5704, 27 18.5039 C 27 18.4374, 26.9736 18.3768, 26.9297 18.332 L 25.4512 16.918 C 25.4037 16.8664, 25.3353 16.834, 25.2578 16.834 C 25.1141 16.834, 24.998 16.9454, 24.998 17.084 L 24.998 18 L 18 18 L 18 15 L 24.998 15 L 24.998 15.916 C 24.998 16.0546, 25.1141 16.166, 25.2578 16.166 C 25.3353 16.166, 25.4037 16.1336, 25.4512 16.082 L 26.9297 14.6738 C 26.9736 14.629, 27 14.5704, 27 14.5039 C 27 14.4374, 26.9736 14.3768, 26.9297 14.332 L 25.4512 12.918 C 25.4037 12.8664, 25.3353 12.834, 25.2578 12.834 C 25.1141 12.834, 24.998 12.9454, 24.998 13.084 L 24.998 14 L 18 14 L 18 9 L 18.916 9 C 19.0546 9, 19.166 8.88397, 19.166 8.74023 C 19.166 8.66277, 19.1336 8.59433, 19.082 8.54688 L 17.668 7.07031 C 17.6232 7.02643, 17.5626 6.99805, 17.4961 6.99805 C 17.4296 6.99805, 17.371 7.02643, 17.3262 7.07031 L 15.918 8.54688 C 15.8664 8.59434, 15.834 8.66276, 15.834 8.74023 C 15.834 8.88397, 15.9454 9, 16.084 9 L 17 9 L 17 14 L 14 14 L 14 9 L 14.916 9 C 15.0546 9, 15.166 8.88397, 15.166 8.74023 C 15.166 8.66277, 15.1336 8.59433, 15.082 8.54688 L 13.668 7.07031 C 13.6232 7.02643, 13.5626 6.99805, 13.4961 6.99805 Z M 14 15 L 17 15 L 17 18 L 14 18 Z'>
+  </path>
 </svg>
diff --git a/src/Views/Pointing.vala b/src/Views/Pointing.vala
index 28aa3c5f..fe00f9af 100644
--- a/src/Views/Pointing.vala
+++ b/src/Views/Pointing.vala
@@ -36,7 +36,9 @@ public class MouseTouchpad.PointingView : Switchboard.SettingsPage {
         var cursor_size_24 = new Gtk.CheckButton () {
             action_name = "pointing.cursor-size",
             action_target = new Variant.int32 (24),
-            child = new Gtk.Image.from_icon_name ("mouse-touchpad-pointing-symbolic") {
+            child = new Gtk.Image.from_paintable (
+                new Gtk.Svg.from_resource ("/io/elementary/settings/mouse-touchpad/pointing/symbolic.svg")
+            ) {
                 pixel_size = 24
             },
             tooltip_text = _("Small")
@@ -46,7 +48,11 @@ public class MouseTouchpad.PointingView : Switchboard.SettingsPage {
         var cursor_size_32 = new Gtk.CheckButton () {
             action_name = "pointing.cursor-size",
             action_target = new Variant.int32 (32),
-            child = new Gtk.Image.from_icon_name ("mouse-touchpad-pointing-symbolic") {
+            child = new Gtk.Image.from_paintable (
+                new Gtk.Svg.from_resource ("/io/elementary/settings/mouse-touchpad/pointing/symbolic.svg") {
+                    weight = 275
+                }
+            ) {
                 pixel_size = 32
             },
             tooltip_text = _("Medium")
@@ -56,7 +62,11 @@ public class MouseTouchpad.PointingView : Switchboard.SettingsPage {
         var cursor_size_48 = new Gtk.CheckButton () {
             action_name = "pointing.cursor-size",
             action_target = new Variant.int32 (48),
-            child = new Gtk.Image.from_icon_name ("mouse-touchpad-pointing-symbolic") {
+            child = new Gtk.Image.from_paintable (
+                new Gtk.Svg.from_resource ("/io/elementary/settings/mouse-touchpad/pointing/symbolic.svg") {
+                    weight = 150
+                }
+            ) {
                 pixel_size = 48
             },
             tooltip_text = _("Large")
diff --git a/src/meson.build b/src/meson.build
index 93884d67..9768b7d0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -22,7 +22,7 @@ shared_module(
         dependency('gio-2.0'),
         dependency('gobject-2.0'),
         dependency('granite-7', version: '>=7.7.0'),
-        dependency('gtk4'),
+        dependency('gtk4', version: '>=4.22.0'),
         dependency('libxml-2.0'),
         switchboard_dep
     ],