diff --git a/app/src/main/java/org/mosad/teapod/MainActivity.kt b/app/src/main/java/org/mosad/teapod/MainActivity.kt
index 2447e63..2b7a72f 100644
--- a/app/src/main/java/org/mosad/teapod/MainActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/MainActivity.kt
@@ -30,8 +30,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.mosad.teapod.databinding.ActivityMainBinding
 import org.mosad.teapod.parser.AoDParser
 import org.mosad.teapod.player.PlayerActivity
@@ -41,7 +39,6 @@ import org.mosad.teapod.ui.components.LoginDialog
 import org.mosad.teapod.ui.fragments.*
 import org.mosad.teapod.util.DataTypes
 import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.TMDBApiController
 import kotlin.system.measureTimeMillis
 
 class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
@@ -156,25 +153,15 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
     }
 
     /**
-     * Show the media fragment for the selected media.
-     * The media fragment is not stored in activeBaseFragment,
-     * as it doesn't replace a fragment but is added on top of one.
+     * Show a fragment on top of the current fragment.
+     * The current fragment is replaced and the new one is added
+     * to the back stack.
      */
-    fun showMediaFragment(mediaId: Int) = GlobalScope.launch {
-        val mediaFragment = MediaFragment(mediaId)
+    fun showFragment(fragment: Fragment) {
         supportFragmentManager.commit {
-            add(R.id.nav_host_fragment, mediaFragment, "MediaFragment")
-            addToBackStack(null)
-            show(mediaFragment)
-        }
-    }
-
-    fun showAboutFragment() {
-        val aboutFragment = AboutFragment()
-        supportFragmentManager.commit {
-            replace(R.id.nav_host_fragment, aboutFragment, "AboutFragment")
-            addToBackStack(aboutFragment.javaClass.name)
-            show(aboutFragment)
+            replace(R.id.nav_host_fragment, fragment, fragment.javaClass.simpleName)
+            addToBackStack(fragment.javaClass.name)
+            show(fragment)
         }
     }
 
diff --git a/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
index 3329e08..b87a753 100644
--- a/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
@@ -53,7 +53,7 @@ class AccountFragment : Fragment() {
         }
 
         binding.linearInfo.setOnClickListener {
-            (activity as MainActivity).showAboutFragment()
+            (activity as MainActivity).showFragment(AboutFragment())
         }
 
         binding.switchSecondary.setOnClickListener {
diff --git a/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
index bce2444..c9e8088 100644
--- a/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
@@ -57,7 +57,7 @@ class HomeFragment : Fragment() {
 
         adapterMyList = MediaItemAdapter(myListMedia)
         adapterMyList.onItemClick = { mediaId, _ ->
-            (activity as MainActivity).showMediaFragment(mediaId)
+            (activity as MainActivity).showFragment(MediaFragment(mediaId))
         }
 
         binding.recyclerMyList.adapter = adapterMyList
@@ -65,7 +65,7 @@ class HomeFragment : Fragment() {
 
     private fun initActions() {
         adapterNewEpisodes.onItemClick = { mediaId, _ ->
-            (activity as MainActivity).showMediaFragment(mediaId)
+            (activity as MainActivity).showFragment(MediaFragment(mediaId))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
index 53f413d..4429e6a 100644
--- a/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
@@ -35,7 +35,7 @@ class LibraryFragment : Fragment() {
                 context?.let {
                     adapter = MediaItemAdapter(AoDParser.itemMediaList)
                     adapter.onItemClick = { mediaId, _ ->
-                        (activity as MainActivity).showMediaFragment(mediaId)
+                        (activity as MainActivity).showFragment(MediaFragment(mediaId))
                     }
 
                     binding.recyclerMediaLibrary.adapter = adapter
diff --git a/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
index e590515..6810030 100644
--- a/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
@@ -33,7 +33,7 @@ class SearchFragment : Fragment() {
                     adapter = MediaItemAdapter(AoDParser.itemMediaList)
                     adapter!!.onItemClick = { mediaId, _ ->
                         binding.searchText.clearFocus()
-                        (activity as MainActivity).showMediaFragment(mediaId)
+                        (activity as MainActivity).showFragment(MediaFragment(mediaId))
                     }
 
                     binding.recyclerMediaSearch.adapter = adapter
diff --git a/app/src/main/res/color/bottom_nav_item_tint.xml b/app/src/main/res/color/bottom_nav_item_tint.xml
index 5cba219..773daa6 100644
--- a/app/src/main/res/color/bottom_nav_item_tint.xml
+++ b/app/src/main/res/color/bottom_nav_item_tint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-    <item android:color="?attr/iconAction"/>
+    <item android:color="?attr/iconColor"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml
index b28921d..188f893 100644
--- a/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_search_24.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/iconAction">
+    android:tint="?attr/iconColor">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/drawable/shape_rounded_corner.xml b/app/src/main/res/drawable/shape_rounded_corner.xml
index a9a25a1..13bb244 100644
--- a/app/src/main/res/drawable/shape_rounded_corner.xml
+++ b/app/src/main/res/drawable/shape_rounded_corner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?iconNoAction"/>
+    <solid android:color="?textBackground"/>
     <corners android:radius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 8511fd6..5302dc9 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -23,6 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="12dp"
+                android:contentDescription="@string/app_name"
                 android:src="@mipmap/ic_launcher_round" />
 
             <TextView
@@ -62,21 +63,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="7dp"
-                android:layout_marginTop="5dp"
+                android:layout_marginTop="7dp"
                 android:layout_marginEnd="7dp"
                 android:text="@string/tmdb_notice"
                 android:textAlignment="center"
                 android:textColor="?textSecondary" />
 
             <TextView
-                android:id="@+id/textView2"
+                android:id="@+id/text_teapod_repo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="7dp"
                 android:layout_marginTop="12dp"
                 android:layout_marginEnd="7dp"
                 android:autoLink="web"
-                android:text="git.mosad.xyz/Seil0/teapod"
+                android:text="@string/teapod_repo"
                 android:textAlignment="center" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 482a454..56994bb 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -14,14 +14,17 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingBottom="12dp">
 
             <LinearLayout
                 android:id="@+id/linear_account"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:background="?themeSecondary"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -53,7 +56,7 @@
                         android:padding="9dp"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_baseline_account_box_24"
-                        app:tint="?iconNoAction" />
+                        app:tint="?iconColor" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -83,9 +86,10 @@
             <LinearLayout
                 android:id="@+id/linear_settings"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:background="?themeSecondary"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -116,7 +120,7 @@
                         android:padding="9dp"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_baseline_subtitles_24"
-                        app:tint="?iconNoAction" />
+                        app:tint="?iconColor" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -180,7 +184,7 @@
                         android:minHeight="48dp"
                         android:padding="9dp"
                         android:src="@drawable/ic_baseline_autorenew_24"
-                        app:tint="?iconNoAction" />
+                        app:tint="?iconColor" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -242,7 +246,7 @@
                         android:padding="9dp"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_baseline_style_24"
-                        app:tint="?iconNoAction" />
+                        app:tint="?iconColor" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -273,9 +277,11 @@
             <LinearLayout
                 android:id="@+id/linear_info"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:background="?themeSecondary"
+                android:clipToPadding="false"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -307,7 +313,7 @@
                         android:padding="9dp"
                         android:scaleType="fitXY"
                         app:srcCompat="@drawable/ic_baseline_info_24"
-                        app:tint="?iconNoAction" />
+                        app:tint="?iconColor" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_episode.xml b/app/src/main/res/layout/item_episode.xml
index f0727d5..3120f07 100644
--- a/app/src/main/res/layout/item_episode.xml
+++ b/app/src/main/res/layout/item_episode.xml
@@ -54,7 +54,7 @@
             android:layout_margin="2dp"
             android:contentDescription="@string/component_watched_desc"
             app:srcCompat="@drawable/ic_baseline_check_circle_24"
-            app:tint="?iconNoAction" />
+            app:tint="?iconColor" />
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c0add77..567bf9f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,7 +4,7 @@
     <attr format="color" name="themeSecondary"/>
     <attr format="color" name="textPrimary"/>
     <attr format="color" name="textSecondary"/>
-    <attr format="color" name="iconAction"/>
-    <attr format="color" name="iconNoAction"/>
+    <attr format="color" name="textBackground"/>
+    <attr format="color" name="iconColor"/>
     <attr format="color" name="buttonBackground"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8d85347..a81619d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,22 +7,23 @@
     <color name="colorAccent">#607d8b</color>
 
     <!-- light theme colors -->
-    <color name="themePrimaryLight">#f7f7f7</color>
+    <color name="themePrimaryLight">#ffffff</color>
     <color name="themeSecondaryLight">#ffffff</color>
     <color name="textPrimaryLight">#de000000</color>
     <color name="textSecondaryLight">#99000000</color>
-    <color name="iconActionLight">#99000000</color>
-    <color name="iconNoActionLight">#66000000</color>
+    <color name="textBackgroundLight">#55000000</color>
+    <color name="iconColorLight">#99000000</color>
     <color name="buttonBackgroundLight">#000000</color>
 
     <!-- dark theme colors -->
-    <color name="themePrimaryDark">#000000</color>
+    <color name="themePrimaryDark">#121212</color>
     <color name="themeSecondaryDark">#202020</color>
     <color name="textPrimaryDark">#deffffff</color>
     <color name="textSecondaryDark">#99ffffff</color>
-    <color name="iconActionDark">#99ffffff</color>
-    <color name="iconNoActionDark">#66ffffff</color>
+    <color name="textBackgroundDark">#55ffffff</color>
+    <color name="iconColorDark">#99ffffff</color>
     <color name="buttonBackgroundDark">#ffffff</color>
+    <color name="controlHighlightDark">#11ffffff</color>
 
     <color name="ic_launcher_background">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 566b332..a11fb4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
     <string name="theme_dark">Dark</string>
 
     <!-- about fragment -->
+    <string name="teapod_repo" translatable="false">git.mosad.xyz/Seil0/teapod</string>
     <string name="tmdb_notice" translatable="false">This product uses the TMDb API but is not endorsed or certified by TMDb.</string>
     <string name="third_party_heading">Third Party Licenses</string>
     <string name="third_party_component_desc">© %1$s %2$s under %3$s</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a62cfe9..afed577 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,8 +14,8 @@
         <item name="android:textColor">@color/textPrimaryLight</item>
         <item name="android:textColorPrimary">@color/textPrimaryLight</item>
         <item name="android:textColorHint">@color/textSecondaryLight</item>
-        <item name="iconAction">@color/iconActionLight</item>
-        <item name="iconNoAction">@color/iconNoActionLight</item>
+        <item name="textBackground">@color/textBackgroundLight</item>
+        <item name="iconColor">@color/iconColorLight</item>
         <item name="buttonBackground">@color/buttonBackgroundLight</item>
         <item name="md_background_color">@color/themeSecondaryLight</item>
         <item name="md_color_content">@color/textSecondaryLight</item>
@@ -29,15 +29,16 @@
         <item name="android:textColor">@color/textPrimaryDark</item>
         <item name="android:textColorPrimary">@color/textPrimaryDark</item>
         <item name="android:textColorHint">@color/textSecondaryDark</item>
-        <item name="iconAction">@color/iconActionDark</item>
-        <item name="iconNoAction">@color/iconNoActionDark</item>
+        <item name="textBackground">@color/textBackgroundDark</item>
+        <item name="iconColor">@color/iconColorDark</item>
         <item name="buttonBackground">@color/buttonBackgroundDark</item>
         <item name="md_background_color">@color/themeSecondaryDark</item>
         <item name="md_color_content">@color/textSecondaryDark</item>
 
         <!-- without this, the unchecked single choice buttons while be black -->
         <item name="md_color_widget_unchecked">@color/textSecondaryDark</item>
-        <item name="colorControlHighlight">#22ffffff</item>
+        <!-- change on click indicator color for manually set components -->
+        <item name="colorControlHighlight">@color/controlHighlightDark</item>
     </style>
 
     <style name="LicensesDialogTheme.Dark" parent="Theme.AppCompat.Dialog">