diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index a65c2b9..29e09ea 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -24,6 +24,7 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.RatingBar;
@@ -75,9 +76,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             editor.apply();
         }
 
-        // TODO: remove this after testing
-        WelcomeDialog welcomeDialog = new WelcomeDialog();
-        welcomeDialog.show(getFragmentManager(), "WelcomeDialog");
 
 
         // check if we need to pre generate levels.
diff --git a/app/src/main/res/drawable/ic_star_blue_48dp.png b/app/src/main/res/drawable/ic_star_blue_48dp.png
index 872e2b3..05d0034 100644
Binary files a/app/src/main/res/drawable/ic_star_blue_48dp.png and b/app/src/main/res/drawable/ic_star_blue_48dp.png differ
diff --git a/app/src/main/res/drawable/ic_star_grey_48dp.png b/app/src/main/res/drawable/ic_star_grey_48dp.png
index 991abe1..37e4733 100644
Binary files a/app/src/main/res/drawable/ic_star_grey_48dp.png and b/app/src/main/res/drawable/ic_star_grey_48dp.png differ
diff --git a/app/src/main/res/drawable/ratingbar.xml b/app/src/main/res/drawable/ratingbar.xml
index 3f204ef..98b8175 100644
--- a/app/src/main/res/drawable/ratingbar.xml
+++ b/app/src/main/res/drawable/ratingbar.xml
@@ -15,18 +15,25 @@
 -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item android:id="@android:id/background">
         <bitmap
-            android:src="@drawable/ic_star_grey_48dp"/>
-    </item>
-    <item android:id="@android:id/secondaryProgress">
-        <bitmap
-            android:src="@drawable/ic_star_half_black_48dp"
+            android:src="@drawable/ic_star_grey_48dp"
             android:tint="@color/middlegrey" />
     </item>
     <item android:id="@android:id/progress">
         <bitmap
-            android:src="@drawable/ic_star_blue_48dp" />
+            android:src="@drawable/ic_star_blue_48dp"
+            android:tint="@color/colorAccent" />
     </item>
+
+    <!--   <item android:id="@android:id/background">
+        <bitmap
+            android:src="@drawable/ic_star_grey_48dp" />
+    </item>
+    <item android:id="@android:id/progress">
+        <bitmap
+            android:src="@drawable/ic_star_blue_48dp" />
+    </item> -->
 </layer-list>
 
diff --git a/app/src/main/res/layout/activity_main_menu.xml b/app/src/main/res/layout/activity_main_menu.xml
index 175c70f..001fb79 100644
--- a/app/src/main/res/layout/activity_main_menu.xml
+++ b/app/src/main/res/layout/activity_main_menu.xml
@@ -124,7 +124,6 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_weight="3"
                 android:onClick="onClick"
-                android:capitalize="none"
                 android:clickable="false"
                 android:elevation="10dp"
                 android:background="@drawable/standalone_button"/>
diff --git a/app/src/main/res/layout/welcome_dialog.xml b/app/src/main/res/layout/welcome_dialog.xml
index a4e6330..f445fac 100644
--- a/app/src/main/res/layout/welcome_dialog.xml
+++ b/app/src/main/res/layout/welcome_dialog.xml
@@ -1,12 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
+    android:gravity="center"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:weightSum="3">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/welcome1" />
-
+        android:text="@string/welcome" />
+    <Space
+        android:layout_width="10dp"
+        android:layout_height="20dp" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:text="@string/field_select_description_headline"
+        style="@style/Base.DialogWindowTitle.AppCompat"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1.25"
+        android:weightSum="1"
+        android:orientation="horizontal">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_keyboard_arrow_left_black_24dp"/>
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:adjustViewBounds="true"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:src="@drawable/icon_default_9x9"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_keyboard_arrow_right_black_24dp"/>
+    </LinearLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/field_select_description"/>
+    <Space
+        android:layout_width="20dp"
+        android:layout_height="20dp" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:text="@string/difficulty_description_headline"
+        style="@style/Base.DialogWindowTitle.AppCompat"/>
+    <RatingBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/difficultyBar"
+        android:layout_gravity="center_horizontal"
+        android:clickable="false"
+        android:numStars="3"
+        android:rating="1"
+        android:stepSize="1"
+        style="@style/RatingBar"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/difficulty_description"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b4bd09..d2d3824 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,7 +87,11 @@
     <string name="reset_confirmation_confirm">Reset</string>
 
     <!-- ### Welcome Dialog ### -->
-    <string name="welcome1">Welcome to Privacy Friendly Sudoku.</string>
+    <string name="welcome">Welcome to Privacy Friendly Sudoku.</string>
+    <string name="field_select_description">Swipe or press the arrow buttons on the left nd right to change the game filed mode</string>
+    <string name="field_select_description_headline">Field mode:</string>
+    <string name="difficulty_description">Press or swipe the stars to change the difficulty</string>
+    <string name="difficulty_description_headline">Difficulty:</string>
 
     <!-- ### Continue Game ### -->
     <string name="loadgame_delete_confirmation">Are you sure you want to delete this save?</string>