diff --git a/res/drawable-hdpi/dropdown_default.9.png b/res/drawable-hdpi/dropdown_default.9.png
deleted file mode 100644
index b4ab9ad83a..0000000000
Binary files a/res/drawable-hdpi/dropdown_default.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/dropdown_disabled.9.png b/res/drawable-hdpi/dropdown_disabled.9.png
deleted file mode 100644
index 7a20af7380..0000000000
Binary files a/res/drawable-hdpi/dropdown_disabled.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/dropdown_focused.9.png b/res/drawable-hdpi/dropdown_focused.9.png
deleted file mode 100644
index 766543c2c2..0000000000
Binary files a/res/drawable-hdpi/dropdown_focused.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/dropdown_pressed.9.png b/res/drawable-hdpi/dropdown_pressed.9.png
deleted file mode 100644
index c849e2f94f..0000000000
Binary files a/res/drawable-hdpi/dropdown_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/spinner_48_inner.png b/res/drawable-hdpi/spinner_48_inner.png
deleted file mode 100644
index 31fa267f4a..0000000000
Binary files a/res/drawable-hdpi/spinner_48_inner.png and /dev/null differ
diff --git a/res/drawable-ldpi/spinner_48_inner.png b/res/drawable-ldpi/spinner_48_inner.png
deleted file mode 100644
index f0f0827b84..0000000000
Binary files a/res/drawable-ldpi/spinner_48_inner.png and /dev/null differ
diff --git a/res/drawable-mdpi/dropdown_default.9.png b/res/drawable-mdpi/dropdown_default.9.png
deleted file mode 100644
index 4a15c63708..0000000000
Binary files a/res/drawable-mdpi/dropdown_default.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/dropdown_disabled.9.png b/res/drawable-mdpi/dropdown_disabled.9.png
deleted file mode 100644
index f54d0b4f1f..0000000000
Binary files a/res/drawable-mdpi/dropdown_disabled.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/dropdown_focused.9.png b/res/drawable-mdpi/dropdown_focused.9.png
deleted file mode 100644
index 0de1bb1bcb..0000000000
Binary files a/res/drawable-mdpi/dropdown_focused.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/dropdown_pressed.9.png b/res/drawable-mdpi/dropdown_pressed.9.png
deleted file mode 100644
index f2f6428dee..0000000000
Binary files a/res/drawable-mdpi/dropdown_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/spinner_48_inner.png b/res/drawable-mdpi/spinner_48_inner.png
deleted file mode 100644
index 11eacf8a9a..0000000000
Binary files a/res/drawable-mdpi/spinner_48_inner.png and /dev/null differ
diff --git a/res/drawable/dropdown.xml b/res/drawable/dropdown.xml
deleted file mode 100644
index 13e06b9766..0000000000
--- a/res/drawable/dropdown.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012-2013 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-          android:drawable="@drawable/dropdown_disabled" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/dropdown_pressed" />
-    <item android:state_pressed="false" android:state_focused="true"
-          android:drawable="@drawable/dropdown_focused" />
-    <item android:drawable="@drawable/dropdown_default" />
-</selector>
diff --git a/res/drawable/indeterminate_progress.xml b/res/drawable/indeterminate_progress.xml
deleted file mode 100644
index 4f19fdde0b..0000000000
--- a/res/drawable/indeterminate_progress.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012-2013 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--  item>
-        <rotate
-             android:drawable="@drawable/freenet_spinner_48_outer"
-             android:pivotX="50%"
-             android:pivotY="50%"
-             android:fromDegrees="0"
-             android:toDegrees="1080" />
-    </item-->
-    <item>
-        <rotate
-             android:drawable="@drawable/spinner_48_inner"
-             android:pivotX="50%"
-             android:pivotY="50%"
-             android:fromDegrees="0"
-             android:toDegrees="720" />
-    </item>
-</layer-list>
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 3500c0fd67..7bd362d178 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -185,7 +185,7 @@
 						           
 	</LinearLayout>
        
-	<com.owncloud.android.ui.CustomButton
+	<Button
 		android:id="@id/buttonOK"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index dee1507b8d..d3964564b4 100644
--- a/res/layout-v14/generic_explanation.xml
+++ b/res/layout-v14/generic_explanation.xml
@@ -49,14 +49,14 @@
         android:orientation="horizontal" >
 
         <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-		<com.owncloud.android.ui.CustomButton
+		<Button
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index a0d5470ef1..c263daf54d 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -166,7 +166,7 @@
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized" />
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/buttonOK"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml
index 61b920e34a..e5c3d105b1 100644
--- a/res/layout/extensions_available_dialog.xml
+++ b/res/layout/extensions_available_dialog.xml
@@ -34,14 +34,14 @@
         android:layout_margin="5dp"
         android:weightSum="1.0" >
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/buttonNo"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/common_no"
             android:layout_weight="0.5"/>
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/buttonYes"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml
index 93350458ca..b4deeed3c7 100644
--- a/res/layout/failed_upload_files.xml
+++ b/res/layout/failed_upload_files.xml
@@ -63,7 +63,7 @@
                 android:text="@string/failed_upload_all_cb"
                 android:textSize="8sp" />
 
-            <com.owncloud.android.ui.CustomButton
+            <Button
                 android:id="@+id/failed_upload_retry_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                 android:text="@string/failed_upload_headline_retryall_btn"
                 android:textSize="8sp" />
 
-            <com.owncloud.android.ui.CustomButton
+            <Button
                 android:id="@+id/failed_upload_delete_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
index 872f28a77f..cf20544552 100644
--- a/res/layout/failed_upload_message_view.xml
+++ b/res/layout/failed_upload_message_view.xml
@@ -10,7 +10,7 @@
        android:layout_height="wrap_content"
        android:minWidth="100dp"/>
    
-   <com.owncloud.android.ui.CustomButton
+   <Button
     android:id="@+id/failed_uploadactivity_close_button"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index fd2d05b93b..cd8875533f 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -48,14 +48,14 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-		<com.owncloud.android.ui.CustomButton
+		<Button
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="1"
 		    android:text="@string/common_ok" />
 		
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index 05f5c57108..22e744b288 100644
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -24,7 +24,7 @@
          android:layout_height="wrap_content"
          android:gravity="bottom">
         
-     <com.owncloud.android.ui.CustomButton
+     <Button
             	android:id="@+id/deleteLogHistoryButton"
          		android:layout_width="match_parent"
      		   	android:layout_height="wrap_content"
diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml
index 11c8739175..0c9cf13825 100644
--- a/res/layout/no_account_available.xml
+++ b/res/layout/no_account_available.xml
@@ -39,7 +39,7 @@
             android:text="@string/main_wrn_accsetup"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/setup_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index 48925beb34..b1b6ce828c 100644
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -68,7 +68,7 @@
             style="@style/PassCodeStyle" />
     </LinearLayout>
 
-    <com.owncloud.android.ui.CustomButton android:layout_width="wrap_content"
+    <Button android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_cancel"
         android:textColor="@android:color/black"
diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index df3e48a239..9da017bb03 100644
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -408,21 +408,21 @@
         android:layout_height="wrap_content"
         android:gravity="center" >
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/details_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
-        <com.owncloud.android.ui.CustomButton
+        <Button
             android:id="@+id/ok"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index cb0206cd9d..6c15ff7e52 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -35,13 +35,13 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal" >
-
        <com.owncloud.android.ui.CustomButton
+
        <Button
             android:id="@+id/upload_files_btn_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
-
		<com.owncloud.android.ui.CustomButton
+
		<Button
 		    android:id="@+id/upload_files_btn_upload"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 2b549a7b99..ff2742988b 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -33,7 +33,7 @@
 	</FrameLayout>
 	<LinearLayout android:id="@+id/linearLayout1"
 		android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
-		<com.owncloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
+		<Button android:layout_gravity="bottom" android:layout_height="wrap_content"
 			android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
 			android:text="@string/uploader_btn_upload_text"/>
 	</LinearLayout>
diff --git a/res/values-v11/versioned_styles.xml b/res/values-v11/versioned_styles.xml
new file mode 100644
index 0000000000..75cfb9b776
--- /dev/null
+++ b/res/values-v11/versioned_styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	
+	<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
+		<item name="android:background">@android:drawable/btn_default</item>
+		<item name="android:textColor">@color/button_text_color</item>
+	</style>
+
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d48fb41171..034ca5cbb7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,24 +25,24 @@
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
-    	<item name="actionDropDownStyle">@style/DropDownStyle</item>
-    	<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
+    	<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
+    	<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
 	</style>
 	
 	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
-      <item name="actionDropDownStyle">@style/DropDownStyle</item>
-      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
     </style>
 	
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="android:windowFullscreen">true</item>
-      <item name="actionDropDownStyle">@style/DropDownStyle</item>
-      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
     </style>
 	
 	
@@ -54,28 +54,14 @@
     	<item name="android:shadowRadius">1</item>
     	<item name="android:shadowDy">1</item>
     	<item name="android:backgroundSplit">@drawable/split_action_bg</item>
-    	<item name="android:indeterminateProgressStyle">@style/IndeterminateStyle</item>
-    	<item name="indeterminateProgressStyle">@style/IndeterminateStyle</item>
-	</style>
-
-	<!-- DropDown -->
-	<style name="DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
-	    <item name="android:background">@drawable/dropdown</item>
-	</style>
-	<style name="IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
-	    <item name="android:indeterminateDrawable">@drawable/indeterminate_progress</item>
+    	<item name="android:indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
+    	<item name="indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
 	</style>
 
 	<!-- Dialogs -->
 	<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
 	</style>
 	
-	<!-- Buttons -->
-    <style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
-        <item name="android:background">@android:drawable/btn_default</item>
-        <item name="android:textColor">@color/button_text_color</item>
-    </style>
-
 	<!-- PopDownMenu -->
 	<style name="Animations.PopDownMenu" />
 	
diff --git a/res/values/versioned_styles.xml b/res/values/versioned_styles.xml
new file mode 100644
index 0000000000..cd6c1f515b
--- /dev/null
+++ b/res/values/versioned_styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	
+    <!-- Buttons -->
+	<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
+		<item name="android:background">@android:drawable/btn_default</item>
+		<item name="android:textColor">@color/button_text_color</item>
+	</style>
+	
+	<!-- DropDown -->
+	<style name="Theme.ownCloud.DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+	    <item name="android:background">@drawable/abs__spinner_ab_holo_dark</item>
+	</style>
+	
+	<style name="Theme.ownCloud.IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
+	    <item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>
+	</style>
+
+</resources>