diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e90288d3c4..ea5580dff1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -138,14 +138,14 @@
     <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.IntroTheme"
+              android:theme="@style/TextSecure.LightIntroTheme"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:label="@string/AndroidManifest__enter_passphrase"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.IntroTheme"
+              android:theme="@style/TextSecure.LightIntroTheme"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
diff --git a/res/drawable-hdpi/ic_action_forward.png b/res/drawable-hdpi/ic_action_forward.png
deleted file mode 100644
index 5d1a8091dc..0000000000
Binary files a/res/drawable-hdpi/ic_action_forward.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_arrow_forward_dark.png b/res/drawable-hdpi/ic_arrow_forward_dark.png
new file mode 100644
index 0000000000..03568e6a08
Binary files /dev/null and b/res/drawable-hdpi/ic_arrow_forward_dark.png differ
diff --git a/res/drawable-hdpi/ic_arrow_forward_light.png b/res/drawable-hdpi/ic_arrow_forward_light.png
new file mode 100644
index 0000000000..b55688a81f
Binary files /dev/null and b/res/drawable-hdpi/ic_arrow_forward_light.png differ
diff --git a/res/drawable-hdpi/lockscreen_watermark.png b/res/drawable-hdpi/lockscreen_watermark.png
deleted file mode 100644
index f17a29cb36..0000000000
Binary files a/res/drawable-hdpi/lockscreen_watermark.png and /dev/null differ
diff --git a/res/drawable-hdpi/lockscreen_watermark_dark.png b/res/drawable-hdpi/lockscreen_watermark_dark.png
new file mode 100644
index 0000000000..84537ce2a7
Binary files /dev/null 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
new file mode 100644
index 0000000000..7cbf49acaa
Binary files /dev/null and b/res/drawable-hdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-mdpi/ic_action_forward.png b/res/drawable-mdpi/ic_action_forward.png
deleted file mode 100644
index 66fe0f03f9..0000000000
Binary files a/res/drawable-mdpi/ic_action_forward.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_dark.png b/res/drawable-mdpi/ic_arrow_forward_dark.png
new file mode 100644
index 0000000000..92b6aebeca
Binary files /dev/null and b/res/drawable-mdpi/ic_arrow_forward_dark.png differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_light.png b/res/drawable-mdpi/ic_arrow_forward_light.png
new file mode 100644
index 0000000000..1df381e4b5
Binary files /dev/null and b/res/drawable-mdpi/ic_arrow_forward_light.png differ
diff --git a/res/drawable-mdpi/lockscreen_watermark_dark.png b/res/drawable-mdpi/lockscreen_watermark_dark.png
new file mode 100644
index 0000000000..88772f001b
Binary files /dev/null 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
new file mode 100644
index 0000000000..9e7b501315
Binary files /dev/null and b/res/drawable-mdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_forward.png b/res/drawable-xhdpi/ic_action_forward.png
deleted file mode 100644
index e5feac8f32..0000000000
Binary files a/res/drawable-xhdpi/ic_action_forward.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.png b/res/drawable-xhdpi/ic_arrow_forward_dark.png
new file mode 100644
index 0000000000..70057432f3
Binary files /dev/null and b/res/drawable-xhdpi/ic_arrow_forward_dark.png differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_light.png b/res/drawable-xhdpi/ic_arrow_forward_light.png
new file mode 100644
index 0000000000..ad50cf2741
Binary files /dev/null and b/res/drawable-xhdpi/ic_arrow_forward_light.png differ
diff --git a/res/drawable-xhdpi/lockscreen_watermark.png b/res/drawable-xhdpi/lockscreen_watermark.png
deleted file mode 100644
index 50ba1c13af..0000000000
Binary files a/res/drawable-xhdpi/lockscreen_watermark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/lockscreen_watermark_dark.png b/res/drawable-xhdpi/lockscreen_watermark_dark.png
new file mode 100644
index 0000000000..b80c9210cd
Binary files /dev/null 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
new file mode 100644
index 0000000000..f4e01b6db7
Binary files /dev/null and b/res/drawable-xhdpi/lockscreen_watermark_light.png differ
diff --git a/res/drawable-xxhdpi/ic_action_forward.png b/res/drawable-xxhdpi/ic_action_forward.png
deleted file mode 100644
index 35bb9a54c9..0000000000
Binary files a/res/drawable-xxhdpi/ic_action_forward.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_dark.png b/res/drawable-xxhdpi/ic_arrow_forward_dark.png
new file mode 100644
index 0000000000..67c757ae26
Binary files /dev/null and b/res/drawable-xxhdpi/ic_arrow_forward_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.png b/res/drawable-xxhdpi/ic_arrow_forward_light.png
new file mode 100644
index 0000000000..44956477ad
Binary files /dev/null and b/res/drawable-xxhdpi/ic_arrow_forward_light.png differ
diff --git a/res/drawable-xxhdpi/lockscreen_watermark.png b/res/drawable-xxhdpi/lockscreen_watermark.png
deleted file mode 100644
index 324798be98..0000000000
Binary files a/res/drawable-xxhdpi/lockscreen_watermark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/lockscreen_watermark_dark.png b/res/drawable-xxhdpi/lockscreen_watermark_dark.png
new file mode 100644
index 0000000000..3a4cf4a43a
Binary files /dev/null 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
new file mode 100644
index 0000000000..5bf0185416
Binary files /dev/null and b/res/drawable-xxhdpi/lockscreen_watermark_light.png differ
diff --git a/res/layout/light_centered_app_title.xml b/res/layout/centered_app_title.xml
similarity index 91%
rename from res/layout/light_centered_app_title.xml
rename to res/layout/centered_app_title.xml
index cc97247f37..877b8748f3 100644
--- a/res/layout/light_centered_app_title.xml
+++ b/res/layout/centered_app_title.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/app_name"
-        android:textColor="#55000000"
+        android:textColor="?attr/centered_app_title_color"
         android:fontFamily="sans-serif-light"
         android:id="@+id/title"
         android:textSize="23sp" />
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 0f5f7d5fa4..e8761c8113 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -16,7 +16,7 @@
                android:layout_height="wrap_content"
                android:layout_centerHorizontal="true"
                android:layout_marginBottom="20dp"
-               android:src="@drawable/lockscreen_watermark"
+               android:src="@drawable/lockscreen_watermark_light"
                android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
                android:layout_marginTop="100dp"/>
 
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 7a135de011..08e5797187 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -15,7 +15,7 @@
                    android:layout_height="wrap_content"
                    android:layout_centerHorizontal="true"
                    android:layout_marginBottom="50dp"
-                   android:src="@drawable/lockscreen_watermark"
+                   android:src="?lockscreen_watermark"
                    android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
                    android:layout_marginTop="30dp"/>
 
@@ -35,7 +35,7 @@
                       android:paddingRight="10dp"/>
 
             <ImageButton android:id="@+id/ok_button"
-                         android:src="@drawable/ic_action_forward"
+                         android:src="?ic_arrow_forward"
                          android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
                          android:background="@null"
                          android:text="@string/prompt_passphrase_activity__unlock"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 00c61f7d17..fd6a1dc84a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,6 +23,9 @@
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
 
+    <attr name="centered_app_title_color" format="reference|color" />
+    <attr name="ic_arrow_forward" format="reference" />
+
     <attr name="conversation_background" format="reference|color"/>
     <attr name="conversation_editor_background" format="reference"/>
     <attr name="conversation_editor_text_color" format="reference|color"/>
@@ -113,4 +116,5 @@
     </declare-styleable>
 
     <attr name="group_members_dialog_icon" format="reference"/>
+    <attr name="lockscreen_watermark" format="reference" />
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f528fbc274..5abf9202ec 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="TextSecure.IntroTheme" parent="@style/Theme.AppCompat.Light">
+    <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
         <!--<item name="colorPrimary">@android:color/transparent</item>-->
         <item name="actionBarStyle">@style/TextSecure.IntroActionBar</item>
         <item name="android:windowContentOverlay">@null</item>
+
+        <item name="android:textColorHint">#cc000000</item>
+        <item name="centered_app_title_color">#55000000</item>
+        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
+        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
+    </style>
+
+    <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
+        <item name="actionBarStyle">@style/TextSecure.IntroActionBar</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+        <item name="android:textColorHint">@color/white</item>
+        <item name="centered_app_title_color">@color/gray27</item>
+        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
+        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
+        <item name="android:windowBackground">@color/black</item>
     </style>
 
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index c3fb1847ef..79e0149113 100644
--- a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -47,7 +47,7 @@ public class PassphraseCreateActivity extends PassphraseActivity {
 
   private void initializeResources() {
     getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-    getSupportActionBar().setCustomView(R.layout.light_centered_app_title);
+    getSupportActionBar().setCustomView(R.layout.centered_app_title);
 
     new SecretGenerator().execute(MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
   }
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index dd4d1eff29..1495777772 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -16,16 +16,12 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.text.Editable;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.TypefaceSpan;
 import android.view.KeyEvent;
@@ -42,9 +38,9 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.util.DynamicIntroTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.util.Util;
 
 /**
  * Activity that prompts for a user's passphrase.
@@ -53,12 +49,14 @@ import org.thoughtcrime.securesms.util.Util;
  */
 public class PassphrasePromptActivity extends PassphraseActivity {
 
-  private DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
+  private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
 
   private EditText passphraseText;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
+    dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
     super.onCreate(savedInstanceState);
 
@@ -69,6 +67,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   @Override
   public void onResume() {
     super.onResume();
+    dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
   }
 
@@ -119,14 +118,13 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private void initializeResources() {
     getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-    getSupportActionBar().setCustomView(R.layout.light_centered_app_title);
+    getSupportActionBar().setCustomView(R.layout.centered_app_title);
 
     ImageButton okButton = (ImageButton) findViewById(R.id.ok_button);
     passphraseText       = (EditText)    findViewById(R.id.passphrase_edit);
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-    hint.setSpan(new ForegroundColorSpan(0xcc000000), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
     passphraseText.setHint(hint);
     okButton.setOnClickListener(new OkButtonClickListener());
diff --git a/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java b/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
new file mode 100644
index 0000000000..a4e7f37445
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.util;
+
+import android.app.Activity;
+
+import org.thoughtcrime.securesms.R;
+
+public class DynamicIntroTheme extends DynamicTheme {
+  @Override
+  protected int getSelectedTheme(Activity activity) {
+    String theme = TextSecurePreferences.getTheme(activity);
+
+    if (theme.equals("dark")) return R.style.TextSecure_DarkIntroTheme;
+
+    return R.style.TextSecure_LightIntroTheme;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
index e270663d2e..b484656d28 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -2,11 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.preference.PreferenceManager;
 
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
-import org.thoughtcrime.securesms.ConversationActivity;
-import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
 
 public class DynamicTheme {
@@ -28,7 +24,7 @@ public class DynamicTheme {
     }
   }
 
-  private static int getSelectedTheme(Activity activity) {
+  protected int getSelectedTheme(Activity activity) {
     String theme = TextSecurePreferences.getTheme(activity);
 
     if (theme.equals("dark")) return R.style.TextSecure_DarkTheme;