diff --git a/app/Android.bp b/app/Android.bp
index d15269d20744976374e271222cbe9f0b0542a80a..6d42204348ee6dd2e361c4772513fe42cff1c50d 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -24,6 +24,7 @@ android_app {
         "androidx.core_core-ktx",
         "Recorder_com.google.android.material_material",
         "androidx-constraintlayout_constraintlayout",
+        "elib",
     ],
 
     sdk_version: "34",
diff --git a/app/src/main/java/org/lineageos/recorder/DialogActivity.kt b/app/src/main/java/org/lineageos/recorder/DialogActivity.kt
index 89698c27ef95f100c38558a7bbd855ef0a489698..a8aef74e5f94bfd4c9bf2df6ee07c9530d585e87 100644
--- a/app/src/main/java/org/lineageos/recorder/DialogActivity.kt
+++ b/app/src/main/java/org/lineageos/recorder/DialogActivity.kt
@@ -10,6 +10,7 @@ import android.os.Build
 import android.os.Bundle
 import android.widget.CompoundButton
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SwitchCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.materialswitch.MaterialSwitch
 import org.lineageos.recorder.utils.PermissionManager
@@ -17,8 +18,8 @@ import org.lineageos.recorder.utils.PreferencesManager
 
 class DialogActivity : AppCompatActivity() {
     // Views
-    private lateinit var highQualitySwitch: MaterialSwitch
-    private lateinit var locationSwitch: MaterialSwitch
+    private lateinit var highQualitySwitch: SwitchCompat
+    private lateinit var locationSwitch: SwitchCompat
 
     private val permissionManager: PermissionManager by lazy { PermissionManager(this) }
 
@@ -77,7 +78,7 @@ class DialogActivity : AppCompatActivity() {
     }
 
     private fun setupLocationSwitch(
-        locationSwitch: MaterialSwitch,
+        locationSwitch: SwitchCompat,
         isRecording: Boolean
     ) {
         val tagWithLocation = if (preferences.tagWithLocation) {
@@ -110,7 +111,7 @@ class DialogActivity : AppCompatActivity() {
     }
 
     private fun setupHighQualitySwitch(
-        highQualitySwitch: MaterialSwitch,
+        highQualitySwitch: SwitchCompat,
         isRecording: Boolean
     ) {
         val highQuality = preferences.recordInHighQuality
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 903c135f1a3e10bd554a1170a4a7679c79f85a40..e0b6aac20355431d80bdfdf21e2361355641c824 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -18,7 +18,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/e_action_bar" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <ProgressBar
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1604b52139bbf33d381a743f9f49b64d9212a1b8..c71a1aae08ec805b59f0710d0c222ee5adb8d579 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -43,11 +43,11 @@
         android:clipToPadding="false"
         android:contentDescription="@string/main_sound_action"
         android:src="@drawable/ic_mic"
-        app:backgroundTint="?attr/colorSurface"
+        app:backgroundTint="@color/e_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="@color/e_background" />
 
     <org.lineageos.recorder.ui.WaveFormView
         android:id="@+id/recordingWaveFormView"
diff --git a/app/src/main/res/layout/dialog_content_settings.xml b/app/src/main/res/layout/dialog_content_settings.xml
index a6e9a7b4ad28ff9c39a0b581e8ee4445b09c7cbf..0bf45052f6588acc06b3eb10c5c160c9034d02fc 100644
--- a/app/src/main/res/layout/dialog_content_settings.xml
+++ b/app/src/main/res/layout/dialog_content_settings.xml
@@ -9,13 +9,13 @@
     android:padding="?dialogPreferredPadding"
     android:orientation="vertical">
 
-    <com.google.android.material.materialswitch.MaterialSwitch
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/locationSwitch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/settings_location_message" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/highQualitySwitch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff30cc6e89d15b425eb6ed2496ed322e4adc6e4f..44f5fc9374d0b3e3b1a9d7bbe1055871ade0a26a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,12 +5,21 @@
 -->
 <resources>
     <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
+        <item name="android:statusBarColor">@color/e_action_bar</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+        <item name="android:itemBackground">@color/e_floating_background</item>
+        <item name="popupMenuBackground">@color/e_floating_background</item>
+        <item name="android:windowBackground">@color/e_background</item>
+        <item name="actionModeStyle">@style/action_mode_style</item>
+    </style>
+
+    <style name="action_mode_style" parent="@style/Widget.Material3.ActionMode">
+        <item name="background">@color/e_action_bar</item>
     </style>
 
     <style name="AppTheme.DialogActivity">
@@ -45,10 +54,22 @@
         <item name="android:dropDownVerticalOffset">0dp</item>
         <item name="android:dropDownHorizontalOffset">0dp</item>
     </style>
-
     <!-- Action menu item style -->
     <style name="AppTheme.MenuItem">
         <item name="android:iconTint">?attr/colorOnSurface</item>
         <item name="iconTint">?attr/colorOnSurface</item>
     </style>
+
+    <style name="Switch" parent="Widget.AppCompat.CompoundButton.Switch">
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
+        <item name="track">@drawable/e_switch_track</item>
+    </style>
+    
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+    <item name="colorSurface">@color/e_floating_background</item>
+    <item name="colorPrimary">@color/e_accent</item>
+    <item name="colorSecondary">@color/e_accent</item>
+    <item name="elevationOverlayEnabled">false</item>
+    <item name="switchStyle">@style/Switch</item>
+    </style>
 </resources>