diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
index fb5a457e0..3f37df331 100644
--- a/English.lproj/Localizable.strings
+++ b/English.lproj/Localizable.strings
@@ -28,3 +28,7 @@
 "SwitchToMiniPlayer" = "Switch to Mini Player";
 "SwitchFromMiniPlayer" = "Switch from Mini Player";
 
+"PlayingTrackTooltip" = "Playing";
+"QueuedTrackTooltip" = "Queued";
+"ErrorTrackTooltip" = "Error";
+"StopAfterTrackTooltip" = "Stop After Track";
diff --git a/Playlist/StatusImageTransformer.m b/Playlist/StatusImageTransformer.m
index ae1b3866c..477b45de5 100644
--- a/Playlist/StatusImageTransformer.m
+++ b/Playlist/StatusImageTransformer.m
@@ -26,10 +26,17 @@
 - (id)init {
 	self = [super init];
 	if(self) {
-		self.playImage = [NSImage imageNamed:@"playTemplate"];
-		self.queueImage = [NSImage imageNamed:@"NSAddTemplate"];
-		self.errorImage = [NSImage imageNamed:@"NSStopProgressTemplate"];
-		self.stopAfterImage = [NSImage imageNamed:@"stopTemplate"];
+		if(@available(macOS 11.0, *)) {
+			self.playImage = [NSImage imageWithSystemSymbolName:@"play.fill" accessibilityDescription:NSLocalizedString(@"PlayingTrackTooltip", "")];
+			self.queueImage = [NSImage imageWithSystemSymbolName:@"plus" accessibilityDescription:NSLocalizedString(@"QueuedTrackTooltip", "")];
+			self.errorImage = [NSImage imageWithSystemSymbolName:@"nosign" accessibilityDescription:NSLocalizedString(@"ErrorTrackTooltip", "")];
+			self.stopAfterImage = [NSImage imageWithSystemSymbolName:@"stop.fill" accessibilityDescription:NSLocalizedString(@"StopAfterTrackTooltip", "")];
+		} else {
+			self.playImage = [NSImage imageNamed:@"playTemplate"];
+			self.queueImage = [NSImage imageNamed:@"NSAddTemplate"];
+			self.errorImage = [NSImage imageNamed:@"NSStopProgressTemplate"];
+			self.stopAfterImage = [NSImage imageNamed:@"stopTemplate"];
+		}
 	}
 
 	return self;
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index fb5a457e0..3f37df331 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -28,3 +28,7 @@
 "SwitchToMiniPlayer" = "Switch to Mini Player";
 "SwitchFromMiniPlayer" = "Switch from Mini Player";
 
+"PlayingTrackTooltip" = "Playing";
+"QueuedTrackTooltip" = "Queued";
+"ErrorTrackTooltip" = "Error";
+"StopAfterTrackTooltip" = "Stop After Track";
diff --git a/es.lproj/Localizable.strings b/es.lproj/Localizable.strings
index fb5a457e0..3f37df331 100644
--- a/es.lproj/Localizable.strings
+++ b/es.lproj/Localizable.strings
@@ -28,3 +28,7 @@
 "SwitchToMiniPlayer" = "Switch to Mini Player";
 "SwitchFromMiniPlayer" = "Switch from Mini Player";
 
+"PlayingTrackTooltip" = "Playing";
+"QueuedTrackTooltip" = "Queued";
+"ErrorTrackTooltip" = "Error";
+"StopAfterTrackTooltip" = "Stop After Track";