diff --git a/Sources/arm/node/Material.hx b/Sources/arm/node/Material.hx
index 3ca61985..768c2fb1 100644
--- a/Sources/arm/node/Material.hx
+++ b/Sources/arm/node/Material.hx
@@ -1746,8 +1746,18 @@ class Material {
 			name: tex_name,
 			file: filepath
 		};
-		tex.min_filter = 'anisotropic';
-		tex.mipmap_filter = 'linear';
+
+		if (arm.ui.UITrait.inst.textureFilter) {
+			tex.min_filter = 'anisotropic';
+			tex.mag_filter = 'linear';
+			tex.mipmap_filter = 'linear';
+		}
+		else {
+			tex.min_filter = 'point';
+			tex.mag_filter = 'point';
+			tex.mipmap_filter = 'no';
+		}
+
 		tex.generate_mipmaps = true;
 		tex.u_addressing = 'repeat';
 		tex.v_addressing = 'repeat';
diff --git a/Sources/arm/ui/BoxPreferences.hx b/Sources/arm/ui/BoxPreferences.hx
index ed275d33..597cd02b 100644
--- a/Sources/arm/ui/BoxPreferences.hx
+++ b/Sources/arm/ui/BoxPreferences.hx
@@ -156,6 +156,7 @@ class BoxPreferences {
 				var filterHandle = Id.handle({selected: UITrait.inst.textureFilter});
 				UITrait.inst.textureFilter = ui.check(filterHandle, "Filter Textures");
 				if (filterHandle.changed) {
+					MaterialParser.parsePaintMaterial();
 					MaterialParser.parseMeshMaterial();
 				}
 				#if (!kha_direct3d12)