diff --git a/Makefile b/Makefile
index 052b3c44..450f8739 100644
--- a/Makefile
+++ b/Makefile
@@ -85,30 +85,6 @@ SOUNDS = \
 	error.wav \
 	settings.wav
 
-JOYPAD_IMAGES = \
-	joypad_a.png \
-	joypad_b.png \
-	joypad_c_down.png \
-	joypad_c_left.png \
-	joypad_c_right.png \
-	joypad_c_up.png \
-	joypad_d_down.png \
-	joypad_d_left.png \
-	joypad_d_right.png \
-	joypad_d_up.png \
-	joypad_l.png \
-	joypad_r.png \
-	joypad_start.png \
-	joypad_z.png
-# joypad_j_east.png \
-# joypad_j_north.png \
-# joypad_j_northeast.png \
-# joypad_j_northwest.png \
-# joypad_j_south.png \
-# joypad_j_southeast.png \
-# joypad_j_southwest.png \
-# joypad_j_west.png \
-
 OBJS = $(addprefix $(BUILD_DIR)/, $(addsuffix .o,$(basename $(SRCS))))
 MINIZ_OBJS = $(filter $(BUILD_DIR)/libs/miniz/%.o,$(OBJS))
 SPNG_OBJS = $(filter $(BUILD_DIR)/libs/libspng/%.o,$(OBJS))
@@ -117,7 +93,7 @@ DEPS = $(OBJS:.o=.d)
 FILESYSTEM = \
 	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(FONTS:%.ttf=%.font64))) \
 	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(SOUNDS:%.wav=%.wav64))) \
-	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(JOYPAD_IMAGES:%.png=%.sprite)))
+	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(IMAGES:%.png=%.sprite)))
 
 $(MINIZ_OBJS): N64_CFLAGS+=-DMINIZ_NO_TIME -fcompare-debug-second
 $(SPNG_OBJS): N64_CFLAGS+=-isystem $(SOURCE_DIR)/libs/miniz -DSPNG_USE_MINIZ -fcompare-debug-second
@@ -134,7 +110,7 @@ $(FILESYSTEM_DIR)/%.wav64: $(ASSETS_DIR)/sounds/%.wav
 	@echo "    [AUDIO] $@"
 	@$(N64_AUDIOCONV) $(AUDIOCONV_FLAGS) -o $(FILESYSTEM_DIR) "$<"
 
-$(FILESYSTEM_DIR)/%.sprite: $(ASSETS_DIR)/images/joypad/%.png
+$(FILESYSTEM_DIR)/%.sprite: $(ASSETS_DIR)/images/%.png
 	@echo "    [SPRITE] $@"
 	@$(N64_MKSPRITE) $(MKSPRITE_FLAGS) -o $(dir $@) "$<"
 
diff --git a/assets/images/joypad/joypad_a.png b/assets/images/joypad/joypad_a.png
deleted file mode 100644
index 9e6e6493..00000000
Binary files a/assets/images/joypad/joypad_a.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_b.png b/assets/images/joypad/joypad_b.png
deleted file mode 100644
index e5874cff..00000000
Binary files a/assets/images/joypad/joypad_b.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_c_down.png b/assets/images/joypad/joypad_c_down.png
deleted file mode 100644
index 773e1391..00000000
Binary files a/assets/images/joypad/joypad_c_down.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_c_left.png b/assets/images/joypad/joypad_c_left.png
deleted file mode 100644
index 2896b627..00000000
Binary files a/assets/images/joypad/joypad_c_left.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_c_right.png b/assets/images/joypad/joypad_c_right.png
deleted file mode 100644
index 7eca4a87..00000000
Binary files a/assets/images/joypad/joypad_c_right.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_c_up.png b/assets/images/joypad/joypad_c_up.png
deleted file mode 100644
index 487eee68..00000000
Binary files a/assets/images/joypad/joypad_c_up.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_d_down.png b/assets/images/joypad/joypad_d_down.png
deleted file mode 100644
index 4223ec3b..00000000
Binary files a/assets/images/joypad/joypad_d_down.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_d_left.png b/assets/images/joypad/joypad_d_left.png
deleted file mode 100644
index fb467603..00000000
Binary files a/assets/images/joypad/joypad_d_left.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_d_right.png b/assets/images/joypad/joypad_d_right.png
deleted file mode 100644
index d9f3fd93..00000000
Binary files a/assets/images/joypad/joypad_d_right.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_d_up.png b/assets/images/joypad/joypad_d_up.png
deleted file mode 100644
index 9689c3df..00000000
Binary files a/assets/images/joypad/joypad_d_up.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_l.png b/assets/images/joypad/joypad_l.png
deleted file mode 100644
index e4d4e01d..00000000
Binary files a/assets/images/joypad/joypad_l.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_r.png b/assets/images/joypad/joypad_r.png
deleted file mode 100644
index 5d0ecb0a..00000000
Binary files a/assets/images/joypad/joypad_r.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_start.png b/assets/images/joypad/joypad_start.png
deleted file mode 100644
index 99c1ebb5..00000000
Binary files a/assets/images/joypad/joypad_start.png and /dev/null differ
diff --git a/assets/images/joypad/joypad_z.png b/assets/images/joypad/joypad_z.png
deleted file mode 100644
index f3cb289e..00000000
Binary files a/assets/images/joypad/joypad_z.png and /dev/null differ