Index: plugins/clock/clock.c
===================================================================
--- plugins/clock/clock.c	(revision 23492)
+++ plugins/clock/clock.c	(working copy)
@@ -156,7 +156,7 @@
     if (size > 26)
     {
         gtk_container_set_border_width (GTK_CONTAINER (clock->frame), 2);
-        size -= 3;
+        size -= 5;
     }
     else
     {
Index: plugins/systray/systray.c
===================================================================
--- plugins/systray/systray.c	(revision 23492)
+++ plugins/systray/systray.c	(working copy)
@@ -199,8 +199,8 @@
 
     gtk_container_set_border_width (GTK_CONTAINER (systray->frame), border);
     
-    size = size - border - 2 - MAX (systray->frame->style->xthickness,
-                                    systray->frame->style->ythickness);
+    size = size - (2 * border) - 2 - MAX (systray->frame->style->xthickness,
+                                          systray->frame->style->ythickness);
     
     if (xfce_panel_plugin_get_orientation (plugin) 
             == GTK_ORIENTATION_HORIZONTAL)
Index: plugins/systray/systray.desktop.in.in
===================================================================
--- plugins/systray/systray.desktop.in.in	(revision 23492)
+++ plugins/systray/systray.desktop.in.in	(working copy)
@@ -4,6 +4,6 @@
 _Name=System Tray
 _Comment=Show notification icons
 Icon=xfce-system-info
-X-XFCE-Module=systemtray
+X-XFCE-Module=systray
 X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@