diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 240aa51a..1bf78272 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
         tools:targetApi="q">
         <activity
             android:name=".MainActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+            android:theme="@style/AppTheme.Main"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTask">
             <intent-filter>
diff --git a/app/src/main/res/layout/account_spinner.xml b/app/src/main/res/layout/account_spinner.xml
index 6f234a7c..0e7efd93 100644
--- a/app/src/main/res/layout/account_spinner.xml
+++ b/app/src/main/res/layout/account_spinner.xml
@@ -9,18 +9,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:ignore="UselessParent"
-        android:padding="5sp" >
+        android:padding="11dp" >
 
         <ImageView
             android:id="@+id/spinnerImage"
+            android:layout_marginStart="5dp"
             android:contentDescription="@string/status" />
 
         <TextView
             android:id="@+id/spinnerText"
-            android:textSize="18sp"
-            android:textColor="@color/colorSecondaryDark"
-            android:paddingStart="8sp"
-            android:paddingEnd="0sp" />
+            android:textColor="@color/colorSpinnerText"
+            android:paddingStart="8dp"
+            android:paddingEnd="0dp" />
 
     </TableRow>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ea585323..b1978e01 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="@color/colorPrimary"
         android:elevation="4dp"
-        android:theme="@style/MainActionBar" >
+        android:theme="@style/ActionBar.Main" >
     </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
@@ -40,9 +40,11 @@
                 <Spinner
                     android:id="@+id/aorSpinner"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:drawable/btn_dropdown"
-                    android:spinnerMode="dropdown" />
+                    android:layout_height="48dp"
+                    android:background="@drawable/spinner_bg"
+                    android:popupBackground="@color/colorSpinnerDropdown"
+                    android:gravity="center_vertical"
+                    android:spinnerMode="dropdown"/>
 
                 <TextView
                     android:id="@+id/callTitle"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6a44c9fa..d8f56222 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,4 +13,8 @@
     <color name="colorWhite">#ffffff</color>
     <color name="colorGreen">#01df01</color>
     <color name="colorRed">#df0101</color>
+    <color name="colorDark">#383838</color>
+    <color name="colorSpinnerText">@color/colorDark</color>
+    <color name="colorSpinnerDropdown">@color/colorGrayLight</color>
+    <color name="colorSpinnerDivider">@color/colorGray</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 51a5f404..7863ad56 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,9 +9,14 @@
         <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
     </style>
 
-    <style name="Spinner" parent="ThemeOverlay.AppCompat.DayNight">
+    <style name="AppTheme.Main" parent="AppTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Spinner" parent="Widget.AppCompat.ListView.DropDown">
         <item name="android:dividerHeight">1dp</item>
-        <item name="android:divider">@color/colorGray</item>
+        <item name="android:divider">@color/colorSpinnerDivider</item>
     </style>
 
     <style name="AlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
@@ -23,16 +28,11 @@
         <item name="android:popupBackground">@color/colorPrimaryDark</item>
     </style>
 
-    <style name="MainActionBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+    <style name="ActionBar.Main" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
         <item name="android:textColorPrimary">@color/colorWhite</item>
         <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />