diff --git a/app/build.gradle b/app/build.gradle
index c98b6093..33f9b037 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
     implementation 'com.afollestad:material-cab:0.1.12'
 
-    implementation 'com.heinrichreimersoftware:material-intro:1.6'
+    implementation 'com.pacioianu.david:ink-page-indicator:1.3.0'
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.melegy.redscreenofdeath:red-screen-of-death:0.1.2'
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
index c7c1e70d..394bf23e 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
@@ -17,11 +17,10 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.heinrichreimersoftware.materialintro.view.InkPageIndicator;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
 import com.dkanada.gramophone.util.PreferenceUtil;
-import com.dkanada.gramophone.util.ViewUtil;
+import com.pixelcan.inkpageindicator.InkPageIndicator;
 
 public class NowPlayingScreenPreferenceDialog extends DialogFragment implements MaterialDialog.SingleButtonCallback, ViewPager.OnPageChangeListener {
 
@@ -39,7 +38,6 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
         ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager);
         viewPager.setAdapter(new NowPlayingScreenAdapter(getContext()));
         viewPager.addOnPageChangeListener(this);
-        viewPager.setPageMargin((int) ViewUtil.convertDpToPixel(32, getResources()));
         viewPager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen().ordinal());
 
         InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator);
@@ -82,7 +80,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
     }
 
     private static class NowPlayingScreenAdapter extends PagerAdapter {
-        private Context context;
+        private final Context context;
 
         public NowPlayingScreenAdapter(Context context) {
             this.context = context;
diff --git a/app/src/main/res/layout/preference_dialog_now_playing.xml b/app/src/main/res/layout/preference_dialog_now_playing.xml
index 088d7400..7f7788e9 100644
--- a/app/src/main/res/layout/preference_dialog_now_playing.xml
+++ b/app/src/main/res/layout/preference_dialog_now_playing.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,19 +10,23 @@
         android:id="@+id/now_playing_screen_view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:clipToPadding="false"
-        android:paddingLeft="72dp"
-        android:paddingRight="72dp" />
+        android:padding="64dp"
+        app:layout_constraintBottom_toTopOf="@id/page_indicator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-    <com.heinrichreimersoftware.materialintro.view.InkPageIndicator
+    <com.pixelcan.inkpageindicator.InkPageIndicator
         android:id="@+id/page_indicator"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        app:currentPageIndicatorColor="?android:textColorPrimary"
-        app:dotDiameter="8dp"
-        app:dotGap="8dp"
-        app:pageIndicatorColor="?android:textColorHint" />
+        android:layout_margin="32dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:ipi_dotDiameter="8dp"
+        app:ipi_dotGap="8dp"
+        app:ipi_currentPageIndicatorColor="?android:textColorPrimary"
+        app:ipi_pageIndicatorColor="?android:textColorHint" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preference_dialog_now_playing_item.xml b/app/src/main/res/layout/preference_dialog_now_playing_item.xml
index 2c5dd087..c11ab6a8 100644
--- a/app/src/main/res/layout/preference_dialog_now_playing_item.xml
+++ b/app/src/main/res/layout/preference_dialog_now_playing_item.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     tools:ignore="ContentDescription">
 
@@ -11,16 +13,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:padding="16dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
         android:textColor="?android:textColorSecondary"
-        tools:text="Card Layout" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="@string/flat" />
 
     <ImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        tools:src="@drawable/np_card" />
+        android:layout_margin="16dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:src="@drawable/np_flat" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>