diff --git a/stepmania/installer-header.bmp b/stepmania/Installer/header.bmp
similarity index 100%
rename from stepmania/installer-header.bmp
rename to stepmania/Installer/header.bmp
diff --git a/stepmania/Installer/install.ico b/stepmania/Installer/install.ico
new file mode 100644
index 0000000000..6a5de183f0
Binary files /dev/null and b/stepmania/Installer/install.ico differ
diff --git a/stepmania/Installer/uninstall.ico b/stepmania/Installer/uninstall.ico
new file mode 100644
index 0000000000..90d7d2252e
Binary files /dev/null and b/stepmania/Installer/uninstall.ico differ
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index c6dea6157b..763d883f72 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -45,10 +45,10 @@
 ;Interface Settings
 
 	!define MUI_HEADERIMAGE
-	!define MUI_HEADERIMAGE_BITMAP "installer-header.bmp"
+	!define MUI_HEADERIMAGE_BITMAP "Installer\header.bmp"
 	!define MUI_ABORTWARNING
-	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+	!define MUI_ICON "Installer\install.ico"
+	!define MUI_UNICON "Installer\uninstall.ico"
 
 ;--------------------------------
 ;Language Selection Dialog Settings
@@ -387,12 +387,12 @@ FunctionEnd
 ;--------------------------------
 ;Descriptions
 
-  ;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
+	;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
 
-  ;Assign descriptions to sections
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} "A test section."
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+	;Assign descriptions to sections
+	!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecMain} "A test section."
+	!insertmacro MUI_FUNCTION_DESCRIPTION_END
 
  
 ;--------------------------------