diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir
index edae5c4c51..ae6c206d6a 100644
--- a/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir	
@@ -1 +1 @@
-_terminator two 40
\ No newline at end of file
+_terminator two judgment 20
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/_terminator two judgment 20px [numbers] 4x4 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two judgment 20px [numbers] 4x4 (doubleres).png
new file mode 100644
index 0000000000..b0ae519e62
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two judgment 20px [numbers] 4x4 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two judgment 20px.ini b/stepmania/Themes/default/Fonts/_terminator two judgment 20px.ini
new file mode 100644
index 0000000000..db13ed43b6
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_terminator two judgment 20px.ini	
@@ -0,0 +1,30 @@
+[common]
+Baseline=18
+Top=1
+LineSpacing=20
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[numbers]
+Line 0=0123
+Line 1=4567
+Line 2=89%.
+Line 3= :x,
+
+0=13
+1=13
+2=13
+3=13
+4=13
+5=13
+6=13
+7=13
+8=13
+9=13
+10=17
+11=4
+12=14
+13=4
+14=16
+15=4
diff --git a/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua b/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua
index 4c16c2a595..c8431440bb 100644
--- a/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua	
+++ b/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua	
@@ -1,3 +1,3 @@
 return LoadFont("Common Normal") .. {
-	InitCommand=cmd(shadowlengthx,0;shadowlengthy,2;);
+	InitCommand=cmd(shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000077"););
 };
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua b/stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua
index ae1c89dd4c..6ce2100a4d 100644
--- a/stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua	
+++ b/stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua	
@@ -3,6 +3,6 @@ return Def.ActorFrame {
 		InitCommand=cmd(y,8;shadowlengthx,0;shadowlengthy,2;);
 	};
 	LoadFont("Common normal") .. {
-		InitCommand=cmd(y,-8;settext,"Barely";shadowlengthx,0;shadowlengthy,2;);
+		InitCommand=cmd(y,-8;settext,"Barely";shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000077"););
 	};
 };
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ModIcon Empty.redir b/stepmania/Themes/default/Graphics/ModIcon Empty.redir
index fb010348ff..04b2ead777 100644
--- a/stepmania/Themes/default/Graphics/ModIcon Empty.redir	
+++ b/stepmania/Themes/default/Graphics/ModIcon Empty.redir	
@@ -1 +1 @@
-ModIcon Filled
\ No newline at end of file
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png b/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png
index 874b5f2a5b..fffdaadd9f 100644
Binary files a/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png and b/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 67b2e28eb8..7fbc60ef58 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1521,12 +1521,12 @@ ComboGraphP2OffCommand=
 
 ModIconRowP1X=SCREEN_CENTER_X-316
 ModIconRowP1Y=SCREEN_CENTER_Y-130
-ModIconRowP1OnCommand=draworder,1;player,"PlayerNumber_P1";zoomy,0;linear,0.5;zoomy,1
-ModIconRowP1OffCommand=linear,0.5;zoomy,0
+ModIconRowP1OnCommand=draworder,1;player,"PlayerNumber_P1";addx,-200;linear,0.5;addx,200
+ModIconRowP1OffCommand=linear,0.5;addx,-200
 ModIconRowP2X=SCREEN_CENTER_X+316
 ModIconRowP2Y=SCREEN_CENTER_Y-130
-ModIconRowP2OnCommand=draworder,1;player,"PlayerNumber_P2";zoomy,0;linear,0.5;zoomy,1
-ModIconRowP2OffCommand=linear,0.5;zoomy,0
+ModIconRowP2OnCommand=draworder,1;player,"PlayerNumber_P2";addx,200;linear,0.5;addx,-200
+ModIconRowP2OffCommand=linear,0.5;addx,200
 
 StepsDisplayP1X=SCREEN_CENTER_X-230
 StepsDisplayP1Y=SCREEN_CENTER_Y+151
@@ -2689,8 +2689,10 @@ MountainHeight=
 
 [ModIcon]
 TextX=0
-TextY=-2
-TextOnCommand=maxwidth,72;uppercase,true
+TextY=0
+TextOnCommand=maxwidth,40;uppercase,true;shadowlength,0;diffuse,color("#f6ff00")
+CropTextToLength=4
+CropIfLongerThan=5
 
 [ModIconSelectMusic]
 Fallback="ModIcon"
@@ -2699,7 +2701,7 @@ Fallback="ModIcon"
 NumModIcons=6
 ModIconOnCommand=
 SpacingX=0
-SpacingY=46
+SpacingY=52
 ModIconMetricsGroup="ModIcon"
 
 [ModIconRowSelectMusic]
@@ -2755,7 +2757,7 @@ DancePointsP2OffCommand=
 DancePointsDigits=5
 PercentUseRemainder=false
 ApplyScoreDisplayOptions=true
-Format=FormatPercentScore
+FormatPercentScore=FormatPercentScore
 
 [ScreenEvaluation Percent]
 PercentP1X=0
@@ -2785,7 +2787,7 @@ DancePointsP2OffCommand=sleep,0.8;accelerate,0.3
 DancePointsDigits=1
 PercentUseRemainder=true
 ApplyScoreDisplayOptions=false
-Format=FormatPercentScore
+FormatPercentScore=FormatPercentScore
 
 [ScoreDisplayPercentage Percent]
 PercentP1X=+20
@@ -2799,7 +2801,7 @@ PercentP2OffCommand=
 DancePointsDigits=5
 PercentUseRemainder=false
 ApplyScoreDisplayOptions=true
-Format=FormatPercentScore
+FormatPercentScore=FormatPercentScore
 
 PercentP3X=+20
 PercentP3Y=0
@@ -4559,6 +4561,13 @@ LeadingZeroMultiplyColor=color("#777777FF")
 Fallback="RollingNumbers"
 ApproachSeconds=2
 
+[RollingNumbersJudgment]
+TextFormat="%04.0f"
+ApproachSeconds=0.2
+Commify=false
+Fallback="RollingNumbers"
+ApproachSeconds=1
+
 [GraphDisplay]
 BodyWidth=140
 BodyHeight=38