diff --git a/data/icons/hicolor/scalable/actions/builder-editor-symbolic.svg b/data/icons/hicolor/scalable/actions/builder-editor-symbolic.svg
index af97399278c3950ab92355e97cc54d55d1e668c3..178fa1247ac88df976dc00094823eb0ed35781d8 100644
--- a/data/icons/hicolor/scalable/actions/builder-editor-symbolic.svg
+++ b/data/icons/hicolor/scalable/actions/builder-editor-symbolic.svg
@@ -1 +1,63 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#2e3436"><path d="m3.003 9.997-1 4h11.992l-.999-4H9.998l-2.49 2H4.002v-2zm-.995 5H14v1H2.008z"/><path d="m5.003 8.998 6.994-7c1 0 1.998 1 1.998 2l-6.995 7H5.002z" fill-rule="evenodd"/><path d="M12.918 1.092c1 0 1.999 1 1.999 2l.999-1c0-1-.751-2-1.999-2z" overflow="visible"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.3"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="d">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="e">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="f">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="g">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="h">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="i">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="j">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="k">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -160 -340.003906)">
+        <path d="m 142.5 351 h 10.449219 c -1.183594 0.492188 -1.296875 2.457031 0 3 h -10.449219 z m 0 0" fill="#2e3436"/>
+    </g>
+    <path d="m 2 13.996094 h 12 c 0.550781 0 1 0.449218 1 1 c 0 0.550781 -0.449219 1 -1 1 h -12 c -0.550781 0 -1 -0.449219 -1 -1 c 0 -0.550782 0.449219 -1 1 -1 z m 0 0" fill="#2e3436"/>
+    <path d="m 12.277344 0.828125 c -0.578125 0.007813 -1.167969 0.230469 -1.691406 0.753906 l -9 9 c -0.375 0.375 -0.585938 0.882813 -0.585938 1.414063 v 3 h 3 c 0.53125 0 1.039062 -0.210938 1.414062 -0.585938 l 9 -9 c 1.789063 -1.789062 0.082032 -4.390625 -1.890624 -4.570312 c -0.082032 -0.011719 -0.164063 -0.011719 -0.246094 -0.011719 z m -1.777344 3.605469 l 1.0625 1.0625 l -7.0625 7.0625 l -1.0625 -1.0625 z m 0 0" fill="#2e3436"/>
+    <g clip-path="url(#e)" mask="url(#d)" transform="matrix(1 0 0 1 -160 -340.003906)">
+        <path d="m 104 502 c 0 0.550781 -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 s 1 0.449219 1 1 z m 0 0" fill="#2e3436"/>
+    </g>
+    <g clip-path="url(#g)" mask="url(#f)" transform="matrix(1 0 0 1 -160 -340.003906)">
+        <path d="m 106 501 v 2 h 8 v -2 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
+    </g>
+    <g clip-path="url(#i)" mask="url(#h)" transform="matrix(1 0 0 1 -160 -340.003906)">
+        <path d="m 104 514 c 0 0.550781 -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 s 1 0.449219 1 1 z m 0 0" fill="#2e3436"/>
+    </g>
+    <g clip-path="url(#k)" mask="url(#j)" transform="matrix(1 0 0 1 -160 -340.003906)">
+        <path d="m 106 513 v 2 h 8 v -2 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
+    </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/actions/builder-todo-symbolic.svg b/data/icons/hicolor/scalable/actions/builder-todo-symbolic.svg
index 68d6ae7784168cc58fcb265c72232dc6dcc035a1..da2c5123199dee417fa77285f7a2490563b39885 100644
--- a/data/icons/hicolor/scalable/actions/builder-todo-symbolic.svg
+++ b/data/icons/hicolor/scalable/actions/builder-todo-symbolic.svg
@@ -1 +1,65 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000" d="M2 1C.91 1 0 1.91 0 3v10c0 1.09.91 2 2 2h10c1.09 0 2-.91 2-2V9a1 1 0 0 0-1-1 1 1 0 0 0-1 1v4H2V3h8a1 1 0 0 0 1-1 1 1 0 0 0-1-1Zm12.13.543L6.839 8.836 4.42 6.418 3.006 7.832l3.832 3.832 8.707-8.707Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.3"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="d">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="e">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="f">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="g">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="h">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="i">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <mask id="j">
+        <g filter="url(#a)">
+            <path d="m 0 0 h 16 v 16 h -16 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="k">
+        <path d="m 0 0 h 800 v 800 h -800 z"/>
+    </clipPath>
+    <g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -140.019531 -320)">
+        <path d="m 142.5 351 h 10.449219 c -1.183594 0.492188 -1.296875 2.457031 0 3 h -10.449219 z m 0 0" fill="#2e3436"/>
+    </g>
+    <g clip-path="url(#e)" mask="url(#d)" transform="matrix(1 0 0 1 -140.019531 -320)">
+        <path d="m 104 502 c 0 0.550781 -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 s 1 0.449219 1 1 z m 0 0" fill="#2e3436"/>
+    </g>
+    <g clip-path="url(#g)" mask="url(#f)" transform="matrix(1 0 0 1 -140.019531 -320)">
+        <path d="m 106 501 v 2 h 8 v -2 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
+    </g>
+    <g clip-path="url(#i)" mask="url(#h)" transform="matrix(1 0 0 1 -140.019531 -320)">
+        <path d="m 104 514 c 0 0.550781 -0.449219 1 -1 1 s -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 s 1 0.449219 1 1 z m 0 0" fill="#2e3436"/>
+    </g>
+    <g clip-path="url(#k)" mask="url(#j)" transform="matrix(1 0 0 1 -140.019531 -320)">
+        <path d="m 106 513 v 2 h 8 v -2 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
+    </g>
+    <g fill="#2e3436">
+        <path d="m 15.734375 2.65625 c 0.175781 -0.199219 0.261719 -0.460938 0.246094 -0.722656 c -0.019531 -0.265625 -0.140625 -0.515625 -0.339844 -0.6875 c -0.199219 -0.175782 -0.460937 -0.265625 -0.726563 -0.246094 c -0.265624 0.015625 -0.511718 0.140625 -0.6875 0.339844 l -6.296874 7.195312 l -2.242188 -2.246094 c -0.390625 -0.390624 -1.023438 -0.390624 -1.414062 0 c -0.1875 0.1875 -0.292969 0.441407 -0.292969 0.707032 s 0.105469 0.523437 0.292969 0.710937 l 3 3 c 0.195312 0.195313 0.464843 0.300781 0.742187 0.292969 c 0.273437 -0.011719 0.535156 -0.132812 0.71875 -0.34375 z m 0 0"/>
+        <path d="m 3.980469 1 c -1.644531 0 -3 1.355469 -3 3 v 8 c 0 1.644531 1.355469 3 3 3 h 8 c 1.644531 0 3 -1.355469 3 -3 v -4 c 0 -0.550781 -0.449219 -1 -1 -1 s -1 0.449219 -1 1 v 4 c 0 0.570312 -0.429688 1 -1 1 h -8 c -0.570313 0 -1 -0.429688 -1 -1 v -8 c 0 -0.570312 0.429687 -1 1 -1 h 7 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/data/icons/src/org.gnome.Builder.svg b/data/icons/src/org.gnome.Builder.svg
index 03a765206772e56647a0e62f62f9a74351a6899f..2b1410a8fcd449beb602549053a832c2faddc4f2 100644
--- a/data/icons/src/org.gnome.Builder.svg
+++ b/data/icons/src/org.gnome.Builder.svg
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.5126645"
-     inkscape:cx="144.02707"
-     inkscape:cy="329.81893"
+     inkscape:zoom="1"
+     inkscape:cx="168"
+     inkscape:cy="351"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -494,12 +494,6 @@
        inkscape:label="">
       <title
          id="title1382">builder-editor</title>
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4308"
-         d="m 166.13883,205.0006 -0.99931,3.9996 h 11.99173 l -0.99931,-3.9996 h -2.99793 l -2.49005,1.9998 h -3.50581 v -1.9998 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:none" />
       <rect
          style="fill:none"
          id="rect13184"
@@ -508,25 +502,18 @@
          x="163.1358"
          y="195.00317" />
       <rect
-         ry="0"
-         style="fill:#2e3436;fill-opacity:1;stroke:none"
-         id="rect13358"
-         width="11.991719"
-         height="0.99988312"
-         x="165.14409"
-         y="210.00011" />
-      <path
-         style="fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         d="m 168.13927,204.00069 6.99336,-6.9993 c 0.9993,0 1.99862,0.9999 1.99862,1.9998 l -6.99517,6.99931 h -1.99862 z"
-         id="path13365"
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0" />
+         ry="1"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.999999"
+         id="rect2498"
+         width="13.999986"
+         height="2"
+         x="164.13582"
+         y="209.00011"
+         rx="1.0000001" />
       <path
-         style="overflow:visible;fill:#2e3436;fill-opacity:1;stroke:none;enable-background:new"
-         d="m 176.05379,196.09527 c 0.99931,0 1.99863,0.9999 1.99863,1.9998 l 0.99931,-0.9999 c 0,-0.9999 -0.75134,-1.9998 -1.99863,-1.9998 z"
-         id="path13367"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0" />
+         id="path32074"
+         style="color:#000000;display:inline;fill:#2e3436;stroke-linejoin:round"
+         d="m 175.41315,195.83203 c -0.57966,0.007 -1.16955,0.23205 -1.6914,0.75391 l -9,9 c -0.37507,0.37502 -0.58584,0.88366 -0.58594,1.41406 v 3 h 3 c 0.5304,-1e-4 1.03904,-0.21087 1.41406,-0.58594 l 9,-9 c 1.78921,-1.78921 0.0827,-4.39013 -1.88867,-4.57226 -0.0821,-0.008 -0.16524,-0.0108 -0.24805,-0.01 z m -1.77734,3.60742 1.06055,1.06055 -0.5293,0.53125 -6,6 -0.53125,0.5293 -1.06055,-1.06055 0.5293,-0.53125 6,-6 z" />
     </g>
     <g
        id="g7889"
@@ -2159,10 +2146,24 @@
          height="16"
          x="300.02048"
          y="682.51965" />
-      <path
-         id="path15809"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-         d="m 302,683.51965 c -1.0907,0 -2,0.9093 -2,2 v 10 c 0,1.0907 0.9093,2 2,2 h 10 c 1.0907,0 2,-0.9093 2,-2 v -4 a 1,1 0 0 0 -1,-1 1,1 0 0 0 -1,1 v 4 h -10 v -10 h 8 a 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 12.13086,0.54297 -7.29297,7.29297 -2.41797,-2.41797 -1.41406,1.41406 3.83203,3.83203 8.70703,-8.70703 z" />
+      <g
+         style="display:inline"
+         inkscape:label="object select selection mode check approve done good active"
+         id="g9445-6"
+         transform="rotate(90,-3.6903365,515.69351)">
+        <title
+           id="title9439-0">selection-mode</title>
+        <path
+           style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+           d="m 165.79297,196.25 a 1,1 0 0 0 -1.41211,0.0937 1,1 0 0 0 0.0937,1.41211 l 7.19531,6.29687 -2.24414,2.24414 a 1,1 0 0 0 0,1.41407 1,1 0 0 0 1.41602,0 l 3,-3 a 1.0001,1.0001 0 0 0 -0.0488,-1.46094 z"
+           id="path8923-6-6" />
+        <path
+           style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4;-inkscape-stroke:none"
+           d="m 143,321 c -1.6447,0 -3,1.3553 -3,3 v 8 c 0,1.6447 1.3553,3 3,3 h 8 c 1.6447,0 3,-1.3553 3,-3 v -4 c 0,-0.55228 -0.44772,-1 -1,-1 -0.55228,0 -1,0.44772 -1,1 v 4 c 0,0.5713 -0.4287,1 -1,1 h -8 c -0.5713,0 -1,-0.4287 -1,-1 v -8 c 0,-0.5713 0.4287,-1 1,-1 h 7 c 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 z"
+           transform="rotate(-90,97.069489,253.93368)"
+           sodipodi:nodetypes="sssssssssssssssssss"
+           id="path419" />
+      </g>
     </g>
   </g>
   <g