diff --git a/data/nautilus.css b/data/nautilus.css
index 5e7ff4963..b5d50fc09 100644
--- a/data/nautilus.css
+++ b/data/nautilus.css
@@ -4,10 +4,6 @@
     -NautilusIconContainer-light-info-rgba: shade (@selected_fg_color, 0.6);
 }
 
-#statusbar-no-border {
-    -GtkStatusbar-shadow-type: none;
-}
-
 #nautilus-extra-view-widget {
     background-color: #a7c6e1;
 }
@@ -19,7 +15,6 @@
     ythickness: 0;
 }
 
-
 NautilusFloatingBar {
     background-color: shade (@theme_base_color, 0.95);
     border-color: darker (shade (@theme_base_color, 0.95));
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index d0f4e54d6..f9c509d90 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -201,8 +201,8 @@ nautilus_floating_bar_constructed (GObject *obj)
 	g_object_set (w,
 		      "margin-top", 2,
 		      "margin-bottom", 2,
-		      "margin-left", 6,
-		      "margin-right", 6,
+		      "margin-left", 12,
+		      "margin-right", 12,
 		      NULL);
 	self->priv->label_widget = w;
 	gtk_widget_show (w);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 2b6e1abf9..a9813ab7d 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -578,10 +578,7 @@ nautilus_window_constructed (GObject *self)
 	gtk_widget_show (table);
 	gtk_container_add (GTK_CONTAINER (window), table);
 
-	gtk_widget_set_margin_bottom (GTK_WIDGET (window), 3);
-
 	statusbar = gtk_statusbar_new ();
-	gtk_widget_set_name (statusbar, "statusbar-noborder");
 	window->details->statusbar = statusbar;
 	window->details->help_message_cid = gtk_statusbar_get_context_id
 		(GTK_STATUSBAR (statusbar), "help_message");
@@ -2021,8 +2018,6 @@ nautilus_window_init (NautilusWindow *window)
 
 	/* Set initial window title */
 	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
-
-	gtk_window_set_has_resize_grip (GTK_WINDOW (window), FALSE);
 }
 
 static NautilusIconInfo *