diff --git a/.gitignore b/.gitignore
index ed0bca5fed..cbbe22f3ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ Windows/ipch
 
 # For ppsspp.ini, etc.
 ppsspp.ini
+PPSSPPControls.dat
 
 # Qt Linguist files
 *.qm
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 4922af6eee..7f5ec88649 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -116,7 +116,7 @@ void Config::Load(const char *iniFileName)
 	graphics->Get("MipMap", &bMipMap, false);
 #endif
 	graphics->Get("TexScalingLevel", &iTexScalingLevel, 1);
-	graphics->Get("TexScalingType", &iTexScalingType, 1);
+	graphics->Get("TexScalingType", &iTexScalingType, 0);
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
diff --git a/Core/Config.h b/Core/Config.h
index 14cc3e6f3e..8058bf51e2 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -73,7 +73,7 @@ public:
 	bool bTrueColor;
 	bool bMipMap;
 	int iTexScalingLevel; // 1 = off, 2 = 2x, ..., 5 = 5x
-	int iTexScalingType; // 0 = Bilinear, 1 = xBRZ, 2 = Hybrid
+	int iTexScalingType; // 0 = xBRZ, 1 = Hybrid
 
 	// Sound
 	bool bEnableSound;
diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp
index d967bb2cb6..8aa2ba8efa 100644
--- a/GPU/GLES/TextureScaler.cpp
+++ b/GPU/GLES/TextureScaler.cpp
@@ -275,15 +275,14 @@ void TextureScaler::Scale(u32* &data, GLenum &dstFmt, int &width, int &height, i
 
 	// scale 
 	switch(g_Config.iTexScalingType) {
-	case BILINEAR:
-		ScaleBilinear(factor, inputBuf, outputBuf, width, height);
-		break;
 	case XBRZ:
 		ScaleXBRZ(factor, inputBuf, outputBuf, width, height);
 		break;
 	case HYBRID:
 		ScaleHybrid(factor, inputBuf, outputBuf, width, height);
 		break;
+	default:
+		ERROR_LOG(G3D, "Unknown scaling type: %d", g_Config.iTexScalingType);
 	}
 
 	// update values accordingly
diff --git a/GPU/GLES/TextureScaler.h b/GPU/GLES/TextureScaler.h
index a870662c95..11b69fa966 100644
--- a/GPU/GLES/TextureScaler.h
+++ b/GPU/GLES/TextureScaler.h
@@ -31,7 +31,7 @@ public:
 
 	void Scale(u32* &data, GLenum &dstfmt, int &width, int &height, int factor);
 
-	enum { BILINEAR = 0, XBRZ= 1, HYBRID = 2 };
+	enum { XBRZ= 0, HYBRID = 1 };
 
 private:
 	void ScaleXBRZ(int factor, u32* source, u32* dest, int width, int height);
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 3eea9e07a7..4f30998456 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -521,9 +521,6 @@ namespace MainWindow
 				setTexScalingLevel(5);
 				break;
 
-			case ID_TEXTURESCALING_BILINEAR:
-				setTexScalingType(TextureScaler::BILINEAR);
-				break;
 			case ID_TEXTURESCALING_XBRZ:
 				setTexScalingType(TextureScaler::XBRZ);
 				break;
@@ -849,7 +846,6 @@ namespace MainWindow
 		}
 
 		static const int texscalingtypeitems[] = {
-			ID_TEXTURESCALING_BILINEAR,
 			ID_TEXTURESCALING_XBRZ,
 			ID_TEXTURESCALING_HYBRID,
 		};
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 76a7d92f67..58592b51f5 100644
Binary files a/Windows/ppsspp.rc and b/Windows/ppsspp.rc differ
diff --git a/Windows/resource.h b/Windows/resource.h
index 41bec3dae5..d74c24156c 100644
Binary files a/Windows/resource.h and b/Windows/resource.h differ