diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index ee1fd274b..e22d75c78 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1067,7 +1067,7 @@ rm -rf project/bin/res
 rm -rf project/res/drawable-xhdpi/ouya_icon.png
 if which convert > /dev/null; then
 	mkdir -p project/res/drawable-xhdpi
-	convert project/res/drawable/icon.png -resize '732x412!' project/res/drawable-xhdpi/ouya_icon.png
+	convert project/res/drawable/icon.png -resize '732x412' -background none -gravity center -extent '732x412' project/res/drawable-xhdpi/ouya_icon.png
 else
 	echo "Install ImageMagick to auto-resize Ouya icon from icon.png"
 fi
diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index 86553af9c..39422d88f 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -21,10 +21,10 @@ AppVersionName="0.5.0.16"
 AppDataDownloadUrl="!SSL certificates|:ca-certificates.crt:ca-certificates.crt"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=y
+ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade="data.zip"
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag"
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
diff --git a/project/jni/application/supertux/AndroidData/logo.jpg b/project/jni/application/supertux/AndroidData/logo.jpg
new file mode 100644
index 000000000..69d868b94
Binary files /dev/null and b/project/jni/application/supertux/AndroidData/logo.jpg differ
diff --git a/project/jni/application/supertux/AndroidData/logo.png b/project/jni/application/supertux/AndroidData/logo.png
deleted file mode 120000
index 62663f29a..000000000
--- a/project/jni/application/supertux/AndroidData/logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../supertux/data/images/background/bluemountain-middle.png
\ No newline at end of file
diff --git a/project/jni/application/supertux/AndroidPostBuild.sh b/project/jni/application/supertux/AndroidPostBuild.sh
index 09b028e84..c01900dfe 100755
--- a/project/jni/application/supertux/AndroidPostBuild.sh
+++ b/project/jni/application/supertux/AndroidPostBuild.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 cd supertux/data || exit 1
-zip -r -n .png:.ogg:.jpg $1 * || exit 1
+#zip -r -n .png:.ogg:.jpg $1 * || exit 1
+zip -r -9 $1 * || exit 1
diff --git a/project/jni/application/supertux/AndroidPreBuild.sh b/project/jni/application/supertux/AndroidPreBuild.sh
new file mode 100755
index 000000000..ea0376051
--- /dev/null
+++ b/project/jni/application/supertux/AndroidPreBuild.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Reduce .apk file size, at the expense of overlay key themes
+cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/dualshock.raw
+cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/n64.raw
+cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/sun.raw
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 4db9d6430..26425d8a1 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 4db9d64305fcee661db7b9e01a6ab48a8404fc52
+Subproject commit 26425d8a1bad7a745862a5233ad76fe960c2e69d
diff --git a/project/jni/application/supertux/version.h b/project/jni/application/supertux/version.h
index ae414e252..c8e4f9017 100644
--- a/project/jni/application/supertux/version.h
+++ b/project/jni/application/supertux/version.h
@@ -1,4 +1,4 @@
 #ifndef VERSION_H
 #define VERSION_H
-#define PACKAGE_VERSION "v0.4.0"
+#define PACKAGE_VERSION "v0.5.0"
 #endif
diff --git a/project/res/drawable/tv_border_left.jpg b/project/res/drawable/tv_border_left.jpg
new file mode 100644
index 000000000..6abe39965
Binary files /dev/null and b/project/res/drawable/tv_border_left.jpg differ
diff --git a/project/res/drawable/tv_border_left.png b/project/res/drawable/tv_border_left.png
deleted file mode 100644
index a4a7f1118..000000000
Binary files a/project/res/drawable/tv_border_left.png and /dev/null differ
diff --git a/project/res/drawable/tv_border_top.jpg b/project/res/drawable/tv_border_top.jpg
new file mode 100644
index 000000000..bf4b01a09
Binary files /dev/null and b/project/res/drawable/tv_border_top.jpg differ
diff --git a/project/res/drawable/tv_border_top.png b/project/res/drawable/tv_border_top.png
deleted file mode 100644
index ef01b6525..000000000
Binary files a/project/res/drawable/tv_border_top.png and /dev/null differ