diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index ad9597f..2a299ac 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -209,6 +209,28 @@ free_applet_data (AppletData *data)
   g_slice_free (AppletData, data);
 }
 
+static inline void
+force_no_focus_padding (GtkWidget *widget)
+{
+  static gboolean first_time = TRUE;
+
+  if (first_time)
+    {
+      gtk_rc_parse_string ("\n"
+                           "   style \"na-tray-style\"\n"
+                           "   {\n"
+                           "      GtkWidget::focus-line-width=0\n"
+                           "      GtkWidget::focus-padding=0\n"
+                           "   }\n"
+                           "\n"
+                           "    widget \"*.na-tray\" style \"na-tray-style\"\n"
+                           "\n");
+      first_time = FALSE;
+    }
+
+  gtk_widget_set_name (widget, "na-tray");
+}
+
 static gboolean
 applet_factory (PanelApplet *applet,
                 const gchar *iid,
@@ -251,7 +273,9 @@ applet_factory (PanelApplet *applet,
   panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
 
   gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
-  
+  gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
+  force_no_focus_padding (GTK_WIDGET (applet));
+
 #ifndef NOTIFICATION_AREA_INPROCESS
   gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON);
 #endif
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index b2259d5..c05c32e 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -460,11 +487,14 @@ na_tray_init (NaTray *tray)
 
   priv = tray->priv = G_TYPE_INSTANCE_GET_PRIVATE (tray, NA_TYPE_TRAY, NaTrayPrivate);
 
+  gtk_container_set_border_width (GTK_CONTAINER (tray), 0);
+
   priv->screen = NULL;
   priv->orientation = GTK_ORIENTATION_HORIZONTAL;
 
   priv->frame = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_add (GTK_CONTAINER (tray), priv->frame);
+  gtk_container_set_border_width (GTK_CONTAINER (priv->frame), 0);
   gtk_widget_show (priv->frame);
 
   priv->box = g_object_new (na_box_get_type (), NULL);
@@ -472,6 +502,7 @@ na_tray_init (NaTray *tray)
 		    G_CALLBACK (na_tray_expose_box), tray);
   gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING);
   gtk_container_add (GTK_CONTAINER (priv->frame), priv->box);
+  gtk_container_set_border_width (GTK_CONTAINER (priv->box), 0);
   gtk_widget_show (priv->box);
 }
 
