diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
index 9861d15f..e66a7197 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
@@ -20,6 +20,7 @@ import com.cappielloantonio.play.service.DownloaderService;
 import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.util.DownloadUtil;
 import com.google.android.gms.cast.framework.CastContext;
+import com.google.android.material.elevation.SurfaceColors;
 import com.google.common.util.concurrent.ListenableFuture;
 
 public class BaseActivity extends AppCompatActivity {
@@ -38,6 +39,7 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onStart() {
         super.onStart();
+        initializeBarColors();
         initializeBrowser();
     }
 
@@ -108,4 +110,9 @@ public class BaseActivity extends AppCompatActivity {
     private void initializeCastContext() {
         CastContext.getSharedInstance(this);
     }
+
+    private void initializeBarColors() {
+        getWindow().setStatusBarColor(SurfaceColors.getColorForElevation(this, 10));
+        getWindow().setNavigationBarColor(SurfaceColors.getColorForElevation(this, 10));
+    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 1cef05bb..59b8281d 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -27,6 +27,7 @@ import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerVerticalPager;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
+import com.google.android.material.elevation.SurfaceColors;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 
@@ -53,6 +54,7 @@ public class PlayerBottomSheetFragment extends Fragment {
 
         playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
 
+        customizeBottomSheetBackground();
         initViewPager();
 
         return view;
@@ -78,6 +80,10 @@ public class PlayerBottomSheetFragment extends Fragment {
         bind = null;
     }
 
+    private void customizeBottomSheetBackground() {
+        bind.playerHeaderLayout.getRoot().setBackgroundColor(SurfaceColors.getColorForElevation(requireContext(), 10));
+    }
+
     private void initViewPager() {
         bind.playerBodyLayout.playerBodyBottomSheetViewPager.setOrientation(ViewPager2.ORIENTATION_VERTICAL);
         bind.playerBodyLayout.playerBodyBottomSheetViewPager.setAdapter(new PlayerControllerVerticalPager(this));
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
index 50e53b7a..5ab03d29 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
@@ -26,6 +26,7 @@ import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.SearchViewModel;
+import com.google.android.material.elevation.SurfaceColors;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.paulrybitskyi.persistentsearchview.adapters.model.SuggestionItem;
 import com.paulrybitskyi.persistentsearchview.listeners.OnSuggestionChangeListener;
@@ -115,6 +116,8 @@ public class SearchFragment extends Fragment {
     }
 
     private void initSearchView() {
+        bind.persistentSearchView.setCardBackgroundColor(SurfaceColors.getColorForElevation(requireContext(), 2));
+
         if (isQueryValid(searchViewModel.getQuery())) {
             search(searchViewModel.getQuery());
         }
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 939dae31..25eed1f6 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -12,9 +12,7 @@
         android:paddingTop="8dp"
         android:paddingEnd="8dp"
         app:areSuggestionsDisabled="false"
-        app:cardBackgroundColor="@color/cardColor"
         app:cardCornerRadius="4dp"
-        app:cardElevation="2dp"
         app:clearInputButtonDrawable="@drawable/ic_close"
         app:dividerColor="@color/dividerColor"
         app:isClearInputButtonEnabled="true"
@@ -24,11 +22,11 @@
         app:leftButtonDrawable="@drawable/ic_search"
         app:queryInputHint="@string/search_hint"
         app:shouldDimBehind="true"
-        app:suggestionIconColor="@color/suggestionIconColor"
-        app:suggestionRecentSearchIconColor="@color/suggestionIconColor"
-        app:suggestionSearchSuggestionIconColor="@color/suggestionIconColor"
-        app:suggestionSelectedTextColor="@color/suggestionSelectedTextColor"
-        app:suggestionTextColor="@color/suggestionTextColor" />
+        app:suggestionIconColor="?attr/colorOnSurface"
+        app:suggestionRecentSearchIconColor="?attr/colorOnSurface"
+        app:suggestionSearchSuggestionIconColor="?attr/colorOnSurface"
+        app:suggestionSelectedTextColor="?attr/colorOnSurface"
+        app:suggestionTextColor="?attr/colorOnSurface" />
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/search_result_nested_scroll_view"
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index 9125fa84..213a45b1 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -80,6 +80,7 @@
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
         android:thumb="@android:color/transparent"
+        android:background="?attr/colorSurface"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />