diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
index 90807a41bd..b76e7f9f30 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
@@ -63,6 +63,7 @@ public abstract class PassphraseActivity extends BaseActivity {
         if (nextIntent != null) {
             try {
                 startActivity(nextIntent);
+                overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
             } catch (java.lang.SecurityException e) {
                 Log.w(TAG, "Access permission not passed from PassphraseActivity, retry sharing.");
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index ab8b013b93..de3387945c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -387,6 +387,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     @Override
     public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
       Log.i(TAG, "onAuthenticationSucceeded");
+
+      lockScreenButton.setOnClickListener(null);
       unlockView.addAnimatorListener(new AnimationCompleteListener() {
         @Override
         public void onAnimationEnd(Animator animation) {
diff --git a/app/src/main/res/drawable/symbol_more_vertical.xml b/app/src/main/res/drawable/symbol_more_vertical.xml
new file mode 100644
index 0000000000..977143f4e4
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_more_vertical.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="12"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6 6.75c0.9 0 1.63-0.73 1.63-1.63C7.63 4.22 6.9 3.5 6 3.5c-0.9 0-1.63 0.73-1.63 1.63 0 0.9 0.73 1.62 1.63 1.62Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.63 12c0 0.9-0.73 1.63-1.63 1.63-0.9 0-1.63-0.73-1.63-1.63 0-0.9 0.73-1.63 1.63-1.63 0.9 0 1.63 0.73 1.63 1.63Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.63 18.88c0 0.9-0.73 1.62-1.63 1.62-0.9 0-1.63-0.73-1.63-1.63 0-0.9 0.73-1.62 1.63-1.62 0.9 0 1.63 0.73 1.63 1.63Z"/>
+</vector>
diff --git a/app/src/main/res/layout/prompt_passphrase_activity.xml b/app/src/main/res/layout/prompt_passphrase_activity.xml
index a4d6788766..2f1e5df46a 100644
--- a/app/src/main/res/layout/prompt_passphrase_activity.xml
+++ b/app/src/main/res/layout/prompt_passphrase_activity.xml
@@ -7,6 +7,7 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="@color/signal_colorSurface"
                 android:orientation="vertical"
                 android:fitsSystemWindows="true">
 
@@ -19,12 +20,14 @@
             android:layout_marginTop="20dp" />
 
     <LinearLayout
+            android:id="@+id/unlock_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            android:paddingBottom="36dp"
             android:orientation="vertical"
             android:gravity="center">
 
@@ -32,13 +35,14 @@
             android:id="@+id/unlock_view"
             android:layout_width="72dp"
             android:layout_height="72dp"
+            android:layout_marginBottom="4dp"
             app:lottie_rawRes="@raw/lottie_unlock" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/prompt_passphrase_activity__unlock_signal"
-            style="@style/Signal.Text.Headline.Medium" />
+            style="@style/Signal.Text.HeadlineMedium" />
 
         <RelativeLayout android:id="@+id/password_auth_container"
                         android:layout_width="match_parent"
@@ -113,6 +117,9 @@
         style="@style/Signal.Text.BodyMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/unlock_container"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintVertical_bias=".65"
         app:layout_constraintBottom_toTopOf="@id/lock_screen_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -131,8 +138,9 @@
         android:text="@string/prompt_passphrase_activity__unlock"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/learn_more_text"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="80dp"
+        android:layout_marginBottom="16dp"
         tools:visibility="visible"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 983cbbc1ac..5c5741d6e8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -270,7 +270,7 @@
     </style>
 
     <style name="Signal.Toolbar.Overflow.Light">
-        <item name="srcCompat">@drawable/ic_more_vert_24</item>
+        <item name="srcCompat">@drawable/symbol_more_vertical</item>
         <item name="android:src">@null</item>
         <item name="android:tint">@color/signal_icon_tint_primary</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8887219a32..7c3ffb6705 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -97,8 +97,8 @@
     <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@color/login_top_background</item>
-        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_colorSurface</item>
+        <item name="android:navigationBarColor">@color/signal_colorSurface</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
@@ -114,8 +114,9 @@
     <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
         <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@color/login_top_background</item>
-        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_colorSurface</item>
+        <item name="android:navigationBarColor">@color/signal_colorSurface</item>
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>