diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ec2cab5daf..566368a6e4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -90,6 +90,7 @@
 
     <application android:name=".ApplicationContext"
                  android:icon="@drawable/icon"
+                 android:roundIcon="@drawable/icon_circle"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
                  tools:replace="android:allowBackup"
@@ -260,7 +261,7 @@
     <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightIntroTheme"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
diff --git a/artwork/logo-512.png b/artwork/logo-512.png
index 9ff2982cca..282f477121 100644
Binary files a/artwork/logo-512.png and b/artwork/logo-512.png differ
diff --git a/res/drawable-hdpi-v11/icon_notification.png b/res/drawable-hdpi-v11/icon_notification.png
index aa31bf571b..025ce4d94d 100644
Binary files a/res/drawable-hdpi-v11/icon_notification.png and b/res/drawable-hdpi-v11/icon_notification.png differ
diff --git a/res/drawable-hdpi-v9/icon_notification.png b/res/drawable-hdpi-v9/icon_notification.png
index ffa5235e2a..f0f52a2a81 100644
Binary files a/res/drawable-hdpi-v9/icon_notification.png and b/res/drawable-hdpi-v9/icon_notification.png differ
diff --git a/res/drawable-hdpi/actionbar_icon_holo_dark.png b/res/drawable-hdpi/actionbar_icon_holo_dark.png
index c2efbf063f..a75443f72a 100644
Binary files a/res/drawable-hdpi/actionbar_icon_holo_dark.png and b/res/drawable-hdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-hdpi/actionbar_icon_holo_light.png b/res/drawable-hdpi/actionbar_icon_holo_light.png
new file mode 100644
index 0000000000..4977ce2b68
Binary files /dev/null and b/res/drawable-hdpi/actionbar_icon_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_signal_grey_24dp.png b/res/drawable-hdpi/ic_signal_grey_24dp.png
index e01390dad8..0389fadccc 100644
Binary files a/res/drawable-hdpi/ic_signal_grey_24dp.png and b/res/drawable-hdpi/ic_signal_grey_24dp.png differ
diff --git a/res/drawable-hdpi/ic_signal_white_48dp.png b/res/drawable-hdpi/ic_signal_white_48dp.png
index 28ede6b2a5..d418114d36 100644
Binary files a/res/drawable-hdpi/ic_signal_white_48dp.png and b/res/drawable-hdpi/ic_signal_white_48dp.png differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
index aba1dee9e9..21b81b796c 100644
Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ
diff --git a/res/drawable-hdpi/icon_circle.png b/res/drawable-hdpi/icon_circle.png
new file mode 100644
index 0000000000..a467775c2c
Binary files /dev/null and b/res/drawable-hdpi/icon_circle.png differ
diff --git a/res/drawable-hdpi/icon_dialog.png b/res/drawable-hdpi/icon_dialog.png
index 0ed7d0332b..6cd58fc927 100644
Binary files a/res/drawable-hdpi/icon_dialog.png and b/res/drawable-hdpi/icon_dialog.png differ
diff --git a/res/drawable-hdpi/icon_transparent.png b/res/drawable-hdpi/icon_transparent.png
new file mode 100644
index 0000000000..0965d0ebda
Binary files /dev/null and b/res/drawable-hdpi/icon_transparent.png differ
diff --git a/res/drawable-hdpi/lockscreen_watermark_dark.png b/res/drawable-hdpi/lockscreen_watermark_dark.png
index 84537ce2a7..974973e66d 100644
Binary files a/res/drawable-hdpi/lockscreen_watermark_dark.png and b/res/drawable-hdpi/lockscreen_watermark_dark.png differ
diff --git a/res/drawable-hdpi/lockscreen_watermark_light.png b/res/drawable-hdpi/lockscreen_watermark_light.png
index 7cbf49acaa..f4c7970433 100644
Binary files a/res/drawable-hdpi/lockscreen_watermark_light.png and b/res/drawable-hdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-mdpi-v11/icon_notification.png b/res/drawable-mdpi-v11/icon_notification.png
index 01f9abda43..47a1f321a8 100644
Binary files a/res/drawable-mdpi-v11/icon_notification.png and b/res/drawable-mdpi-v11/icon_notification.png differ
diff --git a/res/drawable-mdpi-v9/icon_notification.png b/res/drawable-mdpi-v9/icon_notification.png
index 6153b25c42..1f550ea855 100644
Binary files a/res/drawable-mdpi-v9/icon_notification.png and b/res/drawable-mdpi-v9/icon_notification.png differ
diff --git a/res/drawable-mdpi/actionbar_icon_holo_dark.png b/res/drawable-mdpi/actionbar_icon_holo_dark.png
index 73ae590e3e..f2148b4f8d 100644
Binary files a/res/drawable-mdpi/actionbar_icon_holo_dark.png and b/res/drawable-mdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-mdpi/actionbar_icon_holo_light.png b/res/drawable-mdpi/actionbar_icon_holo_light.png
new file mode 100644
index 0000000000..cb1d1dbe2d
Binary files /dev/null and b/res/drawable-mdpi/actionbar_icon_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_signal_grey_24dp.png b/res/drawable-mdpi/ic_signal_grey_24dp.png
index 2399fe616e..3a7bdd081b 100644
Binary files a/res/drawable-mdpi/ic_signal_grey_24dp.png and b/res/drawable-mdpi/ic_signal_grey_24dp.png differ
diff --git a/res/drawable-mdpi/ic_signal_white_48dp.png b/res/drawable-mdpi/ic_signal_white_48dp.png
index 6e9f3c3ed4..7d6bf19e9b 100644
Binary files a/res/drawable-mdpi/ic_signal_white_48dp.png and b/res/drawable-mdpi/ic_signal_white_48dp.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index 44b2fc90a4..b1890ba32e 100644
Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ
diff --git a/res/drawable-mdpi/icon_circle.png b/res/drawable-mdpi/icon_circle.png
new file mode 100644
index 0000000000..7cf00a9054
Binary files /dev/null and b/res/drawable-mdpi/icon_circle.png differ
diff --git a/res/drawable-mdpi/icon_dialog.png b/res/drawable-mdpi/icon_dialog.png
index 7f2dbb42e9..cd7103b90b 100644
Binary files a/res/drawable-mdpi/icon_dialog.png and b/res/drawable-mdpi/icon_dialog.png differ
diff --git a/res/drawable-mdpi/icon_transparent.png b/res/drawable-mdpi/icon_transparent.png
new file mode 100644
index 0000000000..242f2840b5
Binary files /dev/null and b/res/drawable-mdpi/icon_transparent.png differ
diff --git a/res/drawable-mdpi/lockscreen_watermark_dark.png b/res/drawable-mdpi/lockscreen_watermark_dark.png
index 88772f001b..778efed8d6 100644
Binary files a/res/drawable-mdpi/lockscreen_watermark_dark.png and b/res/drawable-mdpi/lockscreen_watermark_dark.png differ
diff --git a/res/drawable-mdpi/lockscreen_watermark_light.png b/res/drawable-mdpi/lockscreen_watermark_light.png
index 9e7b501315..f25c1e0d43 100644
Binary files a/res/drawable-mdpi/lockscreen_watermark_light.png and b/res/drawable-mdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-xhdpi-v11/icon_notification.png b/res/drawable-xhdpi-v11/icon_notification.png
index fb57ee4460..4df63e4a81 100644
Binary files a/res/drawable-xhdpi-v11/icon_notification.png and b/res/drawable-xhdpi-v11/icon_notification.png differ
diff --git a/res/drawable-xhdpi/actionbar_icon_holo_dark.png b/res/drawable-xhdpi/actionbar_icon_holo_dark.png
index ab22eba079..4109717f91 100644
Binary files a/res/drawable-xhdpi/actionbar_icon_holo_dark.png and b/res/drawable-xhdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-xhdpi/actionbar_icon_holo_light.png b/res/drawable-xhdpi/actionbar_icon_holo_light.png
new file mode 100644
index 0000000000..177ad69b43
Binary files /dev/null and b/res/drawable-xhdpi/actionbar_icon_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_signal_grey_24dp.png b/res/drawable-xhdpi/ic_signal_grey_24dp.png
index 9088e211df..b485f022a8 100644
Binary files a/res/drawable-xhdpi/ic_signal_grey_24dp.png and b/res/drawable-xhdpi/ic_signal_grey_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_signal_white_48dp.png b/res/drawable-xhdpi/ic_signal_white_48dp.png
index 189b9ecb44..92b3c43d7a 100644
Binary files a/res/drawable-xhdpi/ic_signal_white_48dp.png and b/res/drawable-xhdpi/ic_signal_white_48dp.png differ
diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
index cb82f0daea..07c58c6920 100644
Binary files a/res/drawable-xhdpi/icon.png and b/res/drawable-xhdpi/icon.png differ
diff --git a/res/drawable-xhdpi/icon_circle.png b/res/drawable-xhdpi/icon_circle.png
new file mode 100644
index 0000000000..e57371a523
Binary files /dev/null and b/res/drawable-xhdpi/icon_circle.png differ
diff --git a/res/drawable-xhdpi/icon_dialog.png b/res/drawable-xhdpi/icon_dialog.png
index 9920940238..c2d691679b 100644
Binary files a/res/drawable-xhdpi/icon_dialog.png and b/res/drawable-xhdpi/icon_dialog.png differ
diff --git a/res/drawable-xhdpi/icon_transparent.png b/res/drawable-xhdpi/icon_transparent.png
new file mode 100644
index 0000000000..8f8b2b3704
Binary files /dev/null and b/res/drawable-xhdpi/icon_transparent.png differ
diff --git a/res/drawable-xhdpi/lockscreen_watermark_dark.png b/res/drawable-xhdpi/lockscreen_watermark_dark.png
index b80c9210cd..f4f3283288 100644
Binary files a/res/drawable-xhdpi/lockscreen_watermark_dark.png and b/res/drawable-xhdpi/lockscreen_watermark_dark.png differ
diff --git a/res/drawable-xhdpi/lockscreen_watermark_light.png b/res/drawable-xhdpi/lockscreen_watermark_light.png
index f4e01b6db7..dabf563d2b 100644
Binary files a/res/drawable-xhdpi/lockscreen_watermark_light.png and b/res/drawable-xhdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-xxhdpi-v11/icon_notification.png b/res/drawable-xxhdpi-v11/icon_notification.png
index eef8f802c1..b47bcea5cd 100644
Binary files a/res/drawable-xxhdpi-v11/icon_notification.png and b/res/drawable-xxhdpi-v11/icon_notification.png differ
diff --git a/res/drawable-xxhdpi/actionbar_icon_holo_dark.png b/res/drawable-xxhdpi/actionbar_icon_holo_dark.png
index 7b5e31dcb1..b6702dd25b 100644
Binary files a/res/drawable-xxhdpi/actionbar_icon_holo_dark.png and b/res/drawable-xxhdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/actionbar_icon_holo_light.png b/res/drawable-xxhdpi/actionbar_icon_holo_light.png
new file mode 100644
index 0000000000..00d80f2240
Binary files /dev/null and b/res/drawable-xxhdpi/actionbar_icon_holo_light.png differ
diff --git a/res/drawable-xxhdpi/ic_signal_grey_24dp.png b/res/drawable-xxhdpi/ic_signal_grey_24dp.png
index d6c3d2bf5b..a7ea1bce21 100644
Binary files a/res/drawable-xxhdpi/ic_signal_grey_24dp.png and b/res/drawable-xxhdpi/ic_signal_grey_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_signal_white_48dp.png b/res/drawable-xxhdpi/ic_signal_white_48dp.png
index a0b322b5bf..e52227145c 100644
Binary files a/res/drawable-xxhdpi/ic_signal_white_48dp.png and b/res/drawable-xxhdpi/ic_signal_white_48dp.png differ
diff --git a/res/drawable-xxhdpi/icon.png b/res/drawable-xxhdpi/icon.png
index 230e62db52..60c5b309ab 100644
Binary files a/res/drawable-xxhdpi/icon.png and b/res/drawable-xxhdpi/icon.png differ
diff --git a/res/drawable-xxhdpi/icon_circle.png b/res/drawable-xxhdpi/icon_circle.png
new file mode 100644
index 0000000000..b471f4b1f4
Binary files /dev/null and b/res/drawable-xxhdpi/icon_circle.png differ
diff --git a/res/drawable-xxhdpi/icon_dialog.png b/res/drawable-xxhdpi/icon_dialog.png
index 6511c7c8bc..1a16f5a85c 100644
Binary files a/res/drawable-xxhdpi/icon_dialog.png and b/res/drawable-xxhdpi/icon_dialog.png differ
diff --git a/res/drawable-xxhdpi/icon_transparent.png b/res/drawable-xxhdpi/icon_transparent.png
new file mode 100644
index 0000000000..8cbd2b75e7
Binary files /dev/null and b/res/drawable-xxhdpi/icon_transparent.png differ
diff --git a/res/drawable-xxhdpi/lockscreen_watermark_dark.png b/res/drawable-xxhdpi/lockscreen_watermark_dark.png
index 3a4cf4a43a..a1437109d8 100644
Binary files a/res/drawable-xxhdpi/lockscreen_watermark_dark.png and b/res/drawable-xxhdpi/lockscreen_watermark_dark.png differ
diff --git a/res/drawable-xxhdpi/lockscreen_watermark_light.png b/res/drawable-xxhdpi/lockscreen_watermark_light.png
index 5bf0185416..a36f37524e 100644
Binary files a/res/drawable-xxhdpi/lockscreen_watermark_light.png and b/res/drawable-xxhdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-xxxhdpi-v11/icon_notification.png b/res/drawable-xxxhdpi-v11/icon_notification.png
index 5099428cc9..a9715d286a 100644
Binary files a/res/drawable-xxxhdpi-v11/icon_notification.png and b/res/drawable-xxxhdpi-v11/icon_notification.png differ
diff --git a/res/drawable-xxxhdpi/ic_signal_grey_24dp.png b/res/drawable-xxxhdpi/ic_signal_grey_24dp.png
index 7df7b11d80..2ee81f64d1 100644
Binary files a/res/drawable-xxxhdpi/ic_signal_grey_24dp.png and b/res/drawable-xxxhdpi/ic_signal_grey_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_signal_white_48dp.png b/res/drawable-xxxhdpi/ic_signal_white_48dp.png
index c17e9ae4d5..b3cf04a80d 100644
Binary files a/res/drawable-xxxhdpi/ic_signal_white_48dp.png and b/res/drawable-xxxhdpi/ic_signal_white_48dp.png differ
diff --git a/res/drawable-xxxhdpi/icon.png b/res/drawable-xxxhdpi/icon.png
index 9aceebde48..9d8b9a27ab 100644
Binary files a/res/drawable-xxxhdpi/icon.png and b/res/drawable-xxxhdpi/icon.png differ
diff --git a/res/drawable-xxxhdpi/icon_circle.png b/res/drawable-xxxhdpi/icon_circle.png
new file mode 100644
index 0000000000..9d39deb142
Binary files /dev/null and b/res/drawable-xxxhdpi/icon_circle.png differ
diff --git a/res/drawable-xxxhdpi/icon_transparent.png b/res/drawable-xxxhdpi/icon_transparent.png
new file mode 100644
index 0000000000..710df30d96
Binary files /dev/null and b/res/drawable-xxxhdpi/icon_transparent.png differ
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index e8761c8113..fbffc48422 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -1,38 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/scroll_parent"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true"
-            android:background="@drawable/background_pattern_repeat">
+<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">
 
-  <RelativeLayout android:id="@+id/prompt_layout"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content">
 
-    <ImageView android:id="@+id/watermark"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_centerHorizontal="true"
-               android:layout_marginBottom="20dp"
-               android:src="@drawable/lockscreen_watermark_light"
-               android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
-               android:layout_marginTop="100dp"/>
+  <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"/>
 
-    <RelativeLayout android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/watermark">
+  <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"/>
 
-      <ProgressBar android:id="@+id/passphrase_edit"
-                   android:layout_width="75dp"
-                   android:layout_height="75dp"
-                   android:indeterminate="true"
-                   android:padding="10dp"
-                   android:layout_centerHorizontal="true"/>
-
-    </RelativeLayout>
-
-  </RelativeLayout>
-
-</ScrollView>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index 9a1ced5b07..f1d723e182 100644
--- a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -47,9 +47,6 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   }
 
   private void initializeResources() {
-    getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-    getSupportActionBar().setCustomView(R.layout.centered_app_title);
-
     new SecretGenerator().execute(MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
   }