diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d6cfb70..0e14693 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
     <application
         android:name=".PFCircuitTrainingApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
index fa91c74..f6748aa 100644
--- a/app/src/main/res/drawable/splash_screen.xml
+++ b/app/src/main/res/drawable/splash_screen.xml
@@ -5,7 +5,7 @@
 
     <item>
         <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@mipmap/splash_icon"
+            android:src="@mipmap/ic_splash"
             android:gravity="center"
             />
     </item>
diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml
index bb92886..3f74d41 100644
--- a/app/src/main/res/layout/tutorial_slide1.xml
+++ b/app/src/main/res/layout/tutorial_slide1.xml
@@ -24,7 +24,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:background="@mipmap/splash_icon"
+            android:background="@mipmap/ic_splash"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/tutorial_slide2.xml b/app/src/main/res/layout/tutorial_slide2.xml
index 30a2428..913a385 100644
--- a/app/src/main/res/layout/tutorial_slide2.xml
+++ b/app/src/main/res/layout/tutorial_slide2.xml
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:background="@mipmap/splash_icon"
+            android:background="@mipmap/ic_splash"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/tutorial_slide3.xml b/app/src/main/res/layout/tutorial_slide3.xml
index 5198873..d7866f8 100644
--- a/app/src/main/res/layout/tutorial_slide3.xml
+++ b/app/src/main/res/layout/tutorial_slide3.xml
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:background="@mipmap/splash_icon"
+            android:background="@mipmap/ic_splash"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/tutorial_slide4.xml b/app/src/main/res/layout/tutorial_slide4.xml
index f8d7125..2a1870c 100644
--- a/app/src/main/res/layout/tutorial_slide4.xml
+++ b/app/src/main/res/layout/tutorial_slide4.xml
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:background="@mipmap/splash_icon"
+            android:background="@mipmap/ic_splash"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/tutorial_slide5.xml b/app/src/main/res/layout/tutorial_slide5.xml
index a71e465..0aef047 100644
--- a/app/src/main/res/layout/tutorial_slide5.xml
+++ b/app/src/main/res/layout/tutorial_slide5.xml
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:background="@mipmap/splash_icon"
+            android:background="@mipmap/ic_splash"
             />
 
         <TextView
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..90f9580
--- /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="@mipmap/ic_launcher_adaptive_back"/>
+  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_drawer.png b/app/src/main/res/mipmap-hdpi/ic_drawer.png
index 21df908..609ea9b 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_drawer.png and b/app/src/main/res/mipmap-hdpi/ic_drawer.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..19421e8
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000..39f323e
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000..8e6f2de
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash.png b/app/src/main/res/mipmap-hdpi/ic_splash.png
new file mode 100644
index 0000000..6f7e9c1
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_splash.png differ
diff --git a/app/src/main/res/mipmap-hdpi/icon.png b/app/src/main/res/mipmap-hdpi/icon.png
deleted file mode 100644
index 24e511b..0000000
Binary files a/app/src/main/res/mipmap-hdpi/icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/splash_icon.png b/app/src/main/res/mipmap-hdpi/splash_icon.png
deleted file mode 100644
index 5c8cbf5..0000000
Binary files a/app/src/main/res/mipmap-hdpi/splash_icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_drawer.png b/app/src/main/res/mipmap-mdpi/ic_drawer.png
index e2fec29..10652a5 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_drawer.png and b/app/src/main/res/mipmap-mdpi/ic_drawer.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..bf79853
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000..dce4765
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000..27d09a9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash.png b/app/src/main/res/mipmap-mdpi/ic_splash.png
new file mode 100644
index 0000000..5a682e1
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_splash.png differ
diff --git a/app/src/main/res/mipmap-mdpi/icon.png b/app/src/main/res/mipmap-mdpi/icon.png
deleted file mode 100644
index a2e0cdb..0000000
Binary files a/app/src/main/res/mipmap-mdpi/icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/splash_icon.png b/app/src/main/res/mipmap-mdpi/splash_icon.png
deleted file mode 100644
index 7e05365..0000000
Binary files a/app/src/main/res/mipmap-mdpi/splash_icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_drawer.png b/app/src/main/res/mipmap-xhdpi/ic_drawer.png
index 5a2c59d..8ef6a82 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_drawer.png and b/app/src/main/res/mipmap-xhdpi/ic_drawer.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..3ec05f1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000..497993d
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000..eec365d
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash.png b/app/src/main/res/mipmap-xhdpi/ic_splash.png
new file mode 100644
index 0000000..5d92f28
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_splash.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/icon.png b/app/src/main/res/mipmap-xhdpi/icon.png
deleted file mode 100644
index 0d41c34..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/splash_icon.png b/app/src/main/res/mipmap-xhdpi/splash_icon.png
deleted file mode 100644
index 4a5a712..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/splash_icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer.png
index ed9d93f..97075b5 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_drawer.png and b/app/src/main/res/mipmap-xxhdpi/ic_drawer.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e1ace8c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000..4b5f051
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000..b5bd0cb
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash.png b/app/src/main/res/mipmap-xxhdpi/ic_splash.png
new file mode 100644
index 0000000..a3fda1e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_splash.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon.png b/app/src/main/res/mipmap-xxhdpi/icon.png
deleted file mode 100644
index 78c42ca..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash_icon.png b/app/src/main/res/mipmap-xxhdpi/splash_icon.png
deleted file mode 100644
index 9e1d715..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/splash_icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_drawer.png b/app/src/main/res/mipmap-xxxhdpi/ic_drawer.png
index 1ea062f..4b6c085 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_drawer.png and b/app/src/main/res/mipmap-xxxhdpi/ic_drawer.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..04b0dbd
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000..926c86c
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000..ae90b8e
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash.png b/app/src/main/res/mipmap-xxxhdpi/ic_splash.png
new file mode 100644
index 0000000..07c90ff
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_splash.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon.png b/app/src/main/res/mipmap-xxxhdpi/icon.png
deleted file mode 100644
index d2b0e48..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/icon.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/splash_icon.png b/app/src/main/res/mipmap-xxxhdpi/splash_icon.png
deleted file mode 100644
index 88ad3c9..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/splash_icon.png and /dev/null differ