diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml
index 91d377878..4f4ce7667 100644
--- a/briar-android/src/main/res/layout/activity_change_password.xml
+++ b/briar-android/src/main/res/layout/activity_change_password.xml
@@ -24,7 +24,8 @@
 			android:layout_height="wrap_content"
 			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
-			app:hintEnabled="false">
+			app:hintEnabled="false"
+			app:passwordToggleEnabled="true">
 
 			<EditText
 				android:id="@+id/current_password_entry"
@@ -42,7 +43,8 @@
 			android:layout_below="@id/current_password_entry_wrapper"
 			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
-			app:hintEnabled="false">
+			app:hintEnabled="false"
+			app:passwordToggleEnabled="true">
 
 			<EditText
 				android:id="@+id/new_password_entry"
@@ -60,7 +62,8 @@
 			android:layout_below="@id/new_password_entry_wrapper"
 			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
-			app:hintEnabled="false">
+			app:hintEnabled="false"
+			app:passwordToggleEnabled="true">
 
 			<EditText
 				android:id="@+id/new_password_confirm"
diff --git a/briar-android/src/main/res/layout/activity_password.xml b/briar-android/src/main/res/layout/activity_password.xml
index db8e12da2..15e6d94a1 100644
--- a/briar-android/src/main/res/layout/activity_password.xml
+++ b/briar-android/src/main/res/layout/activity_password.xml
@@ -22,7 +22,8 @@
 			android:layout_height="wrap_content"
 			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
-			app:hintEnabled="false">
+			app:hintEnabled="false"
+			app:passwordToggleEnabled="true">
 
 			<EditText
 				android:id="@+id/edit_password"
diff --git a/briar-android/src/main/res/layout/fragment_setup_password.xml b/briar-android/src/main/res/layout/fragment_setup_password.xml
index 5a925750e..2e7c289f5 100644
--- a/briar-android/src/main/res/layout/fragment_setup_password.xml
+++ b/briar-android/src/main/res/layout/fragment_setup_password.xml
@@ -26,7 +26,8 @@
 			app:hintEnabled="false"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
+			app:layout_constraintTop_toTopOf="parent"
+			app:passwordToggleEnabled="true">
 
 			<android.support.design.widget.TextInputEditText
 				android:id="@+id/password_entry"
@@ -62,7 +63,8 @@
 			app:hintEnabled="false"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/strength_meter">
+			app:layout_constraintTop_toBottomOf="@+id/strength_meter"
+			app:passwordToggleEnabled="true">
 
 			<android.support.design.widget.TextInputEditText
 				android:id="@+id/password_confirm"