diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..694823c
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WizardSettings">
+    <option name="children">
+      <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="imageAssetPanel">
+                    <value>
+                      <PersistentState>
+                        <option name="children">
+                          <map>
+                            <entry key="launcher">
+                              <value>
+                                <PersistentState>
+                                  <option name="children">
+                                    <map>
+                                      <entry key="backgroundImage">
+                                        <value>
+                                          <PersistentState>
+                                            <option name="values">
+                                              <map>
+                                                <entry key="scalingPercent" value="110" />
+                                                <entry key="trimmed" value="true" />
+                                              </map>
+                                            </option>
+                                          </PersistentState>
+                                        </value>
+                                      </entry>
+                                      <entry key="foregroundImage">
+                                        <value>
+                                          <PersistentState>
+                                            <option name="values">
+                                              <map>
+                                                <entry key="scalingPercent" value="59" />
+                                              </map>
+                                            </option>
+                                          </PersistentState>
+                                        </value>
+                                      </entry>
+                                    </map>
+                                  </option>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="backgroundColor" value="e48a27" />
+                                      <entry key="backgroundImage" value="$USER_HOME$/Desktop/ic_launcher_bg.svg" />
+                                      <entry key="foregroundImage" value="$USER_HOME$/Desktop/paper_player_foreground.svg" />
+                                      <entry key="showGrid" value="true" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index de8a608..808cb4c 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a1231a..b686484 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <application
             android:name=".PaperPlayerApp"
             android:allowBackup="true"
-            android:icon="@mipmap/ic_player"
+            android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 7bdfc68..f4add23 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/xyz/michaelobi/paperplayer/presentation/musiclibrary/MusicLibraryActivity.kt b/app/src/main/java/xyz/michaelobi/paperplayer/presentation/musiclibrary/MusicLibraryActivity.kt
index b7a437d..3a2ecd1 100644
--- a/app/src/main/java/xyz/michaelobi/paperplayer/presentation/musiclibrary/MusicLibraryActivity.kt
+++ b/app/src/main/java/xyz/michaelobi/paperplayer/presentation/musiclibrary/MusicLibraryActivity.kt
@@ -84,7 +84,7 @@ class MusicLibraryActivity : AppCompatActivity(), MusicLibraryContract.View, Vie
                         .withTitle(getString(R.string.storage_permission))
                         .withMessage(getString(R.string.storage_permission_details))
                         .withButtonText(android.R.string.ok)
-                        .withIcon(R.mipmap.ic_player)
+                        .withIcon(R.mipmap.ic_launcher)
                         .build())
 
         Dexter.withActivity(this)
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..fa9fd6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="924.5455"
+        android:viewportHeight="924.5455">
+    <group android:translateX="-46.227272"
+            android:translateY="-45.727272">
+      <path
+          android:pathData="M1017,81.09L1017,935.4C1017,979.4 980.89,1015.49 936.7,1015.49L80.3,1015.49C36.11,1015.5 0,979.5 0,935.4L0,81.09C0,38.44 33.86,3.27 76.19,1.09C77.52,1.02 78.91,0.96 80.3,0.96L936.7,0.96C938.09,0.96 939.48,1.03 940.81,1.09C983.14,3.27 1017,38.45 1017,81.09Z"
+          android:strokeWidth="1"
+          android:fillColor="#E48A27"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M1017,95.78L1017,601.35L0,601.35L0,95.78C-0.12,77.62 4.44,59.73 13.25,43.85C26.9,19.36 50,2.74 76.19,1.14C77.52,1.07 78.91,1.01 80.3,1.01L936.7,1.01C938.09,1.01 939.48,1.08 940.81,1.14C967.05,2.74 990.1,19.36 1003.75,43.86C1012.56,59.74 1017.12,77.62 1017,95.78L1017,95.78Z"
+          android:strokeWidth="1"
+          android:fillColor="#E89C24"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M936.71,1L80.29,1C36.13,1 0,37.04 0,81.09L0,87.76C0,43.76 36.13,7.67 80.29,7.67L936.71,7.67C980.87,7.67 1017,43.67 1017,87.76L1017,81.09C1017,37.04 980.87,1 936.71,1Z"
+          android:strokeAlpha="0.2"
+          android:strokeWidth="1"
+          android:fillColor="#FFFFFF"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M1017,928.73L1017,935.4C1017,979.4 980.89,1015.49 936.7,1015.49L80.3,1015.49C36.11,1015.5 0,979.5 0,935.4L0,928.73C0,972.73 36.11,1008.82 80.3,1008.82L936.7,1008.82C980.89,1008.82 1017,972.78 1017,928.73Z"
+          android:strokeAlpha="0.2"
+          android:strokeWidth="1"
+          android:fillColor="#D53821"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"
+          android:fillAlpha="0.2"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..50a0b9f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="645.7627"
+        android:viewportHeight="645.7627">
+    <group android:translateX="132.38136"
+            android:translateY="242.38136">
+      <path
+          android:pathData="M380.805,80.442C380.807,101.766 372.327,122.216 357.231,137.293C342.135,152.371 321.659,160.839 300.311,160.836L80.561,160.836C43.983,160.823 12.018,136.168 2.756,100.825C-6.505,65.482 9.268,28.346 41.149,10.437C73.03,-7.472 112.994,-1.647 138.422,24.615C163.85,50.877 168.341,90.965 149.354,122.191L231.504,122.191C213.808,93.119 216.349,56.07 237.848,29.679C259.347,3.288 295.15,-6.73 327.246,4.664C359.343,16.058 380.785,46.397 380.787,80.42L380.805,80.442Z"
+          android:strokeWidth="1"
+          android:fillColor="#401E1A"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M257.668,79.467a41.315,41.266 0,1 0,82.63 0a41.315,41.266 0,1 0,-82.63 0z"
+          android:strokeWidth="1"
+          android:fillColor="#FDFDFD"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M36.87,79.467a41.315,41.266 0,1 0,82.63 0a41.315,41.266 0,1 0,-82.63 0z"
+          android:strokeWidth="1"
+          android:fillColor="#FDFDFD"
+          android:fillType="nonZero"
+          android:strokeColor="#00000000"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml
index 70ef9a8..b16e2c1 100644
--- a/app/src/main/res/drawable/splash_background.xml
+++ b/app/src/main/res/drawable/splash_background.xml
@@ -30,7 +30,7 @@
     <item>
         <bitmap
                 android:gravity="center"
-                android:src="@mipmap/ic_player"/>
+                android:src="@mipmap/ic_launcher"/>
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..bbd3e02
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..bbd3e02
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/Thumbs.db b/app/src/main/res/mipmap-hdpi/Thumbs.db
deleted file mode 100644
index 35fe313..0000000
Binary files a/app/src/main/res/mipmap-hdpi/Thumbs.db and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 431890c..eafb204 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..57faf78
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_player.png b/app/src/main/res/mipmap-hdpi/ic_player.png
deleted file mode 100644
index 1a876d7..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_player.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/Thumbs.db b/app/src/main/res/mipmap-mdpi/Thumbs.db
deleted file mode 100644
index 3372af4..0000000
Binary files a/app/src/main/res/mipmap-mdpi/Thumbs.db and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 9dc1797..581a96b 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3414a9d
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_player.png b/app/src/main/res/mipmap-mdpi/ic_player.png
deleted file mode 100644
index bfa2f48..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_player.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/Thumbs.db b/app/src/main/res/mipmap-xhdpi/Thumbs.db
deleted file mode 100644
index 63aa0af..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/Thumbs.db and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 0065fb2..fad53dd 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..90e3869
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_player.png b/app/src/main/res/mipmap-xhdpi/ic_player.png
deleted file mode 100644
index cb0ac8d..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_player.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/Thumbs.db b/app/src/main/res/mipmap-xxhdpi/Thumbs.db
deleted file mode 100644
index db1aeef..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/Thumbs.db and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index a6c1803..445f3e1 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..6ad2757
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_player.png b/app/src/main/res/mipmap-xxhdpi/ic_player.png
deleted file mode 100644
index 5e4ca9c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_player.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/Thumbs.db b/app/src/main/res/mipmap-xxxhdpi/Thumbs.db
deleted file mode 100644
index 8105166..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/Thumbs.db and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index d082dd7..c974c24 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..52a10f4
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_player.png b/app/src/main/res/mipmap-xxxhdpi/ic_player.png
deleted file mode 100644
index fe1dd8c..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_player.png and /dev/null differ
diff --git a/build.gradle b/build.gradle
index 6991632..890ac94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb0399c..6cced61 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 21 00:59:40 WAT 2018
+#Mon May 21 23:28:30 WAT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip