diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc
index 3755258..872e501 100644
--- a/common/gtk-2.0/apps.rc
+++ b/common/gtk-2.0/apps.rc
@@ -76,11 +76,80 @@ style "entry_border" {
   }
 }
 
+style "combobox_entry_border" = "combobox_entry"
+{
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border.png"
+      border = { 4, 4, 5, 4 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus.png"
+      border = { 4, 4, 5, 4 }
+      stretch = TRUE
+      direction = LTR
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/combo-entry-border-rtl.png"
+      border = { 4, 4, 5, 4 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/combo-entry-border-focus-rtl.png"
+      border = { 4, 4, 5, 4 }
+      stretch = TRUE
+      direction = RTL
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+  }
+}
+
+
 # Mousepad search entry
-widget_class "*MousepadSearchBar*.<GtkEntry>"      style "entry_border"
+widget_class "*MousepadSearchBar*.<GtkEntry>"         style "entry_border"
 
 # Mousepad find and replace
-widget_class "*MousepadReplaceDialog*.<GtkEntry>"  style "entry_border"
+widget_class "*MousepadReplaceDialog*.<GtkEntry>"     style "entry_border"
 
 # Hexchat input box
-class "SexySpellEntry"                             style:highest "entry_border"
+class "SexySpellEntry"                                style:highest "entry_border"
+
+# Geany search entries
+widget "*GeanyToolbar.*geany-search-entry-no-match*"  style "entry_border"
+widget "*GeanyToolbar.*GtkEntry*"                     style "entry_border"
+
+widget "GeanyDialogSearch.*GtkComboBoxEntry*.*geany-search-entry-no-match*"  style "combobox_entry_border"
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 906d531..5908b2b 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -741,6 +741,90 @@
        x2="51.5"
        y2="-256.63782"
        gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1-0">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-9-1"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171-1"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618-1"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-8">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-7"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-9"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -749,9 +833,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="37.403863"
-     inkscape:cy="228.51884"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="190.41345"
+     inkscape:cy="213.5177"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5916,5 +6000,129 @@
        rx="2.7755599e-17"
        ry="2.7755599e-17"
        inkscape:label="#rect5008-1" />
+    <g
+       style="display:inline"
+       id="combo-entry-border"
+       inkscape:label="#g9335"
+       transform="translate(161,169)"
+       clip-path="url(#clipPath4466-3)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70"
+         style="display:inline;opacity:0.15;fill:#000000;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
+       style="display:inline"
+       id="combo-entry-border-focus"
+       inkscape:label="#g9335"
+       transform="translate(186,169)"
+       clip-path="url(#clipPath4466-3-1)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618);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
+       style="display:inline"
+       id="combo-entry-border-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,176,199)"
+       clip-path="url(#clipPath4466-3-8)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-30"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-6"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-6"
+         style="display:inline;opacity:0.15;fill:#000000;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
+       style="display:inline"
+       id="combo-entry-border-focus-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,201,199)"
+       clip-path="url(#clipPath4466-3-1-0)">
+      <path
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3-8"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171-1);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9-8"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618-1);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-dark/combo-entry-border-focus-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-border-focus-rtl.png
new file mode 100644
index 0000000..5288d13
Binary files /dev/null and b/common/gtk-2.0/assets-dark/combo-entry-border-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-border-focus.png b/common/gtk-2.0/assets-dark/combo-entry-border-focus.png
new file mode 100644
index 0000000..e000d0d
Binary files /dev/null and b/common/gtk-2.0/assets-dark/combo-entry-border-focus.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-border-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-border-rtl.png
new file mode 100644
index 0000000..f2fb6b0
Binary files /dev/null and b/common/gtk-2.0/assets-dark/combo-entry-border-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-border.png b/common/gtk-2.0/assets-dark/combo-entry-border.png
new file mode 100644
index 0000000..92ebe4e
Binary files /dev/null and b/common/gtk-2.0/assets-dark/combo-entry-border.png differ
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index 4daaa5b..1994bc2 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -19,6 +19,20 @@
    sodipodi:docname="assets.svg">
   <defs
      id="defs9894">
+    <linearGradient
+       id="linearGradient6614">
+      <stop
+         style="stop-color:#cfd6e6;stop-opacity:1;"
+         offset="0"
+         id="stop6616" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5167">
+      <stop
+         style="stop-color:#cfd6e6;stop-opacity:1;"
+         offset="0"
+         id="stop5169" />
+    </linearGradient>
     <linearGradient
        id="linearGradient5117">
       <stop
@@ -866,6 +880,90 @@
        x2="51.5"
        y2="-256.63782"
        gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-9"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-1-0">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-9-1"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient5171-1"
+       x1="9.5"
+       y1="-279.63782"
+       x2="9.5"
+       y2="-255.63782"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient6618-1"
+       x1="17.5"
+       y1="-279.13782"
+       x2="17.5"
+       y2="-256.13782"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4466-3-8">
+      <rect
+         style="opacity:0.55800003;fill:#ff1111;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="rect4468-5-7"
+         width="21"
+         height="25.999998"
+         x="-18"
+         y="-280.63782"
+         transform="scale(-1,1)" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -874,11 +972,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.828427"
-     inkscape:cx="74.28003"
-     inkscape:cy="188.10678"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="205.16573"
+     inkscape:cy="193.28696"
      inkscape:document-units="px"
-     inkscape:current-layer="combo-entry-focus-notebook-rtl"
+     inkscape:current-layer="layer1"
      showgrid="true"
      showborder="false"
      inkscape:window-width="1366"
@@ -6009,5 +6107,129 @@
        rx="2.7755599e-17"
        ry="2.7755599e-17"
        inkscape:label="#rect5008-1" />
+    <g
+       style="display:inline"
+       id="combo-entry-border"
+       inkscape:label="#g9335"
+       transform="translate(161,169)"
+       clip-path="url(#clipPath4466-3)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-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="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70"
+         style="display:inline;opacity:0.3;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
+       style="display:inline"
+       id="combo-entry-border-focus"
+       inkscape:label="#g9335"
+       transform="translate(186,169)"
+       clip-path="url(#clipPath4466-3-1)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618);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
+       style="display:inline"
+       id="combo-entry-border-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,176,199)"
+       clip-path="url(#clipPath4466-3-8)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-30"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-6"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-6"
+         style="display:inline;opacity:0.3;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
+       style="display:inline"
+       id="combo-entry-border-focus-rtl"
+       inkscape:label="#g9335"
+       transform="matrix(-1,0,0,1,201,199)"
+       clip-path="url(#clipPath4466-3-1-0)">
+      <path
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -43,149 0,24 26,0 0,-24 -26,0 z m 3,1 18,0 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 l -18,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
+         transform="translate(40,-428.63782)"
+         id="rect5025-2-2-3-8"
+         inkscape:connector-curvature="0" />
+      <rect
+         rx="3"
+         inkscape:transform-center-y="0.42353254"
+         inkscape:transform-center-x="-4.8613592"
+         y="-279.13782"
+         x="-2.5"
+         height="23"
+         width="24"
+         id="rect7903-7-8-6-2-9-2"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5171-1);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         ry="3" />
+      <rect
+         y="-278.63782"
+         x="17"
+         height="22"
+         width="1"
+         id="rect4699-70-9-8"
+         style="display:inline;opacity:1;fill:url(#linearGradient6618-1);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 853a182..710871e 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -56,13 +56,17 @@ entry-toolbar
 entry-active-toolbar
 entry-disabled-toolbar
 combo-entry
+combo-entry-border
 combo-entry-focus
+combo-entry-border-focus
 combo-entry-insensitive
 combo-entry-notebook
 combo-entry-focus-notebook
 combo-entry-insensitive-notebook
 combo-entry-rtl
+combo-entry-border-rtl
 combo-entry-focus-rtl
+combo-entry-border-focus-rtl
 combo-entry-insensitive-rtl
 combo-entry-notebook-rtl
 combo-entry-focus-notebook-rtl
diff --git a/common/gtk-2.0/assets/combo-entry-border-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-border-focus-rtl.png
new file mode 100644
index 0000000..4923da4
Binary files /dev/null and b/common/gtk-2.0/assets/combo-entry-border-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-border-focus.png b/common/gtk-2.0/assets/combo-entry-border-focus.png
new file mode 100644
index 0000000..623c777
Binary files /dev/null and b/common/gtk-2.0/assets/combo-entry-border-focus.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-border-rtl.png b/common/gtk-2.0/assets/combo-entry-border-rtl.png
new file mode 100644
index 0000000..f30c410
Binary files /dev/null and b/common/gtk-2.0/assets/combo-entry-border-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-border.png b/common/gtk-2.0/assets/combo-entry-border.png
new file mode 100644
index 0000000..0644fef
Binary files /dev/null and b/common/gtk-2.0/assets/combo-entry-border.png differ