diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt b/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
index f62bea5..1463a57 100644
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
@@ -72,10 +72,6 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
         load() // start the initial loading
 
         // theming
-        /**
-         * TODO button should be white (on dark) or black (on light)
-         */
-
         // theme.applyStyle(R.style.AppTheme_DayNight, true) // TODO I think this must be removed for system settings to work
         val mode = when (Preferences.theme) {
             DataTypes.Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
diff --git a/app/src/main/res/layout/fragment_on_login.xml b/app/src/main/res/layout/fragment_on_login.xml
index 20b2b0e..f5d11ee 100644
--- a/app/src/main/res/layout/fragment_on_login.xml
+++ b/app/src/main/res/layout/fragment_on_login.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/image_login"
@@ -15,8 +14,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_launcher_foreground"
-        app:tint="?buttonBackground" />
+        app:srcCompat="@drawable/ic_launcher_foreground" />
 
     <LinearLayout
         android:id="@+id/linear_login"
diff --git a/app/src/main/res/layout/fragment_on_welcome.xml b/app/src/main/res/layout/fragment_on_welcome.xml
index a4e41ea..dbb03f5 100644
--- a/app/src/main/res/layout/fragment_on_welcome.xml
+++ b/app/src/main/res/layout/fragment_on_welcome.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -21,8 +19,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_launcher_foreground"
-            app:tint="?buttonBackground" />
+            app:srcCompat="@drawable/ic_launcher_foreground" />
 
         <LinearLayout
             android:id="@+id/linearLayout3"
diff --git a/app/src/main/res/layout/modal_bottom_sheet_login.xml b/app/src/main/res/layout/modal_bottom_sheet_login.xml
index 74a9560..13b3108 100644
--- a/app/src/main/res/layout/modal_bottom_sheet_login.xml
+++ b/app/src/main/res/layout/modal_bottom_sheet_login.xml
@@ -4,7 +4,6 @@
     android:id="@+id/standard_bottom_sheet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themeSecondary"
     android:orientation="vertical"
     android:paddingTop="24dp"
     android:paddingStart="24dp"
@@ -61,8 +60,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"
-                    android:text="@string/cancel"
-                    android:textColor="?colorPrimary" />
+                    android:text="@string/cancel" />
 
                 <Button
                     android:id="@+id/positive_button"
@@ -70,8 +68,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"
-                    android:text="@string/save"
-                    android:textColor="?colorPrimary" />
+                    android:text="@string/save" />
         </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file