diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index 79f6a4c43..2ec859973 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -72,7 +72,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@string/nc_voice_call"/>
+                    tools:text="Voice Call"/>
 
                 <TextView
                     android:id="@+id/callConversationNameTextView"
@@ -102,7 +102,7 @@
                     android:visibility="invisible"
                     tools:visibility="visible"/>
 
-                <com.facebook.drawee.view.SimpleDraweeView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <com.facebook.drawee.view.SimpleDraweeView
                     android:id="@+id/call_control_switch_camera"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ce6b5b4f3..85576dd37 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -24,12 +24,9 @@
   -->
 
 <resources>
-    <bool name="is_night">true</bool>
-    <bool name="status_bar_light">false</bool>
-
     <color name="colorPrimary">#0082C9</color>
     <color name="colorPrimaryDark">#006AA3</color>
-    <color name="colorAccent">#007CC2</color>
+    <color name="colorAccent">@color/colorPrimary</color>
 
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
@@ -38,13 +35,10 @@
     <color name="conversation_item_header">#deffffff</color>
 
     <color name="bg_default">#121212</color>
-    <color name="bg_alt">#121212</color>
     <color name="bg_inverse">@color/grey950</color>
 
     <color name="fg_default">#FFFFFF</color>
     <color name="fg_inverse">#121212</color>
-    <color name="fg_contrast">#717171</color>
-    <color name="fg_chat_message_sent">@color/fg_default</color>
 
     <color name="nc_darkGreen">#00AA00</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 51595cbf2..a1a6bf137 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,19 +22,15 @@
   -->
 
 <resources>
-    <bool name="is_night">false</bool>
-    <bool name="status_bar_light">true</bool>
-
     <color name="colorPrimary">#0082C9</color>
     <color name="colorPrimaryDark">#006AA3</color>
-    <color name="colorAccent">#007CC2</color>
+    <color name="colorAccent">@color/colorPrimary</color>
     <color name="textColorOnPrimaryBackground">#ffffff</color> <!-- white/black depending on primary color -->
 
     <!-- App bar -->
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
-    <color name="actionbar_shadow">#222222</color>
 
     <!-- Text color of sent messages -->
     <color name="nc_outcoming_text_default">#FFFFFF</color>
@@ -48,7 +44,6 @@
 
     <color name="nc_darkRed">#D32F2F</color>
     <color name="nc_darkGreen">#006400</color>
-    <color name="nc_white_color">@color/per70white</color>
     <color name="controller_chat_separator">#E8E8E8</color>
     <color name="grey_600">#757575</color>
     <color name="nc_grey">#D5D5D5</color>
@@ -61,11 +56,8 @@
 
     <color name="fg_default">#666666</color>
     <color name="fg_inverse">#FFFFFF</color>
-    <color name="fg_contrast">#656565</color>
-    <color name="fg_chat_message_sent">@color/fg_default</color>
 
     <color name="bg_default">#FFFFFF</color>
-    <color name="bg_alt">@color/white60</color>
     <color name="bg_inverse">@color/grey950</color>
     <color name="bg_dark_mention_chips">#333333</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3afa29b00..360edf86b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,7 +27,7 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:panelFullBackground">@color/colorPrimary</item>
         <item name="android:itemBackground">@color/nc_outcoming_text_default</item>
         <item name="android:textColor">@color/nc_incoming_text_default</item>
@@ -35,7 +35,6 @@
         <item name="actionOverflowMenuStyle">@style/appActionBarPopupMenu</item>
         <item name="actionBarPopupTheme">@style/appActionBarPopupMenu</item>
         <item name="searchViewStyle">@style/SearchView</item>
-        <item name="textInputStyle">@style/TextInputLayout</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
@@ -56,30 +55,11 @@
         <item name="android:textColor">@color/textColorOnPrimaryBackground</item>
     </style>
 
-    <style name="ChipMentionTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
-        <item name="android:textColor">@color/colorAccent</item>
-    </style>
-
     <style name="ChipUnreadMessagesTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="appActionBarStyle" parent="@style/Widget.MaterialComponents.ActionBar.Solid">
-        <item name="colorControlNormal">@color/fontAppbar</item>
-        <item name="android:colorPrimary">@color/appbar</item>
-        <item name="android:colorAccent">@color/appbar</item>
-        <item name="android:textColor">@color/fontAppbar</item>
-        <item name="android:textColorSecondary">@color/fontAppbar</item>
-        <item name="searchViewStyle">@style/SearchView</item>
-    </style>
-
-    <style name="Toolbar_TextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:colorPrimary">@color/fontAppbar</item>
-        <item name="android:textColor">@color/fontAppbar</item>
-        <item name="android:textColorPrimary">@color/fontAppbar</item>
-    </style>
-
     <style name="appActionBarPopupMenu" parent="@style/Widget.AppCompat.PopupMenu.Overflow">
         <item name="android:colorPrimary">@color/fg_inverse</item>
         <item name="android:textColorSecondary">@color/fontAppbar</item>
@@ -100,11 +80,6 @@
         <item name="searchHintIcon">@null</item>
     </style>
 
-    <style name="circleImageView" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">50%</item>
-    </style>
-
     <style name="Widget.AppTheme.Button.IconButton" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:minWidth">0dp</item>
         <item name="android:insetLeft">0dp</item>
@@ -114,47 +89,4 @@
         <item name="iconGravity">textStart</item>
         <item name="iconPadding">0dp</item>
     </style>
-
-    <style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
-        <item name="colorControlActivated">@color/fg_default</item>
-        <item name="colorControlHighlight">@color/fg_default</item>
-        <item name="boxBackgroundColor">@color/bg_default</item>
-        <item name="hintTextColor">@color/fg_default</item>
-        <item name="helperTextTextColor">@color/fg_default</item>
-        <item name="boxStrokeColor">@color/fg_default</item>
-    </style>
-
-    <style name="Widget.App.Login.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-        <item name="colorControlActivated">@color/white</item>
-        <item name="colorControlHighlight">@color/white</item>
-        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Login.TextInputLayout</item>
-        <item name="shapeAppearance">@style/ShapeAppearance.MaterialComponents.SmallComponent</item>
-        <item name="hintTextColor">@color/white</item>
-        <item name="helperTextTextColor">@color/white</item>
-    </style>
-
-    <style name="ThemeOverlay.App.Login.TextInputLayout" parent="">
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorOnSurface">@color/white</item>
-        <item name="colorError">@color/nc_darkRed</item>
-        <item name="textAppearanceSubtitle1">@style/TextAppearance.MaterialComponents.Subtitle1</item>
-        <item name="textAppearanceCaption">@style/TextAppearance.MaterialComponents.Caption</item>
-        <item name="editTextStyle">@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox</item>
-    </style>
-
-    <style name="TextInputLayoutLogin" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-        <item name="boxStrokeColor">@color/white</item>
-        <item name="boxStrokeErrorColor">@color/white</item>
-        <item name="hintTextAppearance">@style/HintTextLogin</item>
-        <item name="errorTextAppearance">@style/HintTextLogin</item>
-        <item name="android:colorPrimary">@color/white</item>
-        <!-- Theme attributes -->
-        <item name="android:textColorHint">#80FFFFFF</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-    </style>
-
-    <style name="HintTextLogin" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">@color/white</item>
-    </style>
 </resources>