diff --git a/macosx/Badger.h b/macosx/Badger.h
index 583ab3831..92fe3d439 100644
--- a/macosx/Badger.h
+++ b/macosx/Badger.h
@@ -31,11 +31,12 @@
     
     NSImage * fDockIcon, * fBadge;
     
-    NSDictionary * fAttributes;
-    int fCompleted, fCompletedBadged;
-    BOOL fSpeedBadge;
+    int fCompleted;
     
-    BOOL fQuittingTiger;
+    //tiger-only fields
+    NSDictionary * fAttributes;
+    int fCompletedBadged;
+    BOOL fSpeedBadge, fQuittingTiger;
 }
 
 - (id) initWithLib: (tr_handle *) lib;
diff --git a/macosx/Badger.m b/macosx/Badger.m
index 898cac37c..4d47edf66 100644
--- a/macosx/Badger.m
+++ b/macosx/Badger.m
@@ -73,7 +73,8 @@
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
     
-    [NSApp setApplicationIconImage: nil]; //needed on 10.4
+    if (![NSApp isOnLeopardOrBetter])
+        [NSApp setApplicationIconImage: nil]; //needed on 10.4
     
     [fDockIcon release];
     [fAttributes release];
@@ -241,7 +242,6 @@
     }
 }
 
-#warning see if it now quits fast enough to not need this?
 - (void) setQuitting
 {
     if ([NSApp isOnLeopardOrBetter])