diff --git a/gdm.spec b/gdm.spec
index c03b00f..a4b494a 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -108,9 +108,10 @@ Patch24: fix-computer-info.patch
 Patch25: fix-run-dir-permissions.patch
 Patch26: make-user-list-animation-smoother.patch
 
-Patch97: gdm-multistack.patch
+Patch96: gdm-multistack.patch
 # Fedora-specific
-Patch98: gdm-bubble-location.patch
+Patch97: gdm-bubble-location.patch
+Patch98: tray-padding.patch
 Patch99: gdm-2.23.1-fedora-logo.patch
 
 %package user-switch-applet
@@ -160,8 +161,9 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 %patch25 -p1 -b .fix-run-dir-permission
 %patch26 -p1 -b .make-user-list-animation-smoother
 
-%patch97 -p1 -b .multistack
-%patch98 -p1 -b .bubble-location
+%patch96 -p1 -b .multistack
+%patch97 -p1 -b .bubble-location
+%patch98 -p1 -b .tray-padding
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
@@ -415,6 +417,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Sat Oct 31 2009 Matthias Clasen <mclasen@redhat.com> 2.28.1-18
+- Actually set up statusicon padding
+
 * Fri Oct 30 2009 Ray Strode <rstrode@redhat.com> 2.28.1-17
 - Make the user list slide animation smoother
 
diff --git a/tray-padding.patch b/tray-padding.patch
new file mode 100644
index 0000000..d0c7039
--- /dev/null
+++ b/tray-padding.patch
@@ -0,0 +1,15 @@
+diff -up gdm-2.28.1/data/session-setup.entries.tray-padding gdm-2.28.1/data/session-setup.entries
+--- gdm-2.28.1/data/session-setup.entries.tray-padding	2009-10-31 18:07:29.437799765 -0400
++++ gdm-2.28.1/data/session-setup.entries	2009-10-31 18:08:20.758793871 -0400
+@@ -761,5 +761,11 @@
+         <string>bottom_right</string>
+       </value>
+     </entry>
++    <entry>
++      <key>/apps/notification_area_applet/prefs/padding</key>
++      <value>
++        <int>3</int>
++      </value>
++    </entry>
+   </entrylist>
+ </gconfentryfile>