diff --git a/res/drawable/blue_button.xml b/res/drawable/blue_button.xml
index f686a06a..4e0ef759 100644
--- a/res/drawable/blue_button.xml
+++ b/res/drawable/blue_button.xml
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#071622" android:endColor="#253541" android:angle="90"/>
-    <corners android:radius="0dp" />
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<gradient a:startColor="#001c45"
+			  a:endColor="#003481"
+			  a:angle="90"/>
+    <corners a:radius="0dp" />
 </shape>
diff --git a/res/drawable/dark_blue_button.xml b/res/drawable/blue_button_dark.xml
similarity index 100%
rename from res/drawable/dark_blue_button.xml
rename to res/drawable/blue_button_dark.xml
diff --git a/res/drawable/default_button.xml b/res/drawable/default_button.xml
new file mode 100644
index 00000000..f686a06a
--- /dev/null
+++ b/res/drawable/default_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#071622" android:endColor="#253541" android:angle="90"/>
+    <corners android:radius="0dp" />
+</shape>
diff --git a/res/drawable/button.xml b/res/drawable/default_button_dark.xml
similarity index 100%
rename from res/drawable/button.xml
rename to res/drawable/default_button_dark.xml
diff --git a/res/drawable/light_blue_button.xml b/res/drawable/light_blue_button.xml
deleted file mode 100644
index 4e0ef759..00000000
--- a/res/drawable/light_blue_button.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:a="http://schemas.android.com/apk/res/android">
-	<gradient a:startColor="#001c45"
-			  a:endColor="#003481"
-			  a:angle="90"/>
-    <corners a:radius="0dp" />
-</shape>
diff --git a/res/drawable/dark_violet_button.xml b/res/drawable/violet_button_dark.xml
similarity index 100%
rename from res/drawable/dark_violet_button.xml
rename to res/drawable/violet_button_dark.xml
diff --git a/res/values/styles-common.xml b/res/values/styles-common.xml
index c4862a86..2cd67c0a 100644
--- a/res/values/styles-common.xml
+++ b/res/values/styles-common.xml
@@ -12,13 +12,13 @@
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:focusable">true</item>
-		<item name="android:background">@drawable/button</item>
+		<item name="android:background">@drawable/default_button_dark</item>
 		<item name="android:layout_marginLeft">1dp</item>
 		<item name="android:layout_marginBottom">1dp</item>
 	</style>
 
 	<style name="default_digit_button_style" parent="button_style">
-		<item name="android:background">@drawable/blue_button</item>
+		<item name="android:background">@drawable/default_button</item>
 	</style>
 
 	<style name="violet_digit_button_style" parent="button_style">
@@ -26,17 +26,17 @@
 	</style>
 
 	<style name="light_blue_digit_button_style" parent="button_style">
-		<item name="android:background">@drawable/light_blue_button</item>
+		<item name="android:background">@drawable/blue_button</item>
 	</style>
 
 	<style name="default_control_button_style" parent="button_style"/>
 
 	<style name="violet_control_button_style" parent="button_style">
-		<item name="android:background">@drawable/dark_violet_button</item>
+		<item name="android:background">@drawable/violet_button_dark</item>
 	</style>
 
 	<style name="light_blue_control_button_style" parent="button_style">
-		<item name="android:background">@drawable/dark_blue_button</item>
+		<item name="android:background">@drawable/blue_button_dark</item>
 	</style>
 
 	<style name="default_control_image_button_style" parent="default_control_button_style">