diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 3ab3ceef32..da6f6009fe 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -87,8 +87,8 @@ void ScreenNetSelectMusic::Init()
 	FOREACH_EnabledPlayer( p )
 	{
 		m_OptionIconRow[p].SetName( ssprintf("OptionIconsP%d",p+1) );
-		m_OptionIconRow[p].Load( p );
-		m_OptionIconRow[p].Refresh();
+		m_OptionIconRow[p].Load();
+		m_OptionIconRow[p].SetFromGameState( p );
 		SET_XY_AND_ON_COMMAND( m_OptionIconRow[p] );
 		this->AddChild( &m_OptionIconRow[p] );
 	}
@@ -274,7 +274,7 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 
 		//Update changes
 		FOREACH_EnabledPlayer(p)
-			m_OptionIconRow[p].Refresh();
+			m_OptionIconRow[p].SetFromGameState( p );
 	}
 	else if( SM == SM_SongChanged )
 	{
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 2c9821c2aa..70aa8b3983 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -244,8 +244,8 @@ void ScreenSelectMusic::Init()
 		this->AddChild( &m_AutoGenIcon[p] );
 
 		m_OptionIconRow[p].SetName( ssprintf("OptionIconsP%d",p+1) );
-		m_OptionIconRow[p].Load( p );
-		m_OptionIconRow[p].Refresh();
+		m_OptionIconRow[p].Load();
+		m_OptionIconRow[p].SetFromGameState( p );
 		SET_XY( m_OptionIconRow[p] );
 		this->AddChild( &m_OptionIconRow[p] );
 
@@ -1844,7 +1844,7 @@ void ScreenSelectMusic::AfterMusicChange()
 void ScreenSelectMusic::UpdateOptionsDisplays()
 {
 	FOREACH_HumanPlayer( p )
-		m_OptionIconRow[p].Refresh();
+		m_OptionIconRow[p].SetFromGameState( p );
 
 	CString s = GAMESTATE->m_SongOptions.GetString();
 	s.Replace( ", ", "\n" );