diff --git a/data/Makefile.am b/data/Makefile.am
index eee6b2d51..2196b0942 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,6 +17,7 @@ imagedir = $(pkgdatadir)/images
 dist_image_DATA =		\
 	add-workspace.svg	\
 	close.svg		\
+	close-black.svg       \
 	info.svg		\
 	magnifier.svg  \
 	remove-workspace.svg
diff --git a/data/close-black.svg b/data/close-black.svg
new file mode 100644
index 000000000..1443bb8b8
--- /dev/null
+++ b/data/close-black.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="close-black.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata2399"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs2397"><linearGradient
+     id="linearGradient3173"><stop
+       style="stop-color:#c4c4c4;stop-opacity:1;"
+       offset="0"
+       id="stop3175" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3177" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 8 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="16 : 8 : 1"
+     inkscape:persp3d-origin="8 : 5.3333333 : 1"
+     id="perspective2401" /></defs><sodipodi:namedview
+   inkscape:window-height="811"
+   inkscape:window-width="1272"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="32.125"
+   inkscape:cx="8"
+   inkscape:cy="10.440056"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground" />
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   d="M10.5,3.5l2,2L10,8l2.5,2.5l-2,2L8,10l-2.5,2.5l-2-2L6,8L3.5,5.5l2-2L8,6L10.5,3.5  z M0,8c0-4.418,3.582-8,8-8s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2394"
+   style="fill-opacity:1;fill:#000000" />
+</svg>
\ No newline at end of file
diff --git a/data/magnifier.svg b/data/magnifier.svg
index 836ee6998..31eff887a 100644
--- a/data/magnifier.svg
+++ b/data/magnifier.svg
@@ -9,13 +9,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
+   version="1.0"
    id="Foreground"
    x="0px"
    y="0px"
-   width="29px"
-   height="18px"
-   viewBox="0 0 29 18"
+   width="18"
+   height="18"
+   viewBox="0 0 18 18"
    enable-background="new 0 0 29 18"
    xml:space="preserve"
    sodipodi:version="0.32"
@@ -24,7 +24,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
    id="metadata16"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs14"><inkscape:perspective
      sodipodi:type="inkscape:persp3d"
      inkscape:vp_x="0 : 9 : 1"
@@ -35,7 +35,7 @@
    inkscape:window-height="728"
    inkscape:window-width="1103"
    inkscape:pageshadow="2"
-   inkscape:pageopacity="0"
+   inkscape:pageopacity="1"
    guidetolerance="10.0"
    gridtolerance="10.0"
    objecttolerance="10.0"
@@ -43,13 +43,15 @@
    bordercolor="#666666"
    pagecolor="#000000"
    id="base"
-   showgrid="false"
+   showgrid="true"
    inkscape:zoom="27.260185"
-   inkscape:cx="14.5"
-   inkscape:cy="9"
+   inkscape:cx="9.5844061"
+   inkscape:cy="9.4435574"
    inkscape:window-x="142"
-   inkscape:window-y="25"
-   inkscape:current-layer="Foreground"><inkscape:grid
+   inkscape:window-y="26"
+   inkscape:current-layer="Foreground"
+   inkscape:snap-global="true"
+   showguides="false"><inkscape:grid
      type="xygrid"
      id="grid2391"
      empspacing="5"
@@ -59,23 +61,20 @@
 
 <g
    id="g5"
-   style="fill:#ffffff;fill-opacity:1">
+   style="fill:#ffffff;fill-opacity:1"
+   transform="translate(-4,-0.023114)">
 	<path
-   fill="#FFFFFF"
-   d="M6.246,13.98c-0.319-0.319-0.319-0.837,0-1.157l3.717-3.717c0.319-0.319,0.837-0.319,1.157,0l0.786,0.787   c0.32,0.319,0.32,0.837,0,1.157l-3.717,3.717c-0.32,0.319-0.838,0.319-1.157,0L6.246,13.98L6.246,13.98z"
+   d="m 6.246,13.98 c -0.319,-0.319 -0.319,-0.837 0,-1.157 L 9.963,9.106 c 0.319,-0.319 0.837,-0.319 1.157,0 l 0.786,0.787 c 0.32,0.319 0.32,0.837 0,1.157 l -3.717,3.717 c -0.32,0.319 -0.838,0.319 -1.157,0 l -0.786,-0.787 0,0 z"
    id="path7"
    style="fill:#ffffff;fill-opacity:1" />
 	<path
-   fill="#FFFFFF"
-   d="M9.076,11.937"
+   d="M 9.076,11.937"
    id="path9"
    style="fill:#ffffff;fill-opacity:1" />
 </g>
 <path
-   fill-rule="evenodd"
    clip-rule="evenodd"
-   fill="#FFFFFF"
-   d="M11.25,7.5c0-1.243,1.007-2.25,2.25-2.25s2.25,1.007,2.25,2.25  s-1.007,2.25-2.25,2.25S11.25,8.743,11.25,7.5z M9,7.5C9,5.015,11.015,3,13.5,3S18,5.015,18,7.5S15.985,12,13.5,12S9,9.985,9,7.5z"
+   d="m 7.25,7.476886 c 0,-1.243 1.007,-2.25 2.2499998,-2.25 1.2430002,0 2.2500002,1.007 2.2500002,2.25 0,1.243 -1.007,2.25 -2.2500002,2.25 C 8.257,9.726886 7.25,8.719886 7.25,7.476886 z m -2.25,0 c 0,-2.485 2.015,-4.5 4.4999998,-4.5 2.4850002,0 4.5000002,2.015 4.5000002,4.5 0,2.4849998 -2.015,4.5 -4.5000002,4.5 C 7.015,11.976886 5,9.9618858 5,7.476886 z"
    id="path11"
-   style="fill:#ffffff;fill-opacity:1" />
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
 </svg>
\ No newline at end of file
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 8e1c928bc..a96efa059 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -233,11 +233,14 @@ function SearchEntry() {
 
 SearchEntry.prototype = {
     _init : function() {
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   y_align: Big.BoxAlignment.CENTER,
+        this.actor = new Big.Box({ padding: DEFAULT_PADDING,
                                    border_bottom: SECTION_BORDER,
                                    border_color: SEARCH_BORDER_BOTTOM_COLOR,
-                                   reactive: true  });
+                                   corner_radius: DASH_CORNER_RADIUS,
+                                   reactive: true });
+        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                y_align: Big.BoxAlignment.CENTER });
+        this.actor.append(box, Big.BoxPackFlags.EXPAND);
         this.actor.connect('button-press-event', Lang.bind(this, function () {
             this._resetTextState(true);
             return false;
@@ -259,7 +262,7 @@ SearchEntry.prototype = {
         this.entry.connect('notify::text', Lang.bind(this, function () {
             this._resetTextState(false);
         }));
-        this.actor.append(this.entry, Big.BoxPackFlags.EXPAND);
+        box.append(this.entry, Big.BoxPackFlags.EXPAND);
 
         // Mark as editable just to get a cursor
         let defaultTextProperties = { ellipsize: Pango.EllipsizeMode.END,
@@ -270,20 +273,21 @@ SearchEntry.prototype = {
                                       single_line_mode: true };
         Lang.copyProperties(textProperties, defaultTextProperties);
         this._defaultText = new Clutter.Text(defaultTextProperties);
-        this.actor.add_actor(this._defaultText);
+        box.add_actor(this._defaultText);
         this.entry.connect('notify::allocation', Lang.bind(this, function () {
             this._repositionDefaultText();
         }));
 
         this._iconBox = new Big.Box({ x_align: Big.BoxAlignment.CENTER,
-                                      y_align: Big.BoxAlignment.CENTER });
-        this.actor.append(this._iconBox, Big.BoxPackFlags.END);
+                                      y_align: Big.BoxAlignment.CENTER,
+                                      padding_right: 4 });
+        box.append(this._iconBox, Big.BoxPackFlags.END);
 
         let global = Shell.Global.get();
         let magnifierUri = "file://" + global.imagedir + "magnifier.svg";
         this._magnifierIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
-                                                                             magnifierUri, 29, 18);
-        let closeUri = "file://" + global.imagedir + "close.svg";
+                                                                             magnifierUri, 18, 18);
+        let closeUri = "file://" + global.imagedir + "close-black.svg";
         this._closeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
                                                                          closeUri, 18, 18);
         this._closeIcon.reactive = true;