diff --git a/assets/images/editors/icons/alphabet.png b/assets/images/editors/icons/alphabet.png
index 4fe17ada..5496fcd1 100644
Binary files a/assets/images/editors/icons/alphabet.png and b/assets/images/editors/icons/alphabet.png differ
diff --git a/assets/images/editors/icons/character.png b/assets/images/editors/icons/character.png
index 5553b51c..b58fbe98 100644
Binary files a/assets/images/editors/icons/character.png and b/assets/images/editors/icons/character.png differ
diff --git a/assets/images/editors/icons/chart.png b/assets/images/editors/icons/chart.png
index 129080af..88f01e64 100644
Binary files a/assets/images/editors/icons/chart.png and b/assets/images/editors/icons/chart.png differ
diff --git a/assets/images/editors/icons/debug.png b/assets/images/editors/icons/debug.png
deleted file mode 100644
index cb1b6d82..00000000
Binary files a/assets/images/editors/icons/debug.png and /dev/null differ
diff --git a/assets/images/editors/icons/debugOptions.png b/assets/images/editors/icons/debugOptions.png
new file mode 100644
index 00000000..9910412f
Binary files /dev/null and b/assets/images/editors/icons/debugOptions.png differ
diff --git a/assets/images/editors/icons/dialogue.png b/assets/images/editors/icons/dialogue.png
index c5e93bc6..c6b6ce1f 100644
Binary files a/assets/images/editors/icons/dialogue.png and b/assets/images/editors/icons/dialogue.png differ
diff --git a/assets/images/editors/icons/noteskin.png b/assets/images/editors/icons/noteskin.png
index 083edb29..c508eb79 100644
Binary files a/assets/images/editors/icons/noteskin.png and b/assets/images/editors/icons/noteskin.png differ
diff --git a/assets/images/editors/icons/options.png b/assets/images/editors/icons/options.png
deleted file mode 100644
index a143645d..00000000
Binary files a/assets/images/editors/icons/options.png and /dev/null differ
diff --git a/assets/images/editors/icons/stage.png b/assets/images/editors/icons/stage.png
index e63c860c..3735a3f5 100644
Binary files a/assets/images/editors/icons/stage.png and b/assets/images/editors/icons/stage.png differ
diff --git a/assets/images/editors/icons/uiDebug.png b/assets/images/editors/icons/uiDebug.png
new file mode 100644
index 00000000..527b3328
Binary files /dev/null and b/assets/images/editors/icons/uiDebug.png differ
diff --git a/assets/images/editors/icons/wiki.png b/assets/images/editors/icons/wiki.png
index 2f37734d..47be596f 100644
Binary files a/assets/images/editors/icons/wiki.png and b/assets/images/editors/icons/wiki.png differ
diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx
index ce957733..a57cc740 100644
--- a/source/funkin/editors/EditorPicker.hx
+++ b/source/funkin/editors/EditorPicker.hx
@@ -9,29 +9,29 @@ class EditorPicker extends MusicBeatSubstate {
 	public var options:Array<Editor> = [
 		{
 			name: "Chart Editor",
-			iconID: 0,
+			id: "chart",
 			state: funkin.editors.charter.CharterSelection
 		},
 		{
 			name: "Character Editor",
-			iconID: 1,
+			id: "character",
 			state: funkin.editors.character.CharacterSelection
 		},
 		{
 			name: "Stage Editor",
-			iconID: 2,
+			id: "stage",
 			state: null
 		},
 		#if debug
 		{
 			name: "UI Debug State",
-			iconID: 3,
+			id: "uiDebug",
 			state: UIDebugState
 		},
 		#end
 		{
 			name: "Wiki",
-			iconID: 5,
+			id: "wiki",
 			state: null,
 			onClick: function() {
 				CoolUtil.openURL("https://codename-engine.com/");
@@ -39,7 +39,7 @@ class EditorPicker extends MusicBeatSubstate {
 		},
 		{
 			name: "Debug Options",
-			iconID: 4,
+			id: "debugOptions",
 			state: DebugOptions
 		}
 	];
@@ -74,7 +74,7 @@ class EditorPicker extends MusicBeatSubstate {
 
 		optionHeight = FlxG.height / options.length;
 		for(k=>o in options) {
-			var spr = new EditorPickerOption(o.name, o.iconID, optionHeight);
+			var spr = new EditorPickerOption(o.name, o.id, optionHeight);
 			spr.y = k * optionHeight;
 			add(spr);
 			sprites.push(spr);
@@ -155,7 +155,7 @@ class EditorPicker extends MusicBeatSubstate {
 
 typedef Editor = {
 	var name:String;
-	var iconID:Int;
+	var id:String;
 	var state:Class<MusicBeatState>;
 	var ?onClick:Void->Void;
 }
@@ -171,19 +171,14 @@ class EditorPickerOption extends FlxTypedSpriteGroup<FlxSprite> {
 	public var selectionLerp:Float = 0;
 
 	public var iconRotationCycle:Float = 0;
-	public function new(name:String, iconID:Int, height:Float) {
+	public function new(name:String, iconID:String, height:Float) {
 		super();
 
 		FlxG.mouse.visible = true;
 		iconSpr = new FlxSprite();
-		iconSpr.loadGraphic(Paths.image('editors/icons'), true, 128, 128);
-		iconSpr.animation.add("icon", [iconID], 24, true);
-		iconSpr.animation.play("icon");
+		iconSpr.loadGraphic(Paths.image('editors/icons/$iconID'));
 		iconSpr.antialiasing = true;
-		if (height < 150) {
-			iconSpr.scale.set(height / 150, height / 150);
-			iconSpr.updateHitbox();
-		}
+		iconSpr.setUnstretchedGraphicSize(110, 110, false);
 		iconSpr.x = 25 + ((height - iconSpr.width) / 2);
 		iconSpr.y = (height - iconSpr.height) / 2;