diff --git a/app/src/main/java/de/tum/in/tumcampusapp/App.kt b/app/src/main/java/de/tum/in/tumcampusapp/App.kt
index 02082ce530..7a0e9fba69 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/App.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/App.kt
@@ -1,11 +1,14 @@
 package de.tum.`in`.tumcampusapp
 
 import android.app.Application
+import android.content.res.Resources
 import android.os.StrictMode
+import androidx.appcompat.app.AppCompatDelegate
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.squareup.picasso.OkHttp3Downloader
 import com.squareup.picasso.Picasso
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationUtils.setupNotificationChannels
+import de.tum.`in`.tumcampusapp.component.other.settings.ThemeProvider
 import de.tum.`in`.tumcampusapp.di.AppComponent
 import de.tum.`in`.tumcampusapp.di.DaggerAppComponent
 import io.reactivex.plugins.RxJavaPlugins
@@ -24,6 +27,7 @@ open class App : Application() {
         JodaTimeAndroid.init(this)
         initRxJavaErrorHandler()
         setupStrictMode()
+        loadTheme()
     }
 
     private fun buildAppComponent() {
@@ -68,4 +72,9 @@ open class App : Application() {
     private fun initRxJavaErrorHandler() {
         RxJavaPlugins.setErrorHandler(FirebaseCrashlytics.getInstance()::recordException)
     }
+
+    private fun loadTheme() {
+        val theme = ThemeProvider(this).getThemeFromPreferences()
+        AppCompatDelegate.setDefaultNightMode(theme)
+    }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt
index 313ff80043..399308c36d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt
@@ -144,7 +144,7 @@ class DrawerMenuHelper(
 
         private val ABOUT = arrayOf(
                 NavItem.ActivityDestination(R.string.show_feedback, R.drawable.ic_outline_feedback_24px, FeedbackActivity::class.java),
-                NavItem.ActivityDestination(R.string.about_tca, R.drawable.ic_action_info_black, InformationActivity::class.java),
+                NavItem.ActivityDestination(R.string.about_tca, R.drawable.ic_action_info, InformationActivity::class.java),
                 NavItem.ActivityDestination(R.string.settings, R.drawable.ic_outline_settings_24px, SettingsActivity::class.java)
         )
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt
index 2e3a209325..ee4c821418 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt
@@ -10,6 +10,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.core.content.edit
 import androidx.core.os.bundleOf
@@ -40,6 +41,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_setup_eduroam.*
+import org.jetbrains.anko.appcompat.v7.Appcompat
 import org.jetbrains.anko.defaultSharedPreferences
 import org.jetbrains.anko.notificationManager
 import java.util.concurrent.ExecutionException
@@ -48,6 +50,8 @@ import javax.inject.Inject
 class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener,
         SharedPreferences.OnSharedPreferenceChangeListener {
 
+    private val themeProvider by lazy { ThemeProvider(requireContext()) }
+
     private val compositeDisposable = CompositeDisposable()
 
     @Inject
@@ -85,6 +89,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
             // (since it is not possible to add a button to the preferences screen)
             findPreference(BUTTON_LOGOUT).onPreferenceClickListener = this
             setSummary("language_preference")
+            setSummary(Const.DESIGN_THEME)
             setSummary("card_default_campus")
             setSummary("silent_mode_set_to")
             setSummary("background_mode_set_to")
@@ -193,6 +198,12 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
             }
         }
 
+        // Change design theme
+        if (key == Const.DESIGN_THEME) {
+            val theme = themeProvider.getTheme(sharedPrefs.getString(key, "system")!!)
+            AppCompatDelegate.setDefaultNightMode(theme)
+        }
+
         // If the background mode was activated, start the service. This will invoke
         // the service to call onHandleIntent which updates all background data
         if (key == Const.BACKGROUND_MODE) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/ThemeProvider.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/ThemeProvider.kt
new file mode 100644
index 0000000000..37af538190
--- /dev/null
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/ThemeProvider.kt
@@ -0,0 +1,27 @@
+package de.tum.`in`.tumcampusapp.component.other.settings
+
+import android.app.UiModeManager
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.PreferenceManager
+import de.tum.`in`.tumcampusapp.utils.Const
+import java.security.InvalidParameterException
+
+class ThemeProvider(private val context: Context) {
+
+    fun getThemeFromPreferences(): Int {
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val selectedTheme = sharedPreferences.getString(Const.DESIGN_THEME, "system")
+
+        return selectedTheme?.let {
+            getTheme(it)
+        } ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+    }
+
+    fun getTheme(selectedTheme: String): Int = when (selectedTheme) {
+        "system" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        "light" -> UiModeManager.MODE_NIGHT_NO
+        "dark" -> UiModeManager.MODE_NIGHT_YES
+        else -> throw InvalidParameterException("Theme not defined for $selectedTheme")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index ae9d13f351..52e7514309 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -3,6 +3,7 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.LayoutTransition
+import android.graphics.Color
 import android.graphics.drawable.Animatable
 import android.os.Bundle
 import android.util.ArrayMap
@@ -14,6 +15,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
+import com.github.mikephil.charting.charts.Chart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -131,6 +133,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             })
             legend.setCustom(legend.entries)
             setTouchEnabled(false)
+
+            setHoleColor(Color.TRANSPARENT)
+            legend.textColor = resources.getColor(R.color.text_primary) // TODO exchange deprecated function
+
             invalidate()
         }
     }
@@ -148,6 +154,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         val set = BarDataSet(entries, getString(R.string.grades_without_weight)).apply {
             setColors(GRADE_COLORS, requireContext())
+            valueTextColor = resources.getColor(R.color.text_primary)
         }
 
         barChartView.apply {
@@ -184,6 +191,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     )
             )
 
+            // TODO exchange deprecated function
+            legend.textColor = resources.getColor(R.color.text_primary)
+            xAxis.textColor = resources.getColor(R.color.text_primary)
+            axisLeft.textColor = resources.getColor(R.color.text_primary)
+            axisRight.textColor = resources.getColor(R.color.text_primary)
+
             invalidate()
         }
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/adapteritems/InformationContactItem.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/adapteritems/InformationContactItem.kt
index 44629f9621..d9d11b7b85 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/adapteritems/InformationContactItem.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/adapteritems/InformationContactItem.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import de.tum.`in`.tumcampusapp.R
 
-class InformationContactItem(text: String) : AbstractContactItem(R.string.additional_info, text, R.drawable.ic_action_info_black) {
+class InformationContactItem(text: String) : AbstractContactItem(R.string.additional_info, text, R.drawable.ic_action_info) {
 
     override fun getIntent(context: Context): Intent? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
index ee2266a97f..343cd479d5 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
@@ -65,7 +65,7 @@ class TuitionFeesFragment : FragmentForAccessingTumOnline<TuitionList>(
             if (nextWeek.isAfter(deadline)) {
                 amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.error))
             } else {
-                amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
+                amountTextView.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_primary))
             }
         }
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
index a509807669..cf5dacda51 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
@@ -31,6 +31,7 @@ import de.tum.`in`.tumcampusapp.utils.Utils
 import de.tum.`in`.tumcampusapp.utils.observeNonNull
 import kotlinx.android.synthetic.main.fragment_cafeteria.pager
 import kotlinx.android.synthetic.main.fragment_cafeteria.spinnerToolbar
+import kotlinx.android.synthetic.main.layout_error.*
 import org.joda.time.DateTime
 import javax.inject.Inject
 import javax.inject.Provider
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
index 2809a21f2d..c50c9442a7 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
@@ -173,7 +173,7 @@ private void updateSendingStatus(Context context, ChatMessage message) {
             statusImageView.setVisibility(inProgress ? View.GONE : View.VISIBLE);
             sendingProgressBar.setVisibility(inProgress ? View.VISIBLE : View.GONE);
 
-            int darkTextColor = ContextCompat.getColor(context, R.color.text_dark_secondary);
+            int darkTextColor = ContextCompat.getColor(context, R.color.text_secondary);
 
             if (inProgress) {
                 timestampTextView.setTextColor(darkTextColor);
@@ -198,7 +198,7 @@ private void updateSendingStatus(Context context, ChatMessage message) {
                 timestampTextView.setText(R.string.chat_message_send_error);
                 timestampTextView.setTextColor(iconTint);
             } else {
-                int textColor = ContextCompat.getColor(context, R.color.text_dark_secondary);
+                int textColor = ContextCompat.getColor(context, R.color.text_secondary);
                 timestampTextView.setTextColor(textColor);
                 timestampTextView.setText(message.getFormattedTimestamp(context));
             }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomAdapter.kt
index 9c68ff2f2a..25671bab22 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomAdapter.kt
@@ -19,7 +19,7 @@ class StudyRoomAdapter(private val fragment: Fragment, private val studyRooms: L
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StudyRoomViewHolder {
         val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.card_header_details_button, parent, false)
+                .inflate(R.layout.card_studyroom_detail, parent, false)
         return StudyRoomViewHolder(view)
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/DepartureView.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/DepartureView.kt
index c7c6bb8cd9..74a88f9824 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/DepartureView.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/DepartureView.kt
@@ -13,6 +13,7 @@ import android.view.animation.AnimationUtils
 import android.widget.LinearLayout
 import android.widget.TextSwitcher
 import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
@@ -72,19 +73,19 @@ class DepartureView
                 setBackgroundColor(mvvSymbol.getHighlight())
             } else {
                 setBackgroundColor(mvvSymbol.backgroundColor)
-                lineView.setTextColor(Color.WHITE)
+                lineView.setTextColor(ResourcesCompat.getColor(resources, R.color.text_primary_dark, null))
                 for (index in 0 until timeSwitcher.childCount) {
                     val tw = timeSwitcher.getChildAt(index) as TextView
-                    tw.setTextColor(Color.WHITE)
+                    tw.setTextColor(ResourcesCompat.getColor(resources, R.color.text_secondary_dark, null))
                 }
             }
         } else {
-            setBackgroundColor(mvvSymbol.textColor)
-            lineView.setTextColor(Color.BLACK)
+            setBackgroundColor(ResourcesCompat.getColor(resources, R.color.default_window_background, null))
+            lineView.setTextColor(ResourcesCompat.getColor(resources, R.color.text_primary, null))
 
             for (index in 0 until timeSwitcher.childCount) {
                 val tw = timeSwitcher.getChildAt(index) as TextView
-                tw.setTextColor(Color.GRAY)
+                tw.setTextColor(ResourcesCompat.getColor(resources, R.color.text_secondary, null))
             }
         }
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/utils/Const.kt b/app/src/main/java/de/tum/in/tumcampusapp/utils/Const.kt
index 279049aff9..0487aedc53 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/utils/Const.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/utils/Const.kt
@@ -171,4 +171,6 @@ object Const {
     const val NO_CAFETERIA_FOUND = -1
 
     const val SETTINGS_RESTART = "settingsRestart"
+
+    const val DESIGN_THEME = "design_theme_preference"
 }
diff --git a/app/src/main/res/color/navigation_drawer_item_background_selector.xml b/app/src/main/res/color/navigation_drawer_item_background_selector.xml
index 9df0af875d..3cb85341d3 100644
--- a/app/src/main/res/color/navigation_drawer_item_background_selector.xml
+++ b/app/src/main/res/color/navigation_drawer_item_background_selector.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="@color/tum_500_alpha_15" android:state_checked="true" />
+    <item android:color="@color/navigation_drawer_item_background_selected" android:state_checked="true" />
     <item android:color="@color/navigation_drawer_item_background" />
 </selector>
diff --git a/app/src/main/res/color/navigation_drawer_item_text_selector.xml b/app/src/main/res/color/navigation_drawer_item_text_selector.xml
index 48b4020d34..2e1b11375b 100644
--- a/app/src/main/res/color/navigation_drawer_item_text_selector.xml
+++ b/app/src/main/res/color/navigation_drawer_item_text_selector.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="@color/tum_blue" android:state_checked="true" />
+    <item android:color="@color/navigation_drawer_item_text_selected" android:state_checked="true" />
     <item android:color="@color/navigation_drawer_item_text" />
 </selector>
diff --git a/app/src/main/res/drawable-mdpi/ic_facebook_white.xml b/app/src/main/res/drawable-mdpi/ic_facebook.xml
similarity index 90%
rename from app/src/main/res/drawable-mdpi/ic_facebook_white.xml
rename to app/src/main/res/drawable-mdpi/ic_facebook.xml
index 3b8fb82fae..b21a622859 100644
--- a/app/src/main/res/drawable-mdpi/ic_facebook_white.xml
+++ b/app/src/main/res/drawable-mdpi/ic_facebook.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="266.895"
         android:viewportWidth="266.893">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M182.41,262.31v-99.8h33.5l5.02,-38.9h-38.51V98.78c0,-11.26 3.13,-18.93 19.27,-18.93l20.6,-0.01V45.04c-3.56,-0.47 -15.79,-1.53 -30.01,-1.53c-29.69,0 -50.03,18.13 -50.03,51.41v28.68h-33.58v38.9h33.58v99.8H182.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable-mdpi/ic_github_white.xml b/app/src/main/res/drawable-mdpi/ic_github.xml
similarity index 89%
rename from app/src/main/res/drawable-mdpi/ic_github_white.xml
rename to app/src/main/res/drawable-mdpi/ic_github.xml
index a84abf4fb5..7e2413bdb4 100644
--- a/app/src/main/res/drawable-mdpi/ic_github_white.xml
+++ b/app/src/main/res/drawable-mdpi/ic_github.xml
@@ -5,7 +5,6 @@
         android:viewportWidth="40.723747">
     <path
         android:fillAlpha="1"
-        android:fillColor="#FFFFFF"
-        android:pathData="m20.36,0c-11.24,0 -20.36,9.12 -20.36,20.36 0,9 5.83,16.63 13.93,19.32 1.02,0.19 1.39,-0.44 1.39,-0.98 0,-0.48 -0.02,-1.76 -0.03,-3.46 -5.66,1.23 -6.86,-2.73 -6.86,-2.73 -0.93,-2.35 -2.26,-2.98 -2.26,-2.98 -1.85,-1.26 0.14,-1.24 0.14,-1.24 2.04,0.14 3.12,2.1 3.12,2.1 1.82,3.11 4.77,2.21 5.93,1.69 0.19,-1.32 0.71,-2.21 1.29,-2.72 -4.52,-0.51 -9.27,-2.26 -9.27,-10.06 0,-2.22 0.79,-4.04 2.1,-5.46 -0.21,-0.51 -0.91,-2.59 0.2,-5.39 0,0 1.71,-0.55 5.6,2.09 1.62,-0.45 3.37,-0.68 5.1,-0.68 1.73,0.01 3.47,0.23 5.1,0.68 3.89,-2.63 5.59,-2.09 5.59,-2.09 1.11,2.8 0.41,4.87 0.2,5.39 1.31,1.42 2.09,3.24 2.09,5.46 0,7.82 -4.76,9.54 -9.3,10.05 0.73,0.63 1.38,1.87 1.38,3.77 0,2.72 -0.02,4.92 -0.02,5.59 0,0.54 0.37,1.18 1.4,0.98 8.09,-2.7 13.91,-10.33 13.91,-19.32C40.72,9.12 31.61,0 20.36,0"
-        android:strokeColor="#00000000"/>
+        android:fillColor="@color/text_primary"
+        android:pathData="m20.36,0c-11.24,0 -20.36,9.12 -20.36,20.36 0,9 5.83,16.63 13.93,19.32 1.02,0.19 1.39,-0.44 1.39,-0.98 0,-0.48 -0.02,-1.76 -0.03,-3.46 -5.66,1.23 -6.86,-2.73 -6.86,-2.73 -0.93,-2.35 -2.26,-2.98 -2.26,-2.98 -1.85,-1.26 0.14,-1.24 0.14,-1.24 2.04,0.14 3.12,2.1 3.12,2.1 1.82,3.11 4.77,2.21 5.93,1.69 0.19,-1.32 0.71,-2.21 1.29,-2.72 -4.52,-0.51 -9.27,-2.26 -9.27,-10.06 0,-2.22 0.79,-4.04 2.1,-5.46 -0.21,-0.51 -0.91,-2.59 0.2,-5.39 0,0 1.71,-0.55 5.6,2.09 1.62,-0.45 3.37,-0.68 5.1,-0.68 1.73,0.01 3.47,0.23 5.1,0.68 3.89,-2.63 5.59,-2.09 5.59,-2.09 1.11,2.8 0.41,4.87 0.2,5.39 1.31,1.42 2.09,3.24 2.09,5.46 0,7.82 -4.76,9.54 -9.3,10.05 0.73,0.63 1.38,1.87 1.38,3.77 0,2.72 -0.02,4.92 -0.02,5.59 0,0.54 0.37,1.18 1.4,0.98 8.09,-2.7 13.91,-10.33 13.91,-19.32C40.72,9.12 31.61,0 20.36,0" />
 </vector>
diff --git a/app/src/main/res/drawable/bottom_sheet_background.xml b/app/src/main/res/drawable/bottom_sheet_background.xml
index 259a0c4bc3..065b6744c5 100644
--- a/app/src/main/res/drawable/bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/bottom_sheet_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/default_window_background" />
     <corners
         android:topLeftRadius="@dimen/material_corner_radius"
         android:topRightRadius="@dimen/material_corner_radius" />
diff --git a/app/src/main/res/drawable/ic_action_cancel.xml b/app/src/main/res/drawable/ic_action_cancel.xml
index a3e56dbf19..3ff34812bb 100644
--- a/app/src/main/res/drawable/ic_action_cancel.xml
+++ b/app/src/main/res/drawable/ic_action_cancel.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_info_black.xml b/app/src/main/res/drawable/ic_action_info.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_action_info_black.xml
rename to app/src/main/res/drawable/ic_action_info.xml
index cf53e145cd..fded60afd3 100644
--- a/app/src/main/res/drawable/ic_action_info_black.xml
+++ b/app/src/main/res/drawable/ic_action_info.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_network_wifi.xml b/app/src/main/res/drawable/ic_action_network_wifi.xml
index 85aab90a53..e828845a69 100644
--- a/app/src/main/res/drawable/ic_action_network_wifi.xml
+++ b/app/src/main/res/drawable/ic_action_network_wifi.xml
@@ -5,9 +5,9 @@
         android:viewportWidth="24.0">
     <path
         android:fillAlpha=".3"
-        android:fillColor="#000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M3.53,10.95l8.46,10.54 0.01,0.01 0.01,-0.01 8.46,-10.54C20.04,10.62 16.81,8 12,8c-4.81,0 -8.04,2.62 -8.47,2.95z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_restore.xml b/app/src/main/res/drawable/ic_action_restore.xml
index 5f9b9fae2e..cc49868ec1 100644
--- a/app/src/main/res/drawable/ic_action_restore.xml
+++ b/app/src/main/res/drawable/ic_action_restore.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_secondary"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_search.xml b/app/src/main/res/drawable/ic_action_search.xml
index 75b26b6c21..6587009b18 100644
--- a/app/src/main/res/drawable/ic_action_search.xml
+++ b/app/src/main/res/drawable/ic_action_search.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_send_now.xml b/app/src/main/res/drawable/ic_action_send_now.xml
index a554657764..26d9588007 100644
--- a/app/src/main/res/drawable/ic_action_send_now.xml
+++ b/app/src/main/res/drawable/ic_action_send_now.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index b9b8eca8b9..5196c19ed1 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_anim_down.xml b/app/src/main/res/drawable/ic_arrow_anim_down.xml
index 814970b14f..cb49c9068c 100644
--- a/app/src/main/res/drawable/ic_arrow_anim_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_anim_down.xml
@@ -10,7 +10,7 @@
                 android:viewportHeight="24.0">
             <path
                 android:name="arrowPath"
-                android:fillColor="#FFFFFF"
+                android:fillColor="@color/text_primary"
                 android:pathData="@string/arrow_up_path"/>
         </vector>
     </aapt:attr>
diff --git a/app/src/main/res/drawable/ic_arrow_anim_up.xml b/app/src/main/res/drawable/ic_arrow_anim_up.xml
index 1aa02bb3ff..e7cb0d48cb 100644
--- a/app/src/main/res/drawable/ic_arrow_anim_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_anim_up.xml
@@ -10,7 +10,7 @@
                 android:viewportHeight="24.0">
             <path
                 android:name="arrowPath"
-                android:fillColor="#FFFFFF"
+                android:fillColor="@color/text_primary"
                 android:pathData="@string/arrow_down_path"/>
         </vector>
     </aapt:attr>
diff --git a/app/src/main/res/drawable/ic_autorenew.xml b/app/src/main/res/drawable/ic_autorenew.xml
index 959a5a1bb1..b175d35f44 100644
--- a/app/src/main/res/drawable/ic_autorenew.xml
+++ b/app/src/main/res/drawable/ic_autorenew.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_open_in_new.xml b/app/src/main/res/drawable/ic_baseline_open_in_new.xml
index 47837d25b3..5ad74cf220 100644
--- a/app/src/main/res/drawable/ic_baseline_open_in_new.xml
+++ b/app/src/main/res/drawable/ic_baseline_open_in_new.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index 92f2892528..ca4b171df3 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M17,12h-5v5h5v-5zM16,1v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-1V1h-2zm3,18H5V8h14v11z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index 813d7f428b..70a288fe24 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -6,6 +6,6 @@
         android:viewportWidth="24.0"
         tools:ignore="UnusedAttribute">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
index d11cc5c9c4..4184c933aa 100644
--- a/app/src/main/res/drawable/ic_clear.xml
+++ b/app/src/main/res/drawable/ic_clear.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_code_white_24dp.xml b/app/src/main/res/drawable/ic_code_white_24dp.xml
index 794ce3c9ba..358292a624 100644
--- a/app/src/main/res/drawable/ic_code_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_code_white_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_color_lens.xml b/app/src/main/res/drawable/ic_color_lens.xml
new file mode 100644
index 0000000000..156c0ce4d7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/text_primary"
+      android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index 6de98e09e6..57673bfe0a 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M20,2H4c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_credit_card_black_24dp.xml b/app/src/main/res/drawable/ic_credit_card_24dp.xml
similarity index 51%
rename from app/src/main/res/drawable/ic_credit_card_black_24dp.xml
rename to app/src/main/res/drawable/ic_credit_card_24dp.xml
index 8efb713379..ae29a7c0ff 100644
--- a/app/src/main/res/drawable/ic_credit_card_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_credit_card_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#000000" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cutlery.xml b/app/src/main/res/drawable/ic_cutlery.xml
index e5a4b6cca0..33a178026c 100644
--- a/app/src/main/res/drawable/ic_cutlery.xml
+++ b/app/src/main/res/drawable/ic_cutlery.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M8.1,13.34l2.83,-2.83L3.91,3.5c-1.56,1.56 -1.56,4.09 0,5.66l4.19,4.18zm6.78,-1.81c1.53,0.71 3.68,0.21 5.27,-1.38 1.91,-1.91 2.28,-4.65 0.81,-6.12 -1.46,-1.46 -4.2,-1.1 -6.12,0.81 -1.59,1.59 -2.09,3.74 -1.38,5.27L3.7,19.87l1.41,1.41L12,14.41l6.88,6.88 1.41,-1.41L13.41,13l1.47,-1.47z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_error_outline.xml b/app/src/main/res/drawable/ic_error_outline.xml
index a07a0f90ac..4f66864fa3 100644
--- a/app/src/main/res/drawable/ic_error_outline.xml
+++ b/app/src/main/res/drawable/ic_error_outline.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_event.xml b/app/src/main/res/drawable/ic_event_light_blue.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_event.xml
rename to app/src/main/res/drawable/ic_event_light_blue.xml
diff --git a/app/src/main/res/drawable/ic_external_link.xml b/app/src/main/res/drawable/ic_external_link.xml
index 1ed3a810d5..1e12e52828 100644
--- a/app/src/main/res/drawable/ic_external_link.xml
+++ b/app/src/main/res/drawable/ic_external_link.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/text_primary"
         android:pathData="M5,3C3.9069,3 3,3.9069 3,5L3,19C3,20.0931 3.9069,21 5,21L19,21C20.0931,21 21,20.0931 21,19L21,12L19,12L19,19L5,19L5,5L12,5L12,3L5,3zM14,3L14,5L17.5859,5L8.293,14.293L9.707,15.707L19,6.4141L19,10L21,10L21,3L14,3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list.xml
index 7d435fa2b8..d19a788c89 100644
--- a/app/src/main/res/drawable/ic_filter_list.xml
+++ b/app/src/main/res/drawable/ic_filter_list.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_bulleted.xml b/app/src/main/res/drawable/ic_list_bulleted.xml
index 153747bde3..8b2f5f14e4 100644
--- a/app/src/main/res/drawable/ic_list_bulleted.xml
+++ b/app/src/main/res/drawable/ic_list_bulleted.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml
index 33f32f2d8a..94a6b47962 100644
--- a/app/src/main/res/drawable/ic_minus.xml
+++ b/app/src/main/res/drawable/ic_minus.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M 5 13 L 5 11 L 19 11 L 19 13 Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_money.xml b/app/src/main/res/drawable/ic_money.xml
index 868381309f..f0b79f2891 100644
--- a/app/src/main/res/drawable/ic_money.xml
+++ b/app/src/main/res/drawable/ic_money.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M15,18.5c-2.51,0 -4.68,-1.42 -5.76,-3.5H15v-2H8.58c-0.05,-0.33 -0.08,-0.66 -0.08,-1s0.03,-0.67 0.08,-1H15V9H9.24C10.32,6.92 12.5,5.5 15,5.5c1.61,0 3.09,0.59 4.23,1.57L21,5.3C19.41,3.87 17.3,3 15,3c-3.92,0 -7.24,2.51 -8.48,6H3v2h3.06c-0.04,0.33 -0.06,0.66 -0.06,1 0,0.34 0.02,0.67 0.06,1H3v2h3.52c1.24,3.49 4.56,6 8.48,6 2.31,0 4.41,-0.87 6,-2.3l-1.78,-1.77c-1.13,0.98 -2.6,1.57 -4.22,1.57z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
index 4dad13b466..541dc1b0a3 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#000000" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_no_wifi.xml b/app/src/main/res/drawable/ic_no_wifi.xml
index 1841292c81..46d3ce84d0 100644
--- a/app/src/main/res/drawable/ic_no_wifi.xml
+++ b/app/src/main/res/drawable/ic_no_wifi.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zm-6.6,8.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification_wifi.xml b/app/src/main/res/drawable/ic_notification_wifi.xml
index 732c3dace2..df829deda9 100644
--- a/app/src/main/res/drawable/ic_notification_wifi.xml
+++ b/app/src/main/res/drawable/ic_notification_wifi.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M12,3C6.95,3 3.15,4.85 0,7.23L12,22 24,7.25C20.85,4.87 17.05,3 12,3zM13,16h-2v-6h2v6zM11,8L11,6h2v2h-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_access_time_24px.xml b/app/src/main/res/drawable/ic_outline_access_time_24px.xml
index e05f3e530f..93309ea9b7 100644
--- a/app/src/main/res/drawable/ic_outline_access_time_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_access_time_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12c0,5.52 4.47,10 9.99,10C17.52,22 22,17.52 22,12C22,6.48 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,16.42 16.42,20 12,20z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12.5,7l-1.5,0l0,6l5.25,3.15l0.75,-1.23l-4.5,-2.67z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M11.99,2C6.47,2 2,6.48 2,12c0,5.52 4.47,10 9.99,10C17.52,22 22,17.52 22,12C22,6.48 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,16.42 16.42,20 12,20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12.5,7l-1.5,0l0,6l5.25,3.15l0.75,-1.23l-4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_accessible_24px.xml b/app/src/main/res/drawable/ic_outline_accessible_24px.xml
index 9454b8cee2..43d0fa179c 100644
--- a/app/src/main/res/drawable/ic_outline_accessible_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_accessible_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45c-0.01,0 -0.01,-0.01 -0.02,-0.01H13c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09V15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45C15.29,12.12 17.25,12.99 19,13z"/>
-    <path android:fillColor="#FF000000" android:pathData="M10,20c-1.66,0 -3,-1.34 -3,-3c0,-1.31 0.84,-2.41 2,-2.83V12.1c-2.28,0.46 -4,2.48 -4,4.9c0,2.76 2.24,5 5,5c2.42,0 4.44,-1.72 4.9,-4h-2.07C12.42,19.16 11.31,20 10,20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45c-0.01,0 -0.01,-0.01 -0.02,-0.01H13c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09V15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45C15.29,12.12 17.25,12.99 19,13z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M10,20c-1.66,0 -3,-1.34 -3,-3c0,-1.31 0.84,-2.41 2,-2.83V12.1c-2.28,0.46 -4,2.48 -4,4.9c0,2.76 2.24,5 5,5c2.42,0 4.44,-1.72 4.9,-4h-2.07C12.42,19.16 11.31,20 10,20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_add_photo_alternate_24px.xml b/app/src/main/res/drawable/ic_outline_add_photo_alternate_24px.xml
index 903caafce3..5953c337b9 100644
--- a/app/src/main/res/drawable/ic_outline_add_photo_alternate_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_add_photo_alternate_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,20H4V6h9V4H4C2.9,4 2,4.9 2,6v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2V20z"/>
-    <path android:fillColor="#FF000000" android:pathData="M10.21,16.83l-1.96,-2.36l-2.75,3.53l11,0l-3.54,-4.71z"/>
-    <path android:fillColor="#FF000000" android:pathData="M20,4V1h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0V6h3V4H20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M18,20H4V6h9V4H4C2.9,4 2,4.9 2,6v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2V20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M10.21,16.83l-1.96,-2.36l-2.75,3.53l11,0l-3.54,-4.71z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20,4V1h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0V6h3V4H20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_business_24px.xml b/app/src/main/res/drawable/ic_outline_business_24px.xml
index 1aa43c67b8..21cb4fc5a4 100644
--- a/app/src/main/res/drawable/ic_outline_business_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_business_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,7V3H2v18h20V7H12zM6,19H4v-2h2V19zM6,15H4v-2h2V15zM6,11H4V9h2V11zM6,7H4V5h2V7zM10,19H8v-2h2V19zM10,15H8v-2h2V15zM10,11H8V9h2V11zM10,7H8V5h2V7zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2V9h8V19zM18,11h-2v2h2V11zM18,15h-2v2h2V15z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,7V3H2v18h20V7H12zM6,19H4v-2h2V19zM6,15H4v-2h2V15zM6,11H4V9h2V11zM6,7H4V5h2V7zM10,19H8v-2h2V19zM10,15H8v-2h2V15zM10,11H8V9h2V11zM10,7H8V5h2V7zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2V9h8V19zM18,11h-2v2h2V11zM18,15h-2v2h2V15z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_calendar_today_24px.xml b/app/src/main/res/drawable/ic_outline_calendar_today_24px.xml
index 50d4a11e84..e0097863ff 100644
--- a/app/src/main/res/drawable/ic_outline_calendar_today_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_calendar_today_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,3h-1V1h-2v2H7V1H5v2H4C2.9,3 2,3.9 2,5v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V5C22,3.9 21.1,3 20,3zM20,21H4V10h16V21zM20,8H4V5h1h2h10h2h1V8z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20,3h-1V1h-2v2H7V1H5v2H4C2.9,3 2,3.9 2,5v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V5C22,3.9 21.1,3 20,3zM20,21H4V10h16V21zM20,8H4V5h1h2h10h2h1V8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_calendar_view_day_24px.xml b/app/src/main/res/drawable/ic_outline_calendar_view_day_24px.xml
index d558c6042e..40bc9989a3 100644
--- a/app/src/main/res/drawable/ic_outline_calendar_view_day_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_calendar_view_day_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,17h18v2h-18z"/>
-    <path android:fillColor="#FF000000" android:pathData="M19,12v1H5v-1H19M21,10H3v5h18V10L21,10z"/>
-    <path android:fillColor="#FF000000" android:pathData="M3,6h18v2h-18z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M3,17h18v2h-18z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,12v1H5v-1H19M21,10H3v5h18V10L21,10z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M3,6h18v2h-18z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_chat_bubble_outline_24px.xml b/app/src/main/res/drawable/ic_outline_chat_bubble_outline_24px.xml
index 9c08cd8ccc..e1d5273827 100644
--- a/app/src/main/res/drawable/ic_outline_chat_bubble_outline_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_chat_bubble_outline_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,2H4C2.9,2 2,2.9 2,4v18l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6l-2,2V4h16V16z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20,2H4C2.9,2 2,2.9 2,4v18l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6l-2,2V4h16V16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_cloud_done_24px.xml b/app/src/main/res/drawable/ic_outline_cloud_done_24px.xml
index 7823c3e891..9c6416a40e 100644
--- a/app/src/main/res/drawable/ic_outline_cloud_done_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_cloud_done_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.04C2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5C24,12.36 21.95,10.22 19.35,10.04zM19,18H6c-2.21,0 -4,-1.79 -4,-4c0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11l0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5l1.53,0.11C20.78,12.14 22,13.45 22,15C22,16.65 20.65,18 19,18z"/>
-    <path android:fillColor="#FF000000" android:pathData="M10,14.18l-2.09,-2.09l-1.41,1.41l3.5,3.5l6.01,-6.01l-1.41,-1.41z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.04C2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5C24,12.36 21.95,10.22 19.35,10.04zM19,18H6c-2.21,0 -4,-1.79 -4,-4c0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11l0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5l1.53,0.11C20.78,12.14 22,13.45 22,15C22,16.65 20.65,18 19,18z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M10,14.18l-2.09,-2.09l-1.41,1.41l3.5,3.5l6.01,-6.01l-1.41,-1.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_directions_24px.xml b/app/src/main/res/drawable/ic_outline_directions_24px.xml
index 23c2fd648a..52d7e71445 100644
--- a/app/src/main/res/drawable/ic_outline_directions_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_directions_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22.43,10.59l-9.01,-9.01c-0.75,-0.75 -2.07,-0.76 -2.83,0l-9,9c-0.78,0.78 -0.78,2.04 0,2.82l9,9c0.39,0.39 0.9,0.58 1.41,0.58c0.51,0 1.02,-0.19 1.41,-0.58l8.99,-8.99C23.19,12.65 23.2,11.39 22.43,10.59zM12.01,20.99l-9,-9l9,-9l9,9L12.01,20.99z"/>
-    <path android:fillColor="#FF000000" android:pathData="M8,11v4h2v-3h4v2.5l3.5,-3.5L14,7.5V10H9C8.45,10 8,10.45 8,11z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M22.43,10.59l-9.01,-9.01c-0.75,-0.75 -2.07,-0.76 -2.83,0l-9,9c-0.78,0.78 -0.78,2.04 0,2.82l9,9c0.39,0.39 0.9,0.58 1.41,0.58c0.51,0 1.02,-0.19 1.41,-0.58l8.99,-8.99C23.19,12.65 23.2,11.39 22.43,10.59zM12.01,20.99l-9,-9l9,-9l9,9L12.01,20.99z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M8,11v4h2v-3h4v2.5l3.5,-3.5L14,7.5V10H9C8.45,10 8,10.45 8,11z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_edit_24px.xml b/app/src/main/res/drawable/ic_outline_edit_24px.xml
index 749f99b973..554119197f 100644
--- a/app/src/main/res/drawable/ic_outline_edit_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_edit_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M14.06,9.02l0.92,0.92L5.92,19H5v-0.92L14.06,9.02M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83l3.75,3.75l1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34C18.17,3.09 17.92,3 17.66,3L17.66,3zM14.06,6.19L3,17.25V21h3.75L17.81,9.94L14.06,6.19L14.06,6.19z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M14.06,9.02l0.92,0.92L5.92,19H5v-0.92L14.06,9.02M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83l3.75,3.75l1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34C18.17,3.09 17.92,3 17.66,3L17.66,3zM14.06,6.19L3,17.25V21h3.75L17.81,9.94L14.06,6.19L14.06,6.19z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_email_24px.xml b/app/src/main/res/drawable/ic_outline_email_24px.xml
index 5314ecd8d7..1e88a97c4f 100644
--- a/app/src/main/res/drawable/ic_outline_email_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_email_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22,6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6zM20,6l-8,5L4,6H20zM20,18L4,18V8l8,5l8,-5V18z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M22,6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6zM20,6l-8,5L4,6H20zM20,18L4,18V8l8,5l8,-5V18z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_event_24px.xml b/app/src/main/res/drawable/ic_outline_event_24px.xml
index e5f37d26bd..00e6c77bbf 100644
--- a/app/src/main/res/drawable/ic_outline_event_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_event_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,4h-1V2h-2v2H8V2H6v2H5C3.89,4 3.01,4.9 3.01,6L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6C21,4.9 20.1,4 19,4zM19,20L5,20V10h14V20zM19,8H5v0V6h14V8z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,13h5v5h-5z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,4h-1V2h-2v2H8V2H6v2H5C3.89,4 3.01,4.9 3.01,6L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6C21,4.9 20.1,4 19,4zM19,20L5,20V10h14V20zM19,8H5v0V6h14V8z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,13h5v5h-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_event_note_24px.xml b/app/src/main/res/drawable/ic_outline_event_note_24px.xml
index 8a39e10df6..128f95bc00 100644
--- a/app/src/main/res/drawable/ic_outline_event_note_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_event_note_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V9h14V19zM5,7V5h14v2H5z"/>
-    <path android:fillColor="#FF000000" android:pathData="M7,11h10v2h-10z"/>
-    <path android:fillColor="#FF000000" android:pathData="M7,15h7v2h-7z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V9h14V19zM5,7V5h14v2H5z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7,11h10v2h-10z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7,15h7v2h-7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_event_seat_24px.xml b/app/src/main/res/drawable/ic_outline_event_seat_24px.xml
index e9b2ce1a48..7efc96e2eb 100644
--- a/app/src/main/res/drawable/ic_outline_event_seat_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_event_seat_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,5v7H9V5H15M15,3H9C7.9,3 7,3.9 7,5v9h10V5C17,3.9 16.1,3 15,3L15,3zM22,10h-3v3h3V10L22,10zM5,10H2v3h3V10L5,10zM20,15H4v6h2v-4h12v4h2V15L20,15z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M15,5v7H9V5H15M15,3H9C7.9,3 7,3.9 7,5v9h10V5C17,3.9 16.1,3 15,3L15,3zM22,10h-3v3h3V10L22,10zM5,10H2v3h3V10L5,10zM20,15H4v6h2v-4h12v4h2V15L20,15z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_exit_to_app_24px.xml b/app/src/main/res/drawable/ic_outline_exit_to_app_24px.xml
index 9e47c1d403..52ebc910fe 100644
--- a/app/src/main/res/drawable/ic_outline_exit_to_app_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_exit_to_app_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10.09,15.59L11.5,17l5,-5l-5,-5l-1.41,1.41L12.67,11H3v2h9.67L10.09,15.59zM19,3H5C3.89,3 3,3.9 3,5v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M10.09,15.59L11.5,17l5,-5l-5,-5l-1.41,1.41L12.67,11H3v2h9.67L10.09,15.59zM19,3H5C3.89,3 3,3.9 3,5v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_feedback_24px.xml b/app/src/main/res/drawable/ic_outline_feedback_24px.xml
index 07577f1aa2..6e698ce36d 100644
--- a/app/src/main/res/drawable/ic_outline_feedback_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_feedback_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,2H4C2.9,2 2.01,2.9 2.01,4L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6H5.17l-0.59,0.59L4,17.17V4h16V16z"/>
-    <path android:fillColor="#FF000000" android:pathData="M11,12h2v2h-2z"/>
-    <path android:fillColor="#FF000000" android:pathData="M11,6h2v4h-2z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20,2H4C2.9,2 2.01,2.9 2.01,4L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6H5.17l-0.59,0.59L4,17.17V4h16V16z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M11,12h2v2h-2z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M11,6h2v4h-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_group_add_24px.xml b/app/src/main/res/drawable/ic_outline_group_add_24px.xml
index 8a60b6b91c..cdc44060b1 100644
--- a/app/src/main/res/drawable/ic_outline_group_add_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_group_add_24px.xml
@@ -1,9 +1,9 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M5,15l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0l0,2l3,0l0,3z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,13.75c-2.34,0 -7,1.17 -7,3.5V19h14v-1.75C19,14.92 14.34,13.75 12,13.75zM7.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25H7.34z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,12c1.93,0 3.5,-1.57 3.5,-3.5C15.5,6.57 13.93,5 12,5c-1.93,0 -3.5,1.57 -3.5,3.5C8.5,10.43 10.07,12 12,12zM12,7c0.83,0 1.5,0.67 1.5,1.5S12.83,10 12,10s-1.5,-0.67 -1.5,-1.5S11.17,7 12,7z"/>
-    <path android:fillColor="#FF000000" android:pathData="M17,12c1.93,0 3.5,-1.57 3.5,-3.5C20.5,6.57 18.93,5 17,5c-0.24,0 -0.48,0.02 -0.71,0.07C17.05,6.01 17.5,7.2 17.5,8.5c0,1.3 -0.47,2.48 -1.23,3.42C16.51,11.97 16.75,12 17,12z"/>
-    <path android:fillColor="#FF000000" android:pathData="M19.32,14.02c1,0.81 1.68,1.87 1.68,3.23V19h3v-1.75C24,15.56 21.56,14.49 19.32,14.02z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M5,15l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0l0,2l3,0l0,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,13.75c-2.34,0 -7,1.17 -7,3.5V19h14v-1.75C19,14.92 14.34,13.75 12,13.75zM7.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25H7.34z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,12c1.93,0 3.5,-1.57 3.5,-3.5C15.5,6.57 13.93,5 12,5c-1.93,0 -3.5,1.57 -3.5,3.5C8.5,10.43 10.07,12 12,12zM12,7c0.83,0 1.5,0.67 1.5,1.5S12.83,10 12,10s-1.5,-0.67 -1.5,-1.5S11.17,7 12,7z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M17,12c1.93,0 3.5,-1.57 3.5,-3.5C20.5,6.57 18.93,5 17,5c-0.24,0 -0.48,0.02 -0.71,0.07C17.05,6.01 17.5,7.2 17.5,8.5c0,1.3 -0.47,2.48 -1.23,3.42C16.51,11.97 16.75,12 17,12z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19.32,14.02c1,0.81 1.68,1.87 1.68,3.23V19h3v-1.75C24,15.56 21.56,14.49 19.32,14.02z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_group_work_24px.xml b/app/src/main/res/drawable/ic_outline_group_work_24px.xml
index 179ed6a214..486755d6e2 100644
--- a/app/src/main/res/drawable/ic_outline_group_work_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_group_work_24px.xml
@@ -1,8 +1,8 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
-    <path android:fillColor="#FF000000" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_home_24px.xml b/app/src/main/res/drawable/ic_outline_home_24px.xml
index 1a4c39ac02..fa6a5b4cd1 100644
--- a/app/src/main/res/drawable/ic_outline_home_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_home_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,5.69l5,4.5V12v6h-2v-4v-2h-2h-2H9v2v4H7v-6v-1.81L12,5.69M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3L12,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,5.69l5,4.5V12v6h-2v-4v-2h-2h-2H9v2v4H7v-6v-1.81L12,5.69M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3L12,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_insert_chart_outlined_24px.xml b/app/src/main/res/drawable/ic_outline_insert_chart_outlined_24px.xml
index dbebbc7d0b..a362df7c33 100644
--- a/app/src/main/res/drawable/ic_outline_insert_chart_outlined_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_insert_chart_outlined_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9,17H7v-7h2V17zM13,17h-2V7h2V17zM17,17h-2v-4h2V17zM19,19H5V5h14V19zM19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M9,17H7v-7h2V17zM13,17h-2V7h2V17zM17,17h-2v-4h2V17zM19,19H5V5h14V19zM19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_language_24px.xml b/app/src/main/res/drawable/ic_outline_language_24px.xml
index 0e8fcb7364..ff4acdb424 100644
--- a/app/src/main/res/drawable/ic_outline_language_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_language_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95a15.65 15.65 0 0 0-1.38-3.56A8.03 8.03 0 0 1 18.92 8zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26 -2h3.38c-0.08 0.66 -0.14 1.32-0.14 2s0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56A7.987 7.987 0 0 1 5.08 16zm2.95-8H5.08a7.987 7.987 0 0 1 4.33-3.56A15.65 15.65 0 0 0 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2s0.07-1.35 0.16 -2h4.68c0.09 0.65 0.16 1.32 0.16 2s-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95a8.03 8.03 0 0 1-4.33 3.56zM16.36 14c0.08-0.66 0.14 -1.32 0.14 -2s-0.06-1.34-0.14-2h3.38c0.16 0.64 0.26 1.31 0.26 2s-0.1 1.36-0.26 2h-3.38z" />
+    <path android:fillColor="@color/text_primary" android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95a15.65 15.65 0 0 0-1.38-3.56A8.03 8.03 0 0 1 18.92 8zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26 -2h3.38c-0.08 0.66 -0.14 1.32-0.14 2s0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56A7.987 7.987 0 0 1 5.08 16zm2.95-8H5.08a7.987 7.987 0 0 1 4.33-3.56A15.65 15.65 0 0 0 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2s0.07-1.35 0.16 -2h4.68c0.09 0.65 0.16 1.32 0.16 2s-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95a8.03 8.03 0 0 1-4.33 3.56zM16.36 14c0.08-0.66 0.14 -1.32 0.14 -2s-0.06-1.34-0.14-2h3.38c0.16 0.64 0.26 1.31 0.26 2s-0.1 1.36-0.26 2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_location_on_24px.xml b/app/src/main/res/drawable/ic_outline_location_on_24px.xml
index 12f9adf2d9..eba3e5500e 100644
--- a/app/src/main/res/drawable/ic_outline_location_on_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_location_on_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_map_24px.xml b/app/src/main/res/drawable/ic_outline_map_24px.xml
index 2a569e3918..46fbac6545 100644
--- a/app/src/main/res/drawable/ic_outline_map_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_map_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20.5,3l-0.16,0.03L15,5.1L9,3L3.36,4.9C3.15,4.97 3,5.15 3,5.38V20.5C3,20.78 3.22,21 3.5,21l0.16,-0.03L9,18.9l6,2.1l5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5C21,3.22 20.78,3 20.5,3zM10,5.47l4,1.4v11.66l-4,-1.4V5.47zM5,6.46l3,-1.01v11.7l-3,1.16V6.46zM19,17.54l-3,1.01V6.86l3,-1.16V17.54z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20.5,3l-0.16,0.03L15,5.1L9,3L3.36,4.9C3.15,4.97 3,5.15 3,5.38V20.5C3,20.78 3.22,21 3.5,21l0.16,-0.03L9,18.9l6,2.1l5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5C21,3.22 20.78,3 20.5,3zM10,5.47l4,1.4v11.66l-4,-1.4V5.47zM5,6.46l3,-1.01v11.7l-3,1.16V6.46zM19,17.54l-3,1.01V6.86l3,-1.16V17.54z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_notifications_24px.xml b/app/src/main/res/drawable/ic_outline_notifications_24px.xml
index 135b062a24..2b0092c064 100644
--- a/app/src/main/res/drawable/ic_outline_notifications_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_notifications_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1L18,16zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1L18,16zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_people_outline_24px.xml b/app/src/main/res/drawable/ic_outline_people_outline_24px.xml
index def2a497ef..c4a48eb9f1 100644
--- a/app/src/main/res/drawable/ic_outline_people_outline_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_people_outline_24px.xml
@@ -1,8 +1,8 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9,13.75c-2.34,0 -7,1.17 -7,3.5V19h14v-1.75C16,14.92 11.34,13.75 9,13.75zM4.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25H4.34z"/>
-    <path android:fillColor="#FF000000" android:pathData="M9,12c1.93,0 3.5,-1.57 3.5,-3.5C12.5,6.57 10.93,5 9,5S5.5,6.57 5.5,8.5C5.5,10.43 7.07,12 9,12zM9,7c0.83,0 1.5,0.67 1.5,1.5S9.83,10 9,10S7.5,9.33 7.5,8.5S8.17,7 9,7z"/>
-    <path android:fillColor="#FF000000" android:pathData="M16.04,13.81C17.2,14.65 18,15.77 18,17.25V19h4v-1.75C22,15.23 18.5,14.08 16.04,13.81z"/>
-    <path android:fillColor="#FF000000" android:pathData="M15,12c1.93,0 3.5,-1.57 3.5,-3.5C18.5,6.57 16.93,5 15,5c-0.54,0 -1.04,0.13 -1.5,0.35c0.63,0.89 1,1.98 1,3.15s-0.37,2.26 -1,3.15C13.96,11.87 14.46,12 15,12z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M9,13.75c-2.34,0 -7,1.17 -7,3.5V19h14v-1.75C16,14.92 11.34,13.75 9,13.75zM4.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25H4.34z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M9,12c1.93,0 3.5,-1.57 3.5,-3.5C12.5,6.57 10.93,5 9,5S5.5,6.57 5.5,8.5C5.5,10.43 7.07,12 9,12zM9,7c0.83,0 1.5,0.67 1.5,1.5S9.83,10 9,10S7.5,9.33 7.5,8.5S8.17,7 9,7z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M16.04,13.81C17.2,14.65 18,15.77 18,17.25V19h4v-1.75C22,15.23 18.5,14.08 16.04,13.81z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M15,12c1.93,0 3.5,-1.57 3.5,-3.5C18.5,6.57 16.93,5 15,5c-0.54,0 -1.04,0.13 -1.5,0.35c0.63,0.89 1,1.98 1,3.15s-0.37,2.26 -1,3.15C13.96,11.87 14.46,12 15,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_person_add_24px.xml b/app/src/main/res/drawable/ic_outline_person_add_24px.xml
index b3a7eca16a..ed3488f9e1 100644
--- a/app/src/main/res/drawable/ic_outline_person_add_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_person_add_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4c0,-2.21 -1.79,-4 -4,-4c-2.21,0 -4,1.79 -4,4C11,10.21 12.79,12 15,12zM15,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2c-1.1,0 -2,-0.9 -2,-2S13.9,6 15,6z"/>
-    <path android:fillColor="#FF000000" android:pathData="M15,14c-2.67,0 -8,1.34 -8,4v2h16v-2C23,15.34 17.67,14 15,14zM9,18c0.22,-0.72 3.31,-2 6,-2c2.7,0 5.8,1.29 6,2H9z"/>
-    <path android:fillColor="#FF000000" android:pathData="M6,15l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0l0,2l3,0l0,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M15,12c2.21,0 4,-1.79 4,-4c0,-2.21 -1.79,-4 -4,-4c-2.21,0 -4,1.79 -4,4C11,10.21 12.79,12 15,12zM15,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2c-1.1,0 -2,-0.9 -2,-2S13.9,6 15,6z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M15,14c-2.67,0 -8,1.34 -8,4v2h16v-2C23,15.34 17.67,14 15,14zM9,18c0.22,-0.72 3.31,-2 6,-2c2.7,0 5.8,1.29 6,2H9z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M6,15l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0l0,2l3,0l0,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_phone_24px.xml b/app/src/main/res/drawable/ic_outline_phone_24px.xml
index bc90c001e0..277fcc8b95 100644
--- a/app/src/main/res/drawable/ic_outline_phone_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_phone_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6.54,5C6.6,5.89 6.75,6.76 6.99,7.59l-1.2,1.2C5.38,7.59 5.12,6.32 5.03,5H6.54M16.4,17.02c0.85,0.24 1.72,0.39 2.6,0.45v1.49c-1.32,-0.09 -2.59,-0.35 -3.8,-0.75L16.4,17.02M7.5,3H4C3.45,3 3,3.45 3,4c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.49c0,-0.55 -0.45,-1 -1,-1c-1.24,0 -2.45,-0.2 -3.57,-0.57c-0.1,-0.04 -0.21,-0.05 -0.31,-0.05c-0.26,0 -0.51,0.1 -0.71,0.29l-2.2,2.2c-2.83,-1.45 -5.15,-3.76 -6.59,-6.59l2.2,-2.2C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4C8.5,3.45 8.05,3 7.5,3L7.5,3z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M6.54,5C6.6,5.89 6.75,6.76 6.99,7.59l-1.2,1.2C5.38,7.59 5.12,6.32 5.03,5H6.54M16.4,17.02c0.85,0.24 1.72,0.39 2.6,0.45v1.49c-1.32,-0.09 -2.59,-0.35 -3.8,-0.75L16.4,17.02M7.5,3H4C3.45,3 3,3.45 3,4c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.49c0,-0.55 -0.45,-1 -1,-1c-1.24,0 -2.45,-0.2 -3.57,-0.57c-0.1,-0.04 -0.21,-0.05 -0.31,-0.05c-0.26,0 -0.51,0.1 -0.71,0.29l-2.2,2.2c-2.83,-1.45 -5.15,-3.76 -6.59,-6.59l2.2,-2.2C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4C8.5,3.45 8.05,3 7.5,3L7.5,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_phonelink_ring_24px.xml b/app/src/main/res/drawable/ic_outline_phonelink_ring_24px.xml
index fa1f36639c..6e56fd036a 100644
--- a/app/src/main/res/drawable/ic_outline_phonelink_ring_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_phonelink_ring_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20.1,7.7l-1,1c1.8,1.8 1.8,4.6 0,6.5l1,1C22.6,13.9 22.6,10.1 20.1,7.7zM18,9.8l-1,1c0.5,0.7 0.5,1.6 0,2.3l1,1C19.2,12.9 19.2,11.1 18,9.8zM14,1H4C2.9,1 2,1.9 2,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C16,1.9 15.1,1 14,1zM14,20H4V4h10V20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M20.1,7.7l-1,1c1.8,1.8 1.8,4.6 0,6.5l1,1C22.6,13.9 22.6,10.1 20.1,7.7zM18,9.8l-1,1c0.5,0.7 0.5,1.6 0,2.3l1,1C19.2,12.9 19.2,11.1 18,9.8zM14,1H4C2.9,1 2,1.9 2,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C16,1.9 15.1,1 14,1zM14,20H4V4h10V20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_public_24px.xml b/app/src/main/res/drawable/ic_outline_public_24px.xml
index 8604d9c6e9..a77c59d819 100644
--- a/app/src/main/res/drawable/ic_outline_public_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_public_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM4,12c0,-0.61 0.08,-1.21 0.21,-1.78L8.99,15v1c0,1.1 0.9,2 2,2v1.93C7.06,19.43 4,16.07 4,12zM17.89,17.4c-0.26,-0.81 -1,-1.4 -1.9,-1.4h-1v-3c0,-0.55 -0.45,-1 -1,-1h-6v-2h2c0.55,0 1,-0.45 1,-1V7h2c1.1,0 2,-0.9 2,-2V4.59C17.92,5.77 20,8.65 20,12C20,14.08 19.19,15.98 17.89,17.4z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM4,12c0,-0.61 0.08,-1.21 0.21,-1.78L8.99,15v1c0,1.1 0.9,2 2,2v1.93C7.06,19.43 4,16.07 4,12zM17.89,17.4c-0.26,-0.81 -1,-1.4 -1.9,-1.4h-1v-3c0,-0.55 -0.45,-1 -1,-1h-6v-2h2c0.55,0 1,-0.45 1,-1V7h2c1.1,0 2,-0.9 2,-2V4.59C17.92,5.77 20,8.65 20,12C20,14.08 19.19,15.98 17.89,17.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_school_24px.xml b/app/src/main/res/drawable/ic_outline_school_24px.xml
index a48eb962a9..093baae53e 100644
--- a/app/src/main/res/drawable/ic_outline_school_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_school_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,3L1,9l4,2.18v6L12,21l7,-3.82v-6l2,-1.09V17h2V9L12,3zM18.82,9L12,12.72L5.18,9L12,5.28L18.82,9zM17,15.99l-5,2.73l-5,-2.73v-3.72L12,15l5,-2.73V15.99z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,3L1,9l4,2.18v6L12,21l7,-3.82v-6l2,-1.09V17h2V9L12,3zM18.82,9L12,12.72L5.18,9L12,5.28L18.82,9zM17,15.99l-5,2.73l-5,-2.73v-3.72L12,15l5,-2.73V15.99z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_settings_24px.xml b/app/src/main/res/drawable/ic_outline_settings_24px.xml
index d16ae45c53..adb207f3c3 100644
--- a/app/src/main/res/drawable/ic_outline_settings_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_settings_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98c0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25c-0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4C9.75,2 9.54,2.18 9.51,2.42L9.13,5.07C8.52,5.32 7.96,5.66 7.44,6.05l-2.49,-1C4.89,5.03 4.83,5.02 4.77,5.02c-0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46C2.21,8.95 2.27,9.22 2.46,9.37l2.11,1.65C4.53,11.34 4.5,11.67 4.5,12c0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25c0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65C9.54,21.82 9.75,22 10,22h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03c0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64L19.43,12.98zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73c0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13l0.89,0.7l1.08,0.84l-0.7,1.21l-1.27,-0.51l-1.04,-0.42l-0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43l-0.16,1.13L12.7,20H11.3l-0.19,-1.35l-0.16,-1.13l-1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7l-1.06,0.43l-1.27,0.51l-0.7,-1.21l1.08,-0.84l0.89,-0.7l-0.14,-1.13C6.52,12.43 6.5,12.2 6.5,12s0.02,-0.43 0.05,-0.73l0.14,-1.13L5.8,9.44L4.72,8.6l0.7,-1.21l1.27,0.51l1.04,0.42l0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43l0.16,-1.13L11.3,4h1.39l0.19,1.35l0.16,1.13l1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7l1.06,-0.43l1.27,-0.51l0.7,1.21L18.2,9.44l-0.89,0.7L17.45,11.27z"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4s4,-1.79 4,-4S14.21,8 12,8zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,14 12,14z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98c0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25c-0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4C9.75,2 9.54,2.18 9.51,2.42L9.13,5.07C8.52,5.32 7.96,5.66 7.44,6.05l-2.49,-1C4.89,5.03 4.83,5.02 4.77,5.02c-0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46C2.21,8.95 2.27,9.22 2.46,9.37l2.11,1.65C4.53,11.34 4.5,11.67 4.5,12c0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25c0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65C9.54,21.82 9.75,22 10,22h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03c0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64L19.43,12.98zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73c0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13l0.89,0.7l1.08,0.84l-0.7,1.21l-1.27,-0.51l-1.04,-0.42l-0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43l-0.16,1.13L12.7,20H11.3l-0.19,-1.35l-0.16,-1.13l-1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7l-1.06,0.43l-1.27,0.51l-0.7,-1.21l1.08,-0.84l0.89,-0.7l-0.14,-1.13C6.52,12.43 6.5,12.2 6.5,12s0.02,-0.43 0.05,-0.73l0.14,-1.13L5.8,9.44L4.72,8.6l0.7,-1.21l1.27,0.51l1.04,0.42l0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43l0.16,-1.13L11.3,4h1.39l0.19,1.35l0.16,1.13l1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7l1.06,-0.43l1.27,-0.51l0.7,1.21L18.2,9.44l-0.89,0.7L17.45,11.27z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4s4,-1.79 4,-4S14.21,8 12,8zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,14 12,14z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_train_24px.xml b/app/src/main/res/drawable/ic_outline_train_24px.xml
index 088b883e47..300cc8e925 100644
--- a/app/src/main/res/drawable/ic_outline_train_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_train_24px.xml
@@ -1,7 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M8.5,14.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M15.5,14.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8,2 4,2.5 4,6v9.5C4,17.43 5.57,19 7.5,19L6,20.5V21h2l2,-2h4l2,2h2v-0.5L16.5,19c1.93,0 3.5,-1.57 3.5,-3.5V6C20,2.5 16,2 12,2zM12,4c3.51,0 4.96,0.48 5.57,1H6.43C7.04,4.48 8.49,4 12,4zM6,7h5v3H6V7zM18,15.5c0,0.83 -0.67,1.5 -1.5,1.5h-9C6.67,17 6,16.33 6,15.5V12h12V15.5zM18,10h-5V7h5V10z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M8.5,14.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M15.5,14.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,2C8,2 4,2.5 4,6v9.5C4,17.43 5.57,19 7.5,19L6,20.5V21h2l2,-2h4l2,2h2v-0.5L16.5,19c1.93,0 3.5,-1.57 3.5,-3.5V6C20,2.5 16,2 12,2zM12,4c3.51,0 4.96,0.48 5.57,1H6.43C7.04,4.48 8.49,4 12,4zM6,7h5v3H6V7zM18,15.5c0,0.83 -0.67,1.5 -1.5,1.5h-9C6.67,17 6,16.33 6,15.5V12h12V15.5zM18,10h-5V7h5V10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_update_24px.xml b/app/src/main/res/drawable/ic_outline_update_24px.xml
index 8faf14fa04..16fb47f195 100644
--- a/app/src/main/res/drawable/ic_outline_update_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_update_24px.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11,8l0,5l4.25,2.52l0.77,-1.28l-3.52,-2.09l0,-4.15z"/>
-    <path android:fillColor="#FF000000" android:pathData="M21,10V3l-2.64,2.64C16.74,4.01 14.49,3 12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c4.97,0 9,-4.03 9,-9h-2c0,3.86 -3.14,7 -7,7s-7,-3.14 -7,-7s3.14,-7 7,-7c1.93,0 3.68,0.79 4.95,2.05L14,10H21z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M11,8l0,5l4.25,2.52l0.77,-1.28l-3.52,-2.09l0,-4.15z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M21,10V3l-2.64,2.64C16.74,4.01 14.49,3 12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c4.97,0 9,-4.03 9,-9h-2c0,3.86 -3.14,7 -7,7s-7,-3.14 -7,-7s3.14,-7 7,-7c1.93,0 3.68,0.79 4.95,2.05L14,10H21z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_view_column_24px.xml b/app/src/main/res/drawable/ic_outline_view_column_24px.xml
index edf4388ca4..829fce0474 100644
--- a/app/src/main/res/drawable/ic_outline_view_column_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_view_column_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M4,5v13h17V5H4zM14,7v9h-3V7H14zM6,7h3v9H6V7zM19,16h-3V7h3V16z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M4,5v13h17V5H4zM14,7v9h-3V7H14zM6,7h3v9H6V7zM19,16h-3V7h3V16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_work_outline_24px.xml b/app/src/main/res/drawable/ic_outline_work_outline_24px.xml
index 95b4499a9b..c9abb2066e 100644
--- a/app/src/main/res/drawable/ic_outline_work_outline_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_work_outline_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M14,6V4h-4v2H14zM4,8v11h16V8H4zM20,6c1.11,0 2,0.89 2,2v11c0,1.11 -0.89,2 -2,2H4c-1.11,0 -2,-0.89 -2,-2L2.01,8c0,-1.11 0.88,-2 1.99,-2h4V4c0,-1.11 0.89,-2 2,-2h4c1.11,0 2,0.89 2,2v2H20z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M14,6V4h-4v2H14zM4,8v11h16V8H4zM20,6c1.11,0 2,0.89 2,2v11c0,1.11 -0.89,2 -2,2H4c-1.11,0 -2,-0.89 -2,-2L2.01,8c0,-1.11 0.88,-2 1.99,-2h4V4c0,-1.11 0.89,-2 2,-2h4c1.11,0 2,0.89 2,2v2H20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pie_chart.xml b/app/src/main/res/drawable/ic_pie_chart.xml
index 6fa7616854..f18e5005fc 100644
--- a/app/src/main/res/drawable/ic_pie_chart.xml
+++ b/app/src/main/res/drawable/ic_pie_chart.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M13,2.05v3.03c3.39,0.49 6,3.39 6,6.92 0,0.9 -0.18,1.75 -0.48,2.54l2.6,1.53c0.56,-1.24 0.88,-2.62 0.88,-4.07 0,-5.18 -3.95,-9.45 -9,-9.95zM12,19c-3.87,0 -7,-3.13 -7,-7 0,-3.53 2.61,-6.43 6,-6.92V2.05c-5.06,0.5 -9,4.76 -9,9.95 0,5.52 4.47,10 9.99,10 3.31,0 6.24,-1.61 8.06,-4.09l-2.6,-1.53C16.17,17.98 14.21,19 12,19z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow.xml b/app/src/main/res/drawable/ic_play_arrow.xml
index 81a8f74f6e..d670cd1644 100644
--- a/app/src/main/res/drawable/ic_play_arrow.xml
+++ b/app/src/main/res/drawable/ic_play_arrow.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_room_icon.xml b/app/src/main/res/drawable/ic_room_icon.xml
index bd336ff08f..3cf8de77ee 100644
--- a/app/src/main/res/drawable/ic_room_icon.xml
+++ b/app/src/main/res/drawable/ic_room_icon.xml
@@ -1,12 +1,12 @@
 <vector android:height="24dp" android:viewportHeight="640"
     android:viewportWidth="640" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0" android:fillColor="#FF000000"
+    <path android:fillAlpha="0" android:fillColor="@color/text_primary"
         android:pathData="M150.75,555.77L386,590.91L386,56.75L148.48,105.46L150.75,555.77Z"
-        android:strokeAlpha="1" android:strokeColor="#ffffff" android:strokeWidth="40"/>
-    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:strokeAlpha="1" android:strokeColor="@color/text_primary" android:strokeWidth="40"/>
+    <path android:fillAlpha="0" android:fillColor="@color/text_primary"
         android:pathData="M386,548.57L476.13,548.57L476.13,105.14L386,105.14L386,548.57Z"
-        android:strokeAlpha="1" android:strokeColor="#ffffff" android:strokeWidth="40"/>
-    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:strokeAlpha="1" android:strokeColor="@color/text_primary" android:strokeWidth="40"/>
+    <path android:fillAlpha="0" android:fillColor="@color/text_primary"
         android:pathData="M339.84,320.52L275.71,320"
-        android:strokeAlpha="1" android:strokeColor="#ffffff" android:strokeWidth="40"/>
+        android:strokeAlpha="1" android:strokeColor="@color/text_primary" android:strokeWidth="40"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_rss.xml b/app/src/main/res/drawable/ic_rss.xml
index 5aab0b203a..c61ef17cf6 100644
--- a/app/src/main/res/drawable/ic_rss.xml
+++ b/app/src/main/res/drawable/ic_rss.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="15.0"
         android:viewportWidth="15.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="m2,6 l0,2c2.76,0 5,2.24 5,5l2,0C9,9.13 5.87,6 2,6ZM2,10l0,3 3,0C5,11.34 3.66,10 2,10ZM2,2 L2,4c4.97,0 9,4.03 9,9l2,0C13,6.92 8.08,2 2,2Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_black_24dp.xml b/app/src/main/res/drawable/ic_star_black_24dp.xml
index 61ae31a5bc..55b082e9eb 100644
--- a/app/src/main/res/drawable/ic_star_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stop_sync_cloud.xml b/app/src/main/res/drawable/ic_stop_sync_cloud.xml
index 0d795d6ba3..b2a016c157 100644
--- a/app/src/main/res/drawable/ic_stop_sync_cloud.xml
+++ b/app/src/main/res/drawable/ic_stop_sync_cloud.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/text_primary"
         android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
 </vector>
diff --git a/app/src/main/res/drawable/meal_beef.xml b/app/src/main/res/drawable/meal_beef.xml
index f7b2348beb..ce0cf8883c 100644
--- a/app/src/main/res/drawable/meal_beef.xml
+++ b/app/src/main/res/drawable/meal_beef.xml
@@ -5,6 +5,6 @@
         android:width="24dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/text_primary"
         android:pathData="M473,155.5l-51.3,-53.5l22.3,-14.2l1.3,-11.1l-10.3,-0.6l-26.8,19.3l-33.5,0l-20.5,-12.5l-7.3,1.5l0.1,8.1l13.2,14.6l-1.7,7.7l-155.5,16.7l-161.1,-4.5l-17.4,7.3l-12.8,16.2l-6.6,38l-1.2,27.3l-4,25.5l1.1,25.4l4.5,0.9l6.5,-7.2l5.3,-23.8l-4.3,-33.1l1.5,-0.2l10.1,50.3l-6.9,43.7l6.3,87.2l0.6,9.7l6.1,5.2l27.1,0l8.7,-2.6l-24.2,-39.4l12,-50.1l6.3,0l21.9,66.6l11.3,17.1l5.6,3.4l29.9,0l3.8,-4.8l-25.9,-15.9l-17.5,-54l4.4,-8.8l10.3,1l6.5,15.8l9.4,-15.4l9.1,15.5l7.7,-16.8l22.6,-17.4l80.3,-7.7l13.5,16.5l11.4,80.5l6,11.6l27.4,-0l2.9,-4.3l-16.6,-23.1l-2,-44.1l9,5l9.5,29.3l12,38l5.4,4.2l24.5,0l2,-5.5l-7.2,-6.6l-23.1,-45.1l5.3,-47.3l25.9,-19.1l37.7,-70l43.4,-20l39.9,-4.5l3.4,-3.7l5.6,-15.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/popcorn_placeholder.xml b/app/src/main/res/drawable/popcorn_placeholder.xml
index 857c264c68..567fb47a35 100644
--- a/app/src/main/res/drawable/popcorn_placeholder.xml
+++ b/app/src/main/res/drawable/popcorn_placeholder.xml
@@ -1,11 +1,11 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="640" android:viewportWidth="640"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="@color/white" android:pathData="M531.19,206.61L465.96,559.21C418.32,568.3 370.85,572.84 323.54,572.84C276.23,572.84 229.09,568.3 182.12,559.21L118.65,206.61L531.19,206.61Z"/>
+    <path android:fillAlpha="1" android:fillColor="@color/default_window_background" android:pathData="M531.19,206.61L465.96,559.21C418.32,568.3 370.85,572.84 323.54,572.84C276.23,572.84 229.09,568.3 182.12,559.21L118.65,206.61L531.19,206.61Z"/>
     <path
         android:pathData="M531.19,206.61L465.96,559.21C418.32,568.3 370.85,572.84 323.54,572.84C276.23,572.84 229.09,568.3 182.12,559.21L118.65,206.61L531.19,206.61Z"
         android:strokeAlpha="1" android:strokeColor="@color/text_light_gray" android:strokeWidth="10"/>
-    <path android:fillAlpha="1" android:fillColor="#f4f4f4" android:pathData="M319.58,254.81C383.39,254.81 449.27,238.74 517.24,206.61C523.02,199.53 525.91,192.14 525.91,184.43C525.91,176.71 522.16,169.62 514.65,163.16C516.74,151.07 515.28,142.52 510.27,137.51C505.27,132.51 496.72,131.05 484.63,133.14C496.73,129.66 502.99,125.42 503.41,120.42C503.83,115.41 498.4,109.65 487.13,103.11C482.77,86.75 475.48,77.94 465.27,76.69C459.49,75.98 448.75,63.32 438.89,68.04C432.32,71.2 427.96,80.38 425.83,95.61C420.82,82.05 413.74,71.63 404.56,64.33C399.24,60.1 406.2,46.19 397.75,43.06C392.12,40.98 383.13,43.9 370.78,51.82C370.24,42.22 367.32,36.06 362.03,33.35C356.73,30.64 349.07,30.64 339.02,33.35C325.92,26.26 316.49,23.35 310.74,24.6C304.98,25.85 302.89,32 304.48,43.06C281.34,37.81 265.91,39.26 258.19,47.39C250.48,55.52 250.48,70.34 258.19,91.85C247.98,84.35 238.8,80.59 230.67,80.59C222.54,80.59 215.45,84.35 209.4,91.85C200.44,86.27 192.93,84.94 186.88,87.85C180.84,90.77 176.25,97.94 173.12,109.37C158.86,117.91 152.88,125.84 155.17,133.14C157.46,140.43 163.45,147.11 173.12,153.15C158.01,151.75 147.21,153.47 140.71,158.31C133.08,163.98 136.79,179.36 131.84,184.43C128.31,188.04 126.14,189.72 125.32,192.74C124.03,197.57 126.2,202.19 131.84,206.61C193.2,238.74 255.78,254.81 319.58,254.81Z"/>
+    <path android:fillAlpha="1" android:fillColor="@color/default_window_background" android:pathData="M319.58,254.81C383.39,254.81 449.27,238.74 517.24,206.61C523.02,199.53 525.91,192.14 525.91,184.43C525.91,176.71 522.16,169.62 514.65,163.16C516.74,151.07 515.28,142.52 510.27,137.51C505.27,132.51 496.72,131.05 484.63,133.14C496.73,129.66 502.99,125.42 503.41,120.42C503.83,115.41 498.4,109.65 487.13,103.11C482.77,86.75 475.48,77.94 465.27,76.69C459.49,75.98 448.75,63.32 438.89,68.04C432.32,71.2 427.96,80.38 425.83,95.61C420.82,82.05 413.74,71.63 404.56,64.33C399.24,60.1 406.2,46.19 397.75,43.06C392.12,40.98 383.13,43.9 370.78,51.82C370.24,42.22 367.32,36.06 362.03,33.35C356.73,30.64 349.07,30.64 339.02,33.35C325.92,26.26 316.49,23.35 310.74,24.6C304.98,25.85 302.89,32 304.48,43.06C281.34,37.81 265.91,39.26 258.19,47.39C250.48,55.52 250.48,70.34 258.19,91.85C247.98,84.35 238.8,80.59 230.67,80.59C222.54,80.59 215.45,84.35 209.4,91.85C200.44,86.27 192.93,84.94 186.88,87.85C180.84,90.77 176.25,97.94 173.12,109.37C158.86,117.91 152.88,125.84 155.17,133.14C157.46,140.43 163.45,147.11 173.12,153.15C158.01,151.75 147.21,153.47 140.71,158.31C133.08,163.98 136.79,179.36 131.84,184.43C128.31,188.04 126.14,189.72 125.32,192.74C124.03,197.57 126.2,202.19 131.84,206.61C193.2,238.74 255.78,254.81 319.58,254.81Z"/>
     <path
         android:pathData="M319.58,254.81C383.39,254.81 449.27,238.74 517.24,206.61C523.02,199.53 525.91,192.14 525.91,184.43C525.91,176.71 522.16,169.62 514.65,163.16C516.74,151.07 515.28,142.52 510.27,137.51C505.27,132.51 496.72,131.05 484.63,133.14C496.73,129.66 502.99,125.42 503.41,120.42C503.83,115.41 498.4,109.65 487.13,103.11C482.77,86.75 475.48,77.94 465.27,76.69C459.49,75.98 448.75,63.32 438.89,68.04C432.32,71.2 427.96,80.38 425.83,95.61C420.82,82.05 413.74,71.63 404.56,64.33C399.24,60.1 406.2,46.19 397.75,43.06C392.12,40.98 383.13,43.9 370.78,51.82C370.24,42.22 367.32,36.06 362.03,33.35C356.73,30.64 349.07,30.64 339.02,33.35C325.92,26.26 316.49,23.35 310.74,24.6C304.98,25.85 302.89,32 304.48,43.06C281.34,37.81 265.91,39.26 258.19,47.39C250.48,55.52 250.48,70.34 258.19,91.85C247.98,84.35 238.8,80.59 230.67,80.59C222.54,80.59 215.45,84.35 209.4,91.85C200.44,86.27 192.93,84.94 186.88,87.85C180.84,90.77 176.25,97.94 173.12,109.37C158.86,117.91 152.88,125.84 155.17,133.14C157.46,140.43 163.45,147.11 173.12,153.15C158.01,151.75 147.21,153.47 140.71,158.31C133.08,163.98 136.79,179.36 131.84,184.43C128.31,188.04 126.14,189.72 125.32,192.74C124.03,197.57 126.2,202.19 131.84,206.61C193.2,238.74 255.78,254.81 319.58,254.81Z"
         android:strokeAlpha="1" android:strokeColor="@color/text_light_gray" android:strokeWidth="10"/>
@@ -21,11 +21,11 @@
     <path
         android:pathData="M432.48,417.74C396.8,378.48 361.12,358.85 325.43,358.85C289.75,358.85 254.07,378.48 218.39,417.74"
         android:strokeAlpha="1" android:strokeColor="@color/text_light_gray" android:strokeWidth="10"/>
-    <path android:fillAlpha="1" android:fillColor="#f4f4f4" android:pathData="M121.9,584.19C128.18,584.19 132.69,577.09 135.43,562.89C146.01,552.42 150.24,544.96 148.12,540.52C145.99,536.09 139.38,537.47 128.26,544.66C115.78,534.63 107.45,531.83 103.29,536.26C99.13,540.7 101.4,548.72 110.09,560.31C111.68,576.23 115.62,584.19 121.9,584.19Z"/>
+    <path android:fillAlpha="1" android:fillColor="@color/default_window_background" android:pathData="M121.9,584.19C128.18,584.19 132.69,577.09 135.43,562.89C146.01,552.42 150.24,544.96 148.12,540.52C145.99,536.09 139.38,537.47 128.26,544.66C115.78,534.63 107.45,531.83 103.29,536.26C99.13,540.7 101.4,548.72 110.09,560.31C111.68,576.23 115.62,584.19 121.9,584.19Z"/>
     <path
         android:pathData="M121.9,584.19C128.18,584.19 132.69,577.09 135.43,562.89C146.01,552.42 150.24,544.96 148.12,540.52C145.99,536.09 139.38,537.47 128.26,544.66C115.78,534.63 107.45,531.83 103.29,536.26C99.13,540.7 101.4,548.72 110.09,560.31C111.68,576.23 115.62,584.19 121.9,584.19Z"
         android:strokeAlpha="1" android:strokeColor="@color/text_light_gray" android:strokeWidth="10"/>
-    <path android:fillAlpha="1" android:fillColor="#f4f4f4" android:pathData="M134.18,596.53C134.18,601.02 139.08,608.99 148.88,620.45C157.93,629.6 164.59,633.19 168.85,631.21C173.1,629.24 174.95,621.71 174.4,608.61C185.6,595.58 191.2,586.38 191.2,581C191.2,575.62 185.6,574.06 174.4,576.33C167.07,572.33 161.27,571.77 157.02,574.64C152.76,577.51 150.05,583.81 148.88,593.54C139.08,591.05 134.18,592.05 134.18,596.53Z"/>
+    <path android:fillAlpha="1" android:fillColor="@color/default_window_background" android:pathData="M134.18,596.53C134.18,601.02 139.08,608.99 148.88,620.45C157.93,629.6 164.59,633.19 168.85,631.21C173.1,629.24 174.95,621.71 174.4,608.61C185.6,595.58 191.2,586.38 191.2,581C191.2,575.62 185.6,574.06 174.4,576.33C167.07,572.33 161.27,571.77 157.02,574.64C152.76,577.51 150.05,583.81 148.88,593.54C139.08,591.05 134.18,592.05 134.18,596.53Z"/>
     <path
         android:pathData="M134.18,596.53C134.18,601.02 139.08,608.99 148.88,620.45C157.93,629.6 164.59,633.19 168.85,631.21C173.1,629.24 174.95,621.71 174.4,608.61C185.6,595.58 191.2,586.38 191.2,581C191.2,575.62 185.6,574.06 174.4,576.33C167.07,572.33 161.27,571.77 157.02,574.64C152.76,577.51 150.05,583.81 148.88,593.54C139.08,591.05 134.18,592.05 134.18,596.53Z"
         android:strokeAlpha="1" android:strokeColor="@color/text_light_gray" android:strokeWidth="10"/>
diff --git a/app/src/main/res/drawable/rounded_corners_background.xml b/app/src/main/res/drawable/rounded_corners_background.xml
index 4baaca348b..ca87e205cf 100644
--- a/app/src/main/res/drawable/rounded_corners_background.xml
+++ b/app/src/main/res/drawable/rounded_corners_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/material_corner_radius" />
-    <solid android:color="#FFFFFF" />
+    <solid android:color="@color/default_window_background" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index 80b8320423..a7ba5dac09 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -15,7 +15,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/white"
             android:elevation="12dp"
             android:theme="@style/TumToolbar"
             app:popupTheme="@style/TumToolbarPopUp">
diff --git a/app/src/main/res/layout/activity_barrier_free_contact_listview.xml b/app/src/main/res/layout/activity_barrier_free_contact_listview.xml
index f30cee66b4..c80fbf224d 100644
--- a/app/src/main/res/layout/activity_barrier_free_contact_listview.xml
+++ b/app/src/main/res/layout/activity_barrier_free_contact_listview.xml
@@ -14,7 +14,7 @@
         android:id="@+id/barrierfreeContactNameTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
+        android:textColor="@color/text_primary"
         android:textSize="@dimen/large_text_size"
         android:textStyle="bold"
         tools:text="Person Name"/>
diff --git a/app/src/main/res/layout/activity_barrier_free_facilities.xml b/app/src/main/res/layout/activity_barrier_free_facilities.xml
index 239fe33f6f..c1cad446fa 100644
--- a/app/src/main/res/layout/activity_barrier_free_facilities.xml
+++ b/app/src/main/res/layout/activity_barrier_free_facilities.xml
@@ -21,7 +21,6 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@android:color/white"
                 android:elevation="12dp"
                 android:theme="@style/TumToolbar">
 
@@ -35,7 +34,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:entries="@array/barrier_free_facility_spinner_list"
-                        android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+                        android:popupTheme="@style/TumToolbarPopUp" />
 
                 </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_barrier_free_more_info_listview.xml b/app/src/main/res/layout/activity_barrier_free_more_info_listview.xml
index a65aacd05e..069b07cfd6 100644
--- a/app/src/main/res/layout/activity_barrier_free_more_info_listview.xml
+++ b/app/src/main/res/layout/activity_barrier_free_more_info_listview.xml
@@ -10,7 +10,7 @@
         android:id="@+id/barrierfreeMoreInfoTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
+        android:textColor="@color/text_primary"
         android:textSize="@dimen/large_text_size"
         tools:text="Title"/>
 
diff --git a/app/src/main/res/layout/activity_buy_ticket.xml b/app/src/main/res/layout/activity_buy_ticket.xml
index 30ec7dde61..b0eecb01cf 100644
--- a/app/src/main/res/layout/activity_buy_ticket.xml
+++ b/app/src/main/res/layout/activity_buy_ticket.xml
@@ -72,7 +72,7 @@
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/total"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_secondary"
+                        android:textColor="@color/text_secondary"
                         app:layout_constraintEnd_toEndOf="@id/guideline"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/ticketAmountsRecyclerView"/>
@@ -85,7 +85,7 @@
                         android:layout_marginEnd="@dimen/material_default_padding"
                         android:layout_marginStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         app:layout_constraintBaseline_toBaselineOf="@id/ticket_details_price_title"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@id/guideline"
@@ -115,7 +115,7 @@
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/event"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_secondary"
+                        android:textColor="@color/text_secondary"
                         app:layout_constraintEnd_toEndOf="@id/guideline"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/details_header_text_view"/>
@@ -128,7 +128,7 @@
                         android:layout_marginEnd="@dimen/material_default_padding"
                         android:layout_marginStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         app:layout_constraintBaseline_toBaselineOf="@id/ticket_details_event_title"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@id/guideline"
@@ -143,7 +143,7 @@
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/location"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_secondary"
+                        android:textColor="@color/text_secondary"
                         app:layout_constraintEnd_toEndOf="@id/guideline"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/eventName"/>
@@ -156,7 +156,7 @@
                         android:layout_marginEnd="@dimen/material_default_padding"
                         android:layout_marginStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         app:layout_constraintBaseline_toBaselineOf="@id/ticket_details_location_title"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@id/guideline"
@@ -171,7 +171,7 @@
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/date"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_secondary"
+                        android:textColor="@color/text_secondary"
                         app:layout_constraintEnd_toEndOf="@id/guideline"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/buyEventLocation"/>
@@ -184,7 +184,7 @@
                         android:layout_marginEnd="@dimen/material_default_padding"
                         android:layout_marginStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         app:layout_constraintBaseline_toBaselineOf="@id/ticket_details_date_title"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@id/guideline"
diff --git a/app/src/main/res/layout/activity_cafeteria_notification_settings.xml b/app/src/main/res/layout/activity_cafeteria_notification_settings.xml
index f5f7bb2094..1ecd28ef54 100644
--- a/app/src/main/res/layout/activity_cafeteria_notification_settings.xml
+++ b/app/src/main/res/layout/activity_cafeteria_notification_settings.xml
@@ -17,10 +17,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/material_default_padding"
-            android:drawableStart="@drawable/ic_action_info_black"
             android:drawablePadding="@dimen/material_default_padding"
             android:text="@string/favorite_dish_info"
-            android:textColor="#000000" />
+            app:drawableStartCompat="@drawable/ic_action_info" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/notificationSettingsRecyclerView"
@@ -29,7 +28,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/notificationSettingsSaveButton"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/BlueButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 7f25afe322..08c33bb8ec 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -37,7 +37,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#FFFFFF"
+                android:background="@color/default_window_background"
                 android:orientation="horizontal">
 
                 <EditText
diff --git a/app/src/main/res/layout/activity_chat_history_row_incoming.xml b/app/src/main/res/layout/activity_chat_history_row_incoming.xml
index 3ee7393454..b3aa78d745 100644
--- a/app/src/main/res/layout/activity_chat_history_row_incoming.xml
+++ b/app/src/main/res/layout/activity_chat_history_row_incoming.xml
@@ -26,7 +26,7 @@
         android:id="@+id/messageTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_dark_primary"
+        android:textColor="@color/text_primary"
         android:textSize="16sp"
         android:autoLink="all"
         tools:text="Message" />
diff --git a/app/src/main/res/layout/activity_chat_history_row_outgoing.xml b/app/src/main/res/layout/activity_chat_history_row_outgoing.xml
index bf42c9f9af..b161f26374 100644
--- a/app/src/main/res/layout/activity_chat_history_row_outgoing.xml
+++ b/app/src/main/res/layout/activity_chat_history_row_outgoing.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/material_tiny_padding"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             android:textSize="16sp"
             android:autoLink="all"
             tools:text="Message" />
diff --git a/app/src/main/res/layout/activity_create_event.xml b/app/src/main/res/layout/activity_create_event.xml
index f14c4f42ad..165cd6b788 100644
--- a/app/src/main/res/layout/activity_create_event.xml
+++ b/app/src/main/res/layout/activity_create_event.xml
@@ -58,7 +58,7 @@
                         android:gravity="center_vertical"
                         android:paddingStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         tools:ignore="RtlSymmetry"
                         tools:text="Mon, Jun 11, 2018" />
 
@@ -73,7 +73,7 @@
                         android:paddingStart="@dimen/material_default_padding"
                         android:paddingEnd="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         tools:text="11:30" />
 
                 </LinearLayout>
@@ -91,7 +91,7 @@
                         android:gravity="center_vertical"
                         android:paddingStart="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         tools:ignore="RtlSymmetry"
                         tools:text="Mon, Jun 11, 2018" />
 
@@ -106,7 +106,7 @@
                         android:paddingStart="@dimen/material_default_padding"
                         android:paddingEnd="@dimen/material_default_padding"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textColor="@color/text_dark_primary"
+                        android:textColor="@color/text_primary"
                         tools:text="12:30" />
 
                 </LinearLayout>
@@ -139,7 +139,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:hint="@string/ends_after"
-                            android:textColorHint="@color/text_dark_primary"
+                            android:textColorHint="@color/text_primary"
                             android:checked="true"/>
 
                         <RadioButton
@@ -148,7 +148,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:hint="@string/ends_on"
-                            android:textColorHint="@color/text_dark_primary"/>
+                            android:textColorHint="@color/text_primary"/>
 
                     </RadioGroup>
 
@@ -169,7 +169,7 @@
                                 android:hint="14"
                                 android:inputType="number"
                                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                                android:textColor="@color/text_dark_primary"/>
+                                android:textColor="@color/text_primary"/>
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -178,7 +178,7 @@
                                 android:focusable="true"
                                 android:gravity="center_vertical"
                                 android:text="@string/events"
-                                android:textColor="@color/text_dark_primary"/>
+                                android:textColor="@color/text_primary"/>
                         </LinearLayout>
                         <TextView
                             android:id="@+id/eventLastDateView"
@@ -189,7 +189,7 @@
                             android:focusable="true"
                             android:gravity="center_vertical"
                             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                            android:textColor="@color/text_dark_primary"
+                            android:textColor="@color/text_primary"
                             android:text="Mon, Jun 11, 2018"/>
 
                     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 363b197044..0e93023062 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
+    android:background="@color/default_window_background"
     android:orientation="horizontal"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
@@ -20,7 +20,7 @@
             android:id="@+id/courseNameTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/text_light_blue"
+            android:textColor="@color/color_primary"
             android:textSize="@dimen/large_text_size"
             android:textStyle="bold"
             tools:text="Course name" />
@@ -44,9 +44,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:layout_marginLeft="10dp"
         android:background="@drawable/grade_background"
         android:gravity="center"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="22sp"
         android:textStyle="bold"
         tools:text="1,0" />
diff --git a/app/src/main/res/layout/activity_information.xml b/app/src/main/res/layout/activity_information.xml
index 69e765917c..5ff5510d4e 100644
--- a/app/src/main/res/layout/activity_information.xml
+++ b/app/src/main/res/layout/activity_information.xml
@@ -37,7 +37,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_facebook"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    style="@style/BlueButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/material_default_padding"
@@ -45,11 +45,11 @@
                     android:text="@string/facebook"
                     android:textAllCaps="false"
                     app:cornerRadius="@dimen/material_corner_radius"
-                    app:icon="@drawable/ic_facebook_white" />
+                    app:icon="@drawable/ic_facebook" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_github"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    style="@style/BlueButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/material_default_padding"
@@ -57,11 +57,11 @@
                     android:text="@string/github_contribute"
                     android:textAllCaps="false"
                     app:cornerRadius="@dimen/material_corner_radius"
-                    app:icon="@drawable/ic_github_white" />
+                    app:icon="@drawable/ic_github" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_privacy"
-                    style="@style/Widget.MaterialComponents.Button"
+                    style="@style/BlueButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/material_default_padding"
@@ -72,7 +72,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_licenses"
-                    style="@style/Widget.MaterialComponents.Button"
+                    style="@style/BlueButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/material_default_padding"
diff --git a/app/src/main/res/layout/activity_lectures_listview.xml b/app/src/main/res/layout/activity_lectures_listview.xml
index dc4cc872dd..bb7c26ff84 100644
--- a/app/src/main/res/layout/activity_lectures_listview.xml
+++ b/app/src/main/res/layout/activity_lectures_listview.xml
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             android:textSize="18sp"
             tools:text="Lecture" />
 
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/text_dark_secondary"
+                android:textColor="@color/text_secondary"
                 android:textSize="16sp"
                 tools:text="Professor" />
 
diff --git a/app/src/main/res/layout/activity_lecturesappointments_listview.xml b/app/src/main/res/layout/activity_lecturesappointments_listview.xml
index c8d8501c5a..8d82cc8dc3 100644
--- a/app/src/main/res/layout/activity_lecturesappointments_listview.xml
+++ b/app/src/main/res/layout/activity_lecturesappointments_listview.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
-        android:textColor="@color/text_dark_primary"
+        android:textColor="@color/text_primary"
         android:textSize="18sp"
         tools:text="Date" />
 
@@ -20,7 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/material_tiny_padding"
-        android:textColor="@color/text_dark_secondary"
+        android:textColor="@color/text_secondary"
         android:textSize="16sp"
         tools:text="Details" />
 
@@ -28,7 +28,7 @@
         android:id="@+id/tvTerminBetreff"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_dark_secondary"
+        android:textColor="@color/text_secondary"
         android:textSize="16sp"
         tools:text="More details" />
 
diff --git a/app/src/main/res/layout/activity_payment_confirmation.xml b/app/src/main/res/layout/activity_payment_confirmation.xml
index 26a3f2a253..e3803820af 100644
--- a/app/src/main/res/layout/activity_payment_confirmation.xml
+++ b/app/src/main/res/layout/activity_payment_confirmation.xml
@@ -36,7 +36,7 @@
             android:gravity="center_horizontal"
             android:text="@string/thanks_for_your_purchase"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             app:layout_constraintBottom_toTopOf="@+id/bodyTextView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +50,7 @@
             android:gravity="center_horizontal"
             android:text="@string/tickets_saved_in_app"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_secondary"
+            android:textColor="@color/text_secondary"
             app:layout_constraintBottom_toTopOf="@+id/showTicketButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_payment_stripe.xml b/app/src/main/res/layout/activity_payment_stripe.xml
index 30dfa2973a..351905faaf 100644
--- a/app/src/main/res/layout/activity_payment_stripe.xml
+++ b/app/src/main/res/layout/activity_payment_stripe.xml
@@ -33,7 +33,7 @@
                     android:layout_marginEnd="@dimen/material_default_padding"
                     android:text="@string/enter_card_info_description"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/text_dark_secondary" />
+                    android:textColor="@color/text_secondary" />
 
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
@@ -94,7 +94,7 @@
                             android:layout_marginEnd="@dimen/material_default_padding"
                             android:layout_marginBottom="@dimen/material_default_padding"
                             android:alpha="0.54"
-                            android:src="@drawable/ic_credit_card_black_24dp"
+                            android:src="@drawable/ic_credit_card_24dp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toStartOf="@id/selected_payment_method_text_view"
                             app:layout_constraintStart_toStartOf="parent"
@@ -108,7 +108,7 @@
                             android:layout_marginEnd="@dimen/material_default_padding"
                             android:fontFamily="sans-serif-medium"
                             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                            android:textColor="@color/text_dark_secondary"
+                            android:textColor="@color/text_secondary"
                             app:layout_constraintBottom_toTopOf="@id/selected_payment_method_brand_text_view"
                             app:layout_constraintEnd_toStartOf="@id/changePaymentMethodButton"
                             app:layout_constraintStart_toEndOf="@id/credit_card_icon"
@@ -122,7 +122,7 @@
                             android:layout_marginEnd="@dimen/material_default_padding"
                             android:layout_marginBottom="@dimen/material_default_padding"
                             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                            android:textColor="@color/text_dark_secondary"
+                            android:textColor="@color/text_secondary"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toStartOf="@id/changePaymentMethodButton"
                             app:layout_constraintStart_toStartOf="@id/selected_payment_method_text_view"
diff --git a/app/src/main/res/layout/activity_person_details.xml b/app/src/main/res/layout/activity_person_details.xml
index f81c3d3ad6..8af97d752c 100644
--- a/app/src/main/res/layout/activity_person_details.xml
+++ b/app/src/main/res/layout/activity_person_details.xml
@@ -59,6 +59,7 @@
                             android:layout_height="wrap_content"
                             android:fontFamily="sans-serif-medium"
                             android:gravity="center_horizontal"
+                            android:textColor="@color/text_primary"
                             android:padding="@dimen/padding_default"
                             android:textSize="@dimen/large_text_size"
                             tools:text="Mr. Prof. Dr. Bernd Brügge" />
@@ -69,7 +70,7 @@
                             android:layout_height="1dp"
                             android:layout_marginTop="8dp"
                             android:layout_marginBottom="8dp"
-                            android:background="?android:attr/listDivider" />
+                            android:background="@color/list_divider" />
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/groupsRecyclerView"
@@ -84,7 +85,7 @@
                             android:layout_height="1dp"
                             android:layout_marginTop="8dp"
                             android:layout_marginBottom="8dp"
-                            android:background="?android:attr/listDivider" />
+                            android:background="@color/list_divider" />
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/contactItemsRecyclerView"
diff --git a/app/src/main/res/layout/activity_setup_eduroam.xml b/app/src/main/res/layout/activity_setup_eduroam.xml
index 05ddfa98cf..f574d1f408 100644
--- a/app/src/main/res/layout/activity_setup_eduroam.xml
+++ b/app/src/main/res/layout/activity_setup_eduroam.xml
@@ -100,7 +100,7 @@
                     android:textSize="15sp" />
 
                 <com.google.android.material.button.MaterialButton
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/BlueButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/material_small_padding"
@@ -134,7 +134,7 @@
             android:paddingBottom="@dimen/material_small_padding">
 
             <com.google.android.material.button.MaterialButton
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/BlueButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
@@ -144,7 +144,7 @@
                 app:cornerRadius="@dimen/material_corner_radius" />
 
             <com.google.android.material.button.MaterialButton
-                style="@style/Widget.MaterialComponents.Button"
+                style="@style/BlueButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/layout/card_news_item.xml b/app/src/main/res/layout/card_news_item.xml
index 3405a60231..e2fe53a7fb 100644
--- a/app/src/main/res/layout/card_news_item.xml
+++ b/app/src/main/res/layout/card_news_item.xml
@@ -27,9 +27,9 @@
             android:layout_width="@dimen/icon_default"
             android:layout_height="@dimen/icon_default"
             android:layout_margin="@dimen/material_small_padding"
-            android:alpha="0.7"
+            android:alpha="0.5"
             android:background="@drawable/circle_background"
-            android:backgroundTint="@android:color/white"
+            android:backgroundTint="@color/default_window_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/card_opening_hour_details.xml b/app/src/main/res/layout/card_opening_hour_details.xml
index e8796e4e74..a35ee184d8 100644
--- a/app/src/main/res/layout/card_opening_hour_details.xml
+++ b/app/src/main/res/layout/card_opening_hour_details.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="Location Name" />
 
         <TextView
@@ -82,7 +82,7 @@
             android:paddingTop="@dimen/material_small_padding"
             android:textAppearance="?android:attr/textAppearanceSmall"
             tools:text="Additional Information\nand more"
-            android:drawableStart="@drawable/ic_action_info_black"
+            android:drawableStart="@drawable/ic_action_info"
             android:drawablePadding="@dimen/material_small_padding"
             android:drawableTint="@color/text_dark_gray"
             android:layout_gravity="top"
@@ -90,13 +90,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/openLinkButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/BlueButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/material_tiny_padding"
             android:onClick="openLink"
             android:textAllCaps="false"
-            android:textColor="#006c90"
             android:layout_gravity="right"
             app:cornerRadius="@dimen/material_corner_radius"
             tools:text="@string/website" />
diff --git a/app/src/main/res/layout/card_restore.xml b/app/src/main/res/layout/card_restore.xml
index 44b190d8fa..e985732c70 100644
--- a/app/src/main/res/layout/card_restore.xml
+++ b/app/src/main/res/layout/card_restore.xml
@@ -1,4 +1,5 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/StandardCard">
 
     <FrameLayout
@@ -21,9 +22,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:drawablePadding="@dimen/material_default_padding"
-            android:drawableStart="@drawable/ic_action_restore"
             android:text="@string/restore_all_cards"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            app:drawableStartCompat="@drawable/ic_action_restore" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/card_header_details_button.xml b/app/src/main/res/layout/card_studyroom_detail.xml
similarity index 93%
rename from app/src/main/res/layout/card_header_details_button.xml
rename to app/src/main/res/layout/card_studyroom_detail.xml
index 9552b5877b..aeff42cdf7 100644
--- a/app/src/main/res/layout/card_header_details_button.xml
+++ b/app/src/main/res/layout/card_studyroom_detail.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_view"
+    app:strokeWidth="0.5dp"
     style="@style/StandardCard">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -21,7 +22,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -42,13 +43,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/openLinkButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/BlueButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/material_small_padding"
             android:onClick="openLink"
             android:textAllCaps="false"
-            android:textColor="#006c90"
             app:cornerRadius="@dimen/material_corner_radius"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/departure_line_big.xml b/app/src/main/res/layout/departure_line_big.xml
index 86489c7af1..bc27ca6854 100644
--- a/app/src/main/res/layout/departure_line_big.xml
+++ b/app/src/main/res/layout/departure_line_big.xml
@@ -31,6 +31,7 @@
         android:layout_marginEnd="@dimen/material_small_padding"
         android:layout_weight="1"
         android:textSize="16sp"
+        android:textColor="@color/text_primary"
         tools:text="Line name" />
 
     <TextSwitcher
@@ -45,14 +46,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="end"
-            android:textColor="@color/sections_gray"
+            android:textColor="@color/text_secondary"
             android:textSize="16sp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="end"
-            android:textColor="@color/sections_gray"
+            android:textColor="@color/text_secondary"
             android:textSize="16sp" />
 
     </TextSwitcher>
diff --git a/app/src/main/res/layout/departure_line_small.xml b/app/src/main/res/layout/departure_line_small.xml
index 15997175f0..990a4ab23a 100644
--- a/app/src/main/res/layout/departure_line_small.xml
+++ b/app/src/main/res/layout/departure_line_small.xml
@@ -27,7 +27,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/material_small_padding"
         android:layout_weight="1"
-        android:textColor="@color/text_dark_primary"
+        android:textColor="@color/text_primary"
         android:textSize="15sp"
         tools:text="Line name" />
 
@@ -43,13 +43,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="end|center_vertical"
-            android:textColor="@color/sections_gray" />
+            android:textColor="@color/text_secondary" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="end|center_vertical"
-            android:textColor="@color/sections_gray" />
+            android:textColor="@color/text_secondary" />
 
     </TextSwitcher>
 
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index e587cd09eb..1ae3bd827d 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/tum_light_gray"
+    android:background="@color/navigation_drawer_header_background"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:theme="@style/ThemeOverlay.AppCompat">
@@ -18,6 +18,7 @@
         android:layout_margin="@dimen/material_default_padding"
         android:text="@string/tumonline_login"
         android:textAllCaps="false"
+        android:textColor="@color/text_primary"
         android:visibility="gone"
         app:cornerRadius="@dimen/material_corner_radius"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml
index ce93954526..24f3589228 100644
--- a/app/src/main/res/layout/fragment_cafeteria.xml
+++ b/app/src/main/res/layout/fragment_cafeteria.xml
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/white"
+            android:background="@color/default_window_background"
             android:elevation="@dimen/material_default_elevation"
             android:theme="@style/TumToolbar">
 
diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
index 0e44c4d12b..7ee1ce2db7 100644
--- a/app/src/main/res/layout/fragment_calendar.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -29,16 +29,16 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:columnGap="1dp"
-                    app:dayBackgroundColor="@android:color/white"
+                    app:dayBackgroundColor="@color/default_window_background"
                     app:eventCornerRadius="4dp"
                     app:eventMarginVertical="2dp"
                     app:eventTextColor="@android:color/white"
                     app:eventTextSize="12dp"
-                    app:headerRowBackgroundColor="@android:color/white"
+                    app:headerRowBackgroundColor="@color/default_window_background"
                     app:headerRowBottomLineColor="@color/navigation_bar_divider"
                     app:headerRowBottomLineWidth="1dp"
                     app:headerRowPadding="12dp"
-                    app:headerRowTextColor="@color/text_dark_secondary"
+                    app:headerRowTextColor="@color/text_secondary"
                     app:headerRowTextSize="12dp"
                     app:hourHeight="60dp"
                     app:nowLineColor="@color/tum_blue"
@@ -48,10 +48,11 @@
                     app:showNowLine="true"
                     app:showTimeColumnSeparator="true"
                     app:singleDayHorizontalMargin="2dp"
+                    app:timeColumnBackgroundColor="@color/default_window_background"
                     app:timeColumnPadding="8dp"
                     app:timeColumnSeparatorColor="@color/navigation_bar_divider"
                     app:timeColumnSeparatorStrokeWidth="1dp"
-                    app:timeColumnTextColor="@color/text_dark_secondary"
+                    app:timeColumnTextColor="@color/text_secondary"
                     app:timeColumnTextSize="12dp"
                     app:todayBackgroundColor="#1848adff"
                     app:todayHeaderTextColor="@color/color_primary"
@@ -59,15 +60,13 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/todayButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/BlueButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end|bottom"
                     android:layout_margin="@dimen/material_default_padding"
                     android:text="@string/today"
                     android:visibility="visible"
-                    app:backgroundTint="@android:color/white"
-                    android:textColor="@color/black"
                     app:cornerRadius="@dimen/material_corner_radius"
                     tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/fragment_calendar_details.xml b/app/src/main/res/layout/fragment_calendar_details.xml
index 64a07d9b8e..62e7565146 100644
--- a/app/src/main/res/layout/fragment_calendar_details.xml
+++ b/app/src/main/res/layout/fragment_calendar_details.xml
@@ -2,6 +2,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:theme="@style/AppTheme"
+    android:background="@color/default_window_background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -83,10 +85,10 @@
             android:layout_marginTop="@dimen/material_small_padding"
             android:layout_marginEnd="@dimen/material_default_padding"
             android:layout_marginBottom="@dimen/material_small_padding"
-            android:drawableStart="@drawable/ic_outline_access_time_24px"
             android:drawablePadding="@dimen/material_default_padding"
             android:textAppearance="@android:style/TextAppearance.Medium"
-            tools:text="Date" />
+            tools:text="Date"
+            app:drawableStartCompat="@drawable/ic_outline_access_time_24px" />
 
         <TextView
             android:id="@+id/descriptionTextView"
@@ -97,10 +99,10 @@
             android:layout_marginTop="@dimen/material_small_padding"
             android:layout_marginEnd="@dimen/material_default_padding"
             android:layout_marginBottom="@dimen/material_default_padding"
-            android:drawableStart="@drawable/ic_action_info_black"
             android:drawablePadding="@dimen/material_default_padding"
             android:textAppearance="@android:style/TextAppearance.Medium"
-            tools:text="Description" />
+            tools:text="Description"
+            app:drawableStartCompat="@drawable/ic_action_info" />
 
         <LinearLayout
             android:id="@+id/buttonsContainer"
@@ -114,25 +116,21 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/deleteButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/BlueButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/delete_event_button"
                 android:textAllCaps="false"
-                android:textColor="@color/color_primary"
-                android:theme="@style/AppTheme"
                 app:cornerRadius="@dimen/material_corner_radius" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/editButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/BlueButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/material_small_padding"
                 android:text="@string/edit_event_button"
                 android:textAllCaps="false"
-                android:textColor="@color/color_primary"
-                android:theme="@style/AppTheme"
                 app:cornerRadius="@dimen/material_corner_radius" />
 
         </LinearLayout>
@@ -152,7 +150,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/showInCalendarButton"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/BlueButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/material_default_padding"
@@ -162,8 +160,6 @@
                 android:gravity="start|center_vertical"
                 android:text="@string/show_in_calendar"
                 android:textAllCaps="false"
-                android:textColor="@color/color_primary"
-                android:theme="@style/AppTheme"
                 app:cornerRadius="@dimen/material_corner_radius" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_chat_rooms.xml b/app/src/main/res/layout/fragment_chat_rooms.xml
index 034cf8e9b3..15221a01ab 100644
--- a/app/src/main/res/layout/fragment_chat_rooms.xml
+++ b/app/src/main/res/layout/fragment_chat_rooms.xml
@@ -14,7 +14,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/white"
             android:theme="@style/TumToolbar"
             app:popupTheme="@style/TumToolbarPopUp" />
 
@@ -22,13 +21,13 @@
             android:id="@+id/chatRoomTabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
+            android:background="@color/default_window_background"
             android:theme="@style/ThemeOverlay.AppCompat.Dark"
             app:tabIndicatorColor="@color/color_primary"
             app:tabIndicatorHeight="2dp"
             app:tabMode="fixed"
             app:tabSelectedTextColor="@color/color_primary"
-            app:tabTextColor="@color/text_dark_secondary" />
+            app:tabTextColor="@color/text_secondary" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_event_details.xml b/app/src/main/res/layout/fragment_event_details.xml
index d4ade2f081..c1bff5957b 100644
--- a/app/src/main/res/layout/fragment_event_details.xml
+++ b/app/src/main/res/layout/fragment_event_details.xml
@@ -81,7 +81,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/text_dark_primary"
+                    android:textColor="@color/text_primary"
                     tools:text="Date" />
 
             </LinearLayout>
@@ -113,7 +113,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/text_dark_primary"
+                    android:textColor="@color/text_primary"
                     tools:text="Remaining" />
 
             </LinearLayout>
@@ -146,7 +146,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/text_dark_primary"
+                    android:textColor="@color/text_primary"
                     tools:text="Location" />
 
             </LinearLayout>
@@ -173,7 +173,7 @@
                 android:layout_marginEnd="@dimen/material_default_padding"
                 android:layout_marginBottom="@dimen/material_default_padding"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textColor="@color/text_dark_primary"
+                android:textColor="@color/text_primary"
                 app:layout_constraintBottom_toTopOf="@id/linkButton"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_events.xml b/app/src/main/res/layout/fragment_events.xml
index 866a8d7843..fb5e4bfd96 100644
--- a/app/src/main/res/layout/fragment_events.xml
+++ b/app/src/main/res/layout/fragment_events.xml
@@ -14,7 +14,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/white"
             android:theme="@style/TumToolbar"
             app:popupTheme="@style/TumToolbarPopUp" />
 
@@ -22,13 +21,12 @@
             android:id="@+id/event_tab"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark"
+            android:background="@color/default_window_background"
             app:tabIndicatorColor="@color/color_primary"
             app:tabIndicatorHeight="2dp"
             app:tabMode="fixed"
             app:tabSelectedTextColor="@color/color_primary"
-            app:tabTextColor="@color/text_dark_secondary" />
+            app:tabTextColor="@color/text_secondary" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 1a0bf1f033..b9901c76e5 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -15,7 +15,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/white"
             android:elevation="12dp"
             android:theme="@style/TumToolbar"
             app:popupTheme="@style/TumToolbarPopUp">
@@ -45,6 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="200dp"
             android:padding="@dimen/material_default_padding"
+            android:background="@color/default_window_background"
             android:visibility="invisible">
 
             <com.github.mikephil.charting.charts.PieChart
@@ -82,16 +82,15 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#EEE"
+        android:background="@color/pop_up_background"
         android:padding="@dimen/material_default_padding">
 
         <TextView
             android:id="@+id/averageGradeTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-medium"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="#757575"
+            android:textStyle="bold"
+            android:textColor="@color/text_light_blue"
             android:textSize="@dimen/semilarge_text_size"
             android:visibility="visible"
             tools:text="Average grade: 1.0" />
diff --git a/app/src/main/res/layout/fragment_kinodetails_section.xml b/app/src/main/res/layout/fragment_kinodetails_section.xml
index a881eb07a4..41ab56da3b 100644
--- a/app/src/main/res/layout/fragment_kinodetails_section.xml
+++ b/app/src/main/res/layout/fragment_kinodetails_section.xml
@@ -111,7 +111,7 @@
                 android:drawableTop="@drawable/ic_outline_event_24px"
                 android:gravity="center_horizontal"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                android:textColor="@color/text_dark_primary"
+                android:textColor="@color/text_primary"
                 tools:text="10/11"/>
 
             <TextView
@@ -123,7 +123,7 @@
                 android:drawableTop="@drawable/ic_outline_access_time_24px"
                 android:gravity="center_horizontal"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                android:textColor="@color/text_dark_primary"
+                android:textColor="@color/text_primary"
                 tools:text="135 min"/>
 
             <TextView
@@ -135,7 +135,7 @@
                 android:drawableTop="@drawable/ic_star_black_24dp"
                 android:gravity="center_horizontal"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                android:textColor="@color/text_dark_primary"
+                android:textColor="@color/text_primary"
                 tools:text="7 / 10"/>
 
         </LinearLayout>
@@ -178,7 +178,7 @@
                     android:layout_marginStart="@dimen/material_default_padding"
                     android:lineSpacingMultiplier="1.1"
                     android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/text_dark_primary"
+                    android:textColor="@color/text_primary"
                     tools:text="Actors"/>
             </LinearLayout>
 
@@ -201,7 +201,7 @@
                 android:layout_marginStart="@dimen/material_default_padding"
                 android:lineSpacingMultiplier="1.1"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                android:textColor="@color/text_dark_primary"
+                android:textColor="@color/text_primary"
                 tools:text="Actors"/>
 
         </LinearLayout>
@@ -221,7 +221,7 @@
             android:layout_marginStart="@dimen/material_default_padding"
             android:lineSpacingMultiplier="1.1"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="Lorem ipsum dolor sit amet"/>
 
         <View
@@ -249,7 +249,7 @@
             android:layout_marginStart="@dimen/material_default_padding"
             android:lineSpacingMultiplier="1.1"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="Genres"/>
 
         <TextView
@@ -270,7 +270,7 @@
             android:layout_marginEnd="@dimen/material_default_padding"
             android:layout_marginStart="@dimen/material_default_padding"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="2018"/>
 
         <TextView
@@ -292,7 +292,7 @@
             android:layout_marginStart="@dimen/material_default_padding"
             android:lineSpacingMultiplier="1.1"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="Actors"/>
 
         <TextView
@@ -313,7 +313,7 @@
             android:layout_marginEnd="@dimen/material_default_padding"
             android:layout_marginStart="@dimen/material_default_padding"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             tools:text="Director"/>
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_onboarding_extras.xml b/app/src/main/res/layout/fragment_onboarding_extras.xml
index bc75ea0c15..6e0d8e7d09 100644
--- a/app/src/main/res/layout/fragment_onboarding_extras.xml
+++ b/app/src/main/res/layout/fragment_onboarding_extras.xml
@@ -87,7 +87,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/privacyPolicyButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/BlueButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
@@ -95,7 +95,6 @@
                     android:layout_marginTop="@dimen/material_default_padding"
                     android:text="@string/privacy_policy"
                     android:textAllCaps="false"
-                    android:textColor="@color/color_primary"
                     app:cornerRadius="@dimen/material_corner_radius" />
 
             </LinearLayout>
@@ -121,7 +120,7 @@
         android:layout_marginBottom="@dimen/material_small_padding"
         android:text="@string/goto_tumcampus"
         android:textAllCaps="false"
-        android:textColor="@android:color/white"
+        android:textColor="@color/white"
         app:backgroundTint="@color/color_primary"
         app:cornerRadius="@dimen/material_corner_radius" />
 
diff --git a/app/src/main/res/layout/fragment_study_rooms.xml b/app/src/main/res/layout/fragment_study_rooms.xml
index dd07f582e8..7ed58076f0 100644
--- a/app/src/main/res/layout/fragment_study_rooms.xml
+++ b/app/src/main/res/layout/fragment_study_rooms.xml
@@ -17,7 +17,7 @@
         android:id="@+id/spinnerContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/secondary_window_background"
+        android:background="@color/default_window_background"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_tuition_fees.xml b/app/src/main/res/layout/fragment_tuition_fees.xml
index be3644fe78..2b34178da2 100644
--- a/app/src/main/res/layout/fragment_tuition_fees.xml
+++ b/app/src/main/res/layout/fragment_tuition_fees.xml
@@ -77,7 +77,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/financialAidButton"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/BlueButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/material_default_padding"
@@ -85,7 +85,6 @@
                         android:layout_marginBottom="@dimen/material_default_padding"
                         android:text="@string/student_financial_aid"
                         android:textAllCaps="false"
-                        android:textColor="@color/color_primary"
                         app:cornerRadius="@dimen/material_corner_radius" />
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_error.xml b/app/src/main/res/layout/layout_error.xml
index 2754fb0e4a..efe4ba0ed6 100644
--- a/app/src/main/res/layout/layout_error.xml
+++ b/app/src/main/res/layout/layout_error.xml
@@ -38,13 +38,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/BlueButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/material_default_padding"
         android:text="@string/retry"
         android:textAllCaps="false"
-        android:textColor="@color/color_primary"
         app:cornerRadius="@dimen/material_corner_radius" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_drawer.xml b/app/src/main/res/layout/navigation_drawer.xml
index 98432061e4..b20372b085 100644
--- a/app/src/main/res/layout/navigation_drawer.xml
+++ b/app/src/main/res/layout/navigation_drawer.xml
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="start"
     android:fitsSystemWindows="true"
+    android:backgroundTint="@color/navigation_drawer_background"
     app:itemBackground="@drawable/navigation_drawer_item_background_selector"
     app:itemIconTint="@color/navigation_drawer_icon_tint_selector"
     app:itemTextColor="@color/navigation_drawer_item_text_selector" />
diff --git a/app/src/main/res/layout/notification_schedule_listitem.xml b/app/src/main/res/layout/notification_schedule_listitem.xml
index fd5f78e11d..2f93105e3e 100644
--- a/app/src/main/res/layout/notification_schedule_listitem.xml
+++ b/app/src/main/res/layout/notification_schedule_listitem.xml
@@ -14,7 +14,7 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/text_dark_primary"
+        android:textColor="@color/text_primary"
         tools:text="Monday" />
 
     <TextView
@@ -26,7 +26,7 @@
         android:paddingStart="@dimen/material_default_padding"
         android:paddingEnd="@dimen/material_default_padding"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/text_dark_primary"
+        android:textColor="@color/text_secondary"
         tools:text="9:30" />
 
     <CheckBox
diff --git a/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar.xml b/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar.xml
index 71f2026a4e..981b9e372f 100644
--- a/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar.xml
+++ b/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar.xml
@@ -11,5 +11,5 @@
     android:maxLines="1"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingEnd="@dimen/material_default_padding"
-    android:textColor="@color/text_dark_secondary"
+    android:textColor="@color/text_secondary"
     tools:text="Text" />
diff --git a/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar_two_line.xml b/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar_two_line.xml
index 77324cdd17..59d963ddc7 100644
--- a/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar_two_line.xml
+++ b/app/src/main/res/layout/simple_spinner_dropdown_item_actionbar_two_line.xml
@@ -4,7 +4,7 @@
     style="?android:attr/spinnerDropDownItemStyle"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:background="@android:color/background_light"
+    android:background="@color/default_window_background"
     android:foreground="?android:selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="vertical"
@@ -23,7 +23,7 @@
             android:layout_weight="1"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:textColor="@color/text_dark_secondary"
+            android:textColor="@color/text_primary"
             android:textSize="16sp"
             tools:text="Text 1" />
 
@@ -35,7 +35,7 @@
             android:ellipsize="marquee"
             android:gravity="end"
             android:singleLine="true"
-            android:textColor="@color/text_dark_secondary"
+            android:textColor="@color/text_secondary"
             android:textSize="14sp"
             tools:text="Distance" />
 
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/text_dark_secondary"
+        android:textColor="@color/text_secondary"
         android:textSize="12sp"
         tools:text="Text 2" />
 
diff --git a/app/src/main/res/layout/simple_spinner_item_actionbar.xml b/app/src/main/res/layout/simple_spinner_item_actionbar.xml
index 8e1ab4aee6..01ca406759 100644
--- a/app/src/main/res/layout/simple_spinner_item_actionbar.xml
+++ b/app/src/main/res/layout/simple_spinner_item_actionbar.xml
@@ -5,7 +5,7 @@
     style="?android:attr/spinnerItemStyle"
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeightSmall"
-    android:background="@android:color/white"
+    android:background="@color/default_window_background"
     android:ellipsize="end"
     android:gravity="center_vertical"
     android:maxLines="1"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 04e6b37554..c711fabab5 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -9,7 +9,6 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@android:color/white"
         android:elevation="@dimen/material_default_elevation"
         android:theme="@style/TumToolbar"
         app:popupTheme="@style/TumToolbarPopUp"/>
diff --git a/app/src/main/res/layout/view_header_logged_in.xml b/app/src/main/res/layout/view_header_logged_in.xml
index 695d341fe0..3987cd0548 100644
--- a/app/src/main/res/layout/view_header_logged_in.xml
+++ b/app/src/main/res/layout/view_header_logged_in.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-medium"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="@color/text_dark_primary"
+            android:textColor="@color/text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/profileImageView"
             app:layout_constraintTop_toTopOf="@id/profileImageView"
@@ -40,7 +40,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/text_dark_secondary"
+            android:textColor="@color/text_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/profileImageView"
             app:layout_constraintTop_toBottomOf="@id/nameTextView"
diff --git a/app/src/main/res/menu/chat_context_menu.xml b/app/src/main/res/menu/chat_context_menu.xml
index 40ef8dd48b..1fb60b7a59 100644
--- a/app/src/main/res/menu/chat_context_menu.xml
+++ b/app/src/main/res/menu/chat_context_menu.xml
@@ -11,7 +11,7 @@
 
     <item
         android:id="@+id/action_info"
-        android:icon="@drawable/ic_action_info_black"
+        android:icon="@drawable/ic_action_info"
         android:title="@string/information"
         app:iconTint="@color/color_primary"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_section_fragment_cafeteria_details.xml b/app/src/main/res/menu/menu_section_fragment_cafeteria_details.xml
index 012e4655e5..8244fdcd93 100644
--- a/app/src/main/res/menu/menu_section_fragment_cafeteria_details.xml
+++ b/app/src/main/res/menu/menu_section_fragment_cafeteria_details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/action_settings"
@@ -11,7 +11,7 @@
 
     <item
         android:id="@+id/action_ingredients"
-        android:icon="@drawable/ic_action_info_black"
+        android:icon="@drawable/ic_action_info"
         android:title="@string/action_ingredients"
         app:iconTint="@color/color_primary"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_transport.xml b/app/src/main/res/menu/menu_transport.xml
index a301ef0640..c2b5420883 100644
--- a/app/src/main/res/menu/menu_transport.xml
+++ b/app/src/main/res/menu/menu_transport.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_transport_usage"
-        android:icon="@drawable/ic_action_info_black"
+        android:icon="@drawable/ic_action_info"
         android:title="@string/transport_action_usage"
         app:iconTint="@color/color_primary"
         app:showAsAction="always" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 34087ea606..652f23ecfe 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -88,7 +88,12 @@
     <string name="github_contribute">Mitmachen auf GitHub</string>
     <string name="licences">Open-Source-Lizenzen</string>
     <string name="licences_summary">Rechtliche Hinweise zu Lizenzen</string>
+    <string name="appearance">Erscheinungsbild</string>
     <string name="language_preference">Sprache</string>
+    <string name="design_theme_preference">Designstil</string>
+    <string name="system_default">Systemstandard</string>
+    <string name="light">Hell</string>
+    <string name="dark">Dunkel</string>
 
     <!-- Startup Wizard -->
     <string name="not_connected_to_tumonline">Nicht verbunden</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..db42b34437
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="pop_up_background">#1F1F1F</color>
+
+    <color name="github">@color/text_secondary</color>
+
+    <color name="list_divider">@color/tum_400</color>
+    <color name="placeholder">@color/tum_light_gray</color>
+
+    <color name="spinner_border">#8AFFFFFF</color>
+
+    <!-- Default colors -->
+
+    <color name="text_primary">@color/text_primary_dark</color>
+    <color name="text_secondary">@color/text_secondary_dark</color>
+
+    <color name="default_window_background">@android:color/black</color>
+    <color name="secondary_window_background">@android:color/black</color>
+
+    <color name="default_button_text">@color/text_primary</color>
+    <color name="default_button_background">@color/tum_blue</color>
+
+    <!-- Navigation drawer -->
+
+    <color name="navigation_drawer_header_background">@color/black</color>
+
+    <color name="navigation_drawer_item_background_selected">#780065BD</color>
+    <color name="navigation_drawer_item_text_selected">@color/tum_100</color>
+
+
+    <color name="study_room_free">#213D21</color>
+    <color name="study_room_occupied">#551E25</color>
+
+    <!-- official TUM accent colors (style guide) -->
+    <color name="color_primary">@color/tum_400</color>
+    <color name="color_primary_dark">@color/tum_300</color>
+
+    <color name="grade_4.1">#BF1010</color>
+    <color name="grade_4.2">#AA2020</color>
+    <color name="grade_4.3">#953030</color>
+    <color name="grade_4.4">#7F4040</color>
+    <color name="grade_4.5">#6A5050</color>
+    <color name="grade_4.6">#6A5A5A</color>
+    <color name="grade_4.7">#6A6464</color>
+    <color name="grade_4.8">#555353</color>
+    <color name="grade_4.9">#434141</color>
+    <color name="grade_5.0">#2F2F2F</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 063e6b4239..f8d7079767 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/tum_light_gray</item>
-        <item name="colorPrimaryDark">@color/tum_light_gray</item>
+        <item name="colorPrimaryDark">@color/default_window_background</item>
         <item name="colorAccent">@color/tum_blue</item>
         <item name="android:windowBackground">@color/default_window_background</item>
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="android:textCursorDrawable">@drawable/cursor_text_field_colorful</item>
 
         <!-- Transparent status bar -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
         <!-- Light navigation bar -->
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarColor">@android:color/primary_text_dark</item>
-        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
+        <item name="android:navigationBarColor">@color/default_window_background</item>
+        <item name="android:navigationBarDividerColor">@color/list_divider</item>
+
+        <item name="android:listDivider">@color/list_divider</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3a9a35d92f..95dcbe530a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -11,7 +11,8 @@
         <item>2</item>
     </string-array>
 
-    <!-- Language selection -->
+    <!-- Appearance Selection -->
+    <!-- Language -->
     <string-array name="language_entries">
         <item>Deutsch</item>
         <item>English</item>
@@ -21,6 +22,18 @@
         <item>en</item>
     </string-array>
 
+    <!-- Color mode -->
+    <string-array name="color_mode_entries">
+        <item>@string/system_default</item>
+        <item>@string/light</item>
+        <item>@string/dark</item>
+    </string-array>
+    <string-array name="color_mode_values">
+        <item>system</item>
+        <item>light</item>
+        <item>dark</item>
+    </string-array>
+
     <!-- Default cafeteria and mvv selection -->
     <!-- Campus Garching -->
     <string-array name="cafeterias_G" translatable="false">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6ca0ceca6d..6285d74d0f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white">#FFFFFF</color>
-    <color name="black">#000000</color>
+    <color name="white">@android:color/white</color>
+    <color name="black">@android:color/black</color>
+
+    <color name="transparent">@android:color/transparent</color>
 
     <color name="pop_up_background">#FAFAFA</color>
 
@@ -24,23 +26,45 @@
     <color name="tum_dark_gray">#E6E6E6</color>
     <color name="tum_blue">@color/tum_500</color>
 
-    <color name="tum_500_alpha_15">#260065BD</color>
-
     <color name="facebook">#3B5998</color>
     <color name="github">#24292E</color>
-    <color name="email">#757575</color>
+    <color name="email">@color/text_secondary</color>
 
-    <color name="placeholder">#E2E2E2</color>
-    <color name="list_divider">#EEEEEE</color>
+    <color name="placeholder">@color/tum_dark_gray</color>
+    <color name="list_divider">@color/tum_200</color>
 
-    <color name="spinner_background">#FFFFFF</color>
-    <color name="spinner_border">#E0E0E0</color>
+    <color name="spinner_background">@color/default_window_background</color>
+    <color name="spinner_border">@color/tum_dark_gray</color>
 
     <color name="input_layout_border">@color/color_primary</color>
 
+
+    <!-- Default colors -->
+    <color name="text_primary">#F2000000</color> <!--F2 for 95% opacity-->
+    <color name="text_secondary">#8A000000</color> <!--8A for 54% opacity-->
+    <color name="text_primary_dark">#F2FFFFFF</color>
+    <color name="text_secondary_dark">#8AFFFFFF</color>
+
+    <color name="default_window_background">@color/white</color>
+    <color name="secondary_window_background">#F2F2F2</color>
+    <color name="semitransparent_dark_background">#4D000000</color>
+
+    <color name="default_button_text">@color/color_primary</color>
+    <color name="default_button_background">@color/tum_light_gray</color>
+
+
+    <!-- Navigation drawer -->
+
+    <color name="navigation_drawer_header_background">@color/tum_light_gray</color>
+    <color name="navigation_drawer_header_name">@color/text_primary</color>
+
+    <color name="navigation_drawer_background">@color/default_window_background</color>
     <color name="navigation_drawer_item_background">#EDEDED</color>
+    <color name="navigation_drawer_item_background_selected">#260065BD</color>
     <color name="navigation_drawer_icon_tint">#757575</color>
-    <color name="navigation_drawer_item_text">#222222</color>
+    <color name="navigation_drawer_item_text">@color/text_primary</color>
+    <color name="navigation_drawer_item_text_selected">@color/tum_blue</color>
+
 
     <color name="study_room_free">#C8E6C9</color>
     <color name="study_room_occupied">#FFCDD2</color>
@@ -52,13 +76,6 @@
 
     <color name="card_more_icon">#A5A5A5</color>
 
-    <!-- Default colors -->
-    <color name="text_dark_primary">#DE000000</color> <!--DE for 87% opacity-->
-    <color name="text_dark_secondary">#8A000000</color> <!--8A for 54% opacity-->
-
-    <color name="default_window_background">@android:color/white</color>
-    <color name="secondary_window_background">#F2F2F2</color>
-    <color name="semitransparent_dark_background">#4D000000</color>
 
     <!-- official TUM accent colors (style guide) -->
     <color name="tum_orange">#E37222</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a0422630bb..29e328501b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,8 +133,15 @@
     <string name="licences">Open-source licences</string>
     <string name="licences_summary">Legal notes to licences</string>
 
+    <string name="appearance">Appearance</string>
+
     <string name="language_preference">Language</string>
 
+    <string name="design_theme_preference">Design Theme</string>
+    <string name="system_default">System default</string>
+    <string name="light">Light</string>
+    <string name="dark">Dark</string>
+
     <!-- Startup Wizard -->
     <string name="not_connected_to_tumonline">Not connected</string>
     <string name="connect_to_tum_online">Connect to TUMonline</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7f5ba427dc..5d3d819ef7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/tum_light_gray</item>
         <item name="colorPrimaryDark">@color/tum_light_gray</item>
         <item name="colorAccent">@color/tum_blue</item>
@@ -16,26 +16,28 @@
         <item name="materialButtonStyle">@style/BlueButton</item>
     </style>
     <style name="AppTheme.NoDrawerLayout" parent="AppTheme">
-        <item name="android:statusBarColor">@color/tum_light_gray</item>
+        <item name="android:statusBarColor">@color/default_window_background</item>
 
         <item name="materialButtonStyle">@style/BlueButton</item>
     </style>
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
     </style>
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
+    <style name="AppTheme.PopupOverlay" parent="AppTheme">
     </style>
 
-    <style name="TumToolbar" parent="ThemeOverlay.AppCompat.Dark">
+    <style name="TumToolbar" parent="ThemeOverlay.AppCompat.DayNight">
         <item name="android:textColorPrimary">@color/color_primary</item>
         <item name="android:textColorSecondary">@color/color_primary</item>
         <item name="android:textCursorDrawable">@drawable/cursor_text_field_colorful</item>
+        <item name="android:background">@color/default_window_background</item>
     </style>
 
-    <style name="TumToolbarPopUp" parent="ThemeOverlay.AppCompat.Light">
+    <style name="TumToolbarPopUp" parent="ThemeOverlay.AppCompat.DayNight">
         <item name="actionMenuTextColor">@android:color/primary_text_light</item>
+        <item name="android:background">@color/transparent</item>
     </style>
 
-    <style name="AppThemeFullscreen" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppThemeFullscreen" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/color_primary</item>
         <item name="colorPrimaryDark">@color/color_primary</item>
         <item name="colorAccent">@color/color_primary</item>
@@ -46,7 +48,7 @@
     </style>
 
     <!-- Style for Stripe's payment method activity -->
-    <style name="StripeDefaultTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="StripeDefaultTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/tum_light_gray</item>
         <item name="colorPrimaryDark">@color/tum_dark_gray</item>
         <item name="colorAccent">@color/tum_blue</item>
@@ -134,7 +136,7 @@
         <item name="android:gravity">center</item>
         <item name="android:transitionName">@string/transition_card</item>
         <item name="android:clipToPadding">true</item>
-        <item name="cardBackgroundColor">#FFFFFF</item>
+        <item name="cardBackgroundColor">@color/default_window_background</item>
         <item name="cardElevation">0dp</item>
         <item name="strokeWidth">1dp</item>
         <item name="strokeColor">@color/spinner_border</item>
@@ -146,24 +148,24 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
         <item name="android:layout_marginBottom">@dimen/material_small_padding</item>
-        <item name="android:textColor">@color/text_dark_primary</item>
+        <item name="android:textColor">@color/text_primary</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="CardBody">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
-        <item name="android:textColor">@color/text_dark_secondary</item>
+        <item name="android:textColor">@color/text_secondary</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="CardDetails">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
-        <item name="android:textColor">@color/text_dark_secondary</item>
+        <item name="android:textColor">@color/text_secondary</item>
         <item name="android:textSize">15sp</item>
     </style>
 
     <style name="CardSource">
-        <item name="android:textColor">@color/text_dark_secondary</item>
+        <item name="android:textColor">@color/text_secondary</item>
         <item name="android:textSize">14sp</item>
     </style>
 
@@ -192,8 +194,8 @@
         <item name="android:background">@drawable/bottom_sheet_background</item>
     </style>
 
-    <style name="BaseBottomSheetDialog" parent="@style/Theme.Design.Light.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
+    <style name="BaseBottomSheetDialog" parent="@style/Theme.MaterialComponents.DayNight.BottomSheetDialog">
+        <item name="android:windowIsFloating">true</item>
         <item name="bottomSheetStyle">@style/BottomDialog</item>
     </style>
 
@@ -209,7 +211,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@android:color/white</item>
-        <item name="android:drawableStart">@drawable/ic_action_info_black</item>
+        <item name="android:drawableStart">@drawable/ic_action_info</item>
         <item name="android:drawablePadding">@dimen/material_default_padding</item>
         <item name="android:drawableTint">@android:color/white</item>
         <item name="android:background">@drawable/info_box_background</item>
@@ -219,6 +221,8 @@
 
     <!-- Customized Material Themes -->
     <style name="BlueButton" parent="Widget.MaterialComponents.Button">
-        <item name="android:textColor">@color/color_primary</item>
+        <item name="android:textColor">@color/default_button_text</item>
+        <item name="android:backgroundTint">@color/default_button_background</item>
+        <item name="iconTint">@color/text_primary</item>
     </style>
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0b3891d190..f13bee9e31 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="cards_pref_container">
 
-    <androidx.preference.PreferenceCategory android:title="@string/language_preference">
+    <androidx.preference.PreferenceCategory android:title="@string/appearance">
 
         <androidx.preference.ListPreference
             android:defaultValue="en"
@@ -12,6 +12,14 @@
             android:key="language_preference"
             android:title="@string/language_preference" />
 
+        <androidx.preference.ListPreference
+            android:defaultValue="system"
+            android:entries="@array/color_mode_entries"
+            android:entryValues="@array/color_mode_values"
+            android:icon="@drawable/ic_color_lens"
+            android:key="design_theme_preference"
+            android:title="@string/design_theme_preference" />
+
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory android:title="@string/campus">