diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 71bc147215..c22a9a9cbd 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -40,6 +40,7 @@
 void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, CString ListName )
 {
 	hand.type = ROW_LIST;
+	hand.m_bUseModNameForIcon = true;
 
 	row.name = ListName;
 	if( !ListName.CompareNoCase("noteskins") )
@@ -716,7 +717,9 @@ void ScreenOptionsMaster::RefreshIcons()
 				switch( handler.type )
 				{
 				case ROW_LIST:
-					sIcon = data.choices[iFirstSelection];
+					sIcon = handler.m_bUseModNameForIcon ?
+						handler.ListEntries[iFirstSelection].m_sModifiers :
+						data.choices[iFirstSelection];
 					break;
 				case ROW_CONFIG:
 					break;
diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h
index 884a86fffc..17f23a94ce 100644
--- a/stepmania/src/ScreenOptionsMaster.h
+++ b/stepmania/src/ScreenOptionsMaster.h
@@ -23,13 +23,14 @@ private:
 
 	struct OptionRowHandler
 	{
-		OptionRowHandler() { opt = NULL; }
+		OptionRowHandler() { opt = NULL; m_bUseModNameForIcon = false; }
 
 		OptionRowType type;
 
 		/* ROW_LIST: */
 		vector<GameCommand> ListEntries;
 		GameCommand Default;
+		bool m_bUseModNameForIcon;
 
 		/* ROW_CONFIG: */
 		const ConfOption *opt;