diff --git a/build.gradle b/build.gradle
index c89b50a267..deb4bc1193 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,6 +49,7 @@ dependencies {
     compile 'com.soundcloud.android:android-crop:0.9.10@aar'
     compile 'com.android.support:appcompat-v7:22.2.1'
     compile 'com.android.support:recyclerview-v7:22.2.1'
+    compile 'com.android.support:design:22.2.1'
     compile 'com.melnykov:floatingactionbutton:1.3.0'
     compile 'com.google.zxing:android-integration:3.1.0'
     compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
@@ -107,6 +108,7 @@ dependencyVerification {
             'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
             'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618',
             'com.android.support:recyclerview-v7:b0f530a5b14334d56ce0de85527ffe93ac419bc928e2884287ce1dddfedfb505',
+            'com.android.support:design:58be3ca6a73789615f7ece0937d2f683b98b594bb90aa10565fa760fb10b07ee',
             'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
             'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
             'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index 89fd18ffdd..0e35197e37 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -5,10 +5,9 @@
             android:layout_height="fill_parent"
             android:fillViewport="true">
 
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center" >
+    <FrameLayout android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:gravity="center">
         
         <LinearLayout android:paddingRight="16dip"
                       android:paddingLeft="16dip"
@@ -19,40 +18,45 @@
                       android:visibility="visible"
                       android:orientation="vertical">
                 
-            <TextView style="@style/Registration.Label"
-                      android:id="@+id/old_passphrase_label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__old_passphrase" />
-            
-            <EditText android:id="@+id/old_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:layout_marginBottom="10dip"
-                      android:singleLine="true"/>
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <TextView style="@style/Registration.Label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__new_passphrase" />
-            
-            <EditText android:id="@+id/new_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:singleLine="true"/>
+                <EditText android:id="@+id/old_passphrase"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:layout_marginBottom="10dip"
+                          android:hint="@string/change_passphrase_activity__old_passphrase"
+                          android:singleLine="true"/>
 
-           <TextView style="@style/Registration.Label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__repeat_new_passphrase" />
-            
-            <EditText android:id="@+id/repeat_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:singleLine="true"/>
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText android:id="@+id/new_passphrase"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:hint="@string/change_passphrase_activity__new_passphrase"
+                          android:singleLine="true"/>
+
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText android:id="@+id/repeat_passphrase"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
+                          android:singleLine="true" />
+
+            </android.support.design.widget.TextInputLayout>
 
             <LinearLayout android:orientation="horizontal"
                           android:layout_width="fill_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index cd4fd2c697..68453ca171 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -84,8 +84,6 @@
     <attr name="encrypted_backup" format="reference" />
     <attr name="plaintext_backup" format="reference" />
 
-    <attr name="registration_text_shadow_color" format="color" />
-
     <attr name="reminder_header_background" format="color"/>
 
     <attr name="menu_new_conversation_icon" format="reference" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5c56d6984..1871c64292 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -576,9 +576,9 @@
     <string name="attachment_type_selector__camera">Camera</string>
 
     <!-- change_passphrase_activity -->
-    <string name="change_passphrase_activity__old_passphrase">OLD PASSPHRASE:</string>
-    <string name="change_passphrase_activity__new_passphrase">NEW PASSPHRASE:</string>
-    <string name="change_passphrase_activity__repeat_new_passphrase">REPEAT NEW PASSPHRASE:</string>
+    <string name="change_passphrase_activity__old_passphrase">Old passphrase</string>
+    <string name="change_passphrase_activity__new_passphrase">New passphrase</string>
+    <string name="change_passphrase_activity__repeat_new_passphrase">Repeaet new passhprase</string>
 
     <!-- contact_selection_activity -->
     <string name="contact_selection_activity__enter_name_or_number">Enter name or number</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dca18bc6fb..bc35a2942e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -122,11 +122,11 @@
         <item name="android:textSize">12.0sp</item>
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textColor">#ff808080</item>
         <item name="android:gravity">left</item>
         <item name="android:layout_gravity">left</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:shadowColor">?registration_text_shadow_color</item>
+        <item name="android:shadowColor">#ffffff</item>
         <item name="android:shadowDx">1.0</item>
         <item name="android:shadowDy">1.0</item>
         <item name="android:shadowRadius">0.0</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 24cf64eebc..3d65e4a0d6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -181,8 +181,6 @@
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
 
-        <item name="registration_text_shadow_color">@color/gray95</item>
-
         <item name="reminder_header_background">#ff1d85d7</item>
 
         <item name="pref_ic_sms_mms">@drawable/ic_textsms_black_32dp</item>
@@ -296,8 +294,6 @@
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
 
-        <item name="registration_text_shadow_color">@color/gray13</item>
-
         <item name="reminder_header_background">@color/textsecure_primary_dark</item>
 
         <item name="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item>
diff --git a/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java b/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java
index eef3e361df..eec279fda6 100644
--- a/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java
@@ -25,7 +25,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -49,7 +48,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
   private EditText originalPassphrase;
   private EditText newPassphrase;
   private EditText repeatPassphrase;
-  private TextView originalPassphraseLabel;
   private Button   okButton;
   private Button   cancelButton;
 
@@ -72,7 +70,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
   }
 
   private void initializeResources() {
-    this.originalPassphraseLabel = (TextView) findViewById(R.id.old_passphrase_label);
     this.originalPassphrase      = (EditText) findViewById(R.id.old_passphrase      );
     this.newPassphrase           = (EditText) findViewById(R.id.new_passphrase      );
     this.repeatPassphrase        = (EditText) findViewById(R.id.repeat_passphrase   );
@@ -85,10 +82,8 @@ public class PassphraseChangeActivity extends PassphraseActivity {
 
     if (TextSecurePreferences.isPasswordDisabled(this)) {
       this.originalPassphrase.setVisibility(View.GONE);
-      this.originalPassphraseLabel.setVisibility(View.GONE);
     } else {
       this.originalPassphrase.setVisibility(View.VISIBLE);
-      this.originalPassphraseLabel.setVisibility(View.VISIBLE);
     }
   }