Improvements to CSS to easy tweak widgets

28 files changed, 867 insertions, 2784 deletions

diff --git a/NEWS.md b/NEWS.md
index 4906290f7..a52a4cbfb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -676,9 +676,9 @@ User interface customization
     reconfigured by users. Only one is currently supported (filter editor).
   • The contents of the menus can be configured by customizing the menus.xml
     file.
-  • Toolbar contents for the command bar (toolbar-commands.ui), the snap bar
-    (toolbar-snap.ui), the tool controls bars for each tool
-    (toolbar-select.ui), the toolbox (tool-toolbar.ui) is now configurable.
+  • Toolbar contents for the command bar (commands-toolbar.ui), the snap bar
+    (snap-toolbar.ui), the tool controls bars for each tool
+    (select-toolbar.ui), the toolbox (tool-toolbar.ui) is now configurable.
   • The file keybindings.rc allows you to... (TODO: do what? What does it do in
     comparison to keys.xml? Seems to not work at all... seems to be ancient.
     Can be deleted?)
diff --git a/share/icons/hicolor/scalable/actions/draw-star-ouline.svg b/share/icons/hicolor/scalable/actions/draw-star-ouline.svg
deleted file mode 100644
index f348a88c6..000000000
--- a/share/icons/hicolor/scalable/actions/draw-star-ouline.svg
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="18.268586"
-   height="17.84485"
-   version="1.1"
-   sodipodi:docname="draw-star-ouline.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata4103">
-    <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>
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     inkscape:zoom="37.406242"
-     inkscape:cx="9.6579675"
-     inkscape:cy="9.7321419"
-     inkscape:window-width="1280"
-     inkscape:window-height="960"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0pt"
-       originy="0pt"
-       spacingx="1pt"
-       spacingy="1pt"
-       color="#3f3fff"
-       empcolor="#3f3fff"
-       opacity="0.15"
-       empopacity="0.38"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6625-4"
-       inkscape:collect="always"
-       x1="109.2829"
-       x2="99.93163"
-       xlink:href="#linearGradient6679"
-       y1="199.9722"
-       y2="190.2852" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6644"
-       inkscape:collect="always"
-       x1="98.53114"
-       x2="101.695"
-       xlink:href="#linearGradient5704"
-       y1="191.0442"
-       y2="195.8891" />
-    <linearGradient
-       id="linearGradient6679">
-      <stop
-         id="stop6681"
-         offset="0"
-         style="stop-color:#ffeb74;stop-opacity:1" />
-      <stop
-         id="stop6683"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5704">
-      <stop
-         id="stop5706"
-         offset="0"
-         style="stop-color:#5a5a5a;stop-opacity:1" />
-      <stop
-         id="stop5708"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="draw-star"
-     transform="matrix(1,0,0,1,-455.80047,-179.155581)">
-    <path
-       d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z"
-       id="path2669"
-       inkscape:flatsided="false"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       sodipodi:arg1="-0.122765"
-       sodipodi:arg2="0.5055535"
-       sodipodi:cx="103"
-       sodipodi:cy="195"
-       sodipodi:r1="6.158659"
-       sodipodi:r2="3"
-       sodipodi:sides="5"
-       sodipodi:type="star"
-       style="color:#000000;fill:#fffbc5;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"
-       transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" />
-    <path
-       d="m 107.5277,194.4445 -2.569,1.6153 -0.031,3.0747 -2.3302,-1.9442 -2.93379,0.9204 1.12889,-2.8168 -1.78192,-2.5058 3.02782,0.2032 1.8325,-2.4691 0.7424,2.9425 z"
-       id="path5971"
-       inkscape:flatsided="false"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       sodipodi:arg1="-0.1220787"
-       sodipodi:arg2="0.4959725"
-       sodipodi:cx="103"
-       sodipodi:cy="195"
-       sodipodi:r1="4.561672"
-       sodipodi:r2="2.227037"
-       sodipodi:sides="5"
-       sodipodi:type="star"
-       style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke:url(#linearGradient6625-4);stroke-width:0.6782926;stroke-linecap:round;stroke-miterlimit:80"
-       transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/bend-path-symbolic.svg b/share/icons/hicolor/symbolic/actions/bend-path-symbolic.svg
deleted file mode 100644
index 7e741db26..000000000
--- a/share/icons/hicolor/symbolic/actions/bend-path-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="bend-path">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 1.9990985,3.0848002 C 1.8242565,3.0865002 1.6693549,3.1497002 1.5452776,3.2546899 1.2143904,3.5346597 1.0472119,4.0581247 0.80657336,4.5768796 V 4.5801996 L 0.80463636,4.5821396 C 0.65390286,4.9520288 0.61164732,5.193925 0.62954049,5.3799996 0.64742179,5.5660744 0.72953139,5.6843851 0.78144494,5.7770348 0.83335134,5.8696868 0.86630754,5.9365835 0.84580504,6.1007212 0.82528304,6.2648537 0.73774614,6.5236206 0.51691476,6.9411632 L 0.49893706,6.9771292 0.50415006,7.0145122 C 0.55091666,7.3505433 0.59622826,7.5223228 0.67971667,7.6368029 0.72145657,7.6940449 0.78130704,7.7346669 0.83682784,7.7494319 0.89235824,7.7641879 0.93701969,7.7604559 0.97122423,7.7603109 1.0396113,7.7600686 1.0639388,7.7513009 1.1354322,7.8227759 1.2069342,7.8942469 1.3128644,8.0668429 1.4326167,8.4223518 L 1.4345567,8.4308818 1.4397667,8.4398718 C 1.7446997,9.0039522 2.041012,9.1373527 2.3019813,9.2590241 2.3075813,9.2616241 2.3129813,9.2649341 2.3185543,9.2675241 L 1.4104305,11.74959 C 1.3363065,11.72819 1.2597109,11.71315 1.1790232,11.71315 0.71341241,11.71315 0.33100442,12.095559 0.33100442,12.561169 0.33100442,13.02678 0.71341241,13.408716 1.1790232,13.408716 1.6446339,13.408716 2.0265695,13.02678 2.0265695,12.561169 2.0265695,12.2539 1.8585673,11.985399 1.6115491,11.836664 L 2.5149363,9.3697437 C 2.7039354,9.484437 2.9016158,9.6701749 3.1585219,10.126428 L 3.1623019,10.132128 3.1656219,10.137328 C 3.3050434,10.328684 3.4919128,10.417782 3.6667671,10.462906 3.8416091,10.508036 4.0090566,10.519026 4.1371509,10.552346 4.2652454,10.585666 4.346001,10.627716 4.4068888,10.749208 4.4677768,10.870698 4.5019548,11.092418 4.4608378,11.475134 L 4.4518478,11.566464 4.5375028,11.600534 C 4.9125645,11.747808 5.2950137,12.080808 5.6448481,12.287182 5.8197652,12.390375 5.9922935,12.467416 6.1724926,12.449973 6.3006791,12.437573 6.3932149,12.304915 6.4871876,12.183547 6.5753376,12.241627 6.6305584,12.306173 6.6461911,12.426783 6.6649441,12.571476 6.6457065,12.753207 6.6693781,12.927456 6.6812501,13.014576 6.7053341,13.104334 6.7626051,13.181578 6.8198661,13.258818 6.9120575,13.316931 7.0238264,13.340582 7.2473593,13.387882 7.5538817,13.331682 8.0554558,13.151292 L 8.1183938,13.127622 8.1325928,13.063262 C 8.1785628,12.858022 8.2384933,12.724228 8.298693,12.643037 8.358895,12.561847 8.4152181,12.528566 8.4865631,12.512427 8.6292556,12.480157 8.8512791,12.547587 9.1107486,12.610857 H 9.1145286 9.1164686 C 9.3984542,12.664037 9.6744504,12.627517 9.8887712,12.458952 10.103092,12.290383 10.243712,12.002939 10.298585,11.598631 H 10.300585 V 11.596631 C 10.336515,11.279915 10.452333,11.109996 10.597296,10.999422 10.732809,10.896051 10.901941,10.85293 11.060584,10.822435 11.358796,11.106372 11.624387,11.288592 11.865539,11.314117 12.129284,11.342037 12.351712,11.210201 12.521902,11.018824 12.837568,10.663853 13.047041,10.092296 13.305088,9.6294355 13.423549,9.7223525 13.542621,9.8167342 13.643445,9.8527992 13.781163,9.9020592 13.918542,9.8944792 14.022497,9.8277192 14.2304,9.6941856 14.286098,9.4233721 14.331985,9.1268732 14.377885,8.8303768 14.398355,8.4929937 14.442723,8.214497 14.473333,8.0223869 14.530863,7.9423582 14.584216,7.8477483 14.584942,7.847506 14.586716,7.8479907 14.587516,7.8477483 14.700263,7.8027663 14.812753,7.7003942 14.938176,7.5382579 15.175773,7.2311054 15.365573,6.6953684 15.120839,6.1006019 15.483311,5.9421629 15.731957,5.7359296 15.768212,5.504813 15.808192,5.2499276 15.652988,5.0245679 15.435534,4.9255846 15.339204,4.8550056 15.229996,4.8251458 15.13693,4.8285736 15.036647,4.8322536 14.949687,4.8549536 14.880915,4.8626466 14.812145,4.8703266 14.772097,4.8652466 14.736107,4.8413496 14.701017,4.8180656 14.654607,4.7595516 14.612597,4.6222482 14.61284,4.6311182 14.614597,4.6392812 14.614597,4.6482742 L 14.609397,4.6142012 C 14.610365,4.6178812 14.611597,4.6186812 14.612697,4.6222412 14.607297,4.4526452 14.563157,4.3057925 14.476881,4.1920805 14.386111,4.0724275 14.254162,3.9932588 14.10114,3.9469498 13.803358,3.8568368 13.408685,3.8787158 12.942214,3.9360708 H 12.940214 C 12.639439,3.8943638 12.274992,3.9756438 11.918996,4.1078504 11.562404,4.2402818 11.218099,4.4252178 10.974914,4.6175146 10.85331,4.7136606 10.756891,4.8101674 10.69571,4.914699 10.63451,5.019233 10.61263,5.1595099 10.68671,5.2653572 10.7608,5.371207 10.88707,5.4186499 11.060558,5.4456558 11.137238,5.4576008 11.273241,5.4456169 11.37336,5.4475958 10.997877,5.6895622 10.584114,5.9334208 10.346935,6.1579061 10.269445,6.2312471 10.206745,6.3031619 10.168057,6.3864738 10.129357,6.4697828 10.120257,6.5763209 10.168057,6.6637832 10.203887,6.7293812 10.277698,6.7680921 10.350721,6.8085884 10.113878,6.8378036 9.8204733,6.8321394 9.661746,6.9108061 9.3813153,7.0498163 9.2140884,7.254889 9.100437,7.4545877 8.986783,7.6542865 8.9196345,7.8492217 8.8425278,7.98034 8.7654234,8.1114606 8.7042037,8.1757162 8.5458157,8.1843006 H 8.5420357 8.5368257 C 8.1639625,8.2303262 8.0023277,8.1348877 7.8823548,7.9784477 7.7623844,7.8220101 7.7002513,7.5795493 7.6159292,7.3452732 7.5315997,7.1109947 7.4090392,6.8663995 7.1384461,6.7783484 6.9210383,6.7076068 6.5680687,6.8315144 6.1740138,6.9946126 6.1605423,6.9743087 6.1510203,6.9480395 6.1347359,6.9321476 6.1044908,6.9026075 6.0686413,6.8750783 6.0273138,6.8464953 5.8620131,6.7321605 5.5956213,6.592298 5.2815127,6.4101799 4.6673121,6.0540798 3.8978102,5.5326355 3.4681142,4.8594225 3.4830392,4.8147755 3.4979202,4.7712015 3.5343662,4.7430089 3.5836792,4.7048579 3.6526211,4.6784989 3.7165569,4.6573559 3.7485369,4.6467919 3.7784209,4.6375609 3.8078909,4.6265969 3.8373679,4.6156209 3.8733989,4.6194069 3.9153131,4.5461469 3.9362711,4.5095149 3.9337271,4.4451721 3.9153131,4.4122254 3.8968991,4.3792791 3.8776661,4.3653788 3.8599449,4.3530729 3.8268964,4.3301037 3.7886846,4.3141246 3.7397467,4.2939199 3.5275046,4.1890878 3.5087634,4.1625788 3.4539184,4.0814428 3.3990831,4.0003044 3.3165709,3.8579172 3.0583031,3.6162609 L 3.0568431,3.6143209 3.0530631,3.6123809 C 2.7075407,3.3221704 2.429628,3.1603078 2.1804437,3.1046148 2.1181482,3.0906831 2.057481,3.0841896 1.9991978,3.0847469 Z M 1.9976385,3.3242541 C 2.0369865,3.324981 2.0795615,3.3303541 2.1263557,3.3408271 2.3130215,3.3825491 2.5675895,3.5217507 2.8958212,3.7970176 2.8967904,3.7977445 2.8963059,3.7977445 2.8972712,3.7984676 3.1328751,4.0202512 3.1895857,4.1213447 3.2531387,4.2153779 3.3068277,4.2948039 3.4161448,4.3729882 3.5697259,4.4605086 3.5099989,4.4831146 3.4491377,4.5027186 3.3856404,4.5518406 3.2981684,4.6195056 3.2197849,4.7283836 3.2034497,4.87174 L 3.1977797,4.912912 3.2195377,4.948876 C 3.6840509,5.7136871 4.5222448,6.2497441 5.1597611,6.6193615 5.478512,6.804169 5.750251,6.948497 5.8894715,7.0447884 5.9210565,7.0666434 5.9426255,7.0862874 5.9576155,7.1001564 L 6.0200825,7.2738306 C 6.0297225,7.2716506 6.0378665,7.2654706 6.0470545,7.2629516 6.5887322,6.9907945 6.8989327,6.9552746 7.0649674,7.0093032 7.2310096,7.0633312 7.3087293,7.2108554 7.3867591,7.4276332 7.4647821,7.6444134 7.5262679,7.9109264 7.6905703,8.1251674 7.8541677,8.3384926 8.1372243,8.4735262 8.5636686,8.4223519 8.7973914,8.4067771 8.9559369,8.2654099 9.0520442,8.1019846 9.1492052,7.9367519 9.2123148,7.7483753 9.3113707,7.5743377 9.4104168,7.4003 9.5376076,7.2418198 9.7689785,7.127141 10.000352,7.0124623 10.341939,6.9422172 10.863548,6.9733419 L 10.890518,6.7319981 C 10.71713,6.7033231 10.589111,6.6690121 10.505787,6.6335671 10.422457,6.5981221 10.389446,6.5636371 10.380854,6.5479121 10.372254,6.5321871 10.368744,6.5260571 10.386054,6.4887591 10.403374,6.4514681 10.448204,6.3947311 10.513352,6.3330677 10.773946,6.0864275 11.356573,5.7588112 11.827498,5.4282632 L 12.194285,5.1689362 11.747088,5.2082142 C 11.454864,5.2332452 11.24024,5.2284942 11.097823,5.2062742 10.955407,5.1841042 10.89615,5.1412672 10.885346,5.1258262 10.874546,5.1103922 10.869216,5.0990042 10.904756,5.0382792 10.940306,4.9775562 11.019292,4.8941718 11.126699,4.8092391 11.341524,4.6393736 11.668792,4.4592278 12.003112,4.3350681 12.337433,4.2109084 12.681953,4.1441307 12.909809,4.1760646 L 12.925899,4.1780046 12.941989,4.1760646 C 13.414255,4.1162936 13.794245,4.1076276 14.031351,4.1793846 14.149894,4.2152606 14.229579,4.2676806 14.28358,4.3388631 14.33759,4.4100431 14.37011,4.5064364 14.37112,4.6497709 V 4.6663439 L 14.37632,4.6824319 C 14.42816,4.8582189 14.500884,4.9763359 14.602047,5.0435038 14.70322,5.1106718 14.815792,5.1129418 14.907751,5.1026568 14.999701,5.0923878 15.080672,5.0728768 15.145783,5.0704778 15.210903,5.0680578 15.252938,5.0749878 15.302894,5.1168518 L 15.317094,5.1291598 15.333184,5.1367198 C 15.464372,5.1921898 15.552783,5.322545 15.530046,5.4675054 15.507296,5.6124632 15.367648,5.8051137 14.957917,5.9468807 L 14.8292,5.9913647 14.88977,6.1148751 C 15.158439,6.65728 14.96001,7.1146699 14.746857,7.3902178 14.675537,7.4824068 14.630198,7.5075424 14.580282,7.5459068 L 14.521132,7.4777628 C 14.509672,7.4848428 14.514232,7.5072668 14.503612,7.5151478 L 14.492732,7.5028398 C 14.431722,7.5761448 14.394722,7.6146863 14.380103,7.6959143 14.376403,7.7162183 14.372403,7.7430913 14.385303,7.7763643 14.323893,7.9081755 14.230171,8.0073549 14.20311,8.1771839 14.15588,8.473615 14.13514,8.8096994 14.091904,9.0890876 14.048664,9.3684784 13.96747,9.5751865 13.89173,9.6238338 13.85386,9.6481568 13.8134,9.6577978 13.723735,9.6257738 13.634075,9.5937018 13.506732,9.5119551 13.344683,9.3664472 L 13.235366,9.2680162 13.158226,9.3953134 C 12.850718,9.9062874 12.622237,10.5417 12.340903,10.858055 12.200234,11.01623 12.068229,11.091522 11.892285,11.072897 11.716342,11.054267 11.473722,10.924874 11.158787,10.605825 L 11.113827,10.561345 11.049467,10.572225 C 10.868057,10.604615 10.644953,10.659465 10.450364,10.807889 10.255777,10.956319 10.10082,11.20114 10.059008,11.569783 V 11.566483 C 10.009484,11.931343 9.8888716,12.14916 9.738634,12.26733 9.5883892,12.3855 9.395889,12.417191 9.1608279,12.37286 8.9170467,12.31277 8.675388,12.221495 8.4330072,12.27632 8.3106187,12.30401 8.1938127,12.377294 8.1041165,12.498264 8.0282385,12.600598 7.9756562,12.755829 7.92855,12.931265 7.4867951,13.083835 7.1996658,13.129658 7.073907,13.103044 7.007735,13.089034 6.979781,13.066864 6.9574934,13.036794 6.9352024,13.006724 6.9180334,12.959914 6.9092234,12.895301 6.8916094,12.766068 6.9099503,12.581585 6.8860354,12.39652 6.8620484,12.211459 6.7733047,12.006435 6.5514653,11.911466 L 6.4421485,11.865096 6.3924615,11.974411 C 6.3099875,12.156336 6.237073,12.200107 6.1487506,12.208654 6.0604266,12.217254 5.9257241,12.171214 5.7678036,12.078046 5.4712428,11.903122 5.0983568,11.597088 4.6950075,11.417921 4.7218925,11.075676 4.7092545,10.810931 4.6235495,10.639939 4.5285975,10.450487 4.3599175,10.360359 4.1976479,10.318147 4.035388,10.275937 3.8712648,10.265867 3.727264,10.228707 3.5854655,10.192107 3.4661518,10.135377 3.3652471,10.00014 3.3667071,10.00254 3.3681271,10.00434 3.3695071,10.00674 L 3.3605171,9.99443 C 3.3619771,9.99663 3.3636871,9.99803 3.3652371,10.00013 3.0801674,9.4959264 2.8240222,9.2739974 2.5986817,9.1411589 L 2.9072249,8.2988195 H 3.7807981 C 5.4931467,9.2571316 6.4532615,9.5111568 7.8784515,9.5329896 9.2798607,9.5544562 10.226393,9.2660042 12.103403,8.2699529 V 8.2988189 H 13.798967 V 6.6032544 H 12.103403 V 6.8445981 7.5374004 C 10.05234,8.648746 9.196452,8.9051674 7.8893353,8.8851445 6.5914304,8.8652524 5.7288717,8.6658008 3.9525776,7.6557063 V 6.6032544 H 2.2551203 V 6.8445981 8.2988195 H 2.6729779 L 2.4022951,9.0384688 C 2.1342776,8.9136137 1.9359041,8.8492007 1.652707,8.3253188 1.5315445,7.9724195 1.4227365,7.7682966 1.3072509,7.6528666 1.1884798,7.5341392 1.0473647,7.5167547 0.96936873,7.5170504 0.93037667,7.5171982 0.9066762,7.5175349 0.89791243,7.5151138 0.88914029,7.5126957 0.88974743,7.514387 0.87472488,7.4938167 0.84613462,7.454612 0.79296388,7.298654 0.74931998,7.0073402 0.95272574,6.6138546 1.0604071,6.3339721 1.0857823,6.1309273 1.1125409,5.9167445 1.0529591,5.7664562 0.99255837,5.6586487 0.93216491,5.5508413 0.88328264,5.4846038 0.8709379,5.3562573 0.85867805,5.228628 0.88593574,5.0253507 1.0266293,4.6786007 L 1.0285693,4.6748207 C 1.2747112,4.143651 1.462717,3.640868 1.70102,3.4392334 1.7906434,3.3634035 1.879695,3.3223255 1.997732,3.3242395 Z M 2.7401348,7.0878099 H 3.4679529 V 7.8137358 H 2.7401361 Z M 12.58605,7.0878099 H 13.313868 V 7.8137358 H 12.586051 Z M 1.1789675,12.197691 C 1.3845054,12.197691 1.5419316,12.355591 1.5419316,12.561127 1.5419316,12.766662 1.3845054,12.924091 1.1789675,12.924091 0.97342704,12.924091 0.81600331,12.766662 0.81600331,12.561127 0.81600331,12.355591 0.97342704,12.197691 1.1789675,12.197691 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/bounding-box-symbolic.svg b/share/icons/hicolor/symbolic/actions/bounding-box-symbolic.svg
deleted file mode 100644
index 079c04c1f..000000000
--- a/share/icons/hicolor/symbolic/actions/bounding-box-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="bounding-box">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 1.9633501,0.64414523 V 2.5040481 H 2.592481 V 13.497505 H 1.9633501 V 15.355855 H 3.8232529 V 14.66967 H 12.178303 V 15.355855 H 14.03665 V 13.76202 13.497505 H 13.381588 V 2.5040481 H 14.03665 V 0.91073334 0.64414523 H 12.178303 V 1.3614476 H 3.8232529 V 0.91073334 0.64414523 Z M 2.494455,1.1752501 H 3.292148 V 1.9729432 H 2.494455 Z M 12.709408,1.1752501 H 13.505027 V 1.9729432 H 12.755566 L 12.821955,1.7644446 12.709408,1.8707692 Z M 3.8232529,1.8925525 H 12.178303 V 2.3733458 L 3.1510759,10.913037 8.6177202,14.138565 H 3.8232529 V 13.76202 13.497505 H 3.1235859 V 2.5040481 H 3.8232529 Z M 12.585966,2.5040481 H 12.850483 V 13.497505 H 12.178303 V 14.138565 H 8.8744563 Z M 2.494455,14.02861 H 3.292148 V 14.82475 H 2.494455 Z M 12.709408,14.02861 H 13.505027 V 14.82475 H 12.709408 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/draw-star-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/draw-star-outline-symbolic.svg
deleted file mode 100644
index 5aa4591a1..000000000
--- a/share/icons/hicolor/symbolic/actions/draw-star-outline-symbolic.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   sodipodi:docname="draw-star-outline-symbolic.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata10">
-    <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>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="27.166187"
-     inkscape:cx="9.3879532"
-     inkscape:cy="7.3166036"
-     inkscape:window-width="1280"
-     inkscape:window-height="960"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid" />
-  </sodipodi:namedview>
-  <g
-     transform="matrix(1.000006,0,0,1.002537,-348.99376,-684.09339)"
-     id="draw-star-outline"
-     inkscape:label="00174">
-    <path
-       inkscape:connector-curvature="0"
-       id="rect19962"
-       d="m 349,682.36218 h 15.97919 v 15.9375 H 349 Z"
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;stroke-width:0.98073399"
-       d="M 7.9609375 0 L 5.7460938 5.4824219 L 0.37695312 6.1855469 L 4.3945312 10.181641 L 3.3417969 16.054688 L 8.0449219 13.064453 L 12.785156 15.990234 L 12.669922 15.380859 L 11.658203 10.130859 L 15.625 6.078125 L 10.244141 5.4511719 L 7.9609375 0 z M 7.9726562 2.5019531 L 9.578125 6.328125 L 13.402344 6.7714844 L 10.580078 9.65625 L 11.376953 13.787109 L 8.0351562 11.724609 L 4.7207031 13.833984 L 5.4628906 9.6914062 L 2.6015625 6.8476562 L 6.421875 6.3496094 L 7.9726562 2.5019531 z "
-       transform="matrix(0.999994,0,0,0.99746942,348.99167,682.36224)"
-       id="path822" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/ellipse-5pts-symbolic.svg b/share/icons/hicolor/symbolic/actions/ellipse-5pts-symbolic.svg
deleted file mode 100644
index 78d7a25b0..000000000
--- a/share/icons/hicolor/symbolic/actions/ellipse-5pts-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="ellipse-5pts">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 4.9445142,1.5056301 V 1.8000142 3.5663189 H 7.0052029 V 1.5056301 Z M 5.5332824,2.0943983 H 6.4164347 V 2.9775507 H 5.5332824 Z M 4.5460594,2.1697195 3.9871918,2.216291 4.0607878,3.0965701 4.6179303,3.0488475 Z M 3.3541512,2.32496 2.8165528,2.4750282 3.0528667,3.3248326 3.5910362,3.1747645 Z M 7.4720785,2.5135513 7.2225408,3.3622047 7.7595622,3.5197473 8.0085228,2.673393 Z M 2.1869623,2.7389376 1.7120383,3.0327477 2.1760377,3.7853819 2.6509617,3.4921488 Z M 8.578892,2.874631 8.2436857,3.6905136 8.761157,3.9038273 9.0969404,3.0879447 Z M 9.6420102,3.3455308 9.6241852,3.3783046 H 9.4988424 V 3.6123164 L 9.2245824,4.1240383 9.4988424,4.2706563 V 5.4389933 H 11.219149 L 11.392215,5.5815843 11.508935,5.4389933 H 11.559531 V 5.3768963 L 11.951085,4.8973733 11.559531,4.5753883 V 3.3783046 H 9.7029565 Z M 1.1847905,3.5168712 1.01345,3.7365112 0.99677612,3.7566353 0.98355242,3.7796325 0.84613412,4.0067443 1.6022184,4.4644203 1.7281382,4.2580063 1.8810796,4.0579163 Z M 10.08761,3.9670728 H 10.970762 V 4.8502253 H 10.08761 Z M 0.59659912,4.6708333 0.52070412,5.1957823 1.395231,5.3239983 1.4699751,4.7956023 Z M 12.369087,5.2711033 11.752146,5.9018413 12.123576,6.2669483 12.742242,5.6373583 Z M 1.4170802,5.7023283 0.55175012,5.8811433 0.65811912,6.4020653 1.524024,6.2232503 Z M 13.125745,6.0507593 12.449583,6.6176783 12.785364,7.0190093 12.80779,7.0000333 V 7.1006533 8.8669583 H 14.818454 L 13.992801,9.1170693 14.142292,9.6172933 14.988072,9.3597073 14.839155,8.8669583 H 14.868479 V 6.8062693 H 13.038926 L 13.46268,6.4503643 Z M 1.6637417,6.6383793 0.85705812,6.9994593 1.0761215,7.4870323 1.8828047,7.1259523 Z M 13.396558,7.3950373 H 14.27971 V 8.2781893 H 13.396558 Z M 2.107617,7.5353293 1.3630313,8.0102533 1.649941,8.4604543 1.7701115,8.3839823 V 8.5536013 10.319905 H 3.6882065 L 3.4743187,10.55679 3.8693233,10.914996 4.4609647,10.258959 4.0659601,9.9013263 3.8308002,10.161788 V 8.2592163 H 1.9656002 L 2.3945267,7.9855303 Z M 2.3588797,8.8479853 H 3.242032 V 9.7311373 H 2.3588797 Z M 15.105941,9.9674483 14.225662,10.032995 14.263611,10.554491 15.145038,10.487221 Z M 4.8467698,10.583814 4.300549,11.276653 4.7202759,11.606684 5.2664968,10.913848 Z M 14.24061,10.941444 14.122168,11.447994 14.983471,11.648658 15.099614,11.14096 Z M 5.6752992,11.212831 5.1699005,11.93844 5.3889635,12.091385 5.3924137,12.093684 5.3958639,12.096557 5.6137788,12.240299 6.1053767,11.507789 5.8943622,11.365772 5.890912,11.363473 5.8874618,11.360597 Z M 6.5176293,11.7671 6.0829535,12.535834 6.5371793,12.791695 6.9735802,12.024112 Z M 13.969801,11.794125 13.845032,11.998813 13.714514,12.168428 H 11.908538 V 12.462812 14.229117 H 13.969226 V 12.395542 L 14.402177,12.723274 14.560294,12.51571 14.574669,12.499036 14.583868,12.481211 14.72071,12.259275 Z M 7.4025067,12.244326 7.0362516,13.047556 7.5129007,13.263169 7.8768566,12.459365 Z M 8.3213059,12.637603 8.0361213,13.471884 8.5305954,13.642651 8.816931,12.80607 Z M 12.497306,12.757196 H 13.380458 V 13.640349 H 12.497306 Z M 9.2711539,12.935437 9.0785414,13.79674 9.5885383,13.909436 9.7811538,13.048133 Z M 10.238826,13.122303 10.160632,14.001431 10.680403,14.046852 10.7586,13.167724 Z M 11.729723,13.135527 11.20995,13.174624 11.274346,14.056628 11.795268,14.015803 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/experimental-symbolic.svg b/share/icons/hicolor/symbolic/actions/experimental-symbolic.svg
deleted file mode 100644
index acb8bdd30..000000000
--- a/share/icons/hicolor/symbolic/actions/experimental-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="experimental">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 12.865776,1.9421503 12.722086,2.2334771 12.401475,2.2805022 12.634745,2.5059763 12.579449,2.8255164 12.865459,2.6747469 13.154086,2.8257553 13.09761,2.5055706 13.331397,2.2802595 13.009157,2.2322816 Z M 14.141831,3.2176071 13.998141,3.5089339 13.675967,3.5548929 13.908171,3.7819301 13.853941,4.0999071 14.141515,3.9502036 14.427512,4.1017089 14.373664,3.7810271 14.605888,3.5546498 14.285211,3.507738 Z M 13.279269,3.2500419 C 12.597928,2.9513393 11.807188,2.9403132 11.118502,3.2216652 10.672939,3.4036929 10.292148,3.7119567 9.9969017,4.0873731 10.172224,4.1760412 10.335792,4.2814819 10.489525,4.4026744 10.719322,4.1256821 11.007219,3.8952072 11.337475,3.7602868 11.875299,3.540567 12.514376,3.5496181 13.046464,3.7828867 Z M 13.006516,4.0899935 12.862826,4.3813203 12.542216,4.4283454 12.77442,4.6553827 12.719123,4.9749227 13.006199,4.82259 13.293761,4.9751617 13.239913,4.6544798 13.472137,4.4281027 13.150394,4.3827539 Z M 10.056575,4.4028684 C 9.7660629,4.2193191 9.4407817,4.08667 9.1027973,3.9746373 L 8.5495834,4.7859408 A 4.9395721,4.9395721 0 0 0 2.5914544,6.5650853 4.9395721,4.9395721 0 0 0 3.8898584,13.429738 4.9395721,4.9395721 0 0 0 10.75451,12.131333 4.9395721,4.9395721 0 0 0 10.25241,5.9493601 L 10.806691,5.1364929 C 10.603533,4.8213448 10.347087,4.5864177 10.056575,4.4028684 Z M 4.5084694,5.6142863 C 4.7646089,5.85715 4.9319131,6.0112118 5.127561,6.2310879 5.224888,6.3416568 5.200206,6.4514131 5.1067289,6.5168775 4.647845,6.7157031 4.1269256,7.2149297 4.0065918,7.2872991 3.9130661,7.3527973 3.8055168,7.3579109 3.7640028,7.3005052 3.5805179,7.0942296 3.3932157,6.8166167 3.2715375,6.6189055 3.2161657,6.536148 3.2291428,6.4331426 3.3072191,6.3684316 3.5527204,6.0940376 4.0813532,5.7080592 4.2282925,5.6087315 4.3064187,5.5439794 4.4518687,5.5563368 4.5084694,5.6142863 Z M 3.1782224,7.0109935 A 0.25177074,0.41801359 34.289404 0 1 3.1938545,7.0216528 0.25177074,0.41801359 34.289404 0 1 3.167258,7.5073251 0.25177074,0.41801359 34.289404 0 1 2.7237828,7.7110261 0.25177074,0.41801359 34.289404 0 1 2.7514455,7.2237898 0.25177074,0.41801359 34.289404 0 1 3.1782224,7.0109935 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/hatches-symbolic.svg b/share/icons/hicolor/symbolic/actions/hatches-symbolic.svg
deleted file mode 100644
index 7edd30fda..000000000
--- a/share/icons/hicolor/symbolic/actions/hatches-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="hatches">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 5.9658851,2.133748 C 5.819022,2.1338088 5.687937,2.2044414 5.5903636,2.2955329 5.4927994,2.3866056 5.4164874,2.5017095 5.344268,2.6350508 5.1998224,2.9017451 5.0749908,3.2514902 4.9514285,3.6613585 4.7042946,4.4811138 4.4656075,5.5371902 4.1830651,6.5361114 4.1471363,6.6631387 4.1095905,6.7857163 4.0727773,6.9107229 L 5.2791001,7.2484209 C 5.4863991,6.4425046 5.6491802,5.6419644 5.7749358,4.9756872 5.8289598,4.6894605 5.8650869,4.5026785 5.9075514,4.2765961 5.9190782,4.4872901 5.9403863,4.6498939 5.9385429,4.9187209 5.9337526,5.6162906 5.8791687,6.4838539 5.7758458,7.3874182 L 6.4585311,7.5783698 C 6.6157775,6.299298 6.662344,5.013422 6.6134814,4.0268559 6.588328,3.5189451 6.5394935,3.0924027 6.4635454,2.7745055 6.4255702,2.6155628 6.3817127,2.4833251 6.317254,2.3711823 6.2527978,2.2590417 6.1401836,2.1336758 5.9658851,2.133748 Z M 3.0929545,2.5006105 C 2.923269,2.5006105 2.7696462,2.5928056 2.6727704,2.7088801 2.5758946,2.8249454 2.5153887,2.9639684 2.4658682,3.1172155 2.3668316,3.4237003 2.3182888,3.7981881 2.284943,4.1663082 2.2182116,4.9030268 2.216128,5.6269283 2.216128,5.6269283 2.2137035,5.8930253 2.5871017,5.9551343 2.6709481,5.70258 2.6709481,5.70258 2.7663959,5.4115909 2.8172371,5.2600635 2.8054701,5.5017281 2.7947391,5.7331352 2.781236,5.981032 L 1.9723121,5.757724 1.9098764,5.9828544 1.5375445,7.3322743 2.6627464,7.6430828 C 2.5797541,8.7415585 2.5042493,9.9305141 2.5725113,10.733854 2.5901048,10.940906 2.6210775,11.103273 2.6777849,11.240171 2.7344898,11.377075 2.833083,11.508996 2.9895057,11.551892 3.1459167,11.594786 3.2905724,11.5321 3.4010306,11.452085 3.5114866,11.372073 3.6092443,11.264832 3.7095595,11.129883 4.1108387,10.590103 4.5561599,9.5973546 4.9532509,8.3863813 5.0270778,8.1612323 5.0947308,7.9310828 5.1596982,7.700049 L 3.9392493,7.3582514 C 3.7279579,8.0430297 3.5137499,8.6659791 3.334038,9.1146392 3.3275816,9.130744 3.3249356,9.1317636 3.3185423,9.1474531 3.3210483,8.7711755 3.3104432,8.4482617 3.3445194,7.9502466 3.3758072,7.4929577 3.4122237,7.0194544 3.4461482,6.5570765 L 3.5468647,6.1924914 3.471668,6.1715263 C 3.4847231,5.9784257 3.5008605,5.7735744 3.5099488,5.5959392 3.5496087,4.8209374 3.5579481,4.1027036 3.5286343,3.5683886 3.5139855,3.3012277 3.4903604,3.0817276 3.4511602,2.9103132 3.4315648,2.8246118 3.4113487,2.7510787 3.3700391,2.677891 3.3287297,2.604701 3.2371179,2.5006105 3.0929545,2.5006105 Z M 8.6583477,2.8638283 C 8.4965559,2.8637583 8.3796367,2.9649345 8.3015093,3.0670859 8.2233912,3.1692351 8.1637347,3.290618 8.1050883,3.4375954 7.9877981,3.7315385 7.8800722,4.1256964 7.7660253,4.5933289 7.5519364,5.4712126 7.3175916,6.6058808 7.0186248,7.7346852 L 8.1123801,8.0409367 C 8.1611167,7.7880792 8.2043162,7.538311 8.2600387,7.2716633 8.2273417,7.5452526 8.2065445,7.8009335 8.180285,8.0596222 L 9.6960466,8.4839081 C 9.9571339,7.4559625 10.145953,6.4519593 10.28394,5.6697662 10.330222,5.4074119 10.362877,5.2441944 10.399698,5.0394901 10.413305,5.221477 10.4341,5.3561016 10.437523,5.5854555 10.450044,6.4242485 10.389983,7.5366379 10.259787,8.6415909 L 10.952044,8.8352772 C 10.98757,8.5551709 11.020409,8.2699778 11.047291,7.9830604 11.158384,6.7973527 11.173479,5.5985409 11.105625,4.683109 11.071698,4.2253886 11.019149,3.8395233 10.938826,3.5497056 10.898673,3.4047909 10.852966,3.2835923 10.785245,3.1791938 10.717524,3.0747953 10.601279,2.9641784 10.439345,2.9640898 10.283427,2.9640011 10.149574,3.0469539 10.05334,3.1482047 9.9571083,3.2494555 9.8818863,3.3747677 9.8104363,3.5237284 9.6675263,3.8216662 9.5434506,4.2187852 9.4175947,4.6881211 9.2920584,5.1562577 9.1464484,5.7947005 9.0147288,6.3674922 9.057863,5.7865525 9.1528908,5.1338692 9.1491691,4.6621439 9.1454218,4.1866107 9.1203756,3.7877137 9.0730623,3.492737 9.0494092,3.3452509 9.0224335,3.223525 8.9787252,3.1190378 8.9568734,3.0667942 8.9310364,3.0172294 8.8853005,2.9672795 8.8395669,2.9173389 8.7567145,2.8638726 8.6583477,2.8638283 Z M 12.928096,4.6174837 C 12.839989,4.6242924 12.763919,4.6718624 12.723015,4.7122759 12.668471,4.7661598 12.637746,4.8212408 12.605893,4.8827197 12.478495,5.1286168 12.372542,5.5098201 12.265006,5.9368245 12.157467,6.3638382 12.057938,6.8264308 11.977439,7.1755039 11.845559,7.7473763 11.676688,8.3726287 11.49573,8.9874906 L 12.459147,9.2568286 12.333365,9.7066348 11.359468,9.4341068 C 11.225531,9.8708251 11.089375,10.298356 10.957512,10.682355 10.800492,11.139637 10.659421,11.505491 10.533683,11.810291 10.553145,11.614696 10.563549,11.451843 10.602953,11.186849 10.681937,10.655678 10.789742,10.001201 10.887786,9.3024011 L 10.199632,9.1096272 C 10.057125,10.156923 9.8636116,11.17641 9.7484562,11.96524 9.685145,12.398929 9.6464888,12.761416 9.6573108,13.042134 9.6627241,13.182496 9.6760548,13.301853 9.7311376,13.419022 9.7862213,13.536191 9.9323124,13.655057 10.082507,13.655091 10.345101,13.655136 10.572829,13.514645 10.787068,13.319219 11.001315,13.12378 11.207315,12.860746 11.408687,12.5545 11.811429,11.941999 12.190946,11.152703 12.48011,10.391144 12.480973,10.388869 12.48108,10.387474 12.481935,10.38522 L 12.598144,10.416208 C 12.398042,12.117759 12.1374,13.188423 12.1374,13.188423 12.048739,13.434754 12.370608,13.617893 12.537076,13.415833 12.537076,13.415833 12.566537,13.361333 12.573079,13.35203 H 12.574902 C 12.574902,13.35203 12.576718,13.347025 12.576727,13.347018 12.601992,13.310851 12.637034,13.268219 12.705698,13.117783 12.795114,12.921899 12.908053,12.616299 13.019241,12.156646 13.114673,11.762145 13.207308,11.245552 13.281742,10.597134 L 13.783047,10.730207 14.201409,9.1510978 13.408435,8.9410057 C 13.430397,8.4215845 13.440956,7.8465971 13.436235,7.206493 13.427831,6.0668735 13.386257,5.4141249 13.306806,5.0499715 13.286947,4.9589337 13.265479,4.8864624 13.231155,4.8170944 13.196831,4.747724 13.144224,4.6601747 13.019241,4.6261428 12.987997,4.6176331 12.957463,4.6152134 12.928096,4.6174837 Z M 2.2981614,6.3319438 2.9726426,6.5183384 2.786703,7.1928219 2.1117667,7.0064274 Z M 5.7161449,7.8554544 C 5.6881704,8.0663282 5.661771,8.2769942 5.6281895,8.4880102 5.4241805,9.7699661 5.1146459,11.036407 4.9085907,11.991217 4.8055571,12.468622 4.7277354,12.866531 4.7035106,13.166093 4.6914029,13.315872 4.6874595,13.437744 4.7190063,13.560299 4.7347751,13.621582 4.7609856,13.687845 4.8188106,13.748062 4.8766448,13.808285 4.9723959,13.847831 5.0548797,13.847866 5.3560117,13.847998 5.5678002,13.640949 5.802278,13.365701 6.0367557,13.090455 6.2827323,12.713963 6.5309931,12.263287 7.0275172,11.361955 7.5305699,10.166286 7.8968211,8.9460201 7.9433922,8.790841 7.9814445,8.6427553 8.0153106,8.4984916 L 6.8951232,8.1854034 C 6.5788313,9.3060389 6.2016509,10.398569 5.879752,11.222853 5.8154194,11.387592 5.7717695,11.476017 5.7129551,11.617518 5.740939,11.481036 5.7501347,11.402838 5.7835949,11.247008 5.9696511,10.380511 6.2218973,9.2352265 6.3938181,8.0450388 Z M 8.1224065,8.5285707 C 8.1059961,8.643698 8.0887456,8.7599056 8.0654402,8.8822171 7.8362988,10.084909 7.5047235,11.275533 7.2542389,12.16713 7.1290013,12.612918 7.0253144,12.982456 6.9616585,13.250401 6.9298316,13.38438 6.9061645,13.489457 6.8978578,13.58263 6.8937022,13.62922 6.8897635,13.671736 6.9046922,13.736211 6.9121635,13.768453 6.9248803,13.80922 6.9666728,13.856525 7.0084653,13.903829 7.0909071,13.942623 7.1562571,13.942658 7.3252893,13.942747 7.4087273,13.855467 7.4939527,13.769024 7.5791804,13.682581 7.6613982,13.572036 7.7505296,13.436341 7.9288042,13.164938 8.1286318,12.79242 8.3379678,12.344408 8.7566305,11.448378 9.2100554,10.25543 9.5520374,9.0389898 9.5617207,9.0045404 9.5694231,8.9704549 9.5789245,8.9359937 Z M 12.954071,9.3037685 13.630832,9.4828714 13.451274,10.159632 12.77497,9.9800741 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/mirror-symmetry-symbolic.svg b/share/icons/hicolor/symbolic/actions/mirror-symmetry-symbolic.svg
deleted file mode 100644
index 8a2996af5..000000000
--- a/share/icons/hicolor/symbolic/actions/mirror-symmetry-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="mirror-symmetry">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 7.6774834,1.2141732 V 1.2729938 1.8607267 1.9190896 H 8.3235793 V 1.8607267 1.2729938 1.2141732 Z M 7.9843462,2.2049768 C 7.8578107,2.2061487 7.7366914,2.2782129 7.6214013,2.4165399 L 5.4692696,4.8755344 1.7417952,5.5444268 C 1.4436449,5.5972266 1.348539,5.9776453 1.5867694,6.1645326 L 4.3749655,8.3704679 3.6390468,13.402444 C 3.6025257,13.651112 3.8319571,13.856533 4.0749429,13.79229 L 8.0007602,12.740845 11.924752,13.79229 C 12.168365,13.858067 12.399487,13.652048 12.362474,13.402444 L 11.624732,8.3704679 14.413383,6.1645326 C 14.651613,5.9776453 14.55605,5.5972266 14.2579,5.5444268 L 10.532251,4.8755344 8.3814869,2.4183655 C 8.2429428,2.2736208 8.1108792,2.2038024 7.9843462,2.2049768 Z M 8.0007602,3.0471347 10.085866,5.429069 C 10.137976,5.4893766 10.209014,5.5300019 10.2874,5.5444268 L 13.370601,6.0975063 11.031982,7.9464241 C 10.934361,8.0237526 10.885361,8.1473232 10.902947,8.2706137 L 11.591901,12.977033 8.1316214,12.049611 C 8.0877956,12.038069 8.0420507,12.035553 7.9971113,12.041403 7.995965,12.041393 7.9950686,12.041393 7.99392,12.041403 7.9518077,12.036638 7.9091397,12.039145 7.8680756,12.049611 L 4.4091614,12.977033 5.096751,8.2706137 C 5.1143346,8.1473232 5.0653354,8.0237526 4.9677129,7.9464241 L 2.6290933,6.0975063 5.7136631,5.5444268 C 5.7920515,5.5300019 5.8635437,5.4893766 5.9156548,5.429069 Z M 7.6774834,3.5847106 V 3.6435286 4.2308065 4.2896246 H 8.3235793 V 4.2308065 3.6435286 3.5847106 Z M 7.6774834,4.842704 V 4.9015245 5.4892552 5.5476181 H 8.3235793 V 5.4892552 4.9015245 4.842704 Z M 7.6774834,6.1006999 V 6.1595181 6.7472511 6.8056139 H 8.3235793 V 6.7472511 6.1595181 6.1006999 Z M 7.6774834,7.3591487 V 7.4175115 8.0052445 8.0636075 H 8.3235793 V 8.0052445 7.4175115 7.3591487 Z M 7.6774834,8.6171421 V 8.675505 9.263238 9.3216008 H 8.3235793 V 9.263238 8.675505 8.6171421 Z M 7.6774834,9.8751356 V 9.9334984 10.521231 10.580052 H 8.3235793 V 10.521231 9.9334984 9.8751356 Z M 7.6774834,11.133131 V 11.191495 11.779225 11.838046 H 8.3235793 V 11.779225 11.191495 11.133131 Z M 7.6774834,13.03038 V 13.088743 13.676477 13.735295 H 8.3235793 V 13.676477 13.088743 13.03038 Z M 7.6774834,14.080912 V 14.139731 14.727009 14.785827 H 8.3235793 V 14.727009 14.139731 14.080912 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/show-handles-symbolic.svg b/share/icons/hicolor/symbolic/actions/show-handles-symbolic.svg
deleted file mode 100644
index 82f23db1d..000000000
--- a/share/icons/hicolor/symbolic/actions/show-handles-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="show-handles-box">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 7.2253932,0.86545675 6.0667206,2.0241293 6.2329492,2.1903578 6.8801091,2.8375177 5.7317961,6.2395458 1.2071016,6.3677958 4.7960774,9.2681758 3.5135947,13.832824 6.3873407,11.760137 7.2268731,12.599669 7.8207601,12.005782 10.049811,13.615295 9.6892376,13.975871 9.8539862,14.140619 10.84791,15.134543 12.006583,13.975871 10.84791,12.817198 10.713248,12.951858 9.9649694,10.283309 10.799077,9.4487113 10.372406,9.0220378 12.631053,7.1994361 13.202249,7.7706314 13.641747,7.3311359 13.839052,7.5723416 C 13.673235,7.7820441 13.684572,8.0881931 13.87802,8.2816516 14.086341,8.4899903 14.428342,8.4899903 14.636656,8.2816516 14.844979,8.0733153 14.844979,7.7328322 14.636656,7.5244934 14.475726,7.3635482 14.235596,7.3287392 14.038329,7.4164701 L 13.821787,7.1510954 14.360921,6.6119588 13.202249,5.4532863 12.824411,5.8311266 12.660155,5.6170499 C 12.8285,5.4070696 12.818029,5.0976855 12.623654,4.9033001 12.519492,4.7991307 12.381453,4.7469362 12.243841,4.7469362 12.106229,4.7469362 11.96868,4.7991307 11.864523,4.9033001 11.6562,5.1116364 11.6562,5.453602 11.864523,5.6619357 12.024835,5.8222697 12.264037,5.8583743 12.460878,5.7719339 L 12.643878,6.0116596 12.247293,6.4082417 9.7420155,6.337707 8.6149118,5.2106032 8.4447359,5.3807766 7.5820219,2.8291331 8.3855457,2.0256092 Z M 7.2268731,1.528401 7.7235864,2.0256092 7.2268731,2.5223225 6.7296649,2.0256092 Z M 7.3635053,3.0476471 8.2247419,5.6007731 7.4547593,6.3707557 7.6209878,6.5364918 8.6149118,7.5309082 9.5368185,6.6089989 12.114114,6.6824961 12.208327,6.77671 12.433746,7.0021312 10.175101,8.824733 9.6404045,8.2900388 8.481732,9.4487113 8.6479605,9.6149399 9.6404045,10.607876 9.7390557,10.509223 10.488814,13.176292 10.249088,13.416017 8.0180649,11.808477 8.3855457,11.440997 7.2816235,10.336582 V 3.1295289 Z M 12.243841,4.9984989 C 12.316096,4.9984989 12.388694,5.0264436 12.444598,5.0823532 12.556412,5.1941748 12.556412,5.371556 12.444598,5.4833751 12.332787,5.5951993 12.15538,5.5951993 12.043576,5.4833751 11.931755,5.371556 11.931755,5.1941748 12.043576,5.0823532 12.099478,5.0264436 12.171589,4.9984989 12.243841,4.9984989 Z M 8.6134318,5.8735475 9.11064,6.3707557 8.6149118,6.866484 8.1177036,6.3692758 Z M 13.202249,6.1147506 13.698965,6.6119588 13.202249,7.1086746 12.705041,6.6119588 Z M 14.257338,7.6177223 C 14.32959,7.6177223 14.402188,7.6456645 14.458095,7.7015766 14.569907,7.8133957 14.569907,7.9927518 14.458095,8.1045709 14.346284,8.2163926 14.168885,8.2163926 14.057073,8.1045709 13.945262,7.9927518 13.945262,7.8133957 14.057073,7.7015766 14.11298,7.6456645 14.185086,7.6177223 14.257338,7.6177223 Z M 9.6404045,8.9519956 10.137613,9.4487113 9.6404045,9.9459195 9.1431963,9.4487113 Z M 7.2268731,10.943788 7.7235864,11.440997 7.2268731,11.93771 6.7296649,11.440997 Z M 10.84791,13.479155 11.344623,13.975871 10.84791,14.473079 10.350702,13.975871 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/sketch-symbolic.svg b/share/icons/hicolor/symbolic/actions/sketch-symbolic.svg
deleted file mode 100644
index 7359e017c..000000000
--- a/share/icons/hicolor/symbolic/actions/sketch-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="sketch">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 2.9983178,1.8112636 2.4504471,2.5195754 0.84950042,1.8590547 0.49790159,2.712437 5.1368996,4.6291358 5.9612697,5.2640524 6.8129458,7.3121733 C 6.6101399,7.2142558 6.4682324,7.0905261 6.2326386,7.0066616 L 5.9220056,7.8788205 C 6.631654,8.131429 7.0700906,8.4414933 7.4239691,8.7765767 L 7.4529813,8.846557 7.8045732,9.9320627 7.5127191,9.802347 7.1372293,10.648902 8.1868882,11.113144 8.2005481,11.157518 8.2500432,11.142156 8.4446089,11.229202 9.178525,12.988877 10.031905,12.632166 9.6734808,11.771958 15.126607,14.188736 15.502098,13.343884 9.156338,10.531133 8.9378699,10.005449 9.2348454,9.8962158 C 9.1033193,9.5372416 8.9419694,9.1800058 8.7194043,8.8363144 8.6055403,8.6604769 8.4127573,8.5120585 8.2636939,8.3481838 L 7.7004616,6.6072787 8.7040426,7.3804473 8.7825501,7.2797438 C 9.0425249,7.7898347 9.2620495,8.3075926 9.7571188,8.7902366 10.081183,9.1061643 10.465579,9.4090193 10.926253,9.6948181 L 11.414385,8.9097097 C 11.006159,8.6564469 10.675795,8.3946639 10.402276,8.1280025 9.803985,7.5447336 9.4713571,6.934924 9.2228988,6.2932284 L 8.9481126,6.4007572 8.398531,5.9757701 8.5743246,6.0491677 8.9276297,5.1940721 6.9836204,4.3918912 6.3913667,2.5588281 5.5106784,2.8421528 5.8622772,3.9276515 5.6062606,3.8235376 Z M 3.652011,8.7100159 2.8532474,9.177673 C 3.2192829,9.8042152 3.4018765,10.56177 3.670783,11.394755 3.819784,11.856338 3.9981671,12.339771 4.2613234,12.823323 L 5.0737446,12.381271 C 4.8506824,11.971393 4.6921718,11.545591 4.5514804,11.109727 4.2975703,10.323187 4.1095849,9.4932423 3.652011,8.7100159 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/spiro-symbolic.svg b/share/icons/hicolor/symbolic/actions/spiro-symbolic.svg
deleted file mode 100644
index 647c0a857..000000000
--- a/share/icons/hicolor/symbolic/actions/spiro-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="spiro">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 5.4766262,3.6187514 C 5.0974993,3.6090051 4.7205981,3.6720146 4.3671545,3.7904285 3.8968317,3.9479995 3.4712055,4.2005761 3.0974817,4.5051373 2.4545653,5.0290712 1.9626863,5.7067498 1.6088502,6.4362722 1.2372064,7.2024932 1.0106116,8.0362975 0.93545597,8.8824358 0.87069076,9.6115232 0.91783396,10.401686 1.2843167,11.103217 1.4681985,11.455173 1.7310667,11.776395 2.0701739,12.010717 2.4108112,12.246085 2.8211162,12.387733 3.2498775,12.382069 3.5972388,12.377482 3.926273,12.275672 4.2161336,12.126851 4.5049036,11.978585 4.7540583,11.785523 4.9762864,11.580146 5.3867747,11.200807 5.7045959,10.80725 6.0779554,10.595072 6.3599521,10.434815 6.6975199,10.367492 7.022178,10.393559 V 10.96872 H 8.6668763 V 9.3226451 H 7.022178 V 9.5585844 9.6816047 C 6.573522,9.65614 6.1211197,9.7594795 5.7290924,9.9822692 5.1968387,10.284743 4.8520393,10.733829 4.4975192,11.061444 4.3062812,11.238178 4.1055131,11.39185 3.893438,11.500734 3.6824533,11.609063 3.4567586,11.672778 3.2411558,11.675624 2.9767623,11.679116 2.7005965,11.588294 2.4709065,11.429586 2.2397146,11.269831 2.0461781,11.039314 1.9090564,10.776848 1.6335746,10.249525 1.5803231,9.5967779 1.638228,8.9448625 1.7059428,8.1825121 1.9106099,7.4300775 2.2436865,6.7433622 2.5602856,6.0906101 2.9952022,5.4984186 3.5431976,5.0518402 3.8613339,4.7925819 4.2152076,4.5842718 4.5911617,4.4583161 4.9661804,4.3326753 5.3676368,4.2890457 5.7447002,4.3490682 6.1719245,4.4170743 6.5882414,4.6205476 6.9505689,4.9008193 7.3141749,5.1820827 7.6296859,5.5407791 7.9186604,5.9313399 8.5239473,6.7493788 8.9960139,7.6826259 9.4903748,8.6221669 9.6855823,8.9931738 9.8902213,9.3772902 10.153211,9.7412793 10.416764,10.106032 10.741896,10.450524 11.150681,10.700649 11.55633,10.948861 12.027428,11.089917 12.509406,11.091282 12.992246,11.09265 13.472806,10.952786 13.876394,10.676319 14.218931,10.441663 14.486596,10.122342 14.677857,9.7706571 14.868651,9.4198622 14.983594,9.03972 15.043705,8.6602664 15.106372,8.2647137 15.113862,7.8410523 15.002391,7.4250198 14.889972,7.0053844 14.654454,6.6035237 14.278962,6.3320725 14.024125,6.1478452 13.721341,6.0379227 13.407726,6.0148835 13.25279,6.0035013 13.097898,6.0135368 12.946861,6.0442613 V 5.7614983 H 11.30216 V 5.9974401 7.4080347 H 12.946861 V 6.7736567 C 13.077437,6.727101 13.218895,6.7071358 13.355854,6.7171972 13.536744,6.7304853 13.718835,6.796837 13.865837,6.9031025 14.083083,7.0601564 14.245258,7.3222303 14.32211,7.6090896 14.399933,7.8995495 14.398225,8.2241652 14.34644,8.5510161 14.296615,8.8655141 14.203541,9.1677557 14.058629,9.4341869 13.914221,9.6997273 13.715973,9.9309309 13.478875,10.093352 13.200951,10.283737 12.854003,10.387646 12.510783,10.386673 12.1667,10.385697 11.81733,10.281798 11.518364,10.098861 11.214849,9.9131514 10.951118,9.6407084 10.725621,9.3286123 10.499564,9.0157477 10.308738,8.6605673 10.115112,8.2925827 9.624554,7.360264 9.1388396,6.3940762 8.4860193,5.5117867 8.173881,5.0899256 7.816449,4.6811059 7.3806793,4.3440175 6.9436123,4.0059373 6.4266257,3.7445074 5.8557837,3.6536382 5.7297011,3.6335673 5.6030027,3.6220018 5.4766262,3.6187514 Z M 11.772205,6.2315439 H 12.476815 V 6.937531 H 11.772205 Z M 7.4926817,9.7926905 H 8.1986689 V 10.498675 H 7.4926817 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/transform-2pts-symbolic.svg b/share/icons/hicolor/symbolic/actions/transform-2pts-symbolic.svg
deleted file mode 100644
index 13f2c55b3..000000000
--- a/share/icons/hicolor/symbolic/actions/transform-2pts-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="transform-2ptss">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 6.0991601,1.350335 C 5.9183483,1.3444197 5.7369831,1.3530801 5.5566744,1.3767265 4.8354247,1.4712825 4.1529272,1.8035743 3.6301198,2.3136127 3.1072666,2.8236411 2.7554875,3.499445 2.6380084,4.2215962 2.568502,4.6488668 2.5877724,5.0851582 2.6800391,5.5054776 H 2.3667662 C 2.0938533,5.5054776 1.8658216,5.7330093 1.8658216,6.0059322 V 7.549815 C 1.8658216,7.8227354 2.0938533,8.0507576 2.3667662,8.0507576 H 3.8832798 C 4.156202,8.0507576 4.3837336,7.8227454 4.3837336,7.549815 V 7.3851128 L 4.5606525,7.1231573 4.3837336,7.003909 V 6.0059322 C 4.3837336,5.7329993 4.156202,5.5054776 3.8832798,5.5054776 H 3.3681636 C 3.2634015,5.1234956 3.2342673,4.7191007 3.2977878,4.3286259 3.3918129,3.7506082 3.677625,3.1991047 4.0953871,2.7915844 4.5131388,2.3840267 5.0696322,2.1132332 5.6436684,2.0379698 6.2176853,1.9626889 6.8198073,2.0808613 7.322439,2.3668836 7.7994999,2.6382927 8.1877851,3.076063 8.321882,3.5769654 8.3937973,3.8457171 8.3996627,4.1534092 8.3863956,4.4781768 8.3731911,4.8033872 8.3413672,5.1526496 8.369778,5.523559 8.3984616,5.896738 8.4921742,6.294607 8.7338787,6.6358971 8.855189,6.8072753 9.0115711,6.9595086 9.2030551,7.0698864 9.3956075,7.1808772 9.6177318,7.2453834 9.8511038,7.2414297 10.084806,7.2374562 10.296749,7.1664441 10.479117,7.0718407 10.660302,6.9778053 10.813266,6.8619199 10.950247,6.7522153 11.22282,6.5339094 11.453374,6.3408491 11.677958,6.2757074 11.87195,6.2194263 12.099404,6.2504869 12.261987,6.3568361 12.42279,6.4619916 12.540695,6.6590182 12.553754,6.8480048 12.563553,6.9896485 12.522954,7.1548286 12.44477,7.3137605 12.365553,7.4747167 12.249005,7.6344493 12.11781,7.8049293 11.986514,7.9757294 11.837619,8.1596165 11.711191,8.3777146 11.584045,8.597164 11.479355,8.8524184 11.459988,9.1406152 11.429383,9.5965744 11.618805,10.000157 11.840704,10.320887 12.059891,10.637662 12.30998,10.885613 12.498041,11.137056 12.651198,11.341809 12.780049,11.565926 12.882668,11.802213 H 12.5518 C 12.278877,11.802213 12.051345,12.029735 12.051345,12.302667 12.044404,12.81591 12.051345,13.222355 12.051345,13.847038 12.051345,14.119961 12.278877,14.347493 12.5518,14.347493 H 14.070269 C 14.343192,14.347493 14.56877,14.119951 14.56877,13.847038 V 12.302667 C 14.56877,12.029754 14.343192,11.802213 14.070269,11.802213 H 13.593761 C 13.45973,11.422397 13.273843,11.061272 13.032217,10.738256 12.806449,10.436394 12.563156,10.191783 12.389055,9.9401691 12.217704,9.6925095 12.111162,9.4219431 12.127096,9.1846002 12.13716,9.0348417 12.196502,8.8722489 12.289354,8.7120033 12.382984,8.5504791 12.510212,8.3883443 12.646123,8.2115486 12.782349,8.0345328 12.928345,7.8403539 13.042969,7.6074848 13.158528,7.3725513 13.240833,7.0980145 13.220377,6.8020656 13.191909,6.3900512 12.967017,6.0206857 12.627551,5.7987115 12.289875,5.5778158 11.872803,5.5239519 11.491755,5.6344998 11.073291,5.7558851 10.78487,6.0294111 10.532876,6.2312345 10.407557,6.3316057 10.289257,6.4180292 10.172686,6.4785291 10.057333,6.538366 9.9407331,6.573105 9.8403516,6.5748066 9.7408612,6.5765007 9.6312666,6.5469938 9.535387,6.4917237 9.4384689,6.4358579 9.350504,6.3511034 9.2788064,6.2498038 9.1344101,6.0459211 9.057688,5.7683639 9.0349323,5.4722424 9.012074,5.1739088 9.0394614,4.8500021 9.0535042,4.5040778 9.0676521,4.1577656 9.0678497,3.7836757 8.9665127,3.4049341 8.7758594,2.6927647 8.2584518,2.1321604 7.6513527,1.7867666 7.1773947,1.5170591 6.6415979,1.3680812 6.0991601,1.350335 Z M 2.3667662,6.0059322 H 3.8832798 V 7.549815 H 2.3667662 Z M 5.0112563,7.4266555 4.7317078,7.8415825 5.1823117,8.1455712 5.461864,7.7306418 Z M 5.9124679,8.03414 5.6329165,8.4490694 6.0835209,8.7530556 6.3635603,8.3381287 Z M 6.8141646,8.6416269 6.5346132,9.0565539 6.9852201,9.3605402 7.2647691,8.945613 Z M 7.715376,9.2491113 7.4358245,9.6645289 7.8864289,9.9680272 8.1664683,9.5531003 Z M 8.6170727,9.8570862 8.3375212,10.272012 8.7881256,10.575511 9.067677,10.160585 Z M 9.5182815,10.46457 9.2387325,10.8795 9.6893368,11.182998 9.9693764,10.768068 Z M 10.41998,11.072057 10.140429,11.486984 10.591034,11.790483 10.870585,11.375555 Z M 11.321189,11.679541 11.041638,12.094471 11.492243,12.397969 11.772285,11.98304 Z M 12.5518,12.302667 H 14.070269 V 13.847038 H 12.5518 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/vonkoch-symbolic.svg b/share/icons/hicolor/symbolic/actions/vonkoch-symbolic.svg
deleted file mode 100644
index 4d5c193cd..000000000
--- a/share/icons/hicolor/symbolic/actions/vonkoch-symbolic.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>LiveEffect Icons proposal</dc:title>
-        <dc:date>13 Jan 2019</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Ramón Miranda</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>see the license tab</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon ui</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>This is a contribution with Inkscape Project from
-Ramon Miranda www.ramonmiranda.com (design and SVG file)
-Jabiertxo (SVG stuff to integrate them in UI)</dc:description>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title></dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier></dc:identifier>
-        <dc:source />
-        <dc:relation />
-        <dc:language>-</dc:language>
-        <dc:coverage />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ramon Miranda
-Jabier Arraiza</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="vonkoch-box">
-        <path 
-            id="rect22048" 
-            d="M 0,0 H 16 V 16 H 0 Z" 
-            style="opacity:0;fill:none" />
-        <path
-           id="path9609"
-           d="M 10.030842,2.1816327 A 0.24548906,0.25069076 89.999999 0 0 9.8268766,2.3042047 L 8.5745091,4.4276587 A 0.24548906,0.25069076 89.999999 0 0 8.7920401,4.7958585 H 11.295806 A 0.24548906,0.25069076 89.999999 0 0 11.513818,4.4276587 L 10.26145,2.3042047 A 0.24548906,0.25069076 89.999999 0 0 10.030842,2.1816327 Z M 10.043922,2.9180345 10.8622,4.3046005 H 9.2256427 Z M 5.9854752,4.8007029 A 0.24968278,0.2464817 0 0 0 5.7824802,4.9237611 L 0.79529574,13.449064 A 0.24968278,0.2464817 0 0 0 1.0123405,13.818717 H 10.984288 A 0.24968278,0.2464817 0 0 0 11.200847,13.449064 L 6.2151156,4.9237611 A 0.24968278,0.2464817 0 0 0 5.9854752,4.8007029 Z M 5.9980713,5.5395281 10.55262,13.326006 H 1.444009 Z M 8.4703471,5.8704233 A 0.24555359,0.25062371 89.999999 0 0 8.253786,6.2386255 L 10.822472,10.598414 A 0.24555359,0.25062371 89.999999 0 0 11.256562,10.598897 L 13.825731,6.2391092 A 0.24555359,0.25062371 89.999999 0 0 13.81895,5.9823366 0.24555359,0.25062371 89.999999 0 0 13.608687,5.8709096 Z M 8.9044364,6.3616812 H 13.174598 L 11.040003,9.985068 Z M 13.722056,8.617396 A 0.24548906,0.25069076 89.999999 0 0 13.72157,8.6178797 0.24548906,0.25069076 89.999999 0 0 13.517608,8.7404517 L 12.265239,10.863422 A 0.24548906,0.25069076 89.999999 0 0 12.482768,11.231621 H 14.986534 A 0.24548906,0.25069076 89.999999 0 0 15.204549,10.863422 L 13.95218,8.7404517 A 0.24548906,0.25069076 89.999999 0 0 13.722056,8.617396 Z M 13.734166,9.3537977 14.552928,10.740849 H 12.916374 Z"
-           style="opacity:1;" />
-    </g>
-</svg>
diff --git a/share/ui/toolbar-commands.ui b/share/ui/commands-toolbar.ui
index c2b1ed965..c2b1ed965 100644
--- a/share/ui/toolbar-commands.ui
+++ b/share/ui/commands-toolbar.ui
diff --git a/share/ui/dialog-livepatheffect-add-effect.ui b/share/ui/dialog-livepatheffect-add-effect.ui
deleted file mode 100644
index b423a32f4..000000000
--- a/share/ui/dialog-livepatheffect-add-effect.ui
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkBox" id="LPESelectorEffect">
-    <property name="width_request">200</property>
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="double_buffered">False</property>
-    <property name="halign">center</property>
-    <property name="hexpand">False</property>
-    <property name="orientation">vertical</property>
-    <property name="baseline_position">top</property>
-    <child>
-      <object class="GtkImage" id="LPEIcon">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">center</property>
-        <property name="valign">start</property>
-        <property name="pixel_size">80</property>
-        <property name="icon_name">align-vertical-baseline</property>
-        <property name="icon_size">6</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="LPEName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">LPEName</property>
-        <property name="justify">center</property>
-        <style>
-          <class name="lpename"/>
-        </style>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="LPEDescription">
-        <property name="width_request">200</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Description</property>
-        <property name="justify">center</property>
-        <property name="wrap">True</property>
-        <property name="max_width_chars">20</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="padding">10</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButtonBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="layout_style">start</property>
-        <child>
-          <object class="GtkImage">
-            <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="pixel_size">30</property>
-            <property name="icon_name">draw-star-outline</property>
-            <property name="icon_size">2</property>
-            <style>
-              <class name="fab"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-            <property name="non_homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkImage">
-            <property name="can_focus">False</property>
-            <property name="pixel_size">30</property>
-            <property name="icon_name">on</property>
-            <property name="icon_size">2</property>
-            <style>
-              <class name="apply"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-            <property name="non_homogeneous">True</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="pack_type">end</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <style>
-      <class name="lpeselectoreffect"/>
-    </style>
-  </object>
-</interface>
diff --git a/share/ui/dialog-livepatheffect-add.ui b/share/ui/dialog-livepatheffect-add.ui
deleted file mode 100644
index 3bee689a5..000000000
--- a/share/ui/dialog-livepatheffect-add.ui
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkDialog" id="LPEDialogSelector">
-    <property name="name">LPEDialogSelector</property>
-    <property name="height_request">500</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Live Path Effect Selector</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="gravity">center</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="LPESelector">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <property name="orientation">vertical</property>
-            <property name="baseline_position">top</property>
-            <child>
-              <object class="GtkSearchBar">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="search_mode_enabled">True</property>
-                <child>
-                  <object class="GtkSearchEntry" id="LPEFilter">
-                    <property name="width_request">400</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="primary_icon_name">edit-find-symbolic</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="primary_icon_sensitive">False</property>
-                    <style>
-                      <class name="iconymbolic"/>
-                    </style>
-                  </object>
-                </child>
-                <style>
-                  <class name="searchbar"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LPEInfo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Message</property>
-                <property name="justify">center</property>
-                <property name="ellipsize">end</property>
-                <style>
-                  <class name="lpeinfo"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">in</property>
-                <property name="min_content_width">800</property>
-                <property name="min_content_height">10</property>
-                <property name="propagate_natural_height">True</property>
-                <child>
-                  <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkFlowBox" id="LPESelectorFlowBox">
-                        <property name="name">lpeflow</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="column_spacing">10</property>
-                        <property name="row_spacing">10</property>
-                        <property name="min_children_per_line">3</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <style>
-      <class name="iconsymbolic"/>
-      <class name="colordefault"/>
-    </style>
-  </object>
-</interface>
diff --git a/share/ui/filter-editor.glade b/share/ui/filter-editor.glade
new file mode 100644
index 000000000..908e0d7e3
--- /dev/null
+++ b/share/ui/filter-editor.glade
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkListStore" id="FilterStore">
+    <columns>
+      <!-- column-name Effect -->
+      <column type="gchararray"/>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name gboolean1 -->
+      <column type="gboolean"/>
+      <!-- column-name Origin -->
+      <column type="GObject"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">test1</col>
+        <col id="1" translatable="yes">a</col>
+        <col id="2">False</col>
+        <col id="3"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">test2</col>
+        <col id="1" translatable="yes">b</col>
+        <col id="2">False</col>
+        <col id="3"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">test3</col>
+        <col id="1" translatable="yes">c</col>
+        <col id="2">False</col>
+        <col id="3"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes"/>
+        <col id="1" translatable="yes"/>
+        <col id="2">False</col>
+        <col id="3"/>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="FilterStore1">
+    <columns>
+      <!-- column-name origin_name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">whatever</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">second choice</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkBox" id="FilterEditor">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkComboBoxText" id="FilterList">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <items>
+              <item translatable="yes">filter1</item>
+              <item translatable="yes">filter2</item>
+            </items>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">FER: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">X: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="FilterFERX">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="input_purpose">number</property>
+            <property name="orientation">vertical</property>
+            <property name="value">-0.10000000000000001</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Y: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="FilterFERY">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">W: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="FilterFERW">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">H: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">8</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="FilterFERH">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="orientation">vertical</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">9</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkPaned">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkTreeView" id="FilterPrimitiveList">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">FilterStore</property>
+                <property name="headers_clickable">False</property>
+                <property name="reorderable">True</property>
+                <property name="fixed_height_mode">True</property>
+                <property name="enable_tree_lines">True</property>
+                <property name="activate_on_single_click">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="sizing">fixed</property>
+                    <property name="title" translatable="yes">Effect</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext4"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="sizing">fixed</property>
+                    <property name="title" translatable="yes">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext44"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="sizing">fixed</property>
+                    <property name="title" translatable="yes">Origin(s)</property>
+                    <property name="expand">True</property>
+                    <child>
+                      <object class="GtkCellRendererCombo" id="cellrenderertext45">
+                        <property name="model">FilterStore1</property>
+                        <property name="text_column">0</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkComboBox" id="FilterPrimitiveDropDown">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="FilterPrimitiveAdd">
+                    <property name="label" translatable="yes">Add</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkDrawingArea" id="FilterPreview">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkImage" id="FilterPrimitiveDescImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-dialog-info</property>
+                    <property name="icon_size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="FilterPrimitiveDescText">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">This effect does this and that.</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkComboBox" id="OptionList">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="model">FilterStore1</property>
+    <property name="active">0</property>
+    <property name="id_column">0</property>
+  </object>
+</interface>
diff --git a/share/ui/toolbar-select.ui b/share/ui/select-toolbar.ui
index 1c8c1efc3..1c8c1efc3 100644
--- a/share/ui/toolbar-select.ui
+++ b/share/ui/select-toolbar.ui
diff --git a/share/ui/toolbar-snap.ui b/share/ui/snap-toolbar.ui
index 90fa6bd61..90fa6bd61 100644
--- a/share/ui/toolbar-snap.ui
+++ b/share/ui/snap-toolbar.ui
diff --git a/share/ui/style.css b/share/ui/style.css
index 8063477bf..6ba305608 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -29,301 +29,269 @@
 /* Our own custom shades... better not to use.
  * Lightest to darkest based on linear rgb.
  */
-@define-color bg_color0  #ffffff; /* White */
-@define-color bg_color05 #f8f8f8; /* Slightly off white */
-@define-color bg_color1  #f0f0f0;
-@define-color bg_color2  #e0e0e0;
-@define-color bg_color3  #d0d0d0;
-@define-color bg_color4  #bbbbbb; /* 50% Gray */
-@define-color bg_color5  #a5a5a5;
-@define-color bg_color6  #898989;
-@define-color bg_color7  #636363;
-@define-color bg_color8  #000000; /* Black */
-
- /* Inkscape CSS helper
-  * to add a class to a widget do some thing like
-  * widget->get_style_context()->add_class("mycoolclass");
-  * we define a bunch of helper CSS styles
-  * Ecah Inkscape desktop has a class in top level window
-  * call "dark" so you can style using 2 clases with or without 
-  * "dark" by this way you can always know if the UI is in dark mode
-  * Also added some helper clases:
-  * ::::::: Color based 
-  * ::::::: apply to colors
-  * ::::::: scope widget and all his childs
-  * ".colordefault" use default window color
-  * ".colorinverse" invert window colors
-  * ".colorbright" force bright colors no matter the UI is dark or bright
-  * ".colordark" same but dark
-  * ::::::: Background based 
-  * ::::::: apply to backgrounds
-  * ::::::: scope widget and all his childs
-  * ".backgrounddefault" use default window color
-  * ".backgroundinverse" invert window colors
-  * ".backgroundbright" force bright colors no matter the UI is dark or bright
-  * ".backgrounddark" same but dark
-  * :::::::: Icon Based.
-  * :::::::: apply to color (foreground)
-  * :::::::: scope widget and all nested images
-  * ".iconsymbolic" Force icon symbolic
-  * ".iconregular" Force colorfull icons
-  * ".iconcolordefault" Theme color default
-  * ".iconcolorinverse" Inverse color from theme
-  * ".iconcolorbright, Force clear icon
-  * ".iconcolordark" Force dark icon
-  * ".iconcolornamed" Icon in prefs selected color;
-  * ".iconcolornamedinverse" Icon in inverse color from prefs"
-  * :::::::: Combo box.
-  * "..combobright" Combo bright
-  */
-
-.colordefault, 
-.colordefault *{ 
-    color: @theme_fg_color; 
-}
-
-.colorinverse, 
-.colorinverse *{ 
-    color: @theme_bg_color; 
-}
-.colorbright,
-.colorbright *{
-    color: @theme_fg_color; 
-}
-.dark .colorbright, 
-.dark .colorbright *{
-    color: @theme_bg_color; 
-}
-.colordark, 
-.colordark *{
-    color: @theme_bg_color; 
-}
-.dark .colordark,
-.dark .colordark *{
-    color: @theme_fg_color;
-}
-.backgrounddefault, 
-.backgrounddefault *{ 
-    background-color: @theme_bg_color; 
-    background-image:image(@theme_bg_color);
-}
-.backgroundinverse, 
-.backgroundinverse *{ 
-    background-color: @theme_fg_color; 
-    background-image:image(@theme_fg_color);
-}
-.backgroundbright,
-.backgroundbright *{
-    background-color: @theme_bg_color;
-    background-image:image(@theme_bg_color);
-}
-.dark .backgroundbright, 
-.dark .backgroundbright *{
-    background-color: @theme_fg_color;
-    background-image:image(@theme_fg_color);
-}
-.backgrounddark, 
-.backgrounddark *{
-    background-color: @theme_fg_color;
-    background-image:image(@theme_fg_color);
-}
-.dark .backgrounddark,
-.dark .backgrounddark *{
-    background-color: @theme_bg_color;
-    background-image:image(@theme_bg_color);
-}
-.iconsymbolic,
-.iconsymbolic image{
-    -gtk-icon-style: symbolic;
-}
-.iconregular,
-.iconregular image{
-    -gtk-icon-style: regular;
-}
-
-.combobright *{
-    color: @theme_fg_color; 
-    background-color: @theme_bg_color;
-    background-image:image(@theme_bg_color);
-    border-radius:4px;
-}
-.dark .combobright *{
-    color: @theme_bg_color; 
-    background-color: @theme_fg_color;
-    background-image:image(@theme_fg_color);
-    border-radius:4px;
-}
-
-
-/* 'GtkWidget' for Gtk  <= 3.18   */
-/* 'widget'    for Gtk  <= 3.19.2 */   
-GtkWidget, widget {
-/*    font-size: 12pt; */
-}
-
-GtkSpinButton {
-    padding: 0;
-    outline-style : none;
-}
-
-spinbutton {
-    padding: 0;
-    outline-style : none;
-}
-
-GtkSpinButton entry {
-    padding-left: 2px;
-    padding-right:0;
-}
-
-spinbutton entry {
-    padding-left: 2px;
-    padding-right:0;
-}
-
-GtkSpinButton undershoot {
-	outline-style : none;
-}
-
-spinbutton undershoot {
-	outline-style : none;
-}
-
-.lpeinfo{
-    font-size:16px;
-    padding:20px;
-}
-#lpedialogselector,
-#lpedialogselector .frame,
-#lpedialogselector .searchbar {
-    border-bottom-width:0;
-    border-top-width:0;
-    outline-width:0;
-    border-left-width:0;
-    border-right-width:0;
-}
-
-#lpeflow GtkFlowBoxChild,
-#lpeflow flowboxchild{
-    border-width:0px;
-    border-radius:6px;
-    margin:10px;
-    margin-bottom:30px;
-    padding-bottom:10px;
-}
-
-#lpeflow GtkFlowBoxChild.lpeactive,
-#lpeflow flowboxchild.lpeactive{
-    margin-bottom:0px;
-    padding-bottom:10px;
-    outline:none;
-}
-
-
-#LPEDialogSelector .frame{
-    border-width:0;
-}
-
-SPRuler {
-    background-color: @theme_bg_color;
-    color:            @theme_fg_color;
-}
-
-ruler-widget {
-    background-color: @theme_bg_color;
-    color:            @theme_fg_color;
-}
-
-/* The actual canvas (Inkscape's drawing area). */
-SPCanvas {
-    background-color: white;
-}
-
-combobox window.popup scrolledwindow treeview separator {
-}
-
-#font_selector_family {
-}
-
-#TextFontFamilyAction_combobox {
-    -GtkComboBox-appears-as-list: true;
-}
-
-#LockGuides,
-#StickyZoom,
-#CMS_Adjust {
-    padding: 0;
-}
-
-/* Keep palette scrollbar from generating warnings. */
-#PreviewHolderScroller .vertical slider {
-    min-height: 15px;
-}
-
-/* Override minimum size of container children for palette. */
-#ColorItemPreview {
-  min-height: 5px;
-  min-width:  5px;
-}
-
-/* Reduce width of Fill and Stroke dialog */
-#ColorModeButton {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-/* Reduce width of +/- buttons. */
-.up, .down {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-/* InkSpinScale */
-#InkSpinScale {
-  background : @theme_bg_color;
-  border : 1px black;
-  border-radius: 3px;
-  padding: 0px;
-}
-
-#InkSpinScale spinbutton {
-  border-color: #eee;
-  border-width: 0 0 0 0;
-  border-radius: 0 3px 3px 0;
-  box-shadow: none;
-  padding: 0 0 0 1px;
-  min-height : 10px;
-}
-
-/* Hide slider */
-#InkSpinScale slider {
-    background: none;
-    border:     none;
-    outline:    none;
-    min-width:  0px;
-    min-height: 0px;
-    padding:    0px;
-    margin:     0px;
-}
-
-#InkSpinScale slider, #InkSpinScale highlight {
-	border-top-right-radius : 0;
-	border-bottom-right-radius : 0;
-}
-
-#InkSpinScale scale {
-    padding: 0px;
-}
-
-#InkSpinScale trough {
-    min-height: 30px;
-}
-
-#InkSpinScale box.active {
-  box-shadow: 0 0 0 1px  rgb(74,144,217);
-}
-
-#InkSpinScale spinbutton entry {
-	padding : 0 ;
-	outline-style : none;
-}
+ @define-color bg_color0  #ffffff; /* White */
+ @define-color bg_color05 #f8f8f8; /* Slightly off white */
+ @define-color bg_color1  #f0f0f0;
+ @define-color bg_color2  #e0e0e0;
+ @define-color bg_color3  #d0d0d0;
+ @define-color bg_color4  #bbbbbb; /* 50% Gray */
+ @define-color bg_color5  #a5a5a5;
+ @define-color bg_color6  #898989;
+ @define-color bg_color7  #636363;
+ @define-color bg_color8  #000000; /* Black */
+ 
+  /* Inkscape CSS helper
+   * to add a class to a widget do some thing like
+   * widget->get_style_context()->add_class("mycoolclass");
+   * we define a bunch of helper CSS styles
+   * Ecah Inkscape desktop has a class in top level window
+   * call "dark" so you can style using 2 clases with or without 
+   * "dark" by this way you can always know if the UI is in dark mode
+   * Also added some helper clases:
+   * ::::::: Color based 
+   * ::::::: apply to colors
+   * ::::::: scope widget and all his childs
+   * ".colordefault" use default window color
+   * ".colorinverse" invert window colors
+   * ".colorbright" force bright colors no matter the UI is dark or bright
+   * ".colordark" same but dark
+   * ::::::: Background based 
+   * ::::::: apply to backgrounds
+   * ::::::: scope widget and all his childs
+   * ".backgrounddefault" use default window color
+   * ".backgroundinverse" invert window colors
+   * ".backgroundbright" force bright colors no matter the UI is dark or bright
+   * ".backgrounddark" same but dark
+   * :::::::: Icon Based.
+   * :::::::: apply to color (foreground)
+   * :::::::: scope widget and all nested images
+   * ".iconsymbolic" Force icon symbolic
+   * ".iconregular" Force colorfull icons
+   * ".iconcolordefault" Theme color default
+   * ".iconcolorinverse" Inverse color from theme
+   * ".iconcolorbright, Force clear icon
+   * ".iconcolordark" Force dark icon
+   * ".iconcolornamed" Icon in prefs selected color;
+   * ".iconcolornamedinverse" Icon in inverse color from prefs"
+   * :::::::: Combo box.
+   * "..combobright" Combo bright
+   */
+ 
+ .colordefault, 
+ .colordefault *{ 
+     color: @theme_fg_color; 
+ }
+ 
+ .colorinverse, 
+ .colorinverse *{ 
+     color: @theme_bg_color; 
+ }
+ .colorbright,
+ .colorbright *{
+     color: @theme_fg_color; 
+ }
+ 
+ .dark .colorbright, 
+ .dark .colorbright *{
+     color: @theme_bg_color; 
+ }
+ .colordark, 
+ .colordark *{
+     color: @theme_bg_color; 
+ }
+ .dark .colordark,
+ .dark .colordark *{
+     color: @theme_fg_color;
+ }
+ .backgrounddefault, 
+ .backgrounddefault *{ 
+     background-color: @theme_bg_color; 
+     background-image:image(@theme_bg_color);
+ }
+ .backgroundinverse, 
+ .backgroundinverse *{ 
+     background-color: @theme_fg_color; 
+     background-image:image(@theme_fg_color);
+ }
+ .backgroundbright,
+ .backgroundbright *{
+     background-color: @theme_bg_color;
+     background-image:image(@theme_bg_color);
+ }
+ .dark .backgroundbright, 
+ .dark .backgroundbright *{
+     background-color: @theme_fg_color;
+     background-image:image(@theme_fg_color);
+ }
+ .backgrounddark, 
+ .backgrounddark *{
+     background-color: @theme_fg_color;
+     background-image:image(@theme_fg_color);
+ }
+ .dark .backgrounddark,
+ .dark .backgrounddark *{
+     background-color: @theme_bg_color;
+     background-image:image(@theme_bg_color);
+ }
+ .iconsymbolic,
+ .iconsymbolic image{
+     -gtk-icon-style: symbolic;
+ }
+ .iconregular,
+ .iconregular image{
+     -gtk-icon-style: regular;
+ }
+ 
+ .combobright *{
+     color: @theme_fg_color; 
+     background-color: @theme_bg_color;
+     background-image:image(@theme_bg_color);
+     border-radius:4px;
+ }
+ .dark .combobright *{
+     color: @theme_bg_color; 
+     background-color: @theme_fg_color;
+     background-image:image(@theme_fg_color);
+     border-radius:4px;
+ }
+ 
+ 
+ /* 'GtkWidget' for Gtk  <= 3.18   */
+ /* 'widget'    for Gtk  <= 3.19.2 */   
+ GtkWidget, widget {
+ /*    font-size: 12pt; */
+ }
+ 
+ GtkSpinButton {
+     padding: 0;
+     outline-style : none;
+ }
+ 
+ spinbutton {
+     padding: 0;
+     outline-style : none;
+ }
+ 
+ GtkSpinButton entry {
+     padding-left: 2px;
+     padding-right:0;
+ }
+ 
+ spinbutton entry {
+     padding-left: 2px;
+     padding-right:0;
+ }
+ 
+ GtkSpinButton undershoot {
+     outline-style : none;
+ }
+ 
+ spinbutton undershoot {
+     outline-style : none;
+ }
+ 
+  
+ SPRuler {
+     background-color: @theme_bg_color;
+     color:            @theme_fg_color;
+ }
+ 
+ ruler-widget {
+     background-color: @theme_bg_color;
+     color:            @theme_fg_color;
+ }
+ 
+ /* The actual canvas (Inkscape's drawing area). */
+ SPCanvas {
+     background-color: white;
+ }
+ 
+ combobox window.popup scrolledwindow treeview separator {
+ }
+ 
+ #font_selector_family {
+ }
+ 
+ #TextFontFamilyAction_combobox {
+     -GtkComboBox-appears-as-list: true;
+ }
+ 
+ #LockGuides,
+ #StickyZoom,
+ #CMS_Adjust {
+     padding: 0;
+ }
+ 
+ /* Keep palette scrollbar from generating warnings. */
+ #PreviewHolderScroller .vertical slider {
+     min-height: 15px;
+ }
+ 
+ /* Override minimum size of container children for palette. */
+ #ColorItemPreview {
+   min-height: 5px;
+   min-width:  5px;
+ }
+ 
+ /* Reduce width of Fill and Stroke dialog */
+ #ColorModeButton {
+     padding-left: 0;
+     padding-right: 0;
+ }
+ 
+ /* Reduce width of +/- buttons. */
+ .up, .down {
+     padding-left: 0;
+     padding-right: 0;
+ }
+ 
+ /* InkSpinScale */
+ #InkSpinScale {
+   background : @theme_bg_color;
+   border : 1px black;
+   border-radius: 3px;
+   padding: 0px;
+ }
+ 
+ #InkSpinScale spinbutton {
+   border-color: #eee;
+   border-width: 0 0 0 0;
+   border-radius: 0 3px 3px 0;
+   box-shadow: none;
+   padding: 0 0 0 1px;
+   min-height : 10px;
+ }
+ 
+ /* Hide slider */
+ #InkSpinScale slider {
+     background: none;
+     border:     none;
+     outline:    none;
+     min-width:  0px;
+     min-height: 0px;
+     padding:    0px;
+     margin:     0px;
+ }
+ 
+ #InkSpinScale slider, #InkSpinScale highlight {
+     border-top-right-radius : 0;
+     border-bottom-right-radius : 0;
+ }
+ 
+ #InkSpinScale scale {
+     padding: 0px;
+ }
+ 
+ #InkSpinScale trough {
+     min-height: 30px;
+ }
+ 
+ #InkSpinScale box.active {
+   box-shadow: 0 0 0 1px  rgb(74,144,217);
+ }
+ 
+ #InkSpinScale spinbutton entry {
+     padding : 0 ;
+     outline-style : none;
+ }
+ 
\ No newline at end of file
diff --git a/share/ui/toolbar-tool.ui b/share/ui/tool-toolbar.ui
index a5dedad56..a5dedad56 100644
--- a/share/ui/toolbar-tool.ui
+++ b/share/ui/tool-toolbar.ui
diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 595c81a78..b662d3263 100644
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -11,10 +11,6 @@
  */
 
 #include "util/enums.h"
-#include <glibmm/i18n.h>
-
-
-
 
 namespace Inkscape {
 namespace LivePathEffect {
@@ -79,908 +75,8 @@ enum EffectType {
     INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being last. - johan)
 };
 
-template<typename E>
- struct EnumEffectData
- {
-     E id;
-     const Glib::ustring label;
-     const Glib::ustring key;
-     const Glib::ustring icon;
-     const Glib::ustring description;
-     const bool on_path;
-     const bool on_shape;
-     const bool on_group;
-     const bool on_use;
-     const bool on_image;
-     const bool on_text;
- };
-
-const Glib::ustring empty_string("");
-
-/**
- * Simplified management of enumerations of LPE items with UI labels.
- *
- * @note that get_id_from_key and get_id_from_label return 0 if it cannot find an entry for that key string.
- * @note that get_label and get_key return an empty string when the requested id is not in the list.
- */
-template<typename E> class EnumEffectDataConverter
-{
-public:
-    typedef EnumEffectData<E> Data;
-
-    EnumEffectDataConverter(const EnumEffectData<E>* cd, const unsigned int length)
-        : _length(length), _data(cd)
-    {}
-
-    E get_id_from_label(const Glib::ustring& label) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].label == label)
-                return _data[i].id;
-        }
-
-        return (E)0;
-    }
-
-    E get_id_from_key(const Glib::ustring& key) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].key == key)
-                return _data[i].id;
-        }
-
-        return (E)0;
-    }
-
-    bool is_valid_key(const Glib::ustring& key) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].key == key)
-                return true;
-        }
-
-        return false;
-    }
-
-    bool is_valid_id(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return true;
-        }
-        return false;
-    }
-
-    const Glib::ustring& get_label(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].label;
-        }
-
-        return empty_string;
-    }
-
-    const Glib::ustring& get_key(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].key;
-        }
-
-        return empty_string;
-    }
-
-    const Glib::ustring& get_icon(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].icon;
-        }
-
-        return empty_string;
-    }
-
-    const Glib::ustring& get_description(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].description;
-        }
-
-        return empty_string;
-    }
-
-    const bool& get_on_path(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].path;
-        }
-
-        return false;
-    }
-
-    const bool& get_on_shape(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].shape;
-        }
-
-        return false;
-    }
-
-    const bool& get_on_group(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].group;
-        }
-
-        return false;
-    }
-
-    const bool& get_on_text(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].shape;
-        }
-
-        return false;
-    }
-
-    const bool& get_on_use(const E id) const
-    {
-        for(unsigned int i = 0; i < _length; ++i) {
-            if(_data[i].id == id)
-                return _data[i].use;
-        }
-
-        return false;
-    }
-
-    const EnumEffectData<E>& data(const unsigned int i) const
-    {
-        return _data[i];
-    }
-
-    const unsigned int _length;
-private:
-    const EnumEffectData<E>* _data;
-};
-
-const EnumEffectData<EffectType> LPETypeData[] = {
-    // {constant defined in effect-enum.h, N_("name of your effect"), "name of your effect in SVG"}
-/* 0.46 */
-    {
-        BEND_PATH
-        , N_("Bend") //label
-        , "bend_path" //key
-        , "bend-path" //icon
-        , N_("Curve a item based on skeleton path") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        GEARS
-        , N_("Gears") //label
-        , "gears" //key
-        , "gears" //icon
-        , N_("Create configurable gears") //description
-        , true  //on_path
-        , true  //on_shape
-        , false  //on_group
-        , false  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PATTERN_ALONG_PATH
-        , N_("Pattern Along Path") //label
-        , "skeletal" //key
-        , "skeletal" //icon
-        , N_("transform a tiem along path with or without repeating") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    }, // for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG
-    {
-        CURVE_STITCH
-        , N_("Stitch Sub-Paths") //label
-        , "curvestitching" //key
-        , "curvestitching" //icon
-        , N_("curvestitching") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-/* 0.47 */
-    {
-        VONKOCH
-        , N_("VonKoch") //label
-        , "vonkoch" //key
-        , "vonkoch" //icon
-        , N_("vonkoch") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        KNOT
-        , N_("Knot") //label
-        , "knot" //key
-        , "knot" //icon
-        , N_("knot") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        CONSTRUCT_GRID
-        , N_("Construct grid") //label
-        , "construct_grid" //key
-        , "construct-grid" //icon
-        , N_("construct_grid") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        SPIRO
-        , N_("Spiro spline") //label
-        , "spiro" //key
-        , "spiro" //icon
-        , N_("spiro") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        ENVELOPE
-        , N_("Envelope Deformation") //label
-        , "envelope" //key
-        , "envelope" //icon
-        , N_("Envelope Deformation") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        INTERPOLATE
-        , N_("Interpolate Sub-Paths") //label
-        , "interpolate" //key
-        , "interpolate" //icon
-        , N_("Interpolate Sub-Paths") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        ROUGH_HATCHES
-        , N_("Hatches (rough)") //label
-        , "rough_hatches" //key
-        , "rough-hatches" //icon
-        , N_("Hatches (rough)") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        SKETCH
-        , N_("Sketch") //label
-        , "sketch" //key
-        , "sketch" //icon
-        , N_("Sketch") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        RULER
-        , N_("Ruler") //label
-        , "ruler" //key
-        , "ruler" //icon
-        , N_("Ruler") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-/* 0.91 */
-    {
-        POWERSTROKE
-        , N_("Power stroke") //label
-        , "powerstroke" //key
-        , "powerstroke" //icon
-        , N_("Power stroke") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        CLONE_ORIGINAL
-        , N_("Clone original") //label
-        , "clone_original" //key
-        , "clone-original" //icon
-        , N_("Clone original") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-/* 0.92 */
-    {
-        SIMPLIFY
-        , N_("Simplify") //label
-        , "simplify" //key
-        , "simplify" //icon
-        , N_("Simplify") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        LATTICE2
-        , N_("Lattice Deformation 2") //label
-        , "lattice2" //key
-        , "lattice2" //icon
-        , N_("Lattice Deformation 2") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PERSPECTIVE_ENVELOPE
-        , N_("Perspective/Envelope") //label
-        , "perspective-envelope" //key wrong key with "-" retain because historic
-        , "perspective-envelope" //icon
-        , N_("Perspective/Envelope") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        INTERPOLATE_POINTS
-        , N_("Interpolate points") //label
-        , "interpolate_points" //key
-        , "interpolate-points" //icon
-        , N_("Interpolate points") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        TRANSFORM_2PTS
-        , N_("Transform by 2 points") //label
-        , "transform_2pts" //key
-        , "transform-2pts" //icon
-        , N_("Transform by 2 points") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        SHOW_HANDLES
-        , N_("Show handles") //label
-        , "show_handles" //key
-        , "show-handles" //icon
-        , N_("Show handles") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        ROUGHEN
-        , N_("Roughen") //label
-        , "roughen" //key
-        , "roughen" //icon
-        , N_("Roughen") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        BSPLINE
-        , N_("BSpline") //label
-        , "bspline" //key
-        , "bspline" //icon
-        , N_("BSpline") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        JOIN_TYPE
-        , N_("Join type") //label
-        , "join_type" //key
-        , "join-type" //icon
-        , N_("Join type") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        TAPER_STROKE
-        , N_("Taper stroke") //label
-        , "taper_stroke" //key
-        , "taper-stroke" //icon
-        , N_("Taper stroke") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        MIRROR_SYMMETRY
-        , N_("Mirror symmetry") //label
-        , "mirror_symmetry" //key
-        , "mirror-symmetry" //icon
-        , N_("Mirror symmetry") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        COPY_ROTATE
-        , N_("Rotate copies") //label
-        , "copy_rotate" //key
-        , "copy-rotate" //icon
-        , N_("Rotate copies") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-/* Ponyscape -> Inkscape 0.92*/
-    {
-        ATTACH_PATH
-        , N_("Attach path") //label
-        , "attach_path" //key
-        , "attach-path" //icon
-        , N_("Attach path") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        FILL_BETWEEN_STROKES
-        , N_("Fill between strokes") //label
-        , "fill_between_strokes" //key
-        , "fill-between-strokes" //icon
-        , N_("Fill between strokes") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        FILL_BETWEEN_MANY
-        , N_("Fill between many") //label
-        , "fill_between_many" //key
-        , "fill-between-many" //icon
-        , N_("Fill between many") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        ELLIPSE_5PTS
-        , N_("Ellipse by 5 points") //label
-        , "ellipse_5pts" //key
-        , "ellipse-5pts" //icon
-        , N_("Ellipse by 5 points") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        BOUNDING_BOX
-        , N_("Bounding Box") //label
-        , "bounding_box" //key
-        , "bounding-box" //icon
-        , N_("Bounding Box") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-/* 1.0 */
-    {
-        MEASURE_SEGMENTS
-        , N_("Measure Segments") //label
-        , "measure_segments" //key
-        , "measure-segments" //icon
-        , N_("Measure Segments") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        FILLET_CHAMFER
-        , N_("Fillet/Chamfer") //label
-        , "fillet_chamfer" //key
-        , "fillet-chamfer" //icon
-        , N_("Fillet/Chamfer") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        BOOL_OP
-        , N_("Boolean operation") //label
-        , "bool_op" //key
-        , "bool-op" //icon
-        , N_("Boolean operation") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        EMBRODERY_STITCH
-        , N_("Embroidery stitch") //label
-        , "embrodery_stitch" //key
-        , "embrodery-stitch" //icon
-        , N_("Embroidery stitch") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        POWERCLIP
-        , N_("Power clip") //label
-        , "powerclip" //key
-        , "powerclip" //icon
-        , N_("Power clip") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        POWERMASK
-        , N_("Power mask") //label
-        , "powermask" //key
-        , "powermask" //icon
-        , N_("Power mask") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PTS2ELLIPSE
-        , N_("Ellipse from points") //label
-        , "pts2ellipse" //key
-        , "pts2ellipse" //icon
-        , N_("Ellipse from points") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        OFFSET
-        , N_("Offset") //label
-        , "offset" //key
-        , "offset" //icon
-        , N_("Offset") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        DASH_STROKE
-        , N_("Dash Stroke") //label
-        , "dash_stroke" //key
-        , "dash-stroke" //icon
-        , N_("Dash Stroke") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-#ifdef LPE_ENABLE_TEST_EFFECTS
-    {
-        DOEFFECTSTACK_TEST
-        , N_("doEffect stack test") //label
-        , "doeffectstacktest" //key
-        , "experimental" //icon
-        , N_("doEffect stack test") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        ANGLE_BISECTOR
-        , N_("Angle bisector") //label
-        , "angle_bisector" //key
-        , "experimental" //icon
-        , N_("Angle bisector") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        CIRCLE_WITH_RADIUS
-        , N_("Circle (by center and radius)") //label
-        , "circle_with_radius" //key
-        , "experimental" //icon
-        , N_("Circle (by center and radius)") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        CIRCLE_3PTS
-        , N_("Circle by 3 points") //label
-        , "circle_3pts" //key
-        , "experimental" //icon
-        , N_("Circle by 3 points") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        DYNASTROKE
-        , N_("Dynamic stroke") //label
-        , "dynastroke" //key
-        , "experimental" //icon
-        , N_("Dynamic stroke") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        EXTRUDE
-        , N_("Extrude") //label
-        , "extrude" //key
-        , "experimental" //icon
-        , N_("Extrude") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        LATTICE
-        , N_("Lattice Deformation") //label
-        , "lattice" //key
-        , "experimental" //icon
-        , N_("Lattice Deformation") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        LINE_SEGMENT
-        , N_("Line Segment") //label
-        , "line_segment" //key
-        , "experimental" //icon
-        , N_("Line Segment") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PARALLEL
-        , N_("Parallel") //label
-        , "parallel" //key
-        , "experimental" //icon
-        , N_("Parallel") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PATH_LENGTH
-        , N_("Path length") //label
-        , "path_length" //key
-        , "experimental" //icon
-        , N_("Path length") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        PERP_BISECTOR
-        , N_("Perpendicular bisector") //label
-        , "perp_bisector" //key
-        , "experimental" //icon
-        , N_("Perpendicular bisector") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        RECURSIVE_SKELETON
-        , N_("Recursive skeleton") //label
-        , "recursive_skeleton" //key
-        , "experimental" //icon
-        , N_("Recursive skeleton") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        TANGENT_TO_CURVE
-        , N_("Tangent to curve") //label
-        , "tangent_to_curve" //key
-        , "experimental" //icon
-        , N_("Tangent to curve") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-    {
-        TEXT_LABEL
-        , N_("Text label") //label
-        , "text_label" //key
-        , "experimental" //icon
-        , N_("Text label") //description
-        , true  //on_path
-        , true  //on_shape
-        , true  //on_group
-        , true  //on_use
-        , false //on_image
-        , false //on_text
-    },
-#endif
-
-};
-
-extern const EnumEffectData<EffectType> LPETypeData[];  /// defined in effect.cpp
-extern const EnumEffectDataConverter<EffectType> LPETypeConverter; /// defined in effect.cpp
+extern const Util::EnumData<EffectType> LPETypeData[];  /// defined in effect.cpp
+extern const Util::EnumDataConverter<EffectType> LPETypeConverter; /// defined in effect.cpp
 
 } //namespace LivePathEffect
 } //namespace Inkscape
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index f83d07c6d..92f5a781a 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -94,10 +94,74 @@ namespace Inkscape {
 
 namespace LivePathEffect {
 
+const Util::EnumData<EffectType> LPETypeData[] = {
+    // {constant defined in effect-enum.h, N_("name of your effect"), "name of your effect in SVG"}
+/* 0.46 */
+    {BEND_PATH,             N_("Bend"),                            "bend_path"},
+    {GEARS,                 N_("Gears"),                           "gears"},
+    {PATTERN_ALONG_PATH,    N_("Pattern Along Path"),              "skeletal"},   // for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG
+    {CURVE_STITCH,          N_("Stitch Sub-Paths"),                "curvestitching"},
+/* 0.47 */
+    {VONKOCH,               N_("VonKoch"),                         "vonkoch"},
+    {KNOT,                  N_("Knot"),                            "knot"},
+    {CONSTRUCT_GRID,        N_("Construct grid"),                  "construct_grid"},
+    {SPIRO,                 N_("Spiro spline"),                    "spiro"},
+    {ENVELOPE,              N_("Envelope Deformation"),            "envelope"},
+    {INTERPOLATE,           N_("Interpolate Sub-Paths"),           "interpolate"},
+    {ROUGH_HATCHES,         N_("Hatches (rough)"),                 "rough_hatches"},
+    {SKETCH,                N_("Sketch"),                          "sketch"},
+    {RULER,                 N_("Ruler"),                           "ruler"},
+/* 0.91 */
+    {POWERSTROKE,           N_("Power stroke"),                    "powerstroke"},
+    {CLONE_ORIGINAL,        N_("Clone original"),                  "clone_original"},
+/* 0.92 */
+    {SIMPLIFY,              N_("Simplify"),                        "simplify"},
+    {LATTICE2,              N_("Lattice Deformation 2"),           "lattice2"},
+    {PERSPECTIVE_ENVELOPE,  N_("Perspective/Envelope"),            "perspective-envelope"}, //TODO:Wrong name with "-"
+    {INTERPOLATE_POINTS,    N_("Interpolate points"),              "interpolate_points"},
+    {TRANSFORM_2PTS,        N_("Transform by 2 points"),           "transform_2pts"},
+    {SHOW_HANDLES,          N_("Show handles"),                    "show_handles"},
+    {ROUGHEN,               N_("Roughen"),                         "roughen"},
+    {BSPLINE,               N_("BSpline"),                         "bspline"},
+    {JOIN_TYPE,             N_("Join type"),                       "join_type"},
+    {TAPER_STROKE,          N_("Taper stroke"),                    "taper_stroke"},
+    {MIRROR_SYMMETRY,       N_("Mirror symmetry"),                 "mirror_symmetry"},
+    {COPY_ROTATE,           N_("Rotate copies"),                   "copy_rotate"},
+/* Ponyscape -> Inkscape 0.92*/
+    {ATTACH_PATH,           N_("Attach path"),                     "attach_path"},
+    {FILL_BETWEEN_STROKES,  N_("Fill between strokes"),            "fill_between_strokes"},
+    {FILL_BETWEEN_MANY,     N_("Fill between many"),               "fill_between_many"},
+    {ELLIPSE_5PTS,          N_("Ellipse by 5 points"),             "ellipse_5pts"},
+    {BOUNDING_BOX,          N_("Bounding Box"),                    "bounding_box"},
+/* 0.93 */
+    {MEASURE_SEGMENTS,      N_("Measure Segments"),                "measure_segments"},
+    {FILLET_CHAMFER,        N_("Fillet/Chamfer"),                  "fillet_chamfer"},
+    {BOOL_OP,               N_("Boolean operation"),               "bool_op"},
+    {EMBRODERY_STITCH,      N_("Embroidery stitch"),               "embrodery_stitch"},
+    {POWERCLIP,             N_("Power clip"),                      "powerclip"},
+    {POWERMASK,             N_("Power mask"),                      "powermask"},
+    {PTS2ELLIPSE,           N_("Ellipse from points"),             "pts2ellipse"},
+    {OFFSET,                N_("Offset"),                          "offset"},
+    {DASH_STROKE,           N_("Dash Stroke"),                     "dash_stroke"},
+#ifdef LPE_ENABLE_TEST_EFFECTS
+    {DOEFFECTSTACK_TEST,    N_("doEffect stack test"),             "doeffectstacktest"},
+    {ANGLE_BISECTOR,        N_("Angle bisector"),                  "angle_bisector"},
+    {CIRCLE_WITH_RADIUS,    N_("Circle (by center and radius)"),   "circle_with_radius"},
+    {CIRCLE_3PTS,           N_("Circle by 3 points"),              "circle_3pts"},
+    {DYNASTROKE,            N_("Dynamic stroke"),                  "dynastroke"},
+    {EXTRUDE,               N_("Extrude"),                         "extrude"},
+    {LATTICE,               N_("Lattice Deformation"),             "lattice"},
+    {LINE_SEGMENT,          N_("Line Segment"),                    "line_segment"},
+    {PARALLEL,              N_("Parallel"),                        "parallel"},
+    {PATH_LENGTH,           N_("Path length"),                     "path_length"},
+    {PERP_BISECTOR,         N_("Perpendicular bisector"),          "perp_bisector"},
+    {RECURSIVE_SKELETON,    N_("Recursive skeleton"),              "recursive_skeleton"},
+    {TANGENT_TO_CURVE,      N_("Tangent to curve"),                "tangent_to_curve"},
+    {TEXT_LABEL,            N_("Text label"),                      "text_label"},
+#endif
 
-
-
-const EnumEffectDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
+};
+const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
 
 int
 Effect::acceptsNumClicks(EffectType type) {
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index ba2c7357a..6ad9dca61 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -69,7 +69,7 @@ FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("/dialogs/filtereff
 {
      
     const std::string req_widgets[] = {"FilterEditor", "FilterList", "FilterFERX", "FilterFERY", "FilterFERH", "FilterFERW", "FilterPreview", "FilterPrimitiveDescImage", "FilterPrimitiveList", "FilterPrimitiveDescText", "FilterPrimitiveAdd"};
-    Glib::ustring gladefile = get_filename(UIS, "dialog-filter-editor.ui");
+    Glib::ustring gladefile = get_filename(UIS, "filter-editor.glade");
     try {
         builder = Gtk::Builder::create_from_file(gladefile);
     } catch(const Glib::Error& ex) {
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index 9eea4cccd..1fae9a513 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -13,10 +13,9 @@
 # include "config.h"  // only include where actually required!
 #endif
 
-#include "live_effects/effect.h"
 #include "livepatheffect-add.h"
 #include <glibmm/i18n.h>
-#include "io/resource.h"
+
 #include "desktop.h"
 
 namespace Inkscape {
@@ -24,153 +23,93 @@ namespace UI {
 namespace Dialog {
 
 LivePathEffectAdd::LivePathEffectAdd() :
-    converter(Inkscape::LivePathEffect::LPETypeConverter)
+    add_button(_("_Add"), true),
+    close_button(_("_Cancel"), true),
+    converter(Inkscape::LivePathEffect::LPETypeConverter),
+    applied(false)
 {
-    const std::string req_widgets[] = {"LPEDialogSelector", "LPESelector", "LPESelectorFlowBox"};
-    Glib::ustring gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-livepatheffect-add.ui");
-    try {
-        _builder = Gtk::Builder::create_from_file(gladefile);
-    } catch(const Glib::Error& ex) {
-        g_warning("Glade file loading failed for filter effect dialog");
-        return;
-    }
+    set_title(_("Add Path Effect"));
+
+    /**
+     * Scrolled Window
+     */
+    scrolled_window.add(effectlist_treeview);
+    scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+    scrolled_window.set_shadow_type(Gtk::SHADOW_IN);
+    scrolled_window.set_size_request(250, 200);
+    scrolled_window.set_can_focus();
+
+    /**
+     * Effect Store and Tree
+     */
+    effectlist_store = Gtk::ListStore::create(_columns);
+    effectlist_store->set_sort_column (_columns.name, Gtk::SORT_ASCENDING );
+
+    effectlist_treeview.set_model(effectlist_store);
+    effectlist_treeview.set_headers_visible(false);
+    effectlist_treeview.append_column("Name", _columns.name);
+    //effectlist_treeview.set_activates_default(true);
 
-    Gtk::Object* test;
-    for(std::string w:req_widgets) {
-        _builder->get_widget(w,test);
-        if(!test){
-            g_warning("Required widget %s does not exist", w.c_str());
-            return;
-        }
-    }
-    _builder->get_widget("LPEDialogSelector", _LPEDialogSelector);
     /**
      * Initialize Effect list
      */
-    _builder->get_widget("LPESelectorFlowBox", _LPESelectorFlowBox);
-    _builder->get_widget("LPEFilter", _LPEFilter);
-    _builder->get_widget("LPEInfo", _LPEInfo);
-    _LPEFilter->signal_search_changed().connect(sigc::mem_fun(*this, &LivePathEffectAdd::on_search));
-    const std::string le_widgets[] = {"LPESelectorEffect", "LPEName","LPEDescription"};
-    Glib::ustring le_gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-livepatheffect-add-effect.ui");
-    for(int i = 0; i < static_cast<int>(converter._length); ++i) {
-        
-        try {
-            _builder = Gtk::Builder::create_from_file(le_gladefile);
-        } catch(const Glib::Error& ex) {
-            g_warning("Glade file loading failed for filter effect dialog");
-            return;
-        }
+    int show = LivePathEffect::ATTACH_PATH;
+#ifdef LPE_ENABLE_TEST_EFFECTS
+    //TODO: Handle when showing the experimental effects without setting flag
+    show = LivePathEffect::ANGLE_BISECTOR;
+#elif WITH_LPETOOL
+    //TODO: Handle when showing the experimental effects without setting flag
+    show = LivePathEffect::ANGLE_BISECTOR;
+#endif
 
-        Gtk::Object* test;
-        for(std::string w:le_widgets) {
-            _builder->get_widget(w,test);
-            if(!test){
-                g_warning("Required widget %s does not exist", w.c_str());
-                return;
-            }
+    for(int i = 0; i < static_cast<int>(converter._length); ++i) {
+        Gtk::TreeModel::Row row = *(effectlist_store->append());
+        const Util::EnumData<LivePathEffect::EffectType>* data = &converter.data(i);
+        row[_columns.name] = _( converter.get_label(data->id).c_str() );
+        row[_columns.data] = data;
+        if (i == show) {
+            Glib::RefPtr<Gtk::TreeSelection> select = effectlist_treeview.get_selection();
+            select->select(row);
         }
-        const LivePathEffect::EnumEffectData<LivePathEffect::EffectType>* data = &converter.data(i);
-        Gtk::Label * LPEName;
-        _builder->get_widget("LPEName", LPEName);
-        Glib::ustring newid = "LPEName_" + Glib::ustring::format(i);
-        (*LPEName).set_name(newid);
-        (*LPEName).set_text(converter.get_label(data->id).c_str());
-        Gtk::Label * LPEDescription;
-        _builder->get_widget("LPEDescription", LPEDescription);
-        newid = "LPEDescription_" + Glib::ustring::format(i);
-        (*LPEDescription).set_name(newid);
-        (*LPEDescription).set_text(converter.get_description(data->id));
-        Gtk::Image * LPEIcon;
-        _builder->get_widget("LPEIcon", LPEIcon);
-        newid = "LPEIcon_" + Glib::ustring::format(i);
-        (*LPEIcon).set_name(newid);
-        (*LPEIcon).set_from_icon_name(converter.get_icon(data->id),Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG));
-        Gtk::Box * LPESelectorEffect;
-        _builder->get_widget("LPESelectorEffect", LPESelectorEffect);
-        newid = "LPESelectorEffect" + Glib::ustring::format(i);
-        (*LPESelectorEffect).set_name(newid);
-        _LPESelectorFlowBox->insert(*LPESelectorEffect, i);
     }
-    _visiblelpe = _LPESelectorFlowBox->get_children().size();
-    _LPESelectorFlowBox->signal_child_activated().connect(sigc::mem_fun(*this, &LivePathEffectAdd::on_activate));
-    _LPEDialogSelector->set_title(_("Live Efects Selector"));
-    _LPEDialogSelector->show_all_children();
-    _LPEInfo->set_visible(false);
-}
 
-void LivePathEffectAdd::on_activate(Gtk::FlowBoxChild *child){
-    for (auto i:_LPESelectorFlowBox->get_children()) {
-        Gtk::FlowBoxChild * leitem = dynamic_cast<Gtk::FlowBoxChild *>(i);
-        leitem->get_style_context()->remove_class("lpeactive");
-        leitem->get_style_context()->remove_class("colorinverse");
-        leitem->get_style_context()->remove_class("backgroundinverse");
-        Gtk::Box *box = dynamic_cast<Gtk::Box *>(leitem->get_child());
-        if (box) {
-            std::vector<Gtk::Widget*> contents = box->get_children();
-            Gtk::Box *actions = dynamic_cast<Gtk::Box *>(contents[3]);
-            if (actions) {
-                actions->set_visible(false);
-            }
-        }
-    }
-    child->get_style_context()->add_class("lpeactive");
-    child->get_style_context()->add_class("colorinverse");
-    child->get_style_context()->add_class("backgroundinverse");
-    child->show_all_children();
-}
+    /**
+     * Buttons
+     */
+    //close_button.set_can_default();
+    add_button.set_use_underline(true);
+    add_button.set_can_default();
 
-bool LivePathEffectAdd::on_filter(Gtk::FlowBoxChild *child)
-{
-    if (_LPEFilter->get_text().length() < 4) {
-        _visiblelpe = _LPESelectorFlowBox->get_children().size();
-        return true;
-    }
-    Gtk::Box *box = dynamic_cast<Gtk::Box *>(child->get_child());
-    if (box) {
-        std::vector<Gtk::Widget*> contents = box->get_children();
-        Gtk::Label *lpename = dynamic_cast<Gtk::Label *>(contents[1]);
-        if (lpename) {
-            size_t s = lpename->get_text().uppercase().find(_LPEFilter->get_text().uppercase(),0);
-            if(s != -1) {
-                _visiblelpe++;
-                return true;
-            }
-        }
-        Gtk::Label *lpedesc = dynamic_cast<Gtk::Label *>(contents[2]);
-        if (lpedesc) {
-            size_t s = lpedesc->get_text().uppercase().find(_LPEFilter->get_text().uppercase(),0);
-            if(s != -1) {
-                _visiblelpe++;
-                return true;
-            }
-        }
-    }
-    return false;
-}
+    auto mainVBox = get_content_area();
 
-void LivePathEffectAdd::on_search()
-{
-    _visiblelpe = 0;
-    _LPESelectorFlowBox->set_filter_func(sigc::mem_fun(*this, &LivePathEffectAdd::on_filter));
-    if (_visiblelpe == 0) {
-        _LPEInfo->set_text(_("Your search do a empty result, please try again"));
-        _LPEInfo->set_visible(true);
-        _LPEInfo->get_style_context()->add_class("lpeinfowarn");
-    } else {
-        _LPEInfo->set_visible(false);
-        _LPEInfo->get_style_context()->remove_class("lpeinfowarn");
-    }
+    mainVBox->pack_start(scrolled_window, true, true);
+    add_action_widget(close_button, Gtk::RESPONSE_CLOSE);
+    add_action_widget(add_button, Gtk::RESPONSE_APPLY);
+
+    
+    /**
+     * Signal handlers
+     */
+    effectlist_treeview.signal_button_press_event().connect_notify( sigc::mem_fun(*this, &LivePathEffectAdd::onButtonEvent) );
+    effectlist_treeview.signal_key_press_event().connect_notify(sigc::mem_fun(*this, &LivePathEffectAdd::onKeyEvent));
+    close_button.signal_clicked().connect(sigc::mem_fun(*this, &LivePathEffectAdd::onClose));
+    add_button.signal_clicked().connect(sigc::mem_fun(*this, &LivePathEffectAdd::onAdd));
+    signal_delete_event().connect( sigc::bind_return(sigc::hide(sigc::mem_fun(*this, &LivePathEffectAdd::onClose)), true ) );
+
+    add_button.grab_default();
+
+    show_all_children();
 }
 
 void LivePathEffectAdd::onAdd()
 {
+    applied = true;
     onClose();
 }
 
 void LivePathEffectAdd::onClose()
 {
-    _LPEDialogSelector->hide();
+    hide();
 }
 
 void LivePathEffectAdd::onKeyEvent(GdkEventKey* evt)
@@ -183,10 +122,36 @@ void LivePathEffectAdd::onKeyEvent(GdkEventKey* evt)
     }
 }
 
+void LivePathEffectAdd::onButtonEvent(GdkEventButton* evt)
+{
+    // Double click on tree is same as clicking the add button
+    if (evt->type == GDK_2BUTTON_PRESS) {
+        onAdd();
+    }
+}
+
+const Util::EnumData<LivePathEffect::EffectType>*
+LivePathEffectAdd::getActiveData()
+{
+    Gtk::TreeModel::iterator iter = instance().effectlist_treeview.get_selection()->get_selected();
+    if ( iter ) {
+        Gtk::TreeModel::Row row = *iter;
+        return row[instance()._columns.data];
+    }
+
+    return nullptr;
+}
+
+
 void LivePathEffectAdd::show(SPDesktop *desktop)
 {
     LivePathEffectAdd &dial = instance();
-    dial._LPEDialogSelector->run();
+    dial.applied=false;
+    dial.set_modal(true);
+    desktop->setWindowTransient (dial.gobj());
+    dial.property_destroy_with_parent() = true;
+    dial.effectlist_treeview.grab_focus();
+    dial.run();
 }
 
 } // namespace Dialog
diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h
index 17d46487a..84901385c 100644
--- a/src/ui/dialog/livepatheffect-add.h
+++ b/src/ui/dialog/livepatheffect-add.h
@@ -12,14 +12,10 @@
 #ifndef INKSCAPE_DIALOG_LIVEPATHEFFECT_ADD_H
 #define INKSCAPE_DIALOG_LIVEPATHEFFECT_ADD_H
 
-#include <gtkmm/box.h>
-#include <gtkmm/builder.h>
-#include <gtkmm/label.h>
-#include <gtkmm/flowbox.h>
-#include <gtkmm/stylecontext.h>
-#include <gtkmm/flowboxchild.h>
-#include <gtkmm/searchentry.h>
 #include <gtkmm/dialog.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treeview.h>
+#include <gtkmm/scrolledwindow.h>
 #include "live_effects/effect-enum.h"
 
 class SPDesktop;
@@ -41,23 +37,31 @@ public:
      * Show the dialog
      */
     static void show(SPDesktop *desktop);
+
+    /**
+     * Returns true is the "Add" button was pressed
+     */
     static bool isApplied() {
-        return false;
+        return instance().applied;
     }
 
-    static const Util::EnumData<LivePathEffect::EffectType>* getActiveData(){return NULL;};
+    /**
+     * Return the data associated with the currently selected item
+     */
+    static const Util::EnumData<LivePathEffect::EffectType>* getActiveData();
+
 protected:
+
     /**
      * Close button was clicked
      */
     void onClose();
-    bool on_filter(Gtk::FlowBoxChild *child);
-    void on_search();
-    void on_activate(Gtk::FlowBoxChild *child);
+
     /**
      * Add button was clicked
      */
     void onAdd();
+
     /**
      * Tree was clicked
      */
@@ -68,17 +72,37 @@ protected:
      */
     void onKeyEvent(GdkEventKey* evt);
 private:
-    Gtk::Button       _add_button;
-    Gtk::Button       _close_button;
-    Gtk::Dialog *_LPEDialogSelector;
-    Glib::RefPtr<Gtk::Builder> _builder;
-    Gtk::FlowBox *_LPESelectorFlowBox;
-    Gtk::SearchEntry *_LPEFilter;
-    Gtk::Label *_LPEInfo;
-    Gtk::Box *_LPESelector;
-    guint _visiblelpe;    
-    class Effect;
-    const LivePathEffect::EnumEffectDataConverter<LivePathEffect::EffectType>& converter;
+
+    Gtk::TreeView     effectlist_treeview;
+    Gtk::ScrolledWindow scrolled_window;
+    Gtk::Button       add_button;
+    Gtk::Button       close_button;
+
+    class ModelColumns : public Gtk::TreeModel::ColumnRecord
+    {
+      public:
+        ModelColumns()
+        {
+            add(name);
+            //add(desc);
+            add(data);
+        }
+        ~ModelColumns() override = default;
+
+        Gtk::TreeModelColumn<Glib::ustring> name;
+        /**
+         * TODO - Get detailed descriptions of each Effect to show in the dialog
+         */
+        //Gtk::TreeModelColumn<Glib::ustring> desc;
+        Gtk::TreeModelColumn<const Util::EnumData<LivePathEffect::EffectType>*> data;
+    };
+
+    ModelColumns _columns;
+    Glib::RefPtr<Gtk::ListStore> effectlist_store;
+    const Util::EnumDataConverter<LivePathEffect::EffectType>& converter;
+
+    bool applied;
+
     static LivePathEffectAdd &instance() {
         static LivePathEffectAdd instance_;
         return instance_;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 6e614f582..3199e25ef 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -857,7 +857,7 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati
 void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
     setupToolboxCommon( toolbox, desktop,
-            "toolbar-tool.ui",
+            "tool-toolbar.ui",
             "/ui/ToolToolbar",
             "/toolbox/tools/small");
 }
@@ -905,12 +905,12 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     Glib::RefPtr<Gtk::ActionGroup> mainActions = create_or_fetch_actions( desktop );
 
     // The UI Manager creates widgets based on the definitions in the
-    // "toolbar-select.ui" file.  This is only used with the "prep"
+    // "select-toolbar.ui" file.  This is only used with the "prep"
     // method of toolbar-creation
     GtkUIManager* mgr = gtk_ui_manager_new();
     GError *err = nullptr;
     gtk_ui_manager_insert_action_group( mgr, mainActions->gobj(), 0 );
-    Glib::ustring filename = get_filename(UIS, "toolbar-select.ui");
+    Glib::ustring filename = get_filename(UIS, "select-toolbar.ui");
     guint ret = gtk_ui_manager_add_ui_from_file(mgr, filename.c_str(), &err);
     if(err) {
       g_warning("Failed to load aux toolbar %s: %s", filename.c_str(), err->message);
@@ -1061,7 +1061,7 @@ void update_aux_toolbox(SPDesktop * /*desktop*/, ToolBase *eventcontext, GtkWidg
 void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
     setupToolboxCommon( toolbox, desktop,
-            "toolbar-commands.ui",
+            "commands-toolbar.ui",
             "/ui/CommandsToolbar",
             "/toolbox/small" );
 }
@@ -1375,7 +1375,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     }
 
     setupToolboxCommon( toolbox, desktop,
-            "toolbar-snap.ui",
+            "snap-toolbar.ui",
             "/ui/SnapToolbar",
             "/toolbox/secondary" );
 }