diff --git a/Application/AppController.m b/Application/AppController.m
index 38517e662..74c722485 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -68,7 +68,7 @@
     [p setResolvesAliases:YES];
 	
 	[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
-        if ( result == NSModalResponseOK ) {
+        if ( result == NSFileHandlingPanelOKButton ) {
             [self->playlistLoader willInsertURLs:[p URLs] origin:URLOriginInternal];
             [self->playlistLoader didInsertURLs:[self->playlistLoader addURLs:[p URLs] sort:YES] origin:URLOriginInternal];
         } else {
@@ -84,7 +84,7 @@
 	p = [NSSavePanel savePanel];
 	
 	[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
-        if ( result == NSModalResponseOK ) {
+        if ( result == NSFileHandlingPanelOKButton ) {
             [self->playlistLoader save:[[p URL] path]];
         } else {
             [p close];
@@ -103,7 +103,7 @@
 
 - (void)openURLPanelDidEnd:(OpenURLPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
-	if (returnCode == NSModalResponseOK)
+	if (returnCode == NSOKButton)
 	{
 		[playlistLoader willInsertURLs:[NSArray arrayWithObject:[panel url]] origin:URLOriginInternal];
 		[playlistLoader didInsertURLs:[playlistLoader addURLs:[NSArray arrayWithObject:[panel url]] sort:NO] origin:URLOriginInternal];
@@ -170,7 +170,6 @@
         }
     }
 
-    [[miniWindow standardWindowButton:NSWindowZoomButton] setHidden:YES];
     // Restore mini mode
     [self setMiniMode:[[NSUserDefaults standardUserDefaults] boolForKey:@"miniMode"]];
 
@@ -378,7 +377,7 @@
 	NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary];
 	
     // Font defaults
-    float fFontSize = [NSFont systemFontSizeForControlSize:NSControlSizeSmall];
+    float fFontSize = [NSFont systemFontSizeForControlSize:NSSmallControlSize];
     NSNumber *fontSize = [NSNumber numberWithFloat:fFontSize];
     [userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"];
 	
diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m
index 64f02741e..e0c56a387 100644
--- a/Application/PlaybackEventController.m
+++ b/Application/PlaybackEventController.m
@@ -174,6 +174,37 @@ 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/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index d5e41de95..0a13fd58b 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -582,21 +582,21 @@
             </connections>
             <point key="canvasLocation" x="130.5" y="131"/>
         </window>
-        <window title="Cog" separatorStyle="none" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" titlebarAppearsTransparent="YES" toolbarStyle="expanded" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <rect key="contentRect" x="192" y="547" width="480" height="1"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
-            <value key="minSize" type="size" width="280" height="1"/>
-            <value key="maxSize" type="size" width="600" height="1"/>
+        <window title="Cog" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" toolbarStyle="expanded" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
+            <rect key="contentRect" x="192" y="547" width="480" height="0.0"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <value key="minSize" type="size" width="400" height="0.0"/>
+            <value key="maxSize" type="size" width="600" height="0.0"/>
             <view key="contentView" hidden="YES" wantsLayer="YES" id="2235">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="1"/>
+                <rect key="frame" x="0.0" y="0.0" width="480" height="0.0"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             </view>
             <toolbar key="toolbar" implicitIdentifier="35998ECE-5AD8-429E-8479-657249B22C9C" displayMode="iconOnly" sizeMode="regular" id="2222" userLabel="Mini Toolbar">
                 <allowedToolbarItems>
                     <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="2227"/>
                     <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="2228"/>
-                    <toolbarItem implicitItemIdentifier="6F5A6C43-A09C-462A-AEE2-C86DC3C55128" label="Playback Buttons" paletteLabel="Playback Buttons" visibilityPriority="15" sizingBehavior="auto" id="2272">
+                    <toolbarItem implicitItemIdentifier="6F5A6C43-A09C-462A-AEE2-C86DC3C55128" label="Playback Buttons" paletteLabel="Playback Buttons" sizingBehavior="auto" id="2272">
                         <nil key="toolTip"/>
                         <segmentedControl key="view" verticalHuggingPriority="750" id="2295" customClass="PlaybackButtons">
                             <rect key="frame" x="0.0" y="14" width="133" height="23"/>
@@ -617,7 +617,7 @@
                             </connections>
                         </segmentedControl>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="C10E329B-9AB7-47DB-B3BA-7C40B57792E8" label="Position" paletteLabel="Position" visibilityPriority="15" sizingBehavior="auto" id="2273" customClass="PositionSliderToolbarItem" customModule="Cog" customModuleProvider="target">
+                    <toolbarItem implicitItemIdentifier="C10E329B-9AB7-47DB-B3BA-7C40B57792E8" label="Position" paletteLabel="Position" sizingBehavior="auto" id="2273">
                         <nil key="toolTip"/>
                         <slider key="view" verticalHuggingPriority="750" id="2293" customClass="PositionSlider">
                             <rect key="frame" x="0.0" y="14" width="96" height="20"/>
@@ -1739,19 +1739,19 @@ Gw
             </items>
         </menu>
         <customView id="1611" userLabel="Volume View">
-            <rect key="frame" x="0.0" y="0.0" width="32" height="168"/>
-            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="26" height="168"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <slider horizontalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1612" customClass="VolumeSlider">
-                    <rect key="frame" x="6" y="2" width="20" height="164"/>
+                    <rect key="frame" x="6" y="19" width="15" height="129"/>
                     <autoresizingMask key="autoresizingMask"/>
-                    <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="10" maxValue="100" doubleValue="55" tickMarkPosition="left" sliderType="linear" id="1613"/>
+                    <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="100" doubleValue="50" tickMarkPosition="left" sliderType="linear" id="1613"/>
                     <connections>
                         <action selector="changeVolume:" target="705" id="1614"/>
                     </connections>
                 </slider>
             </subviews>
-            <point key="canvasLocation" x="615" y="-25"/>
+            <point key="canvasLocation" x="-137" y="118"/>
         </customView>
         <customObject id="1675" customClass="SpotlightWindowController">
             <connections>
diff --git a/Preferences/General/Base.lproj/Preferences.xib b/Preferences/General/Base.lproj/Preferences.xib
index 2b9a6c667..59a8d00b3 100644
--- a/Preferences/General/Base.lproj/Preferences.xib
+++ b/Preferences/General/Base.lproj/Preferences.xib
@@ -11,6 +11,7 @@
                 <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"/>
@@ -400,12 +401,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="114"/>
+            <rect key="frame" x="0.0" y="0.0" width="500" height="94"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="njn-Xl-9k9">
-                    <rect key="frame" x="18" y="78" width="158" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
+                    <rect key="frame" x="18" y="58" width="158" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <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"/>
@@ -415,7 +416,7 @@
                     </connections>
                 </button>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AIz-WH-Wqk">
-                    <rect key="frame" x="18" y="58" width="131" height="18"/>
+                    <rect key="frame" x="18" y="18" 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 15a5099ae..9b31123aa 100644
--- a/Preferences/General/GeneralPreferencesPlugin.h
+++ b/Preferences/General/GeneralPreferencesPlugin.h
@@ -25,6 +25,8 @@
     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 90d022cfc..ce2bf6058 100644
--- a/Preferences/General/GeneralPreferencesPlugin.m
+++ b/Preferences/General/GeneralPreferencesPlugin.m
@@ -71,6 +71,15 @@
 
 - (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.m b/Window/VolumeButton.m
index 79a0d15e5..b9dc907cc 100644
--- a/Window/VolumeButton.m
+++ b/Window/VolumeButton.m
@@ -20,7 +20,7 @@
 	
 	[[(VolumeSlider *)_popView target] changeVolume:_popView];
 	
-	[(VolumeSlider *)_popView showToolTipForView:self closeAfter:1.0];
+	[(VolumeSlider *)_popView showToolTipForDuration:1.0];
 }
 
 - (void)mouseDown:(NSEvent *)theEvent
diff --git a/Window/VolumeSlider.h b/Window/VolumeSlider.h
index 483fb4845..7552fcfc1 100644
--- a/Window/VolumeSlider.h
+++ b/Window/VolumeSlider.h
@@ -10,13 +10,11 @@
 #import "ToolTipWindow.h"
 
 @interface VolumeSlider : NSSlider {
-    NSPopover *popover;
-    NSText *textView;
+	ToolTipWindow *toolTip;
 }
 
 - (void)showToolTip;
 - (void)showToolTipForDuration:(NSTimeInterval)duration;
-- (void)showToolTipForView:(NSView *)view closeAfter:(NSTimeInterval)duration;
 - (void)hideToolTip;
 
 @end
diff --git a/Window/VolumeSlider.m b/Window/VolumeSlider.m
index 8523eed9b..e3b6140a8 100644
--- a/Window/VolumeSlider.m
+++ b/Window/VolumeSlider.m
@@ -10,126 +10,87 @@
 #import "PlaybackController.h"
 #import "CogAudio/Helper.h"
 
-@implementation VolumeSlider {
-    NSTimer *currentTimer;
-}
+@implementation VolumeSlider
 
 - (id)initWithFrame:(NSRect)frame
 {
-    self = [super initWithFrame:frame];
-    return self;
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		toolTip = [[ToolTipWindow alloc] init];
+	}
+	
+	return self;
 }
 
 - (id)initWithCoder:(NSCoder *)coder
 {
-    self = [super initWithCoder:coder];
-    return self;
-}
-
-- (void) awakeFromNib {
-    textView = [[NSText alloc] init];
-    [textView setFrame:NSMakeRect(0, 0, 50, 20)];
-    textView.drawsBackground = NO;
-    textView.editable = NO;
-    textView.alignment = NSTextAlignmentCenter;
-
-    NSViewController * viewController = [[NSViewController alloc] init];
-    viewController.view = textView;
-
-    popover = [[NSPopover alloc] init];
-    popover.contentViewController = viewController;
-    // Don't hide the popover automatically.
-    popover.behavior = NSPopoverBehaviorApplicationDefined;
-    popover.animates = NO;
-    [popover setContentSize:textView.bounds.size];
+	self = [super initWithCoder:coder];
+	if (self)
+	{
+		toolTip = [[ToolTipWindow alloc] init];
+	}
+	
+	return self;
 }
 
 - (void)updateToolTip
 {
-    double value = [self doubleValue];
-    double volume = linearToLogarithmic(value);
-
-    NSString *text = [NSString stringWithFormat:@"%0.lf%%", volume];
-
-    [textView setString:text];
+	double value = [self doubleValue];
+	double volume = linearToLogarithmic(value);
+	
+	NSString *text = [[NSString alloc] initWithFormat:@"%0.lf%%", volume];
+	
+	NSSize size = [toolTip suggestedSizeForTooltip:text];
+	NSPoint mouseLocation = [NSEvent mouseLocation];
+	
+	[toolTip setToolTip:text];
+	[toolTip setFrame:NSMakeRect(mouseLocation.x, mouseLocation.y, size.width, size.height) display:YES];
 }
 
 - (void)showToolTip
 {
-    [self updateToolTip];
-
-    double progress = (self.maxValue - [self doubleValue]) / (self.maxValue - self.minValue);
-    CGFloat width = self.knobThickness - 1;
-    // Show tooltip to the left of the Slider Knob
-    CGFloat height = self.knobThickness / 2.f + (self.bounds.size.height - self.knobThickness) * progress - 1;
-    
-    [popover showRelativeToRect:NSMakeRect(width, height, 2, 2) ofView:self preferredEdge:NSRectEdgeMaxX];
-    [self.window.parentWindow makeKeyWindow];
+	[self updateToolTip];
+	
+	[toolTip orderFront];
 }
 
 - (void)showToolTipForDuration:(NSTimeInterval)duration
 {
-    [self showToolTip];
-
-    [self hideToolTipAfterDelay:duration];
+	[self updateToolTip];
+	[toolTip orderFrontForDuration:duration];
 }
 
-- (void)showToolTipForView:(NSView *)view closeAfter:(NSTimeInterval)duration
-{
-    [self updateToolTip];
-
-    [popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxY];
-
-    [self hideToolTipAfterDelay:duration];
-}
 
 - (void)hideToolTip
 {
-    [popover close];
+	[toolTip close];
 }
 
-- (void) hideToolTipAfterDelay:(NSTimeInterval)duration
-{
-    if (currentTimer)
-    {
-        [currentTimer invalidate];
-        currentTimer = nil;
-    }
-
-    if (duration > 0.0) {
-        currentTimer = [NSTimer scheduledTimerWithTimeInterval:duration
-                                                        target:self
-                                                      selector:@selector(hideToolTip)
-                                                      userInfo:nil
-                                                       repeats:NO];
-        [[NSRunLoop mainRunLoop] addTimer:currentTimer forMode:NSRunLoopCommonModes];
-    }
-}
 
 - (BOOL)sendAction:(SEL)theAction to:(id)theTarget
 {
-    // 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];
-    }
+	double oneLog = logarithmicToLinear(100.0);
+	double distance = [self frame].size.height*([self doubleValue] - oneLog)/100.0;
+	if (fabs(distance) < 2.0)
+	{
+		[self setDoubleValue:oneLog];
+	}
 
-    [self showToolTip];
-
-    return [super sendAction:theAction to:theTarget];
+	[self showToolTip];
+	
+	return [super sendAction:theAction to:theTarget];
 }
 
 - (void)scrollWheel:(NSEvent *)theEvent
 {
-    double change = [theEvent deltaY];
-
-    [self setDoubleValue:[self doubleValue] + change];
-
-    [[self target] changeVolume:self];
-
-    [self showToolTipForDuration:1.0];
+	double change = [theEvent deltaY];
+	
+	[self setDoubleValue:[self doubleValue] + change];
+	
+	[[self target] changeVolume:self];
+	
+	[self showToolTipForDuration:1.0];
 }
 
 @end