diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54bf586..87fe1e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ViewActivity"></activity>
+        <activity android:name=".GeneratorActivity"></activity>
+        <activity android:name=".ViewActivity" />
         <activity android:name=".PassphraseActivity" />
         <activity
             android:name=".CreateActivity"
diff --git a/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
index 8aa65e9..dacd5bc 100644
--- a/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
+++ b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
@@ -10,6 +10,8 @@ import android.os.Bundle
 import android.print.PrintAttributes
 import android.print.PrintJob
 import android.print.PrintManager
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
 import android.util.Base64
 import android.util.Log
 import android.view.ContextThemeWrapper
@@ -27,11 +29,12 @@ import com.google.zxing.integration.android.IntentResult
 import com.journeyapps.barcodescanner.BarcodeEncoder
 import dev.turingcomplete.kotlinonetimepassword.GoogleAuthenticator
 import kotlinx.android.synthetic.main.activity_create.*
-import kotlinx.android.synthetic.main.dialogpassphrase.*
 import kotlinx.android.synthetic.main.dialogpassphrase.view.*
 import kotlinx.coroutines.*
 import java.io.ByteArrayOutputStream
+import java.lang.IllegalArgumentException
 import java.util.*
+import kotlin.collections.ArrayList
 
 class CreateActivity : AppCompatActivity() {
     private var schema: QRSchema? = null
@@ -43,6 +46,8 @@ class CreateActivity : AppCompatActivity() {
 
     private var fa_uri: Uri? = null
 
+    private var known_passwords = ArrayList<String>()
+
     /**
      * Gets triggered when the user clicks on printing button (top left) and renders the paper to
      * print.
@@ -130,17 +135,7 @@ class CreateActivity : AppCompatActivity() {
     }
 
     fun passwordKnown(password: String): Boolean {
-        val known_passwords = String(this.resources.openRawResource(
-            this.resources.getIdentifier("passwordlist", "raw", this.packageName)
-        ).readBytes())
-
-        val known_passwords_array = runBlocking {
-            known_passwords.split("\n")
-        }
-
-        Log.i("Create Activity", "Size of passwords: ${known_passwords_array.size}")
-
-        return known_passwords_array.contains(password)
+        return this.known_passwords.contains(password)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -158,6 +153,15 @@ class CreateActivity : AppCompatActivity() {
 
         setSupportActionBar(findViewById(R.id.toolbar))
 
+        // Split word list in the background (this process can take a few seconds to complete)
+        GlobalScope.async {
+            val known_passwords_ = String(resources.openRawResource(
+                resources.getIdentifier("passwordlist", "raw", packageName)
+            ).readBytes())
+
+            known_passwords = known_passwords_.split("\n") as ArrayList<String>
+        }
+
         setContentView(R.layout.activity_create)
         back.setOnClickListener {
             Log.i("CREATE", "Back got clicked!")
@@ -186,6 +190,12 @@ class CreateActivity : AppCompatActivity() {
                         showError("Weak passphrase", "Passphrase has to be at least 8 characters long.")
                         return@OnClickListener
                     }
+                    if (passphrase != editTextLayout.passphrase2_input.text.toString()) {
+                        // Make a new alert, telling the user that his passphrase doesn't match the repeat field.
+                        dialogInterface.cancel()
+                        showError("Passphrase mismatch", "Both passphrases do not match.")
+                        return@OnClickListener
+                    }
 
                     // Check if password is found in our offline password list
                     if(passwordKnown(passphrase)) {
@@ -207,6 +217,16 @@ class CreateActivity : AppCompatActivity() {
 
 
         }
+        password_hide.setOnClickListener {
+            if (password_input.transformationMethod == HideReturnsTransformationMethod.getInstance()) {
+                password_input.transformationMethod = PasswordTransformationMethod.getInstance()
+                password_hide.setImageResource(R.drawable.ic_visibility_on)
+            } else {
+                password_input.transformationMethod = HideReturnsTransformationMethod.getInstance()
+                password_hide.setImageResource(R.drawable.ic_visibility_off)
+
+            }
+        }
 
         fa_input.isFocusable = false
 
@@ -242,6 +262,12 @@ class CreateActivity : AppCompatActivity() {
             if (result.contents.startsWith("otpauth://totp/")) {
                 fa_progress.visibility = View.VISIBLE
                 fa_uri = Uri.parse(result.contents)
+
+                if (fa_uri?.getQueryParameter("secret").toString() == "" || fa_uri?.getQueryParameter("secret") == null) {
+                    showError("Corrupt 2FA", "The scanned 2FA secret doesn't contain a secret!")
+                    return
+                }
+
                 val fa_generator = GoogleAuthenticator(base32secret = fa_uri?.getQueryParameter("secret").toString())
                 this.schema!!.custom.put("2fa", fa_uri?.getQueryParameter("secret").toString())
 
@@ -253,7 +279,12 @@ class CreateActivity : AppCompatActivity() {
                 // TODO: There is a bug. When the user changes his current app, this coroutine stops.
                 fa_coroutine = GlobalScope.launch(Dispatchers.Main) {
                     while (true) {
-                        fa_input.setText(fa_generator.generate())
+                        try {
+                            fa_input.setText(fa_generator.generate())
+                        } catch (error: IllegalArgumentException) {
+                            showError("Corrupt 2FA", "The scanned 2FA secret is corrupt and therefore no codes can be generated.")
+                            return@launch
+                        }
 
                         var seconds_remaining = CryptoOperations().getRemainingTOTPTime()
                         Log.i("2FA Generator", "Remaining: $seconds_remaining")
@@ -275,6 +306,8 @@ class CreateActivity : AppCompatActivity() {
                 }
 
                 fa_label.text = "${fa_uri?.path?.replace("/", "")} (${fa_uri?.getQueryParameter("issuer")})"
+            } else {
+                showError("No 2FA", "The scanned QR-Code has the wrong format.")
             }
         }
     }
diff --git a/app/src/main/java/com/github/mondei1/offpass/GeneratorActivity.kt b/app/src/main/java/com/github/mondei1/offpass/GeneratorActivity.kt
new file mode 100644
index 0000000..777b106
--- /dev/null
+++ b/app/src/main/java/com/github/mondei1/offpass/GeneratorActivity.kt
@@ -0,0 +1,11 @@
+package com.github.mondei1.offpass
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class GeneratorActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_generator)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/mondei1/offpass/PassphraseActivity.kt b/app/src/main/java/com/github/mondei1/offpass/PassphraseActivity.kt
index 4c8e093..99ceb95 100644
--- a/app/src/main/java/com/github/mondei1/offpass/PassphraseActivity.kt
+++ b/app/src/main/java/com/github/mondei1/offpass/PassphraseActivity.kt
@@ -4,9 +4,12 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.text.Editable
+import android.view.View
 import kotlinx.android.synthetic.main.activity_passphrase.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.runBlocking
+import javax.crypto.BadPaddingException
+import kotlin.reflect.typeOf
 
 class PassphraseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -22,10 +25,21 @@ class PassphraseActivity : AppCompatActivity() {
 
         decrypt_button.setOnClickListener {
             decrypt_button.text = "Decrypting ..."
+            var _continue = true;
+
             runBlocking {
-                qrSchema.decrypt(raw, passphrase_input.text.toString())
+                try {
+                    qrSchema.decrypt(raw, passphrase_input.text.toString())
+                } catch (err: BadPaddingException) {
+                    failed.visibility = View.VISIBLE
+                    decrypt_button.text = "Decrypt"
+                    _continue = false
+                    return@runBlocking
+                }
             }
 
+            if(!_continue) return@setOnClickListener
+
             val intent: Intent = Intent(this, ViewActivity::class.java)
             intent.putExtra("decrypted_raw",qrSchema.decrypted_raw)
             startActivity(intent)
diff --git a/app/src/main/java/com/github/mondei1/offpass/ViewActivity.kt b/app/src/main/java/com/github/mondei1/offpass/ViewActivity.kt
index 9764dc7..1a8d969 100644
--- a/app/src/main/java/com/github/mondei1/offpass/ViewActivity.kt
+++ b/app/src/main/java/com/github/mondei1/offpass/ViewActivity.kt
@@ -8,21 +8,33 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
 import android.util.Log
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import dev.turingcomplete.kotlinonetimepassword.GoogleAuthenticator
+import kotlinx.android.synthetic.main.activity_create.*
 import kotlinx.android.synthetic.main.activity_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.android.synthetic.main.activity_view.back
+import kotlinx.android.synthetic.main.activity_view.email_input
+import kotlinx.android.synthetic.main.activity_view.fa_input
+import kotlinx.android.synthetic.main.activity_view.fa_label
+import kotlinx.android.synthetic.main.activity_view.fa_progress
+import kotlinx.android.synthetic.main.activity_view.password_hide
+import kotlinx.android.synthetic.main.activity_view.password_input
+import kotlinx.android.synthetic.main.activity_view.title_label
+import kotlinx.android.synthetic.main.activity_view.url_input
+import kotlinx.android.synthetic.main.activity_view.username_input
+import kotlinx.coroutines.*
 
 
 class ViewActivity : AppCompatActivity() {
 
+    var fa_coroutine: Job? = null
+
     override fun onBackPressed() {
         val i = Intent(this, MainActivity::class.java)
         i.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
@@ -46,13 +58,25 @@ class ViewActivity : AppCompatActivity() {
             i.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
             startActivity(i)
         }
+        password_hide.setOnClickListener {
+            if (password_input.transformationMethod == HideReturnsTransformationMethod.getInstance()) {
+                password_input.transformationMethod = PasswordTransformationMethod.getInstance()
+                password_input.text = "123456"
+                password_hide.setImageResource(R.drawable.ic_visibility_on)
+            } else {
+                password_input.transformationMethod = HideReturnsTransformationMethod.getInstance()
+                password_input.text = qrSchema.password
+                password_hide.setImageResource(R.drawable.ic_visibility_off)
+
+            }
+        }
 
         qrSchema.decrypted_raw = intent.getStringExtra("decrypted_raw")!!
         qrSchema.parse(this)
 
         title_label.text = qrSchema.title
         username_input.setText(qrSchema.username, TextView.BufferType.EDITABLE)
-        password_input.setText(qrSchema.password, TextView.BufferType.EDITABLE)
+        password_input.setText("123456", TextView.BufferType.EDITABLE)
         email_input.setText(qrSchema.email, TextView.BufferType.EDITABLE)
         url_input.setText(qrSchema.website_url, TextView.BufferType.EDITABLE)
 
@@ -62,7 +86,7 @@ class ViewActivity : AppCompatActivity() {
             fa_label.text = "${fa_uri.path?.replace("/", "")} (${fa_uri.getQueryParameter("issuer")})"
             fa_progress.visibility = View.VISIBLE
 
-            GlobalScope.launch(Dispatchers.Main) {
+            fa_coroutine = GlobalScope.launch(Dispatchers.Main) {
                 while (true) {
                     fa_input.setText(fa_generator.generate())
 
@@ -88,4 +112,9 @@ class ViewActivity : AppCompatActivity() {
             fa_layout.visibility = View.GONE
         }
     }
+
+    override fun onStop() {
+        super.onStop()
+        fa_coroutine?.cancel(CancellationException("Activity is stopping"))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png
deleted file mode 100644
index da6e6ab..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png
deleted file mode 100644
index f9b5c4a..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png
deleted file mode 100644
index 81fd4b8..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_arrow_forward_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png
deleted file mode 100644
index eb33d5e..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_settings_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png
deleted file mode 100644
index 9059e00..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_settings_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png
deleted file mode 100644
index 45d855b..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_settings_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_18.png b/app/src/main/res/drawable-hdpi/baseline_shuffle_black_18.png
deleted file mode 100644
index b4f76ac..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_24.png b/app/src/main/res/drawable-hdpi/baseline_shuffle_black_24.png
deleted file mode 100644
index a4d8bee..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_36.png b/app/src/main/res/drawable-hdpi/baseline_shuffle_black_36.png
deleted file mode 100644
index d7482b1..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_48.png b/app/src/main/res/drawable-hdpi/baseline_shuffle_black_48.png
deleted file mode 100644
index 7201645..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_shuffle_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_visibility_black_18.png b/app/src/main/res/drawable-hdpi/baseline_visibility_black_18.png
deleted file mode 100644
index 091cabb..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_visibility_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_visibility_black_24.png b/app/src/main/res/drawable-hdpi/baseline_visibility_black_24.png
deleted file mode 100644
index 133618c..0000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_visibility_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_autorenew.png b/app/src/main/res/drawable-hdpi/ic_autorenew.png
new file mode 100644
index 0000000..c1ac86d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_autorenew.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_off.png b/app/src/main/res/drawable-hdpi/ic_visibility_off.png
new file mode 100644
index 0000000..e00b8be
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_visibility_off.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_on.png b/app/src/main/res/drawable-hdpi/ic_visibility_on.png
new file mode 100644
index 0000000..f47ab13
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_visibility_on.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png
deleted file mode 100644
index 3d57108..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png
deleted file mode 100644
index 262c745..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png
deleted file mode 100644
index bf7d722..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_arrow_forward_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png
deleted file mode 100644
index a986dea..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_settings_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png
deleted file mode 100644
index 1198fc2..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_settings_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png
deleted file mode 100644
index 307389f..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_settings_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_18.png b/app/src/main/res/drawable-mdpi/baseline_shuffle_black_18.png
deleted file mode 100644
index 162c72a..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_24.png b/app/src/main/res/drawable-mdpi/baseline_shuffle_black_24.png
deleted file mode 100644
index bba5fa5..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_36.png b/app/src/main/res/drawable-mdpi/baseline_shuffle_black_36.png
deleted file mode 100644
index a4d8bee..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_48.png b/app/src/main/res/drawable-mdpi/baseline_shuffle_black_48.png
deleted file mode 100644
index 80498e4..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_shuffle_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_visibility_black_18.png b/app/src/main/res/drawable-mdpi/baseline_visibility_black_18.png
deleted file mode 100644
index ff070f4..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_visibility_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_visibility_black_24.png b/app/src/main/res/drawable-mdpi/baseline_visibility_black_24.png
deleted file mode 100644
index 05fc754..0000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_visibility_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_autorenew.png b/app/src/main/res/drawable-mdpi/ic_autorenew.png
new file mode 100644
index 0000000..10d1823
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_autorenew.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_off.png b/app/src/main/res/drawable-mdpi/ic_visibility_off.png
new file mode 100644
index 0000000..84170a4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_visibility_off.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_on.png b/app/src/main/res/drawable-mdpi/ic_visibility_on.png
new file mode 100644
index 0000000..300e505
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_visibility_on.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png
deleted file mode 100644
index f9b5c4a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png
deleted file mode 100644
index bf7d722..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png
deleted file mode 100644
index 3746a8a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_arrow_forward_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png
deleted file mode 100644
index 9059e00..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_settings_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png
deleted file mode 100644
index 307389f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_settings_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png
deleted file mode 100644
index 46180dd..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_settings_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_18.png
deleted file mode 100644
index a4d8bee..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_24.png
deleted file mode 100644
index 80498e4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_36.png
deleted file mode 100644
index 7201645..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_48.png
deleted file mode 100644
index 5d6dc3f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_shuffle_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_visibility_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_visibility_black_18.png
deleted file mode 100644
index 133618c..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_visibility_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_visibility_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_visibility_black_24.png
deleted file mode 100644
index a71ac92..0000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_visibility_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_autorenew.png b/app/src/main/res/drawable-xhdpi/ic_autorenew.png
new file mode 100644
index 0000000..31642b6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_autorenew.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_off.png b/app/src/main/res/drawable-xhdpi/ic_visibility_off.png
new file mode 100644
index 0000000..0bd2cad
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_visibility_off.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_on.png b/app/src/main/res/drawable-xhdpi/ic_visibility_on.png
new file mode 100644
index 0000000..26b003b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_visibility_on.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png
deleted file mode 100644
index ddd2a58..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png
deleted file mode 100644
index 81fd4b8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png
deleted file mode 100644
index e9dfb3a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_arrow_forward_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png
deleted file mode 100644
index e230df7..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png
deleted file mode 100644
index 45d855b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png
deleted file mode 100644
index 76458c8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_settings_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_18.png
deleted file mode 100644
index d7482b1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_24.png
deleted file mode 100644
index 7201645..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_36.png
deleted file mode 100644
index f2f293e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_48.png
deleted file mode 100644
index c615683..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_shuffle_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_18.png
deleted file mode 100644
index 2687675..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_24.png
deleted file mode 100644
index 976001e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_visibility_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_autorenew.png b/app/src/main/res/drawable-xxhdpi/ic_autorenew.png
new file mode 100644
index 0000000..1a1d7b5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_autorenew.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_off.png b/app/src/main/res/drawable-xxhdpi/ic_visibility_off.png
new file mode 100644
index 0000000..5a9e13f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_visibility_off.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_on.png b/app/src/main/res/drawable-xxhdpi/ic_visibility_on.png
new file mode 100644
index 0000000..76daacd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_visibility_on.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png
deleted file mode 100644
index 81fd4b8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png
deleted file mode 100644
index 3746a8a..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png
deleted file mode 100644
index 8e0c787..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_arrow_forward_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png
deleted file mode 100644
index 45d855b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png
deleted file mode 100644
index 46180dd..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png
deleted file mode 100644
index 43aaed2..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_settings_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_18.png
deleted file mode 100644
index 7201645..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_24.png
deleted file mode 100644
index 5d6dc3f..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_36.png
deleted file mode 100644
index c615683..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_48.png
deleted file mode 100644
index fe55185..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_shuffle_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_18.png
deleted file mode 100644
index 976001e..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_24.png
deleted file mode 100644
index 8c736c7..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_36.png
deleted file mode 100644
index 874638e..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_48.png
deleted file mode 100644
index 1286445..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_visibility_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_autorenew.png b/app/src/main/res/drawable-xxxhdpi/ic_autorenew.png
new file mode 100644
index 0000000..f3ec977
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_autorenew.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility_off.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility_off.png
new file mode 100644
index 0000000..5356400
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_visibility_off.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility_on.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility_on.png
new file mode 100644
index 0000000..ffc08b4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_visibility_on.png differ
diff --git a/app/src/main/res/drawable/baseline_arrow_forward_24.xml b/app/src/main/res/drawable/baseline_arrow_forward_24.xml
deleted file mode 100644
index 702e70c..0000000
--- a/app/src/main/res/drawable/baseline_arrow_forward_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_shuffle_24.xml b/app/src/main/res/drawable/baseline_shuffle_24.xml
deleted file mode 100644
index 2469a90..0000000
--- a/app/src/main/res/drawable/baseline_shuffle_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_visibility_24.xml b/app/src/main/res/drawable/baseline_visibility_24.xml
deleted file mode 100644
index 1618495..0000000
--- a/app/src/main/res/drawable/baseline_visibility_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@color/colorPrimaryDark">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
deleted file mode 100644
index 3bc9706..0000000
--- a/app/src/main/res/drawable/ic_logo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="19.05"
-    android:viewportHeight="19.05">
-    <path
-        android:pathData="m1.2288,1.2308v0.2853,0.2853 0.2853,0.2853 0.2853,0.2853 0.2853h0.2853,0.2853 0.2853,0.2853 0.2853,0.2853 0.2853L3.2257,2.9424 3.2257,2.6571 3.2257,2.3718 3.2257,2.0866 3.2257,1.8013 3.2257,1.516 3.2257,1.2308L2.9404,1.2308 2.6551,1.2308 2.3699,1.2308 2.0846,1.2308 1.7993,1.2308 1.514,1.2308ZM3.5109,1.2308L3.5109,1.516 3.5109,1.8013L3.7962,1.8013L3.7962,1.516L4.0815,1.516L4.0815,1.2308L3.7962,1.2308ZM4.0815,1.516L4.0815,1.8013L4.3667,1.8013L4.3667,1.516ZM4.3667,1.8013L4.3667,2.0866L4.652,2.0866 4.9373,2.0866L4.9373,1.8013 4.9373,1.516 4.9373,1.2308L4.652,1.2308v0.2853,0.2853zM4.3667,2.0866L4.0815,2.0866 3.7962,2.0866 3.5109,2.0866L3.5109,2.3718L3.7962,2.3718 4.0815,2.3718L4.0815,2.6571L3.7962,2.6571v0.2853L4.0815,2.9424L4.0815,3.2276L4.3667,3.2276L4.3667,2.9424L4.652,2.9424L4.652,3.2276L4.3667,3.2276L4.3667,3.5129L4.0815,3.5129v0.2853L4.3667,3.7982 4.652,3.7982L4.652,4.0834L4.9373,4.0834L4.9373,3.7982 4.9373,3.5129 4.9373,3.2276 4.9373,2.9424 4.9373,2.6571L4.652,2.6571L4.652,2.3718L4.3667,2.3718ZM4.652,4.0834L4.3667,4.0834L4.3667,4.3687L4.0815,4.3687L4.0815,4.654 4.0815,4.9392L4.3667,4.9392L4.3667,5.2245 4.3667,5.5098L4.0815,5.5098 3.7962,5.5098L3.7962,5.2245L4.0815,5.2245L4.0815,4.9392L3.7962,4.9392L3.7962,4.654 3.7962,4.3687L3.5109,4.3687L3.5109,4.0834L3.7962,4.0834L3.7962,4.3687L4.0815,4.3687L4.0815,4.0834 4.0815,3.7982L3.7962,3.7982 3.5109,3.7982L3.5109,3.5129L3.2257,3.5129 2.9404,3.5129 2.6551,3.5129v0.2853L2.3699,3.7982L2.3699,4.0834L2.0846,4.0834L2.0846,3.7982h0.2853L2.3699,3.5129L2.0846,3.5129 1.7993,3.5129v0.2853L1.514,3.7982v0.2853,0.2853 0.2853L1.7993,4.654v-0.2853h0.2853,0.2853 0.2853L2.6551,4.0834h0.2853L2.9404,3.7982L3.2257,3.7982L3.2257,4.0834L2.9404,4.0834v0.2853h0.2853v0.2853L2.9404,4.654L2.9404,4.9392L3.2257,4.9392 3.5109,4.9392L3.5109,5.2245 3.5109,5.5098 3.5109,5.795h0.2853v0.2853h0.2853,0.2853 0.2853v0.2853L4.3667,6.3656 4.0815,6.3656 3.7962,6.3656L3.7962,6.0803L3.5109,6.0803v0.2853,0.2853L3.7962,6.6508L3.7962,6.9361L3.5109,6.9361L3.5109,7.2214L3.7962,7.2214 4.0815,7.2214L4.0815,6.9361h0.2853v0.2853h0.2853,0.2853 0.2853,0.2853L5.5078,6.9361h0.2853v0.2853h0.2853,0.2853 0.2853L6.6489,6.9361L6.3636,6.9361 6.0783,6.9361L6.0783,6.6508L5.7931,6.6508L5.7931,6.3656L5.5078,6.3656L5.5078,6.6508L5.2225,6.6508 4.9373,6.6508L4.9373,6.9361L4.652,6.9361L4.652,6.6508L4.9373,6.6508L4.9373,6.3656 4.9373,6.0803 4.9373,5.795L5.2225,5.795L5.2225,5.5098L4.9373,5.5098 4.652,5.5098L4.652,5.2245L4.9373,5.2245L4.9373,4.9392 4.9373,4.654 4.9373,4.3687L4.652,4.3687ZM5.5078,6.3656v-0.2853h-0.2853v0.2853zM6.0783,6.6508h0.2853,0.2853L6.6489,6.3656L6.3636,6.3656 6.0783,6.3656ZM6.6489,6.3656L6.9341,6.3656L6.9341,6.0803 6.9341,5.795 6.9341,5.5098 6.9341,5.2245L6.6489,5.2245 6.3636,5.2245 6.0783,5.2245L6.0783,4.9392L5.7931,4.9392L5.7931,5.2245L5.5078,5.2245L5.5078,5.5098 5.5078,5.795h0.2853L5.7931,5.5098L6.0783,5.5098L6.0783,5.795 6.0783,6.0803h0.2853,0.2853zM5.7931,4.9392L5.7931,4.654L5.5078,4.654 5.2225,4.654L5.2225,4.9392h0.2853zM6.0783,4.9392h0.2853L6.3636,4.654 6.3636,4.3687 6.3636,4.0834h0.2853v0.2853h0.2853v0.2853L7.2194,4.654L7.2194,4.3687 7.2194,4.0834L6.9341,4.0834L6.9341,3.7982L7.2194,3.7982L7.2194,3.5129L6.9341,3.5129 6.6489,3.5129v0.2853L6.3636,3.7982v-0.2853h-0.2853v0.2853L5.7931,3.7982v0.2853h0.2853v0.2853,0.2853zM5.7931,4.0834h-0.2853v0.2853h0.2853zM6.9341,4.654L6.6489,4.654L6.6489,4.9392h0.2853zM2.9404,4.654v-0.2853h-0.2853v0.2853zM2.6551,4.654L2.3699,4.654 2.0846,4.654 1.7993,4.654L1.7993,4.9392h0.2853,0.2853 0.2853zM1.514,4.654L1.2288,4.654L1.2288,4.9392h0.2853zM1.514,3.7982v-0.2853h-0.2853v0.2853zM3.5109,3.5129L3.7962,3.5129L3.7962,3.2276 3.7962,2.9424L3.5109,2.9424L3.5109,3.2276ZM5.2225,1.2308v0.2853,0.2853 0.2853,0.2853 0.2853,0.2853 0.2853h0.2853,0.2853 0.2853,0.2853 0.2853,0.2853 0.2853L7.2194,2.9424 7.2194,2.6571 7.2194,2.3718 7.2194,2.0866 7.2194,1.8013 7.2194,1.516 7.2194,1.2308L6.9341,1.2308 6.6489,1.2308 6.3636,1.2308 6.0783,1.2308 5.7931,1.2308 5.5078,1.2308ZM1.514,1.516h0.2853,0.2853 0.2853,0.2853 0.2853v0.2853,0.2853 0.2853,0.2853 0.2853L2.6551,2.9424 2.3699,2.9424 2.0846,2.9424 1.7993,2.9424 1.514,2.9424L1.514,2.6571 1.514,2.3718 1.514,2.0866 1.514,1.8013ZM5.5078,1.516h0.2853,0.2853 0.2853,0.2853 0.2853v0.2853,0.2853 0.2853,0.2853 0.2853L6.6489,2.9424 6.3636,2.9424 6.0783,2.9424 5.7931,2.9424 5.5078,2.9424L5.5078,2.6571 5.5078,2.3718 5.5078,2.0866 5.5078,1.8013ZM1.7993,1.8013v0.2853,0.2853 0.2853h0.2853,0.2853 0.2853L2.6551,2.3718 2.6551,2.0866 2.6551,1.8013L2.3699,1.8013 2.0846,1.8013ZM5.7931,1.8013v0.2853,0.2853 0.2853h0.2853,0.2853 0.2853L6.6489,2.3718 6.6489,2.0866 6.6489,1.8013L6.3636,1.8013 6.0783,1.8013ZM5.2225,3.5129v0.2853h0.2853L5.5078,3.5129ZM1.2288,5.2245L1.2288,5.5098 1.2288,5.795 1.2288,6.0803 1.2288,6.3656 1.2288,6.6508 1.2288,6.9361 1.2288,7.2214h0.2853,0.2853 0.2853,0.2853 0.2853,0.2853 0.2853L3.2257,6.9361 3.2257,6.6508 3.2257,6.3656 3.2257,6.0803 3.2257,5.795 3.2257,5.5098 3.2257,5.2245L2.9404,5.2245 2.6551,5.2245 2.3699,5.2245 2.0846,5.2245 1.7993,5.2245 1.514,5.2245ZM1.514,5.5098h0.2853,0.2853 0.2853,0.2853 0.2853L2.9404,5.795 2.9404,6.0803 2.9404,6.3656 2.9404,6.6508 2.9404,6.9361L2.6551,6.9361 2.3699,6.9361 2.0846,6.9361 1.7993,6.9361 1.514,6.9361L1.514,6.6508 1.514,6.3656 1.514,6.0803 1.514,5.795ZM1.7993,5.795v0.2853,0.2853 0.2853h0.2853,0.2853 0.2853L2.6551,6.3656 2.6551,6.0803 2.6551,5.795L2.3699,5.795 2.0846,5.795ZM6.9341,6.6508L6.9341,6.9361L7.2194,6.9361L7.2194,6.6508Z"
-        android:strokeWidth="0.0178293"
-        android:fillColor="#000000"
-        android:strokeColor="#00000000" />
-    <path
-        android:pathData="M3.6994,3.5927C4.4484,2.9719 15.9727,3.0773 15.9727,3.0773c0,0 1.8604,11.9575 0,12.8955 -1.8375,0.9264 -11.3485,1.3806 -12.8955,0C1.5303,14.5922 2.6453,4.4664 3.6994,3.5927Z"
-        android:strokeLineJoin="bevel"
-        android:strokeWidth="0.2"
-        android:fillColor="#ffd5d5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="m6.3542,12.2299c-0.4057,0 -0.7739,-0.0776 -1.1045,-0.2329C4.9191,11.8417 4.6361,11.6389 4.4007,11.3884 4.1652,11.1329 3.9824,10.8424 3.8522,10.5168 3.7219,10.1912 3.6568,9.8556 3.6568,9.51c0,-0.3506 0.0676,-0.6888 0.2029,-1.0144C3.9949,8.17 4.1828,7.8845 4.4232,7.6391 4.6686,7.3886 4.9567,7.1907 5.2873,7.0455 5.6229,6.8952 5.9886,6.8201 6.3843,6.8201c0.4057,0 0.7739,0.0776 1.1045,0.2329 0.3306,0.1553 0.6136,0.3607 0.849,0.6161 0.2354,0.2555 0.4158,0.546 0.541,0.8716 0.1302,0.3256 0.1954,0.6587 0.1954,0.9993 0,0.3506 -0.0676,0.6888 -0.2029,1.0144C8.7361,10.875 8.5482,11.1605 8.3078,11.4109 8.0673,11.6564 7.7793,11.8542 7.4437,12.0045 7.1131,12.1548 6.7499,12.2299 6.3542,12.2299ZM5.1445,9.525c0,0.1803 0.025,0.3556 0.0751,0.526 0.0501,0.1653 0.1252,0.3131 0.2254,0.4433 0.1002,0.1302 0.2254,0.2354 0.3757,0.3156 0.1553,0.0802 0.3501,-0.2312 0.5485,-0.2312 0.1984,0 0.3932,0.3114 0.5485,0.2312 0.1553,-0.0852 0.2805,-0.1929 0.3757,-0.3231 0.1002,-0.1352 0.1728,-0.288 0.2179,-0.4583 0.0501,-0.1703 0.0751,-0.3431 0.0751,-0.5184 0,-0.1803 -0.025,-0.3531 -0.0751,-0.5184C7.4612,8.8212 7.3836,8.6734 7.2784,8.5482 7.1782,8.418 7.0505,8.3153 6.8952,8.2402 6.7449,8.16 6.5671,8.1199 6.3617,8.1199c-0.2104,0 -0.3932,0.0401 -0.5485,0.1202C5.663,8.3203 5.5377,8.428 5.4375,8.5632 5.3374,8.6935 5.2622,8.8438 5.2121,9.0141 5.1671,9.1794 5.1445,9.3497 5.1445,9.525Z"
-        android:strokeWidth="0.187842"
-        android:fillColor="#1c1c1c" />
-    <path
-        android:pathData="m10.2463,6.125c0.7203,2.2339 -0.6031,4.57 0,6.7999 -0.6997,-0.299 -0.6225,-6.7999 0,-6.7999z"
-        android:strokeWidth="0.187842"
-        android:fillColor="#ff2a2a" />
-    <path
-        android:pathData="M11.5537,12.1924L11.5537,6.8576h2.2241c0.2354,0 0.4508,0.0501 0.6462,0.1503 0.2004,0.0952 0.3707,0.2254 0.5109,0.3907 0.1453,0.1603 0.258,0.3431 0.3381,0.5485 0.0802,0.2004 0.1202,0.4057 0.1202,0.6161 0,0.2204 -0.0376,0.4333 -0.1127,0.6387 -0.0751,0.2054 -0.1828,0.3882 -0.3231,0.5485 -0.1352,0.1603 -0.3005,0.288 -0.4959,0.3832 -0.1903,0.0952 -0.4032,0.1428 -0.6387,0.1428L12.2299,10.5157v1.6767zM12.9129,9.6753h0.8724c0.1403,0 0.2655,-0.0276 0.3757,-0.0827 0.1152,-0.0601 0.2129,-0.1403 0.293,-0.2404 0.0802,-0.1052 0.1428,-0.2254 0.1878,-0.3607 0.0451,-0.1352 0.0676,-0.278 0.0676,-0.4283 0,-0.1553 -0.0276,-0.3005 -0.0826,-0.4358C14.5767,7.9922 14.5066,7.8745 14.4164,7.7743 14.3313,7.6741 14.2286,7.5965 14.1084,7.5414 13.9931,7.4863 13.8704,7.4587 13.7402,7.4587L12.2299,7.4587Z"
-        android:strokeWidth="0.187842"
-        android:fillColor="#1c1c1c" />
-</vector>
diff --git a/app/src/main/res/drawable/main_background.png b/app/src/main/res/drawable/main_background.png
deleted file mode 100644
index cc469fb..0000000
Binary files a/app/src/main/res/drawable/main_background.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_create.xml b/app/src/main/res/layout/activity_create.xml
index be6d949..e3eb523 100644
--- a/app/src/main/res/layout/activity_create.xml
+++ b/app/src/main/res/layout/activity_create.xml
@@ -131,13 +131,13 @@
 
             <EditText
                 android:id="@+id/password_input"
-                android:layout_width="288dp"
-                android:layout_height="68dp"
+                android:layout_width="263dp"
+                android:layout_height="67dp"
                 android:layout_marginStart="16dp"
                 android:background="@color/colorPrimary"
                 android:ems="10"
                 android:fontFamily="sans-serif-black"
-                android:hint="You shouldn't see that"
+                android:hint="Secure password"
                 android:inputType="textPassword"
                 android:singleLine="true"
                 android:textSize="28sp"
@@ -235,19 +235,21 @@
                 app:layout_constraintStart_toEndOf="@+id/password_input"
                 app:layout_constraintTop_toTopOf="@+id/password_input"
                 app:layout_constraintVertical_bias="0.48000002"
-                app:srcCompat="@drawable/baseline_visibility_black_36" />
+                app:srcCompat="@drawable/ic_visibility_on" />
 
             <ImageButton
                 android:id="@+id/password_random"
-                android:layout_width="31dp"
-                android:layout_height="38dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
+                android:layout_marginEnd="15dp"
                 android:background="@color/colorPrimary"
                 android:tint="#000000"
                 app:layout_constraintBottom_toBottomOf="@+id/password_input"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/password_hide"
                 app:layout_constraintTop_toTopOf="@+id/password_input"
-                app:srcCompat="@drawable/baseline_sd_storage_24" />
+                app:srcCompat="@drawable/ic_autorenew" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_generator.xml b/app/src/main/res/layout/activity_generator.xml
new file mode 100644
index 0000000..2fb6fd1
--- /dev/null
+++ b/app/src/main/res/layout/activity_generator.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".GeneratorActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_passphrase.xml b/app/src/main/res/layout/activity_passphrase.xml
index eca670a..c3df356 100644
--- a/app/src/main/res/layout/activity_passphrase.xml
+++ b/app/src/main/res/layout/activity_passphrase.xml
@@ -9,8 +9,8 @@
 
     <EditText
         android:id="@+id/passphrase_input"
-        android:layout_width="234dp"
-        android:layout_height="wrap_content"
+        android:layout_width="286dp"
+        android:layout_height="61dp"
         android:layout_marginStart="88dp"
         android:layout_marginEnd="89dp"
         android:backgroundTint="#757575"
@@ -27,8 +27,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.513" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/decrypt_button"
@@ -36,7 +35,7 @@
         android:layout_width="152dp"
         android:layout_height="59dp"
         android:layout_marginStart="161dp"
-        android:layout_marginTop="72dp"
+        android:layout_marginTop="48dp"
         android:layout_marginEnd="162dp"
         android:background="#00FFFFFF"
         android:backgroundTint="#001C1C1C"
@@ -45,6 +44,7 @@
         android:textColor="@color/colorPrimary"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.484"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/passphrase_input" />
 
@@ -62,4 +62,20 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/failed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="180dp"
+        android:layout_marginEnd="180dp"
+        android:layout_marginBottom="40dp"
+        android:fontFamily="sans-serif-black"
+        android:text="Wrong Passphrase"
+        android:textColor="#E53935"
+        android:textSize="18sp"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@+id/passphrase_input"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view.xml b/app/src/main/res/layout/activity_view.xml
index a0a6ab5..33dce6d 100644
--- a/app/src/main/res/layout/activity_view.xml
+++ b/app/src/main/res/layout/activity_view.xml
@@ -100,11 +100,12 @@
                 android:layout_height="68dp"
                 android:layout_marginStart="16dp"
                 android:background="@color/colorPrimary"
-                android:ems="10"
                 android:fontFamily="sans-serif-black"
+                android:gravity="center_vertical"
                 android:inputType="textPassword"
                 android:singleLine="true"
-                android:textSize="28sp"
+                android:textColor="@color/colorPrimaryDark"
+                android:textSize="42sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/password_label" />
 
@@ -162,13 +163,13 @@
                 android:id="@+id/password_hide"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="60dp"
+                android:layout_marginStart="28dp"
                 android:background="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="@+id/password_input"
                 app:layout_constraintStart_toEndOf="@+id/password_input"
                 app:layout_constraintTop_toTopOf="@+id/password_input"
-                app:layout_constraintVertical_bias="0.437"
-                app:srcCompat="@drawable/baseline_visibility_black_36" />
+                app:layout_constraintVertical_bias="0.45"
+                app:srcCompat="@drawable/ic_visibility_on" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/create_bar.xml b/app/src/main/res/layout/create_bar.xml
deleted file mode 100644
index 753d49c..0000000
--- a/app/src/main/res/layout/create_bar.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/colorPrimaryDark"
-    app:title="Create">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/back"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="47dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="6dp"
-            android:drawableTop="@drawable/baseline_arrow_forward_white_36"
-            android:text=""
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/settings"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="56dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="52dp"
-            android:drawableTop="@drawable/baseline_settings_white_36"
-            android:scaleX="1"
-            android:scaleY="1"
-            android:text=""
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/settings2"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="56dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="108dp"
-            android:drawableTop="@drawable/baseline_sd_storage_24"
-            android:scaleX="1"
-            android:scaleY="1"
-            android:text=""
-            android:textColor="#000000"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/print_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="Create"
-            android:textColor="@color/colorPrimary"
-            android:textSize="24sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialogpassphrase.xml b/app/src/main/res/layout/dialogpassphrase.xml
index 9c6db1d..69754b0 100644
--- a/app/src/main/res/layout/dialogpassphrase.xml
+++ b/app/src/main/res/layout/dialogpassphrase.xml
@@ -11,11 +11,22 @@
         android:id="@+id/passphrase_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:inputType="textPassword"
         android:backgroundTint="@color/colorPrimary"
         android:textColorHint="@color/colorPrimary"
         android:textColor="@color/colorPrimary"
         android:hint="Enter passphrase"/>
 
+    <EditText
+        android:id="@+id/passphrase2_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"
+        android:backgroundTint="@color/colorPrimary"
+        android:textColorHint="@color/colorPrimary"
+        android:textColor="@color/colorPrimary"
+        android:hint="Repeat passphrase"/>
+
     <EditText
         android:id="@+id/hint_input"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-round/strings.xml b/app/src/main/res/values-round/strings.xml
index d74c66c..73862c4 100644
--- a/app/src/main/res/values-round/strings.xml
+++ b/app/src/main/res/values-round/strings.xml
@@ -1,3 +1 @@
-<resources>
-    <string name="hello_world">Hello Round World!</string>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1a7ba4a..49f8c35 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,12 +4,10 @@
     Because the window insets on round devices are larger than 15dp, this padding only applies
     to square screens.
     -->
-    <dimen name="box_inset_layout_padding">0dp</dimen>
 
     <!--
     This padding applies to both square and round screens. The total padding between the buttons
     and the window insets is box_inset_layout_padding (above variable) on square screens and
     inner_frame_layout_padding (below variable) on round screens.
     -->
-    <dimen name="inner_frame_layout_padding">5dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50d1f05..7f25e23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
 <resources>
     <string name="app_name">OffPass</string>
-    <string name="qr_schema_support">1</string>
-    <string name="title_activity_create">CreateActivity</string>
     <!--
     This string is used for square devices and overridden by hello_world in
     values-round/strings.xml for round devices.