diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 58c274c13b..34aab4169d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -70,6 +70,7 @@ import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -146,6 +147,9 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
 
     ApplicationDependencies.getJobManager().beginJobLoop();
+
+    DynamicTheme.setDefaultDayNightMode(this);
+
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index e8ac440acb..60b5368cf3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -18,7 +18,6 @@
 package org.thoughtcrime.securesms;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
@@ -29,7 +28,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 
 import org.thoughtcrime.securesms.help.HelpFragment;
@@ -139,6 +137,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
     if (key.equals(TextSecurePreferences.THEME_PREF)) {
+      DynamicTheme.setDefaultDayNightMode(this);
       recreate();
     } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
       recreate();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CachedInflater.java b/app/src/main/java/org/thoughtcrime/securesms/util/CachedInflater.java
index d4f3c2973d..78505f71cb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CachedInflater.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CachedInflater.java
@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.asynclayoutinflater.view.AsyncLayoutInflater;
 
-import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.logging.Log;
 
 import java.util.Collections;
@@ -51,7 +50,7 @@ public class CachedInflater {
   @MainThread
   @SuppressWarnings("unchecked")
   public <V extends View> V inflate(@LayoutRes int layoutRes, @Nullable ViewGroup parent, boolean attachToRoot) {
-    View cached = ViewCache.getInstance().pull(layoutRes);
+    View cached = ViewCache.getInstance().pull(layoutRes, ContextUtil.getNightModeConfiguration(context));
     if (cached != null) {
       if (parent != null && attachToRoot) {
         parent.addView(cached);
@@ -87,12 +86,20 @@ public class CachedInflater {
 
     private long lastClearTime;
 
+    private int nightModeConfiguration;
+
     static ViewCache getInstance() {
       return INSTANCE;
     }
 
     @MainThread
-    void cacheUntilLimit(Context context, @LayoutRes int layoutRes, @Nullable ViewGroup parent, int limit) {
+    void cacheUntilLimit(@NonNull Context context, @LayoutRes int layoutRes, @Nullable ViewGroup parent, int limit) {
+      int currentNightModeConfiguration = ContextUtil.getNightModeConfiguration(context);
+      if (nightModeConfiguration != currentNightModeConfiguration) {
+        clear();
+        nightModeConfiguration = currentNightModeConfiguration;
+      }
+
       AsyncLayoutInflater inflater = new AsyncLayoutInflater(context);
 
       int existingCount = Util.getOrDefault(cache, layoutRes, Collections.emptyList()).size();
@@ -118,7 +125,12 @@ public class CachedInflater {
     }
 
     @MainThread
-    @Nullable View pull(@LayoutRes int layoutRes) {
+    @Nullable View pull(@LayoutRes int layoutRes, int nightModeConfiguration) {
+      if (this.nightModeConfiguration != nightModeConfiguration) {
+        clear();
+        return null;
+      }
+
       List<View> views = cache.get(layoutRes);
       return  views != null && !views.isEmpty() ? views.remove(0)
                                                 : null;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ContextUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ContextUtil.java
index 3d7ce0e4ec..4277b50362 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ContextUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContextUtil.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.DrawableRes;
@@ -15,4 +16,8 @@ public final class ContextUtil {
   public static @NonNull Drawable requireDrawable(@NonNull Context context, @DrawableRes int drawable) {
     return Objects.requireNonNull(ContextCompat.getDrawable(context, drawable));
   }
+
+  public static int getNightModeConfiguration(@NonNull Context context) {
+    return context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java
index 3c68c31c28..fbe77ba7da 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkActionBarTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicDarkActionBarTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightTheme_Conversation;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkTheme_Conversation;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_DarkActionBar;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java
index 213b58f219..b66255b2fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicDarkToolbarTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicDarkToolbarTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightNoActionBar_DarkToolbar;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkNoActionBar_DarkToolbar;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_DarkNoActionBar;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
index 551e997a7b..889538ead8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicIntroTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightIntroTheme;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkIntroTheme;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_IntroTheme;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java
index dd8227d151..c5999d5aad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarInviteTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicNoActionBarInviteTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.Signal_Light_NoActionBar_Invite;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.Signal_NoActionBar_Invite;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_Invite;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
index e4b56125e7..53e27e72a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicNoActionBarTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightNoActionBar;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkNoActionBar;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_NoActionBar;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
index 6425b7b6a2..f5d5f07b68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
@@ -6,11 +6,7 @@ import org.thoughtcrime.securesms.R;
 
 public class DynamicRegistrationTheme extends DynamicTheme {
 
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightRegistrationTheme;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkRegistrationTheme;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight_Registration;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
index 59cbbb0c8b..e9fdc7b789 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -2,12 +2,12 @@ package org.thoughtcrime.securesms.util;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import org.thoughtcrime.securesms.R;
 
@@ -17,54 +17,51 @@ public class DynamicTheme {
   public static final String LIGHT  = "light";
   public static final String SYSTEM = "system";
 
-  private static boolean isDarkTheme;
+  private static int globalNightModeConfiguration;
 
-  private int currentTheme;
+  private int onCreateNightModeConfiguration;
 
-  public void onCreate(Activity activity) {
-    boolean wasDarkTheme = isDarkTheme;
+  public void onCreate(@NonNull Activity activity) {
+    int previousGlobalConfiguration = globalNightModeConfiguration;
 
-    currentTheme = getSelectedTheme(activity);
-    isDarkTheme  = isDarkTheme(activity);
+    onCreateNightModeConfiguration = ContextUtil.getNightModeConfiguration(activity);
+    globalNightModeConfiguration   = onCreateNightModeConfiguration;
 
-    activity.setTheme(currentTheme);
+    activity.setTheme(getTheme());
 
-    if (isDarkTheme != wasDarkTheme) {
+    if (previousGlobalConfiguration != globalNightModeConfiguration) {
       CachedInflater.from(activity).clear();
     }
   }
 
-  public void onResume(Activity activity) {
-    if (currentTheme != getSelectedTheme(activity)) {
-      Intent intent = activity.getIntent();
-      activity.finish();
-      OverridePendingTransition.invoke(activity);
-      activity.startActivity(intent);
-      OverridePendingTransition.invoke(activity);
+  public void onResume(@NonNull Activity activity) {
+    if (onCreateNightModeConfiguration != ContextUtil.getNightModeConfiguration(activity)) {
       CachedInflater.from(activity).clear();
     }
   }
 
-  private @StyleRes int getSelectedTheme(Activity activity) {
-    if (isDarkTheme(activity)) {
-      return getDarkThemeStyle();
-    } else {
-      return getLightThemeStyle();
-    }
-  }
-
-  protected @StyleRes int getLightThemeStyle() {
-    return R.style.TextSecure_LightTheme;
-  }
-
-  protected @StyleRes int getDarkThemeStyle() {
-    return R.style.TextSecure_DarkTheme;
+  protected @StyleRes int getTheme() {
+    return R.style.Signal_DayNight;
   }
 
   public static boolean systemThemeAvailable() {
     return Build.VERSION.SDK_INT >= 29;
   }
 
+  public static void setDefaultDayNightMode(@NonNull Context context) {
+    String theme = TextSecurePreferences.getTheme(context);
+
+    if (theme.equals(SYSTEM)) {
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+    } else if (DynamicTheme.isDarkTheme(context)) {
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+    } else {
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+    }
+
+    CachedInflater.from(context).clear();
+  }
+
   /**
    * Takes the system theme into account.
    */
@@ -81,10 +78,4 @@ public class DynamicTheme {
   private static boolean isSystemInDarkTheme(@NonNull Context context) {
     return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
   }
-
-  private static final class OverridePendingTransition {
-    static void invoke(Activity activity) {
-      activity.overridePendingTransition(0, 0);
-    }
-  }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.webp
deleted file mode 100644
index 544145e9fe..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_image_dark.webp b/app/src/main/res/drawable-hdpi/ic_image_dark.webp
deleted file mode 100644
index 409bdd877e..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_image_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_image_light.webp b/app/src/main/res/drawable-hdpi/ic_image_light.webp
deleted file mode 100644
index 3fe4d122ad..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_image_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-hdpi/ic_lock_white_18dp.webp
deleted file mode 100644
index 6a8f6ae66c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_white_18dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-hdpi/ic_movie_creation_dark.webp
deleted file mode 100644
index f1ea181140..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_movie_creation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-hdpi/ic_movie_creation_light.webp
deleted file mode 100644
index c013ff1a2f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_movie_creation_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.webp
deleted file mode 100644
index e2a619291a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.webp
deleted file mode 100644
index b1b27900d1..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp
deleted file mode 100644
index b1c9c8d23f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_light.webp
deleted file mode 100644
index 408d41225f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_volume_up_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-hdpi/lockscreen_watermark_dark.webp
deleted file mode 100644
index a515c34fbf..0000000000
Binary files a/app/src/main/res/drawable-hdpi/lockscreen_watermark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-hdpi/lockscreen_watermark_light.webp
deleted file mode 100644
index f6decc8f6b..0000000000
Binary files a/app/src/main/res/drawable-hdpi/lockscreen_watermark_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.webp
deleted file mode 100644
index e675e02524..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_image_dark.webp b/app/src/main/res/drawable-mdpi/ic_image_dark.webp
deleted file mode 100644
index c55b1da2af..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_image_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_image_light.webp b/app/src/main/res/drawable-mdpi/ic_image_light.webp
deleted file mode 100644
index 01e5e478e4..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_image_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-mdpi/ic_lock_white_18dp.webp
deleted file mode 100644
index c25a04277b..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_white_18dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-mdpi/ic_movie_creation_dark.webp
deleted file mode 100644
index 9985f13268..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_movie_creation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-mdpi/ic_movie_creation_light.webp
deleted file mode 100644
index 905ed61fd1..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_movie_creation_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.webp
deleted file mode 100644
index f0460d00dd..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.webp
deleted file mode 100644
index 848e611609..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 642f3f96f4..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_light.webp
deleted file mode 100644
index 887a7f91d5..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_volume_up_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-mdpi/lockscreen_watermark_dark.webp
deleted file mode 100644
index d56efd0ed0..0000000000
Binary files a/app/src/main/res/drawable-mdpi/lockscreen_watermark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-mdpi/lockscreen_watermark_light.webp
deleted file mode 100644
index 9b184a4f96..0000000000
Binary files a/app/src/main/res/drawable-mdpi/lockscreen_watermark_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.webp
deleted file mode 100644
index 891482b931..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_image_dark.webp b/app/src/main/res/drawable-xhdpi/ic_image_dark.webp
deleted file mode 100644
index 8180bc3bfa..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_image_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_image_light.webp b/app/src/main/res/drawable-xhdpi/ic_image_light.webp
deleted file mode 100644
index 35388357e8..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_image_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-xhdpi/ic_lock_white_18dp.webp
deleted file mode 100644
index 45623d6280..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_white_18dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-xhdpi/ic_movie_creation_dark.webp
deleted file mode 100644
index 6ecda642ca..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_movie_creation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-xhdpi/ic_movie_creation_light.webp
deleted file mode 100644
index 617f16530d..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_movie_creation_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.webp
deleted file mode 100644
index 1f852c6af9..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.webp
deleted file mode 100644
index 186986f997..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 29e78839cc..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_light.webp
deleted file mode 100644
index 5747612dec..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_volume_up_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.webp
deleted file mode 100644
index a6c2c38006..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-xhdpi/lockscreen_watermark_light.webp
deleted file mode 100644
index cab573cc8f..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/lockscreen_watermark_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.webp
deleted file mode 100644
index 9b385a25e1..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_image_dark.webp
deleted file mode 100644
index 6f57efaac1..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_image_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_light.webp b/app/src/main/res/drawable-xxhdpi/ic_image_light.webp
deleted file mode 100644
index 80ee612f46..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_image_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.webp
deleted file mode 100644
index 1d3648e75b..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.webp
deleted file mode 100644
index 4f72b19249..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_movie_creation_light.webp b/app/src/main/res/drawable-xxhdpi/ic_movie_creation_light.webp
deleted file mode 100644
index 1eb7b768c4..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_movie_creation_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.webp
deleted file mode 100644
index 92453fb617..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp
deleted file mode 100644
index 7ce9331700..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 712bb1cc91..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up_light.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_light.webp
deleted file mode 100644
index c231717804..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_volume_up_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.webp b/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.webp
deleted file mode 100644
index a4e911c862..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.webp b/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.webp
deleted file mode 100644
index 040821ca00..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/clickable_card_dark.xml b/app/src/main/res/drawable/clickable_card_dark.xml
deleted file mode 100644
index 5828c14065..0000000000
--- a/app/src/main/res/drawable/clickable_card_dark.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/import_export_touch_highlight_dark" />
-        </shape>
-        <layer-list android:src="@drawable/import_export_item_background_dark" />
-    </item>
-    <item android:state_focused="true">
-        <shape>
-            <solid android:color="@color/import_export_touch_highlight_dark" />
-        </shape>
-        <layer-list android:src="@drawable/import_export_item_background_dark" />
-    </item>
-    <item android:drawable="@drawable/import_export_item_background_dark" />
-</selector>
diff --git a/app/src/main/res/drawable/clickable_card_light.xml b/app/src/main/res/drawable/clickable_card_light.xml
deleted file mode 100644
index 38211ea6e2..0000000000
--- a/app/src/main/res/drawable/clickable_card_light.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/import_export_touch_highlight_light" />
-        </shape>
-        <layer-list android:src="@drawable/import_export_item_background_light" />
-    </item>
-    <item android:state_focused="true">
-        <shape>
-            <solid android:color="@color/import_export_touch_highlight_light" />
-        </shape>
-        <layer-list android:src="@drawable/import_export_item_background_light" />
-    </item>
-    <item android:drawable="@drawable/import_export_item_background_light" />
-</selector>
diff --git a/app/src/main/res/drawable/contact_list_divider_dark.xml b/app/src/main/res/drawable/contact_list_divider_dark.xml
deleted file mode 100644
index 09a9f2470f..0000000000
--- a/app/src/main/res/drawable/contact_list_divider_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape>
-            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#101010" />
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#222222" />
-            <size android:height="20dp"/>
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/contact_list_divider_light.xml b/app/src/main/res/drawable/contact_list_divider_light.xml
deleted file mode 100644
index 6157621fed..0000000000
--- a/app/src/main/res/drawable/contact_list_divider_light.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape>
-            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="#d4d4d4" />
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="@color/core_grey_05" />
-            <size android:height="20dp"/>
-        </shape>
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml b/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml
deleted file mode 100644
index 59da5934aa..0000000000
--- a/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape  android:shape="rectangle">
-            <solid android:color="#0d000000" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:bottom="@dimen/message_bubble_shadow_distance">
-        <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#fff3f3f3" />
-            <corners android:bottomLeftRadius="@dimen/message_bubble_corner_radius" android:bottomRightRadius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml b/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
deleted file mode 100644
index d02a391561..0000000000
--- a/app/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:bottom="@dimen/message_bubble_shadow_distance">
-        <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#cc333333" />
-            <corners android:bottomLeftRadius="@dimen/message_bubble_corner_radius" android:bottomRightRadius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/conversation_list_divider_shape.xml b/app/src/main/res/drawable/conversation_list_divider_shape.xml
deleted file mode 100644
index 0581817d13..0000000000
--- a/app/src/main/res/drawable/conversation_list_divider_shape.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="83dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/core_grey_10" />
-            <size android:height="1px" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/conversation_list_divider_shape_dark.xml b/app/src/main/res/drawable/conversation_list_divider_shape_dark.xml
deleted file mode 100644
index 425c926052..0000000000
--- a/app/src/main/res/drawable/conversation_list_divider_shape_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="83dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#33ffffff" />
-            <size android:height="1px" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/ic_keyboard_outline_contact_filter_24.xml b/app/src/main/res/drawable/ic_keyboard_outline_contact_filter_24.xml
deleted file mode 100644
index 2f8defd764..0000000000
--- a/app/src/main/res/drawable/ic_keyboard_outline_contact_filter_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="?contact_filter_toolbar_icon_tint" android:pathData="M20,4.5A1.538,1.538 0,0 1,21.5 6L21.5,17.5A1.538,1.538 0,0 1,20 19L4,19a1.538,1.538 0,0 1,-1.5 -1.5L2.5,6A1.538,1.538 0,0 1,4 4.5L20,4.5M20,3L4,3A2.946,2.946 0,0 0,1 6L1,17.5a2.946,2.946 0,0 0,3 3L20,20.5a2.946,2.946 0,0 0,3 -3L23,6A2.946,2.946 0,0 0,20 3ZM16.5,15h-9v2h9ZM7.5,12h0A1.538,1.538 0,0 0,6 10.5L6,10.5A1.538,1.538 0,0 0,4.5 12h0A1.538,1.538 0,0 0,6 13.5L6,13.5A1.538,1.538 0,0 0,7.5 12ZM11.5,12h0A1.538,1.538 0,0 0,10 10.5h0A1.538,1.538 0,0 0,8.5 12h0A1.538,1.538 0,0 0,10 13.5h0A1.538,1.538 0,0 0,11.5 12ZM15.5,12h0A1.538,1.538 0,0 0,14 10.5h0A1.538,1.538 0,0 0,12.5 12h0A1.538,1.538 0,0 0,14 13.5h0A1.538,1.538 0,0 0,15.5 12ZM19.5,12h0A1.538,1.538 0,0 0,18 10.5h0A1.538,1.538 0,0 0,16.5 12h0A1.538,1.538 0,0 0,18 13.5h0A1.538,1.538 0,0 0,19.5 12ZM7.5,8h0A1.538,1.538 0,0 0,6 6.5L6,6.5A1.538,1.538 0,0 0,4.5 8h0A1.538,1.538 0,0 0,6 9.5L6,9.5A1.538,1.538 0,0 0,7.5 8ZM11.5,8h0A1.538,1.538 0,0 0,10 6.5h0A1.538,1.538 0,0 0,8.5 8h0A1.538,1.538 0,0 0,10 9.5h0A1.538,1.538 0,0 0,11.5 8ZM15.5,8h0A1.538,1.538 0,0 0,14 6.5h0A1.538,1.538 0,0 0,12.5 8h0A1.538,1.538 0,0 0,14 9.5h0A1.538,1.538 0,0 0,15.5 8ZM19.5,8h0A1.538,1.538 0,0 0,18 6.5h0A1.538,1.538 0,0 0,16.5 8h0A1.538,1.538 0,0 0,18 9.5h0A1.538,1.538 0,0 0,19.5 8Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_solid_contact_filter_24.xml b/app/src/main/res/drawable/ic_keyboard_solid_contact_filter_24.xml
deleted file mode 100644
index 087b44f1b3..0000000000
--- a/app/src/main/res/drawable/ic_keyboard_solid_contact_filter_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="?contact_filter_toolbar_icon_tint" android:pathData="M19,4L5,4A2.946,2.946 0,0 0,2 7v9.5a2.946,2.946 0,0 0,3 3L19,19.5a2.946,2.946 0,0 0,3 -3L22,7A2.946,2.946 0,0 0,19 4ZM14,6.5A1.5,1.5 0,1 1,12.5 8,1.538 1.538,0 0,1 14,6.5ZM14,10.5A1.5,1.5 0,1 1,12.5 12,1.538 1.538,0 0,1 14,10.5ZM10,6.5A1.5,1.5 0,1 1,8.5 8,1.538 1.538,0 0,1 10,6.5ZM10,10.5A1.5,1.5 0,1 1,8.5 12,1.538 1.538,0 0,1 10,10.5ZM6,6.5a1.5,1.5 0,0 1,0 3,1.5 1.5,0 0,1 0,-3ZM6,13.5a1.5,1.5 0,0 1,0 -3,1.5 1.5,0 0,1 0,3ZM16.5,17h-9L7.5,15h9ZM18,13.5A1.5,1.5 0,1 1,19.5 12,1.538 1.538,0 0,1 18,13.5ZM18,9.5A1.5,1.5 0,1 1,19.5 8,1.538 1.538,0 0,1 18,9.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_message_outline_tinted_24.xml b/app/src/main/res/drawable/ic_message_outline_tinted_24.xml
deleted file mode 100644
index 5b9b175dfb..0000000000
--- a/app/src/main/res/drawable/ic_message_outline_tinted_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?attr/icon_tint"
-        android:pathData="M12,4c4.963,0 9,3.364 9,7.5S16.963,19 12,19a10.536,10.536 0,0 1,-3.19 -0.5l-0.465,-0.148 -0.464,0.155L4.739,19.556l0.394,-2.365 0.118,-0.707 -0.477,-0.536A6.651,6.651 0,0 1,3 11.5C3,7.364 7.037,4 12,4m0,-1.5c-5.8,0 -10.5,4.029 -10.5,9a8.164,8.164 0,0 0,2.153 5.445l-0.639,3.836c-0.073,0.438 0.144,0.719 0.505,0.719a0.9,0.9 0,0 0,0.279 -0.049l4.558,-1.519A12.019,12.019 0,0 0,12 20.5c5.8,0 10.5,-4.029 10.5,-9s-4.773,-9 -10.5,-9Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message_solid_tinted_24.xml b/app/src/main/res/drawable/ic_message_solid_tinted_24.xml
deleted file mode 100644
index 7aa9ae47be..0000000000
--- a/app/src/main/res/drawable/ic_message_solid_tinted_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?attr/icon_tint"
-        android:pathData="M12,2.5c-5.8,0 -10.5,4.029 -10.5,9a8.164,8.164 0,0 0,2.153 5.445l-0.639,3.836c-0.09,0.542 0.263,0.844 0.784,0.67l4.558,-1.519A12.019,12.019 0,0 0,12 20.5c5.8,0 10.5,-4.029 10.5,-9S17.727,2.5 12,2.5Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_phone_right_outline_tinted_24.xml b/app/src/main/res/drawable/ic_phone_right_outline_tinted_24.xml
deleted file mode 100644
index 6e3c562206..0000000000
--- a/app/src/main/res/drawable/ic_phone_right_outline_tinted_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-    <path
-        android:fillColor="?attr/icon_tint"
-        android:pathData="M6.34,1.5a0.76,0.76 0,0 1,0.41 0.13A0.75,0.75 0,0 1,7 2L8.47,6a0.77,0.77 0,0 1,0 0.45,0.79 0.79,0 0,1 -0.27,0.38 10.72,10.72 0,0 1,-1.34 0.83l-1.36,0.7 0.74,1.35a15.13,15.13 0,0 0,6 6l1.35,0.74 0.7,-1.36a11.63,11.63 0,0 1,0.83 -1.35,0.76 0.76,0 0,1 0.83,-0.24L20,15a0.71,0.71 0,0 1,0.36 0.28,0.68 0.68,0 0,1 0.12,0.44A9.39,9.39 0,0 1,20 18.28a3.27,3.27 0,0 1,-3.06 2.22,3.81 3.81,0 0,1 -0.59,-0.05 18.49,18.49 0,0 1,-9.68 -5.09A18.39,18.39 0,0 1,1.56 5.68,3.19 3.19,0 0,1 2,3.44 3.23,3.23 0,0 1,3.72 2,9 9,0 0,1 6.29,1.5ZM6.34,0L6.19,0a10.82,10.82 0,0 0,-3 0.61A4.72,4.72 0,0 0,0.65 2.7,4.78 4.78,0 0,0 0.08,6 20,20 0,0 0,5.59 16.42a19.9,19.9 0,0 0,10.47 5.5,4.91 4.91,0 0,0 0.86,0.08 4.81,4.81 0,0 0,2.74 -0.89,4.75 4.75,0 0,0 1.73,-2.32 10.81,10.81 0,0 0,0.6 -3,2.19 2.19,0 0,0 -1.46,-2.23l-4,-1.46a2.22,2.22 0,0 0,-2.55 0.77,12.73 12.73,0 0,0 -1,1.54A13.74,13.74 0,0 1,7.57 9a11.65,11.65 0,0 0,1.54 -1,2.17 2.17,0 0,0 0.81,-1.14 2.23,2.23 0,0 0,0 -1.4l-1.46,-4A2.35,2.35 0,0 0,7.61 0.4,2.22 2.22,0 0,0 6.34,0Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_phone_right_solid_tinted_24.xml b/app/src/main/res/drawable/ic_phone_right_solid_tinted_24.xml
deleted file mode 100644
index 956d34e4b1..0000000000
--- a/app/src/main/res/drawable/ic_phone_right_solid_tinted_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?attr/icon_tint"
-        android:pathData="M21.11,16.608a26.24,26.24 0,0 1,-4.513 -2.5,1.384 1.384,0 0,0 -1.918,0.284 9.116,9.116 0,0 0,-0.866 1.465,4.5 4.5,0 0,0 -0.357,1.242A13.113,13.113 0,0 1,6.9 10.542a4.474,4.474 0,0 0,1.243 -0.355,9.019 9.019,0 0,0 1.343,-0.779 1.444,1.444 0,0 0,0.4 -2A26.2,26.2 0,0 1,7.357 2.9a1.42,1.42 0,0 0,-1.71 -0.825,8.63 8.63,0 0,0 -1.1,0.421 4.284,4.284 0,0 0,-2.5 4.392l-0.014,0A16.948,16.948 0,0 0,17.073 21.953l0,-0.016a4.308,4.308 0,0 0,4.441 -2.492,8.732 8.732,0 0,0 0.431,-1.13A1.42,1.42 0,0 0,21.11 16.608Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_safety_number_outline_24.xml b/app/src/main/res/drawable/ic_safety_number_outline_24.xml
deleted file mode 100644
index efea29523e..0000000000
--- a/app/src/main/res/drawable/ic_safety_number_outline_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?icon_tint"
-      android:pathData="M21.793,7.888A19.35,19.35 0,0 1,12 23C7.6,20.4 2,15.5 2,4.5 9,4.5 12,1 12,1s2.156,2.5 7.05,3.268L17.766,5.553A14.7,14.7 0,0 1,12 3,15.653 15.653,0 0,1 3.534,5.946c0.431,8.846 4.8,12.96 8.458,15.29A17.39,17.39 0,0 0,19.983 9.7ZM22.53,5.03 L21.47,3.97 12,13.439 8.53,9.97 7.47,11.03 12,15.561Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_safety_number_solid_24.xml b/app/src/main/res/drawable/ic_safety_number_solid_24.xml
deleted file mode 100644
index 35802774de..0000000000
--- a/app/src/main/res/drawable/ic_safety_number_solid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?icon_tint"
-      android:pathData="M12,15.631 L7.435,11.066l1.13,-1.132L12,13.369l8.9,-8.9C14.689,4.127 12,1 12,1S9,4.5 2,4.5C2,15.5 7.6,20.4 12,23c4.142,-2.5 9.568,-7.16 9.962,-17.33Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/import_export_item_background_dark.xml b/app/src/main/res/drawable/import_export_item_background_dark.xml
deleted file mode 100644
index e540e52ed9..0000000000
--- a/app/src/main/res/drawable/import_export_item_background_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/import_export_item_background_shadow_dark" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:bottom="@dimen/message_bubble_shadow_distance">
-        <shape>
-            <solid android:color="@color/import_export_item_background_dark" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/import_export_item_background_light.xml b/app/src/main/res/drawable/import_export_item_background_light.xml
deleted file mode 100644
index 87fa2dd8ed..0000000000
--- a/app/src/main/res/drawable/import_export_item_background_light.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/import_export_item_background_shadow_light" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:bottom="@dimen/message_bubble_shadow_distance">
-        <shape>
-            <solid android:color="@color/import_export_item_background_light" />
-            <corners android:radius="@dimen/message_bubble_corner_radius" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/insight_modal_background.xml b/app/src/main/res/drawable/insight_modal_background.xml
new file mode 100644
index 0000000000..689e96b8d1
--- /dev/null
+++ b/app/src/main/res/drawable/insight_modal_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/signal_background_dialog" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/megaphone_background_shadow.9.png b/app/src/main/res/drawable/megaphone_background_shadow.9.png
deleted file mode 100644
index 8a9e4b4c10..0000000000
Binary files a/app/src/main/res/drawable/megaphone_background_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml b/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml
deleted file mode 100644
index 5c42bb319e..0000000000
--- a/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="18dp" />
-    <solid android:color="@color/core_grey_60" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml b/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml
deleted file mode 100644
index e9f36f9be2..0000000000
--- a/app/src/main/res/drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="18dp" />
-    <solid android:color="@color/core_grey_05" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_backups.xml b/app/src/main/res/layout/fragment_backups.xml
index ee2d424553..10770da0ec 100644
--- a/app/src/main/res/layout/fragment_backups.xml
+++ b/app/src/main/res/layout/fragment_backups.xml
@@ -163,7 +163,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?attr/icon_tint_dark" />
+            android:background="@color/signal_divider_major" />
 
         <TextView
             android:id="@+id/fragment_backup_info"
diff --git a/app/src/main/res/layout/insights_modal.xml b/app/src/main/res/layout/insights_modal.xml
index a8d1186079..873c026570 100644
--- a/app/src/main/res/layout/insights_modal.xml
+++ b/app/src/main/res/layout/insights_modal.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?insight_modal_background"
+    android:background="@drawable/insight_modal_background"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/research_megaphone_dialog.xml b/app/src/main/res/layout/research_megaphone_dialog.xml
index d0164e4ca7..e98b7c1b2d 100644
--- a/app/src/main/res/layout/research_megaphone_dialog.xml
+++ b/app/src/main/res/layout/research_megaphone_dialog.xml
@@ -28,30 +28,24 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/research_megaphone_dialog_take_the_survey"
-            style="@style/Widget.Signal.Button.Flat"
+            style="@style/Signal.Widget.Button.Large.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="8dp"
             android:text="@string/ResearchMegaphoneDialog_take_the_survey"
-            android:textColor="@color/core_white"
-            app:backgroundTint="?attr/colorAccent"
-            app:icon="@drawable/ic_open_20"
-            app:iconGravity="textEnd"
-            app:iconTint="@color/core_white" />
+            app:icon="@drawable/ic_open_20" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/research_megaphone_dialog_no_thanks"
-            style="@style/Widget.Signal.Button.Flat"
+            style="@style/Signal.Widget.Button.Large.Secondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="12dp"
-            android:text="@string/ResearchMegaphoneDialog_no_thanks"
-            android:textColor="?safety_number_change_dialog_button_text_color"
-            app:backgroundTint="?safety_number_change_dialog_button_background" />
+            android:text="@string/ResearchMegaphoneDialog_no_thanks" />
 
         <TextView
             style="@style/TextAppearance.Signal.Caption"
diff --git a/app/src/main/res/layout/safety_number_change_recipient.xml b/app/src/main/res/layout/safety_number_change_recipient.xml
index 2ce9225792..118cfae101 100644
--- a/app/src/main/res/layout/safety_number_change_recipient.xml
+++ b/app/src/main/res/layout/safety_number_change_recipient.xml
@@ -51,18 +51,14 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/safety_number_change_recipient_view"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+        style="@style/Signal.Widget.Button.Large.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="?attr/safety_number_change_dialog_button_background"
-        android:elevation="0dp"
         android:minWidth="0dp"
         android:text="@string/safety_number_change_dialog__view"
-        android:textColor="?safety_number_change_dialog_button_text_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/safety_number_change_recipient_name"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:targetApi="lollipop" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
new file mode 100644
index 0000000000..0cdc1eb9cf
--- /dev/null
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="signal_accent_primary">@color/core_ultramarine_light</color>
+    <color name="signal_accent_stroke_primary">@color/core_grey_95</color>
+
+    <color name="signal_inverse_primary">@color/core_white</color>
+
+    <color name="signal_background_primary">@color/core_grey_95</color>
+    <color name="signal_background_secondary">@color/core_grey_75</color>
+    <color name="signal_background_tertiary">@color/core_grey_90</color>
+    <color name="signal_background_dialog">@color/core_grey_75</color>
+
+    <color name="signal_text_primary">@color/core_grey_05</color>
+    <color name="signal_text_primary_disabled">@color/core_grey_60</color>
+    <color name="signal_text_primary_dialog">@color/core_grey_25</color>
+
+    <color name="signal_text_secondary">@color/core_grey_25</color>
+    <color name="signal_text_selected">@color/core_white</color>
+
+    <color name="signal_text_toolbar_title">@color/transparent_white_90</color>
+    <color name="signal_text_toolbar_subtitle">@color/transparent_white_80</color>
+
+    <color name="signal_icon_tint_primary">@color/core_grey_15</color>
+    <color name="signal_icon_tint_secondary">@color/core_grey_25</color>
+
+    <color name="signal_button_primary">@color/core_ultramarine_light</color>
+    <color name="signal_button_primary_text">@color/core_white</color>
+    <color name="signal_button_primary_disabled">@color/core_grey_25</color>
+
+    <color name="signal_button_secondary">@color/core_grey_75</color>
+    <color name="signal_button_secondary_text">@color/core_grey_05</color>
+
+    <color name="signal_divider_minor">@color/core_grey_75</color>
+    <color name="signal_divider_major">@color/core_grey_60</color>
+
+    <color name="signal_transparent">@color/transparent_black</color>
+    <color name="signal_transparent_20">@color/transparent_black_20</color>
+    <color name="signal_transparent_40">@color/transparent_black_40</color>
+    <color name="signal_transparent_60">@color/transparent_black_60</color>
+    <color name="signal_transparent_80">@color/transparent_black_80</color>
+
+    <color name="signal_inverse_transparent">@color/transparent</color>
+    <color name="signal_inverse_transparent_15">@color/transparent_white_15</color>
+    <color name="signal_inverse_transparent_20">@color/transparent_white_20</color>
+    <color name="signal_inverse_transparent_40">@color/transparent_white_40</color>
+    <color name="signal_inverse_transparent_60">@color/transparent_white_60</color>
+    <color name="signal_inverse_transparent_80">@color/transparent_white_80</color>
+</resources>
diff --git a/app/src/main/res/values-night/dark_themes.xml b/app/src/main/res/values-night/dark_themes.xml
new file mode 100644
index 0000000000..69dba9a75c
--- /dev/null
+++ b/app/src/main/res/values-night/dark_themes.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Signal.DayNight.NoActionBar" parent="TextSecure.DarkNoActionBar" />
+
+    <style name="Signal.DayNight" parent="TextSecure.DarkTheme" />
+
+    <style name="Signal.DayNight.NoActionBar" parent="TextSecure.DarkNoActionBar" />
+
+    <style name="Signal.DayNight.Invite" parent="Signal.NoActionBar.Invite" />
+
+    <style name="Signal.DayNight.IntroTheme" parent="TextSecure.DarkIntroTheme" />
+
+    <style name="Signal.DayNight.DarkActionBar" parent="TextSecure.DarkTheme.Conversation" />
+
+    <style name="Signal.DayNight.DarkNoActionBar" parent="TextSecure.DarkNoActionBar.DarkToolbar" />
+
+    <style name="Signal.DayNight.Registration" parent="TextSecure.DarkRegistrationTheme" />
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 1661ae1d53..0000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Signal.DayNight.NoActionBar" parent="TextSecure.DarkNoActionBar">
-
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v19/themes.xml b/app/src/main/res/values-v19/themes.xml
deleted file mode 100644
index 1d73d342bf..0000000000
--- a/app/src/main/res/values-v19/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7b0139e6a7..7c3d1503fd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,7 +2,6 @@
 <resources>
     <attr name="theme_type" format="string"/>
     <attr name="icon_tint" format="color" />
-    <attr name="icon_tint_dark" format="color" />
 
     <attr name="search_view_style" format="reference" />
     <attr name="search_view_style_dark" format="reference" />
@@ -17,7 +16,6 @@
     <attr name="backup_enable_subhead_color" format="color" />
     <attr name="backup_enable_dialog_divider_background" format="color" />
 
-    <attr name="attachment_type_selector_background" format="color"/>
     <attr name="attachment_document_icon_small" format="reference" />
     <attr name="attachment_document_icon_large" format="reference" />
 
@@ -36,7 +34,6 @@
     <attr name="conversation_list_item_date_color" format="reference|color"/>
     <attr name="conversation_list_item_unread_color" format="reference|color"/>
     <attr name="conversation_list_item_unread_background" format="reference"/>
-    <attr name="conversation_list_item_divider" format="reference"/>
     <attr name="conversation_list_toolbar_background" format="reference"/>
     <attr name="conversation_list_typing_tint" format="color"/>
     <attr name="conversation_list_camera_icon_tint" format="color"/>
@@ -56,40 +53,27 @@
     <attr name="kbs_confirm_lottie_success" format="reference" />
     <attr name="kbs_confirm_lottie_failure" format="reference" />
 
-    <attr name="conversation_sent_card_background" format="reference|color"/>
-    <attr name="conversation_group_member_name" format="reference|color"/>
-    <attr name="conversation_received_card_background" format="reference|color"/>
-
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
 
-    <attr name="insight_modal_background" format="reference" />
-    <attr name="insight_modal_button_background" format="color" />
     <attr name="insight_title" format="color" />
     <attr name="insight_body_2" format="color" />
     <attr name="insight_dashboard_bottom_bar_background" format="color" />
     <attr name="insight_progress_background" format="color" />
 
-    <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
     <attr name="ic_visibility" format="reference" />
     <attr name="ic_visibility_off" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
-    <attr name="conversation_editor_background" format="reference|color"/>
     <attr name="conversation_editor_text_color" format="reference|color"/>
     <attr name="conversation_input_background" format="reference"/>
     <attr name="conversation_input_inline_attach_icon_tint" format="reference"/>
     <attr name="conversation_transport_sms_indicator" format="reference"/>
-    <attr name="conversation_transport_push_indicator" format="reference"/>
-    <attr name="conversation_transport_popup_background" format="reference"/>
     <attr name="conversation_emoji_toggle" format="reference"/>
     <attr name="conversation_sticker_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
     <attr name="conversation_attach_camera" format="reference"/>
-    <attr name="conversation_attach_image" format="reference"/>
-    <attr name="conversation_attach_video" format="reference"/>
-    <attr name="conversation_attach_sound" format="reference"/>
     <attr name="conversation_attach_contact_info" format="reference"/>
     <attr name="conversation_attach" format="reference"/>
     <attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
@@ -107,8 +91,6 @@
 
     <attr name="emoji_tab_strip_background" format="color" />
     <attr name="emoji_tab_indicator" format="color" />
-    <attr name="emoji_tab_underline" format="color" />
-    <attr name="emoji_tab_seperator" format="color" />
     <attr name="emoji_drawer_background" format="color" />
     <attr name="emoji_text_color" format="color" />
 
@@ -125,12 +107,10 @@
     <attr name="emoji_variation_selector_background" format="reference|color" />
 
     <attr name="reactions_overlay_toolbar_icon_tint" format="color" />
-    <attr name="reactions_overlay_toolbar_overflow_style" format="reference" />
     <attr name="reactions_overlay_toolbar_background_color" format="color" />
     <attr name="reactions_overlay_custom_emoji_icon" format="reference" />
     <attr name="reactions_overlay_old_background" format="reference" />
     <attr name="reactions_overlay_scrubber_background" format="reference" />
-    <attr name="reactions_bottom_dialog_fragment_emoji_selected" format="reference" />
     <attr name="reactions_pill_background" format="reference" />
     <attr name="reactions_pill_selected_background" format="reference" />
     <attr name="reactions_pill_text_color" format="color" />
@@ -139,7 +119,6 @@
 
     <attr name="camera_button_style" />
 
-    <attr name="quick_camera_icon" format="reference"/>
     <attr name="quick_mic_icon" format="reference"/>
 
     <attr name="compose_icon_tint" />
@@ -154,14 +133,11 @@
     <attr name="conversation_item_sent_text_secondary_color" format="reference|color"/>
     <attr name="conversation_item_received_text_primary_color" format="reference|color"/>
     <attr name="conversation_item_received_text_secondary_color" format="reference|color"/>
-    <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
-    <attr name="conversation_item_sent_indicator_text_background" format="reference" />
     <attr name="conversation_item_sent_icon_color" format="color" />
     <attr name="conversation_item_sent_download_icon_color" format="reference|color"/>
     <attr name="conversation_item_update_text_color" format="reference"/>
     <attr name="conversation_item_last_seen_text_color" format="reference"/>
     <attr name="conversation_item_last_seen_line_color" format="reference"/>
-    <attr name="conversation_item_date_line_color" format="reference"/>
     <attr name="conversation_item_quote_text_color" format="reference"/>
     <attr name="conversation_item_sticky_date_background" format="reference" />
     <attr name="conversation_item_sticky_date_text_color" format="color" />
@@ -174,9 +150,6 @@
 
     <attr name="low_priority_button_text_color" format="color|reference" />
 
-    <attr name="safety_number_change_dialog_button_background" format="reference|color" />
-    <attr name="safety_number_change_dialog_button_text_color" format="color" />
-
     <attr name="tinted_circle_background" format="reference" />
 
     <attr name="dialog_info_icon" format="reference" />
@@ -188,8 +161,6 @@
 
     <attr name="contact_selection_push_user" format="reference|color" />
     <attr name="contact_selection_lay_user" format="reference|color" />
-    <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="contact_selection_header_text" format="reference|color" />
     <attr name="contact_selection_invite_icon" format="reference" />
     <attr name="contact_selection_new_group_icon" format="reference" />
     <attr name="contact_selection_checkbox_background" format="reference" />
@@ -197,14 +168,9 @@
     <attr name="circular_progress_button_state" format="reference" />
 
     <attr name="contact_filter_toolbar_icon_tint" format="color" />
-    <attr name="contact_filter_toolbar_keyboard_icon" format="reference" />
 
     <attr name="device_link_item_card_background" format="reference|color" />
 
-    <attr name="import_export_item_background_color" format="reference|color" />
-    <attr name="import_export_item_background_shadow_color" format="reference|color" />
-    <attr name="import_export_item_card_background" format="reference" />
-
     <attr name="invite_edit_text_background" format="reference" />
     <attr name="invite_share_icon" format="reference" />
 
@@ -218,23 +184,14 @@
     <attr name="linkpreview_secondary_text_color" format="color" />
     <attr name="linkpreview_divider_color" format="color" />
 
-    <attr name="reminder_header_background" format="color"/>
-
     <attr name="media_keyboard_button_color" format="color" />
 
-    <attr name="menu_new_conversation_icon" format="reference" />
-    <attr name="menu_search_icon" format="reference" />
     <attr name="menu_call_icon" format="reference" />
     <attr name="menu_popup_expand" format="reference"/>
-    <attr name="menu_unlock_icon" format="reference" />
     <attr name="menu_lock_icon" format="reference" />
-    <attr name="menu_lock_icon_small" format="reference" />
     <attr name="menu_trash_icon" format="reference" />
     <attr name="menu_selectall_icon" format="reference" />
-    <attr name="menu_group_icon" format="reference" />
     <attr name="menu_split_icon" format="reference" />
-    <attr name="menu_accept_icon" format="reference" />
-    <attr name="menu_refresh_directory" format="reference" />
     <attr name="menu_copy_icon" format="reference" />
     <attr name="menu_info_icon" format="reference" />
     <attr name="menu_forward_icon" format="reference" />
@@ -254,7 +211,6 @@
     <attr name="data_and_storage_icon" format="reference" />
     <attr name="linked_devices_icon" format="reference" />
     <attr name="advanced_icon" format="reference" />
-    <attr name="safety_number_icon" format="reference" />
     <attr name="help_icon" format="reference" />
     <attr name="donate_icon" format="reference" />
 
@@ -284,9 +240,7 @@
     <attr name="group_members_dialog_icon" format="reference"/>
     <attr name="manage_group_add_members_icon" format="reference"/>
     <attr name="manage_group_view_all_icon" format="reference"/>
-    <attr name="lockscreen_watermark" format="reference" />
 
-    <attr name="recipient_preference_blocked" format="color"/>
 
     <attr name="verification_background" format="color"/>
 
@@ -294,8 +248,6 @@
     <attr name="media_overview_toolbar_foreground" format="color"/>
     <attr name="media_overview_toolbar_secondary_background" format="color"/>
     <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_primary" format="color"/>
-    <attr name="media_overview_document_secondary" format="color"/>
     <attr name="media_overview_grid_view_icon" format="reference"/>
     <attr name="media_overview_list_view_icon" format="reference"/>
 
@@ -316,20 +268,16 @@
     <attr name="sticker_management_item_background" format="color" />
     <attr name="sticker_popup_background" format="color" />
     <attr name="sticker_preview_toolbar_background" format="color" />
-    <attr name="sticker_preview_status_bar_color" format="color" />
     <attr name="sticker_view_missing_background" format="reference|color" />
 
     <attr name="tooltip_default_color" format="reference|color" />
 
     <attr name="registration_lock_reminder_view_pin_text_color" format="color"/>
 
-    <attr name="contact_list_divider" format="reference"/>
-
     <attr name="login_top_background" format="color"/>
     <attr name="login_floating_background" format="reference"/>
 
     <attr name="megaphone_background" format="color"/>
-    <attr name="megaphone_background_shadow" format="color|reference"/>
     <attr name="megaphone_body_text_color" format="color"/>
     <attr name="megaphone_reactions_shade" format="color"/>
     <attr name="megaphone_reactions_close_tint" format="color"/>
@@ -341,8 +289,6 @@
     <attr name="debuglog_color_warn" format="color" />
     <attr name="debuglog_color_error" format="color" />
 
-    <attr name="recipient_message_icon" format="reference"/>
-    <attr name="recipient_call_icon" format="reference"/>
     <attr name="recipient_block_icon" format="reference"/>
     <attr name="recipient_add_contact_icon" format="reference"/>
     <attr name="recipient_view_safety_icon" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4079514dd9..d387804d9c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,11 +5,13 @@
 
     <color name="transparent_black_05">#0D000000</color>
     <color name="transparent_black_10">#18000000</color>
+    <color name="transparent_black_15">#26000000</color>
     <color name="transparent_black_20">#33000000</color>
     <color name="transparent_black_40">#66000000</color>
     <color name="transparent_black_60">#99000000</color>
     <color name="transparent_black_80">#CC000000</color>
 
+    <color name="transparent_white_15">#26ffffff</color>
     <color name="transparent_white_20">#33ffffff</color>
     <color name="transparent_white_30">#4Dffffff</color>
     <color name="transparent_white_40">#66ffffff</color>
@@ -25,13 +27,6 @@
     <color name="device_link_item_background_light">#ffffffff</color>
     <color name="device_link_item_background_dark">#ff333333</color>
 
-    <color name="import_export_item_background_light">#ffeeeeee</color>
-    <color name="import_export_item_background_dark">#ff333333</color>
-    <color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
-    <color name="import_export_item_background_shadow_dark">#ff222222</color>
-    <color name="import_export_touch_highlight_light">#400099cc</color>
-    <color name="import_export_touch_highlight_dark">#40ffffff</color>
-
     <color name="StickerPreviewActivity_remove_button_color">@color/conversation_crimson</color>
     <color name="StickerPreviewActivity_install_button_color">@color/core_ultramarine</color>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
new file mode 100644
index 0000000000..abc0298df8
--- /dev/null
+++ b/app/src/main/res/values/light_colors.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="signal_accent_primary">@color/core_ultramarine</color>
+    <color name="signal_accent_stroke_primary">@color/core_white</color>
+
+    <color name="signal_inverse_primary">@color/core_black</color>
+
+    <color name="signal_background_primary">@color/core_white</color>
+    <color name="signal_background_secondary">@color/core_grey_05</color>
+    <color name="signal_background_tertiary">@color/core_grey_02</color>
+    <color name="signal_background_dialog">@color/core_white</color>
+
+    <color name="signal_text_primary">@color/core_grey_90</color>
+    <color name="signal_text_primary_disabled">@color/core_grey_25</color>
+    <color name="signal_text_primary_dialog">@color/core_grey_65</color>
+
+    <color name="signal_text_secondary">@color/core_grey_60</color>
+    <color name="signal_text_selected">@color/core_black</color>
+
+    <color name="signal_text_toolbar_title">@color/core_white</color>
+    <color name="signal_text_toolbar_subtitle">@color/transparent_white_90</color>
+
+    <color name="signal_icon_tint_primary">@color/core_grey_75</color>
+    <color name="signal_icon_tint_secondary">@color/core_grey_60</color>
+
+    <color name="signal_button_primary">@color/core_ultramarine</color>
+    <color name="signal_button_primary_text">@color/core_white</color>
+    <color name="signal_button_primary_disabled">@color/core_grey_25</color>
+
+    <color name="signal_button_secondary">@color/core_grey_05</color>
+    <color name="signal_button_secondary_text">@color/core_ultramarine</color>
+
+    <color name="signal_divider_minor">@color/core_grey_15</color>
+    <color name="signal_divider_major">@color/core_grey_25</color>
+
+    <color name="signal_transparent">@color/transparent</color>
+    <color name="signal_transparent_20">@color/transparent_white_20</color>
+    <color name="signal_transparent_40">@color/transparent_white_40</color>
+    <color name="signal_transparent_60">@color/transparent_white_60</color>
+    <color name="signal_transparent_80">@color/transparent_white_80</color>
+
+    <color name="signal_inverse_transparent">@color/transparent_black</color>
+    <color name="signal_inverse_transparent_15">@color/transparent_black_15</color>
+    <color name="signal_inverse_transparent_20">@color/transparent_black_20</color>
+    <color name="signal_inverse_transparent_40">@color/transparent_black_40</color>
+    <color name="signal_inverse_transparent_60">@color/transparent_black_60</color>
+    <color name="signal_inverse_transparent_80">@color/transparent_black_80</color>
+</resources>
diff --git a/app/src/main/res/values/light_themes.xml b/app/src/main/res/values/light_themes.xml
new file mode 100644
index 0000000000..d1b82f8fe8
--- /dev/null
+++ b/app/src/main/res/values/light_themes.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Signal.DayNight" parent="TextSecure.LightTheme" />
+
+    <style name="Signal.DayNight.NoActionBar" parent="TextSecure.LightNoActionBar" />
+
+    <style name="Signal.DayNight.Invite" parent="Signal.NoActionBar.Invite" />
+
+    <style name="Signal.DayNight.IntroTheme" parent="TextSecure.LightIntroTheme" />
+
+    <style name="Signal.DayNight.DarkActionBar" parent="TextSecure.LightTheme.Conversation" />
+
+    <style name="Signal.DayNight.DarkNoActionBar" parent="TextSecure.LightNoActionBar.DarkToolbar" />
+
+    <style name="Signal.DayNight.Registration" parent="TextSecure.LightRegistrationTheme" />
+</resources>
diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
new file mode 100644
index 0000000000..52017d15c5
--- /dev/null
+++ b/app/src/main/res/values/signal_styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Signal.Widget.Button.Large" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="iconGravity">textEnd</item>
+    </style>
+
+    <style name="Signal.Widget.Button.Large.Primary">
+        <item name="android:textColor">@color/signal_button_primary_text</item>
+        <item name="backgroundTint">@color/signal_button_primary</item>
+        <item name="iconTint">@color/signal_button_primary_text</item>
+    </style>
+
+    <style name="Signal.Widget.Button.Large.Secondary">
+        <item name="android:textColor">@color/signal_button_secondary_text</item>
+        <item name="backgroundTint">@color/signal_button_secondary</item>
+        <item name="iconTint">@color/signal_button_secondary_text</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 192234cce8..d19fc5b9cd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -19,18 +19,13 @@
         <item name="colorPrimaryDark">@color/core_ultramarine</item>
         <item name="colorAccent">@color/core_ultramarine</item>
 
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66000000</item>
         <item name="contact_selection_push_user">#ff000000</item>
         <item name="contact_selection_lay_user">#a0000000</item>
-        <item name="contact_selection_header_text">@color/core_ultramarine</item>
 
         <item name="media_overview_toolbar_background">@color/white</item>
         <item name="media_overview_toolbar_secondary_background">@color/core_grey_02</item>
         <item name="media_overview_toolbar_foreground">@color/core_grey_70</item>
         <item name="media_overview_header_foreground">@color/core_grey_50</item>
-        <item name="media_overview_document_primary">@color/core_grey_90</item>
-        <item name="media_overview_document_secondary">@color/core_grey_60</item>
         <item name="media_overview_grid_view_icon">@drawable/ic_grid_outline_20</item>
         <item name="media_overview_list_view_icon">@drawable/ic_list_outline_20</item>
     </style>
@@ -58,18 +53,13 @@
         <item name="colorPrimary">@color/core_grey_95</item>
         <item name="colorAccent">@color/core_ultramarine_light</item>
 
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
         <item name="contact_selection_push_user">#ffeeeeee</item>
         <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_header_text">#66eeeeee</item>
 
         <item name="media_overview_toolbar_background">@color/black</item>
         <item name="media_overview_toolbar_secondary_background">@color/core_grey_80</item>
         <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/core_grey_10</item>
-        <item name="media_overview_document_primary">@color/core_grey_05</item>
-        <item name="media_overview_document_secondary">@color/core_grey_25</item>
         <item name="media_overview_grid_view_icon">@drawable/ic_grid_solid_20</item>
         <item name="media_overview_list_view_icon">@drawable/ic_list_solid_20</item>
     </style>
@@ -97,9 +87,7 @@
         <item name="colorAccent">@color/core_ultramarine</item>
 
         <item name="android:textColorHint">#cc000000</item>
-        <item name="centered_app_title_color">#55000000</item>
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
         <item name="android:windowBackground">@color/white</item>
         <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
         <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
@@ -116,9 +104,7 @@
         <item name="colorAccent">@color/core_ultramarine_light</item>
 
         <item name="android:textColorHint">@color/white</item>
-        <item name="centered_app_title_color">@color/core_grey_25</item>
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
         <item name="android:windowBackground">@color/core_grey_95</item>
         <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
         <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
@@ -160,24 +146,21 @@
 
     <style name="TextSecure.BaseLightTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
         <item name="theme_type">light</item>
-        <item name="icon_tint">@color/core_grey_75</item>
-        <item name="icon_tint_dark">@color/core_grey_15</item>
+        <item name="icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="review_card_bg">@drawable/review_card_outline_light</item>
 
         <item name="folder_icon">@drawable/ic_folder_outline_24</item>
-        <item name="backup_enable_dialog_divider_background">@color/core_grey_20</item>
-        <item name="backup_enable_subhead_color">@color/core_grey_65</item>
+        <item name="backup_enable_dialog_divider_background">@color/signal_divider_major</item>
+        <item name="backup_enable_subhead_color">@color/signal_text_primary_dialog</item>
 
         <item name="audio_seek_bar_sent_played_color">@color/core_grey_60</item>
         <item name="audio_seek_bar_sent_unplayed_color">@color/core_grey_25</item>
         <item name="audio_play_pause_sent_background_tint">@color/core_white</item>
 
-        <item name="insight_modal_background">@drawable/insights_modal_background</item>
-        <item name="insight_modal_button_background">@color/core_grey_10</item>
         <item name="insight_title">@color/core_grey_90</item>
         <item name="insight_body_2">@color/core_grey_60</item>
-        <item name="insight_dashboard_bottom_bar_background">@color/core_grey_02</item>
+        <item name="insight_dashboard_bottom_bar_background">@color/signal_background_secondary</item>
         <item name="insight_progress_background">@color/core_grey_15</item>
 
         <item name="resource_placeholder_gradient">@drawable/avatar_gradient_light</item>
@@ -185,9 +168,9 @@
         <item name="search_view_style">@style/Signal.SearchView</item>
         <item name="search_view_style_dark">@style/Signal.SearchView.Dark</item>
 
-        <item name="title_text_color_primary">@color/core_grey_90</item>
-        <item name="title_text_color_secondary">@color/core_grey_60</item>
-        <item name="title_text_color_disabled">@color/core_grey_25</item>
+        <item name="title_text_color_primary">@color/signal_text_primary</item>
+        <item name="title_text_color_secondary">@color/signal_text_secondary</item>
+        <item name="title_text_color_disabled">@color/signal_text_primary_disabled</item>
 
         <item name="bottomSheetDialogTheme">@style/Theme.Design.Light.BottomSheetDialog</item>
 
@@ -211,7 +194,6 @@
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
         <item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
-        <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
 
         <item name="radio_theme">@style/Widget.Signal.CompoundButton.RadioButton.Light</item>
 
@@ -220,82 +202,66 @@
         <item name="kbs_confirm_lottie_success">@raw/lottie_kbs_success_light</item>
         <item name="kbs_confirm_lottie_failure">@raw/lottie_kbs_fail_light</item>
 
-        <item name="attachment_type_selector_background">@color/white</item>
         <item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
 
         <item name="attachment_keyboard_button_background">@drawable/attachment_keyboard_button_background_light</item>
         <item name="attachment_keyboard_button_foreground">@color/core_grey_65</item>
 
-        <item name="compose_icon_tint">?icon_tint</item>
+        <item name="compose_icon_tint">@color/signal_icon_tint_primary</item>
 
-        <item name="contact_filter_toolbar_icon_tint">?icon_tint</item>
-        <item name="contact_filter_toolbar_keyboard_icon">@drawable/ic_keyboard_outline_contact_filter_24</item>
+        <item name="contact_filter_toolbar_icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
-        <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
-        <item name="conversation_list_item_subject_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_delivery_icon_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_date_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_unread_color">@color/core_black</item>
+        <item name="conversation_list_item_contact_color">@color/signal_text_primary</item>
+        <item name="conversation_list_item_subject_color">@color/signal_text_secondary</item>
+        <item name="conversation_list_item_delivery_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_item_date_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_item_unread_color">@color/signal_inverse_primary</item>
         <item name="conversation_list_item_unread_background">@drawable/unread_count_background_light</item>
-        <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
         <item name="conversation_list_toolbar_background">@null</item>
-        <item name="conversation_list_typing_tint">@color/core_grey_60</item>
-        <item name="conversation_list_camera_icon_tint">@color/core_grey_60</item>
+        <item name="conversation_list_typing_tint">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_camera_icon_tint">@color/signal_icon_tint_secondary</item>
         <item name="conversation_list_compose_icon_tint">@color/core_white</item>
         <item name="conversation_list_camera_button_background">@color/core_white</item>
 
         <item name="camera_icon_background_tint">@color/core_grey_02</item>
 
-        <item name="fab_color">@color/core_ultramarine</item>
+        <item name="fab_color">@color/signal_accent_primary</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
 
-        <item name="conversation_group_member_name">#99000000</item>
-
         <item name="help_emoji_radio_background">@drawable/help_fragment_emoji_radio_background_light</item>
         <item name="help_next_background">@color/help_fragment_next_light</item>
         <item name="help_problem_background">@drawable/help_fragment_problem_background_light</item>
 
-        <item name="conversation_background">@color/core_white</item>
-        <item name="conversation_editor_background">#22000000</item>
+        <item name="conversation_background">@color/signal_background_primary</item>
         <item name="conversation_editor_text_color">#ff111111</item>
         <item name="conversation_input_background">@drawable/compose_background_light</item>
-        <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
+        <item name="conversation_input_inline_attach_icon_tint">@color/signal_icon_tint_secondary</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_unlock_24</item>
-        <item name="conversation_transport_push_indicator">@drawable/ic_send_lock_24</item>
-        <item name="conversation_transport_popup_background">@color/white</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_smiley_outline_24</item>
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_outline_24</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_outline_24</item>
         <item name="conversation_attach_camera">@drawable/ic_camera_outline_24</item>
-        <item name="conversation_attach_image">@drawable/ic_image_light</item>
-        <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
-        <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
         <item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
-        <item name="conversation_number_picker_text_color_normal">@color/core_grey_65</item>
-        <item name="conversation_number_picker_text_color_selected">@color/black</item>
-        <item name="conversation_sticker_footer_text_color">@color/core_grey_60</item>
-        <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
-        <item name="conversation_footer_sent_reveal_dot_color">@color/core_grey_60</item>
-        <item name="conversation_sticker_author_color">@color/core_grey_95</item>
+        <item name="conversation_number_picker_text_color_normal">@color/signal_text_primary_dialog</item>
+        <item name="conversation_number_picker_text_color_selected">@color/signal_text_selected</item>
+        <item name="conversation_sticker_footer_text_color">@color/signal_text_secondary</item>
+        <item name="conversation_sticker_footer_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_footer_sent_reveal_dot_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_sticker_author_color">@color/signal_text_primary</item>
         <item name="conversation_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="conversation_title_color">@color/white</item>
-        <item name="conversation_subtitle_color">@color/transparent_white_90</item>
+        <item name="conversation_title_color">@color/signal_text_toolbar_title</item>
+        <item name="conversation_subtitle_color">@color/signal_text_toolbar_subtitle</item>
         <item name="conversation_mention_background_color">@color/core_grey_20</item>
 
         <item name="low_priority_button_text_color">@color/core_grey_70</item>
 
-        <item name="mention_picker_background_color">@color/core_white</item>
-
-        <item name="safety_number_change_dialog_button_background">@color/core_grey_05</item>
-        <item name="safety_number_change_dialog_button_text_color">@color/core_ultramarine</item>
+        <item name="mention_picker_background_color">@color/signal_background_dialog</item>
 
         <item name="tinted_circle_background">@drawable/tinted_circle_light</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_light</item>
-
         <item name="debuglog_color_none">@color/debuglog_light_none</item>
         <item name="debuglog_color_verbose">@color/debuglog_light_verbose</item>
         <item name="debuglog_color_debug">@color/debuglog_light_debug</item>
@@ -303,14 +269,12 @@
         <item name="debuglog_color_warn">@color/debuglog_light_warn</item>
         <item name="debuglog_color_error">@color/debuglog_light_error</item>
 
-        <item name="verification_background">@color/core_grey_05</item>
+        <item name="verification_background">@color/signal_background_secondary</item>
 
-        <item name="emoji_tab_strip_background">@color/core_grey_05</item>
-        <item name="emoji_tab_indicator">#66555555</item>
-        <item name="emoji_tab_underline">#44555555</item>
-        <item name="emoji_tab_seperator">@color/core_grey_20</item>
-        <item name="emoji_drawer_background">@color/core_grey_02</item>
-        <item name="emoji_text_color">@color/black</item>
+        <item name="emoji_tab_strip_background">@color/signal_background_secondary</item>
+        <item name="emoji_tab_indicator">@color/signal_inverse_transparent_40</item>
+        <item name="emoji_drawer_background">@color/signal_background_tertiary</item>
+        <item name="emoji_text_color">@color/signal_inverse_primary</item>
 
         <item name="emoji_category_recent">@drawable/ic_recent_light_20</item>
         <item name="emoji_category_people">@drawable/ic_emoji_people_light_20</item>
@@ -324,82 +288,63 @@
         <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_light_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
 
-        <item name="reactions_overlay_toolbar_icon_tint">?icon_tint</item>
-        <item name="reactions_overlay_toolbar_overflow_style">@style/Signal.Toolbar.Overflow.Light</item>
+        <item name="reactions_overlay_toolbar_icon_tint">@color/core_grey_15</item>
         <item name="reactions_overlay_toolbar_background_color">@color/core_white</item>
         <item name="reactions_overlay_custom_emoji_icon">@drawable/ic_any_emoji_32_light</item>
         <item name="reactions_overlay_old_background">@drawable/reactions_old_background_light</item>
         <item name="reactions_overlay_scrubber_background">@drawable/conversation_reaction_overlay_background_light</item>
-        <item name="reactions_bottom_dialog_fragment_emoji_selected">@drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_light</item>
         <item name="reactions_pill_background">@drawable/reaction_pill_background_light</item>
         <item name="reactions_pill_selected_background">@drawable/reaction_pill_background_selected_light</item>
         <item name="reactions_pill_text_color">@color/core_grey_60</item>
         <item name="reactions_pill_selected_text_color">@color/core_grey_75</item>
         <item name="reactions_screen_shade_color">@color/transparent_black_40</item>
 
-        <item name="conversation_item_bubble_background">@color/core_grey_05</item>
-        <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
-        <item name="conversation_item_sent_text_secondary_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
+        <item name="conversation_item_bubble_background">@color/signal_background_secondary</item>
+        <item name="conversation_item_sent_text_primary_color">@color/signal_text_primary</item>
+        <item name="conversation_item_sent_text_secondary_color">@color/signal_text_secondary</item>
+        <item name="conversation_item_sent_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_item_sent_download_icon_color">@color/signal_icon_tint_secondary</item>
         <item name="conversation_item_received_text_primary_color">@color/core_white</item>
         <item name="conversation_item_received_text_secondary_color">@color/transparent_white_80</item>
         <item name="conversation_item_update_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_last_seen_text_color">?attr/title_text_color_primary</item>
+        <item name="conversation_item_last_seen_text_color">@color/signal_text_primary</item>
         <item name="conversation_item_last_seen_line_color">@color/core_grey_45</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_25</item>
         <item name="conversation_item_quote_text_color">@color/core_grey_90</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
-        <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_image_outline_color">@color/transparent_black_20</item>
+        <item name="conversation_item_sticky_date_text_color">@color/signal_text_secondary</item>
+        <item name="conversation_item_image_outline_color">@color/signal_inverse_transparent_20</item>
         <item name="conversation_item_reveal_viewed_background_color">?conversation_background</item>
-        <item name="conversation_item_delete_for_everyone_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_mention_pulse_color">@color/transparent_black</item>
+        <item name="conversation_item_delete_for_everyone_text_color">@color/signal_text_primary</item>
+        <item name="conversation_item_mention_pulse_color">@color/signal_inverse_transparent</item>
         <item name="conversation_scroll_to_bottom_background">@drawable/scroll_to_bottom_background_light</item>
         <item name="conversation_scroll_to_bottom_foreground_color">@color/grey_600</item>
 
-        <item name="quick_camera_icon">@drawable/ic_camera_outline_24</item>
         <item name="quick_mic_icon">@drawable/ic_mic_outline_24</item>
 
-        <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
-
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_light</item>
-        <item name="dialog_background_color">@color/background_material_light</item>
+        <item name="dialog_background_color">@color/signal_background_dialog</item>
 
-        <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
+        <item name="device_link_item_card_background">@color/signal_background_dialog</item>
 
-        <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-
-        <item name="linkpreview_background_color">@color/core_white</item>
-        <item name="linkpreview_primary_text_color">@color/core_black</item>
-        <item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
-        <item name="linkpreview_divider_color">@color/core_grey_25</item>
+        <item name="linkpreview_background_color">@color/signal_background_primary</item>
+        <item name="linkpreview_primary_text_color">@color/signal_inverse_primary</item>
+        <item name="linkpreview_secondary_text_color">@color/signal_text_secondary</item>
+        <item name="linkpreview_divider_color">@color/signal_divider_major</item>
 
         <item name="media_keyboard_button_color">@color/core_grey_60</item>
 
-        <item name="megaphone_background">@color/core_grey_05</item>
-        <item name="megaphone_background_shadow">@drawable/megaphone_background_shadow</item>
+        <item name="megaphone_background">@color/signal_background_secondary</item>
         <item name="megaphone_body_text_color">@color/core_grey_65</item>
         <item name="megaphone_reactions_shade">@color/core_grey_02</item>
         <item name="megaphone_reactions_close_tint">@color/core_black</item>
 
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_solid_24</item>
-        <item name="menu_search_icon">@drawable/ic_search_24</item>
         <item name="menu_call_icon">@drawable/ic_phone_right_unlock_solid_24</item>
         <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
         <item name="menu_trash_icon">@drawable/ic_trash_outline_24</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_24</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_copy_outline_24</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24</item>
         <item name="menu_forward_icon">@drawable/ic_forward_outline_24</item>
@@ -419,12 +364,11 @@
         <item name="data_and_storage_icon">@drawable/ic_archive_outline_24dp</item>
         <item name="linked_devices_icon">@drawable/ic_linked_devices_24</item>
         <item name="advanced_icon">@drawable/ic_advanced_24</item>
-        <item name="safety_number_icon">@drawable/ic_safety_number_outline_24</item>
         <item name="help_icon">@drawable/ic_help_outline_24</item>
         <item name="donate_icon">@drawable/ic_heart_outline_24</item>
         <item name="message_request_dialog_button_background">@drawable/message_request_button_background_light</item>
-        <item name="message_request_text_color_primary">@color/core_grey_90</item>
-        <item name="message_request_text_color_secondary">@color/core_grey_60</item>
+        <item name="message_request_text_color_primary">@color/signal_text_primary</item>
+        <item name="message_request_text_color_secondary">@color/signal_text_secondary</item>
 
         <item name="outlined_action_button">@style/Widget.Signal.Button.OutlinedAction.Light</item>
         <item name="paragraph_marker">@drawable/paragraph_marker_light</item>
@@ -436,24 +380,22 @@
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
 
-        <item name="registration_lock_reminder_view_pin_text_color">@color/core_black</item>
-
-        <item name="reminder_header_background">#ff1d85d7</item>
+        <item name="registration_lock_reminder_view_pin_text_color">@color/signal_inverse_primary</item>
 
         <item name="sticker_management_icon">@drawable/sticker_button_light</item>
-        <item name="sticker_management_divider_color">@color/core_grey_15</item>
-        <item name="sticker_management_empty_background_color">@color/core_grey_05</item>
+        <item name="sticker_management_divider_color">@color/signal_divider_minor</item>
+        <item name="sticker_management_empty_background_color">@color/signal_background_secondary</item>
         <item name="sticker_management_action_button_color">@color/core_grey_90</item>
         <item name="sticker_management_item_background">@drawable/selectable_background_light</item>
-        <item name="sticker_popup_background">@color/transparent_white_60</item>
-        <item name="sticker_preview_toolbar_background">@color/core_white</item>
-        <item name="sticker_preview_status_bar_color">@color/core_grey_05</item>
+        <item name="sticker_popup_background">@color/signal_transparent_60</item>
+        <item name="sticker_preview_toolbar_background">@color/signal_background_primary</item>
         <item name="sticker_view_missing_background">@drawable/sticker_missing_background_light</item>
 
         <item name="tooltip_default_color">@color/core_white</item>
 
         <item name="dangerous_button_color">@color/core_red_highlight</item>
-        <item name="pref_icon_tint">?attr/icon_tint</item>
+
+        <item name="pref_icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="pref_divider">@drawable/preference_divider_light</item>
 
@@ -467,8 +409,8 @@
         <item name="manage_group_view_all_icon">@drawable/ic_view_all_circle_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
 
-        <item name="search_toolbar_background">@color/white</item>
-        <item name="search_background">@color/white</item>
+        <item name="search_toolbar_background">@color/signal_background_primary</item>
+        <item name="search_background">@color/signal_background_primary</item>
         <item name="invite_edit_text_background">@drawable/invite_edit_text_background_light</item>
         <item name="invite_share_icon">@drawable/ic_share_outline_24</item>
 
@@ -477,7 +419,7 @@
         <item name="qr_icon">@drawable/ic_qrcode_24_tinted</item>
         <item name="reset_link_icon">@drawable/ic_reset_24_tinted</item>
 
-        <item name="shared_contact_details_header_background">@color/grey_100</item>
+        <item name="shared_contact_details_header_background">@color/signal_background_tertiary</item>
         <item name="shared_contact_details_titlebar">@color/grey_400</item>
         <item name="shared_contact_item_button_color">@color/core_grey_02</item>
 
@@ -504,25 +446,22 @@
 
     <style name="TextSecure.BaseDarkTheme" parent="@style/Theme.MaterialComponents.Bridge">
         <item name="theme_type">dark</item>
-        <item name="icon_tint">@color/core_grey_15</item>
-        <item name="icon_tint_dark">?icon_tint</item>
+        <item name="icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="review_card_bg">@drawable/review_card_outline_dark</item>
 
         <item name="folder_icon">@drawable/ic_folder_solid_24</item>
-        <item name="backup_enable_dialog_divider_background">@color/core_grey_60</item>
-        <item name="backup_enable_subhead_color">@color/core_grey_25</item>
+        <item name="backup_enable_dialog_divider_background">@color/signal_divider_major</item>
+        <item name="backup_enable_subhead_color">@color/signal_text_primary_dialog</item>
 
         <item name="audio_seek_bar_sent_played_color">@color/core_grey_15</item>
         <item name="audio_seek_bar_sent_unplayed_color">@color/core_grey_60</item>
         <item name="audio_play_pause_sent_background_tint">@color/core_grey_60</item>
 
-        <item name="insight_modal_background">@drawable/insights_modal_background_dark</item>
-        <item name="insight_modal_button_background">@color/core_grey_60</item>
         <item name="insight_title">@color/core_grey_25</item>
         <item name="insight_body_2">@color/core_grey_25</item>
         <item name="insight_progress_background">@color/core_grey_60</item>
-        <item name="insight_dashboard_bottom_bar_background">@color/core_grey_80</item>
+        <item name="insight_dashboard_bottom_bar_background">@color/signal_background_secondary</item>
 
         <item name="resource_placeholder_gradient">@drawable/avatar_gradient_dark</item>
 
@@ -537,9 +476,9 @@
         <item name="qr_icon">@drawable/ic_qrcode_24_tinted</item>
         <item name="reset_link_icon">@drawable/ic_reset_24_tinted</item>
 
-        <item name="title_text_color_primary">@color/core_grey_05</item>
-        <item name="title_text_color_secondary">@color/core_grey_25</item>
-        <item name="title_text_color_disabled">@color/core_grey_60</item>
+        <item name="title_text_color_primary">@color/signal_text_primary</item>
+        <item name="title_text_color_secondary">@color/signal_text_secondary</item>
+        <item name="title_text_color_disabled">@color/signal_text_primary_disabled</item>
 
         <item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>
 
@@ -573,64 +512,51 @@
         <item name="kbs_confirm_lottie_success">@raw/lottie_kbs_success_dark</item>
         <item name="kbs_confirm_lottie_failure">@raw/lottie_kbs_fail_dark</item>
 
-        <item name="attachment_type_selector_background">@color/core_grey_95</item>
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
         <item name="attachment_keyboard_button_background">@drawable/attachment_keyboard_button_background_dark</item>
         <item name="attachment_keyboard_button_foreground">@color/core_grey_05</item>
 
-        <item name="compose_icon_tint">?icon_tint</item>
+        <item name="compose_icon_tint">@color/signal_icon_tint_primary</item>
 
-        <item name="contact_filter_toolbar_icon_tint">?icon_tint</item>
-        <item name="contact_filter_toolbar_keyboard_icon">@drawable/ic_keyboard_solid_contact_filter_24</item>
+        <item name="contact_filter_toolbar_icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
-        <item name="conversation_list_item_contact_color">#ffdddddd</item>
-        <item name="conversation_list_item_subject_color">#ffdddddd</item>
-        <item name="conversation_list_item_delivery_icon_color">@color/core_grey_25</item>
-        <item name="conversation_list_item_date_color">#ffdddddd</item>
-        <item name="conversation_list_item_unread_color">@color/core_white</item>
+        <item name="conversation_list_item_contact_color">@color/signal_text_primary</item>
+        <item name="conversation_list_item_subject_color">@color/signal_text_secondary</item>
+        <item name="conversation_list_item_delivery_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_item_date_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_item_unread_color">@color/signal_inverse_primary</item>
         <item name="conversation_list_item_unread_background">@drawable/unread_count_background_dark</item>
-        <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
         <item name="conversation_list_toolbar_background">@null</item>
-        <item name="conversation_list_typing_tint">@color/core_white</item>
-        <item name="conversation_list_camera_icon_tint">@color/core_white</item>
+        <item name="conversation_list_typing_tint">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_list_camera_icon_tint">@color/signal_icon_tint_secondary</item>
         <item name="conversation_list_compose_icon_tint">@color/core_white</item>
         <item name="conversation_list_camera_button_background">@color/core_grey_85</item>
 
         <item name="camera_icon_background_tint">@color/core_grey_75</item>
 
-        <item name="conversation_group_member_name">#99ffffff</item>
-
-        <item name="conversation_item_bubble_background">@color/core_grey_75</item>
-        <item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
-        <item name="conversation_item_sent_text_secondary_color">@color/core_grey_25</item>
-        <item name="conversation_item_sent_icon_color">@color/core_grey_25</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_white</item>
-        <item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
+        <item name="conversation_item_bubble_background">@color/signal_background_secondary</item>
+        <item name="conversation_item_sent_text_primary_color">@color/signal_text_primary</item>
+        <item name="conversation_item_sent_text_secondary_color">@color/signal_text_secondary</item>
+        <item name="conversation_item_sent_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_item_sent_download_icon_color">@color/signal_icon_tint_secondary</item>
         <item name="conversation_item_received_text_primary_color">@color/transparent_white_90</item>
         <item name="conversation_item_received_text_secondary_color">@color/transparent_white_60</item>
-        <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
         <item name="conversation_item_update_text_color">@color/core_grey_45</item>
-        <item name="conversation_item_last_seen_text_color">?title_text_color_primary</item>
+        <item name="conversation_item_last_seen_text_color">@color/signal_text_primary</item>
         <item name="conversation_item_last_seen_line_color">@color/core_grey_45</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_45</item>
         <item name="conversation_item_quote_text_color">@color/core_grey_05</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
-        <item name="conversation_item_sticky_date_text_color">@color/core_grey_25</item>
-        <item name="conversation_item_image_outline_color">@color/transparent_white_20</item>
+        <item name="conversation_item_sticky_date_text_color">@color/signal_text_secondary</item>
+        <item name="conversation_item_image_outline_color">@color/signal_inverse_transparent_20</item>
         <item name="conversation_item_reveal_viewed_background_color">?conversation_background</item>
-        <item name="conversation_item_delete_for_everyone_text_color">@color/core_grey_15</item>
-        <item name="conversation_item_mention_pulse_color">@color/transparent</item>
+        <item name="conversation_item_delete_for_everyone_text_color">@color/signal_text_primary</item>
+        <item name="conversation_item_mention_pulse_color">@color/signal_inverse_transparent</item>
         <item name="outlined_action_button">@style/Widget.Signal.Button.OutlinedAction.Dark</item>
         <item name="paragraph_marker">@drawable/paragraph_marker_dark</item>
 
-        <item name="safety_number_change_dialog_button_background">@color/core_grey_75</item>
-        <item name="safety_number_change_dialog_button_text_color">@color/core_grey_05</item>
-
-        <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
-
         <item name="debuglog_color_none">@color/debuglog_dark_none</item>
         <item name="debuglog_color_verbose">@color/debuglog_dark_verbose</item>
         <item name="debuglog_color_debug">@color/debuglog_dark_debug</item>
@@ -638,78 +564,64 @@
         <item name="debuglog_color_warn">@color/debuglog_dark_warn</item>
         <item name="debuglog_color_error">@color/debuglog_dark_error</item>
 
-        <item name="verification_background">@color/core_grey_95</item>
+        <item name="verification_background">@color/signal_background_secondary</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
-        <item name="dialog_background_color">@color/background_material_dark</item>
+        <item name="dialog_background_color">@color/signal_background_dialog</item>
 
-        <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
+        <item name="device_link_item_card_background">@color/signal_background_dialog</item>
 
-        <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
-
-        <item name="fab_color">@color/core_ultramarine</item>
+        <item name="fab_color">@color/signal_accent_primary</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
         <item name="help_emoji_radio_background">@drawable/help_fragment_emoji_radio_background_dark</item>
         <item name="help_next_background">@color/help_fragment_next_dark</item>
         <item name="help_problem_background">@drawable/help_fragment_problem_background_dark</item>
 
-        <item name="conversation_background">@color/core_grey_95</item>
-        <item name="conversation_editor_background">#22ffffff</item>
+        <item name="conversation_background">@color/signal_background_primary</item>
         <item name="conversation_editor_text_color">#ffeeeeee</item>
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
-        <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_05</item>
+        <item name="conversation_input_inline_attach_icon_tint">@color/signal_icon_tint_secondary</item>
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_unlock_24</item>
-        <item name="conversation_transport_push_indicator">@drawable/ic_send_lock_24</item>
-        <item name="conversation_transport_popup_background">@color/black</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_smiley_solid_24</item>
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_solid_24</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_solid_24</item>
         <item name="conversation_attach_camera">@drawable/ic_camera_solid_24</item>
-        <item name="conversation_attach_image">@drawable/ic_image_dark</item>
-        <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
-        <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
         <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
-        <item name="conversation_number_picker_text_color_normal">@color/core_grey_30</item>
-        <item name="conversation_number_picker_text_color_selected">@color/white</item>
-        <item name="conversation_sticker_footer_text_color">@color/core_grey_25</item>
-        <item name="conversation_sticker_footer_icon_color">@color/core_grey_25</item>
-        <item name="conversation_footer_sent_reveal_dot_color">@color/core_grey_25</item>
-        <item name="conversation_sticker_author_color">@color/core_grey_05</item>
+        <item name="conversation_number_picker_text_color_normal">@color/signal_text_primary_dialog</item>
+        <item name="conversation_number_picker_text_color_selected">@color/signal_text_selected</item>
+        <item name="conversation_sticker_footer_text_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_sticker_footer_icon_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_footer_sent_reveal_dot_color">@color/signal_icon_tint_secondary</item>
+        <item name="conversation_sticker_author_color">@color/signal_text_primary</item>
         <item name="conversation_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="conversation_title_color">@color/transparent_white_90</item>
-        <item name="conversation_subtitle_color">@color/transparent_white_80</item>
+        <item name="conversation_title_color">@color/signal_text_toolbar_title</item>
+        <item name="conversation_subtitle_color">@color/signal_text_toolbar_subtitle</item>
         <item name="conversation_mention_background_color">@color/core_grey_60</item>
         <item name="conversation_scroll_to_bottom_background">@drawable/scroll_to_bottom_background_dark</item>
         <item name="conversation_scroll_to_bottom_foreground_color">@color/core_white</item>
 
         <item name="low_priority_button_text_color">@color/core_grey_50</item>
 
-        <item name="mention_picker_background_color">@color/core_grey_90</item>
+        <item name="mention_picker_background_color">@color/signal_background_dialog</item>
 
         <item name="reactions_overlay_toolbar_icon_tint">@color/core_white</item>
-        <item name="reactions_overlay_toolbar_overflow_style">@style/Signal.Toolbar.Overflow</item>
         <item name="reactions_overlay_toolbar_background_color">@color/action_mode_status_bar</item>
         <item name="reactions_overlay_custom_emoji_icon">@drawable/ic_any_emoji_32_dark</item>
         <item name="reactions_overlay_old_background">@drawable/reactions_old_background_dark</item>
         <item name="reactions_overlay_scrubber_background">@drawable/conversation_reaction_overlay_background_dark</item>
-        <item name="reactions_bottom_dialog_fragment_emoji_selected">@drawable/reactions_bottom_sheet_dialog_fragment_emoji_item_selected_dark</item>
         <item name="reactions_pill_background">@drawable/reaction_pill_background_dark</item>
         <item name="reactions_pill_selected_background">@drawable/reaction_pill_background_selected_dark</item>
         <item name="reactions_pill_text_color">@color/core_grey_35</item>
         <item name="reactions_pill_selected_text_color">@color/core_grey_15</item>
         <item name="reactions_screen_shade_color">@color/transparent_black_60</item>
 
-        <item name="emoji_tab_strip_background">@color/core_grey_85</item>
-        <item name="emoji_tab_indicator">@color/core_grey_65</item>
-        <item name="emoji_tab_underline">@color/core_grey_75</item>
-        <item name="emoji_tab_seperator">@color/core_grey_70</item>
-        <item name="emoji_drawer_background">@color/core_grey_95</item>
-        <item name="emoji_text_color">@color/white</item>
+        <item name="emoji_tab_strip_background">@color/signal_background_secondary</item>
+        <item name="emoji_tab_indicator">@color/signal_inverse_transparent_40</item>
+        <item name="emoji_drawer_background">@color/signal_background_tertiary</item>
+        <item name="emoji_text_color">@color/signal_inverse_primary</item>
 
         <item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
         <item name="emoji_category_people">@drawable/ic_emoji_people_dark_20</item>
@@ -723,35 +635,26 @@
         <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
 
-        <item name="linkpreview_background_color">@color/core_grey_95</item>
-        <item name="linkpreview_primary_text_color">@color/core_white</item>
-        <item name="linkpreview_secondary_text_color">@color/core_grey_25</item>
-        <item name="linkpreview_divider_color">@color/core_grey_60</item>
+        <item name="linkpreview_background_color">@color/signal_background_primary</item>
+        <item name="linkpreview_primary_text_color">@color/signal_inverse_primary</item>
+        <item name="linkpreview_secondary_text_color">@color/signal_text_secondary</item>
+        <item name="linkpreview_divider_color">@color/signal_divider_major</item>
 
-        <item name="quick_camera_icon">@drawable/ic_camera_solid_24</item>
         <item name="quick_mic_icon">@drawable/ic_mic_solid_24</item>
 
         <item name="media_keyboard_button_color">@color/core_grey_25</item>
 
-        <item name="megaphone_background">@color/core_grey_75</item>
-        <item name="megaphone_background_shadow">@null</item>
+        <item name="megaphone_background">@color/signal_background_secondary</item>
         <item name="megaphone_body_text_color">@color/core_grey_25</item>
         <item name="megaphone_reactions_shade">@color/core_grey_70</item>
         <item name="megaphone_reactions_close_tint">@color/core_grey_15</item>
 
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_solid_24</item>
-        <item name="menu_search_icon">@drawable/ic_search_24</item>
         <item name="menu_call_icon">@drawable/ic_phone_right_unlock_solid_24</item>
         <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
         <item name="menu_trash_icon">@drawable/ic_trash_solid_24</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_24</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_copy_solid_24</item>
         <item name="menu_info_icon">@drawable/ic_info_solid_24</item>
         <item name="menu_forward_icon">@drawable/ic_forward_solid_24</item>
@@ -771,12 +674,11 @@
         <item name="data_and_storage_icon">@drawable/ic_archive_solid_24dp</item>
         <item name="linked_devices_icon">@drawable/ic_linked_devices_24</item>
         <item name="advanced_icon">@drawable/ic_advanced_24</item>
-        <item name="safety_number_icon">@drawable/ic_safety_number_solid_24</item>
         <item name="help_icon">@drawable/ic_help_solid_24</item>
         <item name="donate_icon">@drawable/ic_heart_solid_24</item>
         <item name="message_request_dialog_button_background">@drawable/message_request_button_background_dark</item>
-        <item name="message_request_text_color_primary">@color/core_grey_05</item>
-        <item name="message_request_text_color_secondary">@color/core_grey_25</item>
+        <item name="message_request_text_color_primary">@color/signal_text_primary</item>
+        <item name="message_request_text_color_secondary">@color/signal_text_secondary</item>
 
         <item name="avatar_selection_take_photo">@drawable/ic_camera_solid_24</item>
         <item name="avatar_selection_pick_photo">@drawable/ic_photo_solid_24</item>
@@ -785,25 +687,22 @@
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
 
-        <item name="registration_lock_reminder_view_pin_text_color">@color/core_white</item>
-
-        <item name="reminder_header_background">@color/core_ultramarine</item>
+        <item name="registration_lock_reminder_view_pin_text_color">@color/signal_inverse_primary</item>
 
         <item name="sticker_management_icon">@drawable/sticker_button_dark</item>
-        <item name="sticker_management_divider_color">@color/core_grey_75</item>
-        <item name="sticker_management_empty_background_color">@color/core_grey_85</item>
+        <item name="sticker_management_divider_color">@color/signal_divider_minor</item>
+        <item name="sticker_management_empty_background_color">@color/signal_background_secondary</item>
         <item name="sticker_management_action_button_color">@color/core_grey_25</item>
         <item name="sticker_management_item_background">@drawable/selectable_background_dark</item>
-        <item name="sticker_popup_background">@color/transparent_black_60</item>
-        <item name="sticker_preview_toolbar_background">@color/core_grey_95</item>
-        <item name="sticker_preview_status_bar_color">@color/core_grey_85</item>
+        <item name="sticker_popup_background">@color/signal_transparent_60</item>
+        <item name="sticker_preview_toolbar_background">@color/signal_background_primary</item>
         <item name="sticker_view_missing_background">@drawable/sticker_missing_background_dark</item>
 
         <item name="tooltip_default_color">@color/core_grey_75</item>
 
         <item name="dangerous_button_color">@color/core_red</item>
 
-        <item name="pref_icon_tint">?attr/icon_tint</item>
+        <item name="pref_icon_tint">@color/signal_icon_tint_primary</item>
 
         <item name="pref_divider">@drawable/preference_divider_dark</item>
 
@@ -816,10 +715,10 @@
         <item name="manage_group_add_members_icon">@drawable/ic_add_members_circle_dark</item>
         <item name="manage_group_view_all_icon">@drawable/ic_view_all_circle_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-        <item name="search_toolbar_background">@color/core_grey_95</item>
-        <item name="search_background">@color/black</item>
+        <item name="search_toolbar_background">@color/signal_background_primary</item>
+        <item name="search_background">@color/signal_background_primary</item>
 
-        <item name="shared_contact_details_header_background">@color/grey_800</item>
+        <item name="shared_contact_details_header_background">@color/signal_background_tertiary</item>
         <item name="shared_contact_details_titlebar">@color/grey_900</item>
         <item name="shared_contact_item_button_color">@color/core_grey_85</item>
 
@@ -992,8 +891,6 @@
         <item name="android:navigationBarColor" tools:ignore="NewApi">@color/white</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
 
-        <item name="recipient_message_icon">@drawable/ic_message_outline_tinted_24</item>
-        <item name="recipient_call_icon">@drawable/ic_phone_right_outline_tinted_24</item>
         <item name="recipient_block_icon">@drawable/ic_block_tinted_24</item>
         <item name="recipient_add_contact_icon">@drawable/ic_plus_24</item>
         <item name="recipient_view_safety_icon">@drawable/ic_info_outline_tinted_24</item>
@@ -1016,8 +913,6 @@
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/transparent</item>
 
-        <item name="recipient_message_icon">@drawable/ic_message_solid_tinted_24</item>
-        <item name="recipient_call_icon">@drawable/ic_phone_right_solid_tinted_24</item>
         <item name="recipient_block_icon">@drawable/ic_block_tinted_24</item>
         <item name="recipient_add_contact_icon">@drawable/ic_plus_24</item>
         <item name="recipient_view_safety_icon">@drawable/ic_info_solid_tinted_24</item>