diff --git a/.gitignore b/.gitignore
index 9c4de58..cd07bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,37 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+# Built application files
+/*/build/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+*.iml
+
+# OS-specific files
 .DS_Store
-/build
-/captures
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 974ec58..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-privacy-friendly-sudoku
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 592b7b8..85f10a2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,14 +8,19 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name="org.secuso.privacyfriendlysudoku.ui.SplashActivity"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="org.secuso.privacyfriendlysudoku.ui.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name="org.secuso.privacyfriendlysudoku.ui.SettingsActivity"
diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java
new file mode 100644
index 0000000..e29b2d5
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java
@@ -0,0 +1,23 @@
+package org.secuso.privacyfriendlysudoku.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by yonjuni on 22.10.16.
+ */
+
+public class SplashActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent mainIntent = new Intent(SplashActivity.this, MainActivity.class);
+        SplashActivity.this.startActivity(mainIntent);
+        SplashActivity.this.finish();
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/splash_icon.png b/app/src/main/res/drawable-hdpi/splash_icon.png
new file mode 100644
index 0000000..e83f3c1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/splash_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/splash_icon.png b/app/src/main/res/drawable-mdpi/splash_icon.png
new file mode 100644
index 0000000..26b1d97
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/splash_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/splash_icon.png b/app/src/main/res/drawable-xhdpi/splash_icon.png
new file mode 100644
index 0000000..c1f1bfd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/splash_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/splash_icon.png b/app/src/main/res/drawable-xxhdpi/splash_icon.png
new file mode 100644
index 0000000..1f73cb2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/splash_icon.png b/app/src/main/res/drawable-xxxhdpi/splash_icon.png
new file mode 100644
index 0000000..2b449d1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/splash_icon.png differ
diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
new file mode 100644
index 0000000..cfb80f8
--- /dev/null
+++ b/app/src/main/res/drawable/splash_screen.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@color/colorAccent"/>
+
+    <item>
+        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+            android:src="@drawable/splash_icon"
+            android:gravity="center"
+            />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 40cc0d3..1e5c001 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,6 +56,11 @@
         <item name="android:layout_height">50dp</item>
     </style>
 
+    <style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <item name="android:windowBackground">@drawable/splash_screen</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
 
     <!-- <style name="FontStyle">
         <item name="android:fontFamily"></item>