diff --git a/app/src/main/java/me/impy/aegis/AuthActivity.java b/app/src/main/java/me/impy/aegis/AuthActivity.java
index 7209ce3d..acb062ec 100644
--- a/app/src/main/java/me/impy/aegis/AuthActivity.java
+++ b/app/src/main/java/me/impy/aegis/AuthActivity.java
@@ -3,9 +3,11 @@ package me.impy.aegis;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
 import android.support.v7.app.AlertDialog;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -44,9 +46,15 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
         setContentView(R.layout.activity_auth);
         _textPassword = findViewById(R.id.text_password);
         LinearLayout boxFingerprint = findViewById(R.id.box_fingerprint);
-        SwirlView imgFingerprint = findViewById(R.id.img_fingerprint);
         TextView textFingerprint = findViewById(R.id.text_fingerprint);
 
+        SwirlView imgFingerprint = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            ViewGroup insertPoint = findViewById(R.id.img_fingerprint_insert);
+            imgFingerprint = new SwirlView(this);
+            insertPoint.addView(imgFingerprint, 0, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+
         Intent intent = getIntent();
         _slots = (SlotCollection) intent.getSerializableExtra("slots");
 
diff --git a/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java b/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java
index 1926063f..9ad940aa 100644
--- a/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java
+++ b/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java
@@ -3,6 +3,7 @@ package me.impy.aegis;
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
@@ -47,7 +48,13 @@ public class CustomAuthenticatedSlide extends Fragment implements FingerprintUiH
         _textPassword = view.findViewById(R.id.text_password);
         _textPasswordConfirm = view.findViewById(R.id.text_password_confirm);
         _boxFingerprint = view.findViewById(R.id.box_fingerprint);
-        _imgFingerprint = view.findViewById(R.id.img_fingerprint);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            ViewGroup insertPoint = view.findViewById(R.id.img_fingerprint_insert);
+            _imgFingerprint = new SwirlView(getContext());
+            insertPoint.addView(_imgFingerprint, 0, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+
         _textFingerprint = view.findViewById(R.id.text_fingerprint);
         view.findViewById(R.id.main).setBackgroundColor(_bgColor);
         return view;
diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
index 96d303aa..b7cda272 100644
--- a/app/src/main/res/layout/activity_auth.xml
+++ b/app/src/main/res/layout/activity_auth.xml
@@ -50,10 +50,11 @@
             android:layout_marginTop="12dp"
             android:visibility="invisible">
 
-            <com.mattprecious.swirl.SwirlView
-                android:id="@+id/img_fingerprint"
+            <LinearLayout
+                android:id="@+id/img_fingerprint_insert"
                 android:layout_width="60dp"
-                android:layout_height="60dp"/>
+                android:layout_height="60dp"
+                android:orientation="horizontal"/>
 
             <TextView
                 android:id="@+id/text_fingerprint"
diff --git a/app/src/main/res/layout/fragment_authenticated_slide.xml b/app/src/main/res/layout/fragment_authenticated_slide.xml
index a25f1970..81c36a02 100644
--- a/app/src/main/res/layout/fragment_authenticated_slide.xml
+++ b/app/src/main/res/layout/fragment_authenticated_slide.xml
@@ -82,10 +82,11 @@
             android:layout_height="match_parent"
             android:layout_marginTop="12dp">
 
-            <com.mattprecious.swirl.SwirlView
-                android:id="@+id/img_fingerprint"
+            <LinearLayout
+                android:id="@+id/img_fingerprint_insert"
                 android:layout_width="60dp"
-                android:layout_height="60dp"/>
+                android:layout_height="60dp"
+                android:orientation="horizontal"/>
 
             <TextView
                 android:id="@+id/text_fingerprint"