diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index f851233471..1829d3623b 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -6,6 +6,7 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="@color/loki_darkest_gray"
                 android:orientation="vertical">
 
     <View android:id="@+id/shim"
@@ -17,7 +18,6 @@
     <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?login_top_background"
             android:layout_above="@id/shim">
 
     </FrameLayout>
@@ -29,10 +29,10 @@
             android:layout_marginTop="20dp">
 
         <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="128dp"
-                android:src="@drawable/ic_launcher_foreground"
-                android:layout_gravity="center"/>
+            android:layout_width="wrap_content"
+            android:layout_height="64dp"
+            android:src="@drawable/ic_launcher_foreground"
+            android:layout_gravity="center" />
 
     </android.support.v7.widget.Toolbar>
 
@@ -48,35 +48,42 @@
             android:padding="20dp"
             android:elevation="10dp">
 
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="40dp"
-                  android:text="@string/prompt_passphrase_activity__signal_is_locked"
-                  android:gravity="center_horizontal"
-                  android:textSize="25sp"/>
-
-        <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:padding="20dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="60dp"
-                tools:visibility="visible"/>
-
-        <TextView android:id="@+id/lock_screen_auth_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@drawable/rounded_rectangle_dark"
-                  android:backgroundTint="@color/signal_primary"
-                  android:textColor="@color/white"
-                  android:gravity="center_horizontal"
-                  android:elevation="3dp"
-                  android:padding="10dp"
-                  android:text="@string/prompt_passphrase_activity__tap_to_unlock"
-                  tools:visibility="gone"/>
+        <TextView
+            style="@style/Signal.Text.Body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/prompt_passphrase_activity__signal_is_locked"
+            android:textStyle="bold"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:layout_marginBottom="32dp" />
+
+        <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:padding="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="32dp"
+            tools:visibility="visible"/>
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/lock_screen_auth_container"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@color/signal_primary"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="4dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            app:cpb_textIdle="@string/prompt_passphrase_activity__tap_to_unlock"
+            android:elevation="0dp"
+            android:stateListAnimator="@null" />
 
         <RelativeLayout android:id="@+id/password_auth_container"
                         android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 751fef857d..6488c933b5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1536,7 +1536,7 @@
     <string name="RegistrationLockDialog_disable_registration_lock_pin">Disable Registration Lock PIN?</string>
     <string name="RegistrationLockDialog_disable">Disable</string>
     <string name="preferences_chats__backups">Backups</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Loki Messenger is locked</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Loki Messenger is Locked</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
     <string name="RegistrationLockDialog_reminder">Reminder:</string>
     <string name="recipient_preferences__about">About</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 155b8d2064..178c030731 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -75,7 +75,7 @@
         <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
 
         <item name="login_top_background">@color/signal_primary</item>
-        <item name="login_floating_background">@drawable/rounded_rectangle_white</item>
+        <item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
 
     </style>
 
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index b0b1d46f42..dd9bbb246a 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -48,6 +48,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.dd.CircularProgressButton;
+
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -72,9 +74,9 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
   private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
 
-  private View            passphraseAuthContainer;
-  private ImageView       fingerprintPrompt;
-  private TextView        lockScreenButton;
+  private View                   passphraseAuthContainer;
+  private ImageView              fingerprintPrompt;
+  private CircularProgressButton lockScreenButton;
 
   private EditText        passphraseText;
   private ImageButton     showButton;
@@ -136,7 +138,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     MenuInflater inflater = this.getMenuInflater();
     menu.clear();
 
-    inflater.inflate(R.menu.log_submit, menu);
+    // inflater.inflate(R.menu.log_submit, menu);
     super.onPrepareOptionsMenu(menu);
     return true;
   }
@@ -276,7 +278,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
       fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
     } else if (Build.VERSION.SDK_INT >= 21){
       Log.i(TAG, "firing intent...");
-      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Signal", "");
+      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Loki Messenger", "");
       startActivityForResult(intent, 1);
     } else {
       Log.w(TAG, "Not compatible...");