diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index 1a951d76..a5dddd38 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
 		<activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
 		<activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
 
-		<activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/Theme.Wizard.Purchase"/>
+		<activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
 
 		<activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
 
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java b/android-app/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
index afbd4509..923b67d6 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java
@@ -30,15 +30,13 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.ViewBuilder;
 import org.solovyev.android.view.ViewFromLayoutBuilder;
 import org.solovyev.common.units.*;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 
@@ -167,7 +165,7 @@ public class UnitConverterViewBuilder implements ViewBuilder<View> {
 							 @Nonnull List<? extends UnitType<String>> unitTypes) {
 		final Spinner spinner = (Spinner) main.findViewById(spinnerId);
 
-		final ArrayAdapter<UnitType<String>> adapter = new ArrayAdapter<UnitType<String>>(context, android.R.layout.simple_spinner_item);
+		final ArrayAdapter<UnitType<String>> adapter = new ArrayAdapter<UnitType<String>>(context, R.layout.support_simple_spinner_dropdown_item);
 		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		for (UnitType<String> fromUnitType : unitTypes) {
 			adapter.add(fromUnitType);
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardArrayAdapter.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardArrayAdapter.java
index c11f67df..92fa6026 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardArrayAdapter.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardArrayAdapter.java
@@ -5,11 +5,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+import org.solovyev.android.calculator.R;
 
 final class WizardArrayAdapter extends ArrayAdapter<String> {
 
 	public WizardArrayAdapter(Context context, int array) {
-		super(context, android.R.layout.simple_spinner_item, context.getResources().getStringArray(array));
+		super(context, R.layout.support_simple_spinner_dropdown_item, context.getResources().getStringArray(array));
 		setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 	}
 
diff --git a/android-app/src/main/res/values-v21/theme.xml b/android-app/src/main/res/values-v21/theme.xml
index 98738578..add792a3 100644
--- a/android-app/src/main/res/values-v21/theme.xml
+++ b/android-app/src/main/res/values-v21/theme.xml
@@ -37,8 +37,14 @@
 		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
 		<item name="colorAccent">@color/cpp_wizard_primary</item>
 		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
-		<item name="android:textColorSecondary">@color/cpp_wizard_primary</item>
+		<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
 		<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
 	</style>
 
+	<style name="Theme.Settings" parent="Theme.Settings.Base">
+		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
+		<item name="colorAccent">@color/cpp_wizard_primary</item>
+		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index ed7fc753..683cf68b 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -28,8 +28,9 @@
 	<color name="cpp_button_text_operator">#ffffff99</color>
 	<color name="cpp_button_text_ce">#ffffffff</color>
 	<color name="cpp_selected_angle_unit_text">#ffffff99</color>
-	<color name="cpp_main_bg">#ff000000</color>
+	<color name="cpp_main_bg">#101010</color>
 	<color name="cpp_wizard_primary">#FAFAFA</color>
+	<color name="cpp_wizard_secondary">#9E9E9E</color>
 	<color name="cpp_wizard_bg">#212121</color>
 	<color name="cpp_wizard_overscroll">#FAFAFA</color>
 	<color name="cpp_wizard_button_normal">#424242</color>
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index 35affbcd..6df57acd 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -26,7 +26,11 @@
 	<style name="Theme.Dialog" parent="Theme.Base.Dialog"></style>
 
 	<style name="Theme.Base" parent="@style/Theme.AppCompat"></style>
-	<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog"></style>
+	<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
+		<item name="android:windowNoTitle">false</item>
+		<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
+		<item name="windowActionBar">false</item>
+	</style>
 
 	<style name="Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
 		<item name="android:windowNoTitle">true</item>
@@ -37,11 +41,15 @@
 		<item name="android:windowBackground">@color/cpp_wizard_bg</item>
 	</style>
 
-	<style name="Theme.Settings" parent="@style/cpp_metro_blue_theme">
+	<style name="Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowActionBar">false</item>
-
 		<item name="toolbarStyle">@style/Widget.Toolbar</item>
+		<item name="android:windowBackground">@color/cpp_main_bg</item>
+		<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
+		<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
+	</style>
+	<style name="Theme.Settings" parent="Theme.Settings.Base">
 	</style>
 
 	<style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
diff --git a/android-app/src/main/res/values/theme_gray.xml b/android-app/src/main/res/values/theme_gray.xml
index 4b7fe788..fcd3c830 100644
--- a/android-app/src/main/res/values/theme_gray.xml
+++ b/android-app/src/main/res/values/theme_gray.xml
@@ -28,8 +28,7 @@
 
 	<style name="cpp_dialog">
 		<item name="android:padding">6dp</item>
-		<item name="android:minWidth">200dp</item>
-		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:orientation">vertical</item>
 		<item name="android:layout_gravity">center_horizontal</item>