diff --git a/.gitignore b/.gitignore
index a5b45a1ae1b..fbb3ba6cb42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,4 +280,4 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
-godot.creator.user.wd3476
+godot.creator.*
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 298fa3bc789..0fe4f9f3b56 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -201,6 +201,12 @@ def configure(env):
 
 			env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])
 			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+		elif (env["target"]=="debug_release"):
+
+			env.Append(CCFLAGS=['/Zi','/Od'])
+			env.Append(LINKFLAGS=['/DEBUG'])
+			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
+			env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
 
 		elif (env["target"]=="debug"):
 
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index 5b837d699c5..b465db5c80a 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -97,6 +97,13 @@ void Button::_notification(int p_what) {
 			
 			} break;
 		}
+
+		if (has_focus()) {
+
+			Ref<StyleBox> style = get_stylebox("focus");
+			style->draw(ci,Rect2(Point2(),size));
+		}
+
 		Ref<StyleBox> style = get_stylebox("normal" );
 		Ref<Font> font=get_font("font");
 		Ref<Texture> _icon;
@@ -134,11 +141,7 @@ void Button::_notification(int p_what) {
 			_icon->draw(ci,Point2(style->get_offset().x, Math::floor( (size.height-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) );
 		}
 
-		if (has_focus()) {
 
-			Ref<StyleBox> style = get_stylebox("focus");
-			style->draw(ci,Rect2(Point2(),size));
-		}
 				
 	}
 }