diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
index 71f412d8dc..eaa3ee5a4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
@@ -270,8 +270,8 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity
             !TextSecurePreferences.isPasswordDisabled(context))
         {
           Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
-              .setSmallIcon(R.drawable.icon_notification)
-              .setColor(context.getResources().getColor(R.color.signal_primary))
+              .setSmallIcon(R.drawable.ic_notification)
+              .setColor(context.getResources().getColor(R.color.core_ultramarine))
               .setContentTitle(context.getString(R.string.ExperienceUpgradeActivity_unlock_to_complete_update))
               .setContentText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update))
               .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update)))
@@ -299,8 +299,8 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity
         dismissIntent.setAction(DISMISS_ACTION);
 
         Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
-                                        .setSmallIcon(R.drawable.icon_notification)
-                                        .setColor(context.getResources().getColor(R.color.signal_primary))
+                                        .setSmallIcon(R.drawable.ic_notification)
+                                        .setColor(context.getResources().getColor(R.color.core_ultramarine))
                                         .setContentTitle(context.getString(experienceUpgrade.get().getNotificationTitle()))
                                         .setContentText(context.getString(experienceUpgrade.get().getNotificationText()))
                                         .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(experienceUpgrade.get().getNotificationBigText())))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
index ab4ab8431f..0885792045 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
@@ -175,17 +175,17 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   private void setPrimaryColorsToolbarForSms() {
-    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.signal_primary));
+    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.core_ultramarine));
     primaryToolbar.getNavigationIcon().setColorFilter(ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color), PorterDuff.Mode.SRC_IN);
     primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
       WindowUtil.clearLightStatusBar(getWindow());
     }
 
     if (Build.VERSION.SDK_INT >= 27) {
-      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
       WindowUtil.clearLightNavigationBar(getWindow());
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 51df05ed26..8a047f0712 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -238,7 +238,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
                                      EditorInfo.IME_ACTION_DONE);
 
     fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
 
     lockScreenButton.setOnClickListener(v -> resumeScreenLock());
   }
@@ -358,7 +358,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
           handleAuthenticated();
 
           fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
         }
       }).start();
     }
@@ -381,7 +381,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
         @Override
         public void onAnimationEnd(Animation animation) {
           fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
         }
 
         @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
index d4ed37c42a..5a5b3fae3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
@@ -109,7 +109,7 @@ public class TransportOptions {
   public static @NonNull TransportOption getPushTransportOption(@NonNull Context context) {
     return new TransportOption(Type.TEXTSECURE,
                                R.drawable.ic_send_lock_24,
-                               context.getResources().getColor(R.color.textsecure_primary),
+                               context.getResources().getColor(R.color.core_ultramarine),
                                context.getString(R.string.ConversationActivity_transport_signal),
                                context.getString(R.string.conversation_activity__type_message_push),
                                new PushCharacterCalculator());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
index 30407e2acf..7b07b21229 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -235,7 +235,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     final String headerString = getHeaderString(position);
     if (isPush(position)) {
       SpannableString spannable = new SpannableString(headerString);
-      spannable.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.signal_primary)), 0, headerString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      spannable.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.core_ultramarine)), 0, headerString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
       return spannable;
     } else {
       return headerString;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 4dc0e81e06..da37bac029 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1787,7 +1787,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     inputPanel.setMediaKeyboardToggleMode(true);
 
     TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
-                .setBackgroundTint(getResources().getColor(R.color.core_blue))
+                .setBackgroundTint(getResources().getColor(R.color.core_ultramarine))
                 .setTextColor(getResources().getColor(R.color.core_white))
                 .setText(R.string.ConversationActivity_new_say_it_with_stickers)
                 .setOnDismissListener(() -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 5b09be243f..245943f48d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1015,7 +1015,7 @@ public class ConversationFragment extends Fragment
       TooltipPopup.forTarget(requireActivity().findViewById(R.id.menu_context_reply))
                   .setText(text)
                   .setTextColor(getResources().getColor(R.color.core_white))
-                  .setBackgroundTint(getResources().getColor(R.color.core_blue))
+                  .setBackgroundTint(getResources().getColor(R.color.core_ultramarine))
                   .show(TooltipPopup.POSITION_BELOW);
 
       TextSecurePreferences.setHasSeenSwipeToReplyTooltip(requireContext(), true);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
index 681cf8cf32..6a8a76ff4e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
@@ -108,7 +108,7 @@ public class GiphyActivity extends PassphraseRequiredActionBarActivity
   }
 
   private @ColorInt int getConversationColor() {
-    return getIntent().getIntExtra(EXTRA_COLOR, ActivityCompat.getColor(this, R.color.signal_primary));
+    return getIntent().getIntExtra(EXTRA_COLOR, ActivityCompat.getColor(this, R.color.core_ultramarine));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
index 0dae4d8686..ea2637df41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
@@ -125,7 +125,7 @@ public class FcmRefreshJob extends BaseJob {
     PendingIntent              pendingIntent = PendingIntent.getActivity(context, 1122, intent, PendingIntent.FLAG_CANCEL_CURRENT);
     NotificationCompat.Builder builder       = new NotificationCompat.Builder(context, NotificationChannels.FAILURES);
 
-    builder.setSmallIcon(R.drawable.icon_notification);
+    builder.setSmallIcon(R.drawable.ic_notification);
     builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(),
                                                       R.drawable.ic_action_warning_red));
     builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
index d28ac89d75..4b7bbf72c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -137,7 +137,7 @@ public final class PushDecryptMessageJob extends BaseJob {
     // TODO [greyson] Navigation
     NotificationManagerCompat.from(context).notify(494949,
                                                    new NotificationCompat.Builder(context, NotificationChannels.getMessagesChannel(context))
-                                                                         .setSmallIcon(R.drawable.icon_notification)
+                                                                         .setSmallIcon(R.drawable.ic_notification)
                                                                          .setPriority(NotificationCompat.PRIORITY_HIGH)
                                                                          .setCategory(NotificationCompat.CATEGORY_MESSAGE)
                                                                          .setContentTitle(context.getString(R.string.PushDecryptJob_new_locked_message))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index 8ea39dad91..4b73959e7b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -308,7 +308,7 @@ public class CameraXFragment extends Fragment implements CameraFragment {
 
       TooltipPopup.forTarget(captureButton)
                   .setOnDismissListener(this::neverDisplayVideoRecordingTooltipAgain)
-                  .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.signal_primary))
+                  .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.core_ultramarine))
                   .setTextColor(ThemeUtil.getThemedColor(requireContext(), R.attr.conversation_title_color))
                   .setText(R.string.CameraXFragment_tap_for_photo_hold_for_video)
                   .show(displayRotation == Surface.ROTATION_0 || displayRotation == Surface.ROTATION_180 ? TooltipPopup.POSITION_ABOVE : TooltipPopup.POSITION_START);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index d04e93588c..d57e7dfb62 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -727,7 +727,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
         case VIEW_ONCE_TOOLTIP:
           TooltipPopup.forTarget(revealButton)
                       .setText(R.string.MediaSendActivity_tap_here_to_make_this_message_disappear_after_it_is_viewed)
-                      .setBackgroundTint(getResources().getColor(R.color.core_blue))
+                      .setBackgroundTint(getResources().getColor(R.color.core_ultramarine))
                       .setTextColor(getResources().getColor(R.color.core_white))
                       .setOnDismissListener(() -> TextSecurePreferences.setHasSeenViewOnceTooltip(this, true))
                       .show(TooltipPopup.POSITION_ABOVE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
index af0508ffe2..084785932b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
@@ -14,7 +14,7 @@ public class FailedNotificationBuilder extends AbstractNotificationBuilder {
   public FailedNotificationBuilder(Context context, NotificationPrivacyPreference privacy, Intent intent) {
     super(context, privacy);
 
-    setSmallIcon(R.drawable.icon_notification);
+    setSmallIcon(R.drawable.ic_notification);
     setLargeIcon(BitmapFactory.decodeResource(context.getResources(),
                                               R.drawable.ic_action_warning_red));
     setContentTitle(context.getString(R.string.MessageNotifier_message_delivery_failed));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index 6d6199a2b3..e455b028d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -25,8 +25,8 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
   public MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
     super(context, privacy);
 
-    setColor(context.getResources().getColor(R.color.textsecure_primary));
-    setSmallIcon(R.drawable.icon_notification);
+    setColor(context.getResources().getColor(R.color.core_ultramarine));
+    setSmallIcon(R.drawable.ic_notification);
     setContentTitle(context.getString(R.string.app_name));
     // TODO [greyson] Navigation
     setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
index dcdc9a2b62..9b58e25c78 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
@@ -20,8 +20,8 @@ public class PendingMessageNotificationBuilder extends AbstractNotificationBuild
     // TODO [greyson] Navigation
     Intent intent = new Intent(context, MainActivity.class);
 
-    setSmallIcon(R.drawable.icon_notification);
-    setColor(context.getResources().getColor(R.color.textsecure_primary));
+    setSmallIcon(R.drawable.ic_notification);
+    setColor(context.getResources().getColor(R.color.core_ultramarine));
     setCategory(NotificationCompat.CATEGORY_MESSAGE);
 
     setContentTitle(context.getString(R.string.MessageNotifier_you_may_have_new_messages));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index 228934167e..42f1bc16e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -62,8 +62,8 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
   {
     super(new ContextThemeWrapper(context, R.style.TextSecure_LightTheme), privacy);
 
-    setSmallIcon(R.drawable.icon_notification);
-    setColor(context.getResources().getColor(R.color.textsecure_primary));
+    setSmallIcon(R.drawable.ic_notification);
+    setColor(context.getResources().getColor(R.color.core_ultramarine));
     setCategory(NotificationCompat.CATEGORY_MESSAGE);
 
     if (!NotificationChannels.supported()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
index 727e4ae5b0..121ea1de94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
@@ -68,7 +68,7 @@ public class ContactPreference extends Preference {
     int color;
 
     if (secure) {
-      color = getContext().getResources().getColor(R.color.textsecure_primary);
+      color = getContext().getResources().getColor(R.color.core_ultramarine);
     } else {
       color = getContext().getResources().getColor(R.color.grey_600);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index 2ac6442db5..44b7b36655 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -128,8 +128,8 @@ public class ApplicationMigrationService extends Service
   private NotificationCompat.Builder initializeBackgroundNotification() {
     NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NotificationChannels.OTHER);
 
-    builder.setSmallIcon(R.drawable.icon_notification);
-    builder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.icon_notification));
+    builder.setSmallIcon(R.drawable.ic_notification);
+    builder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_notification));
     builder.setContentTitle(getString(R.string.ApplicationMigrationService_importing_text_messages));
     builder.setContentText(getString(R.string.ApplicationMigrationService_import_in_progress));
     builder.setOngoing(true);
@@ -183,7 +183,7 @@ public class ApplicationMigrationService extends Service
     @Override
     public void onReceive(Context context, Intent intent) {
       NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NotificationChannels.OTHER);
-      builder.setSmallIcon(R.drawable.icon_notification);
+      builder.setSmallIcon(R.drawable.ic_notification);
       builder.setContentTitle(context.getString(R.string.ApplicationMigrationService_import_complete));
       builder.setContentText(context.getString(R.string.ApplicationMigrationService_system_database_import_is_complete));
       // TODO [greyson] Navigation
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
index e1d1f7280d..5406c9c5d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
@@ -67,8 +67,8 @@ public class UpdateApkReadyListener extends BroadcastReceiver {
         .setOngoing(true)
         .setContentTitle(context.getString(R.string.UpdateApkReadyListener_Signal_update))
         .setContentText(context.getString(R.string.UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update))
-        .setSmallIcon(R.drawable.icon_notification)
-        .setColor(context.getResources().getColor(R.color.textsecure_primary))
+        .setSmallIcon(R.drawable.ic_notification)
+        .setColor(context.getResources().getColor(R.color.core_ultramarine))
         .setPriority(NotificationCompat.PRIORITY_HIGH)
         .setCategory(NotificationCompat.CATEGORY_REMINDER)
         .setContentIntent(pendingIntent)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
index 2886689ef5..b602eb09f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
@@ -302,7 +302,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
       Drawable        badge     = ContextCompat.getDrawable(context, R.drawable.ic_check_circle_white_18dp);
 
       badge.setBounds(0, 0, badge.getIntrinsicWidth(), badge.getIntrinsicHeight());
-      badge.setColorFilter(ContextCompat.getColor(context, R.color.core_blue), PorterDuff.Mode.MULTIPLY);
+      badge.setColorFilter(ContextCompat.getColor(context, R.color.core_ultramarine), PorterDuff.Mode.MULTIPLY);
       badgeSpan.setSpan(new ImageSpan(badge), 1, badgeSpan.length(), 0);
 
       return badgeSpan;
diff --git a/app/src/main/res/color/help_fragment_next_dark.xml b/app/src/main/res/color/help_fragment_next_dark.xml
index d210aa9226..8fd6e060b1 100644
--- a/app/src/main/res/color/help_fragment_next_dark.xml
+++ b/app/src/main/res/color/help_fragment_next_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_primary" android:state_enabled="true" />
+    <item android:color="@color/core_ultramarine" android:state_enabled="true" />
     <item android:color="@color/core_grey_75" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/help_fragment_next_light.xml b/app/src/main/res/color/help_fragment_next_light.xml
index 6ecdc9eb3c..84421ed12b 100644
--- a/app/src/main/res/color/help_fragment_next_light.xml
+++ b/app/src/main/res/color/help_fragment_next_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_primary" android:state_enabled="true" />
+    <item android:color="@color/core_ultramarine" android:state_enabled="true" />
     <item android:color="@color/core_grey_25" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/icon_notification.webp b/app/src/main/res/drawable-hdpi/icon_notification.webp
deleted file mode 100644
index 819e144ff1..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_transparent.webp b/app/src/main/res/drawable-hdpi/icon_transparent.webp
deleted file mode 100644
index e9936f254c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_transparent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_notification.webp b/app/src/main/res/drawable-mdpi/icon_notification.webp
deleted file mode 100644
index 76e4af9b98..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_transparent.webp b/app/src/main/res/drawable-mdpi/icon_transparent.webp
deleted file mode 100644
index 2e92a8b495..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_transparent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/camera_send_button_background.xml b/app/src/main/res/drawable-v21/camera_send_button_background.xml
index bc0ce271cb..df91cfd220 100644
--- a/app/src/main/res/drawable-v21/camera_send_button_background.xml
+++ b/app/src/main/res/drawable-v21/camera_send_button_background.xml
@@ -11,7 +11,7 @@
 
     <item>
         <shape android:shape="oval" >
-            <solid android:color="@color/signal_primary"/>
+            <solid android:color="@color/core_ultramarine"/>
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/conversation_list_item_background.xml b/app/src/main/res/drawable-v21/conversation_list_item_background.xml
index 642879178e..6ef38ac5e1 100644
--- a/app/src/main/res/drawable-v21/conversation_list_item_background.xml
+++ b/app/src/main/res/drawable-v21/conversation_list_item_background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/textsecure_primary">
+        android:color="@color/core_ultramarine">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
         </selector>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml b/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml
index 642879178e..6ef38ac5e1 100644
--- a/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml
+++ b/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/textsecure_primary">
+        android:color="@color/core_ultramarine">
     <item android:id="@android:id/mask" android:drawable="@android:color/black" />
     <item>
         <selector>
-            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
         </selector>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-v21/cta_button_background.xml b/app/src/main/res/drawable-v21/cta_button_background.xml
index faa6232f9d..059e9cc259 100644
--- a/app/src/main/res/drawable-v21/cta_button_background.xml
+++ b/app/src/main/res/drawable-v21/cta_button_background.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/signal_primary_dark">
+    android:color="@color/core_ultramarine">
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
-            <solid android:color="@color/signal_primary_dark" />
+            <solid android:color="@color/core_ultramarine_dark" />
         </shape>
     </item>
 
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
-            <solid android:color="@color/signal_primary" />
+            <solid android:color="@color/core_ultramarine" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable-v21/media_continue_button_background.xml b/app/src/main/res/drawable-v21/media_continue_button_background.xml
index bc0ce271cb..df91cfd220 100644
--- a/app/src/main/res/drawable-v21/media_continue_button_background.xml
+++ b/app/src/main/res/drawable-v21/media_continue_button_background.xml
@@ -11,7 +11,7 @@
 
     <item>
         <shape android:shape="oval" >
-            <solid android:color="@color/signal_primary"/>
+            <solid android:color="@color/core_ultramarine"/>
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable-xhdpi/icon_notification.webp b/app/src/main/res/drawable-xhdpi/icon_notification.webp
deleted file mode 100644
index 67529804f1..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_transparent.webp b/app/src/main/res/drawable-xhdpi/icon_transparent.webp
deleted file mode 100644
index 13fcd84183..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_transparent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_notification.webp b/app/src/main/res/drawable-xxhdpi/icon_notification.webp
deleted file mode 100644
index 7268fffcae..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_transparent.webp b/app/src/main/res/drawable-xxhdpi/icon_transparent.webp
deleted file mode 100644
index 044d8a15b5..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_transparent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_notification.webp b/app/src/main/res/drawable-xxxhdpi/icon_notification.webp
deleted file mode 100644
index 9011939c36..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_transparent.webp b/app/src/main/res/drawable-xxxhdpi/icon_transparent.webp
deleted file mode 100644
index 11c324dff0..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_transparent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/camera_send_button_background.xml b/app/src/main/res/drawable/camera_send_button_background.xml
index f612f8c4f3..7bcb1e9d44 100644
--- a/app/src/main/res/drawable/camera_send_button_background.xml
+++ b/app/src/main/res/drawable/camera_send_button_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/signal_primary"/>
+    <solid android:color="@color/core_ultramarine"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/conversation_item_background.xml b/app/src/main/res/drawable/conversation_item_background.xml
index d4cbc9d842..31d6730d5f 100644
--- a/app/src/main/res/drawable/conversation_item_background.xml
+++ b/app/src/main/res/drawable/conversation_item_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
+    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
 </selector>
diff --git a/app/src/main/res/drawable/conversation_item_background_animated.xml b/app/src/main/res/drawable/conversation_item_background_animated.xml
index 3664c2a1d7..0116af86c6 100644
--- a/app/src/main/res/drawable/conversation_item_background_animated.xml
+++ b/app/src/main/res/drawable/conversation_item_background_animated.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="1000">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
+    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
 </selector>
diff --git a/app/src/main/res/drawable/conversation_list_item_background.xml b/app/src/main/res/drawable/conversation_list_item_background.xml
index 92908acc6a..2b88d4b9cb 100644
--- a/app/src/main/res/drawable/conversation_list_item_background.xml
+++ b/app/src/main/res/drawable/conversation_list_item_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
+    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
 </selector>
diff --git a/app/src/main/res/drawable/conversation_list_item_background_dark.xml b/app/src/main/res/drawable/conversation_list_item_background_dark.xml
index 92908acc6a..2b88d4b9cb 100644
--- a/app/src/main/res/drawable/conversation_list_item_background_dark.xml
+++ b/app/src/main/res/drawable/conversation_list_item_background_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
+    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
 </selector>
diff --git a/app/src/main/res/drawable/cta_button_background.xml b/app/src/main/res/drawable/cta_button_background.xml
index 4695736fd2..44e80001f2 100644
--- a/app/src/main/res/drawable/cta_button_background.xml
+++ b/app/src/main/res/drawable/cta_button_background.xml
@@ -3,13 +3,13 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
-            <solid android:color="@color/signal_primary_dark" />
+            <solid android:color="@color/core_ultramarine_dark" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
-            <solid android:color="@color/signal_primary" />
+            <solid android:color="@color/core_ultramarine" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml b/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml
index d6f235e65f..9145b1ce56 100644
--- a/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml
+++ b/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape android:shape="oval">
-            <solid android:color="@color/signal_primary" />
+            <solid android:color="@color/core_ultramarine" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml b/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml
index c648a10f86..ce03a64abf 100644
--- a/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml
+++ b/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape android:shape="oval">
-            <solid android:color="@color/signal_primary" />
+            <solid android:color="@color/core_ultramarine" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/drawable/ic_check_circle_solid_20.xml b/app/src/main/res/drawable/ic_check_circle_solid_20.xml
index 5e5b0a250a..9a0af2a0bb 100644
--- a/app/src/main/res/drawable/ic_check_circle_solid_20.xml
+++ b/app/src/main/res/drawable/ic_check_circle_solid_20.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="20"
     android:viewportHeight="20">
     <path
-        android:fillColor="@color/core_blue"
+        android:fillColor="@color/core_ultramarine"
         android:pathData="M10,10m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" />
     <path
         android:fillColor="@color/core_white"
diff --git a/app/src/main/res/drawable/ic_kbs_splash_light_svg.xml b/app/src/main/res/drawable/ic_kbs_splash_light_svg.xml
index 7c09ac4b81..b22785dcd8 100644
--- a/app/src/main/res/drawable/ic_kbs_splash_light_svg.xml
+++ b/app/src/main/res/drawable/ic_kbs_splash_light_svg.xml
@@ -39,6 +39,6 @@
     </group>
     <path
         android:pathData="M160.36,173.85L158.452,172.622L159.178,171.653L160.868,173.222L161.466,170.864L162.63,171.265L161.621,173.523L163.897,173.337L163.866,174.569L161.583,174.325L162.416,176.533L161.234,176.893L160.793,174.528L159.01,176.062L158.283,175.08L160.36,173.85ZM173.332,178.317L171.424,177.089L172.15,176.119L173.84,177.689L174.438,175.331L175.602,175.732L174.593,177.99L176.869,177.804L176.838,179.036L174.555,178.791L175.388,180.999L174.206,181.359L173.765,178.995L171.982,180.528L171.255,179.547L173.332,178.317ZM186.304,182.783L184.396,181.555L185.122,180.586L186.812,182.155L187.41,179.798L188.574,180.199L187.565,182.456L189.841,182.271L189.81,183.503L187.527,183.258L188.361,185.466L187.178,185.826L186.737,183.462L184.954,184.995L184.227,184.013L186.304,182.783ZM199.276,187.25L197.368,186.022L198.094,185.053L199.784,186.622L200.382,184.264L201.546,184.665L200.537,186.923L202.814,186.737L202.782,187.969L200.499,187.725L201.333,189.933L200.15,190.293L199.709,187.928L197.926,189.462L197.2,188.48L199.276,187.25ZM212.249,191.717L210.34,190.489L211.066,189.519L212.756,191.089L213.354,188.731L214.518,189.132L213.509,191.389L215.786,191.204L215.754,192.436L213.471,192.191L214.305,194.399L213.122,194.759L212.681,192.395L210.898,193.928L210.172,192.946L212.249,191.717ZM225.221,196.183L223.312,194.955L224.038,193.986L225.728,195.555L226.326,193.198L227.491,193.599L226.481,195.856L228.758,195.67L228.726,196.903L226.443,196.658L227.277,198.866L226.094,199.226L225.653,196.862L223.87,198.395L223.144,197.413L225.221,196.183Z"
-        android:fillColor="#2090EA"/>
+        android:fillColor="@color/core_ultramarine"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..b59070865f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M48.24,30.7l0.54,2.18a21.46,21.46 0,0 0,-6 2.5L41.6,33.45A24,24 0,0 1,48.24 30.7ZM59.76,30.7 L59.22,32.88a21.46,21.46 0,0 1,6 2.5l1.16,-1.93A24,24 0,0 0,59.76 30.7ZM33.45,41.6a24,24 0,0 0,-2.75 6.64l2.18,0.54a21.46,21.46 0,0 1,2.5 -6ZM32.25,54a21.85,21.85 0,0 1,0.24 -3.26l-2.22,-0.34a24.13,24.13 0,0 0,0 7.2l2.22,-0.34A21.85,21.85 0,0 1,32.25 54ZM66.4,74.55l-1.16,-1.93a21.46,21.46 0,0 1,-6 2.5l0.54,2.18A24,24 0,0 0,66.4 74.55ZM75.75,54a21.85,21.85 0,0 1,-0.24 3.26l2.22,0.34a24.13,24.13 0,0 0,0 -7.2l-2.22,0.34A21.85,21.85 0,0 1,75.75 54ZM77.3,59.76 L75.12,59.22a21.46,21.46 0,0 1,-2.5 6l1.93,1.16A24,24 0,0 0,77.3 59.76ZM57.3,75.51a22.26,22.26 0,0 1,-6.52 0l-0.34,2.22a24.14,24.14 0,0 0,7.2 0ZM71.51,66.9a21.9,21.9 0,0 1,-4.61 4.61l1.34,1.81a24.46,24.46 0,0 0,5.08 -5.08ZM66.9,36.49a21.9,21.9 0,0 1,4.61 4.61l1.81,-1.34a24.46,24.46 0,0 0,-5.08 -5.08ZM36.49,41.1a21.9,21.9 0,0 1,4.61 -4.61l-1.34,-1.81a24.46,24.46 0,0 0,-5.08 5.08ZM74.55,41.6 L72.62,42.76a21.46,21.46 0,0 1,2.5 6l2.18,-0.54A24,24 0,0 0,74.55 41.6ZM50.74,32.49a22.26,22.26 0,0 1,6.52 0l0.34,-2.22a24.13,24.13 0,0 0,-7.2 0ZM37.65,73.91 L33,75l1.09,-4.65 -2.2,-0.51 -1.08,4.65a2.25,2.25 0,0 0,2.7 2.7l4.65,-1.08ZM32.36,67.83 L34.55,68.34 35.31,65.12a21.41,21.41 0,0 1,-2.43 -5.9l-2.18,0.54a23.85,23.85 0,0 0,2.22 5.7ZM42.88,72.69 L39.66,73.45 40.17,75.64 42.53,75.08a24.09,24.09 0,0 0,5.71 2.22l0.54,-2.18A21.41,21.41 0,0 1,42.88 72.69ZM54,34.5A19.5,19.5 0,0 0,37.49 64.37l-1.87,8 8,-1.87A19.5,19.5 0,1 0,54 34.5Z"
+      android:strokeAlpha="0.95"
+      android:fillColor="#fff"
+      android:fillAlpha="0.95"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_map_marker.xml b/app/src/main/res/drawable/ic_map_marker.xml
index 29967a6390..a2c1b00d83 100644
--- a/app/src/main/res/drawable/ic_map_marker.xml
+++ b/app/src/main/res/drawable/ic_map_marker.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="438.536"
     android:viewportHeight="438.536">
     <path
-        android:fillColor="#2090ea"
+        android:fillColor="@color/core_ultramarine"
         android:pathData="M322.621,42.825C294.073,14.272 259.619,0 219.268,0c-40.353,0 -74.803,14.275 -103.353,42.825c-28.549,28.549 -42.825,63 -42.825,103.353c0,20.749 3.14,37.782 9.419,51.106l104.21,220.986c2.856,6.276 7.283,11.225 13.278,14.838c5.996,3.617 12.419,5.428 19.273,5.428c6.852,0 13.278,-1.811 19.273,-5.428c5.996,-3.613 10.513,-8.562 13.559,-14.838l103.918,-220.986c6.282,-13.324 9.424,-30.358 9.424,-51.106C365.449,105.825 351.176,71.378 322.621,42.825zM270.942,197.855c-14.273,14.272 -31.497,21.411 -51.674,21.411s-37.401,-7.139 -51.678,-21.411c-14.275,-14.277 -21.414,-31.501 -21.414,-51.678c0,-20.175 7.139,-37.402 21.414,-51.675c14.277,-14.275 31.504,-21.414 51.678,-21.414c20.177,0 37.401,7.139 51.674,21.414c14.274,14.272 21.413,31.5 21.413,51.675C292.355,166.352 285.217,183.575 270.942,197.855z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 0000000000..b6be281331
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,16.2a9.4,9.4 0,0 1,-0.65 -1.77l1,-0.25A8.83,8.83 0,0 0,4 16.1l-0.33,1.62 -1,-0.2ZM5.43,20.51L3,21l0.49,-2.39 -1,-0.19L2,20.8a1,1 0,0 0,0.25 0.93A1,1 0,0 0,3 22l0.24,0 2.39,-0.49ZM7.9,20l-1.62,0.33 0.2,1L7.81,21a9.06,9.06 0,0 0,1.76 0.65l0.25,-1A8.83,8.83 0,0 1,7.9 20ZM3.43,6.86A10.07,10.07 0,0 0,2.31 9.57l1,0.25a9,9 0,0 1,1 -2.44ZM6.86,3.43l0.52,0.86a9,9 0,0 1,2.44 -1l-0.25,-1A10.07,10.07 0,0 0,6.86 3.43ZM14.43,2.31 L14.18,3.31a9,9 0,0 1,2.44 1l0.52,-0.86A10.07,10.07 0,0 0,14.43 2.31ZM17.14,20.57 L16.62,19.71a9,9 0,0 1,-2.44 1l0.25,1A10.07,10.07 0,0 0,17.14 20.57ZM21,12a8.2,8.2 0,0 1,-0.11 1.32l1,0.15A10.17,10.17 0,0 0,22 12a10.17,10.17 0,0 0,-0.12 -1.47l-1,0.15A8.2,8.2 0,0 1,21 12ZM3,12a8.2,8.2 0,0 1,0.11 -1.32l-1,-0.15A10.17,10.17 0,0 0,2 12a10.17,10.17 0,0 0,0.12 1.47l1,-0.15A8.2,8.2 0,0 1,3 12ZM10.68,3.11a8,8 0,0 1,2.64 0l0.15,-1A10.17,10.17 0,0 0,12 2a10.17,10.17 0,0 0,-1.47 0.12ZM13.32,20.89a8,8 0,0 1,-2.64 0l-0.15,1A10.17,10.17 0,0 0,12 22a10.17,10.17 0,0 0,1.47 -0.12ZM20.57,6.89 L19.71,7.41a9,9 0,0 1,1 2.44l1,-0.25A10.07,10.07 0,0 0,20.57 6.86ZM19.22,17.35a8.73,8.73 0,0 1,-1.87 1.87l0.6,0.8A9.67,9.67 0,0 0,20 18ZM21.69,14.43 L20.69,14.18a9,9 0,0 1,-1 2.44l0.86,0.52A10.07,10.07 0,0 0,21.69 14.43ZM17.35,4.78a8.73,8.73 0,0 1,1.87 1.87l0.8,-0.6A9.67,9.67 0,0 0,18 4ZM4.78,6.65A8.73,8.73 0,0 1,6.65 4.78L6.05,4A9.67,9.67 0,0 0,4 6.05ZM12,4A8,8 0,0 0,5 15.91l-0.78,3.84L8.09,19A8,8 0,1 0,12 4Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_send_lock_24.xml b/app/src/main/res/drawable/ic_send_lock_24.xml
index 3e61677967..23f5573e8a 100644
--- a/app/src/main/res/drawable/ic_send_lock_24.xml
+++ b/app/src/main/res/drawable/ic_send_lock_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_primary"
+      android:fillColor="@color/core_ultramarine"
       android:pathData="M12.694,18.461 L5.286,22.694A1.25,1.25 0,0 1,3.433 21.4L4.69,13.862 14,12 4.69,10.138 3.433,2.6A1.25,1.25 0,0 1,5.286 1.306L22.1,10.915a1.25,1.25 0,0 1,0 2.17l-1.194,0.682A3.99,3.99 0,0 0,14 16.5v0.416A3.017,3.017 0,0 0,12.694 18.461ZM22,19.5v3A1.5,1.5 0,0 1,20.5 24h-5A1.5,1.5 0,0 1,14 22.5v-3a1.5,1.5 0,0 1,1.25 -1.475L15.25,16.75a2.75,2.75 0,0 1,5.5 0v1.275A1.5,1.5 0,0 1,22 19.5ZM16.75,16.75L16.75,18h2.5L19.25,16.75a1.25,1.25 0,0 0,-2.5 0Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_send_unlock_24.xml b/app/src/main/res/drawable/ic_send_unlock_24.xml
index cedd90d5f4..9632084904 100644
--- a/app/src/main/res/drawable/ic_send_unlock_24.xml
+++ b/app/src/main/res/drawable/ic_send_unlock_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_primary"
+      android:fillColor="@color/core_ultramarine"
       android:pathData="M9.5,20.286 L5.286,22.694A1.25,1.25 0,0 1,3.433 21.4L4.69,13.862 14,12 4.69,10.138 3.433,2.6A1.25,1.25 0,0 1,5.286 1.306L22.1,10.915a1.25,1.25 0,0 1,0 2.17l-0.581,0.332A3.979,3.979 0,0 0,15 16.5H12.5a3,3 0,0 0,-3 3ZM19,14a2.75,2.75 0,0 0,-2.75 2.75V18H12.5A1.5,1.5 0,0 0,11 19.5v3A1.5,1.5 0,0 0,12.5 24h5A1.5,1.5 0,0 0,19 22.5v-3a1.5,1.5 0,0 0,-1.25 -1.475V16.75a1.25,1.25 0,0 1,2.5 0V18h1.5V16.75A2.75,2.75 0,0 0,19 14Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_outline_24.xml b/app/src/main/res/drawable/ic_share_outline_24.xml
index e0d004e64b..3018fe04d5 100644
--- a/app/src/main/res/drawable/ic_share_outline_24.xml
+++ b/app/src/main/res/drawable/ic_share_outline_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_primary"
+      android:fillColor="@color/core_ultramarine"
       android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15ZM17,4.5A1.5,1.5 0,1 1,15.5 6,1.5 1.5,0 0,1 17,4.5ZM6,13.5A1.5,1.5 0,1 1,7.5 12,1.5 1.5,0 0,1 6,13.5ZM17,19.5A1.5,1.5 0,1 1,18.5 18,1.5 1.5,0 0,1 17,19.5Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_solid_24.xml b/app/src/main/res/drawable/ic_share_solid_24.xml
index 75a92502b7..06458017ca 100644
--- a/app/src/main/res/drawable/ic_share_solid_24.xml
+++ b/app/src/main/res/drawable/ic_share_solid_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_primary"
+      android:fillColor="@color/core_ultramarine"
       android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/info_round.xml b/app/src/main/res/drawable/info_round.xml
index 668eaf3bee..4dc3e2fadc 100644
--- a/app/src/main/res/drawable/info_round.xml
+++ b/app/src/main/res/drawable/info_round.xml
@@ -10,7 +10,7 @@
     <item>
         <shape>
             <corners android:radius="2dp" />
-            <solid android:color="#ff2090ea" />
+            <solid android:color="@color/core_ultramarine" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/insights_cta_button_background.xml b/app/src/main/res/drawable/insights_cta_button_background.xml
index 5d8a5c7ee1..8992c530ee 100644
--- a/app/src/main/res/drawable/insights_cta_button_background.xml
+++ b/app/src/main/res/drawable/insights_cta_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/signal_primary" />
+    <solid android:color="@color/core_ultramarine" />
     <corners android:radius="2dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/labeled_edit_text_background_active.xml b/app/src/main/res/drawable/labeled_edit_text_background_active.xml
index 00a2dc992e..3bb9c5f1a1 100644
--- a/app/src/main/res/drawable/labeled_edit_text_background_active.xml
+++ b/app/src/main/res/drawable/labeled_edit_text_background_active.xml
@@ -7,7 +7,7 @@
     <corners android:radius="4dp" />
 
     <stroke
-        android:color="@color/signal_primary"
+        android:color="@color/core_ultramarine"
         android:width="2dp" />
 
 </shape>
diff --git a/app/src/main/res/drawable/media_continue_button_background.xml b/app/src/main/res/drawable/media_continue_button_background.xml
index f612f8c4f3..7bcb1e9d44 100644
--- a/app/src/main/res/drawable/media_continue_button_background.xml
+++ b/app/src/main/res/drawable/media_continue_button_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/signal_primary"/>
+    <solid android:color="@color/core_ultramarine"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml
index be4d965cfc..febeaab9f7 100644
--- a/app/src/main/res/drawable/media_count_button_background.xml
+++ b/app/src/main/res/drawable/media_count_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
-    <solid android:color="@color/signal_primary" />
+    <solid android:color="@color/core_ultramarine" />
 </shape>
diff --git a/app/src/main/res/drawable/mediarail_media_outline.xml b/app/src/main/res/drawable/mediarail_media_outline.xml
index 8b6e4ec97f..54e19058e8 100644
--- a/app/src/main/res/drawable/mediarail_media_outline.xml
+++ b/app/src/main/res/drawable/mediarail_media_outline.xml
@@ -4,5 +4,5 @@
 
     <stroke
         android:width="3dp"
-        android:color="@color/signal_primary"/>
+        android:color="@color/core_ultramarine"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml
index be4d965cfc..febeaab9f7 100644
--- a/app/src/main/res/drawable/pill.xml
+++ b/app/src/main/res/drawable/pill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
-    <solid android:color="@color/signal_primary" />
+    <solid android:color="@color/core_ultramarine" />
 </shape>
diff --git a/app/src/main/res/drawable/progress_button_state.xml b/app/src/main/res/drawable/progress_button_state.xml
index 7e6bcc024a..1db6b41dc0 100644
--- a/app/src/main/res/drawable/progress_button_state.xml
+++ b/app/src/main/res/drawable/progress_button_state.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:color="@color/textsecure_primary"/>
+          android:color="@color/core_ultramarine"/>
     <item android:state_focused="true"
-          android:color="@color/textsecure_primary"/>
+          android:color="@color/core_ultramarine"/>
     <item android:state_enabled="false"
-          android:color="@color/textsecure_primary"/>
+          android:color="@color/core_ultramarine"/>
     <item android:state_enabled="true"
-          android:color="@color/textsecure_primary"/>
+          android:color="@color/core_ultramarine"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/read_receipt_vector.xml b/app/src/main/res/drawable/read_receipt_vector.xml
index 8184b984ea..7e9f8f6031 100644
--- a/app/src/main/res/drawable/read_receipt_vector.xml
+++ b/app/src/main/res/drawable/read_receipt_vector.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/textsecure_primary"
+        android:fillColor="@color/core_ultramarine"
         android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable/reminder_background_normal.xml b/app/src/main/res/drawable/reminder_background_normal.xml
index 349f949c23..45628500ee 100644
--- a/app/src/main/res/drawable/reminder_background_normal.xml
+++ b/app/src/main/res/drawable/reminder_background_normal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@color/signal_primary" />
-    <item android:state_focused="true" android:drawable="@color/signal_primary" />
-    <item android:drawable="@color/signal_primary_dark" />
+    <item android:state_pressed="true" android:drawable="@color/core_ultramarine_dark" />
+    <item android:state_focused="true" android:drawable="@color/core_ultramarine" />
+    <item android:drawable="@color/core_ultramarine" />
 </selector>
diff --git a/app/src/main/res/drawable/touch_highlight_background.xml b/app/src/main/res/drawable/touch_highlight_background.xml
index 8089a02808..b5a98171b8 100644
--- a/app/src/main/res/drawable/touch_highlight_background.xml
+++ b/app/src/main/res/drawable/touch_highlight_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@color/touch_highlight" />
-    <item android:state_focused="true" android:drawable="@color/signal_primary" />
+    <item android:state_focused="true" android:drawable="@color/core_ultramarine" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/app/src/main/res/drawable/unread_count_background_dark.xml b/app/src/main/res/drawable/unread_count_background_dark.xml
index 8666e43f67..ddaf847ecc 100644
--- a/app/src/main/res/drawable/unread_count_background_dark.xml
+++ b/app/src/main/res/drawable/unread_count_background_dark.xml
@@ -5,7 +5,7 @@
 
     <corners android:radius="@dimen/unread_count_bubble_radius" />
 
-    <solid android:color="@color/core_blue" />
+    <solid android:color="@color/core_ultramarine" />
 
     <stroke
         android:color="@color/core_grey_95"
diff --git a/app/src/main/res/drawable/unread_count_background_light.xml b/app/src/main/res/drawable/unread_count_background_light.xml
index e87f516098..7afc58ba16 100644
--- a/app/src/main/res/drawable/unread_count_background_light.xml
+++ b/app/src/main/res/drawable/unread_count_background_light.xml
@@ -5,7 +5,7 @@
 
     <corners android:radius="@dimen/unread_count_bubble_radius" />
 
-    <solid android:color="@color/core_blue" />
+    <solid android:color="@color/core_ultramarine" />
 
     <stroke
         android:color="@color/core_white"
diff --git a/app/src/main/res/layout/account_locked_fragment.xml b/app/src/main/res/layout/account_locked_fragment.xml
index 7496a318ba..2b65b940e2 100644
--- a/app/src/main/res/layout/account_locked_fragment.xml
+++ b/app/src/main/res/layout/account_locked_fragment.xml
@@ -55,7 +55,6 @@
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="16dp"
         android:text="@string/AccountLockedFragment__learn_more"
-        android:textColor="@color/signal_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml
index 38f3afd8dc..33c73f92ff 100644
--- a/app/src/main/res/layout/activity_shared_contact_details.xml
+++ b/app/src/main/res/layout/activity_shared_contact_details.xml
@@ -97,14 +97,14 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
+                                android:tint="@color/core_ultramarine"
                                 android:src="@drawable/message_24dp"/>
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/SharedContactDetailsActivity_signal_message"
-                                android:textColor="@color/signal_primary"/>
+                                android:textColor="@color/core_ultramarine"/>
 
                         </LinearLayout>
 
@@ -121,14 +121,14 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
+                                android:tint="@color/core_ultramarine"
                                 android:src="@drawable/phone_24dp"/>
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/SharedContactDetailsActivity_signal_call"
-                                android:textColor="@color/signal_primary"/>
+                                android:textColor="@color/core_ultramarine"/>
 
                         </LinearLayout>
 
diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index 5d31925f06..8acfc0533c 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -88,7 +88,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
-            android:textColor="@color/signal_primary"
             app:layout_constraintTop_toBottomOf="@id/edit_kbs_pin_input_label"
             app:layout_constraintBottom_toTopOf="@id/edit_kbs_pin_confirm"
             app:layout_constraintVertical_bias="1.0"
diff --git a/app/src/main/res/layout/color_fragment.xml b/app/src/main/res/layout/color_fragment.xml
index de2f5f2ed6..a069e491f8 100644
--- a/app/src/main/res/layout/color_fragment.xml
+++ b/app/src/main/res/layout/color_fragment.xml
@@ -4,7 +4,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              tools:background="#FF2090ea">
+              tools:background="@color/core_ultramarine">
 
     <TextView android:layout_width="match_parent"
               android:layout_height="0dp"
diff --git a/app/src/main/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml
index 27171aebc7..1393c1a5bb 100644
--- a/app/src/main/res/layout/contact_selection_list_fragment.xml
+++ b/app/src/main/res/layout/contact_selection_list_fragment.xml
@@ -54,8 +54,8 @@
                     android:visibility="invisible"
                     app:matProg_circleRadius="145dp"
                     app:matProg_barWidth="6dp"
-                    app:matProg_rimColor="@color/signal_primary"
-                    app:matProg_barColor="@color/signal_primary_dark"
+                    app:matProg_rimColor="@color/core_ultramarine"
+                    app:matProg_barColor="@color/core_ultramarine_dark"
                     app:matProg_progressIndeterminate="true"
                     tools:visibility="visible"
                     />
@@ -84,7 +84,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:layout_gravity="center_horizontal"
-                android:background="@color/signal_primary"
+                style="@style/Button.Primary"
                 android:textColor="@color/white"
                 android:padding="10dp"
                 android:text="@string/contact_selection_list_fragment__show_contacts"/>
diff --git a/app/src/main/res/layout/conversation_search_nav.xml b/app/src/main/res/layout/conversation_search_nav.xml
index e3d97456d7..5ceab13471 100644
--- a/app/src/main/res/layout/conversation_search_nav.xml
+++ b/app/src/main/res/layout/conversation_search_nav.xml
@@ -34,7 +34,7 @@
         android:background="?selectableItemBackgroundBorderless"
         android:padding="8dp"
         android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
-        android:tint="@color/signal_primary"
+        android:tint="@color/core_ultramarine"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/conversation_search_down"
         app:layout_constraintTop_toTopOf="parent" />
@@ -49,7 +49,7 @@
         android:background="?selectableItemBackgroundBorderless"
         android:padding="8dp"
         android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
-        android:tint="@color/signal_primary"
+        android:tint="@color/core_ultramarine"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/create_passphrase_activity.xml b/app/src/main/res/layout/create_passphrase_activity.xml
index fbffc48422..4ef7856041 100644
--- a/app/src/main/res/layout/create_passphrase_activity.xml
+++ b/app/src/main/res/layout/create_passphrase_activity.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/prompt_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/core_ultramarine">
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/prompt_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/signal_primary">
+  <ProgressBar
+      android:id="@+id/passphrase_edit"
+      style="?android:attr/progressBarStyleLargeInverse"
+      android:layout_width="75dp"
+      android:layout_height="75dp"
+      android:layout_centerInParent="true"
+      android:indeterminate="true"
+      android:padding="10dp" />
 
-
-  <ProgressBar android:id="@+id/passphrase_edit"
-               android:layout_width="75dp"
-               android:layout_height="75dp"
-               android:indeterminate="true"
-               android:padding="10dp"
-               android:layout_centerInParent="true"
-               style="?android:attr/progressBarStyleLargeInverse"/>
-
-  <ImageView android:id="@+id/watermark"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_centerHorizontal="true"
-             android:layout_marginBottom="20dp"
-             android:layout_above="@id/passphrase_edit"
-             android:src="@drawable/icon_transparent"
-             android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
+  <ImageView
+      android:id="@+id/watermark"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_above="@id/passphrase_edit"
+      android:layout_centerHorizontal="true"
+      android:layout_marginBottom="20dp"
+      android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
+      app:srcCompat="@drawable/ic_launcher_foreground" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/device_list_fragment.xml b/app/src/main/res/layout/device_list_fragment.xml
index 163b1b5865..82e6c8c690 100644
--- a/app/src/main/res/layout/device_list_fragment.xml
+++ b/app/src/main/res/layout/device_list_fragment.xml
@@ -52,7 +52,7 @@
             android:focusable="true"
             android:contentDescription="@string/device_list_fragment__link_new_device"
             fab:fab_colorNormal="?fab_color"
-            fab:fab_colorPressed="@color/textsecure_primary_dark"
-            fab:fab_colorRipple="@color/textsecure_primary_dark" />
+            fab:fab_colorPressed="@color/core_ultramarine_dark"
+            fab:fab_colorRipple="@color/core_ultramarine_dark" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml b/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
index 8a9812a527..d39b1a5851 100644
--- a/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
+++ b/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:background="#FF2090ea">
+    tools:background="@color/core_ultramarine">
 
     <TextView
         android:id="@+id/blurb"
@@ -93,7 +93,7 @@
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         android:text="@string/ExperienceUpgradeActivity_got_it"
-        android:textColor="@color/core_blue"
+        android:textColor="@color/core_ultramarine"
         app:backgroundTint="@color/core_white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/experience_upgrade_preference_fragment.xml b/app/src/main/res/layout/experience_upgrade_preference_fragment.xml
index 046e5265b5..0716df19c2 100644
--- a/app/src/main/res/layout/experience_upgrade_preference_fragment.xml
+++ b/app/src/main/res/layout/experience_upgrade_preference_fragment.xml
@@ -5,7 +5,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              tools:background="#FF2090ea">
+              tools:background="@color/core_ultramarine">
 
         <TextView android:layout_width="match_parent"
                   android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/experience_upgrade_stickers_fragment.xml b/app/src/main/res/layout/experience_upgrade_stickers_fragment.xml
index b2325cf41e..84e057a45d 100644
--- a/app/src/main/res/layout/experience_upgrade_stickers_fragment.xml
+++ b/app/src/main/res/layout/experience_upgrade_stickers_fragment.xml
@@ -57,11 +57,11 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="32dp"
-        android:background="@color/signal_primary"
+        android:background="@color/core_ultramarine"
         android:textColor="@color/white"
         android:elevation="4dp"
         app:cpb_colorIndicator="@color/white"
-        app:cpb_colorProgress="@color/textsecure_primary"
+        app:cpb_colorProgress="@color/core_ultramarine"
         app:cpb_cornerRadius="4dp"
         app:cpb_selectorIdle="@drawable/progress_button_state"
         app:cpb_textIdle="@string/ExperienceUpgradeActivity_lets_go"
diff --git a/app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml b/app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
index 9c428442e2..1fc0cd19f7 100644
--- a/app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
+++ b/app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:background="#FF2090ea">
+    tools:background="@color/core_ultramarine">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,7 +45,7 @@
                 android:layout_height="70dp"
                 android:layout_gravity="center"
                 android:src="@drawable/message_bubble_background"
-                android:tint="@color/signal_primary" />
+                android:tint="@color/core_ultramarine" />
 
             <org.thoughtcrime.securesms.components.TypingIndicatorView
                 android:id="@+id/typing_indicator"
@@ -90,7 +90,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
             android:text="@string/ExperienceUpgradeActivity_turn_on_typing_indicators"
-            android:textColor="@color/core_blue"
+            android:textColor="@color/core_ultramarine"
             app:backgroundTint="@color/core_white" />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -100,7 +100,7 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/ExperienceUpgradeActivity_no_thanks"
             android:textColor="@color/core_white"
-            app:backgroundTint="@color/conversation_blue" />
+            app:backgroundTint="@color/core_ultramarine_dark" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_registration_blank.xml b/app/src/main/res/layout/fragment_registration_blank.xml
index af7599fad4..e24c3b5a5b 100644
--- a/app/src/main/res/layout/fragment_registration_blank.xml
+++ b/app/src/main/res/layout/fragment_registration_blank.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/signal_primary">
+    android:background="@color/core_ultramarine">
 
     <ImageView
         android:id="@+id/watermark"
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:importantForAccessibility="no"
-        android:src="@drawable/icon_transparent"
+        app:srcCompat="@drawable/ic_launcher_foreground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml
index dc3a5553b3..7323671976 100644
--- a/app/src/main/res/layout/fragment_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_registration_lock.xml
@@ -67,7 +67,7 @@
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:text="@string/RegistrationLockFragment__forgot_pin"
-            android:textColor="@color/signal_primary"
+            android:textColor="@color/core_ultramarine"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input_label" />
@@ -79,7 +79,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
-            android:textColor="@color/signal_primary"
             app:layout_constraintBottom_toTopOf="@id/kbs_lock_pin_confirm"
             app:layout_constraintTop_toBottomOf="@id/kbs_lock_forgot_pin"
             app:layout_constraintVertical_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_registration_welcome.xml b/app/src/main/res/layout/fragment_registration_welcome.xml
index 3af1a43222..4d1ce5459b 100644
--- a/app/src/main/res/layout/fragment_registration_welcome.xml
+++ b/app/src/main/res/layout/fragment_registration_welcome.xml
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
         android:text="@string/RegistrationActivity_terms_and_privacy"
-        android:textColor="@color/signal_primary"
+        android:textColor="@color/core_ultramarine"
         app:layout_constraintBottom_toTopOf="@+id/welcome_continue_button"
         app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button"
         app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" />
diff --git a/app/src/main/res/layout/fragment_registration_welcome_rereg.xml b/app/src/main/res/layout/fragment_registration_welcome_rereg.xml
index af7599fad4..e24c3b5a5b 100644
--- a/app/src/main/res/layout/fragment_registration_welcome_rereg.xml
+++ b/app/src/main/res/layout/fragment_registration_welcome_rereg.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/signal_primary">
+    android:background="@color/core_ultramarine">
 
     <ImageView
         android:id="@+id/watermark"
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:importantForAccessibility="no"
-        android:src="@drawable/icon_transparent"
+        app:srcCompat="@drawable/ic_launcher_foreground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index c0e4715d0d..01b84fd3ee 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -77,7 +77,7 @@
                 android:text="@string/HelpFragment__whats_this"
                 android:textAllCaps="false"
                 android:textAppearance="@style/Signal.Text.Body"
-                android:textColor="@color/signal_primary"
+                android:textColor="@color/core_ultramarine"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
@@ -198,7 +198,7 @@
         android:enabled="false"
         android:textColor="@color/white"
         app:cpb_colorIndicator="@color/white"
-        app:cpb_colorProgress="@color/signal_primary"
+        app:cpb_colorProgress="@color/core_ultramarine"
         app:cpb_cornerRadius="4dp"
         app:cpb_selectorIdle="?attr/help_next_background"
         app:cpb_textIdle="@string/HelpFragment__next"
diff --git a/app/src/main/res/layout/insights_dashboard.xml b/app/src/main/res/layout/insights_dashboard.xml
index 4d550f7191..adb1d98850 100644
--- a/app/src/main/res/layout/insights_dashboard.xml
+++ b/app/src/main/res/layout/insights_dashboard.xml
@@ -109,7 +109,7 @@
 
             <Button
                 android:id="@+id/insights_dashboard_start_a_conversation"
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/Button.Borderless"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginStart="16dp"
@@ -117,7 +117,6 @@
                 android:layout_marginEnd="16dp"
                 android:text="@string/InsightsDashboardFragment__start_a_conversation"
                 android:textAppearance="@style/TextAppearance.Signal.Caption.Insights"
-                android:textColor="@color/signal_primary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/insights_dashboard_tagline" />
diff --git a/app/src/main/res/layout/insights_dashboard_adapter_item.xml b/app/src/main/res/layout/insights_dashboard_adapter_item.xml
index 5409c23717..43aaa18dcb 100644
--- a/app/src/main/res/layout/insights_dashboard_adapter_item.xml
+++ b/app/src/main/res/layout/insights_dashboard_adapter_item.xml
@@ -39,7 +39,6 @@
         android:paddingEnd="16dp"
         android:text="@string/conversation_insecure__invite"
         android:textAppearance="@style/TextAppearance.Signal.Caption.Insights"
-        android:textColor="@color/signal_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml
index 170b5f4b2c..4894008fbb 100644
--- a/app/src/main/res/layout/invite_activity.xml
+++ b/app/src/main/res/layout/invite_activity.xml
@@ -96,7 +96,7 @@
             android:layout_height="?attr/actionBarSize"
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
-            android:background="@color/signal_primary"
+            android:background="@color/core_ultramarine"
             android:elevation="4dp"
             app:searchTextStyle="@style/TextSecure.TitleTextStyle.Light" />
 
@@ -120,8 +120,7 @@
                     android:text="@string/InviteActivity_cancel" />
 
             <Button android:id="@+id/send_sms_button"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:textColor="@color/signal_primary"
+                    style="@style/Button.Borderless"
                     android:enabled="false"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_editable_contact.xml b/app/src/main/res/layout/item_editable_contact.xml
index 4745327acb..aa2665641e 100644
--- a/app/src/main/res/layout/item_editable_contact.xml
+++ b/app/src/main/res/layout/item_editable_contact.xml
@@ -30,7 +30,7 @@
             android:padding="16dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_create_white_24dp"
-            android:tint="@color/signal_primary"/>
+            android:tint="@color/core_ultramarine"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/kbs_splash_fragment.xml b/app/src/main/res/layout/kbs_splash_fragment.xml
index 8936863b7d..a9b8cde6d2 100644
--- a/app/src/main/res/layout/kbs_splash_fragment.xml
+++ b/app/src/main/res/layout/kbs_splash_fragment.xml
@@ -59,14 +59,13 @@
 
     <Button
         android:id="@+id/kbs_splash_secondary_action"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        style="@style/Button.Borderless"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="16dp"
         android:text="@string/KbsSplashFragment__learn_more"
-        android:textColor="@color/signal_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/labeled_edit_text.xml b/app/src/main/res/layout/labeled_edit_text.xml
index eaf409849f..e2cc70a0fb 100644
--- a/app/src/main/res/layout/labeled_edit_text.xml
+++ b/app/src/main/res/layout/labeled_edit_text.xml
@@ -27,7 +27,7 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:background="@color/white"
-            android:textColor="@color/signal_primary"
+            android:textColor="@color/core_ultramarine"
             style="@style/Signal.Text.Caption"
             tools:text="Profile Name"/>
 
diff --git a/app/src/main/res/layout/link_preview.xml b/app/src/main/res/layout/link_preview.xml
index 8007891b6a..69961de33a 100644
--- a/app/src/main/res/layout/link_preview.xml
+++ b/app/src/main/res/layout/link_preview.xml
@@ -94,7 +94,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:matProg_barColor="@color/core_blue"
+            app:matProg_barColor="@color/core_ultramarine"
             app:matProg_progressIndeterminate="true" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml
index b6b13cb9b3..cc15d9893d 100644
--- a/app/src/main/res/layout/media_overview_activity.xml
+++ b/app/src/main/res/layout/media_overview_activity.xml
@@ -26,9 +26,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/media_overview_toolbar_background"
-            app:tabIndicatorColor="@color/textsecure_primary"
+            app:tabIndicatorColor="@color/core_ultramarine"
             app:tabMode="scrollable"
-            app:tabSelectedTextColor="@color/textsecure_primary" />
+            app:tabSelectedTextColor="@color/core_ultramarine" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/media_overview_detail_item_audio.xml b/app/src/main/res/layout/media_overview_detail_item_audio.xml
index 5eb4fad942..33e11fffd4 100644
--- a/app/src/main/res/layout/media_overview_detail_item_audio.xml
+++ b/app/src/main/res/layout/media_overview_detail_item_audio.xml
@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:autoRewind="true"
-            app:foregroundTintColor="@color/core_blue"
+            app:foregroundTintColor="@color/core_ultramarine"
             app:small="true" />
 
         <include layout="@layout/media_overview_selected_overlay" />
diff --git a/app/src/main/res/layout/mediapicker_media_item.xml b/app/src/main/res/layout/mediapicker_media_item.xml
index 1085f35f14..a99748ea5f 100644
--- a/app/src/main/res/layout/mediapicker_media_item.xml
+++ b/app/src/main/res/layout/mediapicker_media_item.xml
@@ -37,7 +37,7 @@
             android:layout_height="18dp"
             android:layout_gravity="center"
             android:layout_marginStart="2dp"
-            android:tint="@color/core_blue"
+            android:tint="@color/core_ultramarine"
             android:scaleType="fitXY"
             app:srcCompat="@drawable/triangle_right" />
 
diff --git a/app/src/main/res/layout/mediasend_count_button.xml b/app/src/main/res/layout/mediasend_count_button.xml
index 388e3fce79..acaa74f842 100644
--- a/app/src/main/res/layout/mediasend_count_button.xml
+++ b/app/src/main/res/layout/mediasend_count_button.xml
@@ -21,7 +21,7 @@
         android:paddingBottom="2dp"
         android:gravity="center"
         android:background="@drawable/media_count_number_background"
-        android:textColor="@color/signal_primary"
+        android:textColor="@color/core_ultramarine"
         android:textSize="18dp"
         tools:text="3" />
 
diff --git a/app/src/main/res/layout/permissions_rationale_dialog.xml b/app/src/main/res/layout/permissions_rationale_dialog.xml
index 20e49d5e32..d79eef1551 100644
--- a/app/src/main/res/layout/permissions_rationale_dialog.xml
+++ b/app/src/main/res/layout/permissions_rationale_dialog.xml
@@ -6,7 +6,7 @@
               android:layout_height="wrap_content">
 
     <LinearLayout android:id="@+id/header_container"
-                  android:background="@color/signal_primary"
+                  android:background="@color/core_ultramarine"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
diff --git a/app/src/main/res/layout/preference_right_summary_widget.xml b/app/src/main/res/layout/preference_right_summary_widget.xml
index 56a908e79c..a217344e8c 100644
--- a/app/src/main/res/layout/preference_right_summary_widget.xml
+++ b/app/src/main/res/layout/preference_right_summary_widget.xml
@@ -10,6 +10,6 @@
               android:layout_gravity="right|center_vertical"
               android:gravity="right|center_vertical"
               android:textSize="16sp"
-              android:textColor="@color/signal_primary_dark"/>
+              android:textColor="@color/core_ultramarine"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_storage_category.xml b/app/src/main/res/layout/preference_storage_category.xml
index 61fba6eb99..36a6b745bd 100644
--- a/app/src/main/res/layout/preference_storage_category.xml
+++ b/app/src/main/res/layout/preference_storage_category.xml
@@ -87,7 +87,7 @@
         android:layout_marginBottom="16dp"
         android:text="@string/preferences_storage__review_storage"
         android:textAllCaps="true"
-        android:textColor="@color/signal_primary_dark"
+        android:textColor="@color/core_ultramarine"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index fc5d9a8d27..186f43d7f0 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -225,12 +225,12 @@
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="16dp"
-            android:background="@color/signal_primary"
+            android:background="@color/core_ultramarine"
             android:enabled="false"
             android:textAllCaps="true"
             android:textColor="@color/white"
             app:cpb_colorIndicator="@color/white"
-            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_colorProgress="@color/core_ultramarine"
             app:cpb_cornerRadius="4dp"
             app:cpb_selectorIdle="@drawable/progress_button_state"
             app:cpb_textIdle="@string/CreateProfileActivity_next" />
@@ -241,7 +241,7 @@
         android:id="@+id/reveal"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/textsecure_primary"
+        android:background="@color/core_ultramarine"
         android:visibility="invisible"
         tools:visibility="gone" />
 
diff --git a/app/src/main/res/layout/prompt_passphrase_activity.xml b/app/src/main/res/layout/prompt_passphrase_activity.xml
index 3f95d6fa6d..8cda90e2a6 100644
--- a/app/src/main/res/layout/prompt_passphrase_activity.xml
+++ b/app/src/main/res/layout/prompt_passphrase_activity.xml
@@ -31,7 +31,7 @@
         <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_transparent"
+                app:srcCompat="@drawable/ic_launcher_foreground"
                 android:layout_gravity="center"/>
 
     </androidx.appcompat.widget.Toolbar>
@@ -58,7 +58,7 @@
         <ImageView android:id="@+id/fingerprint_auth_container"
                 android:src="@drawable/ic_fingerprint_white_48dp"
                 android:background="@drawable/circle_tintable"
-                android:backgroundTint="@color/signal_primary"
+                android:backgroundTint="@color/core_ultramarine"
                 android:padding="20dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:background="@drawable/rounded_rectangle_dark"
-                  android:backgroundTint="@color/signal_primary"
+                  android:backgroundTint="@color/core_ultramarine"
                   android:textColor="@color/white"
                   android:gravity="center_horizontal"
                   android:elevation="3dp"
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
index 17b0070574..2f76c04d9d 100644
--- a/app/src/main/res/layout/quote_view.xml
+++ b/app/src/main/res/layout/quote_view.xml
@@ -130,7 +130,7 @@
                         android:layout_height="16dp"
                         android:layout_marginStart="11dp"
                         android:layout_marginTop="8dp"
-                        android:tint="@color/core_blue"
+                        android:tint="@color/core_ultramarine"
                         android:scaleType="fitXY"
                         app:srcCompat="@drawable/triangle_right" />
 
diff --git a/app/src/main/res/layout/recipient_preference_activity.xml b/app/src/main/res/layout/recipient_preference_activity.xml
index 81d7e9e1e5..2531456398 100644
--- a/app/src/main/res/layout/recipient_preference_activity.xml
+++ b/app/src/main/res/layout/recipient_preference_activity.xml
@@ -77,7 +77,7 @@
                       android:visibility="gone"
                       android:focusableInTouchMode="true"
                       style="?android:attr/preferenceCategoryStyle"
-                      android:textColor="@color/textsecure_primary"/>
+                      android:textColor="@color/core_ultramarine"/>
 
             <org.thoughtcrime.securesms.components.ThreadPhotoRailView
                     android:id="@+id/recent_photos"
diff --git a/app/src/main/res/layout/registration_lock_reminder_view.xml b/app/src/main/res/layout/registration_lock_reminder_view.xml
index bbfc9bd757..50fb4d2f38 100644
--- a/app/src/main/res/layout/registration_lock_reminder_view.xml
+++ b/app/src/main/res/layout/registration_lock_reminder_view.xml
@@ -6,7 +6,7 @@
               android:layout_height="wrap_content">
 
     <LinearLayout android:id="@+id/header_container"
-                  android:background="@color/signal_primary"
+                  android:background="@color/core_ultramarine"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
diff --git a/app/src/main/res/layout/shared_contact_view.xml b/app/src/main/res/layout/shared_contact_view.xml
index 3be0ab8b05..8b93de79e3 100644
--- a/app/src/main/res/layout/shared_contact_view.xml
+++ b/app/src/main/res/layout/shared_contact_view.xml
@@ -78,7 +78,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
-            android:textColor="@color/core_blue"
+            android:textColor="@color/core_ultramarine"
             android:background="?attr/shared_contact_item_button_color"
             android:foreground="?attr/selectableItemBackground"
             tools:text="Add to Contacts"/>
diff --git a/app/src/main/res/layout/submit_debug_log_activity.xml b/app/src/main/res/layout/submit_debug_log_activity.xml
index 4370fe25b4..9d0d4819e2 100644
--- a/app/src/main/res/layout/submit_debug_log_activity.xml
+++ b/app/src/main/res/layout/submit_debug_log_activity.xml
@@ -29,7 +29,7 @@
       android:text="@string/SubmitDebugLogActivity_tap_a_line_to_delete_it"
       android:textColor="@color/core_white"
       android:fontFamily="sans-serif-medium"
-      android:background="@color/core_blue"
+      android:background="@color/core_ultramarine"
       android:visibility="gone"
       app:layout_constraintTop_toTopOf="@id/debug_log_warning_banner"
       app:layout_constraintBottom_toBottomOf="@id/debug_log_warning_banner"
@@ -88,12 +88,12 @@
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       android:layout_margin="8dp"
-      android:background="@color/signal_primary"
+      android:background="@color/core_ultramarine"
       android:textAllCaps="true"
       android:textColor="@color/white"
       android:visibility="gone"
       app:cpb_colorIndicator="@color/white"
-      app:cpb_colorProgress="@color/textsecure_primary"
+      app:cpb_colorProgress="@color/core_ultramarine"
       app:cpb_cornerRadius="4dp"
       app:cpb_selectorIdle="@drawable/progress_button_state"
       app:cpb_textIdle="@string/SubmitDebugLogActivity_submit"
diff --git a/app/src/main/res/layout/thumbnail_view.xml b/app/src/main/res/layout/thumbnail_view.xml
index c97ec38b5d..ae59b5d58a 100644
--- a/app/src/main/res/layout/thumbnail_view.xml
+++ b/app/src/main/res/layout/thumbnail_view.xml
@@ -51,7 +51,7 @@
             android:contentDescription="@string/ThumbnailView_Play_video_description"
             android:paddingLeft="5dp"
             android:scaleType="fitXY"
-            android:tint="@color/core_blue"
+            android:tint="@color/core_ultramarine"
             app:srcCompat="@drawable/triangle_right"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
diff --git a/app/src/main/res/layout/transfer_controls_view.xml b/app/src/main/res/layout/transfer_controls_view.xml
index 7a54d547b7..f01d6ad5cc 100644
--- a/app/src/main/res/layout/transfer_controls_view.xml
+++ b/app/src/main/res/layout/transfer_controls_view.xml
@@ -12,7 +12,7 @@
         android:layout_gravity="center"
         android:visibility="gone"
         android:padding="4dp"
-        app:matProg_barColor="@color/core_blue"
+        app:matProg_barColor="@color/core_ultramarine"
         app:matProg_rimColor="@color/core_grey_05"
         app:matProg_linearProgress="true"
         app:matProg_spinSpeed="0.2"
diff --git a/app/src/main/res/layout/unidentified_delivery_learn_more.xml b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
index 22d12af145..a8ea358aa0 100644
--- a/app/src/main/res/layout/unidentified_delivery_learn_more.xml
+++ b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
@@ -19,6 +19,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/preferences_communication__sealed_sender_learn_more"
-        android:textColor="@color/signal_primary"/>
+        android:textColor="@color/core_ultramarine"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/unknown_sender_view.xml b/app/src/main/res/layout/unknown_sender_view.xml
index 30c3bda45e..b7e0762d6e 100644
--- a/app/src/main/res/layout/unknown_sender_view.xml
+++ b/app/src/main/res/layout/unknown_sender_view.xml
@@ -28,7 +28,7 @@
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:src="@drawable/ic_block_white_24dp"
-                   android:tint="@color/signal_primary"/>
+                   android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
@@ -36,7 +36,7 @@
                   android:text="@string/unknown_sender_view__block"
                   android:textAllCaps="true"
                   android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
+                  android:textColor="@color/core_ultramarine"
                   android:textSize="14sp"/>
 
     </LinearLayout>
@@ -52,7 +52,7 @@
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:src="@drawable/ic_person_add_white_24dp"
-                   android:tint="@color/signal_primary"/>
+                   android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
@@ -60,7 +60,7 @@
                   android:text="@string/unknown_sender_view__add_to_contacts"
                   android:textAllCaps="true"
                   android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
+                  android:textColor="@color/core_ultramarine"
                   android:textSize="14sp"/>
 
     </LinearLayout>
@@ -76,7 +76,7 @@
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:src="@drawable/ic_face_white_24dp"
-                   android:tint="@color/signal_primary"/>
+                   android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
@@ -84,7 +84,7 @@
                   android:text="@string/unknown_sender_view__don_t_add_but_make_my_profile_visible"
                   android:textAllCaps="true"
                   android:textStyle="bold"
-                  android:textColor="@color/signal_primary"
+                  android:textColor="@color/core_ultramarine"
                   android:textSize="14sp"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index 09bd1c35eb..5916c2498e 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -49,11 +49,11 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="32dp"
-      android:background="@color/signal_primary"
+      android:background="@color/core_ultramarine"
       android:textAllCaps="true"
       android:textColor="@color/white"
       app:cpb_colorIndicator="@color/white"
-      app:cpb_colorProgress="@color/textsecure_primary"
+      app:cpb_colorProgress="@color/core_ultramarine"
       app:cpb_cornerRadius="4dp"
       app:cpb_selectorIdle="@drawable/progress_button_state"
       app:cpb_textIdle="@string/UsernameEditFragment_submit"
diff --git a/app/src/main/res/layout/video_editor_hud.xml b/app/src/main/res/layout/video_editor_hud.xml
index 6439c37b1b..2a75da3715 100644
--- a/app/src/main/res/layout/video_editor_hud.xml
+++ b/app/src/main/res/layout/video_editor_hud.xml
@@ -53,7 +53,7 @@
                 android:layout_marginTop="12dp"
                 android:contentDescription="@string/ThumbnailView_Play_video_description"
                 android:scaleType="fitXY"
-                android:tint="@color/core_blue"
+                android:tint="@color/core_ultramarine"
                 app:srcCompat="@drawable/triangle_right" />
 
         </FrameLayout>
diff --git a/app/src/main/res/layout/webrtc_call_screen.xml b/app/src/main/res/layout/webrtc_call_screen.xml
index 3d0247e814..7f897a2abb 100644
--- a/app/src/main/res/layout/webrtc_call_screen.xml
+++ b/app/src/main/res/layout/webrtc_call_screen.xml
@@ -119,7 +119,7 @@
                 android:id="@+id/expanded_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/textsecure_primary"
+                android:background="@color/core_ultramarine"
                 android:paddingStart="24dp"
                 android:paddingTop="16dp"
                 android:paddingEnd="24dp">
@@ -180,7 +180,7 @@
                 android:id="@+id/inCallControls"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/textsecure_primary"
+                android:background="@color/core_ultramarine"
                 android:paddingStart="24dp"
                 android:paddingTop="16dp"
                 android:paddingEnd="24dp"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 3c28396ceb..0014ace2a7 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/signal_primary"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/core_ultramarine_icon"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 21b81b796c..13199ffef0 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
deleted file mode 100644
index cbc067184c..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index b1890ba32e..a7c710064c 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 9518e48683..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 07c58c6920..538f51e300 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 434416e853..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 60c5b309ab..8a469c0c5f 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index ccd61fcb7e..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 9d8b9a27ab..8231d3f03e 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index e2502ef19c..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 8d88bda096..a465348c79 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -13,7 +13,7 @@
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
         <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:navigationBarColor">@color/core_grey_95</item>
-        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
+        <item name="android:colorControlActivated">@color/core_ultramarine_light</item>
     </style>
 
     <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8ed363f37..5d0928107c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,14 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="signal_primary">@color/core_blue</color>
-    <color name="signal_primary_dark">#ff1c7ac5</color>
-    <color name="signal_primary_alpha33">#552090ea</color>
-    <color name="signal_primary_alpha_focus">#882090ea</color>
-
-    <color name="textsecure_primary">@color/signal_primary</color>
-    <color name="textsecure_primary_dark">@color/signal_primary_dark</color>
-    <color name="textsecure_primary_alpha33">@color/signal_primary_alpha33</color>
-
     <color name="white">@color/core_white</color>
     <color name="black">@color/core_black</color>
 
@@ -41,7 +32,7 @@
     <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_blue</color>
+    <color name="StickerPreviewActivity_install_button_color">@color/core_ultramarine</color>
 
     <color name="sticker_selected_color">#99ffffff</color>
     <color name="transparent">#00FFFFFF</color>
@@ -59,7 +50,7 @@
     <color name="storage_color_empty">@color/core_grey_50</color>
     <color name="storage_color_photos">#ff5951C8</color>
     <color name="storage_color_videos">#ff9BCFBD</color>
-    <color name="storage_color_audio">#ff2090EA</color>
+    <color name="storage_color_audio">@color/core_ultramarine</color>
     <color name="storage_color_files">#ffA23474</color>
 
 </resources>
diff --git a/app/src/main/res/values/conversation_colors.xml b/app/src/main/res/values/conversation_colors.xml
index cce2d056ac..054cefa7c4 100644
--- a/app/src/main/res/values/conversation_colors.xml
+++ b/app/src/main/res/values/conversation_colors.xml
@@ -48,7 +48,7 @@
     <color name="conversation_steel_tint">#bebec6</color>
     <color name="conversation_steel_shade">#5a5a63</color>
 
-    <color name="conversation_group">@color/textsecure_primary</color>
-    <color name="conversation_group_tint">@color/textsecure_primary</color>
-    <color name="conversation_group_shade">@color/textsecure_primary_dark</color>
+    <color name="conversation_group">@color/core_ultramarine</color>
+    <color name="conversation_group_tint">@color/core_ultramarine_light</color>
+    <color name="conversation_group_shade">@color/core_ultramarine_dark</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/core_colors.xml b/app/src/main/res/values/core_colors.xml
index fd56c04b23..75b8ddc62f 100644
--- a/app/src/main/res/values/core_colors.xml
+++ b/app/src/main/res/values/core_colors.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="core_blue">#2090ea</color>
-    <color name="core_green">#4caf50</color>
-    <color name="core_yellow">#ffd624</color> <!-- new -->
-    <color name="core_red">#f44336</color>
+    <color name="core_ultramarine">#2c6bed</color>
+    <color name="core_ultramarine_light">#2c6bed</color>
+    <color name="core_ultramarine_dark">#1851b4</color>
+    <color name="core_ultramarine_icon">#3a76f0</color>
+    <color name="core_ultramarine_33">#552c6bed</color>
+    <color name="core_ultramarine_50">#802c6bed</color>
 
-    <color name="core_red_highlight">#ef5350</color> <!-- extra -->
+    <color name="core_green">#4caf50</color>
+    <color name="core_yellow">#ffd624</color>
+    <color name="core_red">#f44336</color>
+    <color name="core_red_highlight">#ef5350</color>
 
     <color name="core_white">#ffffff</color>
     <color name="core_black">#000000</color>
diff --git a/app/src/main/res/values/registration_styles.xml b/app/src/main/res/values/registration_styles.xml
index aa682cb6d9..9ab06f8c9b 100644
--- a/app/src/main/res/values/registration_styles.xml
+++ b/app/src/main/res/values/registration_styles.xml
@@ -7,7 +7,7 @@
         <item name="android:elevation" tools:ignore="NewApi">4dp</item>
         <item name="cpb_cornerRadius">4dp</item>
         <item name="cpb_colorIndicator">@color/white</item>
-        <item name="cpb_colorProgress">@color/textsecure_primary</item>
+        <item name="cpb_colorProgress">@color/core_ultramarine</item>
         <item name="cpb_selectorIdle">@drawable/progress_button_state</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 608d74ff3b..679af21e31 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,21 +20,21 @@
     </style>
 
     <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
     </style>
 
     <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
         <item name="android:textColor">@null</item>
     </style>
 
     <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
     </style>
 
     <style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
         <item name="android:textColor">@null</item>
     </style>
@@ -68,7 +68,7 @@
     </style>
 
     <style name="TextSecure.HighlightActionBar" parent="@style/TextSecure.DarkActionBar.Conversation">
-        <item name="background">@color/signal_primary</item>
+        <item name="background">@color/core_ultramarine</item>
         <item name="elevation">0dp</item>
     </style>
 
@@ -81,8 +81,8 @@
 
     <style name="TextSecure.LightActionBar.TabBar"
         parent="@style/Widget.AppCompat.ActionBar.TabBar">
-        <item name="android:background">@color/textsecure_primary</item>
-        <item name="background">@color/textsecure_primary</item>
+        <item name="android:background">@color/core_ultramarine</item>
+        <item name="background">@color/core_ultramarine</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">#BFffffff</item>
         <item name="elevation">4dp</item>
@@ -100,12 +100,12 @@
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle.Conversation</item>
         <item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Conversation</item>
         <item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Conversation</item>
-        <item name="colorControlHighlight">@color/signal_primary_dark</item>
-        <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/signal_primary_dark</item>
+        <item name="colorControlHighlight">@color/core_ultramarine</item>
+        <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/core_ultramarine</item>
         <item name="colorControlNormal">?conversation_subtitle_color</item>
         <item name="android:colorControlNormal" tools:ignore="NewApi">?conversation_subtitle_color</item>
-        <item name="colorControlActivated">@color/signal_primary_dark</item>
-        <item name="android:colorControlActivated" tools:ignore="NewApi">@color/signal_primary_dark</item>
+        <item name="colorControlActivated">@color/core_ultramarine</item>
+        <item name="android:colorControlActivated" tools:ignore="NewApi">@color/core_ultramarine</item>
     </style>
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
@@ -238,12 +238,12 @@
     </style>
 
     <style name="Button.Primary" parent="Base.Widget.AppCompat.Button.Colored">
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
         <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">@color/signal_primary</item>
+        <item name="android:textColor">@color/core_ultramarine</item>
     </style>
 
     <!-- RedPhone -->
@@ -336,7 +336,7 @@
         <item name="android:layout_width">187dp</item>
         <item name="android:layout_height">187dp</item>
         <item name="arcBackgroundColor">?insight_progress_background</item>
-        <item name="arcForegroundColor">@color/signal_primary</item>
+        <item name="arcForegroundColor">@color/core_ultramarine</item>
         <item name="arcProgress">0.0</item>
         <item name="arcStartAngle">120</item>
         <item name="arcSweepAngle">300</item>
@@ -395,7 +395,7 @@
     </style>
 
     <style name="Signal.MessageRequest.Button.Accept">
-        <item name="android:textColor">@color/core_blue</item>
+        <item name="android:textColor">@color/core_ultramarine</item>
     </style>
 
     <declare-styleable name="MaxHeightFrameLayout">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9dc5b0d7e0..581110ed61 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,15 +12,15 @@
         <item name="windowActionModeOverlay">true</item>
 
         <item name="theme_type">light</item>
-        <item name="colorPrimary">@color/textsecure_primary</item>
-        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
+        <item name="colorPrimary">@color/core_ultramarine</item>
+        <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/textsecure_primary_dark</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>
@@ -53,7 +53,7 @@
         <item name="theme_type">dark</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="colorPrimary">@color/core_grey_95</item>
-        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
@@ -91,7 +91,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
 
         <item name="android:textColorHint">#cc000000</item>
         <item name="centered_app_title_color">#55000000</item>
@@ -101,7 +101,7 @@
         <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
         <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
 
-        <item name="login_top_background">@color/signal_primary</item>
+        <item name="login_top_background">@color/core_ultramarine</item>
         <item name="login_floating_background">@drawable/rounded_rectangle_white</item>
 
     </style>
@@ -110,7 +110,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
 
         <item name="android:textColorHint">@color/white</item>
         <item name="centered_app_title_color">@color/core_grey_25</item>
@@ -175,11 +175,11 @@
         <item name="actionModeBackground">@color/core_grey_50</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
-        <item name="colorPrimary">@color/textsecure_primary</item>
-        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="colorControlActivated">@color/signal_primary</item>
-        <item name="colorControlHighlight">@color/signal_primary</item>
+        <item name="colorPrimary">@color/core_ultramarine</item>
+        <item name="colorPrimaryDark">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorControlActivated">@color/core_ultramarine</item>
+        <item name="colorControlHighlight">@color/core_ultramarine</item>
         <item name="android:windowBackground">@color/white</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
@@ -216,7 +216,7 @@
         <item name="conversation_list_compose_icon_tint">@color/core_white</item>
         <item name="conversation_list_camera_button_background">@color/core_white</item>
 
-        <item name="fab_color">@color/textsecure_primary</item>
+        <item name="fab_color">@color/core_ultramarine</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
 
         <item name="conversation_group_member_name">#99000000</item>
@@ -450,10 +450,10 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="colorControlActivated">@color/signal_primary_dark</item>
-        <item name="colorControlHighlight">@color/signal_primary_dark</item>
-        <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorControlActivated">@color/core_ultramarine_light</item>
+        <item name="colorControlHighlight">@color/core_ultramarine_light</item>
+        <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/core_ultramarine_light</item>
         <item name="android:windowBackground">@color/core_grey_95</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
@@ -533,7 +533,7 @@
         <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/textsecure_primary_dark</item>
+        <item name="fab_color">@color/core_ultramarine</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>
@@ -654,7 +654,7 @@
 
         <item name="registration_lock_reminder_view_pin_text_color">@color/core_white</item>
 
-        <item name="reminder_header_background">@color/textsecure_primary_dark</item>
+        <item name="reminder_header_background">@color/core_ultramarine</item>
 
         <item name="sticker_management_icon">@drawable/sticker_button_dark</item>
         <item name="sticker_management_divider_color">@color/core_grey_75</item>
@@ -693,11 +693,11 @@
     </style>
 
     <style name="RationaleDialogLight.SignalAccent">
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
     </style>
 
     <style name="RationaleDialogDark.SignalAccent">
-        <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorAccent">@color/core_ultramarine</item>
     </style>
 
 
@@ -755,7 +755,7 @@
     </style>
 
     <style name="TextSecure.LightTheme.WebRTCCall">
-        <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_primary</item>
+        <item name="android:statusBarColor" tools:ignore="NewApi">@color/core_ultramarine</item>
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
         <item name="android:navigationBarColor" tools:ignore="NewApi">@color/core_black</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>