diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 12899427..43d833f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kabouzeid.gramophone">
+<manifest
+    package="com.kabouzeid.gramophone"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -134,6 +135,10 @@
             android:label="@string/action_settings" />
 
         <activity android:name=".ui.activities.PlaylistDetailActivity" />
+
+        <activity
+            android:name=".ui.activities.AboutActivity"
+            android:label="@string/action_about" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
deleted file mode 100644
index f34cff06..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.kabouzeid.gramophone.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.text.TextUtils;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.kabouzeid.gramophone.R;
-
-/**
- * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
- */
-public class AboutDialog extends LeakDetectDialogFragment {
-
-    private static String getCurrentVersionName(@NonNull final Context context) {
-        String versionName;
-        try {
-            versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            return "Unknown";
-        }
-        return versionName;
-    }
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new MaterialDialog.Builder(getActivity())
-                .title(getActivity().getResources().getString(R.string.app_name) + " " + getCurrentVersionName(getActivity()))
-                .iconRes(R.drawable.ic_launcher)
-                .content(TextUtils.concat(getActivity().getResources().getText(R.string.credits_1),
-                                " ",
-                                getActivity().getResources().getText(R.string.karim_abou_zeid),
-                                ".\n",
-                                getActivity().getResources().getText(R.string.karim_abou_zeid_links),
-                                "\n\n",
-                                getActivity().getResources().getText(R.string.special_thanks_to),
-                                " ",
-                                getActivity().getResources().getText(R.string.aidan_follestad),
-                                ".\n\n",
-                                getActivity().getResources().getText(R.string.credits_3),
-                                " ",
-                                getActivity().getResources().getText(R.string.cookicons),
-                                ".\n\n",
-                                getActivity().getResources().getText(R.string.play_store_illustration_by),
-                                " ",
-                                getActivity().getResources().getText(R.string.maarten_corpel),
-                                "."
-                        )
-                )
-                .positiveText(android.R.string.ok)
-                .neutralText(R.string.changelog)
-                .callback(new MaterialDialog.ButtonCallback() {
-                    @Override
-                    public void onNeutral(MaterialDialog dialog) {
-                        super.onNeutral(dialog);
-                        ChangelogDialog.create().show(getActivity().getSupportFragmentManager(), "CHANGE_LOG_DIALOG");
-                    }
-                })
-                .build();
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
new file mode 100644
index 00000000..a64414c0
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
@@ -0,0 +1,58 @@
+package com.kabouzeid.gramophone.ui.activities;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class AboutActivity extends AbsBaseActivity {
+    @Bind(R.id.toolbar)
+    Toolbar toolbar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        setStatusBarTransparent();
+        ButterKnife.bind(this);
+
+        toolbar.setBackgroundColor(getThemeColorPrimary());
+        setSupportActionBar(toolbar);
+        //noinspection ConstantConditions
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (shouldColorNavigationBar())
+            setNavigationBarThemeColor();
+        setStatusBarThemeColor();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private static String getCurrentVersionName(@NonNull final Context context) {
+        String versionName;
+        try {
+            versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            return "Unknown";
+        }
+        return versionName;
+    }
+}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 9cd44e0b..8fbb6d46 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -49,7 +49,6 @@ import com.anjlab.android.iab.v3.TransactionDetails;
 import com.kabouzeid.gramophone.App;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.PagerAdapter;
-import com.kabouzeid.gramophone.dialogs.AboutDialog;
 import com.kabouzeid.gramophone.dialogs.ChangelogDialog;
 import com.kabouzeid.gramophone.dialogs.CreatePlaylistDialog;
 import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
@@ -254,7 +253,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
                         new Handler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                new AboutDialog().show(getSupportFragmentManager(), "ABOUT_DIALOG");
+                                startActivity(new Intent(MainActivity.this, AboutActivity.class));
                             }
                         }, 300);
                         break;
diff --git a/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 00000000..7a60257e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png
new file mode 100644
index 00000000..ce6a4ba1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png
new file mode 100644
index 00000000..3876b03c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png
new file mode 100644
index 00000000..ce905000
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png
new file mode 100644
index 00000000..f5c05cd8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 00000000..0932c17c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png
new file mode 100644
index 00000000..55c1cfe1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png
new file mode 100644
index 00000000..5c3aa950
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 00000000..bd77896a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png
new file mode 100644
index 00000000..2bbb4e29
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png
new file mode 100644
index 00000000..7af6a1fe
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png
new file mode 100644
index 00000000..ca168c1c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png
new file mode 100644
index 00000000..d9c9ec68
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 00000000..03cf044b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png
new file mode 100644
index 00000000..e306dc50
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png
new file mode 100644
index 00000000..3f044475
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 00000000..1cf4a924
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png
new file mode 100644
index 00000000..5ce17aab
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png
new file mode 100644
index 00000000..f9f15612
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png
new file mode 100644
index 00000000..4574c68f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png
new file mode 100644
index 00000000..8dd45150
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 00000000..33ec308a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png
new file mode 100644
index 00000000..f1bdeee0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png
new file mode 100644
index 00000000..95c16843
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 00000000..8b77603b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png
new file mode 100644
index 00000000..b98a7e9c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png
new file mode 100644
index 00000000..26935301
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png
new file mode 100644
index 00000000..05bccca0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png
new file mode 100644
index 00000000..b6b6a813
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 00000000..f8e64ad7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png
new file mode 100644
index 00000000..c6e831b0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png
new file mode 100644
index 00000000..15fa5d96
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 00000000..57de5bb8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png
new file mode 100644
index 00000000..5d714c56
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png
new file mode 100644
index 00000000..6c57703c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png
new file mode 100644
index 00000000..096f5413
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png
new file mode 100644
index 00000000..3e1d2f71
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 00000000..cb42f367
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png
new file mode 100644
index 00000000..5b08d1c1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png
new file mode 100644
index 00000000..d3837be4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png differ
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 7d8aacaf..fcf0b1af 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,81 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:isScrollContainer="true">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.activities.AboutActivity">
 
-    <LinearLayout
+    <include layout="@layout/status_bar" />
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:background="@android:color/transparent" />
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:clipToPadding="false"
+        android:isScrollContainer="true">
 
-        <!-- Application -->
-
-        <android.support.v7.widget.CardView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:cardBackgroundColor="?cardBackgroundColor"
-            app:cardCornerRadius="4dp"
-            app:cardUseCompatPadding="true">
+            android:orientation="vertical"
+            android:padding="16dp">
 
-            <LinearLayout
+            <include layout="@layout/card_about_app" />
+
+            <include
+                layout="@layout/card_author"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="24dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="24dp">
+                android:layout_marginTop="16dp" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Application"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
+            <include
+                layout="@layout/card_support_development"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp" />
 
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackground"
-                    android:paddingBottom="8dp"
-                    android:paddingTop="8dp">
+            <include
+                layout="@layout/card_special_thanks"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp" />
 
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_gravity="center_vertical"
-                        android:tint="?android:textColorSecondary"
-                        android:src="@drawable/ic_history_white_24dp" />
+        </LinearLayout>
 
-                    <LinearLayout
-                        android:layout_marginLeft="16dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:orientation="vertical">
+    </ScrollView>
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                            android:text="Version" />
-
-                        <TextView
-                            android:id="@+id/txtAboutVersionContent"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                            tools:text="0.9.5 (145)" />
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index 01c5f3dd..d94b68c7 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -11,7 +11,6 @@
         <include layout="@layout/status_bar" />
 
         <FrameLayout
-            android:clipToPadding="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?colorPrimary"
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
new file mode 100644
index 00000000..e2cc76cd
--- /dev/null
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView 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="wrap_content"
+    android:layout_gravity="center"
+    app:cardBackgroundColor="?cardBackgroundColor"
+    app:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:orientation="horizontal"
+            android:padding="16dp">
+
+            <ImageView
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_launcher"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:text="@string/app_name"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_info_outline_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/version"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:id="@+id/app_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0.0.0 (0)"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                    tools:ignore="HardcodedText" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/changelog"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_history_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/changelog"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
new file mode 100644
index 00000000..c3d55323
--- /dev/null
+++ b/app/src/main/res/layout/card_author.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    app:cardBackgroundColor="?cardBackgroundColor"
+    app:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingBottom="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="24dp"
+            android:text="@string/author"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_person_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/karim_abou_zeid"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aachen_germany"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/add_to_google_plus_circles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_google_plus_box_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/add_to_google_plus_circles"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/follow_on_twitter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_twitter_box_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/follow_on_twitter"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/fork_on_git_hub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_github_circle_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/fork_on_git_hub"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/visit_website"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_web_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/visit_website"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml
new file mode 100644
index 00000000..82e1c3f7
--- /dev/null
+++ b/app/src/main/res/layout/card_special_thanks.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginTop="16dp"
+    app:cardBackgroundColor="?cardBackgroundColor"
+    app:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingBottom="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="24dp"
+            android:text="@string/special_thanks_to"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerHorizontal" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aidan_follestad"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aidan_follestad_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/aidan_follestad_google_plus"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/google_plus"
+                    android:textColor="#dd4b39" />
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/aidan_follestad_git_hub"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/git_hub"
+                    android:textColor="#4183c4" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerHorizontal" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/michael_cook_cookicons"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/michael_cook_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/michael_cook_google_plus"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/google_plus"
+                    android:textColor="#dd4b39" />
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/michael_cook_website"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/website"
+                    android:textColor="#4183c4" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerHorizontal" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/maarten_corpel"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/maarten_corpel_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/maarten_corpel_google_plus"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/google_plus"
+                    android:textColor="#dd4b39" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerHorizontal" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aleksandar_tesic"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aleksandar_tesic_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/aleksandar_tesic_google_plus"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/google_plus"
+                    android:textColor="#dd4b39" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
new file mode 100644
index 00000000..4d3ad5af
--- /dev/null
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    app:cardBackgroundColor="?cardBackgroundColor"
+    app:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingBottom="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="24dp"
+            android:text="@string/support_development"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+
+        <LinearLayout
+            android:id="@+id/report_bugs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_bug_report_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/report_bugs"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/report_bugs_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/join_google_plus_community"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_google_plus_box_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/join_community"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/join_community_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/translate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_flag_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/translate"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/translate_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/donate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <android.support.v7.internal.widget.TintImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_attach_money_white_24dp"
+                android:tint="?android:textColorSecondary" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:orientation="vertical"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/donate"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/donate_summary"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid_card_horizontal.xml b/app/src/main/res/layout/item_grid_card_horizontal.xml
index 0f8dae89..0e971ccc 100644
--- a/app/src/main/res/layout/item_grid_card_horizontal.xml
+++ b/app/src/main/res/layout/item_grid_card_horizontal.xml
@@ -6,8 +6,7 @@
     android:layout_marginEnd="8dp"
     android:layout_marginRight="8dp"
     android:foreground="?rect_selector"
-    app:cardBackgroundColor="?cardBackgroundColor"
-    app:elevation="@dimen/card_elevation">
+    app:cardBackgroundColor="?cardBackgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/mini_player.xml b/app/src/main/res/layout/mini_player.xml
index a20e6ce6..3beb49e4 100644
--- a/app/src/main/res/layout/mini_player.xml
+++ b/app/src/main/res/layout/mini_player.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mini_player_height"
-    android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="false">
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 021cff8e..61c330aa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--light theme-->
-    <color name="music_controller_container_color">@color/cardview_light_background</color>
-    <color name="default_bar_color">@color/grey_700</color>
+    <color name="pink_A200">#ff4081</color>
+    <color name="indigo_500">#3f51b5</color>
 
-    <!--dark theme-->
-    <color name="music_controller_container_color_dark">@color/cardview_dark_background</color>
-    <color name="default_bar_color_dark">@color/grey_900</color>
+    <color name="grey_700">#616161</color>
+    <color name="grey_800">#424242</color>
+    <color name="grey_900">#212121</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index da7bfd08..37c52cbe 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Phonograph</string>
-    <string name="cookicons" translatable="false"><a href="http://cookicons.co/">Cookicons</a></string>
-    <string name="karim_abou_zeid" translatable="false"><b>Karim Abou Zeid</b></string>
-    <string name="karim_abou_zeid_links" translatable="false"><a href="https://google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a></string>
-    <string name="aidan_follestad" translatable="false"><a href="https://google.com/+AidanFollestad">Aidan Follestad</a></string>
-    <string name="maarten_corpel" translatable="false"><a href="https://google.com/+MaartenCorpel">Maarten Corpel</a></string>
+
+    <string name="karim_abou_zeid" translatable="false">Karim Abou Zeid</string>
+    <string name="aidan_follestad" translatable="false">Aidan Follestad</string>
+    <string name="maarten_corpel" translatable="false">Maarten Corpel</string>
+    <string name="michael_cook_cookicons" translatable="false">Michael Cook (Cookicons)</string>
+    <string name="aleksandar_tesic" translatable="false">Aleksandar Tešić</string>
+
+    <string name="aachen_germany" translatable="false">Aachen, Germany</string>
+
+    <string name="google_plus" translatable="false">Google Plus</string>
+    <string name="twitter" translatable="false">Twitter</string>
+    <string name="git_hub" translatable="false">GitHub</string>
 
     <string-array name="donation_ids" translatable="false">
         <item>donation_1</item>
diff --git a/app/src/main/res/values/materialcolors.xml b/app/src/main/res/values/materialcolors.xml
deleted file mode 100644
index 8607a11e..00000000
--- a/app/src/main/res/values/materialcolors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- https://gist.github.com/kalehv/bae765c756e94455ed88 -->
-<resources>
-
-    <color name="pink_A200">#ff4081</color>
-    <color name="indigo_500">#3f51b5</color>
-
-    <color name="grey_700">#616161</color>
-    <color name="grey_800">#424242</color>
-    <color name="grey_900">#212121</color>
-
-</resources>
\ 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 3ba872ae..8a5934de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,8 +52,6 @@
     <string name="action_go_to_album">Go to album</string>
     <string name="label_current_playing_queue">Playing queue</string>
     <string name="save_as_playlist">Save as playlist</string>
-    <string name="credits_3">Icon by</string>
-    <string name="credits_1">"Phonograph is a completely free material designed music player by"</string>
     <string name="no_results">No results</string>
     <string name="action_re_download_artist_image">Update artist image</string>
     <string name="updated_artist_image">Artist image updated.</string>
@@ -178,4 +176,24 @@
     <string name="support_development">Support development</string>
     <string name="thank_you">Thank you!</string>
     <string name="play_store_illustration_by">Play Store illustration by</string>
+    <string name="version">Version</string>
+    <string name="application">Application</string>
+    <string name="author">Author</string>
+    <string name="add_to_google_plus_circles">Add to Google Plus circles</string>
+    <string name="follow_on_twitter">Follow on Twitter</string>
+    <string name="fork_on_git_hub">Fork on GitHub</string>
+    <string name="visit_website">Visit website</string>
+    <string name="report_bugs">Report bugs</string>
+    <string name="report_bugs_summary">Report bugs or request new features.</string>
+    <string name="join_community">Join the Google Plus community</string>
+    <string name="join_community_summary">If you need help or have questions, the Phonograph community on Google Plus is a good place to go.</string>
+    <string name="translate">Translate</string>
+    <string name="translate_summary">Help translating Phonograph to your native language.</string>
+    <string name="donate">Donate</string>
+    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave me a few dollars here.</string>
+    <string name="aidan_follestad_summary">For the theme engine and some other great stuff.</string>
+    <string name="michael_cook_summary">For the pretty material app icon.</string>
+    <string name="maarten_corpel_summary">For making the Play Store illustration and the empty album cover.</string>
+    <string name="aleksandar_tesic_summary">For helping me with the design.</string>
+    <string name="website">Website</string>
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 56f760fa..af03a3be 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -8,15 +8,14 @@
 
         <item name="md_dark_theme">true</item>
 
-        <item name="music_controller_container_color">@color/music_controller_container_color_dark
-        </item>
+        <item name="music_controller_container_color">@color/cardview_dark_background</item>
 
         <item name="round_selector">@drawable/round_selector_dark</item>
         <item name="rect_selector">@drawable/rect_selector_dark</item>
 
         <item name="cardBackgroundColor">@color/cardview_dark_background</item>
 
-        <item name="default_bar_color">@color/default_bar_color_dark</item>
+        <item name="default_bar_color">@color/grey_900</item>
 
         <item name="divider_color">@color/md_divider_white</item>
         <item name="icon_color">@color/secondary_text_default_material_dark</item>
@@ -37,14 +36,14 @@
 
         <item name="md_dark_theme">false</item>
 
-        <item name="music_controller_container_color">@color/music_controller_container_color</item>
+        <item name="music_controller_container_color">@color/cardview_light_background</item>
 
         <item name="round_selector">@drawable/round_selector</item>
         <item name="rect_selector">@drawable/rect_selector</item>
 
         <item name="cardBackgroundColor">@color/cardview_light_background</item>
 
-        <item name="default_bar_color">@color/default_bar_color</item>
+        <item name="default_bar_color">@color/grey_700</item>
 
         <item name="divider_color">@color/md_divider_black</item>
         <item name="icon_color">@color/secondary_text_default_material_light</item>