diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 1a9b00cb5a..e14fd53744 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1834,6 +1834,7 @@ ChoiceDouble="name,Double;style,double;text,Double;screen,"..Branch.AfterSelectP
 ChoiceSolo="name,Solo;style,solo;text,Solo;screen,"..Branch.AfterSelectPlayMode()
 ChoiceVersus="name,Versus;style,versus;text,Versus;screen,"..Branch.AfterSelectPlayMode()
 ChoiceCouple="name,Couple;style,couple;text,Couple;screen,"..Branch.AfterSelectPlayMode()
+ChoiceRoutine="name,Routine;style,routine;text,Routine;screen,"..Branch.AfterSelectPlayMode()
 ChoiceHalfDouble="name,HalfDouble;style,halfdouble;text,HalfDouble;screen,"..Branch.AfterSelectPlayMode()
 Choice5Keys="name,5Keys;style,single5;text,5Keys;screen,"..Branch.AfterSelectPlayMode()
 Choice7Keys="name,7Keys;style,single7;text,7Keys;screen,"..Branch.AfterSelectPlayMode()
diff --git a/Themes/default/Graphics/_SelectIcon Routine.png b/Themes/default/Graphics/_SelectIcon Routine.png
new file mode 100644
index 0000000000..2732321931
Binary files /dev/null and b/Themes/default/Graphics/_SelectIcon Routine.png differ
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 85ecd68ca8..12844adf17 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -705,7 +705,7 @@ IconChoiceDoubleX=SCREEN_CENTER_X-160
 IconChoiceDoubleY=SCREEN_CENTER_Y
 IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoiceDoubleOffCommand=linear,0.1175;zoomx,0
-#
+####
 IconChoiceSoloX=SCREEN_CENTER_X-160
 IconChoiceSoloY=SCREEN_CENTER_Y+96
 IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1
@@ -715,17 +715,22 @@ IconChoiceHalfDoubleX=SCREEN_CENTER_X-160
 IconChoiceHalfDoubleY=SCREEN_CENTER_Y+96
 IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoiceHalfDoubleOffCommand=linear,0.1175;zoomx,0
-#
+####
 IconChoiceVersusX=SCREEN_CENTER_X+160
-IconChoiceVersusY=SCREEN_CENTER_Y-48
+IconChoiceVersusY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y-96 or SCREEN_CENTER_Y-48
 IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoiceVersusOffCommand=linear,0.1175;zoomx,0
 #
 IconChoiceCoupleX=SCREEN_CENTER_X+160
-IconChoiceCoupleY=SCREEN_CENTER_Y+48
+IconChoiceCoupleY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y or SCREEN_CENTER_Y+48
 IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoiceCoupleOffCommand=linear,0.1175;zoomx,0
 #
+IconChoiceRoutineX=SCREEN_CENTER_X+160
+IconChoiceRoutineY=SCREEN_CENTER_Y+96
+IconChoiceRoutineOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceRoutineOffCommand=linear,0.1175;zoomx,0
+#
 IconChoicekb7X=SCREEN_CENTER_X
 IconChoicekb7Y=SCREEN_CENTER_Y
 IconChoicekb7OnCommand=zoom,0;bounceend,0.35;zoom,1