diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
index 7b9df570..f34cff06 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
@@ -32,11 +32,24 @@ public class AboutDialog extends LeakDetectDialogFragment {
                 .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.credits_2),
+                                " ",
+                                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.special_thanks_names),
+                                " ",
+                                getActivity().getResources().getText(R.string.aidan_follestad),
+                                ".\n\n",
                                 getActivity().getResources().getText(R.string.credits_3),
-                                getActivity().getResources().getText(R.string.credits_4))
+                                " ",
+                                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)
diff --git a/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png
new file mode 100644
index 00000000..4b06ddee
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png
new file mode 100644
index 00000000..cdc5ac0a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png
new file mode 100644
index 00000000..edf287c9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png
new file mode 100644
index 00000000..773917c7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png
new file mode 100644
index 00000000..68f446bc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png differ
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 00000000..7d8aacaf
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,81 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:isScrollContainer="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <!-- Application -->
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:cardBackgroundColor="?cardBackgroundColor"
+            app:cardCornerRadius="4dp"
+            app:cardUseCompatPadding="true">
+
+            <LinearLayout
+                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">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Application"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp">
+
+                    <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
+                        android:layout_marginLeft="16dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:orientation="vertical">
+
+                        <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
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index e819800f..75660d50 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -11,6 +11,7 @@
         <include layout="@layout/status_bar" />
 
         <FrameLayout
+            android:clipToPadding="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="@dimen/toolbar_elevation"
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 3e3948cc..da7bfd08 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Phonograph</string>
-    <string name="credits_4" translatable="false">\u0020<a href="http://cookicons.co/">Cookicons</a></string>
-    <string name="credits_2" translatable="false">\u0020<b>Karim Abou Zeid</b>.\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a>\n\n</string>
-    <string name="special_thanks_names" translatable="false">\u0020<a href="https://google.com/+AidanFollestad">Aidan Follestad</a>\n\n</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-array name="donation_ids" translatable="false">
         <item>donation_1</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd229897..3ba872ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -177,4 +177,5 @@
     <string name="back">back</string>
     <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>
 </resources>