diff --git a/LICENSE b/LICENSE
index b6a53db3..aae69a95 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ DB Browser for SQLite is bi-licensed under the Mozilla Public License
 Version 2, as well as the GNU General Public License Version 3 or later.
 
 You can modify or redistribute it under the conditions of these
-licenses.
+licenses. Check also `LICENSE-PLUGINS`.
 
 -----------------------------------------------------------------------
 
diff --git a/LICENSE-PLUGINS b/LICENSE-PLUGINS
index 4cd296b0..2000115b 100644
--- a/LICENSE-PLUGINS
+++ b/LICENSE-PLUGINS
@@ -57,3 +57,17 @@ WebP - https://developers.google.com/speed/webp/
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Icons - https://codefisher.org/pastel-svg/
+
+Most of the icons come from the Pastel SVG icon set created by Michael
+Buckley. We have obtained a special license (Creative Commons
+Attribution Share Alike 4.0
+http://creativecommons.org/licenses/by-sa/4.0/) but you might be
+required to redistribute it under Creative Commons Attribution
+NonCommercial Share Alike 4.0
+http://creativecommons.org/licenses/by-nc-sa/4.0/
+Check https://codefisher.org/pastel-svg/ for clarification.
+
+Some icons might have other open licenses, check history of the files
+under `src/icons`.
\ No newline at end of file
diff --git a/README.md b/README.md
index 70f18c44..18c4315b 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,8 @@ Version 2, as well as the GNU General Public License Version 3 or later.
 
 Modification or redistribution is permitted under the conditions of these licenses.
 
+Check `LICENSE-PLUGINS` for other rights regarding included third-party resources.
+
   [travis-img]: https://travis-ci.org/sqlitebrowser/sqlitebrowser.svg?branch=master
   [travis]: https://travis-ci.org/sqlitebrowser/sqlitebrowser
 
diff --git a/src/icons/clear_filters.png b/src/icons/clear_filters.png
deleted file mode 100644
index 16288fdb..00000000
Binary files a/src/icons/clear_filters.png and /dev/null differ
diff --git a/src/icons/clear_sorting.png b/src/icons/clear_sorting.png
deleted file mode 100644
index be27fea4..00000000
Binary files a/src/icons/clear_sorting.png and /dev/null differ
diff --git a/src/icons/clear_sorting.svg b/src/icons/clear_sorting.svg
new file mode 100644
index 00000000..79cb201a
--- /dev/null
+++ b/src/icons/clear_sorting.svg
@@ -0,0 +1,326 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg23"
+   sodipodi:docname="clear_sorting.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata29">
+    <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>Arrow Up</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs27">
+    <linearGradient
+       y2="-5.2915026"
+       x2="-5.2915026"
+       y1="5.2915026"
+       x1="5.2915026"
+       id="arrow-backing-6"
+       gradientTransform="scale(0.75592895,1.3228757)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop896"
+         stop-color="#72c466"
+         offset="0%" />
+      <stop
+         id="stop898"
+         stop-color="#22601e"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="-3.8729833"
+       x2="-3.8729833"
+       y1="3.8729833"
+       x1="3.8729833"
+       id="arrow-center-7"
+       gradientTransform="scale(0.64549722,1.5491933)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop901"
+         stop-color="#a7d69e"
+         offset="0%" />
+      <stop
+         id="stop903"
+         stop-color="#78bd72"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="3.5"
+       x2="3.5"
+       y1="-3.5"
+       x1="-3.5"
+       id="backing_delete"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1006"
+         stop-color="#c4581e"
+         offset="0%" />
+      <stop
+         id="stop1008"
+         stop-color="#b84503"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="2.5"
+       x2="2.5"
+       y1="-2.5"
+       x1="-2.5"
+       id="center_delete"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1011"
+         stop-color="#fed6b8"
+         offset="0%" />
+      <stop
+         id="stop1013"
+         stop-color="#dd6401"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="7.0381582"
+       x2="7.3088566"
+       y1="-7.579555"
+       x1="-7.3088566"
+       id="backing"
+       gradientTransform="scale(1.0827936,0.92353707)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1159"
+         stop-color="#cdcdcd"
+         offset="0%" />
+      <stop
+         id="stop1161"
+         stop-color="#6e6e6e"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="3.5"
+       x2="3.5"
+       y1="-3.5"
+       x1="-3.5"
+       id="backing_delete-5"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1175"
+         stop-color="#c4581e"
+         offset="0%" />
+      <stop
+         id="stop1177"
+         stop-color="#b84503"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="2.5"
+       x2="2.5"
+       y1="-2.5"
+       x1="-2.5"
+       id="center_delete-6"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1180"
+         stop-color="#fed6b8"
+         offset="0%" />
+      <stop
+         id="stop1182"
+         stop-color="#dd6401"
+         offset="100%" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1052"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="-25.401707"
+     inkscape:cy="4.0180205"
+     inkscape:window-x="1366"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg23" />
+  <title
+     id="title2">Arrow Up</title>
+  <desc
+     id="desc4">Arrow Up Top</desc>
+  <g
+     id="icon"
+     transform="matrix(0.76279069,0,0,0.76279069,3.9325189,6.3395348)">
+    <defs
+       id="defs16">
+      <linearGradient
+         id="arrow-backing"
+         x1="-5.2915025"
+         y1="-5.2915025"
+         x2="5.2915025"
+         y2="5.2915025"
+         gradientTransform="scale(0.75592895,1.3228757)"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#72c466"
+           id="stop6" />
+        <stop
+           offset="100%"
+           stop-color="#22601e"
+           id="stop8" />
+      </linearGradient>
+      <linearGradient
+         id="arrow-center"
+         x1="-3.8729832"
+         y1="-3.8729832"
+         x2="3.8729832"
+         y2="3.8729832"
+         gradientTransform="scale(0.64549722,1.5491933)"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#a7d69e"
+           id="stop11" />
+        <stop
+           offset="100%"
+           stop-color="#78bd72"
+           id="stop13" />
+      </linearGradient>
+    </defs>
+    <path
+       d="m -2,-3 h -2 l 4,-4 4,4 H 2 V 7 h -4 z"
+       id="path18"
+       style="fill:url(#arrow-backing)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="M -1,-3.5 H -2.5 L 0,-6 2.5,-3.5 H 1 V 6 h -2 z"
+       id="path20"
+       style="fill:url(#arrow-center)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.76279069,0,0,0.76279069,8.9488372,6.3395348)"
+     id="icon-3">
+    <g
+       id="g912"
+       transform="scale(-1)">
+      <defs
+         id="defs906">
+        <linearGradient
+           y2="0"
+           x2="0"
+           y1="1"
+           x1="1"
+           id="linearGradient933">
+          <stop
+             id="stop929"
+             stop-color="#72c466"
+             offset="0%" />
+          <stop
+             id="stop931"
+             stop-color="#22601e"
+             offset="100%" />
+        </linearGradient>
+        <linearGradient
+           y2="0"
+           x2="0"
+           y1="1"
+           x1="1"
+           id="linearGradient939">
+          <stop
+             id="stop935"
+             stop-color="#a7d69e"
+             offset="0%" />
+          <stop
+             id="stop937"
+             stop-color="#78bd72"
+             offset="100%" />
+        </linearGradient>
+      </defs>
+      <path
+         style="fill:url(#arrow-backing-6)"
+         id="path908"
+         d="m -2,-3 h -2 l 4,-4 4,4 H 2 V 7 h -4 z"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#arrow-center-7)"
+         id="path910"
+         d="M -1,-3.5 H -2.5 L 0,-6 2.5,-3.5 H 1 V 6 h -2 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="translate(12.508475,12.474576)"
+     id="delete">
+    <defs
+       id="defs1016">
+      <linearGradient
+         y2="1"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1041">
+        <stop
+           id="stop1037"
+           stop-color="#c4581e"
+           offset="0%" />
+        <stop
+           id="stop1039"
+           stop-color="#b84503"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="1"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1047">
+        <stop
+           id="stop1043"
+           stop-color="#fed6b8"
+           offset="0%" />
+        <stop
+           id="stop1045"
+           stop-color="#dd6401"
+           offset="100%" />
+      </linearGradient>
+    </defs>
+    <circle
+       r="3.5"
+       id="back"
+       cx="0"
+       cy="0"
+       style="fill:url(#backing_delete)" />
+    <circle
+       r="2.5"
+       id="center-dot"
+       cx="0"
+       cy="0"
+       style="fill:url(#center_delete)" />
+    <path
+       id="path1020"
+       d="m -1.5,-0.5 h 3 v 1 h -3 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+  </g>
+</svg>
diff --git a/src/icons/color_hsl.svg b/src/icons/color_hsl.svg
deleted file mode 100644
index 301ba4d1..00000000
--- a/src/icons/color_hsl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" x1="0%" x2="100%" y1="0%" y2="0%"><stop offset="0" stop-color="#f00"/><stop offset=".166667" stop-color="#ff0"/><stop offset=".333333" stop-color="#0f0"/><stop offset=".5" stop-color="#0ff"/><stop offset=".666667" stop-color="#00f"/><stop offset=".833333" stop-color="#f0f"/><stop offset="1" stop-color="#f00"/></linearGradient><linearGradient id="b" x1="0%" x2="0%" y1="0%" y2="100%"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#7c7c7c"/></linearGradient><linearGradient id="c" x1="0%" x2="100%" y1="0%" y2="100%"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity=".8"/></linearGradient><mask id="d"><path d="m-8-8h16v16h-16z" fill="#fff"/><path d="m-5-5h10v10h-10z" opacity=".3"/></mask><g transform="translate(8 8)"><rect fill="#fff" height="14" rx="1" width="14" x="-7" y="-7"/><rect fill="url(#a)" height="14" opacity=".8" rx="1" width="14" x="-7" y="-7"/><rect fill="url(#b)" height="14" rx="1" width="14" x="-7" y="-7"/><path d="m-6-6h12v12h-12z" fill="url(#c)" mask="url(#d)" opacity=".6"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/cut.png b/src/icons/cut.png
deleted file mode 100644
index f215d6f6..00000000
Binary files a/src/icons/cut.png and /dev/null differ
diff --git a/src/icons/edit_cut.svg b/src/icons/edit_cut.svg
new file mode 100644
index 00000000..3abc7673
--- /dev/null
+++ b/src/icons/edit_cut.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48">
+  <defs>
+    <linearGradient id="h">
+      <stop offset="0"/>
+      <stop offset="1" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="g">
+      <stop offset="0" stop-color="#9a0c00"/>
+      <stop offset="1" stop-color="#9a0c00" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="f">
+      <stop offset="0" stop-color="#df2a2a"/>
+      <stop offset="1" stop-color="#df2a2a" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="e">
+      <stop offset="0" stop-color="#e2e2e2"/>
+      <stop offset="1" stop-color="#d8d8d8"/>
+    </linearGradient>
+    <radialGradient id="d" cx="165.061" cy="23.333" r="7.285" gradientTransform="matrix(1 0 0 1.0103 0 -.16)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ef3535"/>
+      <stop offset="1" stop-color="#a40000" stop-opacity="0"/>
+    </radialGradient>
+    <linearGradient id="c" x1="292.972" x2="296.94" y1="4.759" y2="10.711" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#eeeeec"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+    <radialGradient id="b" cx="165.061" cy="23.333" r="7.285" gradientTransform="matrix(1 0 0 1.0103 0 -.16)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ef3535"/>
+      <stop offset="0" stop-color="#c91a1a"/>
+      <stop offset="1" stop-color="#ff4c4c"/>
+    </radialGradient>
+    <linearGradient id="a" x1="68.175" x2="74.587" y1="21.425" y2="27.837" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#babdb6"/>
+      <stop offset="1" stop-color="#eeeeec"/>
+    </linearGradient>
+    <linearGradient id="o" x1="22.225" x2="24.19" y1="23.843" y2="22.861" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+    <linearGradient id="k" x1="294.595" x2="297.185" y1="12.188" y2="13.34" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="v" x1="296.762" x2="297.798" y1="12.012" y2="10.947" gradientTransform="translate(-1053.179 -16.847) scale(3.62444)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="l" x1="296.486" x2="296.529" y1="15.507" y2="9.877" gradientTransform="matrix(3.6379 0 0 3.47038 -1056.116 -16.007)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="i" x1="292.972" x2="296.94" y1="4.759" y2="10.711" gradientTransform="matrix(-4.12776 0 0 4.1366 1244.465 -11.905)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+    <linearGradient id="m" x1="292.972" x2="296.94" y1="4.759" y2="10.711" gradientTransform="matrix(4.05343 0 0 4.1366 -1175.535 -11.905)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+    <linearGradient id="w" x1="39.62" x2="-3.533" y1="44.541" y2="-11.889" gradientTransform="matrix(1.16188 0 0 .9925 -5.112 .064)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="r" x1="13.825" x2="7.67" y1="40.069" y2="2.326" gradientTransform="matrix(1.16188 0 0 .9925 -2.667 .064)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="q" x1="7.185" x2="25.152" y1="31.057" y2="50.775" gradientTransform="matrix(1.16188 0 0 .9925 -2.43 .266)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="n" x1="20.288" x2="24.326" y1="6.46" y2="23.943" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
+    <linearGradient id="j" x1="20.288" x2="24.326" y1="6.46" y2="23.943" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
+    <radialGradient id="s" cx="34.376" cy="37.5" r="8.389" fx="34.376" fy="37.5" gradientTransform="matrix(1 0 0 1.06038 0 -2.3)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="t" x1="298.479" x2="298.869" y1="13.6" y2="13.803" gradientUnits="userSpaceOnUse" xlink:href="#f"/>
+    <linearGradient id="u" x1="298.479" x2="298.869" y1="13.6" y2="13.803" gradientUnits="userSpaceOnUse" xlink:href="#g"/>
+    <radialGradient id="p" cx="25.188" cy="41.625" r="18.063" fx="25.188" fy="41.625" gradientTransform="matrix(1 0 0 .32526 0 28.086)" gradientUnits="userSpaceOnUse" xlink:href="#h"/>
+  </defs>
+  <path fill="url(#i)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" d="M 34.174311,1.6249997 C 34.386261,1.6935355 34.59157,1.7696619 34.798294,1.842502 C 35.449709,4.0395037 38.469777,6.2612218 37.321354,8.4491328 C 33.495509,14.82952 29.697021,21.294565 25.899759,27.72527 C 25.154013,27.872172 24.401732,27.952183 23.647995,27.96996 C 22.061603,28.01017 20.433063,27.775465 18.927431,27.23589 C 23.978303,18.684616 29.031301,10.114483 34.174311,1.6249997 z"/>
+  <path fill="url(#j)" d="M 34.288823,4.25 C 34.057702,4.5574529 33.839208,5.120942 33.602793,5.40625 C 29.555938,12.158979 25.440784,18.900329 21.378976,25.625 C 21.318425,25.878117 20.565047,26.637291 21.366935,26.567963 C 22.478492,26.765843 23.638682,26.918567 24.746762,26.625 C 28.505752,20.407794 32.192639,14.142582 35.943048,7.9231779 C 36.285519,7.5359043 36.352163,6.9979201 35.992403,6.611197 C 35.462387,5.7945892 34.925464,4.9364821 34.382373,4.15625 L 34.311813,4.2269607 L 34.288823,4.25 z"/>
+  <path fill="url(#k)" stroke="#9a0c00" stroke-linecap="round" stroke-linejoin="round" stroke-width=".281" d="M297.044 12.3L296.399 13.385 295.133 14.719 294.732 13.673 295.747 11.96 297.044 12.3z" transform="matrix(3.6379 0 0 3.47038 -1056.116 -16.007)"/>
+  <path fill="url(#l)" d="M 20.40625,26.96875 C 19.183905,27.455468 19.192232,29.003929 18.481272,29.932762 C 18.138949,30.648557 17.537483,31.278989 17.28125,32.03125 C 17.271571,32.546641 17.729203,33.391474 18.3125,32.9375 C 19.697476,31.791172 20.876866,30.398821 21.756725,28.810629 C 21.989088,28.320596 22.552476,27.916466 22.625,27.40625 C 22.086431,26.835441 21.112182,26.873225 20.40625,26.96875 z"/>
+  <path fill="url(#m)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" d="M 12.960099,1.6249997 C 12.751966,1.6935355 12.550355,1.7696619 12.347353,1.842502 C 11.707669,4.0395037 8.7419877,6.2612218 9.8697297,8.4491328 C 13.626677,14.82952 17.35676,21.294565 21.085639,27.72527 C 21.817956,27.872172 22.55669,27.952183 23.296853,27.96996 C 24.854677,28.01017 26.453889,27.775465 27.932407,27.23589 C 22.972493,18.684616 18.010492,10.114483 12.960099,1.6249997 z"/>
+  <path fill="url(#n)" d="M 12.719667,4.25 C 12.336632,5.3766793 11.270006,6.2059645 11.004855,7.40625 C 14.713376,13.800362 18.475798,20.175378 22.181757,26.5625 C 23.380123,26.820799 24.610198,26.655657 25.795112,26.40625 C 25.606339,25.665807 25.056911,25.075319 24.765129,24.3767 C 20.870526,17.806174 16.941429,11.242872 13.087127,4.65625 C 13.072466,4.5046403 12.870425,4.1721152 12.719667,4.25 z"/>
+  <path fill="url(#o)" d="M 24.190449 23.843431 A 0.98252523 0.98252523 0 1 1 22.225399,23.843431 A 0.98252523 0.98252523 0 1 1 24.190449 23.843431 z" color="#000" style="marker:none" transform="matrix(.9799 0 0 1 .311 .174)"/>
+  <path fill="url(#p)" fill-rule="evenodd" d="M 43.25 41.625 A 18.0625 5.875 0 1 1 7.125,41.625 A 18.0625 5.875 0 1 1 43.25 41.625 z" color="#000" opacity=".267" style="marker:none" transform="matrix(1.25605 0 0 .81915 -7.2 9.09)"/>
+  <path fill="url(#q)" stroke="#a40000" d="M 17.700393,30.286934 C 20.935404,32.013583 21.196229,36.899851 18.278338,41.201286 C 15.360479,45.50525 10.373849,47.596472 7.1373807,45.877418 C 3.9008825,44.150767 3.6415462,39.267032 6.5594356,34.965597 C 9.4758075,30.664166 14.463925,28.572944 17.700393,30.286934 z M 15.845268,33.029079 C 14.408745,32.26545 11.33781,33.569599 9.3789266,36.463107 C 7.4160164,39.356612 7.5560293,42.376624 8.991202,43.137951 C 10.426348,43.906181 13.499985,42.597432 15.458868,39.703925 C 17.42313,36.81042 17.281765,33.792709 15.845268,33.029079 z"/>
+  <path fill="url(#r)" d="M 14.3255,30.583289 C 12.400369,30.97051 10.691041,32.037306 9.2785926,33.064531 C 8.5268294,33.759433 8.0350294,34.514452 7.3629449,35.31874 C 5.6546178,37.670805 4.9387067,40.762168 6.2901069,43.388409 C 6.90956,44.841515 8.9327419,45.435852 10.658323,45.067542 C 12.110236,44.819078 13.339639,43.906473 14.470735,43.268641 C 15.391637,42.47786 16.024749,41.642131 16.803626,40.677364 C 18.612986,38.202962 19.595537,34.928687 18.101604,32.165081 C 17.377898,31.022952 15.866963,30.41829 14.3255,30.583289 z M 14.797513,31.54477 C 16.814017,31.795124 18.154487,33.577585 17.92006,35.266634 C 17.940833,37.553573 16.774038,39.710728 15.196909,41.500756 C 13.779705,42.902737 11.848294,44.229027 9.5327534,44.137076 C 8.1738996,44.134209 7.100179,43.224779 6.7169325,42.176618 C 6.1002938,39.644695 6.9116496,36.911389 8.6831288,34.83862 C 10.041367,33.315308 11.877976,31.95152 14.150642,31.596926 C 14.366331,31.581652 14.581522,31.554432 14.797513,31.54477 z"/>
+  <path fill="url(#s)" stroke="#a40000" d="M 30.331764,30.286934 C 27.096753,32.013583 26.835929,36.899851 29.75382,41.201286 C 32.671679,45.50525 37.658309,47.596472 40.894777,45.877418 C 44.131276,44.150767 44.390611,39.267032 41.472722,34.965597 C 38.55635,30.664166 33.568233,28.572944 30.331764,30.286934 z M 32.18689,33.029079 C 33.623412,32.26545 36.694348,33.569599 38.653231,36.463107 C 40.616141,39.356612 40.476128,42.376624 39.040956,43.137951 C 37.60581,43.906181 34.532173,42.597432 32.57329,39.703925 C 30.609028,36.81042 30.750393,33.792709 32.18689,33.029079 z"/>
+  <path fill="url(#t)" stroke="url(#u)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".276" d="M296.956 12.3L297.6 13.385 298.867 14.719 299.268 13.673 298.254 11.96 296.956 12.3z" transform="translate(-1053.179 -16.847) scale(3.62444)"/>
+  <path fill="url(#v)" d="M 26.15625,27.9375 C 25.729502,28.136321 25.139436,28.138981 24.8125,28.4375 C 25.76252,29.838889 26.702412,31.352161 27.663379,32.650077 C 28.331933,33.404621 29.019194,34.150303 29.78125,34.8125 C 30.516527,33.421076 29.91641,31.751292 28.96875,30.625 C 28.366215,29.725307 28.138928,28.512038 27.125,28.03125 C 26.820951,27.912839 26.474385,27.853373 26.15625,27.9375 z"/>
+  <path fill="url(#w)" d="M 32.280087,30.449093 C 30.759703,30.678844 29.385141,31.534748 29.039639,32.837057 C 27.908495,35.232508 28.824763,37.950571 30.319418,40.063908 C 31.421345,41.40911 32.259488,42.993821 33.959001,43.837878 C 35.429654,44.761502 37.300143,45.728452 39.176641,45.138766 C 40.689956,44.705317 41.547313,43.4582 41.856813,42.166912 C 42.461243,39.856882 41.561117,37.490951 40.149846,35.530428 C 39.491173,34.616722 38.816861,33.647222 38.036528,32.835783 C 36.841969,31.932329 35.398614,31.184254 33.947688,30.603431 C 33.41359,30.493019 32.832464,30.37069 32.280087,30.449093 z M 32.715792,31.658699 C 34.473095,31.591923 35.950305,32.398157 37.092162,33.427664 C 38.124459,34.396792 39.113817,35.23287 39.754673,36.426541 C 40.831856,38.24711 41.142534,40.4065 40.594777,42.390073 C 40.066397,43.714585 38.368623,44.362109 36.803657,44.006518 C 34.821776,43.77769 33.586317,42.335503 32.277091,41.198158 C 30.771344,39.766768 29.83647,37.719532 29.76651,35.715783 C 29.780622,34.698114 29.740042,33.53736 30.464653,32.682212 C 30.876926,32.139062 31.84466,31.627886 32.715792,31.658699 z"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/filter.png b/src/icons/filter.png
deleted file mode 100644
index 58ec8744..00000000
Binary files a/src/icons/filter.png and /dev/null differ
diff --git a/src/icons/find_edit.svg b/src/icons/find_edit.svg
new file mode 100644
index 00000000..a977580c
--- /dev/null
+++ b/src/icons/find_edit.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	width="16" height="16" version="1.1">
+	<title>Find Edit</title>
+	<desc>Find Edit</desc>
+	<g id="icon" transform="translate(8,8)">
+		<defs>
+			<linearGradient id="backing" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#767a80" />
+				<stop offset="100%" stop-color="#000000" />
+			</linearGradient>
+			<linearGradient id="block" x1="0%" y1="0%" x2="100%" y2="0%">
+				<stop offset="0%" stop-color="#86929f" />
+				<stop offset="33%" stop-color="#bac3cc" />
+				<stop offset="100%" stop-color="#8b98a6" />
+			</linearGradient>
+			<linearGradient id="shade" x1="0%" y1="0%" x2="100%" y2="0%">
+				<stop offset="0%" stop-color="#000" stop-opacity="0" />
+				<stop offset="20%" stop-color="#000" stop-opacity="0.7" />
+				<stop offset="100%" stop-color="#000" />
+			</linearGradient>
+			<linearGradient id="shade2" x1="0%" y1="0%" x2="100%" y2="0%">
+				<stop offset="0%" stop-color="#000" />
+				<stop offset="80%" stop-color="#000" stop-opacity="0.7" />
+				<stop offset="100%" stop-color="#000" stop-opacity="0" />
+			</linearGradient>
+			<linearGradient id="swivel-shade" x1="0%" y1="0%" x2="0%" y2="100%">
+				<stop offset="0%" stop-color="#000" stop-opacity="0.4" />
+				<stop offset="100%" stop-color="#000" stop-opacity="0" />
+			</linearGradient>
+			<linearGradient id="swivel" x1="0%" y1="0%" x2="100%" y2="0%">
+				<stop offset="0%" stop-color="#7b91aa" />
+				<stop offset="33%" stop-color="#94a7ba" />
+				<stop offset="100%" stop-color="#7d8d9f" />
+			</linearGradient>
+			<linearGradient id="top-left" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#7d8a96" />
+				<stop offset="100%" stop-color="#484f56" />
+			</linearGradient>
+			<linearGradient id="top-right" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#93a0ae" />
+				<stop offset="100%" stop-color="#010101" />
+			</linearGradient>
+			<linearGradient id="top-center" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#aeb8c3" />
+				<stop offset="100%" stop-color="#5e6770" />
+			</linearGradient>
+		</defs>
+		<path fill="url(#backing)"
+			d="M0,0 h6 v5.5 a0.5,0.5 0 0,1 -.5,0.5 h-5 a0.5,0.5 0 0,1 -.5,-.5 v-5.5 m-1,0 h-6 v5.5 a0.5,0.5 0 0,0 0.5,0.5 h5 a0.5,0.5 0 0,0 0.5,-.5 l0-5.5 z" />
+		<rect width="1" height="1.5" x="-1" y="-1" fill="url(#backing)" />
+		<rect width="4" height="4" x="1" y="1" fill="url(#block)" />
+		<rect width="4" height="4" x="-6" y="1" fill="url(#block)" />
+		<rect width="2" height="3" x="-7" y="2" fill="url(#shade2)" opacity="0.3" />
+		<rect width="2" height="3" x="0" y="2" fill="url(#shade2)" opacity="0.3" />
+		<rect width="3" height="3" x="-4" y="2" fill="url(#shade)" opacity="0.3" />
+		<rect width="3" height="3" x="3" y="2" fill="url(#shade)" opacity="0.3" />
+		<path fill="url(#top-right)"
+			d="M0,0 v-6 h3 v1.5 a0.5,0.5 0 0,0 0.5,0.5 l0.5,0 a2,2 0 0,1 2,2 v2 " />
+		<path fill="url(#top-center)"
+			d="M1,0 v-5 h1 v1.5 a0.5,0.5 0 0,0 0.5,0.5 l0.5,0 a2,2 0 0,1 2,2 v1 " />
+		<path fill="url(#top-left)"
+			d="M-1,0 v-6 h-3 v1.5 a0.5,0.5 0 0,1 -.5,0.5 l-0.5,0 a2,2 0 0,0 -2,2 v2 " />
+		<path fill="url(#top-center)"
+			d="M-2,0 v-5 h-1 v1.5 a0.5,0.5 0 0,1 -.5,0.5 l-0.5,0 a2,2 0 0,0 -2,2 v1 " />
+		<rect width="5" height="2" x="-3" y="-3" fill="url(#swivel)" />
+		<rect width="5" height="1.5" x="-3" y="-3" fill="url(#swivel-shade)" />
+		<g id="pencil" transform="translate(2,2)">
+			<defs>
+				<linearGradient id="top_center" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#f7e1c9" />
+					<stop offset="100%" stop-color="#f4cfa5" />
+				</linearGradient>
+				<linearGradient id="pencil-back" x1="100%" y1="0%" x2="0%"
+					y2="100%">
+					<stop offset="0%" stop-color="#ca9350" stop-opacity="1.0" />
+					<stop offset="20%" stop-color="#ca9350" stop-opacity="0.5" />
+					<stop offset="30%" stop-color="#ca9350" stop-opacity="0.0" />
+					<stop offset="55%" stop-color="#936d1e" stop-opacity="0.0" />
+					<stop offset="65%" stop-color="#936d1e" stop-opacity="0.3" />
+					<stop offset="80%" stop-color="#936d1e" stop-opacity="0.9" />
+					<stop offset="92%" stop-color="#936d1e" stop-opacity="1.0" />
+					<stop offset="94%" stop-color="#594212" stop-opacity="1.0" />
+				</linearGradient>
+				<linearGradient id="pencil-cross" x1="37%" y1="37%" x2="63%"
+					y2="63%">
+					<stop offset="0%" stop-color="#e4ba2f" />
+					<stop offset="100%" stop-color="#d98f3b" />
+				</linearGradient>
+				<linearGradient id="pencil-nib" x1="100%" y1="0%" x2="0%" y2="100%">
+					<stop offset="0%" stop-color="#fae7d1" stop-opacity="1.0" />
+					<stop offset="75%" stop-color="#fae7d1" stop-opacity="0.9" />
+					<stop offset="100%" stop-color="#fae7d1" stop-opacity="0.0" />
+				</linearGradient>
+				<linearGradient id="pencil-outer" x1="37%" y1="37%" x2="63%"
+					y2="63%">
+					<stop offset="0%" stop-color="#f8edc3" />
+					<stop offset="10%" stop-color="#fcf4b3" />
+					<stop offset="45%" stop-color="#f4d644" />
+					<stop offset="55%" stop-color="#f4d644" />
+					<stop offset="90%" stop-color="#fcf4b3" />
+					<stop offset="100%" stop-color="#faee8e" />
+				</linearGradient>
+				<linearGradient id="pencil-nib-shadow" x1="0%" y1="0%" x2="100%"
+					y2="100%">
+					<stop offset="0%" stop-color="#e07500" stop-opacity="0.0" />
+					<stop offset="40%" stop-color="#e07500" stop-opacity="0.2" />
+					<stop offset="50%" stop-color="#e07500" stop-opacity="0.45" />
+					<stop offset="60%" stop-color="#e07500" stop-opacity="0.4" />
+					<stop offset="100%" stop-color="#e07500" stop-opacity="0.0" />
+				</linearGradient>
+			</defs>
+			<path fill="url(#pencil-cross)" d="M2,-5 l-8,8 v3 h3 l8,-8 a2,1.25 45 0,0 -3,-3" />
+			<path fill="url(#pencil-back)" d="M2,-5 l-8,8 v3 h3 l8,-8 a2,1.25 45 0,0 -3,-3" />
+			<ellipse transform="translate(3.5,-3.5) rotate(45)" cx="0" cy="0" rx="1.25"
+				ry="0.75" fill="url(#top_center)" />
+			<path fill="url(#pencil-nib)" d="M-5,5 h2 l1,-1 a1.41,0.75 45 0,1 -2,-2 l-1,1 v2" />
+			<path fill="url(#pencil-nib-shadow)" d="M-5,5 h2 l1,-1 a1.41,0.75 45 0,1 -2,-2 l-1,1 v2" />
+			<path fill="url(#pencil-outer)"
+				d="M2,-4 l-5.5,5.5 a1.41,0.75 45 0,0 2,2 l5.5,-5.5 a1.41,0.75 45 0,1 -2,-2" />
+		</g>
+	</g>
+</svg>
diff --git a/src/icons/funnel.svg b/src/icons/funnel.svg
new file mode 100644
index 00000000..7f77114b
--- /dev/null
+++ b/src/icons/funnel.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	width="16" height="16" version="1.1">
+	<title>Funnel</title>
+	<desc>Funnel</desc>
+	<g id="icon" transform="translate(8,8)">
+		<defs>
+			<linearGradient id="backing" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#c3c3c3" />
+				<stop offset="100%" stop-color="#9a9a9a" />
+			</linearGradient>
+			<linearGradient id="center" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#f3f3f3" />
+				<stop offset="100%" stop-color="#c3c3c3" />
+			</linearGradient>
+			<linearGradient id="inner" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#ffffff" />
+				<stop offset="100%" stop-color="#f1f1f1" />
+			</linearGradient>
+			<linearGradient id="top" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#dadada" />
+				<stop offset="50%" stop-color="#c1c1c1" />
+				<stop offset="100%" stop-color="#cfcfcf" />
+			</linearGradient>
+		</defs>
+		<path fill="url(#backing)" d="M-2,1 l-5,-5 c0,-4 14,-4 14,0 l-5,5 v7 l-4,-4 v-2"/>
+		<path fill="url(#inner)" d="M-1,1 l-5,-5 c0,-3 12,-3 12,0 l-5,5 v4.8 l-2,-2" />
+		<path fill="url(#center)" d="M0,1 l-5,-5 c0,-2 10,-2 10,0 l-5,5 " />
+		<path fill="url(#top)" d="M-5,-4 c0,-2 10,-2 10,0 c0,1 -10,1 -10,0" />
+	</g>
+</svg>
diff --git a/src/icons/funnel_delete.svg b/src/icons/funnel_delete.svg
new file mode 100644
index 00000000..ae28e4e3
--- /dev/null
+++ b/src/icons/funnel_delete.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	width="16" height="16" version="1.1">
+	<title>Funnel Delete</title>
+	<desc>Funnel Delete</desc>
+	<g id="icon" transform="translate(8,8)">
+		<defs>
+			<linearGradient id="backing" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#c3c3c3" />
+				<stop offset="100%" stop-color="#9a9a9a" />
+			</linearGradient>
+			<linearGradient id="center" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#f3f3f3" />
+				<stop offset="100%" stop-color="#c3c3c3" />
+			</linearGradient>
+			<linearGradient id="inner" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#ffffff" />
+				<stop offset="100%" stop-color="#f1f1f1" />
+			</linearGradient>
+			<linearGradient id="top" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#dadada" />
+				<stop offset="50%" stop-color="#c1c1c1" />
+				<stop offset="100%" stop-color="#cfcfcf" />
+			</linearGradient>
+		</defs>
+		<path fill="url(#backing)" d="M-2,1 l-5,-5 c0,-4 14,-4 14,0 l-5,5 v7 l-4,-4 v-2"/>
+		<path fill="url(#inner)" d="M-1,1 l-5,-5 c0,-3 12,-3 12,0 l-5,5 v4.8 l-2,-2" />
+		<path fill="url(#center)" d="M0,1 l-5,-5 c0,-2 10,-2 10,0 l-5,5 " />
+		<path fill="url(#top)" d="M-5,-4 c0,-2 10,-2 10,0 c0,1 -10,1 -10,0" />
+	</g>
+	<g id="delete" transform="translate(12.5,12.5)">
+		<defs>
+			<linearGradient id="backing_delete" x1="0%" y1="0%" x2="100%"
+				y2="100%">
+				<stop offset="0%" stop-color="#c4581e" />
+				<stop offset="100%" stop-color="#b84503" />
+			</linearGradient>
+			<linearGradient id="center_delete" x1="0%" y1="0%" x2="100%"
+				y2="100%">
+				<stop offset="0%" stop-color="#fed6b8" />
+				<stop offset="100%" stop-color="#dd6401" />
+			</linearGradient>
+		</defs>
+		<circle id="back" r="3.5" fill="url(#backing_delete)" />
+		<circle id="center-dot" r="2.5" fill="url(#center_delete)" />
+		<path fill="#fff" d="M-1.5,-0.5 h3 v1 h-3 v-1 z " />
+	</g>
+</svg>
diff --git a/src/icons/hourglass.png b/src/icons/hourglass.png
deleted file mode 100644
index 57b03ce7..00000000
Binary files a/src/icons/hourglass.png and /dev/null differ
diff --git a/src/icons/hourglass.svg b/src/icons/hourglass.svg
new file mode 100644
index 00000000..18c6ba96
--- /dev/null
+++ b/src/icons/hourglass.svg
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 128 128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><linearGradient id="b" x1="83.2" x2="46.534" y1="111.65" y2="20.316" gradientUnits="userSpaceOnUse"><stop stop-color="#BBDEFB" offset=".0021923"/><stop stop-color="#E3F2FD" offset="1"/></linearGradient><path d="m56.31 59.58c1.57 0.67 1.61 3.21 0.05 3.93-5.14 2.39-30.07 12.39-30.07 48.79l-0.16 6.72 75.75 0.13-0.05-6.78c0-37.1-25.08-46.31-30.25-48.72-1.55-0.72-1.52-3.26 0.05-3.93 5.13-2.2 29.63-12.65 29.63-45.39l0.63-5.7-75.76-0.12 0.66 5.97c0 31.72 24.37 42.89 29.52 45.1z" fill="url(#b)"/><linearGradient id="a" x1="64.395" x2="64.395" y1="38.333" y2="114.21" gradientUnits="userSpaceOnUse"><stop stop-color="#FFCA7B" offset="0"/><stop stop-color="#FFA726" offset=".2539"/><stop stop-color="#FFCC80" offset=".4688"/><stop stop-color="#FFC875" offset=".6586"/><stop stop-color="#FFA726" offset=".8665"/></linearGradient><path d="M95.85,109.3C94,100.63,90.93,95,83.04,95H66.79l-0.01-34.35 c0-8.93,22.91-11.52,22.91-24.07l-50.95,0.03c0,12.1,22.75,15.28,22.75,24.13L61.52,95H45.64c-7.95,0-11.05,5.72-12.84,14.48 l-2.19,10.46l67.56,0.18L95.85,109.3z" fill="url(#a)"/><g opacity=".2"><path d="m29.48 11.52 69.05 0.11-0.27 2.37c-0.01 0.11-0.02 0.22-0.02 0.33 0 20.07-9.6 34.81-27.81 42.63-1.8 0.77-2.98 2.6-3.01 4.66s1.1 3.93 2.88 4.75c0.27 0.13 0.59 0.27 0.96 0.43 6.82 3.03 27.56 12.26 27.56 45.59l0.03 3.75-69.65-0.12 0.09-3.65v-0.07c0-14.14 3.9-25.69 11.61-34.33 6.15-6.92 13.1-10.09 16.07-11.44 0.24-0.11 0.46-0.21 0.66-0.3 1.78-0.83 2.91-2.69 2.88-4.75s-1.21-3.88-3.01-4.66c-8.33-3.58-27.71-14.87-27.71-42.34 0-0.11-0.01-0.22-0.02-0.33l-0.29-2.63m-3.35-3.01 0.66 5.97c0 31.72 24.37 42.89 29.52 45.1 1.57 0.67 1.61 3.21 0.05 3.93-5.14 2.39-30.07 12.39-30.07 48.79l-0.16 6.72 75.74 0.13-0.05-6.78c0-37.1-25.08-46.31-30.25-48.72-1.55-0.72-1.52-3.26 0.05-3.93 5.13-2.2 29.63-12.65 29.63-45.39l0.63-5.7-75.75-0.12z" fill="#424242"/></g><path d="m25.02 4h77.96c3.33 0 6.02 2.7 6.02 6.02 0 3.33-2.7 6.02-6.02 6.02h-77.96c-3.33 0-6.02-2.7-6.02-6.02s2.7-6.02 6.02-6.02z" fill="#795548"/><g opacity=".2"><path d="m102.98 7c1.67 0 3.02 1.36 3.02 3.02 0 1.67-1.36 3.02-3.02 3.02h-77.96c-1.67 0-3.02-1.36-3.02-3.02s1.36-3.02 3.02-3.02h77.96m0-3h-77.96c-3.32 0-6.02 2.7-6.02 6.02 0 3.33 2.7 6.02 6.02 6.02h77.96c3.33 0 6.02-2.7 6.02-6.02s-2.7-6.02-6.02-6.02z" fill="#424242"/></g><g opacity=".2"><path d="m87.43 38.61c-1.23 4.51-6.51 7.56-11.65 10.51-5.66 3.26-11 6.34-11 11.58l0.01 34.35c0 1.1 0.9 1.95 2 1.95h16.25c5.94 0 8.88 3.48 10.85 12.73l1.81 8.39-62.62-0.16 1.69-8.08c1.88-9.24 4.93-12.88 10.87-12.88h15.88c0.53 0 1.04-0.16 1.41-0.54 0.38-0.38 0.59-0.86 0.59-1.39l-0.03-34.29c0-5.21-5.35-8.4-11.02-11.78-5.02-3-10.19-6.08-11.44-10.38l46.4-0.01m2.26-2.01-50.95 0.02c0 12.1 22.75 15.28 22.75 24.12l0.03 34.26h-15.88c-7.95 0-11.05 5.72-12.84 14.48l-2.19 10.46 67.56 0.2-2.33-10.84c-1.84-8.67-4.91-14.3-12.8-14.3h-16.25l-0.01-34.35c0-8.93 22.91-11.49 22.91-24.05z" fill="#424242"/></g><path d="m24.86 112.31h78.28c3.23 0 5.85 2.62 5.85 5.85s-2.62 5.85-5.85 5.85h-78.28c-3.23 0-5.85-2.62-5.85-5.85 0-3.24 2.62-5.85 5.85-5.85z" fill="#795548"/><g opacity=".2"><path d="m103.14 115.31c1.57 0 2.85 1.28 2.85 2.85s-1.28 2.85-2.85 2.85h-78.28c-1.57 0-2.85-1.28-2.85-2.85s1.28-2.85 2.85-2.85h78.28m0-3h-78.28c-3.23 0-5.85 2.62-5.85 5.85s2.62 5.85 5.85 5.85h78.28c3.23 0 5.85-2.62 5.85-5.85s-2.62-5.85-5.85-5.85z" fill="#424242"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index d2e1275b..96383cd9 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -10,13 +10,13 @@
         <file alias="up">bullet_arrow_up.svg</file>
         <file alias="cancel">cancel.svg</file>
         <file alias="function">chart_curve.svg</file>
-        <file alias="clear_filters">clear_filters.png</file>
-        <file alias="clear_sorting">clear_sorting.png</file>
+        <file alias="clear_filters">funnel_delete.svg</file>
+        <file alias="clear_sorting">clear_sorting.svg</file>
         <file alias="keyword">cog.svg</file>
         <file alias="cog_go">cog_go.svg</file>
         <file>color_swatch.svg</file>
         <file alias="close">cross.svg</file>
-        <file alias="cut">cut.png</file>
+        <file alias="cut">edit_cut.svg</file>
         <file>database.svg</file>
         <file alias="db_new">database_add.svg</file>
         <file alias="db_open">database_go.svg</file>
@@ -24,7 +24,7 @@
         <file alias="db_revert">database_refresh.svg</file>
         <file alias="db_save">database_save.svg</file>
         <file alias="save_all">database_save.svg</file>
-        <file alias="filter">filter.png</file>
+        <file alias="filter">funnel.svg</file>
         <file>folder.svg</file>
         <file alias="document_open">folder_page.svg</file>
         <file>folder_user.svg</file>
@@ -33,25 +33,25 @@
         <file alias="clear_cond_formats">font_delete.svg</file>
         <file alias="edit_cond_formats">font_edit.svg</file>
         <file alias="whatis">help.svg</file>
-        <file alias="hourglass">hourglass.png</file>
+        <file alias="hourglass">hourglass.svg</file>
         <file alias="encryption">key.svg</file>
         <file alias="toolbar">layout_sidebar.svg</file>
         <file alias="db_detach">link_break.svg</file>
         <file alias="monitor_link">monitor_link.svg</file>
         <file>package.svg</file>
         <file alias="project_open">package_go.svg</file>
-        <file alias="project_save_as">package_rename.png</file>
-        <file alias="project_save">package_save.png</file>
+        <file alias="project_save_as">package_rename.svg</file>
+        <file alias="project_save">package_save.svg</file>
         <file alias="field_add">page_add.svg</file>
         <file alias="copy">page_copy.svg</file>
-        <file alias="sql_copy">page_copy_sql.png</file>
+        <file alias="sql_copy">script_copy.svg</file>
         <file alias="field_delete">page_delete.svg</file>
         <file alias="field_edit">page_edit.svg</file>
         <file alias="find">page_find.svg</file>
         <file alias="field">page_green.svg</file>
         <file alias="field_key">page_key.svg</file>
         <file alias="browser_open">page_link.svg</file>
-        <file alias="background_color">color_hsl.svg</file>
+        <file alias="background_color">page_white_color.svg</file>
         <file alias="paste">page_paste.svg</file>
         <file alias="save_sql">page_save.svg</file>
         <file alias="special_copy">page_white_copy.svg</file>
@@ -100,7 +100,7 @@
         <file alias="text_indent">text_padding_left.svg</file>
         <file alias="comment_block">text_padding_top.svg</file>
         <file alias="foreground_color">color_wheel.svg</file>
-        <file alias="text_replace">text_replace.png</file>
+        <file alias="text_replace">find_edit.svg</file>
         <file alias="text_underline">text_underlined.svg</file>
         <file alias="set_to_null">textfield_delete.svg</file>
         <file alias="settings">wrench.svg</file>
diff --git a/src/icons/package_rename.png b/src/icons/package_rename.png
deleted file mode 100644
index 41bf2be9..00000000
Binary files a/src/icons/package_rename.png and /dev/null differ
diff --git a/src/icons/package_rename.svg b/src/icons/package_rename.svg
new file mode 100644
index 00000000..46e6d68f
--- /dev/null
+++ b/src/icons/package_rename.svg
@@ -0,0 +1,383 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg74"
+   sodipodi:docname="package_rename.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata80">
+    <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>Package</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs78">
+    <linearGradient
+       y2="-2.4494897"
+       x2="0"
+       y1="-2.4494897"
+       x1="-4.8989795"
+       id="selected"
+       gradientTransform="scale(1.2247449,0.81649658)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1263"
+         stop-color="#6b8fc3"
+         offset="0%" />
+      <stop
+         id="stop1265"
+         stop-color="#7193c1"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="-1.4142136"
+       x2="-0.70710678"
+       y1="-1.4142136"
+       x1="-3.5355339"
+       id="selected-inner"
+       gradientTransform="scale(1.4142136,0.70710678)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1268"
+         stop-color="#7298d9"
+         offset="0%" />
+      <stop
+         id="stop1270"
+         stop-color="#7ba1d6"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="-2.5628464"
+       x2="4.9749372"
+       y1="-2.5628464"
+       x1="0"
+       id="caret"
+       gradientTransform="scale(0.60302269,1.6583124)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1273"
+         stop-color="#6b6b6b"
+         offset="0%" />
+      <stop
+         id="stop1275"
+         stop-color="#6e6e6e"
+         offset="100%" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1052"
+     id="namedview76"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.2830849"
+     inkscape:cy="4.0892656"
+     inkscape:window-x="1366"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg74" />
+  <title
+     id="title2">Package</title>
+  <desc
+     id="desc4">Package Software</desc>
+  <g
+     id="icon"
+     transform="translate(8,8)">
+    <defs
+       id="defs51">
+      <linearGradient
+         id="backing-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#d9b74f"
+           id="stop6" />
+        <stop
+           offset="100%"
+           stop-color="#c88e2c"
+           id="stop8" />
+      </linearGradient>
+      <linearGradient
+         id="backing-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#d7b04a"
+           id="stop11" />
+        <stop
+           offset="100%"
+           stop-color="#c58726"
+           id="stop13" />
+      </linearGradient>
+      <linearGradient
+         id="inner-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           id="stop16" />
+        <stop
+           offset="100%"
+           stop-color="#e8e8e8"
+           id="stop18" />
+      </linearGradient>
+      <linearGradient
+         id="inner-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#f7e4b2"
+           id="stop21" />
+        <stop
+           offset="100%"
+           stop-color="#ecc483"
+           id="stop23" />
+      </linearGradient>
+      <linearGradient
+         id="center-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="20%"
+           stop-color="#fff3d4"
+           id="stop26" />
+        <stop
+           offset="100%"
+           stop-color="#fee094"
+           id="stop28" />
+      </linearGradient>
+      <linearGradient
+         id="center-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="20%"
+           stop-color="#efc748"
+           id="stop31" />
+        <stop
+           offset="100%"
+           stop-color="#de9f32"
+           id="stop33" />
+      </linearGradient>
+      <linearGradient
+         id="top"
+         x1="0%"
+         y1="100%"
+         x2="100%"
+         y2="0%">
+        <stop
+           offset="0%"
+           stop-color="#f7d589"
+           id="stop36" />
+        <stop
+           offset="100%"
+           stop-color="#f5cf7f"
+           id="stop38" />
+      </linearGradient>
+      <linearGradient
+         id="lower-flap"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           stop-opacity="1.0"
+           id="stop41" />
+        <stop
+           offset="100%"
+           stop-color="#fef8e1"
+           stop-opacity="0.0"
+           id="stop43" />
+      </linearGradient>
+      <linearGradient
+         id="upper-flap"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           stop-opacity="0.0"
+           id="stop46" />
+        <stop
+           offset="100%"
+           stop-color="#fef8e1"
+           stop-opacity="1.0"
+           id="stop48" />
+      </linearGradient>
+    </defs>
+    <path
+       fill="url(#backing-right)"
+       d="M0,-8 l-8,4 v8 l8,4 z"
+       id="path53" />
+    <path
+       fill="url(#backing-left)"
+       d="M0,-8 l8,4 v8 l-8,4 z"
+       id="path55" />
+    <path
+       fill="url(#inner-right)"
+       d="M0,-7 l-7,3.5 v7 l7,3.5 z"
+       id="path57" />
+    <path
+       fill="url(#inner-left)"
+       d="M0,-7 l7,3.5 v7 l-7,3.5 z"
+       id="path59" />
+    <path
+       fill="url(#center-right)"
+       d="M-6,-2.5 v5.5 l6,3 v-5.5"
+       id="path61" />
+    <path
+       fill="url(#center-left)"
+       d="M6,-2.5 v5.5 l-6,3 v-5.5"
+       id="path63" />
+    <path
+       fill="url(#top)"
+       d="M-6,-3 l6,3 l6,-3 l-6,-3 l-6,3"
+       id="path65" />
+    <path
+       fill="url(#lower-flap)"
+       d="M0,0 v-3.5 h6.5"
+       id="path67" />
+    <path
+       fill="url(#upper-flap)"
+       d="M-6,-3 l6,-1 v-2"
+       id="path69" />
+    <path
+       fill="#765219"
+       opacity="0.5"
+       d="M-6,-3 h5 l1,3 v-4 v-2 l1,2.5 h-1 v-0.5"
+       id="path71" />
+  </g>
+  <g
+     transform="matrix(0.83410375,0,0,0.83410375,9.3703128,12.426297)"
+     id="icon-3">
+    <defs
+       id="defs1278">
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1314">
+        <stop
+           id="stop1310"
+           stop-color="#6b8fc3"
+           offset="0%" />
+        <stop
+           id="stop1312"
+           stop-color="#7193c1"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1320">
+        <stop
+           id="stop1316"
+           stop-color="#7298d9"
+           offset="0%" />
+        <stop
+           id="stop1318"
+           stop-color="#7ba1d6"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1326">
+        <stop
+           id="stop1322"
+           stop-color="#6b6b6b"
+           offset="0%" />
+        <stop
+           id="stop1324"
+           stop-color="#6e6e6e"
+           offset="100%" />
+      </linearGradient>
+    </defs>
+    <rect
+       id="rect1280"
+       y="-4"
+       x="-8"
+       height="8"
+       width="16"
+       style="fill:#c9c9c9" />
+    <path
+       id="path1282"
+       d="M -7,-3 H 8 V 4 H -8 V 3 h 1 z"
+       inkscape:connector-curvature="0"
+       style="fill:#e8e8e8" />
+    <rect
+       id="rect1284"
+       y="-3"
+       x="-7"
+       height="6"
+       width="14"
+       style="fill:#ffffff" />
+    <rect
+       id="rect1286"
+       y="-2"
+       x="-6"
+       height="4"
+       width="6"
+       style="fill:url(#selected)" />
+    <rect
+       id="rect1288"
+       y="-1"
+       x="-5"
+       height="2"
+       width="4"
+       style="fill:url(#selected-inner)" />
+    <path
+       id="path1290"
+       d="m 0,-4 h 1 v 0.25 a 0.5,0.5 0 0 0 1,0 V -4 h 1 v 1 H 2 V 3 H 3 V 4 H 2 V 3.75 a 0.5,0.5 0 0 0 -1,0 h 0.25 -1 v -1 h 1 v -6 h -1 v -1 z"
+       inkscape:connector-curvature="0"
+       style="fill:url(#caret)" />
+  </g>
+</svg>
diff --git a/src/icons/package_save.png b/src/icons/package_save.png
deleted file mode 100644
index 35eb7632..00000000
Binary files a/src/icons/package_save.png and /dev/null differ
diff --git a/src/icons/package_save.svg b/src/icons/package_save.svg
new file mode 100644
index 00000000..88fd0a2e
--- /dev/null
+++ b/src/icons/package_save.svg
@@ -0,0 +1,631 @@
+<?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"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg74"
+   sodipodi:docname="package_save.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata80">
+    <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>Package</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs78">
+    <linearGradient
+       y2="3.1622777"
+       x2="-4.7434165"
+       y1="-6.3245553"
+       x1="4.7434165"
+       id="center"
+       gradientTransform="scale(1.0540926,0.9486833)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1003"
+         stop-color="#a0bedc"
+         offset="0%" />
+      <stop
+         id="stop1005"
+         stop-color="#b3d2f1"
+         offset="10%" />
+      <stop
+         id="stop1007"
+         stop-color="#d5e5fe"
+         offset="50%" />
+    </linearGradient>
+    <linearGradient
+       y2="-7.1157103"
+       x2="6.0008064"
+       y1="-4.0661202"
+       x1="2.9512163"
+       id="corner"
+       gradientTransform="scale(1.01653,0.98373875)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1010"
+         stop-color="#cde6fc"
+         offset="0%" />
+      <stop
+         id="stop1012"
+         stop-color="#7db2e2"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4833148"
+       x2="7.4833148"
+       y1="-7.4833148"
+       x1="-7.4833148"
+       id="backing"
+       gradientTransform="scale(0.93541435,1.069045)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1015"
+         stop-color="#4f8cc8"
+         offset="0%" />
+      <stop
+         id="stop1017"
+         stop-color="#2e62b7"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="5.4772256"
+       x2="2.7386128"
+       y1="10.954451"
+       x1="-2.7386128"
+       id="base"
+       gradientTransform="scale(1.8257419,0.54772256)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1020"
+         stop-color="#68bffd"
+         offset="0%" />
+      <stop
+         id="stop1022"
+         stop-color="#4fb2f7"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="11.313708"
+       x2="1.4142136"
+       y1="14.142136"
+       x1="-1.4142136"
+       id="base-center"
+       gradientTransform="scale(2.8284271,0.35355339)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1025"
+         stop-color="#a0d8ff"
+         offset="0%" />
+      <stop
+         id="stop1027"
+         stop-color="#93d4ff"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="6.4807407"
+       x2="-6.4807407"
+       y1="-6.4807407"
+       x1="6.4807407"
+       id="line"
+       gradientTransform="scale(0.9258201,1.0801234)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1030"
+         stop-color="#fff"
+         offset="0%" />
+      <stop
+         id="stop1032"
+         stop-color="#eaf1f8"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-6"
+       y1="-5"
+       x1="-6"
+       id="backing_disk"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop1051"
+         stop-color="#6e97d4"
+         offset="0%" />
+      <stop
+         id="stop1053"
+         stop-color="#5884c3"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="100%"
+       x2="100%"
+       y1="0%"
+       x1="0%"
+       id="center_disk">
+      <stop
+         id="stop1056"
+         stop-color="#b0cdf3"
+         offset="0%" />
+      <stop
+         id="stop1058"
+         stop-color="#85a2dd"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="0%"
+       x2="100%"
+       y1="0%"
+       x1="0%"
+       id="label_disk">
+      <stop
+         id="stop1061"
+         stop-color="#a8d782"
+         offset="0%" />
+      <stop
+         id="stop1063"
+         stop-color="#d7f4a2"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#center_disk"
+       id="linearGradient1196"
+       x1="-5"
+       y1="-4"
+       x2="3"
+       y2="4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#center_disk"
+       id="linearGradient1198"
+       x1="-4.2426407"
+       y1="-2.8284271"
+       x2="-2.8284271"
+       y2="-1.4142136"
+       gradientTransform="scale(0.70710678,1.4142136)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#label_disk"
+       id="linearGradient1220"
+       gradientUnits="userSpaceOnUse"
+       x1="-3"
+       y1="2"
+       x2="-1"
+       y2="2" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1052"
+     id="namedview76"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-0.06779661"
+     inkscape:cy="8"
+     inkscape:window-x="1366"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg74" />
+  <title
+     id="title2">Package</title>
+  <desc
+     id="desc4">Package Software</desc>
+  <g
+     id="icon"
+     transform="translate(8,8)">
+    <defs
+       id="defs51">
+      <linearGradient
+         id="backing-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#d9b74f"
+           id="stop6" />
+        <stop
+           offset="100%"
+           stop-color="#c88e2c"
+           id="stop8" />
+      </linearGradient>
+      <linearGradient
+         id="backing-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#d7b04a"
+           id="stop11" />
+        <stop
+           offset="100%"
+           stop-color="#c58726"
+           id="stop13" />
+      </linearGradient>
+      <linearGradient
+         id="inner-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           id="stop16" />
+        <stop
+           offset="100%"
+           stop-color="#e8e8e8"
+           id="stop18" />
+      </linearGradient>
+      <linearGradient
+         id="inner-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#f7e4b2"
+           id="stop21" />
+        <stop
+           offset="100%"
+           stop-color="#ecc483"
+           id="stop23" />
+      </linearGradient>
+      <linearGradient
+         id="center-right"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="20%"
+           stop-color="#fff3d4"
+           id="stop26" />
+        <stop
+           offset="100%"
+           stop-color="#fee094"
+           id="stop28" />
+      </linearGradient>
+      <linearGradient
+         id="center-left"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="20%"
+           stop-color="#efc748"
+           id="stop31" />
+        <stop
+           offset="100%"
+           stop-color="#de9f32"
+           id="stop33" />
+      </linearGradient>
+      <linearGradient
+         id="top"
+         x1="0%"
+         y1="100%"
+         x2="100%"
+         y2="0%">
+        <stop
+           offset="0%"
+           stop-color="#f7d589"
+           id="stop36" />
+        <stop
+           offset="100%"
+           stop-color="#f5cf7f"
+           id="stop38" />
+      </linearGradient>
+      <linearGradient
+         id="lower-flap"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           stop-opacity="1.0"
+           id="stop41" />
+        <stop
+           offset="100%"
+           stop-color="#fef8e1"
+           stop-opacity="0.0"
+           id="stop43" />
+      </linearGradient>
+      <linearGradient
+         id="upper-flap"
+         x1="0%"
+         y1="0%"
+         x2="100%"
+         y2="100%">
+        <stop
+           offset="0%"
+           stop-color="#fef8e1"
+           stop-opacity="0.0"
+           id="stop46" />
+        <stop
+           offset="100%"
+           stop-color="#fef8e1"
+           stop-opacity="1.0"
+           id="stop48" />
+      </linearGradient>
+    </defs>
+    <path
+       fill="url(#backing-right)"
+       d="M0,-8 l-8,4 v8 l8,4 z"
+       id="path53" />
+    <path
+       fill="url(#backing-left)"
+       d="M0,-8 l8,4 v8 l-8,4 z"
+       id="path55" />
+    <path
+       fill="url(#inner-right)"
+       d="M0,-7 l-7,3.5 v7 l7,3.5 z"
+       id="path57" />
+    <path
+       fill="url(#inner-left)"
+       d="M0,-7 l7,3.5 v7 l-7,3.5 z"
+       id="path59" />
+    <path
+       fill="url(#center-right)"
+       d="M-6,-2.5 v5.5 l6,3 v-5.5"
+       id="path61" />
+    <path
+       fill="url(#center-left)"
+       d="M6,-2.5 v5.5 l-6,3 v-5.5"
+       id="path63" />
+    <path
+       fill="url(#top)"
+       d="M-6,-3 l6,3 l6,-3 l-6,-3 l-6,3"
+       id="path65" />
+    <path
+       fill="url(#lower-flap)"
+       d="M0,0 v-3.5 h6.5"
+       id="path67" />
+    <path
+       fill="url(#upper-flap)"
+       d="M-6,-3 l6,-1 v-2"
+       id="path69" />
+    <path
+       fill="#765219"
+       opacity="0.5"
+       d="M-6,-3 h5 l1,3 v-4 v-2 l1,2.5 h-1 v-0.5"
+       id="path71" />
+  </g>
+  <g
+     transform="translate(9,8)"
+     id="icon-3">
+    <defs
+       id="defs1035">
+      <linearGradient
+         y2="1"
+         x2="0"
+         y1="0"
+         x1="1"
+         id="linearGradient1127">
+        <stop
+           id="stop1121"
+           stop-color="#a0bedc"
+           offset="0%" />
+        <stop
+           id="stop1123"
+           stop-color="#b3d2f1"
+           offset="10%" />
+        <stop
+           id="stop1125"
+           stop-color="#d5e5fe"
+           offset="50%" />
+      </linearGradient>
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="1"
+         x1="0"
+         id="linearGradient1133">
+        <stop
+           id="stop1129"
+           stop-color="#cde6fc"
+           offset="0%" />
+        <stop
+           id="stop1131"
+           stop-color="#7db2e2"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="1"
+         x2="1"
+         y1="0"
+         x1="0"
+         id="linearGradient1139">
+        <stop
+           id="stop1135"
+           stop-color="#4f8cc8"
+           offset="0%" />
+        <stop
+           id="stop1137"
+           stop-color="#2e62b7"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="1"
+         x1="0"
+         id="linearGradient1145">
+        <stop
+           id="stop1141"
+           stop-color="#68bffd"
+           offset="0%" />
+        <stop
+           id="stop1143"
+           stop-color="#4fb2f7"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="0"
+         x2="1"
+         y1="1"
+         x1="0"
+         id="linearGradient1151">
+        <stop
+           id="stop1147"
+           stop-color="#a0d8ff"
+           offset="0%" />
+        <stop
+           id="stop1149"
+           stop-color="#93d4ff"
+           offset="100%" />
+      </linearGradient>
+      <linearGradient
+         y2="1"
+         x2="0"
+         y1="0"
+         x1="1"
+         id="linearGradient1157">
+        <stop
+           id="stop1153"
+           stop-color="#fff"
+           offset="0%" />
+        <stop
+           id="stop1155"
+           stop-color="#eaf1f8"
+           offset="100%" />
+      </linearGradient>
+    </defs>
+    <g
+       transform="translate(3,3)"
+       id="save">
+      <defs
+         id="defs1066">
+        <linearGradient
+           y2="1"
+           x2="0"
+           y1="0"
+           x1="0"
+           id="linearGradient1171">
+          <stop
+             id="stop1167"
+             stop-color="#6e97d4"
+             offset="0%" />
+          <stop
+             id="stop1169"
+             stop-color="#5884c3"
+             offset="100%" />
+        </linearGradient>
+        <linearGradient
+           y2="1"
+           x2="1"
+           y1="0"
+           x1="0"
+           id="linearGradient1177">
+          <stop
+             id="stop1173"
+             stop-color="#b0cdf3"
+             offset="0%" />
+          <stop
+             id="stop1175"
+             stop-color="#85a2dd"
+             offset="100%" />
+        </linearGradient>
+        <linearGradient
+           y2="0"
+           x2="1"
+           y1="0"
+           x1="0"
+           id="linearGradient1183">
+          <stop
+             id="stop1179"
+             stop-color="#a8d782"
+             offset="0%" />
+          <stop
+             id="stop1181"
+             stop-color="#d7f4a2"
+             offset="100%" />
+        </linearGradient>
+      </defs>
+      <path
+         id="path1068"
+         d="m 0,-5 h -5 a 1,1 0 0 0 -1,1 v 8 a 1,1 0 0 0 1,1 H 3 A 1,1 0 0 0 4,4 V -3 L 2,-5 Z"
+         inkscape:connector-curvature="0"
+         style="fill:url(#backing_disk)" />
+      <rect
+         id="rect1070"
+         height="8"
+         width="8"
+         y="-4"
+         x="-5"
+         style="fill:url(#linearGradient1196)" />
+      <rect
+         id="rect1072"
+         height="3"
+         width="6"
+         y="-4"
+         x="-4"
+         style="fill:#ffffff" />
+      <rect
+         id="rect1074"
+         height="2"
+         width="1"
+         y="-4"
+         x="-3"
+         style="fill:url(#linearGradient1198)" />
+      <rect
+         id="rect1076"
+         height="3"
+         width="6"
+         y="1"
+         x="-4"
+         style="fill:#ffffff" />
+      <rect
+         height="2"
+         width="2"
+         y="2"
+         x="-3"
+         id="label_disk_part"
+         style="fill:url(#linearGradient1220)" />
+      <use
+         id="use1079"
+         transform="rotate(180,-1,3)"
+         xlink:href="#label_disk_part"
+         x="0"
+         y="0"
+         width="100%"
+         height="100%" />
+      <rect
+         id="rect1081"
+         height="6"
+         width="10"
+         y="-3"
+         x="-6"
+         style="opacity:0.05;fill:#000000" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/page_copy_sql.png b/src/icons/page_copy_sql.png
deleted file mode 100644
index 3b0e3f84..00000000
Binary files a/src/icons/page_copy_sql.png and /dev/null differ
diff --git a/src/icons/page_white_color.svg b/src/icons/page_white_color.svg
new file mode 100644
index 00000000..de305e43
--- /dev/null
+++ b/src/icons/page_white_color.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	width="16" height="16" version="1.1">
+	<title>White Page Color</title>
+	<desc>White Page Color</desc>
+	<g id="icon" transform="translate(8,8)">
+		<defs>
+			<linearGradient id="center" x1="100%" y1="0%" x2="0%" y2="100%">
+				<stop offset="0%" stop-color="#cacaca" />
+				<stop offset="10%" stop-color="#e9e9e9" />
+				<stop offset="50%" stop-color="#fff" />
+			</linearGradient>
+			<linearGradient id="corner" x1="0%" y1="100%" x2="100%" y2="0%">
+				<stop offset="0%" stop-color="#fff" />
+				<stop offset="100%" stop-color="#c1c1c1" />
+			</linearGradient>
+		</defs>
+		<path fill="#000" opacity="0.21"
+			d="M0,-8 h-6 a1,1 0 0,0 -1,1 v14 a1,1 0 0,0 1,1 h12 a1,1 0 0,0 1,-1 v-11.5 l-3.5,-3.5 l-4.5,0 Z" />
+		<path fill="#fff" d="M0,-7 h-6 v14 h12 v-11 l-3,-3 h-3 Z" />
+		<path fill="url(#center)" d="M0,-6 h-5 v12 h10 v-10 l-2,-2 h-2 Z" />
+		<path fill="#fff" d="M2,-7 h1 l3,3 v1 h-4 v-4 Z" />
+		<path fill="url(#corner)" d="M3,-7 l0.1,0 l3,3 l-3.1,0 v-3 Z" />
+		<g id="color-wheel" transform="scale(0.6) translate(6.2,6.2)">
+			<defs>
+				<linearGradient id="red" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#f00" stop-opacity="0" />
+					<stop offset="50%" stop-color="#f00" />
+					<stop offset="100%" stop-color="#f00" stop-opacity="0" />
+				</linearGradient>
+				<linearGradient id="masker" x1="0%" y1="0%" x2="0%" y2="100%">
+					<stop offset="0%" stop-color="#fff" stop-opacity="0" />
+					<stop offset="100%" stop-color="#fff" />
+				</linearGradient>
+				<linearGradient id="blue" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#00f" stop-opacity="0" />
+					<stop offset="50%" stop-color="#00f" />
+					<stop offset="100%" stop-color="#00f" stop-opacity="0" />
+				</linearGradient>
+				<linearGradient id="green" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#0f0" stop-opacity="0" />
+					<stop offset="50%" stop-color="#0f0" />
+					<stop offset="100%" stop-color="#0f0" stop-opacity="0" />
+				</linearGradient>
+				<linearGradient id="yellow" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#ff0" stop-opacity="0" />
+					<stop offset="50%" stop-color="#ff0" />
+					<stop offset="100%" stop-color="#ff0" stop-opacity="0" />
+				</linearGradient>
+				<linearGradient id="cyan" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#0ff" stop-opacity="0" />
+					<stop offset="50%" stop-color="#0ff" />
+					<stop offset="100%" stop-color="#0ff" stop-opacity="0" />
+				</linearGradient>
+				<linearGradient id="magenta" x1="0%" y1="0%" x2="100%" y2="0%">
+					<stop offset="0%" stop-color="#f0f" stop-opacity="0" />
+					<stop offset="50%" stop-color="#f0f" />
+					<stop offset="100%" stop-color="#f0f" stop-opacity="0" />
+				</linearGradient>
+				<radialGradient id="white">
+					<stop offset="0%" stop-color="#fff" stop-opacity="0" />
+					<stop offset="80%" stop-color="#fff" stop-opacity="0" />
+					<stop offset="100%" stop-color="#fff" />
+				</radialGradient>
+				<mask id="Mask">
+					<path fill="url(#masker)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z" />
+				</mask>
+			</defs>
+			<circle id="round" r="6" fill="#fff" />
+			<path transform="rotate(210)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#yellow)" mask="url(#Mask)" />
+			<path transform="rotate(90)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#cyan)" mask="url(#Mask)" />
+			<path transform="rotate(-30)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#magenta)" mask="url(#Mask)" />
+			<path transform="rotate(-90)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#red)" mask="url(#Mask)" />
+			<path transform="rotate(30)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#blue)" mask="url(#Mask)" />
+			<path transform="rotate(150)" d="M0,0 l6.062177,3.5 a7,7 0 0,1 -12.124354,0 Z"
+				fill="url(#green)" mask="url(#Mask)" />
+			<circle id="round" r="6" fill="url(#white)" />
+		</g>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/script_copy.svg b/src/icons/script_copy.svg
new file mode 100644
index 00000000..097afd0d
--- /dev/null
+++ b/src/icons/script_copy.svg
@@ -0,0 +1,210 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg27"
+   sodipodi:docname="script_copy.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata33">
+    <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>Script</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs31">
+    <linearGradient
+       id="backing-3"
+       x1="-8"
+       y1="-8"
+       x2="8"
+       y2="8"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0%"
+         stop-color="#5face2"
+         id="stop6-6" />
+      <stop
+         offset="50%"
+         stop-color="#598fd4"
+         id="stop8-7" />
+      <stop
+         offset="100%"
+         stop-color="#335f94"
+         id="stop10-5" />
+    </linearGradient>
+    <linearGradient
+       id="center-3"
+       x1="4.5276928"
+       y1="-5.3007131"
+       x2="-4.5276928"
+       y2="3.7546718"
+       gradientTransform="scale(0.88345221,1.1319231)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0%"
+         stop-color="#dfedfd"
+         id="stop13-5" />
+      <stop
+         offset="100%"
+         stop-color="#bddaf8"
+         id="stop15-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1052"
+     id="namedview29"
+     showgrid="false"
+     inkscape:zoom="20.85965"
+     inkscape:cx="2.4381271"
+     inkscape:cy="7.5199501"
+     inkscape:window-x="1366"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg27" />
+  <title
+     id="title2">Script</title>
+  <desc
+     id="desc4">Script</desc>
+  <g
+     id="icon"
+     transform="matrix(-0.7243482,0,0,0.7243482,5.7947853,5.842725)">
+    <defs
+       id="defs18">
+      <linearGradient
+         id="backing"
+         x1="-8"
+         y1="-8"
+         x2="8"
+         y2="8"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#5face2"
+           id="stop6" />
+        <stop
+           offset="50%"
+           stop-color="#598fd4"
+           id="stop8" />
+        <stop
+           offset="100%"
+           stop-color="#335f94"
+           id="stop10" />
+      </linearGradient>
+      <linearGradient
+         id="center"
+         x1="4.5276928"
+         y1="-5.3007131"
+         x2="-4.5276928"
+         y2="3.7546718"
+         gradientTransform="scale(0.88345221,1.1319231)"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#dfedfd"
+           id="stop13" />
+        <stop
+           offset="100%"
+           stop-color="#bddaf8"
+           id="stop15" />
+      </linearGradient>
+    </defs>
+    <path
+       d="m -3,-8 c 9,0 11,0 11,3 A 2,2 0 0 1 6,-3 C 6,6 5,8 3,8 -6,8 -8,8 -8,5 a 2,2 0 0 1 2,-2 c 0,-9 0,-11 3,-11"
+       id="path20"
+       style="fill:url(#backing)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m -4,-7 c 9,0 11,0 11,2 A 1,1 0 0 1 6,-4 C 6,-5.5 6,-5.5 5,-5.5 5,5 4,7 3,7 -5,7 -7,7 -7,5 h 9.25 v 0.25 a 0.5,0.5 0 0 0 1,0 V 4 l -8,-0.25 c 0,-9 0,-11 2,-11"
+       id="path22"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <path
+       d="m -3,-6 c 7,0 7,0 7,2 C 4,4 3,4 3,4.25 L -4,4 c 0,-10 0,-10 2,-10"
+       id="path24"
+       style="fill:url(#center)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="icon-2"
+     transform="matrix(-0.7243482,0,0,0.7243482,10.115223,10.199327)">
+    <defs
+       id="defs18-9">
+      <linearGradient
+         id="RESERVED_FOR_INKSCAPE_DUPLICATE_DEF_000000000"
+         x1="-8"
+         y1="-8"
+         x2="8"
+         y2="8"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#5face2"
+           id="stop858" />
+        <stop
+           offset="50%"
+           stop-color="#598fd4"
+           id="stop860" />
+        <stop
+           offset="100%"
+           stop-color="#335f94"
+           id="stop862" />
+      </linearGradient>
+      <linearGradient
+         id="RESERVED_FOR_INKSCAPE_DUPLICATE_DEF_000000001"
+         x1="4.5276928"
+         y1="-5.3007131"
+         x2="-4.5276928"
+         y2="3.7546718"
+         gradientTransform="scale(0.88345221,1.1319231)"
+         gradientUnits="userSpaceOnUse">
+        <stop
+           offset="0%"
+           stop-color="#dfedfd"
+           id="stop866" />
+        <stop
+           offset="100%"
+           stop-color="#bddaf8"
+           id="stop868" />
+      </linearGradient>
+    </defs>
+    <path
+       d="m -3,-8 c 9,0 11,0 11,3 A 2,2 0 0 1 6,-3 C 6,6 5,8 3,8 -6,8 -8,8 -8,5 a 2,2 0 0 1 2,-2 c 0,-9 0,-11 3,-11"
+       id="path20-1"
+       style="fill:url(#backing-3)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m -4,-7 c 9,0 11,0 11,2 A 1,1 0 0 1 6,-4 C 6,-5.5 6,-5.5 5,-5.5 5,5 4,7 3,7 -5,7 -7,7 -7,5 h 9.25 v 0.25 a 0.5,0.5 0 0 0 1,0 V 4 l -8,-0.25 c 0,-9 0,-11 2,-11"
+       id="path22-2"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <path
+       d="m -3,-6 c 7,0 7,0 7,2 C 4,4 3,4 3,4.25 L -4,4 c 0,-10 0,-10 2,-10"
+       id="path24-7"
+       style="fill:url(#center-3)"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/icons/text_replace.png b/src/icons/text_replace.png
deleted file mode 100644
index 877f82fe..00000000
Binary files a/src/icons/text_replace.png and /dev/null differ