From 29d46e29707c040fae299828c2440c6840a54777 Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Fri, 5 Jun 2015 12:41:31 +0200
Subject: [PATCH] gtk2 toolbar and entry fixes

---
 common/gtk-2.0/assets.svg                     | 857 +++++++++++-------
 common/gtk-2.0/assets.txt                     |  21 +-
 common/gtk-2.0/assets/arrow-down-insens.png   | Bin 334 -> 334 bytes
 common/gtk-2.0/assets/arrow-down-prelight.png | Bin 304 -> 306 bytes
 .../assets/arrow-down-small-insens.png        | Bin 287 -> 287 bytes
 .../assets/arrow-down-small-prelight.png      | Bin 283 -> 285 bytes
 common/gtk-2.0/assets/arrow-left-prelight.png | Bin 319 -> 319 bytes
 .../gtk-2.0/assets/arrow-right-prelight.png   | Bin 313 -> 314 bytes
 .../assets/combo-entry-focus-notebook-rtl.png | Bin 274 -> 279 bytes
 .../assets/combo-entry-focus-notebook.png     | Bin 259 -> 275 bytes
 .../gtk-2.0/assets/combo-entry-focus-rtl.png  | Bin 274 -> 278 bytes
 common/gtk-2.0/assets/combo-entry-focus.png   | Bin 260 -> 275 bytes
 .../assets/combo-entry-notebook-rtl.png       | Bin 256 -> 270 bytes
 .../gtk-2.0/assets/combo-entry-notebook.png   | Bin 236 -> 247 bytes
 common/gtk-2.0/assets/combo-entry-rtl.png     | Bin 256 -> 273 bytes
 common/gtk-2.0/assets/combo-entry.png         | Bin 242 -> 254 bytes
 ...s.png => entry-border-active-bg-solid.png} | Bin
 .../gtk-2.0/assets/entry-border-active-bg.png | Bin 0 -> 882 bytes
 .../{entry.png => entry-border-bg-solid.png}  | Bin
 common/gtk-2.0/assets/entry-border-bg.png     | Bin 0 -> 824 bytes
 ...itive.png => entry-border-disabled-bg.png} | Bin
 .../gtk-2.0/assets/entry-focus-notebook.png   | Bin 769 -> 0 bytes
 common/gtk-2.0/assets/entry-focus-toolbar.png | Bin 818 -> 0 bytes
 common/gtk-2.0/assets/entry-notebook.png      | Bin 696 -> 0 bytes
 common/gtk-2.0/assets/entry-toolbar.png       | Bin 697 -> 0 bytes
 common/gtk-2.0/assets/menubar.png             | Bin 0 -> 183 bytes
 .../notebook-entry-border-active-bg.png       | Bin 0 -> 869 bytes
 .../assets/notebook-entry-border-bg.png       | Bin 0 -> 805 bytes
 ... => notebook-entry-border-disabled-bg.png} | Bin
 .../assets/toolbar-entry-border-active-bg.png | Bin 0 -> 888 bytes
 .../assets/toolbar-entry-border-bg.png        | Bin 0 -> 789 bytes
 ...g => toolbar-entry-border-disabled-bg.png} | Bin
 common/gtk-2.0/assets/toolbar.png             | Bin 183 -> 183 bytes
 common/gtk-2.0/gtkrc                          | 109 ++-
 34 files changed, 620 insertions(+), 367 deletions(-)
 rename common/gtk-2.0/assets/{entry-focus.png => entry-border-active-bg-solid.png} (100%)
 create mode 100644 common/gtk-2.0/assets/entry-border-active-bg.png
 rename common/gtk-2.0/assets/{entry.png => entry-border-bg-solid.png} (100%)
 create mode 100644 common/gtk-2.0/assets/entry-border-bg.png
 rename common/gtk-2.0/assets/{entry-insensitive.png => entry-border-disabled-bg.png} (100%)
 delete mode 100644 common/gtk-2.0/assets/entry-focus-notebook.png
 delete mode 100644 common/gtk-2.0/assets/entry-focus-toolbar.png
 delete mode 100644 common/gtk-2.0/assets/entry-notebook.png
 delete mode 100644 common/gtk-2.0/assets/entry-toolbar.png
 create mode 100644 common/gtk-2.0/assets/menubar.png
 create mode 100644 common/gtk-2.0/assets/notebook-entry-border-active-bg.png
 create mode 100644 common/gtk-2.0/assets/notebook-entry-border-bg.png
 rename common/gtk-2.0/assets/{entry-insensitive-notebook.png => notebook-entry-border-disabled-bg.png} (100%)
 create mode 100644 common/gtk-2.0/assets/toolbar-entry-border-active-bg.png
 create mode 100644 common/gtk-2.0/assets/toolbar-entry-border-bg.png
 rename common/gtk-2.0/assets/{entry-insensitive-toolbar.png => toolbar-entry-border-disabled-bg.png} (100%)

diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index 0f966a5..c20d97c 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -535,6 +535,28 @@
          x="407"
          y="111" />
     </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5131">
+      <rect
+         style="opacity:1;fill:#272a30;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5133"
+         width="13"
+         height="24"
+         x="10"
+         y="-279.63782" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5158">
+      <rect
+         style="opacity:1;fill:#272a30;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect5160"
+         width="13"
+         height="24"
+         x="31"
+         y="-279.63782" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -543,12 +565,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="111.23391"
-     inkscape:cy="224.58499"
+     inkscape:zoom="11.313708"
+     inkscape:cx="478.52624"
+     inkscape:cy="293.00874"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      showborder="false"
      inkscape:window-width="1366"
      inkscape:window-height="720"
@@ -750,7 +772,7 @@
     </g>
     <g
        style="display:inline"
-       transform="translate(203,-1319)"
+       transform="translate(214,-1319)"
        id="menu-checkbox-unchecked"
        inkscape:label="Ebene 1">
       <g
@@ -802,7 +824,7 @@
     </g>
     <g
        style="display:inline;opacity:0.55"
-       transform="translate(218,-1319)"
+       transform="translate(229,-1319)"
        id="menu-checkbox-unchecked-insensitive"
        inkscape:label="Ebene 1">
       <g
@@ -812,8 +834,7 @@
          transform="translate(-19,1036.9872)">
         <g
            id="sdsd-3-0"
-           inkscape:label="#g21853"
-           style="">
+           inkscape:label="#g21853">
           <path
              sodipodi:nodetypes="ssssssssssssssssss"
              inkscape:connector-curvature="0"
@@ -823,8 +844,7 @@
           <g
              transform="translate(0,-30)"
              inkscape:label="#g14325"
-             id="scdsdcd-1-9"
-             style="">
+             id="scdsdcd-1-9">
             <g
                transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)"
                id="g15812-6-6-1-0-0"
@@ -834,13 +854,11 @@
                  id="g5489-2-9-6-8-8-0-1"
                  transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)">
                 <g
-                   id="g5428-8-1-4-0-0-5-9"
-                   style="" />
+                   id="g5428-8-1-4-0-0-5-9" />
               </g>
             </g>
             <g
-               id="g5400-0-5"
-               style="">
+               id="g5400-0-5">
               <rect
                  transform="translate(-2.0348579e-6,4.7858158e-6)"
                  rx="1"
@@ -857,7 +875,7 @@
       </g>
     </g>
     <g
-       transform="translate(197.37869,-282.08594)"
+       transform="translate(208.37869,-282.08594)"
        style="display:inline;opacity:1"
        id="menu-checkbox-checked"
        inkscape:label="#g10758">
@@ -950,7 +968,7 @@
       </g>
     </g>
     <g
-       transform="translate(104,-267.00013)"
+       transform="translate(115,-267.00013)"
        style="display:inline;opacity:1"
        id="menu-radio-unchecked"
        inkscape:label="#g10975">
@@ -991,7 +1009,7 @@
       </g>
     </g>
     <g
-       transform="translate(117,-267.00012)"
+       transform="translate(128,-267.00012)"
        style="display:inline;opacity:1"
        id="menu-radio-checked"
        inkscape:label="#g11094">
@@ -1041,7 +1059,7 @@
          ry="2.5" />
     </g>
     <g
-       transform="translate(212.99999,-282.00013)"
+       transform="translate(223.99999,-282.00013)"
        style="display:inline;opacity:0.55"
        id="menu-checkbox-checked-insensitive"
        inkscape:label="#g10758">
@@ -1052,13 +1070,11 @@
          transform="translate(19,0)">
         <g
            id="sdsd-7-5-5"
-           inkscape:label="#g21853"
-           style="">
+           inkscape:label="#g21853">
           <g
              transform="translate(0,-30)"
              inkscape:label="#g14325"
-             id="scdsdcd-5-1-7"
-             style="">
+             id="scdsdcd-5-1-7">
             <g
                transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)"
                id="g15812-6-6-1-5-1-5"
@@ -1068,13 +1084,11 @@
                  id="g5489-2-9-6-8-8-53-16-8"
                  transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)">
                 <g
-                   id="g5428-8-1-4-0-0-4-1-8"
-                   style="" />
+                   id="g5428-8-1-4-0-0-4-1-8" />
               </g>
             </g>
             <g
-               id="g5400-6-7-5"
-               style="">
+               id="g5400-6-7-5">
               <rect
                  rx="1.9999943"
                  y="32.362202"
@@ -1099,12 +1113,10 @@
            style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" />
         <g
            id="g4049-2-3-9"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)"
-           style="">
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)">
           <g
              id="g4056-7-07-7"
-             transform="translate(12.374375,11.531233)"
-             style="">
+             transform="translate(12.374375,11.531233)">
             <g
                id="g3981-0-3-4"
                transform="translate(-3,-4.9999826)"
@@ -1128,7 +1140,7 @@
       </g>
     </g>
     <g
-       transform="matrix(0.92826431,0,0,0.92857155,142.39707,-265.90282)"
+       transform="matrix(0.92826431,0,0,0.92857155,153.39707,-265.90282)"
        style="display:inline;opacity:0.55"
        id="menu-radio-checked-insensitive"
        inkscape:label="#g11094">
@@ -1138,23 +1150,20 @@
          id="radio-unchecked-2-8-1"
          style="display:inline">
         <g
-           id="g10964-6-4-9"
-           style="">
+           id="g10964-6-4-9">
           <g
              inkscape:label="#g15805"
              transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)"
              id="radio-unchecked2-0-6-2"
              style="display:inline">
             <g
-               id="g7025-09-1-7"
-               style="">
+               id="g7025-09-1-7">
               <g
                  transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)"
                  id="g5489-2-9-3-2-71-0"
                  style="display:inline">
                 <g
-                   id="g5428-8-1-7-5-8-1"
-                   style="">
+                   id="g5428-8-1-7-5-8-1">
                   <rect
                      rx="14.692498"
                      y="126.56255"
@@ -1181,7 +1190,7 @@
          ry="2.6923075" />
     </g>
     <g
-       transform="translate(119,-267.00013)"
+       transform="translate(130,-267.00013)"
        style="display:inline;opacity:0.55"
        id="menu-radio-unchecked-insensitive"
        inkscape:label="#g10975">
@@ -1192,23 +1201,20 @@
          style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          sodipodi:nodetypes="ssssssssss" />
       <g
-         id="g10964-66-0"
-         style="">
+         id="g10964-66-0">
         <g
            style="display:inline"
            id="radio-unchecked2-8-4"
            transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)"
            inkscape:label="#g15805">
           <g
-             id="g7025-1-8"
-             style="">
+             id="g7025-1-8">
             <g
                style="display:inline"
                id="g5489-2-9-3-9-2"
                transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)">
               <g
-                 id="g5428-8-1-7-6-8"
-                 style="">
+                 id="g5428-8-1-7-6-8">
                 <rect
                    ry="13.246163"
                    style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
@@ -1225,7 +1231,7 @@
       </g>
     </g>
     <g
-       transform="translate(254,-282.00012)"
+       transform="translate(265,-282.00012)"
        style="display:inline;opacity:1"
        id="checkbox-unchecked"
        inkscape:label="#g22047">
@@ -1276,7 +1282,7 @@
       </g>
     </g>
     <g
-       transform="translate(267,-282.00013)"
+       transform="translate(278,-282.00013)"
        style="display:inline;opacity:1"
        id="checkbox-checked"
        inkscape:label="#g10758">
@@ -1376,7 +1382,7 @@
       </g>
     </g>
     <g
-       transform="translate(174.00426,-266.00013)"
+       transform="translate(185.00426,-266.00013)"
        style="display:inline;opacity:1"
        id="radio-unchecked"
        inkscape:label="#g10975">
@@ -1423,7 +1429,7 @@
       </g>
     </g>
     <g
-       transform="translate(187,-266.00013)"
+       transform="translate(198,-266.00013)"
        style="display:inline;opacity:1"
        id="radio-checked"
        inkscape:label="#g11094">
@@ -1480,14 +1486,13 @@
          ry="2" />
     </g>
     <g
-       transform="translate(270,-282.00012)"
+       transform="translate(281,-282.00012)"
        style="display:inline;opacity:0.55"
        id="checkbox-unchecked-insensitive"
        inkscape:label="#g22047">
       <g
          inkscape:label="#g21853"
-         id="sdsd-6-1"
-         style="">
+         id="sdsd-6-1">
         <path
            inkscape:connector-curvature="0"
            style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -1496,8 +1501,7 @@
         <g
            id="scdsdcd-9-8"
            inkscape:label="#g14325"
-           transform="translate(0,-30)"
-           style="">
+           transform="translate(0,-30)">
           <g
              style="display:inline"
              id="g15812-6-6-1-1-4"
@@ -1507,8 +1511,7 @@
                id="g5489-2-9-6-8-8-7-8"
                style="display:inline">
               <g
-                 id="g5428-8-1-4-0-0-0-6"
-                 style="" />
+                 id="g5428-8-1-4-0-0-0-6" />
             </g>
           </g>
           <rect
@@ -1519,8 +1522,7 @@
              id="rect13523-9-4"
              style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
           <g
-             id="g5400-7-2"
-             style="">
+             id="g5400-7-2">
             <rect
                ry="1"
                style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
@@ -1535,7 +1537,7 @@
       </g>
     </g>
     <g
-       transform="translate(283,-282.00013)"
+       transform="translate(294,-282.00013)"
        style="display:inline;opacity:0.55"
        id="checkbox-checked-insensitive"
        inkscape:label="#g10758">
@@ -1546,13 +1548,11 @@
          transform="translate(19,0)">
         <g
            id="sdsd-7-5-4-3"
-           inkscape:label="#g21853"
-           style="">
+           inkscape:label="#g21853">
           <g
              transform="translate(0,-30)"
              inkscape:label="#g14325"
-             id="scdsdcd-5-1-0-5"
-             style="">
+             id="scdsdcd-5-1-0-5">
             <g
                transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)"
                id="g15812-6-6-1-5-1-7-1"
@@ -1562,8 +1562,7 @@
                  id="g5489-2-9-6-8-8-53-16-3-9"
                  transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)">
                 <g
-                   id="g5428-8-1-4-0-0-4-1-2-7"
-                   style="" />
+                   id="g5428-8-1-4-0-0-4-1-2-7" />
               </g>
             </g>
             <rect
@@ -1574,8 +1573,7 @@
                x="17"
                y="30.362183" />
             <g
-               id="g5400-6-7-8-7"
-               style="">
+               id="g5400-6-7-8-7">
               <rect
                  rx="1.9999943"
                  y="31.362196"
@@ -1600,12 +1598,10 @@
            style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" />
         <g
            id="g4049-2-3-6-5"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)"
-           style="">
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)">
           <g
              id="g4056-7-07-3-8"
-             transform="translate(12.374375,11.531233)"
-             style="">
+             transform="translate(12.374375,11.531233)">
             <g
                id="g3981-0-3-0-5"
                transform="translate(-3,-4.9999826)"
@@ -1630,7 +1626,7 @@
       </g>
     </g>
     <g
-       transform="translate(190.00426,-266.00013)"
+       transform="translate(201.00426,-266.00013)"
        style="display:inline;opacity:0.55"
        id="radio-unchecked-insensitive"
        inkscape:label="#g10975">
@@ -1640,8 +1636,7 @@
          d="m 98,8.3621828 c 0,3.8659902 3.13401,7.0000002 7,7.0000002 3.86599,0 7,-3.13401 7,-7.0000002 0,-3.86599 -3.13401,-7 -7,-7 -3.86599,0 -7,3.13401 -7,7 z m 1,0 c 0,-3.324 2.676,-6 6,-6 3.324,0 6,2.676 6,6 0,3.3240002 -2.676,6.0000002 -6,6.0000002 -3.324,0 -6,-2.676 -6,-6.0000002 z"
          style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <g
-         id="g10964-62-9"
-         style="">
+         id="g10964-62-9">
         <g
            style="display:inline"
            id="radio-unchecked2-8-1-4"
@@ -1655,15 +1650,13 @@
              x="206.99057"
              y="261.97873" />
           <g
-             id="g7025-6-0"
-             style="">
+             id="g7025-6-0">
             <g
                style="display:inline"
                id="g5489-2-9-3-77-9"
                transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)">
               <g
-                 id="g5428-8-1-7-58-8"
-                 style="">
+                 id="g5428-8-1-7-58-8">
                 <rect
                    ry="13.246163"
                    style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
@@ -1680,7 +1673,7 @@
       </g>
     </g>
     <g
-       transform="translate(203,-266.00013)"
+       transform="translate(214,-266.00013)"
        style="display:inline;opacity:0.55"
        id="radio-checked-insensitive"
        inkscape:label="#g11094">
@@ -1690,8 +1683,7 @@
          id="radio-unchecked-2-8-9-6"
          style="display:inline">
         <g
-           id="g10964-6-4-7-3"
-           style="">
+           id="g10964-6-4-7-3">
           <g
              inkscape:label="#g15805"
              transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)"
@@ -1705,15 +1697,13 @@
                id="rect14348-4-8-9-5"
                style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
             <g
-               id="g7025-09-1-6-4"
-               style="">
+               id="g7025-09-1-6-4">
               <g
                  transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)"
                  id="g5489-2-9-3-2-71-7-7"
                  style="display:inline">
                 <g
-                   id="g5428-8-1-7-5-8-3-8"
-                   style="">
+                   id="g5428-8-1-7-5-8-3-8">
                   <rect
                      rx="14.692498"
                      y="126.56255"
@@ -1746,7 +1736,7 @@
        id="sjhgfjsgf-2" />
     <g
        style="display:inline"
-       id="entry"
+       id="entry-border-bg-solid"
        inkscape:label="#g9335"
        transform="translate(-1,61.999998)">
       <rect
@@ -1779,7 +1769,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-focus"
+       id="entry-border-active-bg-solid"
        inkscape:label="#g9350"
        transform="translate(-1,61.999998)">
       <rect
@@ -1812,7 +1802,7 @@
     </g>
     <g
        style="display:inline"
-       id="entry-insensitive"
+       id="entry-border-disabled-bg"
        inkscape:label="#g9365"
        transform="translate(-1,61.999998)">
       <g
@@ -1849,24 +1839,13 @@
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="entry-notebook"
+       id="notebook-entry-border-bg"
        inkscape:label="#g9335">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="23.999998"
-         width="26"
-         id="rect9321-6"
-         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" />
-      <rect
-         rx="11"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-652"
-         style="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="10.999999" />
+      <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 16 99 C 22.094 99 27 103.906 27 110 C 27 116.094 22.094 121 16 121 C 9.906 121 5 116.094 5 110 C 5 103.906 9.906 99 16 99 z "
+         transform="translate(-6,-377.63782)"
+         id="rect9321-6" />
       <rect
          rx="11.5"
          inkscape:transform-center-y="0.42353254"
@@ -1882,24 +1861,13 @@
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="entry-focus-notebook"
+       id="notebook-entry-border-active-bg"
        inkscape:label="#g9350">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-0"
-         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" />
-      <rect
-         ry="10.999999"
-         rx="11"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-5"
-         style="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" />
+      <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 50 99 C 56.094 99 61 103.906 61 110 C 61 116.094 56.094 121 50 121 C 43.906 121 39 116.094 39 110 C 39 103.906 43.906 99 50 99 z "
+         transform="translate(-6,-377.63782)"
+         id="rect9321-0-0" />
       <rect
          ry="11.5"
          rx="11.5"
@@ -1915,7 +1883,7 @@
     <g
        transform="translate(-1,93.999999)"
        style="display:inline"
-       id="entry-insensitive-notebook"
+       id="notebook-entry-border-disabled-bg"
        inkscape:label="#g9365">
       <g
          id="g4303-7">
@@ -1953,8 +1921,8 @@
        id="entry-border-fill"
        width="5"
        height="24.000002"
-       x="99.000031"
-       y="-217.63776"
+       x="100.50003"
+       y="-246.88776"
        inkscape:label="#rect4361" />
     <g
        style="display:inline"
@@ -1962,22 +1930,11 @@
        inkscape:label="#g9335"
        transform="translate(-1,169)"
        clip-path="url(#clipPath4466)">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="23.999998"
-         width="26"
-         id="rect9321-4"
-         style="opacity:1;fill:#f9fafb;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" />
-      <rect
-         rx="1"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-5"
-         style="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="1" />
+      <path
+         style="opacity:1;fill:#f9fafb;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 26 174 C 26.554 174 27 174.446 27 175 L 27 195 C 27 195.554 26.554 196 26 196 L 6 196 C 5.446 196 5 195.554 5 195 L 5 175 C 5 174.446 5.446 174 6 174 z "
+         transform="translate(-6,-452.63782)"
+         id="rect9321-4" />
       <rect
          rx="2"
          inkscape:transform-center-y="0.42353254"
@@ -1996,22 +1953,11 @@
        inkscape:label="#g9350"
        transform="translate(-10,169)"
        clip-path="url(#clipPath4470)">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-5"
-         style="display:inline;opacity:1;fill:#f9fafb;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" />
-      <rect
-         ry="1"
-         rx="1"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-4"
-         style="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" />
+      <path
+         style="display:inline;opacity:1;fill:#f9fafb;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 51 174 C 51.554 174 52 174.446 52 175 L 52 195 C 52 195.554 51.554 196 51 196 L 31 196 C 30.446 196 30 195.554 30 195 L 30 175 C 30 174.446 30.446 174 31 174 z "
+         transform="translate(3,-452.63782)"
+         id="rect9321-0-5" />
       <rect
          ry="2"
          rx="2"
@@ -2067,22 +2013,11 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9)"
        transform="translate(-1,199)">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="24"
-         width="26"
-         id="rect9321-4-9"
-         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" />
-      <rect
-         rx="1"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-5-6"
-         style="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="1" />
+      <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 26 204 C 26.554 204 27 204.446 27 205 L 27 225 C 27 225.554 26.554 226 26 226 L 6 226 C 5.446 226 5 225.554 5 225 L 5 205 C 5 204.446 5.446 204 6 204 z "
+         transform="translate(-6,-482.63782)"
+         id="rect9321-4-9" />
       <rect
          rx="2"
          inkscape:transform-center-y="0.42353254"
@@ -2101,22 +2036,11 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7)"
        transform="translate(-10,199)">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-5-3"
-         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" />
-      <rect
-         ry="1"
-         rx="1"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-4-1"
-         style="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" />
+      <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 51 204 C 51.554 204 52 204.446 52 205 L 52 225 C 52 225.554 51.554 226 51 226 L 31 226 C 30.446 226 30 225.554 30 225 L 30 205 C 30 204.446 30.446 204 31 204 z "
+         transform="translate(3,-482.63782)"
+         id="rect9321-0-5-3" />
       <rect
          ry="2"
          rx="2"
@@ -2314,22 +2238,11 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-1)"
        transform="matrix(-1,0,0,1,146,169)">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="23.999998"
-         width="26"
-         id="rect9321-4-5"
-         style="opacity:1;fill:#f9fafb;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" />
-      <rect
-         rx="1"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-5-7"
-         style="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="1" />
+      <path
+         style="opacity:1;fill:#f9fafb;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 153 174 C 153.554 174 154 174.446 154 175 L 154 195 C 154 195.554 153.554 196 153 196 L 133 196 C 132.446 196 132 195.554 132 195 L 132 175 C 132 174.446 132.446 174 133 174 z "
+         transform="matrix(-1,0,0,1,153,-452.63782)"
+         id="rect9321-4-5" />
       <rect
          rx="2"
          inkscape:transform-center-y="0.42353254"
@@ -2348,22 +2261,11 @@
        inkscape:label="#g9350"
        transform="matrix(-1,0,0,1,155,169)"
        clip-path="url(#clipPath4470-6)">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-5-4"
-         style="display:inline;opacity:1;fill:#f9fafb;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" />
-      <rect
-         ry="1"
-         rx="1"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-4-5"
-         style="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" />
+      <path
+         style="display:inline;opacity:1;fill:#f9fafb;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 128 174 C 128.554 174 129 174.446 129 175 L 129 195 C 129 195.554 128.554 196 128 196 L 108 196 C 107.446 196 107 195.554 107 195 L 107 175 C 107 174.446 107.446 174 108 174 z "
+         transform="matrix(-1,0,0,1,162,-452.63782)"
+         id="rect9321-0-5-4" />
       <rect
          ry="2"
          rx="2"
@@ -2419,22 +2321,11 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath4466-9-0)"
        transform="matrix(-1,0,0,1,146,199)">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="23.999998"
-         width="26"
-         id="rect9321-4-9-9"
-         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" />
-      <rect
-         rx="1"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-5-6-6"
-         style="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="1" />
+      <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 153 204 C 153.554 204 154 204.446 154 205 L 154 225 C 154 225.554 153.554 226 153 226 L 133 226 C 132.446 226 132 225.554 132 225 L 132 205 C 132 204.446 132.446 204 133 204 z "
+         transform="matrix(-1,0,0,1,153,-482.63782)"
+         id="rect9321-4-9-9" />
       <rect
          rx="2"
          inkscape:transform-center-y="0.42353254"
@@ -2453,22 +2344,11 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath4470-7-0)"
        transform="matrix(-1,0,0,1,155,199)">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-5-3-7"
-         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" />
-      <rect
-         ry="1"
-         rx="1"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-4-1-2"
-         style="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" />
+      <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 128 204 C 128.554 204 129 204.446 129 205 L 129 225 C 129 225.554 128.554 226 128 226 L 108 226 C 107.446 226 107 225.554 107 225 L 107 205 C 107 204.446 107.446 204 108 204 z "
+         transform="matrix(-1,0,0,1,162,-482.63782)"
+         id="rect9321-0-5-3-7" />
       <rect
          ry="2"
          rx="2"
@@ -4316,7 +4196,7 @@
     </g>
     <g
        id="minus"
-       transform="translate(-216,-108)"
+       transform="translate(-205,-108)"
        inkscape:label="#g5704">
       <rect
          style="opacity:1;fill:#cfd6e6;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"
@@ -4348,7 +4228,7 @@
     </g>
     <g
        id="plus"
-       transform="translate(-216,-108)"
+       transform="translate(-205,-108)"
        inkscape:label="#g5698">
       <rect
          style="opacity:1;fill:#cfd6e6;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"
@@ -4390,7 +4270,7 @@
     </g>
     <image
        y="-179.63782"
-       x="276"
+       x="287.00043"
        id="line-h"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3wECFwIHDe6ntQAAABVJREFUCNdjYIACxvv37/9nYGBg AAAXYQOeFmwcNwAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
@@ -4400,7 +4280,7 @@
        inkscape:label="#image5739" />
     <image
        y="-179.63782"
-       x="271.99997"
+       x="283.0004"
        id="line-v"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABGdBTUEAALGPC/xhBQAACjppQ0NQ UGhvdG9zaG9wIElDQyBwcm9maWxlAABIiZ2Wd1RU1xaHz713eqHNMBQpQ++9DSC9N6nSRGGYGWAo Aw4zNLEhogIRRUQEFUGCIgaMhiKxIoqFgGDBHpAgoMRgFFFReTOyVnTl5b2Xl98fZ31rn733PWfv fda6AJC8/bm8dFgKgDSegB/i5UqPjIqmY/sBDPAAA8wAYLIyMwJCPcOASD4ebvRMkRP4IgiAN3fE KwA3jbyD6HTw/0malcEXiNIEidiCzclkibhQxKnZggyxfUbE1PgUMcMoMfNFBxSxvJgTF9nws88i O4uZncZji1h85gx2GlvMPSLemiXkiBjxF3FRFpeTLeJbItZMFaZxRfxWHJvGYWYCgCKJ7QIOK0nE piIm8cNC3ES8FAAcKfErjv+KBZwcgfhSbukZuXxuYpKArsvSo5vZ2jLo3pzsVI5AYBTEZKUw+Wy6 W3paBpOXC8DinT9LRlxbuqjI1ma21tZG5sZmXxXqv27+TYl7u0ivgj/3DKL1fbH9lV96PQCMWVFt dnyxxe8FoGMzAPL3v9g0DwIgKepb+8BX96GJ5yVJIMiwMzHJzs425nJYxuKC/qH/6fA39NX3jMXp /igP3Z2TwBSmCujiurHSU9OFfHpmBpPFoRv9eYj/ceBfn8MwhJPA4XN4oohw0ZRxeYmidvPYXAE3 nUfn8v5TE/9h2J+0ONciURo+AWqsMZAaoALk1z6AohABEnNAtAP90Td/fDgQv7wI1YnFuf8s6N+z wmXiJZOb+DnOLSSMzhLysxb3xM8SoAEBSAIqUAAqQAPoAiNgDmyAPXAGHsAXBIIwEAVWARZIAmmA D7JBPtgIikAJ2AF2g2pQCxpAE2gBJ0AHOA0ugMvgOrgBboMHYASMg+dgBrwB8xAEYSEyRIEUIFVI CzKAzCEG5Ah5QP5QCBQFxUGJEA8SQvnQJqgEKoeqoTqoCfoeOgVdgK5Cg9A9aBSagn6H3sMITIKp sDKsDZvADNgF9oPD4JVwIrwazoML4e1wFVwPH4Pb4Qvwdfg2PAI/h2cRgBARGqKGGCEMxA0JRKKR BISPrEOKkUqkHmlBupBe5CYygkwj71AYFAVFRxmh7FHeqOUoFmo1ah2qFFWNOoJqR/WgbqJGUTOo T2gyWgltgLZD+6Aj0YnobHQRuhLdiG5DX0LfRo+j32AwGBpGB2OD8cZEYZIxazClmP2YVsx5zCBm DDOLxWIVsAZYB2wglokVYIuwe7HHsOewQ9hx7FscEaeKM8d54qJxPFwBrhJ3FHcWN4SbwM3jpfBa eDt8IJ6Nz8WX4RvwXfgB/Dh+niBN0CE4EMIIyYSNhCpCC+ES4SHhFZFIVCfaEoOJXOIGYhXxOPEK cZT4jiRD0ie5kWJIQtJ20mHSedI90isymaxNdiZHkwXk7eQm8kXyY/JbCYqEsYSPBFtivUSNRLvE kMQLSbyklqSL5CrJPMlKyZOSA5LTUngpbSk3KabUOqkaqVNSw1Kz0hRpM+lA6TTpUumj0lelJ2Ww MtoyHjJsmUKZQzIXZcYoCEWD4kZhUTZRGiiXKONUDFWH6kNNppZQv6P2U2dkZWQtZcNlc2RrZM/I jtAQmjbNh5ZKK6OdoN2hvZdTlnOR48htk2uRG5Kbk18i7yzPkS+Wb5W/Lf9ega7goZCisFOhQ+GR IkpRXzFYMVvxgOIlxekl1CX2S1hLipecWHJfCVbSVwpRWqN0SKlPaVZZRdlLOUN5r/JF5WkVmoqz SrJKhcpZlSlViqqjKle1QvWc6jO6LN2FnkqvovfQZ9SU1LzVhGp1av1q8+o66svVC9Rb1R9pEDQY GgkaFRrdGjOaqpoBmvmazZr3tfBaDK0krT1avVpz2jraEdpbtDu0J3XkdXx08nSadR7qknWddFfr 1uve0sPoMfRS9Pbr3dCH9a30k/Rr9AcMYANrA67BfoNBQ7ShrSHPsN5w2Ihk5GKUZdRsNGpMM/Y3 LjDuMH5homkSbbLTpNfkk6mVaappg+kDMxkzX7MCsy6z3831zVnmNea3LMgWnhbrLTotXloaWHIs D1jetaJYBVhtseq2+mhtY823brGestG0ibPZZzPMoDKCGKWMK7ZoW1fb9banbd/ZWdsJ7E7Y/WZv ZJ9if9R+cqnOUs7ShqVjDuoOTIc6hxFHumOc40HHESc1J6ZTvdMTZw1ntnOj84SLnkuyyzGXF66m rnzXNtc5Nzu3tW7n3RF3L/di934PGY/lHtUejz3VPRM9mz1nvKy81nid90Z7+3nv9B72UfZh+TT5 zPja+K717fEj+YX6Vfs98df35/t3BcABvgG7Ah4u01rGW9YRCAJ9AncFPgrSCVod9GMwJjgouCb4 aYhZSH5IbyglNDb0aOibMNewsrAHy3WXC5d3h0uGx4Q3hc9FuEeUR4xEmkSujbwepRjFjeqMxkaH RzdGz67wWLF7xXiMVUxRzJ2VOitzVl5dpbgqddWZWMlYZuzJOHRcRNzRuA/MQGY9czbeJ35f/AzL jbWH9ZztzK5gT3EcOOWciQSHhPKEyUSHxF2JU0lOSZVJ01w3bjX3ZbJ3cm3yXEpgyuGUhdSI1NY0 XFpc2imeDC+F15Oukp6TPphhkFGUMbLabvXu1TN8P35jJpS5MrNTQBX9TPUJdYWbhaNZjlk1WW+z w7NP5kjn8HL6cvVzt+VO5HnmfbsGtYa1pjtfLX9j/uhal7V166B18eu612usL1w/vsFrw5GNhI0p G38qMC0oL3i9KWJTV6Fy4YbCsc1em5uLJIr4RcNb7LfUbkVt5W7t32axbe+2T8Xs4mslpiWVJR9K WaXXvjH7puqbhe0J2/vLrMsO7MDs4O24s9Np55Fy6fK88rFdAbvaK+gVxRWvd8fuvlppWVm7h7BH uGekyr+qc6/m3h17P1QnVd+uca1p3ae0b9u+uf3s/UMHnA+01CrXltS+P8g9eLfOq669Xru+8hDm UNahpw3hDb3fMr5talRsLGn8eJh3eORIyJGeJpumpqNKR8ua4WZh89SxmGM3vnP/rrPFqKWuldZa chwcFx5/9n3c93dO+J3oPsk42fKD1g/72ihtxe1Qe277TEdSx0hnVOfgKd9T3V32XW0/Gv94+LTa 6ZozsmfKzhLOFp5dOJd3bvZ8xvnpC4kXxrpjux9cjLx4qye4p/+S36Urlz0vX+x16T13xeHK6at2 V09dY1zruG59vb3Pqq/tJ6uf2vqt+9sHbAY6b9je6BpcOnh2yGnowk33m5dv+dy6fnvZ7cE7y+/c HY4ZHrnLvjt5L/Xey/tZ9+cfbHiIflj8SOpR5WOlx/U/6/3cOmI9cmbUfbTvSeiTB2Ossee/ZP7y YbzwKflp5YTqRNOk+eTpKc+pG89WPBt/nvF8frroV+lf973QffHDb86/9c1Ezoy/5L9c+L30lcKr w68tX3fPBs0+fpP2Zn6u+K3C2yPvGO9630e8n5jP/oD9UPVR72PXJ79PDxfSFhb+BQOY8/wldxZ1 AAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAAGYktHRAD/AP8A /6C9p5MAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQffAQIXAhMXNHPIAAAAFUlEQVQI12O4 f//+fwYGBgYmBigAADfmA58R2qpdAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
@@ -4410,7 +4290,7 @@
        inkscape:label="#image5750" />
     <image
        y="-179.63782"
-       x="268"
+       x="279.00043"
        id="menu_line_h"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3AcEFBQdwu2NkwAAABpJREFUCNdjfP369X8GBgYGFgYG BkYGBgYGADpPA8ceLzbjAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
@@ -4420,7 +4300,7 @@
        inkscape:label="#image5761" />
     <g
        id="menuitem"
-       transform="translate(-18,1.9999974)"
+       transform="translate(-7,1.9999974)"
        inkscape:label="#g5794">
       <rect
          rx="0"
@@ -4448,7 +4328,8 @@
     </g>
     <g
        id="handle-v"
-       inkscape:label="#g6182">
+       inkscape:label="#g6182"
+       transform="translate(11,0)">
       <rect
          y="-189.63782"
          x="210"
@@ -4479,7 +4360,7 @@
          style="opacity:1;fill:#cfd6e6;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" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,49.362183,-388.63782)"
+       transform="matrix(0,1,-1,0,60.362183,-388.63782)"
        style="display:inline"
        id="handle-h"
        inkscape:label="#g6182-9">
@@ -4517,26 +4398,26 @@
        id="progressbar_v"
        width="30"
        height="8"
-       x="212"
-       y="201"
+       x="216.00018"
+       y="-82.637817"
        ry="4"
        rx="4"
-       transform="translate(-7,-283.63782)"
        inkscape:label="#rect5799" />
     <rect
        style="opacity:1;fill:#5294e2;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="progressbar"
        width="30"
        height="8"
-       x="214"
-       y="-231"
+       x="-69.637817"
+       y="-235.00018"
        ry="4"
        rx="4"
-       transform="matrix(0,1,-1,0,-7,-283.63782)"
+       transform="matrix(0,1,-1,0,0,0)"
        inkscape:label="#rect5799-3" />
     <g
        id="trough-progressbar_v"
-       inkscape:label="#g5052">
+       inkscape:label="#g5052"
+       transform="translate(11,0)">
       <rect
          ry="0"
          rx="0"
@@ -4561,22 +4442,20 @@
     <circle
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="slider"
-       cx="224.5"
-       cy="263.5"
+       cx="228.50018"
+       cy="-20.137819"
        r="7"
-       transform="translate(-7,-283.63782)"
        inkscape:label="#path5834" />
     <circle
        style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="slider-prelight"
-       cx="243.5"
-       cy="263.5"
+       cx="247.50018"
+       cy="-20.137819"
        r="7"
-       transform="translate(-7,-283.63782)"
        inkscape:label="#path5834-3" />
     <g
        id="slider-insensitive"
-       transform="translate(-7,-283.63782)"
+       transform="translate(4,-283.63782)"
        inkscape:label="#g5881">
       <circle
          r="7"
@@ -4593,7 +4472,7 @@
     </g>
     <g
        id="trough-horizontal"
-       transform="translate(-5,-283.63782)"
+       transform="translate(6,-283.63782)"
        inkscape:label="#g5902">
       <rect
          ry="0"
@@ -4615,7 +4494,7 @@
          style="opacity:1;fill:#cfd6e6;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" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,498,-200.63782)"
+       transform="matrix(0,1,-1,0,509,-200.63782)"
        id="trough-vertical"
        inkscape:label="#g5902-6">
       <rect
@@ -4639,7 +4518,7 @@
     </g>
     <g
        id="slider-horiz"
-       transform="translate(-20,-223.63782)"
+       transform="translate(-9,-223.63782)"
        inkscape:label="#g5902-0">
       <rect
          ry="0"
@@ -4662,7 +4541,7 @@
     </g>
     <g
        id="slider-horiz-active"
-       transform="translate(-20,-212.63782)"
+       transform="translate(-9,-212.63782)"
        inkscape:label="#g5902-0-6">
       <rect
          ry="0"
@@ -4685,7 +4564,7 @@
     </g>
     <g
        id="slider-horiz-insens"
-       transform="translate(-20,-201.63782)"
+       transform="translate(-9,-201.63782)"
        inkscape:label="#g5902-0-0">
       <rect
          ry="0"
@@ -4708,7 +4587,7 @@
     </g>
     <g
        id="slider-horiz-prelight"
-       transform="translate(-20,-190.63782)"
+       transform="translate(-9,-190.63782)"
        inkscape:label="#g5902-0-1">
       <rect
          ry="0"
@@ -4731,7 +4610,7 @@
     </g>
     <g
        id="slider-vert"
-       transform="matrix(0,1,-1,0,511,-150.63782)"
+       transform="matrix(0,1,-1,0,522,-150.63782)"
        inkscape:label="#g5902-0-14">
       <rect
          ry="0"
@@ -4754,7 +4633,7 @@
     </g>
     <g
        id="slider-vert-active"
-       transform="matrix(0,1,-1,0,522,-150.63782)"
+       transform="matrix(0,1,-1,0,533,-150.63782)"
        inkscape:label="#g5902-0-6-4">
       <rect
          ry="0"
@@ -4777,7 +4656,7 @@
     </g>
     <g
        id="slider-vert-insens"
-       transform="matrix(0,1,-1,0,533,-150.63782)"
+       transform="matrix(0,1,-1,0,544,-150.63782)"
        inkscape:label="#g5902-0-0-7">
       <rect
          ry="0"
@@ -4800,7 +4679,7 @@
     </g>
     <g
        id="slider-vert-prelight"
-       transform="matrix(0,1,-1,0,544,-150.63782)"
+       transform="matrix(0,1,-1,0,555,-150.63782)"
        inkscape:label="#g5902-0-1-1">
       <rect
          ry="0"
@@ -4826,23 +4705,21 @@
        id="trough-scrollbar"
        width="15"
        height="15"
-       x="237"
-       y="376"
+       x="241.00018"
+       y="92.362183"
        rx="0"
        ry="0"
-       transform="translate(-7,-283.63782)"
        inkscape:label="#rect6037" />
     <rect
        style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:#dde3e9;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="notebook"
        width="9"
        height="9"
-       x="394.5"
-       y="6.5"
-       transform="translate(-7,-283.63782)"
+       x="398.50043"
+       y="-277.13782"
        inkscape:label="#rect6042" />
     <g
-       transform="translate(405,-1300)"
+       transform="translate(416,-1300)"
        id="tab-top-active"
        inkscape:label="Ebene 1"
        clip-path="url(#clipPath6057)">
@@ -4868,7 +4745,7 @@
          rx="1" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,1492.3622,-277.63782)"
+       transform="matrix(0,1,-1,0,1503.3622,-277.63782)"
        id="tab-right-active"
        inkscape:label="Ebene 1"
        clip-path="url(#clipPath6057-7)">
@@ -4894,7 +4771,7 @@
          rx="1" />
     </g>
     <g
-       transform="matrix(1,0,0,-1,405,808.72438)"
+       transform="matrix(1,0,0,-1,416,808.72438)"
        id="tab-bottom-active"
        inkscape:label="Ebene 1"
        clip-path="url(#clipPath6057-4)">
@@ -4920,7 +4797,7 @@
          rx="1" />
     </g>
     <g
-       transform="matrix(0,-1,1,0,-582.3622,-213.63782)"
+       transform="matrix(0,-1,1,0,-571.3622,-213.63782)"
        id="tab-left-active"
        inkscape:label="Ebene 1"
        clip-path="url(#clipPath6057-9)">
@@ -4947,7 +4824,7 @@
     </g>
     <g
        id="notebook-gap-horiz"
-       transform="translate(-7,-283.63782)"
+       transform="translate(4,-283.63782)"
        inkscape:label="#g6133">
       <rect
          y="19"
@@ -4965,7 +4842,7 @@
          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" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,413,-659.63782)"
+       transform="matrix(0,1,-1,0,424,-659.63782)"
        id="notebook-gap-vert"
        inkscape:label="#g6133-5">
       <rect
@@ -4991,11 +4868,11 @@
        x="407.5"
        y="109.5"
        clip-path="url(#clipPath6162)"
-       transform="translate(-7,-283.63782)"
+       transform="translate(4,-283.63782)"
        inkscape:label="#rect6158" />
     <g
        id="toolbar"
-       transform="translate(-7,-283.63782)"
+       transform="translate(4,-283.63782)"
        inkscape:label="#g6170">
       <rect
          y="111"
@@ -5003,18 +4880,19 @@
          height="32"
          width="24"
          id="rect6166"
-         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" />
+         style="opacity:1;fill:#f9fafb;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" />
       <rect
          y="142"
          x="437"
          height="1"
          width="24"
          id="rect6168"
-         style="opacity:1;fill:#d7d8dd;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" />
+         style="opacity:1;fill:#dde3e9;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" />
     </g>
     <g
        id="tree_header"
-       inkscape:label="#g6293">
+       inkscape:label="#g6293"
+       transform="translate(11,0)">
       <rect
          y="-87.637817"
          x="410"
@@ -5035,12 +4913,12 @@
        id="null"
        width="15"
        height="14.999997"
-       x="430"
+       x="441.00043"
        y="-87.637817"
        inkscape:label="#rect6297" />
     <image
        y="-39.637821"
-       x="410"
+       x="421.00043"
        id="frame"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwQljtRB1wAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAKklEQVQY02O8f//+fwYiAAsDAwODgoICXkUPHjxgYGIgEoxM hSywcCIEABzqCVThoNl8AAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
@@ -5050,7 +4928,7 @@
        inkscape:label="#image6307" />
     <image
        y="-37.637821"
-       x="425"
+       x="436.00043"
        id="frame-gap-end"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+KAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwUBq8yURwAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAEklEQVQI12O8f//+/5+/fjoCACBdBssq+XOrAAAAAElFTkSu QmCC "
        style="image-rendering:optimizeSpeed"
@@ -5060,7 +4938,7 @@
        inkscape:label="#image6318" />
     <image
        y="-34.637821"
-       x="425"
+       x="436.00043"
        id="frame-gap-start"
        xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+KAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwUNonrYbAAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAEUlEQVQI12O8cfOGAzsb+34AFAwDnr/nIb8AAAAASUVORK5C YII= "
        style="image-rendering:optimizeSpeed"
@@ -5070,7 +4948,8 @@
        inkscape:label="#image6329" />
     <g
        id="menubar_button"
-       inkscape:label="#g5032">
+       inkscape:label="#g5032"
+       transform="translate(11,0)">
       <rect
          inkscape:label="#rect5007"
          y="-152.63782"
@@ -5103,7 +4982,7 @@
          style="display:inline;opacity:1;fill:#d8dae0;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" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,177.36218,-309.63782)"
+       transform="matrix(0,1,-1,0,188.36218,-309.63782)"
        style="display:inline"
        id="trough-progressbar"
        inkscape:label="#g5052">
@@ -5131,24 +5010,13 @@
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="entry-toolbar"
+       id="toolbar-entry-border-bg"
        inkscape:label="#g9335">
-      <rect
-         y="-279.63782"
-         x="-3"
-         height="23.999998"
-         width="26"
-         id="rect9321-6-7"
-         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" />
-      <rect
-         rx="11"
-         y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
-         id="rect7903-652-0"
-         style="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="10.999999" />
+      <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 16 131 C 22.094 131 27 135.906 27 142 C 27 148.094 22.094 153 16 153 C 9.906 153 5 148.094 5 142 C 5 135.906 9.906 131 16 131 z "
+         transform="translate(-6,-409.63782)"
+         id="rect9321-6-7" />
       <rect
          rx="11.5"
          inkscape:transform-center-y="0.42353254"
@@ -5164,24 +5032,13 @@
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="entry-focus-toolbar"
+       id="toolbar-entry-border-active-bg"
        inkscape:label="#g9350">
-      <rect
-         y="-279.63782"
-         x="31"
-         height="23.999998"
-         width="26"
-         id="rect9321-0-0-1"
-         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" />
-      <rect
-         ry="10.999999"
-         rx="11"
-         y="-278.63782"
-         x="33"
-         height="21.999998"
-         width="22"
-         id="rect7903-2-5-5"
-         style="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" />
+      <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 50 131 C 56.094 131 61 135.906 61 142 C 61 148.094 56.094 153 50 153 C 43.906 153 39 148.094 39 142 C 39 135.906 43.906 131 50 131 z "
+         transform="translate(-6,-409.63782)"
+         id="rect9321-0-0-1" />
       <rect
          ry="11.5"
          rx="11.5"
@@ -5197,7 +5054,7 @@
     <g
        transform="translate(-1,126)"
        style="display:inline"
-       id="entry-insensitive-toolbar"
+       id="toolbar-entry-border-disabled-bg"
        inkscape:label="#g9365">
       <g
          id="g4303-7-3">
@@ -5230,5 +5087,321 @@
            ry="11.5" />
       </g>
     </g>
+    <g
+       style="display:inline"
+       id="entry-border-bg"
+       inkscape:label="#g9335"
+       transform="translate(106,61.999997)">
+      <path
+         style="opacity:1;fill:#f9fafb;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 123 67 C 129.094 67 134 71.906001 134 78 C 134 84.093999 129.094 89 123 89 C 116.906 89 112 84.093999 112 78 C 112 71.906001 116.906 67 123 67 z "
+         id="rect9321-3-7"
+         transform="translate(-113,-345.63782)" />
+      <rect
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="-1.5"
+         height="23"
+         width="23"
+         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="11.5" />
+    </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:#f9fafb;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 157 67 C 163.094 67 168 71.906001 168 78 C 168 84.093999 163.094 89 157 89 C 150.906 89 146 84.093999 146 78 C 146 71.906001 150.906 67 157 67 z "
+         id="rect9321-0-2-2"
+         transform="translate(-113,-345.63782)" />
+      <rect
+         ry="11.5"
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="32.5"
+         height="23"
+         width="23"
+         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="translate(-126,104)"
+       style="display:inline"
+       id="entry-notebook-4"
+       inkscape:label="#g9335">
+      <rect
+         y="-279.63782"
+         x="-3"
+         height="23.999998"
+         width="26"
+         id="rect9321-6-2"
+         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" />
+      <rect
+         rx="11"
+         y="-278.63782"
+         x="-1"
+         height="21.999998"
+         width="22"
+         id="rect7903-652-1"
+         style="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="10.999999" />
+      <rect
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="-1.5"
+         height="23"
+         width="23"
+         id="rect7903-7-1-2"
+         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="11.5" />
+    </g>
+    <g
+       transform="translate(-126,104)"
+       style="display:inline"
+       id="entry-focus-notebook-3"
+       inkscape:label="#g9350">
+      <rect
+         y="-279.63782"
+         x="31"
+         height="23.999998"
+         width="26"
+         id="rect9321-0-0-5"
+         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" />
+      <rect
+         ry="10.999999"
+         rx="11"
+         y="-278.63782"
+         x="33"
+         height="21.999998"
+         width="22"
+         id="rect7903-2-5-0"
+         style="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" />
+      <rect
+         ry="11.5"
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="32.5"
+         height="23"
+         width="23"
+         id="rect7903-7-3-4-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" />
+    </g>
+    <g
+       transform="translate(-126,104)"
+       style="display:inline"
+       id="entry-insensitive-notebook-9"
+       inkscape:label="#g9365">
+      <g
+         id="g4303-7-9">
+        <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-0"
+           width="26"
+           height="23.999998"
+           x="65"
+           y="-279.63782" />
+        <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-4"
+           width="22"
+           height="21.999998"
+           x="67"
+           y="-278.63782"
+           rx="11"
+           ry="10.999999" />
+        <rect
+           style="display:inline;opacity:0.55;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"
+           id="rect7903-7-2-3-2"
+           width="23"
+           height="23"
+           x="66.5"
+           y="-279.13782"
+           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-y="0.42353254"
+           rx="11.5"
+           ry="11.5" />
+      </g>
+    </g>
+    <g
+       transform="translate(-123,136)"
+       style="display:inline"
+       id="entry-toolbar-0"
+       inkscape:label="#g9335">
+      <rect
+         y="-279.63782"
+         x="-3"
+         height="23.999998"
+         width="26"
+         id="rect9321-6-7-5"
+         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" />
+      <rect
+         rx="11"
+         y="-278.63782"
+         x="-1"
+         height="21.999998"
+         width="22"
+         id="rect7903-652-0-2"
+         style="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="10.999999" />
+      <rect
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="-1.5"
+         height="23"
+         width="23"
+         id="rect7903-7-1-6-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="11.5" />
+    </g>
+    <g
+       transform="translate(-123,136)"
+       style="display:inline"
+       id="entry-focus-toolbar-9"
+       inkscape:label="#g9350">
+      <rect
+         y="-279.63782"
+         x="31"
+         height="23.999998"
+         width="26"
+         id="rect9321-0-0-1-0"
+         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" />
+      <rect
+         ry="10.999999"
+         rx="11"
+         y="-278.63782"
+         x="33"
+         height="21.999998"
+         width="22"
+         id="rect7903-2-5-5-8"
+         style="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" />
+      <rect
+         ry="11.5"
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="32.5"
+         height="23"
+         width="23"
+         id="rect7903-7-3-4-9-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" />
+    </g>
+    <g
+       transform="translate(-123,136)"
+       style="display:inline"
+       id="entry-insensitive-toolbar-3"
+       inkscape:label="#g9365">
+      <g
+         id="g4303-7-3-7">
+        <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-5"
+           width="26"
+           height="23.999998"
+           x="65"
+           y="-279.63782" />
+        <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-4"
+           width="22"
+           height="21.999998"
+           x="67"
+           y="-278.63782"
+           rx="11"
+           ry="10.999999" />
+        <rect
+           style="display:inline;opacity:0.55;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"
+           id="rect7903-7-2-3-4-6"
+           width="23"
+           height="23"
+           x="66.5"
+           y="-279.13782"
+           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-y="0.42353254"
+           rx="11.5"
+           ry="11.5" />
+      </g>
+    </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
+         inkscape:connector-curvature="0"
+         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 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
+         transform="translate(-6,-409.63782)"
+         id="rect9321-6-7-4" />
+      <rect
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="-1.5"
+         height="23"
+         width="23"
+         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="11.5" />
+    </g>
+    <g
+       transform="translate(103,126)"
+       style="display:inline"
+       id="entry-border-active-bg-solid-spin"
+       inkscape:label="#g9350"
+       clip-path="url(#clipPath5158)">
+      <path
+         inkscape:connector-curvature="0"
+         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 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
+         transform="translate(-6,-409.63782)"
+         id="rect9321-0-0-1-3" />
+      <rect
+         ry="11.5"
+         rx="11.5"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.6588025"
+         y="-279.13782"
+         x="32.5"
+         height="23"
+         width="23"
+         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"
+       transform="translate(33,-283.63782)"
+       inkscape:label="#g6170">
+      <rect
+         y="111"
+         x="437"
+         height="32"
+         width="24"
+         id="rect6166-6"
+         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" />
+      <rect
+         y="142"
+         x="437"
+         height="1"
+         width="24"
+         id="rect6168-6"
+         style="opacity:1;fill:#d7d8dd;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" />
+    </g>
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt
index 0e64d1b..82bf432 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -38,15 +38,17 @@ menu-radio-checked
 menu-radio-checked-insensitive
 menu-radio-unchecked
 menu-radio-unchecked-insensitive
-entry
-entry-focus
-entry-insensitive
-entry-notebook
-entry-focus-notebook
-entry-insensitive-notebook
-entry-toolbar
-entry-focus-toolbar
-entry-insensitive-toolbar
+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
 combo-entry
 combo-entry-focus
@@ -115,3 +117,4 @@ tab-left-active
 tab-right-active
 inline-toolbar
 toolbar
+menubar
diff --git a/common/gtk-2.0/assets/arrow-down-insens.png b/common/gtk-2.0/assets/arrow-down-insens.png
index 0623ac395edbda4d87d6e3884db5c3aabf2b8429..9db1788d4ea6e730fe07fcef1e987213d255428b 100644
GIT binary patch
delta 185
zcmV;q07n1L0?q=Ei3K|Y!+&#;ju?MG2F80#zrMa)`JaK|1|tK5XLLfY1p@;ELwtOu
zF%u($Hv=Q%9aVXe6^slF3=E;64Q!meZ_@uUFv>Fg`*VzeiN%WH-~XqAyo@s@PoDgf
znSp_U;o7wWe+~7uF8%w@s>#U6sQsUj;q9+4|7OmgKlM8U0|Nsy%ncVVT=*%Yu4;IV
niJe9I7Yq0N)r%*5hRFc{Si3|BG_d?500000NkvXXu0mjfe7RKV

delta 185
zcmV;q07n1L0?q=Ei3R(AMg}vHju?Oc{|xt;etmtp@;?K^4MqkA&*+3)3kC)ThWPkQ
zV<tuhZw5xjJF4;`D;OCV7#KoB8`wB`-=zOzV3cL}_vaV`6N?qYzyD7Kc^PL+o;>*{
zGXnzy!?kM%{u=6QUHbQ*Rg;mCQTsn5!`ok9{>_{}f9iJz1_lOZm>Vu!xbP`QUDfa!
n6FZCaFBb0ks~1oB43h%@@w-I`C8`MU00000NkvXXu0mjf`Mge+

diff --git a/common/gtk-2.0/assets/arrow-down-prelight.png b/common/gtk-2.0/assets/arrow-down-prelight.png
index d5029388cebb6b68d43915a4a1bf2ccbe80f3de4..ffcd1f9672afe3ef01fb97865172714241308390 100644
GIT binary patch
delta 204
zcmV;-05kuv0<r>-Zhx;yL_t&tnO)333jtvq!13?z@h2s`6^qTp>Mc;$l}pM*L>7bO
z&hQL|t2@e@un2hp-hka;6NABdOjq)qKYhj1;T2)s?bsv!a&<TnuobY!F!Xdd_yr3c
zbOpx1N#!zc3&R$edV19a@N`f&$Q(F4^U4wc*WF|#{oa8oiA7;)gf?)FUR3*i`yugu
z=KF=@D{%xV0vD4`m3ytm4M4?c;5c^`rD_=Vk$fsK0QdqH<2k#iyiltE0000<MNUMn
GLSTXl!d`&@

delta 202
zcmV;*05$)z0<Z#*Zhx&wL_t&tnO)2=3jtvqfbr-5a#F%qvDi$kz5;a=NtuYqVvyV!
z-obF?C||-Nl-(Dw8*E}Q+<8q`^31;;akYO#*mOJf5q~+_p9s_xaKJEhwLka;3%%+J
zjDfRCCj%S94w$-n-2ia)s$!5iaC~KyEdY+QO-UlygUO3wX+wlIa0%a(`u+M-qW#SC
zvhjE91d;=;CSetNt?C^>MQG4$K2&IxF&skq6e9re1s1+JyEq62OaK4?07*qoM6N<$
Ef?n8KiU0rr

diff --git a/common/gtk-2.0/assets/arrow-down-small-insens.png b/common/gtk-2.0/assets/arrow-down-small-insens.png
index 0eef483cf6bd58e69614c13178c71f64620e1c5a..8a67e67c69d0ffefa7d5d8fa4d5abb49a35c3911 100644
GIT binary patch
delta 176
zcmV;h08js)0-pkqcYiwy!cY`MXKs>48w(q)EEI7^e%=$4LQvxtvIq-1K}ZoWThUFp
z071|~^SKsANa>V^Il}<|#`>Gc+V!Z;Ot2bSe-i<K06?KQt4A{q!Y%+9v+R(LRgnt-
zuo5|2gcG6m>AA-|%jZJ5#)n-@Ql%>Cpw~Vr<W^?I)+O%^_bHW-)cVr*o3+i-X-(hH
eB1zNz<HtV^XDz*I>dcq`0000<MNUMnLSTXv0Z@(r

delta 176
zcmV;h08js)0-pkqcYnPO!C)AL&w1M}ECvgcfrvZu^L?TnB&b{HMHp-nNrxtSE8K(&
zFbD(vc?~M*=!{R!b8>)xWBpBJ?Rr#aCRh!vzli`q0H9Eu)uR~)VHW_5S$0Urs>lTZ
zSc#l1!iiA(^xR{f<#VB2<HIf{sZy16&}*L*ax1f9>p<=e_bHW-)cVr*o3+i-X-(hH
eB1zNz<HtV^V=cXM;5tqK0000<MNUMnLSTYC15qLX

diff --git a/common/gtk-2.0/assets/arrow-down-small-prelight.png b/common/gtk-2.0/assets/arrow-down-small-prelight.png
index 08199f2dd911003ef85949a04c42a8aed1081345..11d636910b1e78397fd52b2f6b93f70459826ecb 100644
GIT binary patch
delta 183
zcmV;o07(Cv0-XYoZhx9dL_t&tnT?LU4#8j;M$cPnV{#qh7EBVO!KRbN1=zotuhH5>
z+Q!cyy%39=kcbWz3#0EfG@95v<9U*k1OLv($t{et!4HelzKxRtzylC;tGMHQnRNjc
z(WZlFE-Jh72UJzURk{aysxtJ1+@a^!<2o|NxY8t|&z3g<E-)f`QYdQg=GYkHDpS>A
l*KHd0gZh3jn+EqU{{U*uHjASICn^8{002ovPDHLkV1k1DRowsp

delta 181
zcmV;m080Oz0-FMmZhx3bL_t&tnT?J;4gpaZMb9^WIx5?c*n&!;ROqNQ7NCE%%wVV#
zV<M)IS%}6aBr=g`G?d;|2#L-u&rMDa{JSttiYQLIKWwq-gmF>;1OSG%!tbZ^v;{C*
zrA<sZD0}~aB#V}t9nhAn7Z|xm$H(p5ch32@$xQcpFal0yIxYxZO3&KBIp@EoZ%4Rp
jP%USwRECrB@cQ8|pr1FB)aFHq00000NkvXXu0mjfX>(Gh

diff --git a/common/gtk-2.0/assets/arrow-left-prelight.png b/common/gtk-2.0/assets/arrow-left-prelight.png
index b97e1036504b7be0f47da72de3a8a2137715c307..75701fe9a6300b2b3cf741dd5808bf04007f8b3a 100644
GIT binary patch
delta 32
mcmdnbw4Z50H{*thJ@ZALC!1YpEeVli00K`}KbLh*2~7ah6br`y

delta 32
ncmdnbw4Z50H{+6tJ@ZAL%`!W$xBQ<s0}yz+`njxgN@xNA;5!Vc

diff --git a/common/gtk-2.0/assets/arrow-right-prelight.png b/common/gtk-2.0/assets/arrow-right-prelight.png
index af6b55ad8ab769a46ae733b924bae5d695e03e1b..bfce54667dc5d1dbd12c256d5a97bf9f6845de18 100644
GIT binary patch
delta 212
zcmV;_04x8w0=fc_ZhyB)L_t&tnLW+DY64LhgyDBikrZO#6^Ts(UVx<`il*B}VOz1W
zI0`u_Wmkw*`jmp?0@9?m6l@|kB8Y#Vh3-!K3^N*rbY)_;+Z0>9UhTj=4)~N&FP667
z-cJh|2*7_Nu}lNtm*c70?Y^y*HHIO10VM{Di!M(&0F2(#U`-;znCIZb<W<<%VBt=B
zcDIj7BrE~_Jxb+Hr?GTCq<xtMjGyz~DpAz<2XKNm@b%z!)i`c$v*{}-xI#VPJxuTb
O0000<MNUMnLSTaDong-a

delta 211
zcmV;^04)Ey0=WW^Zhy8(L_t&tnLW*+ZURvhgyDa#XhnnIiAYUJcz{X>5L&lpH(5(C
zhzki9Np=yadTi750WfGJK|wHtq@k39D9hMyGNVDrHzq!h`%<UdeLZoD17<SnrSf6!
z{p_g#0r+v2%G3uI{GMw`^1f5i7=)|=$_!Q)U0&`0FdXH<L`;P7bq61&O<@y*l{>5I
z{y(OXune?(lqzxDT00-|p3DNq_ur2_M^S4F-~?~L$Adf8(zJajrmre^LOwzQgnj@3
N002ovPDHLkV1gwJT<ib<

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 846b726b041392b9162b85a55f41d5f498bbc318..6f9f3b07cf1b8aa8840dec72fc67dc1e4950f134 100644
GIT binary patch
delta 177
zcmV;i08ams0+#}iZhw?XL_t(IjbjX&^5{PUg@A>bkwHs}ogvdffI*a(g@KV$0~r_?
z7(yGavMFc^PvYiaO0V-3p@xwV;5q3wd)V~H|Ns5_N3qXQK+u#&|Ns5__n(QXrb5A}
zp`(V58ais|sG)<*P|r!X*;$w&RUQj93=D0!%BCpJJDHmU;wnZKYE;pT%!~}&983%u
f4gw4e3=9ka%orbGNa5`w00000NkvXXu0mjf)2B|E

delta 172
zcmV;d08{^$0+IrdZhwzSL_t(IjqT2{4Z<)K0MYx{$W^2iq45Z$VT3G@29_X8Fa<1<
zML<Gg01zyYD#F&MLZY_|3f}-vC)?v)Nz58y?Hxl`v#Knjs>x`G%6OT$K4%Vn!y*;@
zp7xuH+iM2Mg90p#5TfQqe=BG~3tG^E{u%m?iZzlC4N)1-6D6&80NCB>k&Id+wBE7r
aY5+c703!Lka)P@60000<MNUMnLSTY3p-N@|

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 865e74aaa4c572ea9011b26c399853db2bc9481e..ecaa70d6d2beb8afe92f34db59ceb643b3060781 100644
GIT binary patch
delta 173
zcmV;e08;;h0+RxeZhw$TL_t(IjqTO34T4Y<h2is*=m1uBw(2$}&cO=oAjxwF6IZ|`
zl-@#uHZM>R^l`4OJ=gC31ANJ;jw310Ho_MHWz{1Ng0Uq4;ERCnGaRLE(sQ<btDt4o
zL+U0yDS!X~lCsP1<2U~_(Zmcj)KEhW{R5gz9roFEri!kYb0(}di-Q*INXn~?@Rxww
bL+7Hu)oeW3mI}-@00000NkvXXu0mjfm>N-D

delta 157
zcmV;O0Al}>0)qmOZhwGDL_t(IjqTO34TC@sMA2Cv5|IlaZ~;VA;-aX6I-mhuf+N!b
zNZ<hJBBW!M42hTx_ZRTeFC=x22~EFZm^P$caW^5Ub@xa0%JHtA$b#HP9{?~+n;Ceb
zX;(AwM6GkwQAZth)DX>rm<;cNmPL;C8_i%LsY^^~J}Z8s%@(2$ubDHom8ot}00000
LNkvXXu0mjfd#XaY

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 360026f97a271686f200b009717549518b8cfa96..157d8997d17bca839405c69b1be665fd21aceb89 100644
GIT binary patch
delta 176
zcmV;h08jst0+s@hZhw<WL_t(IjbjX&^5{PUg@A>bkwHU}jUnBRk3ocog@KV$0~r_?
z7(yGavdL=*PU7NVPOtV7qK1(W;5q3wd)V~H|9}4a{hx_ihHlSO{rTrFBqXV3C^8r|
zbkxvMLq`oAHFS^}>N)8)I}0<U%44C1fuRjo*%ZZjCv&nx4JoBY70t-Z$iT_Y$dG2o
e$H2hAzyJWs9UZK9xzpSL0000<MNUMnLSTXm&r!_)

delta 172
zcmV;d08{^#0+IrdZhwzSL_t(IjqT2%4FWM3K;ie(Qbj5VrW<gQ1#SQY0(O8QSOW&R
zMIb?;xe)w0pv{jW!M6g@H^7%C>%&dS%o<@H9J|&tn^;6uv(cE8?mTe0KiMy*jB>&6
z>1yG*K3)K2P=K)!V$!ncZxyX*MJrm-KSSS1u|~?FF)7_?pd|?o0J}N%*{C%_6CB&t
a1MmUZDk9h6(@W<70000<MNUMnLSTaZDoY;#

diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png
index 85250187a1a5b1273029a79e2da34e1b097dbd04..23dd71a54c3ba01605cf8c9259cdfd8a375a0fde 100644
GIT binary patch
delta 173
zcmV;e08;;i0+RxeZhw$TL_t(IjqTMj4uU`sh2ghK=<Td*HSsnko`WlJ2QAz)m~aQU
z1BtXYLbRGtxU);f)}Eo8{{Ua|s^<bnd5;OcCUiX`O@g^)0N`uFm#3QyR8-}WRnV?y
z$Uwzi0R#X9j&iy_=WqUNrHL78sG)`$x&WH39nNK&tD^gDjwan<bJ2ob;3%Il!8e4*
bOXs40#f3c0C~+Dt00000NkvXXu0mjf6BADP

delta 158
zcmV;P0Ac@=0)zsPZhwJEL_t(IjqTO34TC@oM&aK9k&c>%nwCj26-%%M4FiM)(uN5@
z0;M?7obOJiLrRTHzX87Xk>?=W5z)UL=9LkX;BMqONH_k_)=#|J5_v|q(FXv`E31JQ
z8k4Aj7pk41h8k+9p^9jpk;?G?(55Ode4H9go`dX1L_axv7Z;sHpWOK~wW%km^8f$<
M07*qoM6N<$f)kZTng9R*

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 1da5c8e7a1a578314afecf7c8a41b0678ebacfaf..23c8eaa4d8be2fefdaacfa3b7fa1299008981a43 100644
GIT binary patch
delta 168
zcmV;Z09XHj0*(TZZhwnOL_t(IjqTMj3IZ_@h2b}wbpo<1mRoF_6We$zZAOI=#6}D8
z0E;kV5fJ;Nu*iRakJmlgAMcLBhzP@)F;63S6-v3Bi17LP++A)jH?!iA-&8doP7gOT
z?`okbrNuputcL#9(1td&p$+{rR8=Dp0RZ|Mpop-A&353tu_3Q<(QhKe&|#iN0Kf+#
W1S`7pkDA5+0000<MNUMnLSTZ1%1ZnI

delta 154
zcmV;L0A>G<0)PULZhw7AL_t(IjqTMj4uU`wgyH|8Zh^!^3PS;n_rHr)dIL>Jq+%&(
z#%dG#-GbuH0lv&sV~^KIWX8;B>OkLJ2&V%kDI1l<I7Q~Tav!c#xnOE~YtPKf3Qz`3
za2j0<-NsQz9d*>vouQI2vvQ~;#$TkV0|3Y8`<sn!FB;$vqZ9oj5mAOgh5!Hn07*qo
IM6N<$f-sImHvj+t

diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png
index 4e00dc7134f0b80371a523d1fa69a75a1f88825d..1042b0d7d5b694e7e7d47333c45455b9dd8de9c9 100644
GIT binary patch
delta 145
zcmV;C0B-;60rvrrZhv%1L_t(Ijbr@x@8ADlzyC5kdGU$i%eP+)|NsAIpcwr7_wWDh
zhj0Ghxc_?k)vH(8C^r#m=!NUg|5MFCn4#ydJ)?r35rB!BhK(9JYUrq;qlS(eN&`a~
z85tR<S)DL3FfcIiaIrD4aEeW)mcfj)sG<P~q(lhNXX!-%015yANkvXXu0mjfdr3+Z

delta 133
zcmV;00DAxT0qg;gZhmP=L_t(IjqTOF4nRN<Md5oDBz_u&_kS@Jg-9sGZm}CPI*Hoo
z<~+dH9*T&jd|_S=oH0RF@imHwj?<2=sW9{nNPb2O00=Rgfe)&xX5fQb=cuEOI_jt)
nO44L_FSM;otXnXH`NyJf)mt?`qD=c$00000NkvXXu0mjffDt<A

diff --git a/common/gtk-2.0/assets/combo-entry-rtl.png b/common/gtk-2.0/assets/combo-entry-rtl.png
index 5629ac4e6747e2dc1581f062c942899134794102..5a914c83004645b8cb3db3b6267f4626de4efb8a 100644
GIT binary patch
delta 171
zcmV;c095~g0+9lcZhwwRL_t(IjqTN;4#GeXgyGq?*M{Z<f>hL!6Fe`5w?Zu>Y)DWf
zB-kdD5*Bd?d{-d$e}GSn8QLGNikT4++C@O$MTDxH%jKB4KAvy8)8($?b5gQl0TF42
zSA1;ND->2}N@-NhOPZm-IqImRjyn2hsE9N~`JE~YkeTauxg^}S;fq>a^hAVE5c)0x
Z06ywnCtFtM7V!W8002ovPDHLkV1obDOyK|k

delta 154
zcmV;L0A>G?0)PULZhw7AL_t(IjqTMj3c^4XgyH{bw#X8&5F(`U{-=qRxq%YUDp4UR
z#%dw`Zjs{60X}A`vHt!LnK3hB9q8JIP#rNz*{CGO_ssNJxOOKFxnOE~IX8TND?k}E
z!D)0cbQ?z<b<|NucZN#B%*vsX7+*874ggfQ;hBwYFB;$v9uqbq?~>?{VgLXD07*qo
IM6N<$f_r>Jp8x;=

diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png
index 394d14ea0aef5e7bb7eef899e125d73ceb6bd3fd..8d2e972d9f4f78b4c50e9f0dd127df2379cba979 100644
GIT binary patch
delta 152
zcmV;J0B8U50saAyZhw18L_t(IjqTOD4TLZdgyC6>hwfs!aB&nvLRXOZt^z<JAOV4}
zv6qzGCfh0ClP3D<w2s~7G0q$I!-1I*y9@w^d4>0(&BIb_t!=b=TF3o=Vq;7ZjXlxs
zH^zT{Or^vG6;x0`1$_Y}BBacT0)X!)hbpTk6-;j=`UVB(KoPmKOD`P&0000<MNUMn
GLSTZRyF-Tn

delta 140
zcmV;70CWHT0rCNmZhvn{L_t(IjqTMj4uU`sK+!)0V-RAYg&h_5zZE7BIyP=}*NojJ
z);o0b5AfPA?@!W{zdYB#D<)Kx+FF2l-MRK>rtyY|RHF?*jG4!MFaZmys%Bt8t#i~-
uM;&$45ET)V;r*eP?!>YMGgyvT^bcjuF@Jr72H*ey002ovP6b4+LSTYvJw7@B

diff --git a/common/gtk-2.0/assets/entry-focus.png b/common/gtk-2.0/assets/entry-border-active-bg-solid.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-focus.png
rename to common/gtk-2.0/assets/entry-border-active-bg-solid.png
diff --git a/common/gtk-2.0/assets/entry-border-active-bg.png b/common/gtk-2.0/assets/entry-border-active-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..072d5c2cb84c5a063e567e9b78021d5cb019aba6
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`EygK~zYIt=7#?({LCE@TcwQ>RuQy#xOX>i^PKoW?NB|K;m65
zP7)?09030o<IQ-(!Nv&;iZ>2MBV%($wt)vD;U#0pcp2R*W3w+?>p^P=j3r3FNiXd$
z{WMMc`#uQ6aspIH;<yOG2m>oSG*H<hByvRn0MM&3FlaHbHWOeoD?zWpD%}Q<^Poho
z2ycQ}2yW9tTRpyE)MB#)j`(yaz6=16;aO{r5&GiCygeLeI!H5t^pjesQ<n$JLQ7jT
zIDHx6W+U!1T~!Y_tm?f=Pdnw0Hyxz;nIHRX&seVx>1rX)E@D_tC_UzaX<^j0TX6Z3
zPb$8PG8z9w4UD>Xxp$$oaQeO{An#gM7<2D&PEX2mQACW>ld_Dsq6Oc2wmh_#qJ`m!
zDDPZM4*V}7X40E<3{OP){S<u`dhwnTp3fgHTow`YZ2r*u@&ok`LIM7K!plDy-dKYU
z$^~7k!yJJKEr`DZ3IGs@(9mY6+8Dl9zbh9s)UA)U8}Q9ggpr_cI}GU6*qmI57=xy2
zZe@p-px99XG&p>e8@hrE3$aW=g3@^&aGdxqH>9jmuB7t31R-(@f5Y*#0znW7s!^f9
z&`hV?5YO?qYE`HN8FdQC6@>e8L%#}&K4Y~)f-EKi;>WyQZYY-J?3QMw1li0=2*;U@
zDSy04E@XNsVcMeDcAL2b(rYjv%>;6g=4a%BB8SD-cUlQV>?c&b&`)Y%b)W5Vdy|gK
zBI6!va4p7m+exi-vUDr=t!IT1SF~`MnwVTnTSr{c!sm^XHG!5c>S`h2L8k`$63zwO
z9_qpy>??25;or=Ceb}kNNb|{-EnDS*2n|keM!3<4`%QXmV5nOktprRjB~05?ac1>^
zz5BFRhmd8e{M_Lrl`q0<Fbjb#T4-;;HybqATSCEml}c3z0Dxigwj77{#k2gQaGbe*
zyOls5lUk@%U0^sVO(Iu>kT`A~of@~QF|affK$?~3PCsIP15HfDbPJRN6#xJL07*qo
IM6N<$f^@8ZE&u=k

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/entry.png b/common/gtk-2.0/assets/entry-border-bg-solid.png
similarity index 100%
rename from common/gtk-2.0/assets/entry.png
rename to common/gtk-2.0/assets/entry-border-bg-solid.png
diff --git a/common/gtk-2.0/assets/entry-border-bg.png b/common/gtk-2.0/assets/entry-border-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..04642430ab0bf6bd18381756fe4a5c7cf4c7e6e3
GIT binary patch
literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10<}p*K~zYIt=3&j+fV=o;5R2ZiTP-$trc7qgw5NHIW{%~VSi!X
zDB}LyU^vG72LnMFY_fT?JKZL&)vnr3oA2|H>|(7|v2|+Rt3wj<<b=a{j}kMUVo11<
za6JYuWZ+DK%LD*GRRXH3$XPlZTL;zDVXuKQ2oge~*$&`(acUZLhf?xhCFv$5`ZoaJ
z37Zu{nHNdA5Jqe!=NQU((SkMryb|j8F&a%TwN1L2Ge;K7W&2>**Vc}M3Jb#3Amnos
z<BpQEjq9P-Nr=`-APbKEdg@;B?J(eSs`d6_$LDWK1yd^)%)wB{kMaA+7mlqzo34y*
z-vsGpum0z;>&IIYWk)?fGtwIfA<<}hY2KzQw?zP8x-z<5%$qBRO)nKf_HV?Dr!nK{
zuUaepSv_9AEpRzMs;!N^{dU@WKLP$NVK3kbwXEf=Aj3A7I$nG>D*^zn$6y%R&eWJy
z&kC9>S^K6*cU_<NAunX0gsf$S^rCCpnj6G@h%pI5l8;$KM3L)^o%?k{CK#b3-?N5v
z)z}u@EsI?9?480?qAA@m0RT-Uh(!D_Ye@3wk*1P9r0XgYsl3b@QW7#xb+r%WEFB_A
z7qW&J=L?Qy^dZOA5k_pLb{tf)Lh7wxDvZSayiNNM)l}phLt#O<niUkf;k&$JD7}6<
zTXo|_3qi!^>W$N-yCQoB?d6d1=jD=hcI`q<xPFYoBTwdR<LRwy;^1V~^`b8WYXSgr
zwt=yNrMiB+RXb?kc!RArPM2IS{ybK&)XOb<WtDelmYN3rG~$?xlO=0^7*KBoQ;`?0
z1`&Vp-&Nj=kP=6&039z*O_T2G8u^eCY?ws<3IJiko}>cvLL{%km_NunhEgtB(9|0o
zPA-5#!u2`aAO`0WTy&3H8Udv$9Lqr7rUOquz5E5KmS_}xF1=j<0000<MNUMnLSTX^
CW^hCR

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/entry-insensitive.png b/common/gtk-2.0/assets/entry-border-disabled-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-insensitive.png
rename to common/gtk-2.0/assets/entry-border-disabled-bg.png
diff --git a/common/gtk-2.0/assets/entry-focus-notebook.png b/common/gtk-2.0/assets/entry-focus-notebook.png
deleted file mode 100644
index 044edf6f247a500f66f0a8ece83a0ec1c8060eea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10)9zEK~zYIt(H4a+fW#W-&~-WTv|d}Ayoy#$`l&YUr=?cy0on6
z5`I;rM(Rbdv~)#XA;p1oX%{X|se@21m^gNf6Wd>h#C8<wq<|mkES7v8eLClS?-#Hv
zi!g$E%fz0bp>%qMYRg1jF#rI`Xc&)TA*?J+fnymYW1&&oAmAmcD<(F18O5>&Zjk}U
zGI%^Qf!RoJ!-i@?l)B&r4aKsCG|OO(i(@wGA+#)uhS$!aN|~HUp9+`M?pQPqRX6El
z;gT{rk#>*NYx`N2Mb|`M4w|%{KckacXRKhD<El>Ce1*13&C#NrLzUL^XVg%P8%t~&
zib2_Y<yvKqs490UlM`=M$-gSg<V32;T}KqO&uU{&#*5_$7LyYrZ_od*^l%c-m!sG$
z%FeeS(7VF>zcsu}#qTV!d6kNR7c|rr(-nOe+E`s=Fg+O@`SVSfo(v+*GT;Tx75zBX
z@swqJlh~wL2Bp(0S9C5Lm`~jOY=(J~n810{a7B`8;=%Oj7IGUBkq|D_finvDuIOPA
zArJ_-qM1ktQs3++l4>H+?~OqKn7bdwAF1oRNR$lB#lx;BH9zHCLqFLQG^{M#b447>
zpjg(>?pVG_+8qlA{rGT1$yf+!mcdr3<(ug9K?~287$={cR<Op!vHeqlQ0v@Ta$M`+
z+b;#Lxq+58*vfa0RLbTnzQjb~*dr$FwN+|THeaEWs(xe1QB|kxy9#|B7kq=2z0HaA
zp>Rp6ZjKeGx=HVMdr@BSh;q;2<U%#E!OP%JG^Cy3B#hZ;?_D$$1EOSr7c}gbHLNZ%
zc*Dh=2Re+W$fmBC;O%is9vZje?zrVS{q*?@!rpK}=^LR200000NkvXXu0mjfrcz$e

diff --git a/common/gtk-2.0/assets/entry-focus-toolbar.png b/common/gtk-2.0/assets/entry-focus-toolbar.png
deleted file mode 100644
index 5ce0711362e3bbea9febb6b00fc6409f797790e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10<TF#K~zYIt(Hqq6Hyd^zv<9{X+<b)g+f3UAcj{F1-F7OL|G{;
z(BB~mzkr1JJ0u~vgG3ezF6jbF1ri>H$fGTR$%xpF?Jyk|Kp$9&lz!WrJKsHb&OPS{
zq40r84%Dd0QZT_v_yi>as+Iu2AzN_Tq17YO?h$d=gj}CNxJ;yKCetfA-$Dit>Lj}B
zZPYp?+@)3k4vuxUl{mhwDE^%|Z61;S7Axg)c41bLe>cJSVvMIvG6Rn*ut}Djr;Wr6
zCVeVj)->L9N_cC;t3{vJPng>@818e@SXGi!aFLC$#@Hu?o`xcN8;dg5GLGusO)&S}
zV07TlwIu+JRWhTmE1BIqVQJ6EE>bm<@x>U!eNJ3w{~;e-rB>cOck*E&&QC3MSxM2<
zvd**nGL4njkK`ivs$_baWTsd3OpzKjSq>Y#>T=vza?W74gFw(gJ&Vc$;13#f)=Ail
z|IL<su@{SU)Jg<`MoP3AHh5HTE12Y*u6i3Qp)}E9#H8LO6<l=JC2{aO?dpy+lZspU
zXWC`BO069INfYI+Qu&iGO$0$miEhgR%CVkvQ$8riI%OqkBDY=OhY~NiXj{>7+tWlX
z9uePGwBVxoEsa)>B_(S2i1>HnL}EtHjn^R(GYIU&X{#1fB8N?&%_B1DQwt`Vm{;-E
zSd#rIS?l^+tjw-yY=pEMOV&afU)MEWG^d_SQdBMr40TG3%_tn+AOjDNb>7b?3_X-G
zx@|^3^45s-G!!xNaX+uf*1{Sill$~G6ydGTteaU|`O==j_(Gf~O)`Vsjw_38BxW!%
zuQIo;@wQW<{eN2dIY*kw)T&NkFF{A0^=vq?;=X-a6AymH*;aIXTTzyFbi6edUN&1P
wyUuWuj;fgif(9!gBm1~jeL8MkHvOFQ7aH#uM&uDVNdN!<07*qoM6N<$g7Ob$=l}o!

diff --git a/common/gtk-2.0/assets/entry-notebook.png b/common/gtk-2.0/assets/entry-notebook.png
deleted file mode 100644
index 831004f5592a3e798c3df1a40399bca414b868fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yRlQK~zYIwU$d$;y@He59HO5mzgl)f`u;p|Nm!Zp$n`+icHLd
z*h!~h76Jka7J_G+sy?~5Z}-=o#bUAK2#wNYg`}(+nnu&K8UWigux$h1wFx|dZ5hXw
zp>s&2lxC95$qPy73j)tUI3||)wxDV?vTn)Bn!Jz%zThTyu?`476}=Rar%BEr>T?}?
zbi19Sf2$Wurb$VXR*Y@}LSK9>n*N)Uq!o9gh@P;H3if%GiidH^AnNn`m%H<=yI)C?
zR@~plCrbc&!s7lmW|mfDh5THkl;&xYb2o}M`|uqs)8K9tF`ncor9X-$vy%9#_pM6y
z=?RNC>hqk;cSViT<YmqEz&~5E<~sJs3c0DO3y`fw*!W_)PQmDQ2z)_S*6*USY6v{%
zVv;qX=TOYIM0KMPj(KsBa7^lEt97c?XHD86EYm=>TcV$039NU$yKlZE+nwqHIJSYT
z+l!0py2ZA)M80cp#_*D4g~WHAcTwO8@<O7IN7G5@#ge?N3B4_mZ5af<V49Q{6HR9&
zp)WT1w3)h_*d=+Xc$MmGNhK9YRxupBN5w{DSq7tFz{5B_YXViPc^s#VhQZF++&M>~
zFBn99{yrw(s;rWVKaUB6sQ)2lKaKLNkc^*m;;XkP|LU^UizU-pN%C?+l&?{(=6N<J
zTRl8N&%tp_>{UCOR#Vq4Ss~x1%NGm>?!l|<plBmhnyjoT<~5DdG^>2EEd$#!@Lh+{
ea}K_K*8B$n&>06#JBqIW0000<MNUMnLSTYAt3fyb

diff --git a/common/gtk-2.0/assets/entry-toolbar.png b/common/gtk-2.0/assets/entry-toolbar.png
deleted file mode 100644
index 02f411ed11dd87112f260db79e618cd9eb5139f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yarRK~zYIwU$e7(?Ar3zZqvd_9P}o6;eeOlm-0%-vbK@Qrb$W
z!f70P{F-55;yl`<N*d0}mLH$*nd5s$+&}#G98u>yw)WJmqidn_{q2De1S8N&pp_($
z;@E2#9lGG0XIVO`+A%hY5AO{oR_IUxP}L1Z*^uRy$3=q<B}pui2Y}+Gifrw9TD7E!
zW_Fzt1oG(Dww+`Ckg-@+OveE_e188k(8@Xr>$sVvB$MbUU|;#lay!p3T4JJI*v^@)
zJw@gC`uXZ)2*6|<@#W@<qUtSw5#(HN*Uc;)*5MrKQ1NM&vRHLEw=rt~EsKsc(In&3
zE7?~vj+iEzyxdeJp^tFYcs^dIZ-%TjyH2sS8>*7fug%yfMz5sn6paFjF$&vkf$G*V
zJ!A1-Q#y%;Q1sSyVB+%wa7ZRrv>jU@=iijHL(-wb`7P`Imprg;ND@FwK~*;w2UT^0
z6k-D!Nhr$8gUYfY2-tvhD9CbqaZt9jXeGBmN>UUJZRd_Yc#7K2QIsuFxMf`+1v-?>
zAF_*q=Jy#o6vKQPQkTS%MP9MIfQ3)FWwEN5#G6nLM^Xx=CgA5?_ND|@b;GZ_jCUs3
z8Sgv)kq#wBOTOPeo>ke?%JS{@5u+v1-jsc|XE2c@knm&vhv}pr<*zl{wsXwyGZy&?
zqkJvrJbCG`wa1td=_DeK716&|W$T8rY{-@+McEOBg2}0ylYO9VJXP)JT;CU=Pii20
fyCWqI0@nHq8@~wBBWAHn00000NkvXXu0mjf&YV15

diff --git a/common/gtk-2.0/assets/menubar.png b/common/gtk-2.0/assets/menubar.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff499522d754f1fab68fd2d96ebf4c04171e7858
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^5<slL!3HEb;&xa7DVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u}o-U3d
z9-YZG{~mp<XOm)5i;}X-I=F&$u~<)(0SZI;6w@?*dAo~Om>70ivz;wm^Q{S}pTX1B
K&t;ucLK6U^f;6%K

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..d390dedbc2c99f5aea13035ac40026c2102a1ea3
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^&(TK~zYIt=3CV6Hycg@G}ouN@)pD3W~^kVPZ5?d8i4*uONw1
zA%O%)^rIM;#s$&ZA`3tx5jSkqAgu+8QWwMxl$vH}pq;kPz_g`v=Ux{&3_@u{=AYc%
z<o;&v%$##5j4^=%;dd1XgfkF~WFfYz0KbO-0Kittg5AP^qrMp08%$ucFom`O>LiHY
zQ{dH#2!U{#G*=ncYpg}DON@-qOz2er0Exm5DW`Pr2&gv{-*4?`ETQhTTcNTvKbRL<
z3T0qyAw@2qH~KDAm-IOu=4he29ryFKF@a32MfYz#=qaZ<n@q<q!Wfgo>+PyQMm<sV
z(l6XEcouo`d?DF4;@OgCg916a?_ZFAT_U5Ns66gZwVf8xo-Wlk?B>wohLj(Qi82{<
zaoGJ?==)zp%?oeRIq2eWT$GPPPu?fU<GJ|!SrIjl=HlL`9}@=<4e<LD{_-P(?PXNI
zUQlg0?OfhW6Mjzt000^QU^$$I=BlFg!JD=%y`X`vO0LCj+*k=`H0WDoAM9mCGkPIv
z>=t$=7|CkTwuqqAK!4C1G8>usZ2@UeN>YHP*)_c(hGv3E>Cii(^cMa^##xr4C=Dt%
zGoT=JMQ@10^wkP8qd_%gEJz67)*DL8&|PC?HK^@kG3*GaS8r%rM7@rBqXxA%m>?A2
zZyopZwR$0wfka(6o@>6|VA3F)g@KO75-KK;DZQWwuS|C}nW%&Qq}HOiD3c)<hdth;
z^Q?%=m+T*MahTuDQ&cg=WN||x!)^|prA<sM{&WnxIkXfyp-rf3HYku0&lZ~SB~M*o
zpLvtckr!L?yF86AZ!2Hk%)r>E6uETH;IFM<`UbixxkA8XAW;`dkg4y{?2U&#<y1$W
zR(|4el9UvfUJ)U%nIX+~!$!4*ePb#DFUuOf0stVCyOx%rdq+ffHsiUL&L$Iex7`Zr
v5BkrL8h%fK6?NPakBnPZZQMF(`cd->Dgph?bK07E00000NkvXXu0mjf&SZfE

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/notebook-entry-border-bg.png b/common/gtk-2.0/assets/notebook-entry-border-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..8767bc675173d4ba0ee57c0752a6c3102a6e3467
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-{MoK~zYIwbt)T+dvox@F%(C@~dsY`U})o+um;I-fRfM{)PFb
zo&TU?%>Q5@D1$M!z0kd|%EoL{64%;Z)1=AWCASyaHfmeu%pM4Y5bl#4_uTiSG))D}
zD9REbegyrH0;LI1o&W#<RuEu}plD$z6?DKVnl%ha(;&tYaN7Zp-aweTdWx~~PEn*o
zIhDTx0Hkud!MWI?JlPII`ou07(sJ1XbqY8U>iQ8lZch|Ud|1%6%EE%xob|Q!R=C2V
zXg3Jx=IU}uvWxoNm(ny9*~@MD;`^z`n=W}Xb1o*7<C4m8&0}867q`c~0bP<%9M?SN
zTy)m&i;S>~&iYZ!<sA}EhT@osqZ2oETvGX0B=cw0qZ2ocV|Ew%<#fc)`sMyZkzxI4
zTppY^yCX;jxLU%!ew-?XzLOV(4ZYg!4FqFX?H~gH5I+J#Q%=|BO(!pCwQM#_6Q7ZO
zJcjxq1&o!wypUmOD%$gd3>4D@WEno>4Iw1$$22o_j3=N<%5m<HK;Ib8K>w>Kk`?Lt
zUIqYA6$Bjk)7+($JyR7lhBS;IN#IrPP$IT4&Ok*A1Letf-cC&UcG1$tP^q9p7}6*8
zR=AQE;<UrHLBt=~g$#sM1a`@gSQPE%1;zcrTf3-B!+aX8y5+J3K}a_pmsB5$)IG8j
z#O%e=yfuE9-O4*86h}3eKO`oazq=cgV&X<0*+m@|=PcAE^mEfA_ugR7T~cj#;!lfn
z7P_6X6Qi8?5j4D>Fm?5#W*L>$ve}pgIPGwahS6?6q%WsM`SimHPrz#hK>SD;hI*zc
z=shUX0T$>B005Pe=a7i4nDW<yh(ETAy0kQJ!LUL98XAEt0n(4b4`QG!0eYP;SVe$U
j1Vu{&yP!=y{S505UHH!XT1u?W00000NkvXXu0mjfIN)vR

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/entry-insensitive-notebook.png b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-insensitive-notebook.png
rename to common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png
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
new file mode 100644
index 0000000000000000000000000000000000000000..c97829088d5dd58ab984dbfb856428274f2987a5
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`*BmK~zYIt=7#?6G0dT@Mm_q)fOXET4GzN2TKovMT!~)gF!?S
z<s=sn^&%WJ#(%}cXo!g+F+{`|J!uTas`!-<l~Mv6XpIT&E<{#Vh-IbQ+3}#Ig_J7L
z=eV2fZ)Xng^OEVAS&lqW7dgVRf$^CXz9#@xGXMZKi-6K1pvp<%cT(7_B;RL1)`C=x
z<LS7L(P_p#HX&lS3J)!2yt6W47yuTj5zus_K}nF-DV0_Dos_gxiYT$<26I9qaRYs!
zB=^~ccP@vy?b1<)obPYDgE6<VAoNcvMtw&>B-L*EZzwpK!pjI_2Rx>WSDJVB<pWmd
z=77{T95;HKd?wTJ3e$>r!s?T}im+6j*L-lj2mo9?<?gTZZaMT~QfFa_<%U#^qc4=?
zHM>n0I**lw){CUmd8{l{Q%*138`k*`Epu7R(33G8K0A4H^~BEpjUwq>JL$gfwF~c`
zPUtHkb&+Fi#xU&LdB<jvbX+C8JuEY>{ymid03$Mkr-Vc<H<e3;g1Q=a#XU9}9hF%I
znwViI-G;}7LejBYg~#L5S&)+8uuudG4Oz_m_3Y2AtDDz2s349N8ls?~`CnO3{wcNb
zq)5_42+2U(Ed-3E{Dp>C64k|9vmi$ifoAZ=LPI(?H8_g0ph_o&k|3>xhGr8+Yn4;T
zKz=91l*%f)gE4oZke)%QJf^Ze`&={w*{lS9Cnd^)u<7xWPHc`p*zcw!-A~K2uBB2$
zL^0}bJ(Joui`*EHJH9CV@aetc^0Q^A#6oZ`Ad*iq>%BAht!AUh?Vub8#Z!0B)rus$
zZCCVBwVUFEPo(doOCP%j<aH0&>(8b3p|5PH*(cI!*UFa7S><7gp>J5{UWf3(S<KtI
z8h6F>0X>6Kd29~-QN=iNJ|GhR|5SN8^BTvK2_0dHanBAKEwzwGW`VukBAPz~z>=P<
zUE)H+TmomOROa39rsT|C5yk6SPO_tF9HTPB_%zGCZn^%fTWf7U>HG%s!bL+2C-4*i
O0000<MNUMnLSTZ|IGF|j

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/toolbar-entry-border-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bef4f50175db1bee596948ce6b9ae3a4031e76f
GIT binary patch
literal 789
zcmV+w1M2*VP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10+LBYK~zYIwbtKD6j2lh@b5Wy?#%3}`Cy6Q4-`}13JszVg#Lwm
zQN;eY5Xy-B4}vHQLdut*%oPP)Q`3iSb)A_z_uL+~aaYkTb^AUI%rKw1XYQOc^ke6z
zLxWgxh!Te+71$K8u6ns5g7Sbs69UapOpR^>@1heT4&`G(oQTsNtuoO|KafRO{#=!0
z%nBxA!;^=VbSUtd+HwrO0HpI)6eSM7j;sqb7W2M0)z^1xyV29GZ0>j4*vuP)@%9#`
zz~{e1N0Hzt5}VWXWO%UaStH<V3hO&lmDtU-gzV+R)7U8}N*u}+o8D+s_xrm$moI~4
z*(mOfmdfc;dtRyfm7N@k{3%yJvsXm`puf9wIT!G3=}4SNtym{exnkjacsnxCHGfqk
z%kV(gbFK0I@K{bmRveNP!l9nIE|Nuu{&bYoR>eT|-FS@Ek=~odW<f(e9b2AOg~-%F
zNh(mvEi?<sq6rIeA~ncb0Fc+shM4V})S?a&2Tl4*(;=sp#nqMWf5m9!Wete|fSHgY
zz0+*SCgv^^)gX@n=jc(hArCyE6lzf56RcB{&4yBOlY!<sNHdJFLo1v6-OWM@#e-gx
z%3$c%l}<4s@R@9EuHAmJB$ebv;4@|O>15Zn<rpT#`1iG)>FXlj)^=x%#e>$|Io+F?
z(4J>HHZr$S+#9_rvbwQ7790EYMxLpDyr24x0-w<uDpe}mrPa0FOE=iB>pRnxh(5N4
zN`-!d!IvdY1f_~N-=hy+sHcW{I<^`Ch2lZ4shIgBbr1h}lxGofI6M|ai8xQI0+V~?
z;NFGAp8z0oa*u%t5qfM=xgGjUt(W~dISWR{Ax;EVs(lft?o`Fqa)+8O1hV`FuWLHh
TTjvWh00000NkvXXu0mjfT{Uhh

literal 0
HcmV?d00001

diff --git a/common/gtk-2.0/assets/entry-insensitive-toolbar.png b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png
similarity index 100%
rename from common/gtk-2.0/assets/entry-insensitive-toolbar.png
rename to common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png
diff --git a/common/gtk-2.0/assets/toolbar.png b/common/gtk-2.0/assets/toolbar.png
index ff499522d754f1fab68fd2d96ebf4c04171e7858..6b55f41e073c8bd8d0e354bd8388aafb3ba15221 100644
GIT binary patch
delta 42
xcmdnaxSerA8OxuaufI>MQj%8Jzkl%x6NB1EwpW6Ihh-Rmz|+;wWt~$(69AFI5U>CM

delta 42
xcmdnaxSerA8B5K-M_(saDM|Co+g-fE#IVzv?QG$iZ%qt9;OXk;vd$@?2>^Qh5On|m

diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index a0ac495..d117ca6 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -694,8 +694,41 @@ style "menubar" {
 
   xthickness = 0
   ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/menubar.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
 }
 
+style "menubar-borderless" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @selected_fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/null.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+
+}
+
+
 style "menu" {
 
   xthickness = 0
@@ -1046,7 +1079,7 @@ style "entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry.png"
+      file = "assets/entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1056,7 +1089,7 @@ style "entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive.png"
+      file = "assets/entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1065,7 +1098,7 @@ style "entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus.png"
+      file = "assets/entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1100,7 +1133,7 @@ style "notebook_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry-notebook.png"
+      file = "assets/notebook-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1110,7 +1143,7 @@ style "notebook_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive-notebook.png"
+      file = "assets/notebook-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1119,10 +1152,28 @@ style "notebook_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus-notebook.png"
+      file = "assets/notebook-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
+    }
   }
 }
 
@@ -1136,7 +1187,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry-toolbar.png"
+      file = "assets/toolbar-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1146,7 +1197,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive-toolbar.png"
+      file = "assets/toolbar-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1155,10 +1206,28 @@ style "toolbar_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus-toolbar.png"
+      file = "assets/toolbar-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
+    }
   }
 }
 
@@ -1730,7 +1799,7 @@ style "libreoffice_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry.png"
+      file = "assets/entry-border-bg-solid.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1739,7 +1808,7 @@ style "libreoffice_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus.png"
+      file = "assets/entry-border-active-bg-solid.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1773,7 +1842,7 @@ style "standalone_entry" {
     detail = "entry"
     state = NORMAL
     shadow = IN
-    file = "assets/entry.png"
+    file = "assets/entry-border-bg-solid.png"
     border = { 12, 12, 12, 12 }
     stretch = TRUE
     }
@@ -1782,7 +1851,7 @@ style "standalone_entry" {
     function = SHADOW
     detail = "entry"
     state = ACTIVE
-    file = "assets/entry-focus.png"
+    file = "assets/entry-border-active-bg-solid.png"
     border = { 12, 12, 12, 12 }
     stretch = TRUE
     }
@@ -1964,7 +2033,7 @@ style "combobox_button" {
 }
 
 style "range" {
-	
+
   engine "pixmap" {
 
     image {
@@ -2479,8 +2548,8 @@ widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>"                 styl
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>"   style "combobox_entry"
 
 # The same thing for toolbars
-widget_class "*<GtkToolbar>*<GtkEntry>"                                    style "toolbar_entry"
-widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>"                      style "entry"
+#widget_class "*<GtkToolbar>*<GtkEntry>"                                    style "toolbar_entry"
+#widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>"                      style "entry"
 
 # We also need to avoid changing fg color for the inactive notebook tab labels
 widget_class "*<GtkNotebook>.<GtkLabel>"                            style "notebook_tab_label"
@@ -2523,3 +2592,11 @@ widget "*libreoffice-toplevel*GtkSpinButton"                        style "libre
 widget_class "*XfdesktopIconView*"                                  style "xfdesktop-icon-view"
 widget "xfwm4-tabwin*"                                              style "xfwm-tabwin"
 widget "xfwm4-tabwin*GtkButton*"                                    style "xfwm-tabwin-button"
+
+# Whitelist for dark toolbars
+widget_class "*ThunarWindow*<GtkMenuBar>"                           style "menubar-borderless"
+widget_class "*CajaNavigationWindow*<GtkMenuBar>"                   style "menubar-borderless"
+widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>"                style "toolbar_entry"
+widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>"        style "toolbar_entry"
+widget_class "*ThunarWindow*<GtkToolbar>"                           style "menubar"
+widget_class "*CajaNavigationWindow*<GtkToolbar>"                   style "menubar"