diff --git a/res/btn_background.xml b/res/btn_background.xml
new file mode 100644
index 00000000..066aed5b
--- /dev/null
+++ b/res/btn_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_pressed" />
+    <item android:state_focused="true" android:state_default="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_normal" />
+    <item android:state_enabled="true" android:state_default="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_enabled="true" android:state_hovered="true"
+        android:drawable="@drawable/btn_hover" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_normal" />
+    <item
+        android:drawable="@drawable/btn_disabled" />
+</selector>
+
diff --git a/res/btn_background_transparent.xml b/res/btn_background_transparent.xml
new file mode 100644
index 00000000..f96baa91
--- /dev/null
+++ b/res/btn_background_transparent.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item
+    android:drawable="btn_disabled"
+    android:state_enabled="false"/>
+  <item
+    android:drawable="@null"
+    android:state_focused="true" />
+  <item
+    android:drawable="btn_pressed"
+    android:state_pressed="true" />
+  <item
+    android:drawable="btn_hover"
+    android:state_hovered="true" />
+  <item
+    android:drawable="@null" />
+</selector>
diff --git a/res/mdpi/btn_default.9.png b/res/mdpi/btn_default.9.png
new file mode 100644
index 00000000..9cbe49ae
Binary files /dev/null and b/res/mdpi/btn_default.9.png differ
diff --git a/res/mdpi/btn_disabled.9.png b/res/mdpi/btn_disabled.9.png
new file mode 100644
index 00000000..7722ed22
Binary files /dev/null and b/res/mdpi/btn_disabled.9.png differ
diff --git a/res/mdpi/btn_hover.9.png b/res/mdpi/btn_hover.9.png
new file mode 100644
index 00000000..8f50cd26
Binary files /dev/null and b/res/mdpi/btn_hover.9.png differ
diff --git a/res/mdpi/btn_normal.9.png b/res/mdpi/btn_normal.9.png
new file mode 100644
index 00000000..816d6a40
Binary files /dev/null and b/res/mdpi/btn_normal.9.png differ
diff --git a/res/mdpi/btn_pressed.9.png b/res/mdpi/btn_pressed.9.png
new file mode 100644
index 00000000..6084c61d
Binary files /dev/null and b/res/mdpi/btn_pressed.9.png differ
diff --git a/res/theme_default.xml b/res/theme_default.xml
index 8aed3d80..292bc014 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <theme id="theme_default" fontSize="15" >
     <style id="BUTTON"
-        backgroundImageId="btn_default_small"
+        backgroundImageId="btn_background"
         align="Center"
         margins="5,5,5,5"
         />
     <style id="BUTTON_TRANSPARENT"
-        backgroundImageId="btn_default_small_transparent"
+        backgroundImageId="btn_background_transparent"
         align="Center"
         />
     <style id="BUTTON_LABEL"
@@ -31,7 +31,7 @@
         minHeight="5"
         />
     <style id="BUTTON_NOMARGINS"
-        backgroundImageId="btn_default_small"
+        backgroundImageId="btn_background"
         align="Center"
         />
     <drawable id="scrollbar_button_up" value="scrollbar_btn_up"/>
diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d
index 3db4cb69..973be1ef 100644
--- a/src/dlangui/graphics/resources.d
+++ b/src/dlangui/graphics/resources.d
@@ -348,6 +348,7 @@ void extractStateFlag(ref string[string] attr, string attrName, string attrName2
 void extractStateFlags(ref string[string] attr, ref uint stateMask, ref uint stateValue) {
     extractStateFlag(attr, "state_pressed", "android:state_pressed", State.Pressed, stateMask, stateValue);
     extractStateFlag(attr, "state_focused", "android:state_focused", State.Focused, stateMask, stateValue);
+    extractStateFlag(attr, "state_default", "android:state_default", State.Default, stateMask, stateValue);
     extractStateFlag(attr, "state_hovered", "android:state_hovered", State.Hovered, stateMask, stateValue);
     extractStateFlag(attr, "state_selected", "android:state_selected", State.Selected, stateMask, stateValue);
     extractStateFlag(attr, "state_checkable", "android:state_checkable", State.Checkable, stateMask, stateValue);
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 78dd3ff1..2d6eab2c 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -749,14 +749,14 @@ Theme createDefaultTheme() {
     }
     //res.fontFace = "Arial Narrow";
     res.fontSize = 15; // TODO: choose based on DPI
-	Style button = res.createSubstyle("BUTTON").backgroundImageId("btn_default_small").alignment(Align.Center).setMargins(5,5,5,5);
-    res.createSubstyle("BUTTON_TRANSPARENT").backgroundImageId("btn_default_small_transparent").alignment(Align.Center);
+	Style button = res.createSubstyle("BUTTON").backgroundImageId("btn_background").alignment(Align.Center).setMargins(5,5,5,5);
+    res.createSubstyle("BUTTON_TRANSPARENT").backgroundImageId("btn_background_transparent").alignment(Align.Center);
     res.createSubstyle("BUTTON_LABEL").layoutWidth(FILL_PARENT).alignment(Align.Left|Align.VCenter);
     res.createSubstyle("BUTTON_ICON").alignment(Align.Center);
     res.createSubstyle("TEXT").setMargins(2,2,2,2).setPadding(1,1,1,1);
     res.createSubstyle("HSPACER").layoutWidth(FILL_PARENT).minWidth(5).layoutWeight(100);
     res.createSubstyle("VSPACER").layoutHeight(FILL_PARENT).minHeight(5).layoutWeight(100);
-	res.createSubstyle("BUTTON_NOMARGINS").backgroundImageId("btn_default_small").alignment(Align.Center); // .setMargins(5,5,5,5)
+    res.createSubstyle("BUTTON_NOMARGINS").backgroundImageId("btn_background").alignment(Align.Center); // .setMargins(5,5,5,5)
 	//button.createState(State.Enabled | State.Focused, State.Focused).backgroundImageId("btn_default_small_normal_disable_focused");
     //button.createState(State.Enabled, 0).backgroundImageId("btn_default_small_normal_disable");
     //button.createState(State.Pressed, State.Pressed).backgroundImageId("btn_default_small_pressed");
@@ -1015,7 +1015,7 @@ bool loadStyleAttributes(Style style, Element elem, bool allowStates) {
  * <?xml version="1.0" encoding="utf-8"?>
  * <theme id="theme_custom" parent="theme_default">
  *   	<style id="BUTTON" 
- * 			backgroundImageId="btn_default_small"
+ * 			backgroundImageId="btn_background"
  * 	 	>
  *   	</style>
  * </theme>