diff --git a/macosx/Base.lproj/MainMenu.xib b/macosx/Base.lproj/MainMenu.xib
index f1d018bd0..3cb60f52e 100644
--- a/macosx/Base.lproj/MainMenu.xib
+++ b/macosx/Base.lproj/MainMenu.xib
@@ -330,6 +330,7 @@
                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PriorityHighTemplate" id="LI6-cz-gYa"/>
                                                                         </imageView>
                                                                     </subviews>
+                                                                    <edgeInsets key="edgeInsets" left="0.0" right="4" top="0.0" bottom="0.0"/>
                                                                     <visibilityPriorities>
                                                                         <integer value="1000"/>
                                                                         <integer value="1000"/>
diff --git a/macosx/SmallTorrentCell.mm b/macosx/SmallTorrentCell.mm
index 5782b3ba3..05c61afb8 100644
--- a/macosx/SmallTorrentCell.mm
+++ b/macosx/SmallTorrentCell.mm
@@ -45,16 +45,14 @@
 
 - (void)updateTrackingAreas
 {
+    [super updateTrackingAreas];
+
     if (self.fTrackingArea != nil)
     {
         [self removeTrackingArea:self.fTrackingArea];
     }
 
-    //tracking rect should not be entire row, but start at fGroupDownloadView
-    NSRect titleRect = self.fTorrentTitleField.frame;
-    CGFloat maxX = NSMaxX(titleRect);
     NSRect rect = self.bounds;
-    rect.origin.x = maxX;
 
     NSTrackingAreaOptions opts = (NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow);
     self.fTrackingArea = [[NSTrackingArea alloc] initWithRect:rect options:opts owner:self userInfo:nil];
diff --git a/macosx/TorrentCell.mm b/macosx/TorrentCell.mm
index 522223651..219d57aa7 100644
--- a/macosx/TorrentCell.mm
+++ b/macosx/TorrentCell.mm
@@ -8,8 +8,6 @@
 #import "Torrent.h"
 #import "NSImageAdditions.h"
 
-static CGFloat const kPriorityIconWidth = 12.0;
-
 @implementation TorrentCell
 
 - (void)drawRect:(NSRect)dirtyRect
@@ -31,14 +29,12 @@ static CGFloat const kPriorityIconWidth = 12.0;
                 imageWithColor:priorityColor];
 
             self.fTorrentPriorityView.image = priorityImage;
-            self.fStackView.spacing = 4;
-            self.fTorrentPriorityViewWidthConstraint.constant = kPriorityIconWidth;
+
+            [self.fStackView setVisibilityPriority:NSStackViewVisibilityPriorityMustHold forView:self.fTorrentPriorityView];
         }
         else
         {
-            self.fTorrentPriorityView.image = nil;
-            self.fStackView.spacing = 0;
-            self.fTorrentPriorityViewWidthConstraint.constant = 0;
+            [self.fStackView setVisibilityPriority:NSStackViewVisibilityPriorityNotVisible forView:self.fTorrentPriorityView];
         }
     }