diff --git a/app/build.gradle b/app/build.gradle
index a96291f..75053ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64804e5..3971ec8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/launcher_icon_dicer"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
@@ -22,24 +22,24 @@
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".AboutActivity"
             android:label="@string/about"
-            android:parentActivityName=".MainActivity">
-        </activity>
-
+            android:parentActivityName=".MainActivity"/>
         <activity
             android:name=".HelpActivity"
             android:label="Help"
-            android:parentActivityName=".MainActivity">
-        </activity>
+            android:parentActivityName=".MainActivity"/>
         <activity
             android:name=".SettingsActivity"
             android:label="@string/settings_title"
-            android:parentActivityName=".MainActivity">
-        </activity>
+            android:parentActivityName=".MainActivity"/>
+        <activity
+            android:name=".TutorialActivity"
+            android:label="@string/slide1_heading"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:parentActivityName=".MainActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/AboutActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/AboutActivity.java
index 9c798cf..7b1fc17 100644
--- a/app/src/main/java/org/secuso/privacyfriendlydicer/AboutActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/AboutActivity.java
@@ -1,7 +1,7 @@
 package org.secuso.privacyfriendlydicer;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/HelpActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/HelpActivity.java
index de11553..19953b0 100644
--- a/app/src/main/java/org/secuso/privacyfriendlydicer/HelpActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/HelpActivity.java
@@ -1,7 +1,7 @@
 package org.secuso.privacyfriendlydicer;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by yonjuni on 15.06.16.
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/MainActivity.java
index 124b1f4..30c0302 100644
--- a/app/src/main/java/org/secuso/privacyfriendlydicer/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/MainActivity.java
@@ -1,23 +1,20 @@
 package org.secuso.privacyfriendlydicer;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Point;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.support.design.widget.NavigationView;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Display;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
@@ -54,8 +51,6 @@ protected void onCreate(Bundle savedInstanceState) {
         drawer.setDrawerListener(toggle);
         toggle.syncState();
 
-        doFirstRun();
-
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
 
@@ -271,18 +266,24 @@ public boolean onNavigationItemSelected(MenuItem item) {
         switch(item.getItemId()) {
             case R.id.nav_about:
                 intent = new Intent(this, AboutActivity.class);
-                startActivityForResult(intent, 0);
+                startActivity(intent);
                 return true;
 
             case R.id.nav_help:
                 intent = new Intent(this, HelpActivity.class);
-                startActivityForResult(intent, 0);
+                startActivity(intent);
                 return true;
 
             case R.id.nav_settimgs:
                 intent = new Intent(this, SettingsActivity.class);
-                startActivityForResult(intent, 0);
+                startActivity(intent);
+                return true;
+
+            case R.id.nav_tutorial:
+                intent = new Intent(this, TutorialActivity.class);
+                startActivity(intent);
                 return true;
+
             default:
         }
 
@@ -290,43 +291,4 @@ public boolean onNavigationItemSelected(MenuItem item) {
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
-
-    private void doFirstRun() {
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        sharedPreferences.edit().putString("firstShow", "").apply();
-        SharedPreferences settings = getSharedPreferences("firstShow", getBaseContext().MODE_PRIVATE);
-        if (settings.getBoolean("isFirstRun", true)) {
-            welcomeDialog();
-            SharedPreferences.Editor editor = settings.edit();
-            editor.putBoolean("isFirstRun", false);
-            editor.apply();
-        }
-    }
-
-    public void welcomeDialog() {
-        AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
-
-        alertDialog.setTitle(R.string.welcome_title);
-
-        alertDialog.setMessage(R.string.welcome_description);
-
-        alertDialog.setIcon(R.mipmap.drawer_icon_dicer);
-
-        alertDialog.setPositiveButton(getString(R.string.confirm_button), new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog,int which) {
-            }
-        });
-
-        final Intent intent = new Intent(this, HelpActivity.class);
-        alertDialog.setNegativeButton(getString(R.string.help_button), new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                startActivityForResult(intent, 0);
-                dialog.cancel();
-            }
-        });
-
-        alertDialog.show();
-    }
-
-
 }
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/SettingsActivity.java
index cd70d67..f78fc4c 100644
--- a/app/src/main/java/org/secuso/privacyfriendlydicer/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/SettingsActivity.java
@@ -1,7 +1,7 @@
 package org.secuso.privacyfriendlydicer;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by yonjuni on 15.06.16.
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/SplashActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/SplashActivity.java
index aebd780..fda4596 100644
--- a/app/src/main/java/org/secuso/privacyfriendlydicer/SplashActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/SplashActivity.java
@@ -1,8 +1,9 @@
 package org.secuso.privacyfriendlydicer;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by yonjuni on 22.10.16.
@@ -14,10 +15,17 @@ public class SplashActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        Intent mainIntent = new Intent(SplashActivity.this, MainActivity.class);
-        SplashActivity.this.startActivity(mainIntent);
-        SplashActivity.this.finish();
+        SharedPreferences settings = getSharedPreferences("firstShow", getBaseContext().MODE_PRIVATE);
 
+        Intent intent;
+        if (settings.getBoolean("isFirstRun", true)) {
+            intent = new Intent(SplashActivity.this, TutorialActivity.class);
+        } else {
+            intent = new Intent(SplashActivity.this, MainActivity.class);
+        }
+
+        startActivity(intent);
+        finish();
     }
 
 }
diff --git a/app/src/main/java/org/secuso/privacyfriendlydicer/TutorialActivity.java b/app/src/main/java/org/secuso/privacyfriendlydicer/TutorialActivity.java
new file mode 100644
index 0000000..33fc0a2
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlydicer/TutorialActivity.java
@@ -0,0 +1,196 @@
+package org.secuso.privacyfriendlydicer;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+
+/**
+ * Class structure taken from tutorial at http://www.androidhive.info/2016/05/android-build-intro-slider-app/
+ * @author Karola Marky, Christopher Beckmann
+ * @version 20161214
+ */
+public class TutorialActivity extends AppCompatActivity {
+
+    private ViewPager viewPager;
+    private MyViewPagerAdapter myViewPagerAdapter;
+    private LinearLayout dotsLayout;
+    private TextView[] dots;
+    private int[] layouts;
+    private Button btnSkip, btnNext;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Making notification bar transparent
+        if (Build.VERSION.SDK_INT >= 21) {
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+        }
+
+        setContentView(R.layout.activity_tutorial);
+
+        viewPager = (ViewPager) findViewById(R.id.view_pager);
+        dotsLayout = (LinearLayout) findViewById(R.id.layoutDots);
+        btnSkip = (Button) findViewById(R.id.btn_skip);
+        btnNext = (Button) findViewById(R.id.btn_next);
+
+        // layouts of all welcome sliders
+        // add few more layouts if you want
+        layouts = new int[]{R.layout.tutorial_slide1};
+
+        // adding bottom dots
+        addBottomDots(0);
+
+        // making notification bar transparent
+        changeStatusBarColor();
+
+        myViewPagerAdapter = new MyViewPagerAdapter();
+        viewPager.setAdapter(myViewPagerAdapter);
+        viewPager.addOnPageChangeListener(viewPagerPageChangeListener);
+        viewPagerPageChangeListener.onPageSelected(0);
+
+        btnSkip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TutorialActivity.this.launchHomeScreen();
+            }
+        });
+
+        btnNext.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // checking for last page
+                // if last page home screen will be launched
+                int current = TutorialActivity.this.getItem(+1);
+                if (current < layouts.length) {
+                    // move to next screen
+                    viewPager.setCurrentItem(current);
+                } else {
+                    TutorialActivity.this.launchHomeScreen();
+                }
+            }
+        });
+    }
+
+    private void addBottomDots(int currentPage) {
+        dots = new TextView[layouts.length];
+
+        int[] colorsActive = getResources().getIntArray(R.array.array_dot_active);
+        int[] colorsInactive = getResources().getIntArray(R.array.array_dot_inactive);
+
+        dotsLayout.removeAllViews();
+        for (int i = 0; i < dots.length; i++) {
+            dots[i] = new TextView(this);
+            dots[i].setText(Html.fromHtml("&#8226;"));
+            dots[i].setTextSize(35);
+            dots[i].setTextColor(colorsInactive[currentPage]);
+            dotsLayout.addView(dots[i]);
+        }
+
+        if (dots.length > 0)
+            dots[currentPage].setTextColor(colorsActive[currentPage]);
+    }
+
+    private int getItem(int i) {
+        return viewPager.getCurrentItem() + i;
+    }
+
+    private void launchHomeScreen() {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        sharedPreferences.edit().putString("firstShow", "").apply();
+        SharedPreferences settings = getSharedPreferences("firstShow", getBaseContext().MODE_PRIVATE);
+        if (settings.getBoolean("isFirstRun", true)) {
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putBoolean("isFirstRun", false);
+            editor.apply();
+        }
+
+        startActivity(new Intent(TutorialActivity.this, MainActivity.class));
+        finish();
+    }
+
+    //  viewpager change listener
+    ViewPager.OnPageChangeListener viewPagerPageChangeListener = new ViewPager.OnPageChangeListener() {
+        @Override public void onPageScrollStateChanged(int i) {}
+        @Override public void onPageScrolled(int i, float v, int i1) {}
+        @Override public void onPageSelected(int position) {
+            addBottomDots(position);
+
+            // changing the next button text 'NEXT' / 'GOT IT'
+            if (position == layouts.length - 1) {
+                // last page. make button text to GOT IT
+                btnNext.setText(getString(R.string.okay));
+                btnSkip.setVisibility(View.GONE);
+            } else {
+                // still pages are left
+                btnNext.setText(getString(R.string.next));
+                btnSkip.setVisibility(View.VISIBLE);
+            }
+        }
+    };
+
+    /**
+     * Making notification bar transparent
+     */
+    private void changeStatusBarColor() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        }
+    }
+
+    /**
+     * View pager adapter
+     */
+    public class MyViewPagerAdapter extends PagerAdapter {
+        private LayoutInflater layoutInflater;
+
+        public MyViewPagerAdapter() {
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            View view = layoutInflater.inflate(layouts[position], container, false);
+            container.addView(view);
+
+            return view;
+        }
+
+        @Override
+        public int getCount() {
+            return layouts.length;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object obj) {
+            return view == obj;
+        }
+
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            View view = (View) object;
+            container.removeView(view);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_menu_tutorial.xml b/app/src/main/res/drawable/ic_menu_tutorial.xml
new file mode 100644
index 0000000..30d83f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_tutorial.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5,13.18v4L12,21l7,-3.82v-4L12,17l-7,-3.82zM12,3L1,9l11,6 9,-4.91V17h2V9L12,3z"/>
+</vector>
diff --git a/app/src/main/res/layout-land/content_main.xml b/app/src/main/res/layout-land/content_main.xml
index 531ec97..cec4c86 100644
--- a/app/src/main/res/layout-land/content_main.xml
+++ b/app/src/main/res/layout-land/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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:id="@+id/content_main"
@@ -265,7 +265,7 @@
         app:layout_constraintTop_toBottomOf="@id/resultOne"
         app:srcCompat="@drawable/d1" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -275,4 +275,4 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a61d8a6..8e69e22 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -22,4 +22,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml
new file mode 100644
index 0000000..5735f1a
--- /dev/null
+++ b/app/src/main/res/layout/activity_tutorial.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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"
+    tools:showIn="@layout/activity_tutorial">
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:id="@+id/layoutDots"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dots_height"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/dots_margin_bottom"
+        android:gravity="center"
+        android:orientation="horizontal"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:alpha=".5"
+        android:layout_above="@id/layoutDots"
+        android:background="@android:color/white" />
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="8dp"
+        android:background="@null"
+        android:text="@string/next"
+        android:textColor="@android:color/white"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="8dp" />
+
+    <Button
+        android:id="@+id/btn_skip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="8dp"
+        android:background="@null"
+        android:text="@string/skip"
+        android:textColor="@android:color/white"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="8dp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index bd9fd24..0b90995 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@@ -7,20 +7,20 @@
     android:fitsSystemWindows="true"
     tools:context="org.secuso.privacyfriendlydicer.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 689ca75..6bafac4 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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:id="@+id/content_main"
@@ -260,4 +260,4 @@
         app:srcCompat="@drawable/d1" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml
new file mode 100644
index 0000000..cbe2588
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_slide1.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorAccent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
+        android:layout_centerVertical="true"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/slide1_heading"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_title"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:layout_width="@dimen/img_width_height"
+            android:layout_height="@dimen/img_width_height"
+            android:background="@mipmap/splash_icon"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/slide1_text"
+            android:textAlignment="center"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_desc" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index c1df71d..ff2bb54 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/nav_settimgs"
-        android:icon="@drawable/ic_menu_settings"
-        android:title="@string/action_settings" />
-    <item
-        android:id="@+id/nav_help"
-        android:icon="@drawable/ic_menu_help"
-        android:title="@string/action_help" />
-    <item
-        android:id="@+id/nav_about"
-        android:icon="@drawable/ic_menu_info"
-        android:title="@string/action_about" />
+        android:id="@+id/nav_tutorial"
+        android:icon="@drawable/ic_menu_tutorial"
+        android:title="@string/action_tutorial" />
+
+    <group android:id="@+id/nav_group_settings">
+        <item
+            android:id="@+id/nav_settimgs"
+            android:icon="@drawable/ic_menu_settings"
+            android:title="@string/action_settings" />
+        <item
+            android:id="@+id/nav_help"
+            android:icon="@drawable/ic_menu_help"
+            android:title="@string/action_help" />
+        <item
+            android:id="@+id/nav_about"
+            android:icon="@drawable/ic_menu_info"
+            android:title="@string/action_about" />
+    </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 33e61c3..17892a4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -39,8 +39,11 @@
     <string name="help_permissions_description">Privacy Friendly Würfel nutzt die Berechtigung "Vibration" muss Feedback zu ermöglichen. Diese Berechtigung kann der App ohne Probleme entzogen werden.</string>
 
     <!-- WelcomeDialog-->
-    <string name="welcome_title">Willkommen</string>
-    <string name="welcome_description">Die Anzahl der Würfel kann über den Slider gewählt werden. Zum Würfeln kann entweder der Button gedrückt oder das Gerät geschüttelt werden.</string>
-    <string name="confirm_button">OKAY</string>
     <string name="help_button">Zur Hilfe</string>
+    <string name="next">Weiter</string>
+    <string name="skip">Überspringen</string>
+    <string name="okay">Okay</string>
+    <string name="slide1_heading">Willkommen</string>
+    <string name="slide1_text">Die Anzahl der Würfel kann über den Slider gewählt werden. Zum Würfeln kann entweder der Button gedrückt oder das Gerät geschüttelt werden.</string>
+    <string name="action_tutorial">Tutorial</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5a3490e..c0b879e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -37,8 +37,13 @@
     <string name="help_permissions_description">Privacy Friendly Dicer uses the vibration permission to enable feedback.</string>
 
     <!-- WelcomeDialog-->
-    <string name="welcome_title">ようこそ</string>
-    <string name="welcome_description">Choose the number of dice of adjusting the slider. Roll the dice by pressing the button or shaking the smartphone.</string>
-    <string name="confirm_button">了解</string>
     <string name="help_button">ヘルプ</string>
+    <string name="slide1_heading">ようこそ</string>
+    <string name="slide1_text">Choose the number of dice of adjusting the slider. Roll the dice by pressing the button or shaking the smartphone.</string>
+    <string name="action_tutorial">Tutorial</string>
+    <string name="okay">了解</string>
+    <string name="next">了解</string>
+    <string name="skip">Skip</string>
+    <string name="main_dice_sum">和: %s</string>
+    <string name="choose_face_heading">ページ数:</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index c5ffd2d..4e3402b 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -37,8 +37,13 @@
     <string name="help_permissions_description">Privacy Friendly Kauliņi izmanto vibrāciju lai dotu atsauksmi par kauliņu mešanu.</string>
 
     <!-- WelcomeDialog-->
-    <string name="welcome_title">Sveicināti!</string>
-    <string name="welcome_description">Izvēleties kauliņu skaitu ar slaidera palīdzību. Metiet kauliņus nospiežot pogu vai kratot telefonu.</string>
-    <string name="confirm_button">Labi</string>
     <string name="help_button">Palīdzība</string>
+    <string name="slide1_heading">Sveicināti!</string>
+    <string name="slide1_text">Izvēleties kauliņu skaitu ar slaidera palīdzību. Metiet kauliņus nospiežot pogu vai kratot telefonu.</string>
+    <string name="action_tutorial">Tutorial</string>
+    <string name="okay">Labi</string>
+    <string name="next">Labi</string>
+    <string name="skip">Skip</string>
+    <string name="main_dice_sum">Summa: %s</string>
+    <string name="choose_face_heading">lappušu skaits:</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c7f39a6..e43a352 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -37,8 +37,13 @@
     <string name="help_permissions_description">Privacy Friendly Кости использует разрешение для вибрации в целях обратной связи.</string>
 
     <!-- WelcomeDialog-->
-    <string name="welcome_title">Добро пожаловать</string>
-    <string name="welcome_description">Выберите количество костей с помощью слайдера. Бросайте кости нажатием кнопки или встряхиванием телефона. </string>
-    <string name="confirm_button">Подтвердить</string>
     <string name="help_button">Помощь</string>
+    <string name="choose_face_heading">Стороны костей:</string>
+    <string name="main_dice_sum">сумма: %s</string>
+    <string name="next">Продолжить</string>
+    <string name="okay">Подтвердить</string>
+    <string name="slide1_heading">Добро пожаловать</string>
+    <string name="slide1_text">"Выберите количество костей с помощью слайдера. Бросайте кости нажатием кнопки или встряхиванием телефона. "</string>
+    <string name="action_tutorial">Tutorial</string>
+    <string name="skip">Skip</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8c7227..7d37e49 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,4 +8,19 @@
     <color name="white">#ffffff</color>
 
     <color name="ic_launcher_background">#3680BB</color>
+
+    <color name="dot_dark_screen">#026499</color>
+    <color name="dot_light_screen">#448bb2</color>
+
+    <array name="array_dot_active">
+        <item>@color/dot_light_screen</item>
+        <item>@color/dot_light_screen</item>
+        <item>@color/dot_light_screen</item>
+    </array>
+
+    <array name="array_dot_inactive">
+        <item>@color/dot_dark_screen</item>
+        <item>@color/dot_dark_screen</item>
+        <item>@color/dot_dark_screen</item>
+    </array>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c2effc5..c418820 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,4 +6,12 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+
+    <dimen name="dots_height">30dp</dimen>
+    <dimen name="dots_margin_bottom">20dp</dimen>
+    <dimen name="img_width_height">120dp</dimen>
+    <dimen name="slide_title">30dp</dimen>
+    <dimen name="slide_desc">16dp</dimen>
+    <dimen name="slide_actions">20dp</dimen>
+    <dimen name="desc_padding">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7dde382..24d3555 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,9 +40,12 @@
     <string name="help_permissions_heading">Permissions</string>
     <string name="help_permissions_description">Privacy Friendly Dicer uses the vibration permission to enable feedback after displaying a new result. If the permission is not granted the device will not vibrate.</string>
 
-    <!-- WelcomeDialog-->
-    <string name="welcome_title">Welcome</string>
-    <string name="welcome_description">Choose the number of dice of adjusting the slider. Roll the dice by pressing the button or shaking the smartphone.</string>
-    <string name="confirm_button">OKAY</string>
-    <string name="help_button">View help</string>
+    <string name="next">Next</string>
+    <string name="skip">Skip</string>
+    <string name="okay">Okay</string>
+
+    <string name="slide1_heading">Welcome!</string>
+    <string name="slide1_text">Choose the number of dice of adjusting the slider. Roll the dice by pressing the button or shaking the smartphone.</string>
+    <string name="action_tutorial">Tutorial</string>
+    <string name="help_button">Help</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file