diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp
index db175ff3aa..d7167e3e7c 100644
--- a/stepmania/src/DifficultyIcon.cpp
+++ b/stepmania/src/DifficultyIcon.cpp
@@ -44,7 +44,7 @@ void DifficultyIcon::SetFromNotes( PlayerNumber pn, Notes* pNotes )
 		switch( GetNumStates() )
 		{
 		case 5:		SetState( iStateNo );		break;
-		case 10:	SetState( iStateNo*2+pn );	break;
+		case 10:	SetState( iStateNo );		break;
 		default:	ASSERT(0);
 		}
 	}
diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp
index 248f51ae99..f97d52ba45 100644
--- a/stepmania/src/ScreenSelectDifficultyEX.cpp
+++ b/stepmania/src/ScreenSelectDifficultyEX.cpp
@@ -66,8 +66,9 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX() : ScreenSelect( "ScreenSele
 		m_sprDifficultyIcon[p].SetY( 200 );
 		m_sprDifficultyIcon[p].SetZoom( 10 );
 		
-		m_sprDifficultyIcon[p].SetState( 5 );	// 0=BEG, 1=LGT, 2=STD, 3=HVY, 4=NS/ONI
-		//this->AddChild( &m_sprDifficultyIcon[p] );
+		m_sprDifficultyIcon[p].SetState( 6 );
+		// 0=BEGINNER, 1=LIGHT, 2=STANDARD, 3=HEAVY, 4=NONSTOP/ONI, 5=ENDLESS, 6=RAVE
+		this->AddChild( &m_sprDifficultyIcon[p] );
 
 		CLAMP( m_iChoice[p], 0, (int)m_ModeChoices.size()-1 );
 		m_bChosen[p] = false;