diff --git a/app/src/main/java/me/impy/aegis/ui/IntroActivity.java b/app/src/main/java/me/impy/aegis/ui/IntroActivity.java
index 81d81645..877d1234 100644
--- a/app/src/main/java/me/impy/aegis/ui/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/IntroActivity.java
@@ -58,7 +58,9 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
+        setWizardMode(true);
         showSkipButton(false);
+        pager.setPagingEnabled(false);
         //showPagerIndicator(false);
         setGoBackLock(true);
 
@@ -69,19 +71,6 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
         homeSliderPage.setBgColor(getResources().getColor(R.color.colorPrimary));
         addSlide(AppIntroFragment.newInstance(homeSliderPage));
 
-        SliderPage permSliderPage = new SliderPage();
-        permSliderPage.setTitle("Permissions");
-        permSliderPage.setDescription("Aegis needs permission to use your camera in order to scan QR codes. " +
-                "It also needs access to external storage to able to export the database.");
-        permSliderPage.setImageDrawable(R.drawable.intro_scanner);
-        permSliderPage.setBgColor(getResources().getColor(R.color.colorAccent));
-        addSlide(AppIntroFragment.newInstance(permSliderPage));
-        askForPermissions(new String[]{
-                Manifest.permission.CAMERA,
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-        }, 2);
-
         _authenticationSlide = new CustomAuthenticationSlide();
         _authenticationSlide.setBgColor(getResources().getColor(R.color.colorHeaderSuccess));
         addSlide(_authenticationSlide);
@@ -124,7 +113,7 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
             // skip to the last slide if no encryption will be used
             if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
                 // TODO: no magic indices
-                getPager().setCurrentItem(5);
+                getPager().setCurrentItem(4);
             }
         }
     }
diff --git a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java
index f3b8144d..b46f7421 100644
--- a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java
+++ b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java
@@ -8,8 +8,10 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.github.paolorotolo.appintro.ISlidePolicy;
@@ -23,6 +25,7 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy,
     public static final int CRYPT_TYPE_PASS = 2;
     public static final int CRYPT_TYPE_FINGER = 3;
 
+    private Spinner _authenticationSpinner;
     private RadioGroup _buttonGroup;
     private int _bgColor;
 
@@ -38,8 +41,8 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy,
         if (manager != null) {
             RadioButton button = view.findViewById(R.id.rb_fingerprint);
             TextView text = view.findViewById(R.id.text_rb_fingerprint);
-            button.setVisibility(View.VISIBLE);
-            text.setVisibility(View.VISIBLE);
+            button.setEnabled(false);
+            text.setEnabled(false);
         }
 
         view.findViewById(R.id.main).setBackgroundColor(_bgColor);
diff --git a/app/src/main/res/color/disabled_textview_colors.xml b/app/src/main/res/color/disabled_textview_colors.xml
new file mode 100644
index 00000000..adbd5b7e
--- /dev/null
+++ b/app/src/main/res/color/disabled_textview_colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_enabled="false"
+        android:color="#78efefef"
+        />
+    <item
+        android:state_enabled="true"
+        android:color="#efefef"
+        />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_id_card.xml b/app/src/main/res/drawable/ic_id_card.xml
new file mode 100644
index 00000000..724573e4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_id_card.xml
@@ -0,0 +1,23 @@
+<vector android:height="24dp" android:viewportHeight="501.551"
+    android:viewportWidth="501.551" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#F2F2F2" android:pathData="M480.7,124.3H20.9C9.4,124.3 0,133.7 0,145.2v335.4c0,11.5 9.4,20.9 20.9,20.9h459.8c11.5,0 20.9,-9.4 20.9,-20.9V145.2C501.6,133.7 492.1,124.3 480.7,124.3z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M312.4,151.5H189.1c-5.2,0 -9.4,4.2 -9.4,9.4s4.2,9.4 9.4,9.4h124.3c5.2,0 9.4,-4.2 9.4,-9.4C321.8,155.7 317.6,151.5 312.4,151.5z"/>
+    <path android:fillColor="#FF7058" android:pathData="M198.5,0h104.5v160.9h-104.5z"/>
+    <path android:fillColor="#84DBFF" android:pathData="M47,194.4h180.8v200.6h-180.8z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M277.9,252.9h176.6v24h-176.6z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M277.9,311.4h176.6v24h-176.6z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M277.9,370.9h176.6v24h-176.6z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M48.1,429.5h406.5v24h-406.5z"/>
+    <path android:fillColor="#F8B64C" android:pathData="M105.4,284a10.4,4.2 78.7,1 0,-4.1 -20.5a10.4,4.2 78.7,1 0,4.1 20.5z"/>
+    <path android:fillColor="#F8B64C" android:pathData="M175.8,275.1a10.4,4.2 101.3,1 0,-8.2 -1.6a10.4,4.2 101.3,1 0,8.2 1.6z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M224.7,395H50.2c0,0 3.1,-35.5 14.6,-52.2c0,0 0,0 1,0c7.3,-3.1 35.5,-13.6 49.1,-24l1,-6.3c0,0 5.2,11.5 17.8,12.5c1,0 2.1,0 4.2,0c1,0 3.1,0 4.2,0c12.5,-2.1 17.8,-12.5 17.8,-12.5l1,6.3c13.6,10.4 41.8,20.9 48.1,23c1,0 1,0 1,0C221.5,358.4 224.7,395 224.7,395z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M117,338.5l5.2,9.4l8.4,-12.5l-2.1,-2.1l-6.3,9.4l-7.3,-13.6C114.9,332.3 116,335.4 117,338.5z"/>
+    <path android:fillColor="#F8B64C" android:pathData="M158.8,312.4c0,0 -5.2,11.5 -17.8,12.5c-1,0 -2.1,0 -4.2,0c-1,0 -3.1,0 -4.2,0c-12.5,-2.1 -17.8,-12.5 -17.8,-12.5s0,-2.1 0,-4.2c0,-1 0,-2.1 0,-3.1c10.4,12.5 20.9,14.6 20.9,14.6s11.5,-2.1 20.9,-14.6c0,1 0,2.1 0,3.1C158.8,310.3 158.8,312.4 158.8,312.4z"/>
+    <path android:fillColor="#F7AF48" android:pathData="M158.8,308.2c-9.4,11.5 -19.9,12.5 -20.9,12.5l0,0l0,0c-1,0 -11.5,-2.1 -20.9,-12.5c0,-1 0,-2.1 0,-3.1c10.4,12.5 20.9,14.6 20.9,14.6s11.5,-2.1 20.9,-14.6C158.8,305.1 158.8,307.2 158.8,308.2z"/>
+    <path android:fillColor="#FFD15C" android:pathData="M173.5,264.4c0,2.1 -1,3.1 -1,3.1c-6.3,47 -35.5,51.2 -35.5,51.2s-29.3,-5.2 -35.5,-51.2c0,0 0,-1 -1,-3.1l0,0c-1,-11.5 -3.1,-47 35.5,-47C176.6,217.3 174.5,252.9 173.5,264.4z"/>
+    <path android:fillColor="#40596B" android:pathData="M137.9,382.4v11.5h58.5l13.6,-51.2l-1,-1c-7.3,-2.1 -35.5,-12.5 -49.1,-23l0,0c0,0 3.1,11.5 -7.3,33.4C152.6,352.1 143.2,369.9 137.9,382.4z"/>
+    <path android:fillColor="#CDD6E0" android:pathData="M157.8,338.5l-5.2,9.4l-8.4,-12.5l2.1,-2.1l6.3,9.4l7.3,-13.6C159.9,332.3 158.8,335.4 157.8,338.5z"/>
+    <path android:fillColor="#FF7058" android:pathData="M141.1,340.6l4.2,26.1c-3.1,5.2 -5.2,11.5 -8.4,16.7c-2.1,-5.2 -5.2,-11.5 -8.4,-16.7l4.2,-26.1l-5.2,-6.3l5.2,-8.4l0,0c1,0 2.1,0 4.2,0c1,0 3.1,0 4.2,0l0,0l5.2,8.4L141.1,340.6z"/>
+    <path android:fillColor="#334A5E" android:pathData="M143.2,395H78.4l-13.6,-51.2l1,-1c7.3,-3.1 35.5,-13.6 49.1,-24l0,0l0,0c0,0 -3.1,11.5 7.3,33.4c0,0 9.4,17.8 15.7,30.3C140,388.7 142.1,392.9 143.2,395z"/>
+    <path android:fillColor="#334A5E" android:pathData="M173.5,264.4l-1,1c0,0 -2.1,-18.8 -10.4,-31.3c0,0 -5.2,8.4 -24,8.4s-24,-8.4 -24,-8.4c-8.4,13.6 -10.4,31.3 -10.4,31.3l-1,-1l0,0c-1,-11.5 -3.1,-47 35.5,-47S174.5,252.9 173.5,264.4z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_authentication_slide.xml b/app/src/main/res/layout/fragment_authentication_slide.xml
index cae4dc7d..030c0f2e 100644
--- a/app/src/main/res/layout/fragment_authentication_slide.xml
+++ b/app/src/main/res/layout/fragment_authentication_slide.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -7,78 +8,94 @@
     android:padding="32dp">
 
     <TextView
-        android:text="@string/choose_authentication_method"
+        android:id="@+id/textView2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="24sp"
+        android:text="@string/choose_authentication_method"
+        android:textAlignment="center"
         android:textColor="@color/primary_text_inverted"
-        android:id="@+id/textView2" />
+        android:textSize="24sp"
+        android:layout_marginTop="30dp"
+        android:textStyle="bold" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:layout_marginBottom="100dp"
+        android:layout_marginTop="70dp"
+        app:srcCompat="@drawable/ic_id_card" />
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="200dp"
-        android:layout_marginTop="12dp">
+        android:layout_alignParentBottom="true"
+        android:layout_marginTop="12dp"
+        android:orientation="horizontal">
+
 
         <RadioGroup
-            android:layout_width="match_parent"
             android:id="@+id/rg_authenticationMethod"
+            android:layout_width="match_parent"
             android:layout_height="187dp">
 
             <RadioButton
+                android:id="@+id/rb_none"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:id="@+id/rb_none"
-                android:text="@string/authentication_method_none"/>
+                android:text="@string/authentication_method_none"
+                android:textSize="16sp" />
 
             <TextView
-                android:text="@string/authentication_method_none_description"
                 android:layout_width="match_parent"
-                android:textColor="@color/secondary_text_inverted"
-                android:layout_marginTop="-5dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
+                android:layout_marginTop="-5dp"
+                android:text="@string/authentication_method_none_description"
+                android:textColor="@color/secondary_text_inverted" />
+
+            <RadioButton
+                android:id="@+id/rb_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/authentication_method_password"
+                android:textSize="16sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="-5dp"
+                android:text="@string/authentication_method_password_description"
+                android:textColor="@color/secondary_text_inverted" />
+
+            <RadioButton
+                android:id="@+id/rb_fingerprint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/authentication_method_fingerprint"
+                android:textSize="16sp"
                 />
 
-            <RadioButton
-                android:text="@string/authentication_method_password"
-                android:layout_width="match_parent"
-                android:textSize="16sp"
-                android:layout_height="wrap_content"
-                android:id="@+id/rb_password"
-                android:checked="true"/>
-
-            <TextView
-                android:text="@string/authentication_method_password_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="-5dp"
-                android:textColor="@color/secondary_text_inverted"
-                android:layout_marginStart="32dp"/>
-
-            <RadioButton
-                android:text="@string/authentication_method_fingerprint"
-                android:layout_width="match_parent"
-                android:textSize="16sp"
-                android:layout_height="wrap_content"
-                android:id="@+id/rb_fingerprint"
-                android:visibility="invisible"/>
             <TextView
                 android:id="@+id/text_rb_fingerprint"
-                android:text="@string/authentication_method_fingerprint_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-5dp"
-                android:textColor="@color/secondary_text_inverted"
                 android:layout_marginStart="32dp"
-                android:visibility="invisible"/>
+                android:layout_marginTop="-5dp"
+
+                android:text="@string/authentication_method_fingerprint_description"
+                android:textColor="@color/disabled_textview_colors"
+                 />
 
         </RadioGroup>
 
     </LinearLayout>
 
+
     <LinearLayout
+
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8332990e..f94f622c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="authentication_method_none_description">The database will be stored in plain text</string>
     <string name="authentication_method_password">Password</string>
     <string name="authentication_method_password_description">The database will be encrypted with a key derived from a password</string>
-    <string name="authentication_method_fingerprint">Password &amp; Fingerprint</string>
+    <string name="authentication_method_fingerprint">Fingerprint</string>
     <string name="authentication_method_fingerprint_description">In addition to a password, fingerprints registered on this device can be used to decrypt the database</string>
     <string name="authentication_method_set_password">Password</string>
     <string name="authentication_enter_password">Enter your password</string>
@@ -45,7 +45,7 @@
     <string-array name="authentication_methods">
         <item>None</item>
         <item>Password</item>
-        <item>Password &amp; Fingerprint</item>
+        <item>Fingerprint</item>
     </string-array>
 
     <string-array name="otp_types_array">