diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 403cbce73a..649c4bb82f 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -163,24 +163,24 @@ PremiumX=SCREEN_CENTER_X+230
 PremiumY=SCREEN_CENTER_Y-156
 PremiumOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3
 PremiumOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
-Icon1X=SCREEN_CENTER_X-260
-Icon1Y=SCREEN_CENTER_Y-156
+Icon1X=SCREEN_CENTER_X-270
+Icon1Y=SCREEN_BOTTOM-60
 Icon1OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon1OffCommand=bouncebegin,0.5;zoomy,0
-Icon2X=SCREEN_CENTER_X-180
-Icon2Y=SCREEN_CENTER_Y-156
+Icon2X=SCREEN_CENTER_X-190
+Icon2Y=SCREEN_BOTTOM-60
 Icon2OnCommand=addx,-SCREEN_WIDTH;sleep,0.15;decelerate,0.3;addx,SCREEN_WIDTH
 Icon2OffCommand=bouncebegin,0.5;zoomy,0
-Icon3X=SCREEN_CENTER_X-100
-Icon3Y=SCREEN_CENTER_Y-156
+Icon3X=SCREEN_CENTER_X-110
+Icon3Y=SCREEN_BOTTOM-60
 Icon3OnCommand=addx,-SCREEN_WIDTH;sleep,0.10;decelerate,0.3;addx,SCREEN_WIDTH
 Icon3OffCommand=bouncebegin,0.5;zoomy,0
-Icon4X=SCREEN_CENTER_X-20
-Icon4Y=SCREEN_CENTER_Y-156
+Icon4X=SCREEN_CENTER_X-30
+Icon4Y=SCREEN_BOTTOM-60
 Icon4OnCommand=addx,-SCREEN_WIDTH;sleep,0.05;decelerate,0.3;addx,SCREEN_WIDTH
 Icon4OffCommand=bouncebegin,0.5;zoomy,0
-Icon5X=SCREEN_CENTER_X+60
-Icon5Y=SCREEN_CENTER_Y-156
+Icon5X=SCREEN_CENTER_X+50
+Icon5Y=SCREEN_BOTTOM-60
 Icon5OnCommand=addx,-SCREEN_WIDTH;sleep,0.00;decelerate,0.3;addx,SCREEN_WIDTH
 Icon5OffCommand=bouncebegin,0.5;zoomy,0
 Icon6X=
@@ -198,20 +198,20 @@ Icon8OffCommand=bouncebegin,0.5;zoomy,0
 IconGainFocusCommand=glowshift;effectperiod,0.5
 IconLoseFocusCommand=stopeffect
 DisabledCommand=diffuse,0.2,0.2,0.2,1
-ExplanationX=SCREEN_CENTER_X+160
-ExplanationY=SCREEN_CENTER_Y-70
+ExplanationX=SCREEN_CENTER_X+80
+ExplanationY=SCREEN_CENTER_Y-40
 ExplanationOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ExplanationOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
-WarningX=SCREEN_CENTER_X+160
-WarningY=SCREEN_CENTER_Y+160
+WarningX=SCREEN_CENTER_X+130
+WarningY=SCREEN_CENTER_Y+88
 WarningOnCommand=addy,-120;zoomy,0;decelerate,0.5;zoomy,1;addy,120;diffuseshift;effectcolor1,1,1,1,1;effectcolor2,0.4,0.4,0.4,1
 WarningOffCommand=accelerate,0.3;zoomy,0;y,280
-InfoX=SCREEN_CENTER_X+160
+InfoX=SCREEN_CENTER_X+80
 InfoY=SCREEN_CENTER_Y+40
 InfoOnCommand=zoomy,0;bounceend,0.5;zoomy,1
 InfoOffCommand=bouncebegin,0.5;zoomy,0
 PictureX=SCREEN_CENTER_X-160
-PictureY=SCREEN_CENTER_Y+20
+PictureY=SCREEN_CENTER_Y-20
 PictureOnCommand=diffusealpha,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;diffusealpha,1;linear,0.2;glow,1,1,1,0
 PictureOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0
 
@@ -938,7 +938,7 @@ CombinedLifeOnCommand=addy,-100;sleep,0.5;linear,1;addy,100
 CombinedLifeOffCommand=linear,1;addy,-100
 ShowStage=not GAMESTATE:IsCourseMode()
 StageX=SCREEN_CENTER_X+0
-StageY=SCREEN_CENTER_Y-186
+StageY=SCREEN_CENTER_Y-206
 StageOnCommand=draworder,100;addy,-100;sleep,0.5;linear,1;addy,100
 StageOffCommand=linear,1;addy,-100
 StageFrameX=
@@ -2261,10 +2261,10 @@ DescOnCommand=zoom,0.5
 DescWidth=400
 
 [LifeMeterBar]
-MeterWidth=260
-MeterHeight=24
+MeterWidth=270
+MeterHeight=32
 DangerThreshold=0.2
-NumChambers=32
+NumChambers=1
 NumStrips=2
 InitialValue=0.5
 StreamNormalOnCommand=
@@ -2627,10 +2627,10 @@ ExtraColor=1.0,0.0,0.0,1.0	// red
 ExtraColorMeter=10
 
 [Background]
-LeftEdge=SCREEN_LEFT+20
-TopEdge=SCREEN_TOP+20
-RightEdge=SCREEN_RIGHT-20
-BottomEdge=SCREEN_BOTTOM-20
+LeftEdge=SCREEN_LEFT
+TopEdge=SCREEN_TOP
+RightEdge=SCREEN_RIGHT
+BottomEdge=SCREEN_BOTTOM
 BlinkDangerAll=1
 DangerAllIsOpaque=1
 BrightnessFadeCommand=
@@ -2697,7 +2697,7 @@ HoldJudgmentYStandard=-90
 HoldJudgmentYReverse=90
 BrightGhostComboThreshold=100
 StartDrawingAtPixels=-60
-StopDrawingAtPixels=350
+StopDrawingAtPixels=400
 MaxProTimingError=100
 TapJudgmentsUnderField=0
 HoldJudgmentsUnderField=0
@@ -2826,12 +2826,12 @@ TextZoom=0.5
 Uppercase=1
 
 [OptionIconRow]
-SpacingX=38
+SpacingX=32
 SpacingY=0
 
 [TransitionOniFade]
-BannerWidth=564
-BannerHeight=184
+BannerWidth=512
+BannerHeight=160
 
 [LyricDisplay]
 InCommand=shadowlength,0;diffusealpha,0;linear,0.2;diffusealpha,0.75