diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
index 19dd327f0f..99ff3dae3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
@@ -3,9 +3,7 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.PorterDuff;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -20,7 +18,6 @@ import android.widget.Toast;
 import androidx.annotation.AnimRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
 import org.thoughtcrime.securesms.components.ContactFilterView;
@@ -35,10 +32,8 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
@@ -49,14 +44,13 @@ import java.util.function.Consumer;
 
 public class InviteActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener {
 
-  private ContactSelectionListFragment contactsFragment;
-  private EditText                     inviteText;
-  private ViewGroup                    smsSendFrame;
-  private Button                       smsSendButton;
-  private Animation                    slideInAnimation;
-  private Animation                    slideOutAnimation;
-  private DynamicTheme                 dynamicTheme = new DynamicNoActionBarInviteTheme();
-  private Toolbar                      primaryToolbar;
+  private       ContactSelectionListFragment contactsFragment;
+  private       EditText                     inviteText;
+  private       ViewGroup                    smsSendFrame;
+  private       Button                       smsSendButton;
+  private       Animation                    slideInAnimation;
+  private       Animation                    slideOutAnimation;
+  private final DynamicTheme                 dynamicTheme = new DynamicNoActionBarInviteTheme();
 
   @Override
   protected void onPreCreate() {
@@ -84,7 +78,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   }
 
   private void initializeAppBar() {
-    primaryToolbar = findViewById(R.id.toolbar);
+    final Toolbar primaryToolbar = findViewById(R.id.toolbar);
     setSupportActionBar(primaryToolbar);
 
     assert getSupportActionBar() != null;
@@ -101,7 +95,6 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     TextView             shareText       = findViewById(R.id.share_text);
     View                 smsButton       = findViewById(R.id.sms_button);
     Button               smsCancelButton = findViewById(R.id.cancel_sms_button);
-    Toolbar              smsToolbar      = findViewById(R.id.sms_send_frame_toolbar);
     ContactFilterView    contactFilter   = findViewById(R.id.contact_filter_edit_text);
 
     inviteText        = findViewById(R.id.invite_text);
@@ -123,7 +116,6 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     smsCancelButton.setOnClickListener(new SmsCancelClickListener());
     smsSendButton.setOnClickListener(new SmsSendClickListener());
     contactFilter.setOnFilterChangedListener(new ContactFilterChangedListener());
-    smsToolbar.setNavigationIcon(R.drawable.ic_search_conversation_24);
 
     if (Util.isDefaultSmsProvider(this)) {
       shareButton.setOnClickListener(new ShareClickListener());
@@ -164,9 +156,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   }
 
   private void updateSmsButtonText(int count) {
-    smsSendButton.setText(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_to_friends,
-                                                           count,
-                                                           count));
+    smsSendButton.setText(getResources().getString(R.string.InviteActivity_send_sms, count));
     smsSendButton.setEnabled(count > 0);
   }
 
@@ -178,43 +168,21 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     }
   }
 
+  @Override public boolean onSupportNavigateUp() {
+    if (smsSendFrame.getVisibility() == View.VISIBLE) {
+      cancelSmsSelection();
+      return false;
+    } else {
+      return super.onSupportNavigateUp();
+    }
+  }
+
   private void cancelSmsSelection() {
-    setPrimaryColorsToolbarNormal();
     contactsFragment.reset();
     updateSmsButtonText(contactsFragment.getSelectedContacts().size());
     ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE);
   }
 
-  private void setPrimaryColorsToolbarNormal() {
-    primaryToolbar.setBackgroundColor(0);
-    primaryToolbar.getNavigationIcon().setColorFilter(null);
-    primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_primary));
-
-    if (Build.VERSION.SDK_INT >= 23) {
-      WindowUtil.setStatusBarColor(getWindow(), ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor));
-      getWindow().setNavigationBarColor(ThemeUtil.getThemedColor(this, android.R.attr.navigationBarColor));
-      WindowUtil.setLightStatusBarFromTheme(this);
-    }
-
-    WindowUtil.setLightNavigationBarFromTheme(this);
-  }
-
-  private void setPrimaryColorsToolbarForSms() {
-    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.core_ultramarine));
-    primaryToolbar.getNavigationIcon().setColorFilter(ContextCompat.getColor(this, R.color.signal_text_toolbar_subtitle), PorterDuff.Mode.SRC_IN);
-    primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_toolbar_title));
-
-    if (Build.VERSION.SDK_INT >= 23) {
-      WindowUtil.setStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.core_ultramarine));
-      WindowUtil.clearLightStatusBar(getWindow());
-    }
-
-    if (Build.VERSION.SDK_INT >= 27) {
-      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
-      WindowUtil.clearLightNavigationBar(getWindow());
-    }
-  }
-
   private class ShareClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
@@ -233,7 +201,6 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   private class SmsClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-      setPrimaryColorsToolbarForSms();
       ViewUtil.animateIn(smsSendFrame, slideInAnimation);
     }
   }
diff --git a/app/src/main/res/color/signal_button_primary_inverse_text_selector.xml b/app/src/main/res/color/signal_button_primary_inverse_text_selector.xml
new file mode 100644
index 0000000000..d831fb72fe
--- /dev/null
+++ b/app/src/main/res/color/signal_button_primary_inverse_text_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/signal_text_secondary" android:state_enabled="false" />
+    <item android:color="@color/signal_inverse_primary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_conversation_24.xml b/app/src/main/res/drawable/ic_search_conversation_24.xml
index b20bf2cf38..fb9c8d4da6 100644
--- a/app/src/main/res/drawable/ic_search_conversation_24.xml
+++ b/app/src/main/res/drawable/ic_search_conversation_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_text_toolbar_subtitle"
+      android:fillColor="@color/signal_inverse_primary"
       android:pathData="M17.257,16.2 L15.9,15.385a8.022,8.022 0,1 0,-0.519 0.519l0.812,1.353L20.439,21.5 21.5,20.439ZM10,16.5A6.5,6.5 0,1 1,16.5 10,6.508 6.508,0 0,1 10,16.5Z"/>
 </vector>
diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml
index 305f6e525b..62eddb9e17 100644
--- a/app/src/main/res/layout/invite_activity.xml
+++ b/app/src/main/res/layout/invite_activity.xml
@@ -23,7 +23,8 @@
                 android:fillViewport="true"
                 android:clickable="false"
                 app:layout_constraintTop_toBottomOf="@id/toolbar"
-                app:layout_constraintBottom_toBottomOf="parent">
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:visibility="gone">
 
         <LinearLayout android:layout_gravity="center"
                       android:layout_height="wrap_content"
@@ -100,19 +101,8 @@
                   android:orientation="vertical"
                   android:visibility="gone"
                   app:layout_constraintBottom_toBottomOf="parent"
-                  app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
-            android:id="@+id/sms_send_frame_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:theme="?attr/settingsToolbarStyle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
-            app:title="@string/InviteActivity_invite_to_signal"
-            app:titleTextAppearance="@style/Signal.Text.Title" />
+                  app:layout_constraintTop_toBottomOf="@id/toolbar"
+                  tools:visibility="visible">
 
         <org.thoughtcrime.securesms.components.ContactFilterView
             android:id="@+id/contact_filter_edit_text"
@@ -133,22 +123,24 @@
 
         <LinearLayout android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:gravity="end"
+                      android:gravity="center_horizontal"
                       android:padding="10dp"
                       android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_sms_button"
-                    style="@style/Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    style="@style/Signal.Widget.Button.Large.Primary.Inverse"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:text="@string/InviteActivity_cancel" />
 
             <Button android:id="@+id/send_sms_button"
-                    style="@style/Button.Borderless"
+                    style="@style/Signal.Widget.Button.Large.Primary.Inverse"
                     android:enabled="false"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="Send to 0 friends"/>
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    tools:text="Send SMS (0)"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings.xml
index fa869f6970..90362ce64f 100644
--- a/app/src/main/res/navigation/app_settings.xml
+++ b/app/src/main/res/navigation/app_settings.xml
@@ -372,7 +372,8 @@
     <activity
         android:id="@+id/inviteActivity"
         android:name="org.thoughtcrime.securesms.InviteActivity"
-        android:label="invite_activity" />
+        android:label="invite_activity"
+        tools:layout="@layout/invite_activity" />
 
     <!-- region Direct-To-Page actions -->
 
diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
index 2694510da6..9fac155f95 100644
--- a/app/src/main/res/values/signal_styles.xml
+++ b/app/src/main/res/values/signal_styles.xml
@@ -18,6 +18,12 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
+    <style name="Signal.Widget.Button.Large.Primary.Inverse" parent="@style/Signal.Widget.Button.Large.Primary">
+        <item name="android:minHeight">48dp</item>
+        <item name="android:textColor">@color/signal_button_primary_inverse_text_selector</item>
+        <item name="background">?attr/selectableItemBackground</item>
+    </style>
+
     <style name="Signal.Widget.Button.Large.Danger" parent="@style/Signal.Widget.Button.Large.Primary">
         <item name="backgroundTint">@color/signal_alert_primary</item>
     </style>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 366d66cd4a..be1e9de02f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -882,10 +882,7 @@
     <string name="InviteActivity_sending">Sending…</string>
     <string name="InviteActivity_invitations_sent">Invitations sent!</string>
     <string name="InviteActivity_invite_to_signal">Invite to Signal</string>
-    <plurals name="InviteActivity_send_sms_to_friends">
-        <item quantity="one">SEND SMS TO %d FRIEND</item>
-        <item quantity="other">SEND SMS TO %d FRIENDS</item>
-    </plurals>
+    <string name="InviteActivity_send_sms">Send SMS (%d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Send %d SMS invite?</item>
         <item quantity="other">Send %d SMS invites?</item>