diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m
index e0c56a387..64f02741e 100644
--- a/Application/PlaybackEventController.m
+++ b/Application/PlaybackEventController.m
@@ -174,37 +174,6 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
                     content.sound = nil;
                     content.categoryIdentifier = @"play";
                     
-                    if ([defaults boolForKey:@"notifications.show-album-art"] && [pe albumArtInternal]) {
-                        NSError *error = nil;
-                        NSFileManager *fileManager = [NSFileManager defaultManager];
-                        NSURL *tmpSubFolderURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()]
-                                URLByAppendingPathComponent:@"cog-artworks-cache" isDirectory:true];
-                        if ([fileManager createDirectoryAtPath:[tmpSubFolderURL path]
-                                   withIntermediateDirectories:true
-                                                    attributes:nil
-                                                         error:&error]) {
-                            NSString *tmpFileName = [[NSProcessInfo.processInfo globallyUniqueString] stringByAppendingString:@".jpg"];
-                            NSURL *fileURL = [tmpSubFolderURL URLByAppendingPathComponent:tmpFileName];
-                            NSImage *image = [pe albumArt];
-                            CGImageRef cgRef = [image CGImageForProposedRect:NULL context:nil hints:nil];
-                            NSBitmapImageRep *newRep = [[NSBitmapImageRep alloc] initWithCGImage:cgRef];
-                            NSData *jpgData = [newRep representationUsingType:NSBitmapImageFileTypeJPEG
-                                                                   properties:@{NSImageCompressionFactor: @0.5f}];
-                            [jpgData writeToURL:fileURL atomically:YES];
-
-                            UNNotificationAttachment *icon = [UNNotificationAttachment attachmentWithIdentifier:@"art"
-                                                                                                            URL:fileURL
-                                                                                                        options:nil
-                                                                                                          error:&error];
-                            if (error) {
-                                // We have size limit of 10MB per image attachment.
-                                NSLog(@"%@", error.localizedDescription);
-                            } else {
-                                content.attachments = @[icon];
-                            }
-                        }
-                    }
-
                     UNNotificationRequest * request = [UNNotificationRequest requestWithIdentifier:@"PlayTrack" content:content trigger:nil];
                     
                     [center addNotificationRequest:request withCompletionHandler:^(NSError * _Nullable error) {
diff --git a/Preferences/General/Base.lproj/Preferences.xib b/Preferences/General/Base.lproj/Preferences.xib
index 59a8d00b3..2b9a6c667 100644
--- a/Preferences/General/Base.lproj/Preferences.xib
+++ b/Preferences/General/Base.lproj/Preferences.xib
@@ -11,7 +11,6 @@
                 <outlet property="appearanceView" destination="CgN-sy-RmM" id="wvB-aW-Gfx"/>
                 <outlet property="growlView" destination="U4w-jw-ca5" id="IUJ-gB-jwT"/>
                 <outlet property="hotKeyPane" destination="6" id="14"/>
-                <outlet property="iTunesStyleCheck" destination="AIz-WH-Wqk" id="2n1-pY-cZR"/>
                 <outlet property="midiPane" destination="i5B-ga-Atm" id="rbe-uK-5n2"/>
                 <outlet property="outputPane" destination="57" id="75"/>
                 <outlet property="playlistView" destination="231" id="244"/>
@@ -401,12 +400,12 @@
             <point key="canvasLocation" x="-78" y="-31.5"/>
         </customView>
         <customView id="U4w-jw-ca5" userLabel="GrowlView">
-            <rect key="frame" x="0.0" y="0.0" width="500" height="94"/>
+            <rect key="frame" x="0.0" y="0.0" width="500" height="114"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="njn-Xl-9k9">
-                    <rect key="frame" x="18" y="58" width="158" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <rect key="frame" x="18" y="78" width="158" height="18"/>
+                    <autoresizingMask key="autoresizingMask"/>
                     <buttonCell key="cell" type="check" title="Enable notifications" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="hqT-nY-NoU">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -416,7 +415,7 @@
                     </connections>
                 </button>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AIz-WH-Wqk">
-                    <rect key="frame" x="18" y="18" width="131" height="18"/>
+                    <rect key="frame" x="18" y="58" width="131" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Use iTunes style" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="cOb-hQ-7K8">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
diff --git a/Preferences/General/GeneralPreferencesPlugin.h b/Preferences/General/GeneralPreferencesPlugin.h
index 9b31123aa..15a5099ae 100644
--- a/Preferences/General/GeneralPreferencesPlugin.h
+++ b/Preferences/General/GeneralPreferencesPlugin.h
@@ -25,8 +25,6 @@
     IBOutlet NSView *growlView;
     IBOutlet NSView *appearanceView;
     IBOutlet NSView *midiView;
-
-    __weak IBOutlet NSButton *iTunesStyleCheck;
 }
 
 - (HotKeyPane *)hotKeyPane;
diff --git a/Preferences/General/GeneralPreferencesPlugin.m b/Preferences/General/GeneralPreferencesPlugin.m
index ce2bf6058..90d022cfc 100644
--- a/Preferences/General/GeneralPreferencesPlugin.m
+++ b/Preferences/General/GeneralPreferencesPlugin.m
@@ -71,15 +71,6 @@
 
 - (GeneralPreferencePane *)growlPane
 {
-    if (@available(macOS 10.14, *)) {
-        if (iTunesStyleCheck) {
-            iTunesStyleCheck.hidden = YES;
-            NSSize size = growlView.frame.size;
-            size.height -= 18;
-            [growlView setFrameSize:size];
-        }
-    }
-
     return [GeneralPreferencePane preferencePaneWithView:growlView title:NSLocalizedStringFromTableInBundle(@"Growl", nil, [NSBundle bundleForClass:[self class]], @"")  iconNamed:@"growl"];
 }
 
diff --git a/Window/VolumeButton.h b/Window/VolumeButton.h
index d4354fc95..6eba6cc8e 100644
--- a/Window/VolumeButton.h
+++ b/Window/VolumeButton.h
@@ -6,9 +6,11 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
 
-#import "PopupButton.h"
+#import <Cocoa/Cocoa.h>
+#import "VolumeSlider.h"
 
-@interface VolumeButton : PopupButton {
+@interface VolumeButton : NSButton {
+    IBOutlet VolumeSlider *_popView;
 }
 
 @end
diff --git a/Window/VolumeButton.m b/Window/VolumeButton.m
index 79a0d15e5..9faa93c23 100644
--- a/Window/VolumeButton.m
+++ b/Window/VolumeButton.m
@@ -7,29 +7,45 @@
 //
 
 #import "VolumeButton.h"
-#import "VolumeSlider.h"
 #import "PlaybackController.h"
 
-@implementation VolumeButton
+@implementation VolumeButton {
+    NSPopover *popover;
+}
+
+- (void)awakeFromNib
+{
+    popover = [[NSPopover alloc] init];
+
+    NSViewController * viewController = [[NSViewController alloc] init];
+    viewController.view = _popView;
+    popover.contentViewController = viewController;
+    popover.behavior = NSPopoverBehaviorTransient;
+    [popover setContentSize:_popView.bounds.size];
+}
 
 - (void)scrollWheel:(NSEvent *)theEvent
 {
-	double change = [theEvent deltaY];
-	
-	[(VolumeSlider *)_popView setDoubleValue:[(VolumeSlider *)_popView doubleValue] + change];
-	
-	[[(VolumeSlider *)_popView target] changeVolume:_popView];
-	
-	[(VolumeSlider *)_popView showToolTipForView:self closeAfter:1.0];
+    if ([popover isShown]) {
+        [_popView scrollWheel:theEvent];
+        return;
+    }
+
+    double change = [theEvent deltaY];
+
+    [_popView setDoubleValue:[_popView doubleValue] + change];
+
+    [[_popView target] changeVolume:_popView];
+
+    [_popView showToolTipForView:self closeAfter:1.0];
 }
 
 - (void)mouseDown:(NSEvent *)theEvent
 {
-	[(VolumeSlider *)_popView hideToolTip];
-	
-	[super mouseDown:theEvent];
+    [_popView hideToolTip];
+    [popover showRelativeToRect:self.bounds ofView:self preferredEdge:NSRectEdgeMaxY];
 
-	[(VolumeSlider *)_popView hideToolTip];
+    [super mouseDown:theEvent];
 }
 
 
diff --git a/Window/VolumeSlider.m b/Window/VolumeSlider.m
index 8523eed9b..b7d9f26aa 100644
--- a/Window/VolumeSlider.m
+++ b/Window/VolumeSlider.m
@@ -12,6 +12,7 @@
 
 @implementation VolumeSlider {
     NSTimer *currentTimer;
+    BOOL wasInsideSnapRange;
 }
 
 - (id)initWithFrame:(NSRect)frame
@@ -27,6 +28,7 @@
 }
 
 - (void) awakeFromNib {
+    wasInsideSnapRange = NO;
     textView = [[NSText alloc] init];
     [textView setFrame:NSMakeRect(0, 0, 50, 20)];
     textView.drawsBackground = NO;
@@ -39,7 +41,7 @@
     popover = [[NSPopover alloc] init];
     popover.contentViewController = viewController;
     // Don't hide the popover automatically.
-    popover.behavior = NSPopoverBehaviorApplicationDefined;
+    popover.behavior = NSPopoverBehaviorTransient;
     popover.animates = NO;
     [popover setContentSize:textView.bounds.size];
 }
@@ -111,9 +113,23 @@
     // Snap to 100% if value is close
     double snapTarget = logarithmicToLinear(100.0);
     double snapProgress = ([self doubleValue] - snapTarget) / (self.maxValue - self.minValue);
+
     if (fabs(snapProgress) < 0.005)
     {
         [self setDoubleValue:snapTarget];
+        if (!wasInsideSnapRange)
+        {
+            if (@available(macOS 10.11, *))
+            {
+                [[NSHapticFeedbackManager defaultPerformer] performFeedbackPattern:NSHapticFeedbackPatternGeneric
+                                                                   performanceTime:NSHapticFeedbackPerformanceTimeDefault];
+            }
+        }
+        wasInsideSnapRange = YES;
+    }
+    else
+    {
+        wasInsideSnapRange = NO;
     }
 
     [self showToolTip];