diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Failed (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Failed (doubleres).png
index 3c6239b22d..6eea5716ae 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Failed (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Failed (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier01 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier01 (doubleres).png
index a202923732..921fa058ef 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier01 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier01 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier02 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier02 (doubleres).png
index 151e331d0a..0c9288b1f5 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier02 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier02 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier03 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier03 (doubleres).png
index b5d057b237..fd7e3a56c8 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier03 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier03 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier04 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier04 (doubleres).png
index 54dd0dc07d..a8dd7f54c4 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier04 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier04 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier05 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier05 (doubleres).png
index e8577937e1..a62c578f47 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier05 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier05 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier06 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier06 (doubleres).png
index bf01cd65b5..e65391a273 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier06 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier06 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier07 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier07 (doubleres).png
index 97fdfe3d67..4223b7a35e 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier07 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier07 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier08 (doubleres).png b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier08 (doubleres).png
index fac627223e..16b278ff59 100644
Binary files a/stepmania/Themes/default/Graphics/GradeDisplayEval Tier08 (doubleres).png and b/stepmania/Themes/default/Graphics/GradeDisplayEval Tier08 (doubleres).png differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index f9cb61a469..c3e9701022 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2052,8 +2052,8 @@ MemoryCardIcons=true
 CancelTransitionsOut=false
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+35
-HeaderOnCommand=draworder,95;linear,0.25;addy,33
-HeaderOffCommand=linear,0.25;addy,-44;
+HeaderOnCommand=addy,-50;linear,0.25;addy,50
+HeaderOffCommand=linear,0.25;addy,-50;
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM-34
 FooterOnCommand=
@@ -2093,7 +2093,7 @@ RightFrameOnCommand=
 RightFrameOffCommand=
 StyleIconX=SCREEN_CENTER_X+170
 StyleIconY=SCREEN_CENTER_Y-202
-StyleIconOnCommand=
+StyleIconOnCommand=draworder,1
 StyleIconOffCommand=
 
 [MenuTimer]
@@ -3795,17 +3795,18 @@ DeltaSecondsHeldCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx
 DeltaSecondsGainLifeCommand=
 
 [PlayerStageStats]
-GradePercentTier01=1.000000
-GradePercentTier02=1.000000
-GradePercentTier03=0.930000
-GradePercentTier04=0.800000
-GradePercentTier05=0.650000
-GradePercentTier06=0.450000
-GradePercentTier07=-99999.000000
+NumGradeTiersUsed=8
+GradePercentTier01=1.00
+GradePercentTier02=0.99
+GradePercentTier03=0.97
+GradePercentTier04=0.93
+GradePercentTier05=0.80
+GradePercentTier06=0.65
+GradePercentTier07=0.45
+GradePercentTier08=-99999.000000
 GradeTier01IsAllW2s=false
-GradeTier02IsAllW2s=true
+GradeTier02IsAllW2s=false
 GradeTier02IsFullCombo=false
-NumGradeTiersUsed=7
 
 [HighScore]
 EmptyName="STEP"