diff --git a/.hidden b/.hidden
index 8a68f745..51b5ac34 100755
--- a/.hidden
+++ b/.hidden
@@ -1,4 +1,3 @@
-build
 crowdin.yaml
 diaspora-android.iml
 gradle
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index a60b144d..1c9e66e2 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -202,7 +202,7 @@ public class MainActivity extends AppCompatActivity
         boolean newWebView = (webView == null);
         if(newWebView) {
             Log.d(App.TAG, "Webview was null. Create new one.");
-            View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout);
+            View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout, false);
             webView = (ContextMenuWebView) webviewHolder.findViewById(R.id.webView);
             ((LinearLayout)webView.getParent()).removeView(webView);
             setupWebView(savedInstanceState);
@@ -806,7 +806,7 @@ public class MainActivity extends AppCompatActivity
                 if (WebHelper.isOnline(MainActivity.this)) {
                     final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-                    View layout = getLayoutInflater().inflate(R.layout.dialog_search__people_tags, contentLayout);
+                    View layout = getLayoutInflater().inflate(R.layout.dialog_search__people_tags, contentLayout, false);
                     final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input);
                     final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
                         @Override
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
index be4b1a45..2d75115f 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
@@ -36,9 +36,6 @@ import butterknife.ButterKnife;
 public class SplashActivity extends AppCompatActivity {
     private App app;
 
-    @BindView(R.id.splash__splashimage)
-    ImageView imgSplash;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -46,11 +43,6 @@ public class SplashActivity extends AppCompatActivity {
         ButterKnife.bind(this);
         app = (App) getApplication();
 
-        TypedArray images = getResources().obtainTypedArray(R.array.splash_images);
-        int choice = (int) (Math.random() * images.length());
-        imgSplash.setImageResource(images.getResourceId(choice, R.drawable.splashscreen1));
-        images.recycle();
-
         int delay = getResources().getInteger(R.integer.splash_delay);
         new Handler().postDelayed(startActivityRunnable, delay);
     }
diff --git a/app/src/main/res/drawable/header.jpg b/app/src/main/res/drawable/header.jpg
deleted file mode 100644
index 915e324c..00000000
Binary files a/app/src/main/res/drawable/header.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_email_colored_48px.xml b/app/src/main/res/drawable/ic_email_colored_48px.xml
index 302869b1..ab034128 100644
--- a/app/src/main/res/drawable/ic_email_colored_48px.xml
+++ b/app/src/main/res/drawable/ic_email_colored_48px.xml
@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#EBFF7C" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+    <path android:fillColor="#4CAF50" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_colored_48px.xml b/app/src/main/res/drawable/ic_notifications_colored_48px.xml
index 24b09e43..c1a647cc 100644
--- a/app/src/main/res/drawable/ic_notifications_colored_48px.xml
+++ b/app/src/main/res/drawable/ic_notifications_colored_48px.xml
@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#EBFF7C" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+    <path android:fillColor="#4CAF50" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/splashscreen1.jpg b/app/src/main/res/drawable/splashscreen1.jpg
deleted file mode 100644
index bd2f04d6..00000000
Binary files a/app/src/main/res/drawable/splashscreen1.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/splashscreen2.jpg b/app/src/main/res/drawable/splashscreen2.jpg
deleted file mode 100644
index 2be7268d..00000000
Binary files a/app/src/main/res/drawable/splashscreen2.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/splashscreen3.jpg b/app/src/main/res/drawable/splashscreen3.jpg
deleted file mode 100644
index 8f1a8997..00000000
Binary files a/app/src/main/res/drawable/splashscreen3.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/splashscreen4.jpg b/app/src/main/res/drawable/splashscreen4.jpg
deleted file mode 100644
index 77ef17d6..00000000
Binary files a/app/src/main/res/drawable/splashscreen4.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/splashscreen5.jpg b/app/src/main/res/drawable/splashscreen5.jpg
deleted file mode 100644
index e1128818..00000000
Binary files a/app/src/main/res/drawable/splashscreen5.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/splashscreen6.jpg b/app/src/main/res/drawable/splashscreen6.jpg
deleted file mode 100644
index 6f97fa4c..00000000
Binary files a/app/src/main/res/drawable/splashscreen6.jpg and /dev/null differ
diff --git a/app/src/main/res/layout/main__activity.xml b/app/src/main/res/layout/main__activity.xml
index ca41fb0a..a546cd6d 100644
--- a/app/src/main/res/layout/main__activity.xml
+++ b/app/src/main/res/layout/main__activity.xml
@@ -19,6 +19,9 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
+        app:itemTextColor="@color/primary_text"
+        app:paddingEnd="0dp"
+        app:paddingStart="0dp"
         app:headerLayout="@layout/main__nav_header"
         app:menu="@menu/main__navdrawer" />
 
diff --git a/app/src/main/res/layout/splash__activity.xml b/app/src/main/res/layout/splash__activity.xml
index 6dfb9121..5adde8d1 100644
--- a/app/src/main/res/layout/splash__activity.xml
+++ b/app/src/main/res/layout/splash__activity.xml
@@ -1,15 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activity.SplashActivity">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/primary"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                tools:context=".activity.SplashActivity">
 
     <ImageView
-        android:id="@+id/splash__splashimage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:scaleType="centerCrop"
-        android:src="@drawable/splashscreen1" />
+        android:shadowColor="@color/black"
+        android:minHeight="100dp"
+        android:scaleType="fitXY"
+        android:minWidth="100dp"
+        android:src="@drawable/ic_launcher"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="15dp"
+        android:shadowColor="@color/black"
+        android:shadowDx="-4"
+        android:shadowDy="4"
+        android:shadowRadius="6"
+        android:text="@string/app_name"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/white"
+        android:textSize="32sp"
+        android:textStyle="bold"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f6e514e3..0d2c4cc4 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="splash_images">
-        <item>@drawable/splashscreen1</item>
-        <item>@drawable/splashscreen2</item>
-        <item>@drawable/splashscreen3</item>
-        <item>@drawable/splashscreen4</item>
-        <item>@drawable/splashscreen5</item>
-        <item>@drawable/splashscreen6</item>
-    </array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index b69c9db7..7595c3fc 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -5,10 +5,16 @@
     <color name="colorAccent">@color/accent</color>
 
     <!-- Colors from Palette -->
-    <color name="primary">#608b6f</color>			<!-- #607d8b -->
-    <color name="primary_dark">#608b6f</color>		<!-- #607d8b -->
-    <color name="accent">#8b685b</color>			<!-- #4CAF50 -->
+    <color name="primary">#3F51B5</color>
+    <color name="primary_dark">#303F9F</color>
+    <color name="primary_light">#C5CAE9</color>
+    <color name="accent">#4CAF50</color>
+    <color name="primary_text">#212121</color>
+    <color name="secondary_text">#757575</color>
+    <color name="icons">#FFFFFF</color>
+    <color name="divider">#BDBDBD</color>
     <!-- End colors from Palette -->
 
     <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 57a761b3..dc345adf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- App - AppName specific -->
-    <string name="diaspora" translatable="false">Diaspora</string>
+    <string name="diaspora" translatable="false">diaspora*</string>
     <string name="diaspora_for_android" translatable="false">Diaspora for Android</string>
     <string name="app_name" translatable="false">@string/diaspora</string>
     <string name="app_hashtag" translatable="false">#DiasporaForAndroid</string>