diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index b5919f4..dd7f410 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -45,8 +45,6 @@
         android:background="#80FFFFFF"
         android:scaleType="centerCrop"
         android:src="@drawable/background_red_blue"
-        android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textColorHint="@color/mtrl_btn_text_color_selector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -104,8 +102,6 @@
         android:hint="@string/login_username"
         android:inputType="textEmailAddress"
         android:singleLine="false"
-        android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textColorHint="@color/mtrl_btn_text_color_selector"
         app:layout_constraintEnd_toEndOf="@+id/text_home"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/text_home"
@@ -119,15 +115,13 @@
         android:ems="10"
         android:hint="@string/login_password"
         android:inputType="textPassword"
-        android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textColorHint="@color/mtrl_btn_text_color_selector"
         app:layout_constraintEnd_toEndOf="@+id/text_home"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/text_home"
         app:layout_constraintTop_toBottomOf="@+id/loginuserInput"
         app:passwordToggleEnabled="true"/>
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/loginButton"
         android:layout_width="0dp"
         android:layout_height="40dp"
@@ -141,7 +135,7 @@
         app:layout_constraintStart_toStartOf="@+id/text_home"
         app:layout_constraintTop_toBottomOf="@+id/loginpasswordInput" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/logoutButton"
         android:layout_width="0dp"
         android:layout_height="40dp"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index cdd6af0..ba77ea0 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -68,18 +68,6 @@
             tools:visibility="visible"
             tools:text="Additional info when biometric auth is unavailable" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/settings_screen_security"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/screen_security" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/settings_hide_codes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/hide_codes" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/settings_show_images"
             android:layout_width="match_parent"