diff --git a/misc/ps4/Makefile b/misc/ps4/Makefile
index 9ffbc51ad..97a21765d 100644
--- a/misc/ps4/Makefile
+++ b/misc/ps4/Makefile
@@ -63,12 +63,20 @@ $(BUILD_DIR):
 #---------------------------------------------------------------------------------
 # Executable generation
 #---------------------------------------------------------------------------------
-$(CONTENT_ID).pkg: pkg.gp4
+$(CONTENT_ID).pkg: $(BUILD_DIR)/pkg.gp4
 	$(TOOLCHAIN)/bin/$(CDIR)/PkgTool.Core pkg_build $< .
 
-pkg.gp4: eboot.bin $(BUILD_DIR)/sce_sys/param.sfo
+$(BUILD_DIR)/pkg.gp4: $(BUILD_DIR)/eboot.bin $(BUILD_DIR)/sce_sys/param.sfo $(BUILD_DIR)/sce_sys/icon0.png $(BUILD_DIR)/sce_sys/about/right.sprx
+	cd $(BUILD_DIR)
 	$(TOOLCHAIN)/bin/$(CDIR)/create-gp4 -out $@ --content-id=$(CONTENT_ID) --files "eboot.bin sce_sys/about/right.sprx sce_sys/param.sfo sce_sys/icon0.png"
 
+$(BUILD_DIR)/sce_sys/icon0.png: misc/ps4/icon0.png
+	cp $< $@
+
+$(BUILD_DIR)/sce_sys/about/right.sprx: misc/ps4/right.sprx
+	mkdir -p $(BUILD_DIR)/sce_sys/about
+	cp $< $@
+
 $(BUILD_DIR)/sce_sys/param.sfo:
 	mkdir -p $(BUILD_DIR)/sce_sys
 	$(TOOLCHAIN)/bin/$(CDIR)/PkgTool.Core sfo_new $@
@@ -86,8 +94,8 @@ $(BUILD_DIR)/sce_sys/param.sfo:
 $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 	$(LD) $(OBJS) -o $(BUILD_DIR)/$(TARGET).elf $(LDFLAGS)
 
-eboot.bin: $(BUILD_DIR)/$(TARGET).elf
-	$(TOOLCHAIN)/bin/$(CDIR)/create-fself -in=$(BUILD_DIR)/$(TARGET).elf -out=$(BUILD_DIR)/$(TARGET).oelf --eboot "eboot.bin" --paid 0x3800000000000011
+$(BUILD_DIR)/eboot.bin: $(BUILD_DIR)/$(TARGET).elf
+	$(TOOLCHAIN)/bin/$(CDIR)/create-fself -in=$(BUILD_DIR)/$(TARGET).elf -out=$(BUILD_DIR)/$(TARGET).oelf --eboot "$(BUILD_DIR)/eboot.bin" --paid 0x3800000000000011
 
 
 #---------------------------------------------------------------------------------
diff --git a/misc/ps4/icon0.png b/misc/ps4/icon0.png
new file mode 100755
index 000000000..b0dc03ba0
Binary files /dev/null and b/misc/ps4/icon0.png differ
diff --git a/misc/ps4/right.sprx b/misc/ps4/right.sprx
new file mode 100644
index 000000000..4d79e6a66
Binary files /dev/null and b/misc/ps4/right.sprx differ
diff --git a/src/android/Window_Android.c b/src/android/Window_Android.c
index 58a7e3217..8990d7cd8 100644
--- a/src/android/Window_Android.c
+++ b/src/android/Window_Android.c
@@ -567,9 +567,9 @@ static ANativeWindow* fallback_fromSurface(JNIEnv* env, jobject surface) {
 static void fallback_release(ANativeWindow* window) {
 }
 
-static jobject   canvas_arr;
-static uint32_t* canvas_ptr;
-static ARect     canvas_rect;
+static jobject canvas_arr;
+static jint*   canvas_ptr;
+static ARect   canvas_rect;
 
 static int32_t fallback_lock(ANativeWindow* window, ANativeWindow_Buffer* oBuffer, ARect* ioDirtyBounds) {
 	JNIEnv* env;
@@ -706,4 +706,4 @@ void Window_Init(void) {
 	DisplayInfo.ScaleY = Java_ICall_Float(env, JAVA_getDpiY, NULL);
 }
 
-void Window_Free(void) { }
\ No newline at end of file
+void Window_Free(void) { }