diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index 10a7386..4371b3a 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -70,6 +70,10 @@ if FIXED_GTKSPELL
 FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
 endif
 
+if HAS_GTK_2_16
+HAS_GTK_2_16_FLAGS = -define:HAS_GTK_2_16
+endif
+
 CSFLAGS = 				\
 	-debug				\
 	-define:DEBUG 			\
@@ -81,6 +85,7 @@ CSFLAGS = 				\
 	$(WIN_CSFLAGS) 		\
 	$(FIXED_PANELAPPLET_CSFLAGS)	\
 	$(FIXED_GTKSPELL_CSFLAGS) \
+	$(HAS_GTK_2_16_FLAGS) \
 	$(CSC_DEFINES)
 
 CSFILES = 					\
diff --git a/Tomboy/Tray.cs b/Tomboy/Tray.cs
index c063287..174db53 100644
--- a/Tomboy/Tray.cs
+++ b/Tomboy/Tray.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Mono.Unix;
 using System.Runtime.InteropServices;
+using GtkBeans;
 
 namespace Tomboy
 {
@@ -31,7 +32,9 @@ namespace Tomboy
 		{
 			this.note = note;
 			Image = new Gtk.Image (note_icon);
-
+#if HAS_GTK_2_16
+			this.SetAlwaysShowImage (true);
+#endif
 			if (show_pin) {
 				Gtk.HBox box = new Gtk.HBox (false, 0);
 				Gtk.Widget child = Child;
diff --git a/Tomboy/gtk-sharp-beans/ImageMenuItem.cs b/Tomboy/gtk-sharp-beans/ImageMenuItem.cs
new file mode 100644
index 0000000..2dcdc5e
--- /dev/null
+++ b/Tomboy/gtk-sharp-beans/ImageMenuItem.cs
@@ -0,0 +1,41 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//  
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//  
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// 
+// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
+// 
+// Authors:
+//      Sandy Armstrong <sanfordarmstrong@gmail.com>
+// 
+
+#if HAS_GTK_2_16
+using System;
+using System.Runtime.InteropServices;
+
+namespace GtkBeans {
+	public static class ImageMenuItemExtensions {
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		static extern void gtk_image_menu_item_set_always_show_image(IntPtr raw, bool always_show);
+
+		public static void SetAlwaysShowImage (this Gtk.ImageMenuItem item, bool always_show)
+		{
+			gtk_image_menu_item_set_always_show_image (item.Handle, always_show);
+		}
+	}
+}
+#endif
diff --git a/configure.in b/configure.in
index e30e09a..bc09f01 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,11 @@ PKG_CHECK_MODULES(LIBTOMBOY,
 AC_SUBST(LIBTOMBOY_CFLAGS)
 AC_SUBST(LIBTOMBOY_LIBS)
 
+if pkg-config --atleast-version=2.16 gtk+-2.0; then
+	HAS_GTK_2_16=yes
+fi
+AM_CONDITIONAL(HAS_GTK_2_16, test "x$HAS_GTK_2_16" = "xyes")
+
 #
 # Use pkg-config to check for the panel applet server directory if
 # specified by --enable-panelapplet-srvdir-check.
