diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc
index 6a010b0..2fcbdd5 100644
--- a/common/gtk-2.0/apps.rc
+++ b/common/gtk-2.0/apps.rc
@@ -25,3 +25,52 @@ widget_class "*ThunarWindow*.<GtkScrolledWindow>"       style "thunar-frame"
 widget_class "*ThunarShortcutsView*"                    style "dark-sidebar"
 widget_class "*ThunarTreeView*"                         style "dark-sidebar"
 widget_class "*ThunarWindow*.<GtkHPaned>"               style "thunar-handle"
+
+#
+# Mousepad
+#
+
+style "entry_border" {
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/entry-border-bg.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/entry-border-active-bg.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = NORMAL
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = ACTIVE
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
+  }
+}
+
+widget_class "*MousepadSearchBar*.<GtkEntry>"    style "entry_border"
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index ee913d7..83c6a16 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -565,9 +565,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="243.54683"
-     inkscape:cy="369.23846"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="32.121536"
+     inkscape:cy="224.28999"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -1753,8 +1753,8 @@
        transform="matrix(1.9947791,0,0,1.9939719,403.25667,278.01933)"
        id="sjhgfjsgf-2" />
     <g
-       style="display:inline"
-       id="entry-border-bg-solid"
+       style="display:inline;opacity:0.93"
+       id="entry-bg"
        inkscape:label="#g9335"
        transform="translate(-1,61.999998)">
       <rect
@@ -1787,7 +1787,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-border-active-bg-solid"
+       id="entry-active-bg"
        inkscape:label="#g9350"
        transform="translate(-1,61.999998)">
       <rect
@@ -1820,7 +1820,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-border-disabled-bg"
+       id="entry-disabled-bg"
        inkscape:label="#g9365"
        transform="translate(-1,61.999998)">
       <g
@@ -1857,13 +1857,17 @@
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-bg"
+       id="entry-notebook"
        inkscape:label="#g9335">
-      <path
-         style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 6.5 99 L 7.5 99 L 24.5 99 L 25.5 99 C 26.885 99 28 100.115 28 101.5 L 28 118.5 C 28 119.885 26.885 121 25.5 121 L 24.5 121 L 7.5 121 L 6.5 121 C 5.115 121 4 119.885 4 118.5 L 4 101.5 C 4 100.115 5.115 99 6.5 99 z "
-         transform="translate(-6,-377.63782)"
-         id="rect9321-6" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-3"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
@@ -1875,17 +1879,30 @@
          id="rect7903-7-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="-2"
+         height="21.999998"
+         width="24"
+         id="rect7903-93-7"
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-active-bg"
+       id="entry-active-notebook"
        inkscape:label="#g9350">
-      <path
-         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 40.5 99 L 41.5 99 L 58.5 99 L 59.5 99 C 60.885 99 62 100.115 62 101.5 L 62 118.5 C 62 119.885 60.885 121 59.5 121 L 58.5 121 L 41.5 121 L 40.5 121 C 39.115 121 38 119.885 38 118.5 L 38 101.5 C 38 100.115 39.115 99 40.5 99 z "
-         transform="translate(-6,-377.63782)"
-         id="rect9321-0-0" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-36"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          ry="3"
          rx="3.0000002"
@@ -1897,21 +1914,32 @@
          width="25"
          id="rect7903-7-3-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="32"
+         height="21.999998"
+         width="24"
+         id="rect7903-93-0"
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-disabled-bg"
+       id="entry-disabled-notebook"
        inkscape:label="#g9365">
       <g
          id="g4303-7">
         <rect
-           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-2"
+           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5076-6"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5"
@@ -1934,25 +1962,21 @@
            ry="3" />
       </g>
     </g>
-    <rect
-       style="display:inline;opacity:1;fill:#383c45;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="entry-border-fill"
-       width="5"
-       height="24.000002"
-       x="100.50003"
-       y="-246.88776"
-       inkscape:label="#rect4361" />
     <g
        style="display:inline"
        id="combo-entry"
        inkscape:label="#g9335"
        transform="translate(-1,169)"
        clip-path="url(#clipPath4466)">
-      <path
-         style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 6.5 174 L 25.5 174 L 26 174 C 26.296418 174 26.553519 174.1343 26.736328 174.33789 C 27.488884 174.76781 28 175.56782 28 176.5 L 28 193.5 C 28 194.43218 27.488884 195.23219 26.736328 195.66211 C 26.553519 195.8657 26.296418 196 26 196 L 25.5 196 L 6.5 196 L 6 196 C 5.7035817 196 5.4464809 195.8657 5.2636719 195.66211 C 4.5111162 195.23219 4 194.43218 4 193.5 L 4 176.5 C 4 175.56782 4.5111162 174.76781 5.2636719 174.33789 C 5.4464809 174.1343 5.7035817 174 6 174 z "
-         transform="translate(-6,-452.63782)"
-         id="rect9321-4" />
+      <rect
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-3"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -1964,6 +1988,15 @@
          id="rect7903-7-8-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-6"
+         width="23"
+         height="21.999998"
+         x="-2"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5" />
     </g>
     <g
        style="display:inline"
@@ -1971,11 +2004,24 @@
        inkscape:label="#g9350"
        transform="translate(-10,169)"
        clip-path="url(#clipPath4470)">
-      <path
-         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 31.5 174 L 50.5 174 L 51 174 C 51.296418 174 51.553519 174.1343 51.736328 174.33789 C 52.488884 174.76781 53 175.56782 53 176.5 L 53 193.5 C 53 194.43218 52.488884 195.23219 51.736328 195.66211 C 51.553519 195.8657 51.296418 196 51 196 L 50.5 196 L 31.5 196 L 31 196 C 30.703582 196 30.446481 195.8657 30.263672 195.66211 C 29.511116 195.23219 29 194.43218 29 193.5 L 29 176.5 C 29 175.56782 29.511116 174.76781 30.263672 174.33789 C 30.446481 174.1343 30.703582 174 31 174 z "
-         transform="translate(3,-452.63782)"
-         id="rect9321-0-5" />
+      <rect
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-2"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1"
+         width="23"
+         height="21.999998"
+         x="32"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5" />
       <rect
          ry="3"
          rx="3"
@@ -1997,12 +2043,14 @@
       <g
          id="g4303-70">
         <rect
-           style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7"
+           style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-33"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7"
@@ -2031,11 +2079,15 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9)"
        transform="translate(-1,199)">
-      <path
-         style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 6.5 204 L 25.5 204 L 26 204 C 26.296418 204 26.553519 204.1343 26.736328 204.33789 C 27.488884 204.76781 28 205.56782 28 206.5 L 28 223.5 C 28 224.43218 27.488884 225.23219 26.736328 225.66211 C 26.553519 225.8657 26.296418 226 26 226 L 25.5 226 L 6.5 226 L 6 226 C 5.7035817 226 5.4464809 225.8657 5.2636719 225.66211 C 4.5111162 225.23219 4 224.43218 4 223.5 L 4 206.5 C 4 205.56782 4.5111162 204.76781 5.2636719 204.33789 C 5.4464809 204.1343 5.7035817 204 6 204 z "
-         transform="translate(-6,-482.63782)"
-         id="rect9321-4-9" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-5"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2047,6 +2099,15 @@
          id="rect7903-7-8-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-5"
+         width="23"
+         height="21.999998"
+         x="-2"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5" />
     </g>
     <g
        style="display:inline"
@@ -2054,11 +2115,15 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7)"
        transform="translate(-10,199)">
-      <path
-         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 31.5 204 L 50.5 204 L 51 204 C 51.296418 204 51.553519 204.1343 51.736328 204.33789 C 52.488884 204.76781 53 205.56782 53 206.5 L 53 223.5 C 53 224.43218 52.488884 225.23219 51.736328 225.66211 C 51.553519 225.8657 51.296418 226 51 226 L 50.5 226 L 31.5 226 L 31 226 C 30.703582 226 30.446481 225.8657 30.263672 225.66211 C 29.511116 225.23219 29 224.43218 29 223.5 L 29 206.5 C 29 205.56782 29.511116 204.76781 30.263672 204.33789 C 30.446481 204.1343 30.703582 204 31 204 z "
-         transform="translate(3,-482.63782)"
-         id="rect9321-0-5-3" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-25"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          ry="3"
          rx="3"
@@ -2070,6 +2135,15 @@
          width="24"
          id="rect7903-7-3-1-0"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-9"
+         width="23"
+         height="21.999998"
+         x="32"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5" />
     </g>
     <g
        style="display:inline"
@@ -2080,12 +2154,14 @@
       <g
          id="g4303-70-8">
         <rect
-           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-4"
+           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-41"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4"
@@ -2256,11 +2332,16 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-1)"
        transform="matrix(-1,0,0,1,146,169)">
-      <path
-         style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 133.5 174 L 152.5 174 L 153 174 C 153.29642 174 153.55352 174.1343 153.73633 174.33789 C 154.48888 174.76781 155 175.56782 155 176.5 L 155 193.5 C 155 194.43218 154.48888 195.23219 153.73633 195.66211 C 153.55352 195.8657 153.29642 196 153 196 L 152.5 196 L 133.5 196 L 133 196 C 132.70358 196 132.44648 195.8657 132.26367 195.66211 C 131.51112 195.23219 131 194.43218 131 193.5 L 131 176.5 C 131 175.56782 131.51112 174.76781 132.26367 174.33789 C 132.44648 174.1343 132.70358 174 133 174 z "
-         transform="matrix(-1,0,0,1,153,-452.63782)"
-         id="rect9321-4-5" />
+      <rect
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-8"
+         width="26"
+         height="24"
+         x="-23"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2272,6 +2353,16 @@
          id="rect7903-7-8-76"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-7"
+         width="23"
+         height="21.999998"
+         x="-21"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5"
+         transform="scale(-1,1)" />
     </g>
     <g
        style="display:inline"
@@ -2279,11 +2370,16 @@
        inkscape:label="#g9350"
        transform="matrix(-1,0,0,1,155,169)"
        clip-path="url(#clipPath4470-6)">
-      <path
-         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 108.5 174 L 127.5 174 L 128 174 C 128.29642 174 128.55352 174.1343 128.73633 174.33789 C 129.48888 174.76781 130 175.56782 130 176.5 L 130 193.5 C 130 194.43218 129.48888 195.23219 128.73633 195.66211 C 128.55352 195.8657 128.29642 196 128 196 L 127.5 196 L 108.5 196 L 108 196 C 107.70358 196 107.44648 195.8657 107.26367 195.66211 C 106.51112 195.23219 106 194.43218 106 193.5 L 106 176.5 C 106 175.56782 106.51112 174.76781 107.26367 174.33789 C 107.44648 174.1343 107.70358 174 108 174 z "
-         transform="matrix(-1,0,0,1,162,-452.63782)"
-         id="rect9321-0-5-4" />
+      <rect
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-1"
+         width="26"
+         height="24"
+         x="-57"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
       <rect
          ry="3"
          rx="3"
@@ -2295,6 +2391,16 @@
          width="24"
          id="rect7903-7-3-1-2"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-1"
+         width="23"
+         height="21.999998"
+         x="-55"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5"
+         transform="scale(-1,1)" />
     </g>
     <g
        style="display:inline"
@@ -2305,12 +2411,15 @@
       <g
          id="g4303-70-0">
         <rect
-           style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-1"
+           style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-4"
            width="26"
            height="24"
-           x="65"
-           y="-279.63782" />
+           x="-91"
+           y="-279.63782"
+           rx="0"
+           ry="0"
+           transform="scale(-1,1)" />
         <rect
            style="opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-5"
@@ -2339,11 +2448,16 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9-0)"
        transform="matrix(-1,0,0,1,146,199)">
-      <path
-         style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 133.5 204 L 152.5 204 L 153 204 C 153.29642 204 153.55352 204.1343 153.73633 204.33789 C 154.48888 204.76781 155 205.56782 155 206.5 L 155 223.5 C 155 224.43218 154.48888 225.23219 153.73633 225.66211 C 153.55352 225.8657 153.29642 226 153 226 L 152.5 226 L 133.5 226 L 133 226 C 132.70358 226 132.44648 225.8657 132.26367 225.66211 C 131.51112 225.23219 131 224.43218 131 223.5 L 131 206.5 C 131 205.56782 131.51112 204.76781 132.26367 204.33789 C 132.44648 204.1343 132.70358 204 133 204 z "
-         transform="matrix(-1,0,0,1,153,-482.63782)"
-         id="rect9321-4-9-9" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-81"
+         width="26"
+         height="24"
+         x="-23"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2355,6 +2469,16 @@
          id="rect7903-7-8-9-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-97"
+         width="23"
+         height="21.999998"
+         x="-21"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5"
+         transform="scale(-1,1)" />
     </g>
     <g
        style="display:inline"
@@ -2362,11 +2486,16 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7-0)"
        transform="matrix(-1,0,0,1,155,199)">
-      <path
-         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 108.5 204 L 127.5 204 L 128 204 C 128.29642 204 128.55352 204.1343 128.73633 204.33789 C 129.48888 204.76781 130 205.56782 130 206.5 L 130 223.5 C 130 224.43218 129.48888 225.23219 128.73633 225.66211 C 128.55352 225.8657 128.29642 226 128 226 L 127.5 226 L 108.5 226 L 108 226 C 107.70358 226 107.44648 225.8657 107.26367 225.66211 C 106.51112 225.23219 106 224.43218 106 223.5 L 106 206.5 C 106 205.56782 106.51112 204.76781 107.26367 204.33789 C 107.44648 204.1343 107.70358 204 108 204 z "
-         transform="matrix(-1,0,0,1,162,-482.63782)"
-         id="rect9321-0-5-3-7" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-42"
+         width="26"
+         height="24"
+         x="-57"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
       <rect
          ry="3"
          rx="3"
@@ -2378,6 +2507,16 @@
          width="24"
          id="rect7903-7-3-1-0-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-1-76"
+         width="23"
+         height="21.999998"
+         x="-55"
+         y="-278.63782"
+         rx="2.5"
+         ry="2.5"
+         transform="scale(-1,1)" />
     </g>
     <g
        style="display:inline"
@@ -2388,12 +2527,15 @@
       <g
          id="g4303-70-8-0">
         <rect
-           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-4-0"
+           style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-9"
            width="26"
            height="24"
-           x="65"
-           y="-279.63782" />
+           x="-91"
+           y="-279.63782"
+           rx="0"
+           ry="0"
+           transform="scale(-1,1)" />
         <rect
            style="opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4-7"
@@ -4752,13 +4894,17 @@
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-bg"
+       id="entry-toolbar"
        inkscape:label="#g9335">
-      <path
-         style="opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 6.5 131 L 7.5 131 L 24.5 131 L 25.5 131 C 26.885 131 28 132.115 28 133.5 L 28 150.5 C 28 151.885 26.885 153 25.5 153 L 24.5 153 L 7.5 153 L 6.5 153 C 5.115 153 4 151.885 4 150.5 L 4 133.5 C 4 132.115 5.115 131 6.5 131 z "
-         transform="translate(-6,-409.63782)"
-         id="rect9321-6-7" />
+      <rect
+         style="display:inline;opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-61"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
@@ -4770,17 +4916,30 @@
          id="rect7903-7-1-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#252932;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="-2"
+         height="21.999998"
+         width="24"
+         id="rect7903-93-9"
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-active-bg"
+       id="entry-active-toolbar"
        inkscape:label="#g9350">
-      <path
-         style="display:inline;opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 40.5 131 L 41.5 131 L 58.5 131 L 59.5 131 C 60.885 131 62 132.115 62 133.5 L 62 150.5 C 62 151.885 60.885 153 59.5 153 L 58.5 153 L 41.5 153 L 40.5 153 C 39.115 153 38 151.885 38 150.5 L 38 133.5 C 38 132.115 39.115 131 40.5 131 z "
-         transform="translate(-6,-409.63782)"
-         id="rect9321-0-0-1" />
+      <rect
+         style="display:inline;opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-0"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          ry="3"
          rx="3"
@@ -4792,21 +4951,32 @@
          width="24.999998"
          id="rect7903-7-3-4-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="32"
+         height="21.999998"
+         width="24"
+         id="rect7903-93-1"
+         style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-disabled-bg"
+       id="entry-disabled-toolbar"
        inkscape:label="#g9365">
       <g
          id="g4303-7-3">
         <rect
-           style="display:inline;opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-2-1"
+           style="display:inline;opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5076-1"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#39404d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5-6"
@@ -4829,96 +4999,6 @@
            ry="3" />
       </g>
     </g>
-    <g
-       style="display:inline"
-       id="entry-border-bg"
-       inkscape:label="#g9335"
-       transform="translate(106,61.999997)">
-      <path
-         style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z "
-         transform="translate(-113,-345.63782)"
-         id="rect9321-3-7" />
-      <rect
-         rx="3.0000002"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-5.0639158"
-         y="-279.13782"
-         x="-2.5"
-         height="23"
-         width="25"
-         id="rect7903-7-31-1"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="3" />
-    </g>
-    <g
-       style="display:inline"
-       id="entry-border-active-bg"
-       inkscape:label="#g9350"
-       transform="translate(106,61.999997)">
-      <path
-         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z "
-         transform="translate(-113,-345.63782)"
-         id="rect9321-0-2-2" />
-      <rect
-         ry="3"
-         rx="3.0000002"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-5.0639177"
-         y="-279.13782"
-         x="31.500002"
-         height="23"
-         width="25"
-         id="rect7903-7-3-7-7"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <g
-       transform="matrix(-1,0,0,1,131,126)"
-       style="display:inline"
-       id="entry-border-bg-solid-spin"
-       inkscape:label="#g9335"
-       clip-path="url(#clipPath5131)">
-      <path
-         style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 115 130 L 115 154 L 141 154 L 141 130 L 115 130 z M 118.5 131 L 119.5 131 L 136.5 131 L 137.5 131 C 138.885 131 140 132.115 140 133.5 L 140 150.5 C 140 151.885 138.885 153 137.5 153 L 136.5 153 L 119.5 153 L 118.5 153 C 117.115 153 116 151.885 116 150.5 L 116 133.5 C 116 132.115 117.115 131 118.5 131 z "
-         transform="matrix(-1,0,0,1,138,-409.63782)"
-         id="rect9321-6-7-4" />
-      <rect
-         rx="3"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.8613593"
-         y="-279.13782"
-         x="-1.5000001"
-         height="23"
-         width="24"
-         id="rect7903-7-1-6-9"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="3" />
-    </g>
-    <g
-       transform="translate(103,126)"
-       style="display:inline"
-       id="entry-border-active-bg-solid-spin"
-       inkscape:label="#g9350"
-       clip-path="url(#clipPath5158)">
-      <path
-         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 141 130 L 141 154 L 167 154 L 167 130 L 141 130 z M 144.5 131 L 145.5 131 L 162.5 131 L 163.5 131 C 164.885 131 166 132.115 166 133.5 L 166 150.5 C 166 151.885 164.885 153 163.5 153 L 162.5 153 L 145.5 153 L 144.5 153 C 143.115 153 142 151.885 142 150.5 L 142 133.5 C 142 132.115 143.115 131 144.5 131 z "
-         transform="translate(-110,-409.63782)"
-         id="rect9321-0-0-1-3" />
-      <rect
-         ry="3"
-         rx="3"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.8613611"
-         y="-279.13782"
-         x="31.500002"
-         height="23"
-         width="24"
-         id="rect7903-7-3-4-9-5"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
     <g
        style="display:inline"
        id="menubar"
@@ -5536,5 +5616,51 @@
          style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          ry="2.5" />
     </g>
+    <g
+       style="display:inline"
+       id="entry-border-bg"
+       inkscape:label="#g9335"
+       transform="translate(-1,31)">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 110,66 0,24 26,0 0,-24 -26,0 z m 3.5,1 1,0 17,0 1,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,17 c 0,1.385 -1.115,2.5 -2.5,2.5 l -1,0 -17,0 -1,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-17 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
+         transform="translate(-113,-345.63782)"
+         id="rect9321-3-7" />
+      <rect
+         rx="3.0000002"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-5.0639158"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="25"
+         id="rect7903-7-31-1"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+    </g>
+    <g
+       style="display:inline"
+       id="entry-border-active-bg"
+       inkscape:label="#g9350"
+       transform="translate(-1,31)">
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 144,66 0,24 26,0 0,-24 -26,0 z m 3.5,1 1,0 17,0 1,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,17 c 0,1.385 -1.115,2.5 -2.5,2.5 l -1,0 -17,0 -1,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-17 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
+         transform="translate(-113,-345.63782)"
+         id="rect9321-0-2-2" />
+      <rect
+         ry="3"
+         rx="3.0000002"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-5.0639177"
+         y="-279.13782"
+         x="31.500002"
+         height="23"
+         width="25"
+         id="rect7903-7-3-7-7"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png
index 3d78384..0e5ada5 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png
index 2ebd63a..850b3f2 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png
index d8f8d55..ce55a18 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus.png b/common/gtk-2.0/assets-dark/combo-entry-focus.png
index e1e35fd..75e2590 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus.png and b/common/gtk-2.0/assets-dark/combo-entry-focus.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png
index f21d25b..4753a67 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-notebook.png
index 1fbe1f4..bd883b7 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-rtl.png
index 5b35cb0..8150968 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry.png b/common/gtk-2.0/assets-dark/combo-entry.png
index 1238651..5bd299b 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry.png and b/common/gtk-2.0/assets-dark/combo-entry.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png b/common/gtk-2.0/assets-dark/entry-active-bg.png
similarity index 100%
rename from common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png
rename to common/gtk-2.0/assets-dark/entry-active-bg.png
diff --git a/common/gtk-2.0/assets-dark/entry-active-notebook.png b/common/gtk-2.0/assets-dark/entry-active-notebook.png
new file mode 100644
index 0000000..b49b365
Binary files /dev/null and b/common/gtk-2.0/assets-dark/entry-active-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-active-toolbar.png b/common/gtk-2.0/assets-dark/entry-active-toolbar.png
new file mode 100644
index 0000000..ac880fb
Binary files /dev/null and b/common/gtk-2.0/assets-dark/entry-active-toolbar.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-bg.png b/common/gtk-2.0/assets-dark/entry-bg.png
new file mode 100644
index 0000000..6665512
Binary files /dev/null and b/common/gtk-2.0/assets-dark/entry-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png
deleted file mode 100644
index e7f3a9c..0000000
Binary files a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png and /dev/null differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-fill.png b/common/gtk-2.0/assets-dark/entry-border-fill.png
deleted file mode 100644
index 387a98b..0000000
Binary files a/common/gtk-2.0/assets-dark/entry-border-fill.png and /dev/null differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-bg.png
similarity index 100%
rename from common/gtk-2.0/assets-dark/entry-border-disabled-bg.png
rename to common/gtk-2.0/assets-dark/entry-disabled-bg.png
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-notebook.png
similarity index 100%
rename from common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png
rename to common/gtk-2.0/assets-dark/entry-disabled-notebook.png
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-disabled-toolbar.png
similarity index 100%
rename from common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png
rename to common/gtk-2.0/assets-dark/entry-disabled-toolbar.png
diff --git a/common/gtk-2.0/assets-dark/entry-notebook.png b/common/gtk-2.0/assets-dark/entry-notebook.png
new file mode 100644
index 0000000..cb3ede2
Binary files /dev/null and b/common/gtk-2.0/assets-dark/entry-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-toolbar.png b/common/gtk-2.0/assets-dark/entry-toolbar.png
new file mode 100644
index 0000000..5c04ca3
Binary files /dev/null and b/common/gtk-2.0/assets-dark/entry-toolbar.png differ
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png
deleted file mode 100644
index 60dad2a..0000000
Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png
deleted file mode 100644
index 37a9dc8..0000000
Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png
deleted file mode 100644
index 28d08e5..0000000
Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png
deleted file mode 100644
index a8dd05d..0000000
Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index 6d149fc..c6bdc86 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,12 +565,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="263.38272"
-     inkscape:cy="373.79667"
+     inkscape:zoom="4"
+     inkscape:cx="70.918098"
+     inkscape:cy="184.39866"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      showborder="false"
      inkscape:window-width="1366"
      inkscape:window-height="720"
@@ -1736,7 +1736,7 @@
        id="sjhgfjsgf-2" />
     <g
        style="display:inline"
-       id="entry-border-bg-solid"
+       id="entry-bg"
        inkscape:label="#g9335"
        transform="translate(-1,61.999998)">
       <rect
@@ -1769,7 +1769,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-border-active-bg-solid"
+       id="entry-active-bg"
        inkscape:label="#g9350"
        transform="translate(-1,61.999998)">
       <rect
@@ -1802,7 +1802,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-border-disabled-bg"
+       id="entry-disabled-bg"
        inkscape:label="#g9365"
        transform="translate(-1,61.999998)">
       <g
@@ -1839,13 +1839,17 @@
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-bg"
+       id="entry-notebook"
        inkscape:label="#g9335">
-      <path
-         style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 6.5 99 L 7.5 99 L 24.5 99 L 25.5 99 C 26.885 99 28 100.115 28 101.5 L 28 118.5 C 28 119.885 26.885 121 25.5 121 L 24.5 121 L 7.5 121 L 6.5 121 C 5.115 121 4 119.885 4 118.5 L 4 101.5 C 4 100.115 5.115 99 6.5 99 z "
-         transform="translate(-6,-377.63782)"
-         id="rect9321-6" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-9"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
@@ -1857,17 +1861,30 @@
          id="rect7903-7-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="-2"
+         height="22"
+         width="24"
+         id="rect7903-93-3"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-active-bg"
+       id="entry-active-notebook"
        inkscape:label="#g9350">
-      <path
-         style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 40.5 99 L 41.5 99 L 58.5 99 L 59.5 99 C 60.885 99 62 100.115 62 101.5 L 62 118.5 C 62 119.885 60.885 121 59.5 121 L 58.5 121 L 41.5 121 L 40.5 121 C 39.115 121 38 119.885 38 118.5 L 38 101.5 C 38 100.115 39.115 99 40.5 99 z "
-         transform="translate(-6,-377.63782)"
-         id="rect9321-0-0" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-8"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          ry="3"
          rx="3"
@@ -1879,21 +1896,32 @@
          width="24.999998"
          id="rect7903-7-3-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="32"
+         height="22"
+         width="24"
+         id="rect7903-93-8"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="notebook-entry-border-disabled-bg"
+       id="entry-disabled-notebook"
        inkscape:label="#g9365">
       <g
          id="g4303-7">
         <rect
-           style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-2"
+           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5076-75"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5"
@@ -1916,25 +1944,30 @@
            ry="3" />
       </g>
     </g>
-    <rect
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="entry-border-fill"
-       width="5"
-       height="24.000002"
-       x="100.50003"
-       y="-246.88776"
-       inkscape:label="#rect4361" />
     <g
        style="display:inline"
        id="combo-entry"
        inkscape:label="#g9335"
        transform="translate(-1,169)"
        clip-path="url(#clipPath4466)">
-      <path
-         style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 6.5 174 L 25.5 174 L 26 174 C 26.296418 174 26.553519 174.1343 26.736328 174.33789 C 27.488884 174.76781 28 175.56782 28 176.5 L 28 193.5 C 28 194.43218 27.488884 195.23219 26.736328 195.66211 C 26.553519 195.8657 26.296418 196 26 196 L 25.5 196 L 6.5 196 L 6 196 C 5.7035817 196 5.4464809 195.8657 5.2636719 195.66211 C 4.5111162 195.23219 4 194.43218 4 193.5 L 4 176.5 C 4 175.56782 4.5111162 174.76781 5.2636719 174.33789 C 5.4464809 174.1343 5.7035817 174 6 174 z "
-         transform="translate(-6,-452.63782)"
-         id="rect9321-4" />
+      <rect
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-2"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3"
+         width="23"
+         height="21.999998"
+         x="-2"
+         y="-278.63782"
+         rx="1"
+         ry="1" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -1953,11 +1986,24 @@
        inkscape:label="#g9350"
        transform="translate(-10,169)"
        clip-path="url(#clipPath4470)">
-      <path
-         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 31.5 174 L 50.5 174 L 51 174 C 51.296418 174 51.553519 174.1343 51.736328 174.33789 C 52.488884 174.76781 53 175.56782 53 176.5 L 53 193.5 C 53 194.43218 52.488884 195.23219 51.736328 195.66211 C 51.553519 195.8657 51.296418 196 51 196 L 50.5 196 L 31.5 196 L 31 196 C 30.703582 196 30.446481 195.8657 30.263672 195.66211 C 29.511116 195.23219 29 194.43218 29 193.5 L 29 176.5 C 29 175.56782 29.511116 174.76781 30.263672 174.33789 C 30.446481 174.1343 30.703582 174 31 174 z "
-         transform="translate(3,-452.63782)"
-         id="rect9321-0-5" />
+      <rect
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-7"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-9"
+         width="23"
+         height="21.999998"
+         x="32"
+         y="-278.63782"
+         rx="1"
+         ry="1" />
       <rect
          ry="3"
          rx="3"
@@ -1979,12 +2025,14 @@
       <g
          id="g4303-70">
         <rect
-           style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7"
+           style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-5"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7"
@@ -2013,11 +2061,24 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9)"
        transform="translate(-1,199)">
-      <path
-         style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 6.5 204 L 25.5 204 L 26 204 C 26.296418 204 26.553519 204.1343 26.736328 204.33789 C 27.488884 204.76781 28 205.56782 28 206.5 L 28 223.5 C 28 224.43218 27.488884 225.23219 26.736328 225.66211 C 26.553519 225.8657 26.296418 226 26 226 L 25.5 226 L 6.5 226 L 6 226 C 5.7035817 226 5.4464809 225.8657 5.2636719 225.66211 C 4.5111162 225.23219 4 224.43218 4 223.5 L 4 206.5 C 4 205.56782 4.5111162 204.76781 5.2636719 204.33789 C 5.4464809 204.1343 5.7035817 204 6 204 z "
-         transform="translate(-6,-482.63782)"
-         id="rect9321-4-9" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-4"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-9"
+         width="23"
+         height="21.999998"
+         x="-2"
+         y="-278.63782"
+         rx="1"
+         ry="1" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2036,11 +2097,24 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7)"
        transform="translate(-10,199)">
-      <path
-         style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 31.5 204 L 50.5 204 L 51 204 C 51.296418 204 51.553519 204.1343 51.736328 204.33789 C 52.488884 204.76781 53 205.56782 53 206.5 L 53 223.5 C 53 224.43218 52.488884 225.23219 51.736328 225.66211 C 51.553519 225.8657 51.296418 226 51 226 L 50.5 226 L 31.5 226 L 31 226 C 30.703582 226 30.446481 225.8657 30.263672 225.66211 C 29.511116 225.23219 29 224.43218 29 223.5 L 29 206.5 C 29 205.56782 29.511116 204.76781 30.263672 204.33789 C 30.446481 204.1343 30.703582 204 31 204 z "
-         transform="translate(3,-482.63782)"
-         id="rect9321-0-5-3" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-0"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-8"
+         width="23"
+         height="21.999998"
+         x="32"
+         y="-278.63782"
+         rx="1"
+         ry="1" />
       <rect
          ry="3"
          rx="3"
@@ -2062,12 +2136,14 @@
       <g
          id="g4303-70-8">
         <rect
-           style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-4"
+           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-65"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4"
@@ -2238,11 +2314,26 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-1)"
        transform="matrix(-1,0,0,1,146,169)">
-      <path
-         style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 133.5 174 L 152.5 174 L 153 174 C 153.29642 174 153.55352 174.1343 153.73633 174.33789 C 154.48888 174.76781 155 175.56782 155 176.5 L 155 193.5 C 155 194.43218 154.48888 195.23219 153.73633 195.66211 C 153.55352 195.8657 153.29642 196 153 196 L 152.5 196 L 133.5 196 L 133 196 C 132.70358 196 132.44648 195.8657 132.26367 195.66211 C 131.51112 195.23219 131 194.43218 131 193.5 L 131 176.5 C 131 175.56782 131.51112 174.76781 132.26367 174.33789 C 132.44648 174.1343 132.70358 174 133 174 z "
-         transform="matrix(-1,0,0,1,153,-452.63782)"
-         id="rect9321-4-5" />
+      <rect
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-3"
+         width="26"
+         height="24"
+         x="-23"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-1"
+         width="23"
+         height="21.999998"
+         x="-21"
+         y="-278.63782"
+         rx="1"
+         ry="1"
+         transform="scale(-1,1)" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2261,11 +2352,26 @@
        inkscape:label="#g9350"
        transform="matrix(-1,0,0,1,155,169)"
        clip-path="url(#clipPath4470-6)">
-      <path
-         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 108.5 174 L 127.5 174 L 128 174 C 128.29642 174 128.55352 174.1343 128.73633 174.33789 C 129.48888 174.76781 130 175.56782 130 176.5 L 130 193.5 C 130 194.43218 129.48888 195.23219 128.73633 195.66211 C 128.55352 195.8657 128.29642 196 128 196 L 127.5 196 L 108.5 196 L 108 196 C 107.70358 196 107.44648 195.8657 107.26367 195.66211 C 106.51112 195.23219 106 194.43218 106 193.5 L 106 176.5 C 106 175.56782 106.51112 174.76781 107.26367 174.33789 C 107.44648 174.1343 107.70358 174 108 174 z "
-         transform="matrix(-1,0,0,1,162,-452.63782)"
-         id="rect9321-0-5-4" />
+      <rect
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-55"
+         width="26"
+         height="24"
+         x="-57"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-6"
+         width="23"
+         height="21.999998"
+         x="-55"
+         y="-278.63782"
+         rx="1"
+         ry="1"
+         transform="scale(-1,1)" />
       <rect
          ry="3"
          rx="3"
@@ -2287,12 +2393,15 @@
       <g
          id="g4303-70-0">
         <rect
-           style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-1"
+           style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-6"
            width="26"
            height="24"
-           x="65"
-           y="-279.63782" />
+           x="-91"
+           y="-279.63782"
+           rx="0"
+           ry="0"
+           transform="scale(-1,1)" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-5"
@@ -2321,11 +2430,26 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9-0)"
        transform="matrix(-1,0,0,1,146,199)">
-      <path
-         style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 133.5 204 L 152.5 204 L 153 204 C 153.29642 204 153.55352 204.1343 153.73633 204.33789 C 154.48888 204.76781 155 205.56782 155 206.5 L 155 223.5 C 155 224.43218 154.48888 225.23219 153.73633 225.66211 C 153.55352 225.8657 153.29642 226 153 226 L 152.5 226 L 133.5 226 L 133 226 C 132.70358 226 132.44648 225.8657 132.26367 225.66211 C 131.51112 225.23219 131 224.43218 131 223.5 L 131 206.5 C 131 205.56782 131.51112 204.76781 132.26367 204.33789 C 132.44648 204.1343 132.70358 204 133 204 z "
-         transform="matrix(-1,0,0,1,153,-482.63782)"
-         id="rect9321-4-9-9" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-51"
+         width="26"
+         height="24"
+         x="-23"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-81"
+         width="23"
+         height="21.999998"
+         x="-21"
+         y="-278.63782"
+         rx="1"
+         ry="1"
+         transform="scale(-1,1)" />
       <rect
          rx="3"
          inkscape:transform-center-y="0.42353254"
@@ -2344,11 +2468,26 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7-0)"
        transform="matrix(-1,0,0,1,155,199)">
-      <path
-         style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 108.5 204 L 127.5 204 L 128 204 C 128.29642 204 128.55352 204.1343 128.73633 204.33789 C 129.48888 204.76781 130 205.56782 130 206.5 L 130 223.5 C 130 224.43218 129.48888 225.23219 128.73633 225.66211 C 128.55352 225.8657 128.29642 226 128 226 L 127.5 226 L 108.5 226 L 108 226 C 107.70358 226 107.44648 225.8657 107.26367 225.66211 C 106.51112 225.23219 106 224.43218 106 223.5 L 106 206.5 C 106 205.56782 106.51112 204.76781 107.26367 204.33789 C 107.44648 204.1343 107.70358 204 108 204 z "
-         transform="matrix(-1,0,0,1,162,-482.63782)"
-         id="rect9321-0-5-3-7" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5025-8"
+         width="26"
+         height="24"
+         x="-57"
+         y="-279.63782"
+         rx="0"
+         ry="0"
+         transform="scale(-1,1)" />
+      <rect
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         id="rect7903-6-7-3-66"
+         width="23"
+         height="21.999998"
+         x="-55"
+         y="-278.63782"
+         rx="1"
+         ry="1"
+         transform="scale(-1,1)" />
       <rect
          ry="3"
          rx="3"
@@ -2370,12 +2509,15 @@
       <g
          id="g4303-70-8-0">
         <rect
-           style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-7-4-0"
+           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5025-9"
            width="26"
            height="24"
-           x="65"
-           y="-279.63782" />
+           x="-91"
+           y="-279.63782"
+           rx="0"
+           ry="0"
+           transform="scale(-1,1)" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4-7"
@@ -4807,13 +4949,17 @@
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-bg"
+       id="entry-toolbar"
        inkscape:label="#g9335">
-      <path
-         style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 6.5 131 L 7.5 131 L 24.5 131 L 25.5 131 C 26.885 131 28 132.115 28 133.5 L 28 150.5 C 28 151.885 26.885 153 25.5 153 L 24.5 153 L 7.5 153 L 6.5 153 C 5.115 153 4 151.885 4 150.5 L 4 133.5 C 4 132.115 5.115 131 6.5 131 z "
-         transform="translate(-6,-409.63782)"
-         id="rect9321-6-7" />
+      <rect
+         style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-6"
+         width="26"
+         height="24"
+         x="-3"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
@@ -4825,17 +4971,30 @@
          id="rect7903-7-1-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="3" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="-2"
+         height="22"
+         width="24"
+         id="rect7903-93-7"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-active-bg"
+       id="entry-active-toolbar"
        inkscape:label="#g9350">
-      <path
-         style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 40.5 131 L 41.5 131 L 58.5 131 L 59.5 131 C 60.885 131 62 132.115 62 133.5 L 62 150.5 C 62 151.885 60.885 153 59.5 153 L 58.5 153 L 41.5 153 L 40.5 153 C 39.115 153 38 151.885 38 150.5 L 38 133.5 C 38 132.115 39.115 131 40.5 131 z "
-         transform="translate(-6,-409.63782)"
-         id="rect9321-0-0-1" />
+      <rect
+         style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5076-2"
+         width="26"
+         height="24"
+         x="31"
+         y="-279.63782"
+         rx="0"
+         ry="0" />
       <rect
          ry="3"
          rx="3.0000002"
@@ -4847,21 +5006,32 @@
          width="25"
          id="rect7903-7-3-4-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         rx="2.5"
+         y="-278.63782"
+         x="32"
+         height="22"
+         width="24"
+         id="rect7903-93-4"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+         ry="2.5" />
     </g>
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="toolbar-entry-border-disabled-bg"
+       id="entry-disabled-toolbar"
        inkscape:label="#g9365">
       <g
          id="g4303-7-3">
         <rect
-           style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect9321-2-2-1"
+           style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5076-7"
            width="26"
-           height="23.999998"
+           height="24"
            x="65"
-           y="-279.63782" />
+           y="-279.63782"
+           rx="0"
+           ry="0" />
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5-6"
@@ -4884,96 +5054,6 @@
            ry="3" />
       </g>
     </g>
-    <g
-       style="display:inline"
-       id="entry-border-bg"
-       inkscape:label="#g9335"
-       transform="translate(106,61.999997)">
-      <path
-         style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z "
-         transform="translate(-113,-345.63782)"
-         id="rect9321-3-7" />
-      <rect
-         rx="3.0000002"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-5.0639158"
-         y="-279.13782"
-         x="-2.5"
-         height="23"
-         width="25"
-         id="rect7903-7-31-1"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="3" />
-    </g>
-    <g
-       style="display:inline"
-       id="entry-border-active-bg"
-       inkscape:label="#g9350"
-       transform="translate(106,61.999997)">
-      <path
-         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z "
-         transform="translate(-113,-345.63782)"
-         id="rect9321-0-2-2" />
-      <rect
-         ry="3"
-         rx="3"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-5.0639174"
-         y="-279.13782"
-         x="31.500002"
-         height="23"
-         width="24.999998"
-         id="rect7903-7-3-7-7"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <g
-       transform="matrix(-1,0,0,1,131,126)"
-       style="display:inline"
-       id="entry-border-bg-solid-spin"
-       inkscape:label="#g9335"
-       clip-path="url(#clipPath5131)">
-      <path
-         style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 115 130 L 115 154 L 141 154 L 141 130 L 115 130 z M 118.5 131 L 119.5 131 L 136.5 131 L 137.5 131 C 138.885 131 140 132.115 140 133.5 L 140 150.5 C 140 151.885 138.885 153 137.5 153 L 136.5 153 L 119.5 153 L 118.5 153 C 117.115 153 116 151.885 116 150.5 L 116 133.5 C 116 132.115 117.115 131 118.5 131 z "
-         transform="matrix(-1,0,0,1,138,-409.63782)"
-         id="rect9321-6-7-4" />
-      <rect
-         rx="3"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.8613593"
-         y="-279.13782"
-         x="-1.5000001"
-         height="23"
-         width="24"
-         id="rect7903-7-1-6-9"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="3" />
-    </g>
-    <g
-       transform="translate(103,126)"
-       style="display:inline"
-       id="entry-border-active-bg-solid-spin"
-       inkscape:label="#g9350"
-       clip-path="url(#clipPath5158)">
-      <path
-         style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 141 130 L 141 154 L 167 154 L 167 130 L 141 130 z M 144.5 131 L 145.5 131 L 162.5 131 L 163.5 131 C 164.885 131 166 132.115 166 133.5 L 166 150.5 C 166 151.885 164.885 153 163.5 153 L 162.5 153 L 145.5 153 L 144.5 153 C 143.115 153 142 151.885 142 150.5 L 142 133.5 C 142 132.115 143.115 131 144.5 131 z "
-         transform="translate(-110,-409.63782)"
-         id="rect9321-0-0-1-3" />
-      <rect
-         ry="3"
-         rx="3"
-         inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.8613611"
-         y="-279.13782"
-         x="31.500002"
-         height="23"
-         width="24"
-         id="rect7903-7-3-4-9-5"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
     <g
        style="display:inline"
        id="menubar"
@@ -5504,5 +5584,51 @@
          style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          ry="2.5" />
     </g>
+    <g
+       style="display:inline"
+       id="entry-border-bg"
+       inkscape:label="#g9335"
+       transform="translate(-1,31.999997)">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 110,66 0,24 26,0 0,-24 -26,0 z m 3.5,1 1,0 17,0 1,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,17 c 0,1.385 -1.115,2.5 -2.5,2.5 l -1,0 -17,0 -1,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-17 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
+         transform="translate(-113,-345.63782)"
+         id="rect9321-3-7" />
+      <rect
+         rx="3.0000002"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-5.0639158"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="25"
+         id="rect7903-7-31-1"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+    </g>
+    <g
+       style="display:inline"
+       id="entry-border-active-bg"
+       inkscape:label="#g9350"
+       transform="translate(-1,31.999997)">
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 144,66 0,24 26,0 0,-24 -26,0 z m 3.5,1 1,0 17,0 1,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,17 c 0,1.385 -1.115,2.5 -2.5,2.5 l -1,0 -17,0 -1,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-17 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
+         transform="translate(-113,-345.63782)"
+         id="rect9321-0-2-2" />
+      <rect
+         ry="3"
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-5.0639174"
+         y="-279.13782"
+         x="31.500002"
+         height="23"
+         width="24.999998"
+         id="rect7903-7-3-7-7"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt
index 08e3959..8ebc233 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -42,18 +42,17 @@ menu-radio-checked-insensitive
 menu-radio-unchecked
 menu-radio-unchecked-selected
 menu-radio-unchecked-insensitive
-entry-border-bg-solid
-entry-border-active-bg-solid
-entry-border-disabled-bg
 entry-border-bg
 entry-border-active-bg
-notebook-entry-border-bg
-notebook-entry-border-active-bg
-notebook-entry-border-disabled-bg
-toolbar-entry-border-bg
-toolbar-entry-border-active-bg
-toolbar-entry-border-disabled-bg
-entry-border-fill
+entry-bg
+entry-active-bg
+entry-disabled-bg
+entry-notebook
+entry-active-notebook
+entry-disabled-notebook
+entry-toolbar
+entry-active-toolbar
+entry-disabled-toolbar
 combo-entry
 combo-entry-focus
 combo-entry-insensitive
diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png
index ee73552..689534b 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook.png b/common/gtk-2.0/assets/combo-entry-focus-notebook.png
index 888aa9b..d223057 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-rtl.png
index 2380d75..f59ae2a 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png
index c7e7a6e..d04c9e5 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus.png and b/common/gtk-2.0/assets/combo-entry-focus.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png
index 8e6d815..b41c462 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png
index 7ccb9d3..9e52513 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png
index 9f877d8..24329de 100644
Binary files a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png
index c29a8fb..c82543e 100644
Binary files a/common/gtk-2.0/assets/combo-entry-notebook.png and b/common/gtk-2.0/assets/combo-entry-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-rtl.png b/common/gtk-2.0/assets/combo-entry-rtl.png
index 4039597..aacb10e 100644
Binary files a/common/gtk-2.0/assets/combo-entry-rtl.png and b/common/gtk-2.0/assets/combo-entry-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png
index da69e19..df09596 100644
Binary files a/common/gtk-2.0/assets/combo-entry.png and b/common/gtk-2.0/assets/combo-entry.png differ
diff --git a/common/gtk-2.0/assets/entry-border-active-bg-solid.png b/common/gtk-2.0/assets/entry-active-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-border-active-bg-solid.png
rename to common/gtk-2.0/assets/entry-active-bg.png
diff --git a/common/gtk-2.0/assets/entry-active-notebook.png b/common/gtk-2.0/assets/entry-active-notebook.png
new file mode 100644
index 0000000..a314dc7
Binary files /dev/null and b/common/gtk-2.0/assets/entry-active-notebook.png differ
diff --git a/common/gtk-2.0/assets/entry-active-toolbar.png b/common/gtk-2.0/assets/entry-active-toolbar.png
new file mode 100644
index 0000000..359b399
Binary files /dev/null and b/common/gtk-2.0/assets/entry-active-toolbar.png differ
diff --git a/common/gtk-2.0/assets/entry-border-bg-solid.png b/common/gtk-2.0/assets/entry-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-border-bg-solid.png
rename to common/gtk-2.0/assets/entry-bg.png
diff --git a/common/gtk-2.0/assets/entry-border-fill.png b/common/gtk-2.0/assets/entry-border-fill.png
deleted file mode 100644
index 15f6746..0000000
Binary files a/common/gtk-2.0/assets/entry-border-fill.png and /dev/null differ
diff --git a/common/gtk-2.0/assets/entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-disabled-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-border-disabled-bg.png
rename to common/gtk-2.0/assets/entry-disabled-bg.png
diff --git a/common/gtk-2.0/assets/entry-disabled-notebook.png b/common/gtk-2.0/assets/entry-disabled-notebook.png
new file mode 100644
index 0000000..91b4c2d
Binary files /dev/null and b/common/gtk-2.0/assets/entry-disabled-notebook.png differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-disabled-toolbar.png
similarity index 100%
rename from common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png
rename to common/gtk-2.0/assets/entry-disabled-toolbar.png
diff --git a/common/gtk-2.0/assets/entry-notebook.png b/common/gtk-2.0/assets/entry-notebook.png
new file mode 100644
index 0000000..0ccc4ed
Binary files /dev/null and b/common/gtk-2.0/assets/entry-notebook.png differ
diff --git a/common/gtk-2.0/assets/entry-toolbar.png b/common/gtk-2.0/assets/entry-toolbar.png
new file mode 100644
index 0000000..885a5d8
Binary files /dev/null and b/common/gtk-2.0/assets/entry-toolbar.png differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png
deleted file mode 100644
index 66092de..0000000
Binary files a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-bg.png b/common/gtk-2.0/assets/notebook-entry-border-bg.png
deleted file mode 100644
index 3d4c05b..0000000
Binary files a/common/gtk-2.0/assets/notebook-entry-border-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png
deleted file mode 100644
index 1ea2ede..0000000
Binary files a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png
deleted file mode 100644
index aa5c284..0000000
Binary files a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-bg.png
deleted file mode 100644
index cbd444c..0000000
Binary files a/common/gtk-2.0/assets/toolbar-entry-border-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc
index 18da44a..1d22cbb 100644
--- a/common/gtk-2.0/main.rc
+++ b/common/gtk-2.0/main.rc
@@ -981,110 +981,70 @@ style "entry" {
   ythickness = 4
 
   base[NORMAL] = @base_color
+  base[ACTIVE] = @base_color
   base[INSENSITIVE] = @insensitive_bg_color
 
   engine "pixmap" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "assets/entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "assets/entry-bg.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
+      file = "assets/entry-active-bg.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
       state = INSENSITIVE
-      shadow = IN
-      file = "assets/entry-border-disabled-bg.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
       detail = "entry"
-      state = ACTIVE
-      file = "assets/entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "assets/entry-disabled-bg.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
 style "notebook_entry" {
-  xthickness = 6
 
   engine "pixmap" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "assets/notebook-entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "assets/entry-notebook.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
+      file = "assets/entry-active-notebook.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
       state = INSENSITIVE
-      shadow = IN
-      file = "assets/notebook-entry-border-disabled-bg.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
       detail = "entry"
-      state = ACTIVE
-      file = "assets/notebook-entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "assets/entry-disabled-notebook.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
@@ -1629,92 +1589,6 @@ style "gimp_spin_scale" {
   }
 }
 
-style "libreoffice_entry" {
-
-  engine "pixmap" {
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/entry-border-fill.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/entry-border-fill.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail = "entry"
-      state = NORMAL
-      shadow = IN
-      file = "assets/entry-border-bg-solid.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail = "entry"
-      state = ACTIVE
-      file = "assets/entry-border-active-bg-solid.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-  }
-}
-
-style "standalone_entry" {
-
-  engine "pixmap" {
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      file = "assets/entry-border-fill.png"
-      stretch = TRUE
-      border = { 0, 0, 0, 0 }
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      file = "assets/entry-border-fill.png"
-      stretch = TRUE
-      border = { 0, 0, 0, 0 }
-    }
-
-    image {
-      function = SHADOW
-      detail = "entry"
-      state = NORMAL
-      shadow = IN
-      file = "assets/entry-border-bg-solid.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail = "entry"
-      state = ACTIVE
-      file = "assets/entry-border-active-bg-solid.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-  }
-}
-
 style "notebook" {
 
   xthickness = 5
@@ -2434,10 +2308,6 @@ widget_class "*<GimpToolbox>*<GtkFrame>"                            style "gimp_
 widget_class "*Chrom*Button*"                                       style "button"
 widget_class "*<GtkCustomMenu>*<GtkCustomMenuItem>*"                style "chrome_menu_item"
 
-# We use this weird selector to target an offscreen entry as created
-# by Chrome/Chromium to derive the style for its toolbar
-widget_class "<GtkEntry>"                                           style "standalone_entry"
-
 # Eclipse/SWT
 widget "gtk-tooltips*"                                              style "eclipse-tooltips"
 widget "*swt-toolbar-flat"                                          style "null"
@@ -2445,10 +2315,6 @@ widget "*swt-toolbar-flat"                                          style "null"
 # Openoffice, Libreoffice
 class "GtkWindow"                                                   style "toplevel_hack"
 widget "*openoffice-toplevel*"                                      style "ooo_stepper_hack"
-widget "*openoffice-toplevel*GtkEntry"                              style "libreoffice_entry"
-widget "*openoffice-toplevel*GtkSpinButton"                         style "libreoffice_entry"
-widget "*libreoffice-toplevel*GtkEntry"                             style "libreoffice_entry"
-widget "*libreoffice-toplevel*GtkSpinButton"                        style "libreoffice_entry"
 
 # Xfce
 widget_class "*XfdesktopIconView*"                                  style "xfdesktop-icon-view"
diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
new file mode 100644
index 0000000..ac880fb
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
new file mode 100644
index 0000000..359b399
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
new file mode 100644
index 0000000..d6f19b7
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
new file mode 100644
index 0000000..074826b
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
new file mode 100644
index 0000000..5c04ca3
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png
new file mode 100644
index 0000000..885a5d8
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index 122443c..4ebb209 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -126,9 +126,9 @@ style "toolbar_button" {
 }
 
 style "toolbar_entry" {
-  xthickness = 6
 
-  base[NORMAL] = "#414857"
+  base[NORMAL] = "#404552"
+  base[ACTIVE] = "#404552"
   base[INSENSITIVE] = "#39404d"
 
   text[NORMAL] = "#afb8c5"
@@ -137,50 +137,30 @@ style "toolbar_entry" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg-dark.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "menubar-toolbar/entry-toolbar-dark.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
+      file = "menubar-toolbar/entry-active-toolbar-dark.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
       state = INSENSITIVE
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
       detail = "entry"
-      state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg-dark.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-disabled-toolbar-dark.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index c02626d..5a9f177 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -71,10 +71,6 @@ style "menubar-text" {
 }
 
 style "toolbar_entry" {
-  xthickness = 6
-
-  base[NORMAL] = "#fdfdfd"
-  base[INSENSITIVE] = "#f4f5f6"
 
   text[NORMAL] = "#70788d"
 
@@ -82,50 +78,30 @@ style "toolbar_entry" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "menubar-toolbar/entry-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
+      file = "menubar-toolbar/entry-active-toolbar.png"
+      border = {6, 6, 6, 6}
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
       state = INSENSITIVE
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png"
-      border = { 12, 12, 12, 12 }
-      stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
       detail = "entry"
-      state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-disabled-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
deleted file mode 100644
index 4c358b3..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and /dev/null differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
deleted file mode 100644
index 427548a..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
deleted file mode 100644
index 716060a..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png and /dev/null differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
deleted file mode 100644
index 320deb9..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png and /dev/null differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
deleted file mode 100644
index 8304a5d..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png and /dev/null differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png
deleted file mode 100644
index 512d5bd..0000000
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png and /dev/null differ