diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc
index 2fcbdd5..ecabed7 100644
--- a/common/gtk-2.0/apps.rc
+++ b/common/gtk-2.0/apps.rc
@@ -27,29 +27,30 @@ widget_class "*ThunarTreeView*"                         style "dark-sidebar"
 widget_class "*ThunarWindow*.<GtkHPaned>"               style "thunar-handle"
 
 #
-# Mousepad
+# Workaround for colored entries
 #
-
 style "entry_border" {
 
+  xthickness = 7
+  ythickness = 5
+
   engine "pixmap" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
+      detail = "entry"
       file = "assets/entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
-      detail = "entry"
       state = ACTIVE
+      detail = "entry"
       file = "assets/entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
@@ -73,4 +74,8 @@ style "entry_border" {
   }
 }
 
+# Mousepad search entry
 widget_class "*MousepadSearchBar*.<GtkEntry>"    style "entry_border"
+
+# Hexchat input box
+class "SexySpellEntry"                           style:highest "entry_border"
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 83c6a16..20aeedd 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -565,9 +565,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="32.121536"
-     inkscape:cy="224.28999"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-24.583201"
+     inkscape:cy="377.40868"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5621,6 +5621,11 @@
        id="entry-border-bg"
        inkscape:label="#g9335"
        transform="translate(-1,31)">
+      <path
+         inkscape:connector-curvature="0"
+         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 -4,-280.63782 0,26 1,0 1,0 24,0 1,0 1,0 0,-26 -1,0 -1,0 -24,0 -1,0 -1,0 z m 2,2 24,0 0,22 -24,0 0,-22 z"
+         id="rect5006-1-1-6" />
       <path
          inkscape:connector-curvature="0"
          style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -5644,6 +5649,11 @@
        id="entry-border-active-bg"
        inkscape:label="#g9350"
        transform="translate(-1,31)">
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 30,-280.63782 0,26 1,0 1,0 24,0 1,0 1,0 0,-26 -1,0 -1,0 -24,0 -1,0 -1,0 z m 2,2 24,0 0,22 -24,0 0,-22 z"
+         id="rect5006-1-1-6-0" />
       <path
          inkscape:connector-curvature="0"
          style="display:inline;opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg.png b/common/gtk-2.0/assets-dark/entry-border-active-bg.png
index 4266547..d92e0bf 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-bg.png b/common/gtk-2.0/assets-dark/entry-border-bg.png
index 2cd6bf2..3d4ae5a 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-bg.png and b/common/gtk-2.0/assets-dark/entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index c6bdc86..e8b23d8 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,9 +565,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="70.918098"
-     inkscape:cy="184.39866"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-25.898322"
+     inkscape:cy="369.44312"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5589,12 +5589,17 @@
        id="entry-border-bg"
        inkscape:label="#g9335"
        transform="translate(-1,31.999997)">
+      <path
+         inkscape:connector-curvature="0"
+         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 -4,-280.63782 0,26 1,0 1,0 24,0 1,0 1,0 0,-26 -1,0 -1,0 -24,0 -1,0 -1,0 z m 2,2 24,0 0,22 -24,0 0,-22 z"
+         id="rect5006-1" />
       <path
          inkscape:connector-curvature="0"
          style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 110,66 0,24 26,0 0,-24 -26,0 z m 3.5,1 1,0 17,0 1,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,17 c 0,1.385 -1.115,2.5 -2.5,2.5 l -1,0 -17,0 -1,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-17 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
-         transform="translate(-113,-345.63782)"
-         id="rect9321-3-7" />
+         id="rect9321-3-7"
+         transform="translate(-113,-345.63782)" />
       <rect
          rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
@@ -5612,6 +5617,11 @@
        id="entry-border-active-bg"
        inkscape:label="#g9350"
        transform="translate(-1,31.999997)">
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 30,-280.63782 0,26 1,0 1,0 24,0 1,0 1,0 0,-26 -1,0 -1,0 -24,0 -1,0 -1,0 z m 2,2 24,0 0,22 -24,0 0,-22 z"
+         id="rect5006-1-1-1" />
       <path
          inkscape:connector-curvature="0"
          style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
diff --git a/common/gtk-2.0/assets/entry-border-active-bg.png b/common/gtk-2.0/assets/entry-border-active-bg.png
index 4dd75af..84618be 100644
Binary files a/common/gtk-2.0/assets/entry-border-active-bg.png and b/common/gtk-2.0/assets/entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets/entry-border-bg.png b/common/gtk-2.0/assets/entry-border-bg.png
index 5604317..6b820aa 100644
Binary files a/common/gtk-2.0/assets/entry-border-bg.png and b/common/gtk-2.0/assets/entry-border-bg.png differ