diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index e8d8141711..60a22e1782 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -59,7 +59,7 @@ android {
     defaultConfig {
         // TODO If this is ever modified, change application_id in strings.xml
         applicationId = "dev.eden.eden_emulator"
-        minSdk = 28
+        minSdk = 24
         targetSdk = 36
         versionName = getGitVersion()
 
diff --git a/src/android/app/src/main/res/drawable/ic_launcher.xml b/src/android/app/src/main/res/drawable-v26/ic_launcher.xml
similarity index 100%
rename from src/android/app/src/main/res/drawable/ic_launcher.xml
rename to src/android/app/src/main/res/drawable-v26/ic_launcher.xml
diff --git a/src/android/app/src/main/res/drawable/ic_launcher.png b/src/android/app/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000000..6b586fc757
Binary files /dev/null and b/src/android/app/src/main/res/drawable/ic_launcher.png differ
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 1e158f3759..c1fdd374ef 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -21,7 +24,7 @@ add_executable(tests
 
 create_target_directory_groups(tests)
 
-target_link_libraries(tests PRIVATE common core input_common)
+target_link_libraries(tests PRIVATE common core input_common video_core)
 target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Catch2::Catch2WithMain Threads::Threads)
 
 add_test(NAME tests COMMAND tests)
diff --git a/src/video_core/vulkan_common/vma.h b/src/video_core/vulkan_common/vma.h
index 911c1114b2..e022b2bf7d 100644
--- a/src/video_core/vulkan_common/vma.h
+++ b/src/video_core/vulkan_common/vma.h
@@ -10,4 +10,12 @@
 #define VMA_STATIC_VULKAN_FUNCTIONS 0
 #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable : 4189 )
+#endif
 #include "vk_mem_alloc.h"
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
diff --git a/tools/VectorDrawable2Svg.py b/tools/VectorDrawable2Svg.py
new file mode 100644
index 0000000000..20f168e1aa
--- /dev/null
+++ b/tools/VectorDrawable2Svg.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python2
+"""
+VectorDrawable2Svg
+This script convert your VectorDrawable to a Svg
+Author: Alessandro Lucchet
+
+Usage: drop one or more vector drawable onto this script to convert them to svg format
+"""
+
+from xml.dom.minidom import *
+import sys
+
+# extracts all paths inside vdContainer and add them into svgContainer
+def convertPaths(vdContainer,svgContainer,svgXml):
+	vdPaths = vdContainer.getElementsByTagName('path')
+	for vdPath in vdPaths:
+		# only iterate in the first level
+		if vdPath.parentNode == vdContainer:
+			svgPath = svgXml.createElement('path')
+			svgPath.attributes['d'] = vdPath.attributes['android:pathData'].value
+			if vdPath.hasAttribute('android:fillColor'):
+				svgPath.attributes['fill'] = vdPath.attributes['android:fillColor'].value
+			else:
+				svgPath.attributes['fill'] = 'none'
+			if vdPath.hasAttribute('android:strokeLineJoin'):
+				svgPath.attributes['stroke-linejoin'] = vdPath.attributes['android:strokeLineJoin'].value
+			if vdPath.hasAttribute('android:strokeLineCap'):
+				svgPath.attributes['stroke-linecap'] = vdPath.attributes['android:strokeLineCap'].value
+			if vdPath.hasAttribute('android:strokeMiterLimit'):
+				svgPath.attributes['stroke-miterlimit'] = vdPath.attributes['android:strokeMiterLimit'].value
+			if vdPath.hasAttribute('android:strokeWidth'):
+				svgPath.attributes['stroke-width'] = vdPath.attributes['android:strokeWidth'].value
+			if vdPath.hasAttribute('android:strokeColor'):
+				svgPath.attributes['stroke'] = vdPath.attributes['android:strokeColor'].value
+			svgContainer.appendChild(svgPath);
+		
+# define the function which converts a vector drawable to a svg
+def convertVd(vdFilePath):
+
+	# create svg xml
+	svgXml = Document()
+	svgNode = svgXml.createElement('svg')
+	svgXml.appendChild(svgNode);
+
+	# open vector drawable
+	vdXml = parse(vdFilePath)
+	vdNode = vdXml.getElementsByTagName('vector')[0]
+
+	# setup basic svg info
+	svgNode.attributes['xmlns'] = 'http://www.w3.org/2000/svg'
+	svgNode.attributes['width'] = vdNode.attributes['android:viewportWidth'].value
+	svgNode.attributes['height'] = vdNode.attributes['android:viewportHeight'].value
+	svgNode.attributes['viewBox'] = '0 0 {} {}'.format(vdNode.attributes['android:viewportWidth'].value, vdNode.attributes['android:viewportHeight'].value)
+
+	# iterate through all groups
+	vdGroups = vdXml.getElementsByTagName('group')
+	for vdGroup in vdGroups:
+	
+		# create the group
+		svgGroup = svgXml.createElement('g')
+		
+		# setup attributes of the group
+		if vdGroup.hasAttribute('android:translateX'):
+			svgGroup.attributes['transform'] = 'translate({},{})'.format(vdGroup.attributes['android:translateX'].value,vdGroup.attributes['android:translateY'].value)
+		
+		# iterate through all paths inside the group
+		convertPaths(vdGroup,svgGroup,svgXml)
+			
+		# append the group to the svg node
+		svgNode.appendChild(svgGroup);
+
+	# iterate through all svg-level paths
+	convertPaths(vdNode,svgNode,svgXml)
+
+	# write xml to file
+	svgXml.writexml(open(vdFilePath + '.svg', 'w'),indent="",addindent="  ",newl='\n')
+	
+# script begin
+if len(sys.argv)>1:
+	iterArgs = iter(sys.argv)
+	next(iterArgs) #skip the first entry (it's the name of the script)
+	for arg in iterArgs:
+		convertVd(arg)
+else:
+	print("You have to pass me something")
+	sys.exit()
diff --git a/tools/generate-legacy-icons.sh b/tools/generate-legacy-icons.sh
new file mode 100755
index 0000000000..9bf14e8093
--- /dev/null
+++ b/tools/generate-legacy-icons.sh
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+
+# Generate SDK <26 icons for android
+# requires imagemagick, inkscape
+
+ROOTDIR=$PWD
+
+cd src/android/app/src/main
+
+pushd res/drawable
+# convert vector to svg--needed to generate launcher png
+cp ic_yuzu_icon.xml tmp
+
+python3 $ROOTDIR/tools/VectorDrawable2Svg.py tmp
+
+inkscape -w 768 -h 768 tmp.svg -o ic_tmp.png
+magick ic_icon_bg_orig.png -resize 512x512 bg_tmp.png
+
+magick bg_tmp.png -strip -type TrueColor -depth 8 -colorspace sRGB -color-matrix "1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0" bg_tmp_rgb.png
+magick -verbose bg_tmp_rgb.png ic_tmp.png -gravity center -composite -colorspace sRGB ic_launcher.png
+echo
+
+rm *tmp*
+popd
+
+# Add legacy here when legacy gets merged