diff --git a/stepmania/src/DifficultyDisplay.cpp b/stepmania/src/DifficultyDisplay.cpp
index d94e18b4c5..b6d9a332e1 100644
--- a/stepmania/src/DifficultyDisplay.cpp
+++ b/stepmania/src/DifficultyDisplay.cpp
@@ -3,11 +3,13 @@
 #include "song.h"
 #include "ThemeManager.h"
 
-#define ICONONCOMMAND			THEME->GetMetric ("DifficultyDisplay","IconOnCommand")
-#define ICONOFFCOMMAND			THEME->GetMetric ("DifficultyDisplay","IconOffCommand")
+CachedThemeMetric  ICONONCOMMAND	("DifficultyDisplay","IconOnCommand");
+CachedThemeMetric  ICONOFFCOMMAND	("DifficultyDisplay","IconOffCommand");
 
 DifficultyDisplay::DifficultyDisplay()
 {
+	ICONONCOMMAND.Refresh();
+	ICONOFFCOMMAND.Refresh();
 	float fHeight = 0;
 	int diff;
 	for( diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff )