diff --git a/Makefile b/Makefile
index 17a16dbff..380c61324 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,8 @@ gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
 
+gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace
+
 %.bin: ;
 %.blk: ;
 
diff --git a/gfx/pokedex/pokedex.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f
similarity index 100%
rename from gfx/pokedex/pokedex.2bpp.lz
rename to gfx/pokedex/pokedex.2bpp.lz.3726dd3f
diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png
new file mode 100644
index 000000000..48af514c7
Binary files /dev/null and b/gfx/pokedex/pokedex.png differ
diff --git a/gfx/pokedex/select_start.2bpp b/gfx/pokedex/select_start.2bpp
deleted file mode 100644
index c223eb635..000000000
--- a/gfx/pokedex/select_start.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����ˉ�����������,,mm,,mmmm$$�����������������������������ۛ�������UUUUUUUU����������������
\ No newline at end of file
diff --git a/gfx/pokedex/select_start.png b/gfx/pokedex/select_start.png
new file mode 100644
index 000000000..efa8d4a46
Binary files /dev/null and b/gfx/pokedex/select_start.png differ
diff --git a/gfx/pokedex/sgb.2bpp.lz b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b
similarity index 100%
rename from gfx/pokedex/sgb.2bpp.lz
rename to gfx/pokedex/sgb.2bpp.lz.82bc0a7b
diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/sgb.png
new file mode 100644
index 000000000..bbacb114d
Binary files /dev/null and b/gfx/pokedex/sgb.png differ
diff --git a/gfx/pokedex/slowpoke.2bpp.lz b/gfx/pokedex/slowpoke.2bpp.lz.49a91b42
similarity index 100%
rename from gfx/pokedex/slowpoke.2bpp.lz
rename to gfx/pokedex/slowpoke.2bpp.lz.49a91b42
diff --git a/gfx/pokedex/slowpoke.png b/gfx/pokedex/slowpoke.png
new file mode 100644
index 000000000..5c1909a33
Binary files /dev/null and b/gfx/pokedex/slowpoke.png differ