diff --git a/Themes/default/Graphics/MusicWheelItem Song NormalPart.png b/Themes/default/Graphics/MusicWheelItem Song NormalPart.png
index 52f068a075..b5f4222443 100644
Binary files a/Themes/default/Graphics/MusicWheelItem Song NormalPart.png and b/Themes/default/Graphics/MusicWheelItem Song NormalPart.png differ
diff --git a/Themes/default/Graphics/MusicWheelItem grades/default.lua b/Themes/default/Graphics/MusicWheelItem grades/default.lua
new file mode 100644
index 0000000000..12cab535a9
--- /dev/null
+++ b/Themes/default/Graphics/MusicWheelItem grades/default.lua	
@@ -0,0 +1,31 @@
+-- This actor is duplicated.  Upvalues will not be duplicated.
+local grades = {
+	Grade_Tier01 = 0,
+	Grade_Tier02 = 1,
+	Grade_Tier03 = 2,
+	Grade_Tier04 = 3,
+	Grade_Tier05 = 4,
+	Grade_Tier06 = 5,
+	Grade_Tier07 = 6,
+	Grade_Failed = 7,
+	Grade_None = nil
+};
+
+return LoadActor("grades")..{
+	InitCommand=cmd(pause);
+	SetGradeCommand=function(self, params)
+		if GAMESTATE:IsCourseMode() then
+			self:visible(false);
+			return;
+		end;
+		local state = grades[params.Grade] or grades.Grade_None;
+		if state == nil then
+			self:visible(false)
+		else
+			self:visible(true)
+			state = state*2
+			if params.PlayerNumber == PLAYER_2 then state = state+1 end
+			self:setstate(state)
+		end
+	end;
+};
\ No newline at end of file
diff --git a/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png b/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png
new file mode 100644
index 0000000000..61ea2404ca
Binary files /dev/null and b/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png differ
diff --git a/Themes/default/Graphics/ScreenSelectMusic pane background.png b/Themes/default/Graphics/ScreenSelectMusic pane background.png
index 97adda40ad..17fa96b726 100644
Binary files a/Themes/default/Graphics/ScreenSelectMusic pane background.png and b/Themes/default/Graphics/ScreenSelectMusic pane background.png differ
diff --git a/Themes/default/Graphics/WheelNotifyIcon icons 4x2.png b/Themes/default/Graphics/WheelNotifyIcon icons 4x2.png
index d743c7abb6..ca07801bc5 100644
Binary files a/Themes/default/Graphics/WheelNotifyIcon icons 4x2.png and b/Themes/default/Graphics/WheelNotifyIcon icons 4x2.png differ
diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua
index b969c0fe71..2bdef845a6 100644
--- a/Themes/default/Scripts/02 Colors.lua	
+++ b/Themes/default/Scripts/02 Colors.lua	
@@ -26,7 +26,7 @@ end;
 
 ScreenColors = {
     Style           = color("#81468B"),
-    PlayMode        = color("#478e6f"),
+    PlayMode        = color("#b2350c"),
     Music           = color("#1268aa"),
     Online           = color("#1CA6A0"),
     Course          = color("#6D1646"),
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index f780c063f2..f4b6c2f697 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -817,7 +817,7 @@ ShowRandom=true
 
 [MusicWheelItem]
 Fallback=WheelItemBase
-IconX=-190
+IconX=-186
 IconY=0
 IconOnCommand=
 #
@@ -838,10 +838,10 @@ RandomX=-200
 RandomY=0
 RandomOnCommand=zoom,1.25;uppercase,true;rainbowscroll,true;shadowlength,1;horizalign,left;
 
-GradeP1X=140
-GradeP1Y=0
-GradeP2X=216
-GradeP2Y=0
+GradeP1X=-196
+GradeP1Y=-14
+GradeP2X=-196
+GradeP2Y=14
 
 CourseX=-210
 CourseOnCommand=zoom,1.0;horizalign,left;shadowlength,1;maxwidth,SCREEN_WIDTH*0.31;strokecolor,color("#42292E")
@@ -865,13 +865,13 @@ AfterSetCommand=%function(self) \
 	local Subtitle=self:GetChild("Subtitle"); \
 	local Artist=self:GetChild("Artist"); \
 	if Subtitle:GetText() == "" then \
-		(cmd(zoom,1.1;maxwidth,SCREEN_WIDTH*0.31;y,-13;x,-200;strokecolor,color("#42292E");))(Title); \
+		(cmd(zoom,1.1;maxwidth,SCREEN_WIDTH*0.24;y,-13;x,-150;strokecolor,color("#42292E");))(Title); \
 		(cmd(visible,false))(Subtitle); \
-		(cmd(zoom,0.75;maxwidth,SCREEN_WIDTH*0.45;y,13;x,-200;strokecolor,color("#42292E");))(Artist); \
+		(cmd(zoom,0.75;maxwidth,SCREEN_WIDTH*0.36;y,13;x,-150;strokecolor,color("#42292E");))(Artist); \
 	else \
-		(cmd(zoom,0.9;maxwidth,SCREEN_WIDTH*0.31;y,-14;x,-200;strokecolor,color("#42292E");))(Title); \
-		(cmd(visible,true;zoom,0.5;y,4;maxwidth,SCREEN_WIDTH*0.46;x,-200;strokecolor,color("#42292E");))(Subtitle); \
-		(cmd(zoom,0.6;maxwidth,SCREEN_WIDTH*0.45;y,18;x,-200;strokecolor,color("#42292E");))(Artist); \
+		(cmd(zoom,0.9;maxwidth,SCREEN_WIDTH*0.24;y,-14;x,-150;strokecolor,color("#42292E");))(Title); \
+		(cmd(visible,true;zoom,0.5;y,4;maxwidth,SCREEN_WIDTH*0.40;x,-150;strokecolor,color("#42292E");))(Subtitle); \
+		(cmd(zoom,0.6;maxwidth,SCREEN_WIDTH*0.36;y,18;x,-150;strokecolor,color("#42292E");))(Artist); \
 	end \
 end;