diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
index 43880debdd6a3e050eab37709a04903beff6916d..e564e80a50e3dce28986b43277affd9a95b4ea76 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
@@ -3,13 +3,13 @@ package de.kuschku.quasseldroid_ng.ui.setup.accounts
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
-import android.support.design.widget.TextInputEditText
 import android.support.design.widget.TextInputLayout
 import android.support.v7.app.AlertDialog
 import android.support.v7.app.AppCompatActivity
 import android.text.Editable
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.EditText
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.Keys
@@ -24,27 +24,27 @@ class AccountEditActivity : AppCompatActivity() {
   @BindView(R.id.nameWrapper)
   lateinit var nameWrapper: TextInputLayout
   @BindView(R.id.name)
-  lateinit var name: TextInputEditText
+  lateinit var name: EditText
 
   @BindView(R.id.hostWrapper)
   lateinit var hostWrapper: TextInputLayout
   @BindView(R.id.host)
-  lateinit var host: TextInputEditText
+  lateinit var host: EditText
 
   @BindView(R.id.portWrapper)
   lateinit var portWrapper: TextInputLayout
   @BindView(R.id.port)
-  lateinit var port: TextInputEditText
+  lateinit var port: EditText
 
   @BindView(R.id.userWrapper)
   lateinit var userWrapper: TextInputLayout
   @BindView(R.id.user)
-  lateinit var user: TextInputEditText
+  lateinit var user: EditText
 
   @BindView(R.id.passWrapper)
   lateinit var passWrapper: TextInputLayout
   @BindView(R.id.pass)
-  lateinit var pass: TextInputEditText
+  lateinit var pass: EditText
 
   private var accountId: Long = -1
   private var account: AccountDatabase.Account? = null
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
index 28d100c6ba0d9dd055b94277c348891d00491b63..e9fdc5a9b99d6c4199a9360b09bcc3ee63b5756a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
@@ -1,12 +1,12 @@
 package de.kuschku.quasseldroid_ng.ui.setup.accounts
 
 import android.os.Bundle
-import android.support.design.widget.TextInputEditText
 import android.support.design.widget.TextInputLayout
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.R
@@ -18,13 +18,13 @@ class AccountSetupConnectionSlide : SlideFragment() {
   @BindView(R.id.hostWrapper)
   lateinit var hostWrapper: TextInputLayout
   @BindView(R.id.host)
-  lateinit var hostField: TextInputEditText
+  lateinit var hostField: EditText
 
   @BindView(R.id.portWrapper)
   lateinit var portWrapper: TextInputLayout
 
   @BindView(R.id.port)
-  lateinit var portField: TextInputEditText
+  lateinit var portField: EditText
 
   override fun isValid(): Boolean {
     return hostValidator.isValid && portValidator.isValid
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
index 33d68251b894a488c1187498adb7c24f236ce989..2e0f8c4298e590a881ef21d1d9470a4febe2f3d9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
@@ -1,12 +1,12 @@
 package de.kuschku.quasseldroid_ng.ui.setup.accounts
 
 import android.os.Bundle
-import android.support.design.widget.TextInputEditText
 import android.support.design.widget.TextInputLayout
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.R
@@ -17,7 +17,7 @@ class AccountSetupNameSlide : SlideFragment() {
   @BindView(R.id.nameWrapper)
   lateinit var nameWrapper: TextInputLayout
   @BindView(R.id.name)
-  lateinit var nameField: TextInputEditText
+  lateinit var nameField: EditText
 
   override fun isValid(): Boolean {
     return nameValidator.isValid
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
index 8e10124b96db17c43e93133ed54c5bd5013a3fa2..f995d230fbff84b189fa53a4a7fb7b86183b306b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
@@ -1,12 +1,12 @@
 package de.kuschku.quasseldroid_ng.ui.setup.accounts
 
 import android.os.Bundle
-import android.support.design.widget.TextInputEditText
 import android.support.design.widget.TextInputLayout
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.R
@@ -17,12 +17,12 @@ class AccountSetupUserSlide : SlideFragment() {
   @BindView(R.id.userWrapper)
   lateinit var userWrapper: TextInputLayout
   @BindView(R.id.user)
-  lateinit var userField: TextInputEditText
+  lateinit var userField: EditText
 
   @BindView(R.id.passWrapper)
   lateinit var passWrapper: TextInputLayout
   @BindView(R.id.pass)
-  lateinit var passField: TextInputEditText
+  lateinit var passField: EditText
 
   override fun isValid(): Boolean {
     return true
diff --git a/app/src/main/res/layout/setup_account_connection.xml b/app/src/main/res/layout/setup_account_connection.xml
index 499b64e16bb60a4abfd27541a86389de1490debb..f217339abc7c29ceb074c2fdcce352cfd96ec164 100644
--- a/app/src/main/res/layout/setup_account_connection.xml
+++ b/app/src/main/res/layout/setup_account_connection.xml
@@ -14,7 +14,7 @@
     android:hint="@string/labelConnectionHost"
     app:errorEnabled="true">
 
-    <android.support.design.widget.TextInputEditText
+    <EditText
       android:id="@+id/host"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
     android:hint="@string/labelConnectionPort"
     app:errorEnabled="true">
 
-    <android.support.design.widget.TextInputEditText
+    <EditText
       android:id="@+id/port"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index 715e30623c0fea8627fa90c4af2bb122f10bed2e..4397994164a74e6b0be5996b2119fefddbd3174f 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -39,7 +39,7 @@
         android:hint="@string/labelAccountName"
         app:errorEnabled="true">
 
-        <android.support.design.widget.TextInputEditText
+        <EditText
           android:id="@+id/name"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
           android:hint="@string/labelConnectionHost"
           app:errorEnabled="true">
 
-          <android.support.design.widget.TextInputEditText
+          <EditText
             android:id="@+id/host"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
           android:hint="@string/labelConnectionPort"
           app:errorEnabled="true">
 
-          <android.support.design.widget.TextInputEditText
+          <EditText
             android:id="@+id/port"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -145,7 +145,7 @@
           android:layout_height="wrap_content"
           android:hint="@string/labelAccountUser">
 
-          <android.support.design.widget.TextInputEditText
+          <EditText
             android:id="@+id/user"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -157,9 +157,10 @@
           android:id="@+id/passWrapper"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:hint="@string/labelAccountPass">
+          android:hint="@string/labelAccountPass"
+          app:passwordToggleEnabled="true">
 
-          <android.support.design.widget.TextInputEditText
+          <EditText
             android:id="@+id/pass"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_name.xml b/app/src/main/res/layout/setup_account_name.xml
index 591099361b76cb3175f4103e944b9ce1295ed465..4de486fd0b252c76593f3724e3bed5c254b61cc1 100644
--- a/app/src/main/res/layout/setup_account_name.xml
+++ b/app/src/main/res/layout/setup_account_name.xml
@@ -12,7 +12,7 @@
     android:hint="@string/labelAccountName"
     app:errorEnabled="true">
 
-    <android.support.design.widget.TextInputEditText
+    <EditText
       android:id="@+id/name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_user.xml b/app/src/main/res/layout/setup_account_user.xml
index 4468f2c97765ce2638a7e3fa30af1144cd47ea9a..2dda6f38460d2546395648a1654424a0b91ecdf0 100644
--- a/app/src/main/res/layout/setup_account_user.xml
+++ b/app/src/main/res/layout/setup_account_user.xml
@@ -11,7 +11,7 @@
     android:layout_height="wrap_content"
     android:hint="@string/labelAccountUser">
 
-    <android.support.design.widget.TextInputEditText
+    <EditText
       android:id="@+id/user"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -23,9 +23,10 @@
     android:id="@+id/passWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:hint="@string/labelAccountPass">
+    android:hint="@string/labelAccountPass"
+    app:passwordToggleEnabled="true">
 
-    <android.support.design.widget.TextInputEditText
+    <EditText
       android:id="@+id/pass"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"