diff --git a/app/build.gradle b/app/build.gradle
index e4b4585f..2cd2f9c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:customtabs:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
 
     // More libraries
     compile 'com.jakewharton:butterknife:8.0.1'
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
index 2caa1c72..056a4a2e 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
@@ -21,8 +21,10 @@ package com.github.dfa.diaspora_android.activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.AppBarLayout;
@@ -37,6 +39,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -58,6 +61,7 @@ import java.util.Observer;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /**
  * Activity that holds some fragments that show information about the app in a tab layout
@@ -146,12 +150,24 @@ public class AboutActivity extends ThemedActivity
 
         public static final String TAG = "com.github.dfa.diaspora_android.AboutActivity.AboutFragment";
 
-        @BindView(R.id.fragment_about__about_text)
-        TextView aboutText;
-
         @BindView(R.id.fragment_about__app_version)
         TextView appVersion;
 
+        @BindView(R.id.fragment_about__spread_the_word_text)
+        HtmlTextView spreadText;
+
+        @BindView(R.id.fragment_about__contribute_button)
+        Button contributeBtn;
+
+        @BindView(R.id.fragment_about__translate_button)
+        Button translateBtn;
+
+        @BindView(R.id.fragment_about__feedback_button)
+        Button feedbackBtn;
+
+        @BindView(R.id.fragment_about__spread_the_word_button)
+        Button spreadBtn;
+
         public AboutFragment() {
         }
 
@@ -174,7 +190,12 @@ public class AboutActivity extends ThemedActivity
 
         @Override
         protected void applyColorToViews() {
-            ThemeHelper.updateTextViewLinkColor(aboutText);
+            ThemeHelper.getInstance(getAppSettings());
+            ThemeHelper.updateTextViewLinkColor(spreadText);
+            contributeBtn.setTextColor(ThemeHelper.getAccentColor());
+            feedbackBtn.setTextColor(ThemeHelper.getAccentColor());
+            spreadBtn.setTextColor(ThemeHelper.getAccentColor());
+            translateBtn.setTextColor(ThemeHelper.getAccentColor());
         }
 
         @Override
@@ -191,6 +212,28 @@ public class AboutActivity extends ThemedActivity
         public boolean onBackPressed() {
             return false;
         }
+
+        @OnClick({R.id.fragment_about__contribute_button, R.id.fragment_about__translate_button, R.id.fragment_about__feedback_button, R.id.fragment_about__spread_the_word_button})
+        public void buttonClicked(View view) {
+            switch (view.getId()) {
+                case R.id.fragment_about__contribute_button:
+                    Helpers.openInExternalBrowser(getContext(), getString(R.string.fragment_about__contribute_link));
+                    break;
+                case R.id.fragment_about__translate_button:
+                    Helpers.openInExternalBrowser(getContext(), getString(R.string.fragment_about__translate_link));
+                    break;
+                case R.id.fragment_about__feedback_button:
+                    Helpers.openInExternalBrowser(getContext(), getString(R.string.fragment_About__feedback_link));
+                    break;
+                case R.id.fragment_about__spread_the_word_button:
+                    Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+                    sharingIntent.setType("text/plain");
+                    sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_name));
+                    sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.fragment_about__spread_the_word_share_text, getString(R.string.fragment_about__fdroid_link)));
+                    startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
+                    break;
+            }
+        }
     }
 
     /**
@@ -199,11 +242,20 @@ public class AboutActivity extends ThemedActivity
     public static class LicenseFragment extends ThemedFragment {
         public static final String TAG = "com.github.dfa.diaspora_android.AboutActivity.LicenseFragment";
 
-        @BindView(R.id.fragment_license__licensetext)
-        HtmlTextView textLicenseBox;
+        @BindView(R.id.fragment_license__maintainers_text)
+        HtmlTextView maintainers;
 
-        @BindView(R.id.fragment_license__3rdparty)
-        HtmlTextView textLicense3partyBox;
+        @BindView(R.id.fragment_license__contributors_text)
+        HtmlTextView contributors;
+
+        @BindView(R.id.fragment_license__thirdparty_libs_text)
+        HtmlTextView thirdPartyLibs;
+
+        @BindView(R.id.fragment_license__license_button)
+        Button licenseBtn;
+
+        @BindView(R.id.fragment_license__leafpic_button)
+        Button leafpicBtn;
 
         private String accentColor;
 
@@ -218,18 +270,24 @@ public class AboutActivity extends ThemedActivity
             final Context context = rootView.getContext();
             accentColor = Helpers.colorToHex(ThemeHelper.getAccentColor());
 
-            textLicenseBox.setTextFormatted(getString(R.string.fragment_license__license_content,
-                    getMaintainersHtml(context),
-                    getContributorsHtml(context),
-                    getLicenseHtml(context)
-            ));
-
-            textLicense3partyBox.setTextFormatted(
-                    getLicense3dPartyHtml(context)
-            );
+            maintainers.setTextFormatted(getString(R.string.fragment_license__maintainers_text, getMaintainersHtml(context)));
+            contributors.setTextFormatted(getString(R.string.fragment_license__contributors_thank_you, getContributorsHtml(context)));
+            thirdPartyLibs.setTextFormatted(getLicense3dPartyHtml(context));
             return rootView;
         }
 
+        @OnClick({R.id.fragment_license__leafpic_button, R.id.fragment_license__license_button})
+        public void buttonClicked(View v) {
+            switch (v.getId()) {
+                case R.id.fragment_license__leafpic_button:
+                    Helpers.openInExternalBrowser(getContext(), getString(R.string.fragment_licesen__misc_leafpic_link));
+                    break;
+                case R.id.fragment_license__license_button:
+                    Helpers.openInExternalBrowser(getContext(), getString(R.string.fragment_license__license_gpl_link));
+                    break;
+            }
+        }
+
         public String getContributorsHtml(Context context) {
             String text = Helpers.readTextfileFromRawRessource(context, R.raw.contributors,
                     "<font color='" + accentColor + "'><b>*</b></font> ", "<br>");
@@ -244,12 +302,6 @@ public class AboutActivity extends ThemedActivity
             return text;
         }
 
-        public String getLicenseHtml(Context context) {
-            String text = Helpers.readTextfileFromRawRessource(context, R.raw.license,
-                    "", "").replace("\n\n", "<br><br>");
-            return text;
-        }
-
         public String getLicense3dPartyHtml(Context context) {
             String text = Helpers.readTextfileFromRawRessource(context, R.raw.license_third_party, "", "<br>");
             text = text.replace("NEWENTRY", "<font color='" + accentColor + "'><b>*</b></font> ");
@@ -258,8 +310,11 @@ public class AboutActivity extends ThemedActivity
 
         @Override
         protected void applyColorToViews() {
-            ThemeHelper.updateTextViewLinkColor(textLicense3partyBox);
-            ThemeHelper.updateTextViewLinkColor(textLicenseBox);
+            ThemeHelper.getInstance(getAppSettings());
+            leafpicBtn.setTextColor(ThemeHelper.getAccentColor());
+            licenseBtn.setTextColor(ThemeHelper.getAccentColor());
+            ThemeHelper.updateTextViewLinkColor(maintainers);
+            ThemeHelper.updateTextViewLinkColor(thirdPartyLibs);
         }
 
         @Override
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
index 5db1e5d2..c6059bd3 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
@@ -150,4 +150,15 @@ public class Helpers {
         }
         return !isOnline;
     }
+
+    /**
+     * Send an Intent that opens url in any browser
+     * @param context context
+     * @param url url
+     */
+    public static void openInExternalBrowser(Context context, String url) {
+        Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        openBrowserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(openBrowserIntent);
+    }
 }
diff --git a/app/src/main/res/layout/about__fragment_about.xml b/app/src/main/res/layout/about__fragment_about.xml
index 6283eee7..94f06710 100644
--- a/app/src/main/res/layout/about__fragment_about.xml
+++ b/app/src/main/res/layout/about__fragment_about.xml
@@ -1,10 +1,11 @@
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:layout_marginBottom="@dimen/activity_vertical_margin"
+    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+    android:layout_marginRight="@dimen/activity_horizontal_margin"
     tools:context="com.github.dfa.diaspora_android.activity.AboutActivity$AboutFragment">
 
     <LinearLayout
@@ -12,34 +13,223 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!--Vertical padding-->
-        <android.support.v4.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/activity_vertical_margin" />
-
-        <TextView
-            android:id="@+id/fragment_about__app_name"
-            style="@android:style/TextAppearance.DeviceDefault.Large"
+        <!-- About -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/diaspora_for_android"
-            android:textAlignment="center" />
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
 
-        <TextView
-            android:id="@+id/fragment_about__app_version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__about"/>
 
-        <android.support.v4.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="16dp" />
+                <TextView
+                    android:id="@+id/fragment_about__app_version"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_debug__app_version"/>
 
-        <com.github.dfa.diaspora_android.ui.HtmlTextView
-            android:id="@+id/fragment_about__about_text"
-            style="@android:style/TextAppearance.DeviceDefault.Small"
+                <TextView
+                    android:id="@+id/fragment_about__app_codename"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_debug__app_codename"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__about_text"
+                    android:layout_marginBottom="16dp"/>
+
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Contribute Code -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:linksClickable="true"
-            android:text="@string/fragment_about__about_content" />
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__contribute"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__contribute_text"/>
+
+                <Button
+                    android:id="@+id/fragment_about__contribute_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_about__contribute_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Translate -->
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__translate"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__translate_text"/>
+
+                <Button
+                    android:id="@+id/fragment_about__translate_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_about__translate_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Give Feedback -->
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__feedback"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__feedback_text"/>
+
+                <Button
+                    android:id="@+id/fragment_about__feedback_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_about__feedback_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Spread the Word -->
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__spread_the_word"
+                    android:layout_marginBottom="8dp"/>
+
+                <com.github.dfa.diaspora_android.ui.HtmlTextView
+                    android:id="@+id/fragment_about__spread_the_word_text"
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_about__spread_the_word_text"/>
+
+                <Button
+                    android:id="@+id/fragment_about__spread_the_word_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_about__spread_the_word_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/about__fragment_license.xml b/app/src/main/res/layout/about__fragment_license.xml
index 5b8360d4..ca42b98e 100644
--- a/app/src/main/res/layout/about__fragment_license.xml
+++ b/app/src/main/res/layout/about__fragment_license.xml
@@ -1,10 +1,11 @@
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:layout_marginBottom="@dimen/activity_vertical_margin"
+    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+    android:layout_marginRight="@dimen/activity_horizontal_margin"
     tools:context="com.github.dfa.diaspora_android.activity.AboutActivity$LicenseFragment">
 
     <LinearLayout
@@ -12,37 +13,202 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!--Vertical Padding-->
-        <android.support.v4.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/activity_vertical_margin" />
-
-        <TextView
-            style="@android:style/TextAppearance.DeviceDefault.Large"
+        <!-- Maintainers -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/fragment_license__copyright_years" />
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
 
-        <com.github.dfa.diaspora_android.ui.HtmlTextView
-            android:id="@+id/fragment_license__licensetext"
-            style="@android:style/TextAppearance.DeviceDefault.Small"
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__maintainers"/>
+
+                <com.github.dfa.diaspora_android.ui.HtmlTextView
+                    android:id="@+id/fragment_license__maintainers_text"
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__maintainers_text"
+                    android:layout_marginBottom="8dp"/>
+
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Contributors -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:linksClickable="true"
-            android:text="@string/fragment_license__license_content" />
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
 
-        <TextView
-            style="@android:style/TextAppearance.DeviceDefault.Large"
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__contributors"
+                    android:layout_marginBottom="8dp"/>
+
+                <com.github.dfa.diaspora_android.ui.HtmlTextView
+                    android:id="@+id/fragment_license__contributors_text"
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp" />
+
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- License -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/fragment_license__3rd_party_libs_title" />
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
 
-        <com.github.dfa.diaspora_android.ui.HtmlTextView
-            android:id="@+id/fragment_license__3rdparty"
-            style="@android:style/TextAppearance.DeviceDefault.Small"
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__license"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__license_text"/>
+
+                <Button
+                    android:id="@+id/fragment_license__license_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_license__license_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Third Party Libraries -->
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:linksClickable="true" />
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__thirdparty_libs"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__thirdparty_libs_text"/>
+
+                <com.github.dfa.diaspora_android.ui.HtmlTextView
+                    android:id="@+id/fragment_license__thirdparty_libs_text"
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <!-- Miscellaneous -->
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            style="?android:attr/buttonBarStyle"
+            card_view:cardElevation="5dp"
+            card_view:cardCornerRadius="5dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/activity_horizontal_margin_half"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin_half">
+
+                <TextView
+                    style="@android:style/TextAppearance.DeviceDefault.Large"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__misc"
+                    android:layout_marginBottom="8dp"/>
+
+                <TextView
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_license__misc_leafpic"/>
+
+                <Button
+                    android:id="@+id/fragment_license__leafpic_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/fragment_license__misc_leafpic_button"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
diff --git a/app/src/main/res/values-de/strings-about.xml b/app/src/main/res/values-de/strings-about.xml
index ad828972..da34ab72 100644
--- a/app/src/main/res/values-de/strings-about.xml
+++ b/app/src/main/res/values-de/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">Debug-Protokoll</string>
   <string name="fragment_debug__section_log_spam">Debug-Protokoll (Verbose)</string>
   <string name="fragment_debug__app_version">App Version: %1$s</string>
-  <string name="fragment_debug__package_name">Paketname: %1$s</string>
   <string name="fragment_debug__android_version">Android Version: %1$s</string>
   <string name="fragment_debug__device_name">Gerätename: %1$s</string>
   <string name="fragment_debug__app_codename">Codename: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Pod Profil Name: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Debug-Protokoll in Zwischenablage kopiert</string>
-  <string name="fragment_license__3rd_party_libs_title">Verwendete Drittanbieter-Bibliotheken</string>
-  <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-        DiasporaForAndroid ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk Diaspora. Er bietet dir zusätzliche Features wie nützliche Toolbars und Unterstützung für Proxyserver wie etwa das Tornetzwerk. &lt;br&gt;&lt;br&gt;
-
-        Diaspora benutzt Markdown-Formatierung für deine Beiträge. Weitere Informationen dazu findest du auf&lt;br&gt;
-        https://wiki.diasporafoundation.org/Markdown_reference_guide &lt;br&gt; &lt;br&gt;
-
-        DiasporaForAndroid wird frei wie in Freiheit entwickelt und folgt den Ideen des Diaspora Projektes. &lt;br&gt;
-        Den Quellcode findest du auf Github: &lt;br&gt;
-        https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-        Wenn du auf Probleme stößt oder Vorschläge hast, nutze den Bugtracker (siehe Link oben).
-        Alternativ kannst du deine Frage auch mit dem Hashtag #DFAQ auf Diaspora posten.&lt;br&gt; &lt;br&gt;
-        Die App ist nicht in deiner Sprache verfügbar? Hilf mit und übersetze die App auf Crowdin.com!&lt;br&gt;
-        https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-        Wenn du Lust hast erzähle doch deinen Freunden von #DiasporaForAndroid!</string>
+    <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-es/strings-about.xml b/app/src/main/res/values-es/strings-about.xml
index c8b437e0..669c3427 100644
--- a/app/src/main/res/values-es/strings-about.xml
+++ b/app/src/main/res/values-es/strings-about.xml
@@ -11,31 +11,12 @@
   <string name="fragment_debug__section_log">Depurar registro</string>
   <string name="fragment_debug__section_log_spam">Depurar registro (Detallado)</string>
   <string name="fragment_debug__app_version">Versión aplicación:%1$s</string>
-  <string name="fragment_debug__package_name">Nombre del paquete: %1$s</string>
   <string name="fragment_debug__android_version">Versión de Android: %1$s</string>
   <string name="fragment_debug__device_name">Nombre del dispositivo: %1$s</string>
   <string name="fragment_debug__app_codename">Nombre clave: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Nombre de perfil del pod: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Dominio del pod:%1$s</string>
   <string name="fragment_debug__toast_log_copied">Registro de depuración copiado al portapapeles</string>
-  <string name="fragment_license__3rd_party_libs_title">Usadas bibliotecas de terceros</string>
   <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-DiasporaForAndroid es su aplicación complementaria para explorar la red social Diaspora. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social. &lt;br&gt;&lt;br&gt;
-
-Diaspora utiliza Markdown para dar formato a las publicaciones. Puede encontrar más informaciónat&lt;br&gt;
-
-El desarrollo de DiasporaForAndroid es libre en sentido de libertad y sigue las ideas del proyecto Diaspora.&lt;br&gt;
-
-Puede encontrar el código fuente en Github: &lt;br&gt;
-https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-Si encuentra algún problema o tiene alguna sugerencia, puede utilizar nuestro gestor de errores en el enlace de arriba.
-También puede publicar su pregunta utilizando la etiqueta #DFAQ en Diaspora. &lt;br&gt; &lt;br&gt;
-
-¿Esta aplicación no está disponible en su idioma? Compruebe nuestro proyecto en Crowdin.com y ¡ayúdenos a traducirlo!&lt;br&gt;
-https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-¡No dude en hablarle a sus amigos de #DiasporaforAndroid!</string>
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings-about.xml b/app/src/main/res/values-fr/strings-about.xml
index 35c0fea8..75c836a5 100644
--- a/app/src/main/res/values-fr/strings-about.xml
+++ b/app/src/main/res/values-fr/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">Journal de débogage</string>
   <string name="fragment_debug__section_log_spam">Log de débogage (Verbeux)</string>
   <string name="fragment_debug__app_version">Version app : %1$s</string>
-  <string name="fragment_debug__package_name">Nom du paquet : %1$s</string>
-  <string name="fragment_debug__android_version">Version Android : %1$s</string>
+    <string name="fragment_debug__android_version">Version Android : %1$s</string>
   <string name="fragment_debug__device_name">Nom de l\'appareil : %1$s</string>
   <string name="fragment_debug__app_codename">Nom de code : %1$s</string>
   <string name="fragment_debug__pod_profile_name">Pod alias : %1$s</string>
   <string name="fragment_debug__pod_profile_url">Adresse du pod : %1$s</string>
   <string name="fragment_debug__toast_log_copied">Journal de débogage copié dans le presse-papiers</string>
-  <string name="fragment_license__3rd_party_libs_title">Bibliothèques tierces utilisées</string>
-  <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-        DiasporaForAndroid est votre app compagnon pour naviguer sur le réseau social Diaspora*. Il ajoute des fonctionnalités supplémentaires comme des barres d’outils utiles et la prise en charge pour les serveurs proxy comme le réseau Tor à votre expérience sociale. &lt;br&gt;&lt;br&gt;
-
-        Diaspora* utilise Markdown pour mettre en forme les messages. Vous pouvez trouver plus d’informations sur&lt;br&gt;
-        https://wiki.diasporafoundation.org/Markdown_reference_guide &lt;br&gt; &lt;br&gt;
-
-        DiasporaForAndroid est un logiciel libre et suit les idées du projet Diaspora*. &lt;br&gt;
-        Vous pouvez trouver le code source sur Github : &lt;br&gt;
-        https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-        Si vous rencontrez des problèmes ou si vous avez des suggestions, vous pouvez utiliser notre bug tracker avec le lien ci-dessus.
-        Alternativement, vous pouvez poster votre question avec le hashtag #DFAQ sur Diaspora*. &lt;br&gt; &lt;br&gt;
-        Cette application n’est pas disponible dans votre langue ? Découvrez notre projet sur Crowdin et aidez à la traduire ! !&lt;br&gt;
-        https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-        Aussi, n’hésitez pas à parler à vos amis de #DiasporaForAndroid !</string>
+    <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml
index 3d9d3390..1a8a22cf 100644
--- a/app/src/main/res/values-it/strings-about.xml
+++ b/app/src/main/res/values-it/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">Log di debug</string>
   <string name="fragment_debug__section_log_spam">Log di debug (dettagliato)</string>
   <string name="fragment_debug__app_version">Versione app: %1$s</string>
-  <string name="fragment_debug__package_name">Nome pacchetto: %1$s</string>
-  <string name="fragment_debug__android_version">Versione Android: %1$s</string>
+    <string name="fragment_debug__android_version">Versione Android: %1$s</string>
   <string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
   <string name="fragment_debug__app_codename">Codename: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Pod alias: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Dominio pod: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
-  <string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string>
-  <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-DiasporaForAndroid è la tua app per navigare sul social network Diaspora. Aggiunge funzioni, come un\'utile barra di navigazione e il supporto ai server proxy come la rete Tor, alla tua esperienza social. &lt;br&gt;&lt;br&gt;
-
-        Diaspora usa la sintassi Markdown per formattare i post. Puoi trovare maggiori informazioni su&lt;br&gt;
-        https://wiki.diasporafoundation.org/Markdown_reference_guide/it &lt;br&gt; &lt;br&gt;
-
-        DiasporaForAndroid è sviluppato liberamente e segue le idee del progetto Diaspora. &lt;br&gt;
-        Puoi trovare il codice sorgente su Github: &lt;br&gt;
-        https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-        Se trovi qualsiasi problema o hai dei suggerimenti puoi usare il nostro bug tracker al link sopraccitato.
-        Alternativamente puoi postare la tua domanda con l\'hashtag #DFAQ su Diaspora. &lt;br&gt; &lt;br&gt;
-        Quest\'app non è tradotta nella tua lingua? Visita il nostro progetto su Crowdin e aiuta la traduzione!&lt;br&gt;
-        https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-        Sentiti poi libero di parlare ai tuoi amici di #DiasporaForAndroid!</string>
+    <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings-about.xml b/app/src/main/res/values-ja/strings-about.xml
index 42b1c4c9..23c23067 100644
--- a/app/src/main/res/values-ja/strings-about.xml
+++ b/app/src/main/res/values-ja/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">デバッグログ</string>
   <string name="fragment_debug__section_log_spam">デバッグ ログ (詳細)</string>
   <string name="fragment_debug__app_version">アプリバージョン: %1$s</string>
-  <string name="fragment_debug__package_name">パッケージ名: %1$s</string>
   <string name="fragment_debug__android_version">Android バージョン: %1$s</string>
   <string name="fragment_debug__device_name">デバイス名: %1$s</string>
   <string name="fragment_debug__app_codename">コード名: %1$s</string>
   <string name="fragment_debug__pod_profile_name">ポッドプロファイル名: %1$s</string>
   <string name="fragment_debug__pod_profile_url">ポッドドメイン: %1$s</string>
   <string name="fragment_debug__toast_log_copied">デバッグログをクリップボードにコピーしました</string>
-  <string name="fragment_license__3rd_party_libs_title">使用したサードパーティ ライブラリー</string>
   <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-DiasporaForAndroid は、ダイアスポラ ソーシャル ネットワークを閲覧するためのコンパニオン アプリです。ソーシャル体験に便利なツールバーや Tor のようなプロキシ サーバーのサポートのような追加機能があります。&lt;br&gt;&lt;br&gt;
-
-ダイアスポラは、投稿の書式にマークダウンを使用します。詳細は&lt;br&gt;
-https://wiki.diasporafoundation.org/Markdown_reference_guide &lt;br&gt; &lt;br&gt;
-
-DiasporaForAndroid は自由に無料で開発され、ダイアスポラ プロジェクトの考えをフォローしています。&lt;br&gt;
-Github でソースコードを見つけることができます: &lt;br&gt;
-https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-何か問題に直面したり、提案がある場合は、上記のリンクで私たちのバグトラッカーを使用できます。
-またダイアスポラにハッシュタグ #DFAQ で質問を投稿することもできます。&lt;br&gt; &lt;br&gt;
-このアプリがあなたの言語で利用可能できませんか? Crowdin.com で私たちのプロジェクトを確認して、翻訳を手伝ってください!&lt;br&gt;
-https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-また気軽に #DiasporaForAndroid について友達に教えてください!</string>
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-ml/strings-about.xml b/app/src/main/res/values-ml/strings-about.xml
index f9b22ee5..a95624bc 100644
--- a/app/src/main/res/values-ml/strings-about.xml
+++ b/app/src/main/res/values-ml/strings-about.xml
@@ -8,8 +8,6 @@
   <string name="fragment_debug__section_app">അപ്ലിക്കേഷന്‍</string>
   <string name="fragment_debug__section_pod">ഡയസ്പോറ പോഡ്</string>
   <string name="fragment_debug__app_version">പ്രയോഗത്തിന്റെ പതിപ്പ്:%1$s</string>
-  <string name="fragment_debug__package_name">പാക്കേജിന്റെ പേര്:%1$s</string>
-  <string name="fragment_license__3rd_party_libs_title">മൂന്നാം കക്ഷി ലൈബ്രറികൾ ഉപയോഗിച്ചിട്ടുണ്ട്</string>
   <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings-about.xml b/app/src/main/res/values-nl/strings-about.xml
index bdb318aa..2b805ed6 100644
--- a/app/src/main/res/values-nl/strings-about.xml
+++ b/app/src/main/res/values-nl/strings-about.xml
@@ -11,16 +11,12 @@
   <string name="fragment_debug__section_log">Debug Logboek</string>
   <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
   <string name="fragment_debug__app_version">Versie: %1$s</string>
-  <string name="fragment_debug__package_name">Pakket-naam: %1$s</string>
   <string name="fragment_debug__android_version">Android-versie: %1$s</string>
   <string name="fragment_debug__device_name">Toestelnaam: %1$s</string>
   <string name="fragment_debug__app_codename">Versienaam: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Pod Profielnaam: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Pod-domein: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Tekst naar klembord gekopieerd</string>
-  <string name="fragment_license__3rd_party_libs_title">Gebruikte bibliotheken van derden</string>
   <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-DiasporaForAndroid is uw behulpzame app voor het bladeren door het sociale netwerk van Diaspora. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Network aan uw sociale ervaring. &lt; Br &gt;&lt; br &gt; Diaspora maakt gebruik van Markdown voor het opmaken van berichten. U vindt meer informatie bij &lt; br &gt; https://diasporafoundation.org/formatting &lt; br &gt;&lt; br &gt; DiasporaForAndroid is vrije software als in het is in vrijheid ontwikkeld en volgt de ideeën van het Diaspora-project &lt; Br &gt; kunt u de broncode op Github: &lt; br &gt; https://github.com/Diaspora-for-Android/diaspora-android &lt; br &gt;&lt; br &gt; wanneer u tegen eventuele problemen aanloopt of als u suggesties hebt, u onze bug tracker op de bovenstaande link kunt.         Als alternatief kunt u uw vraag met de hashtag #DFAQ op Diaspora plaatsen. &lt; Br &gt;&lt; br &gt; deze app niet beschikbaar in uw taal? Check ons project op Crowdin.com en help mee met vertalen! &lt; br &gt; https://crowdin.com/project/diaspora-for-android &lt; br &gt;&lt; br &gt;  voel je ook vrij om je vrienden vertellen over #DiasporaForAndroid!</string>
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-pl/strings-about.xml b/app/src/main/res/values-pl/strings-about.xml
index aa051962..d27c5818 100644
--- a/app/src/main/res/values-pl/strings-about.xml
+++ b/app/src/main/res/values-pl/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">Log debugowania</string>
   <string name="fragment_debug__section_log_spam">Log debugowania (rozszerzony)</string>
   <string name="fragment_debug__app_version">Wersja aplikacji: %1$s</string>
-  <string name="fragment_debug__package_name">Nazwa pakietu: %1$s</string>
   <string name="fragment_debug__android_version">Wersja systemu Android: %1$s</string>
   <string name="fragment_debug__device_name">Nazwa urządzenia: %1$s</string>
   <string name="fragment_debug__app_codename">Nazwa kodowa: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Alias Poda: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Domena Poda: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Log debugowania został skopiowany do schowka</string>
-  <string name="fragment_license__3rd_party_libs_title">Lista bibliotek zewnętrznych</string>
   <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-DiasporaForAndroid to Twój cyfrowy towarzysz ułatwiający korzystanie z Diaspory. Aplikacja dodaje użyteczne paski narzędzi oraz obsługę serwerów proxy takich jak Tor, by korzystanie z Diaspory było jeszcze przyjemniejsze. &lt;br&gt;&lt;br&gt;
-
-Diaspora do formatowania tekstu wykorzystuje język Markdown. By dowiedzieć się więcej na ten temat odwiedź&lt;br&gt;
-https://diasporafoundation.org/formatting &lt;br&gt; &lt;br&gt;
-
-DiasporaForAndroid to aplikacja podążająca za duchem wolnego (w sensie wolności) oprogramowania i odzwierciedlająca idee stojące za projektem Diaspora. &lt;br&gt;
-Kod źródłowy aplikacji znajdziesz na Githubie: &lt;br&gt;
-https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-Jeżeli natrafisz na jakikolwiek problem lub masz jakieś sugestie, możesz użyć naszego systemu zgłaszania błędów, do którego odnośnik znajdziesz powyżej.
-Możesz także zadać pytanie na Diasporze używając we wpisie tagu #DFAQ.&lt;br&gt; &lt;br&gt;
-Chciałbyś by aplikacja była dostępna także w Twoim języku? Zajrzyj na Crowdin.com i pomóż w tłumaczeniu!&lt;br&gt;
-https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-Poza tym, nie omieszkaj powiedzieć swoim znajomym o #DiasporaForAndroid!</string>
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings-about.xml b/app/src/main/res/values-ru/strings-about.xml
index f6f05ba6..e5c1e566 100644
--- a/app/src/main/res/values-ru/strings-about.xml
+++ b/app/src/main/res/values-ru/strings-about.xml
@@ -11,30 +11,12 @@
   <string name="fragment_debug__section_log">Журнал отладки</string>
   <string name="fragment_debug__section_log_spam">Журнал отладки (подробный)</string>
   <string name="fragment_debug__app_version">Версия приложения: %1$s</string>
-  <string name="fragment_debug__package_name">Название пакета: %1$s</string>
-  <string name="fragment_debug__android_version">Версия Android: %1$s</string>
+    <string name="fragment_debug__android_version">Версия Android: %1$s</string>
   <string name="fragment_debug__device_name">Имя устройства: %1$s</string>
   <string name="fragment_debug__app_codename">Кодовое имя: %1$s</string>
   <string name="fragment_debug__pod_profile_name">Имя профиля пода: %1$s</string>
   <string name="fragment_debug__pod_profile_url">Домен пода: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Журнал отладки скопирован в буфер обмена</string>
-  <string name="fragment_license__3rd_party_libs_title">Используемые сторонние библиотеки</string>
-  <!-- About (large amount of text) -->
-  <string name="fragment_about__about_content">
-        DiasporaForAndroid - это приложение-компаньон для социальной сети Диаспора. Оно добавляет такие функции, как удобные панели инструментов и поддержку прокси-серверов (таких как Tor). &lt;br&gt;&lt;br&gt;
-
-        Диаспора использует Markdown для форматирования сообщений. Вы можете найти дополнительную информацию по ссылке&lt;br&gt;
-        https://wiki.diasporafoundation.org/Markdown_reference_guide &lt;br&gt; &lt;br&gt;
-
-        DiasporaForAndroid разрабатывается как свободное ПО и придерживается идей проекта Диаспора. &lt;br&gt;
-        Вы можете найти исходный код на Github: &lt;br&gt;
-        https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
-
-        Если у вас возникли проблемы или у вас есть предложения, вы можете использовать наш баг трекер по ссылке выше.
-        Также вы можете разместить сообщение с вашим вопросом с хэштегом #DFAQ на Диаспоре. &lt;br&gt; &lt;br&gt;
-        Приложение не доступно на вашем языке? Проверьте наш проект на Crowdin.com и помогите перевести его!&lt;br&gt;
-        https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
-
-        Не стесняйтесь посоветовать #DiasporaForAndroid вашим друзьям!</string>
+    <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>
diff --git a/app/src/main/res/values/strings-about.xml b/app/src/main/res/values/strings-about.xml
index ff5df216..7724f186 100644
--- a/app/src/main/res/values/strings-about.xml
+++ b/app/src/main/res/values/strings-about.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- License & help (large amount of text) -->
-    <string name="fragment_license__copyright_years" translatable="false">Copyright © 2015–2016</string>
-    <string name="fragment_license__license_content" translatable="false">
-        &lt;h2>Maintainers:&lt;/h2> %1$s
-        &lt;h2>Contributors:&lt;/h2> %2$s
-        &lt;h2>License:&lt;/h2> %3$s
-    </string>
     <string name="about_activity__title_about_app">About</string>
     <string name="about_activity__title_about_license">License</string>
     <string name="about_activity__title_debug_info">Debugging</string>
@@ -16,34 +9,58 @@
     <string name="fragment_debug__section_log">Debug Log</string>
     <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
     <string name="fragment_debug__app_version">App Version: %1$s</string>
-    <string name="fragment_debug__package_name">Package Name: %1$s</string>
     <string name="fragment_debug__android_version">Android Version: %1$s</string>
     <string name="fragment_debug__device_name">Device Name: %1$s</string>
     <string name="fragment_debug__app_codename">Codename: %1$s</string>
     <string name="fragment_debug__pod_profile_name">Pod Profile Name: %1$s</string>
     <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
     <string name="fragment_debug__toast_log_copied">Debug log copied to clipboard</string>
-    <string name="fragment_license__3rd_party_libs_title">Used 3rd Party Libraries</string>
+
+    <string name="fragment_about__about">@string/diaspora_for_android</string>
+    <string name="fragment_about__about_text">DiasporaForAndroid is your companion app for browsing the Diaspora social network. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience.</string>
+
+    <string name="fragment_about__contribute">Contribute Code!</string>
+    <string name="fragment_about__contribute_text">DiasporaForAndroid is developed free as in Freedom and follows the ideas of the diaspora* project. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
+    <string name="fragment_about__contribute_button">Get the source</string>
+    <string name="fragment_about__contribute_link" translatable="false">https://github.com/Diaspora-for-Android/diaspora-android</string>
+
+    <string name="fragment_about__translate">Translate the App!</string>
+    <string name="fragment_about__translate_text">The app is not available in your language? You can change that! Why don\'t you help us by translating it? We use the crowdin platform to enable anyone to translate the app.</string>
+    <string name="fragment_about__translate_button">Let me translate</string>
+    <string name="fragment_about__translate_link" translatable="false">https://crowdin.com/project/diaspora-for-android/invite</string>
+
+    <string name="fragment_about__feedback">Give Feedback!</string>
+    <string name="fragment_about__feedback_text">DiasporaForAndroid is still in development, so if you have suggestions or any kind of feedback, please use our bug tracker to let us know!</string>
+    <string name="fragment_about__feedback_button">Report Bugs</string>
+    <string name="fragment_About__feedback_link" translatable="false">https://github.com/Diaspora-for-Android/diaspora-android/issues</string>
+
+    <string name="fragment_about__spread_the_word">Spread the word!</string>
+    <string name="fragment_about__spread_the_word_text">Tell your friends and family about diaspora* and #DiasporaForAndroid! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
+    <string name="fragment_about__spread_the_word_button">Share the app</string>
+    <string name="fragment_about__spread_the_word_share_text">Hey! Check out #DiasporaForAndroid! %1$s</string>
+    <string name="fragment_about__fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android</string>
 
 
-    <!-- About (large amount of text) -->
-    <string name="fragment_about__about_content">
-        DiasporaForAndroid is your companion app for browsing the Diaspora social network. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience. &lt;br>&lt;br>
+    <!-- License & help (large amount of text) -->
+    <string name="fragment_license__maintainers">Maintainers</string>
+    <string name="fragment_license__maintainers_text">This app is currently being developed and maintained by &lt;br>&lt;br>%1$s</string>
+    <string name="fragment_license__contributors">Contributors</string>
+    <string name="fragment_license__contributors_thank_you">%1$s&lt;br>&lt;br>Thank you!</string>
+    <string name="fragment_license__license">License</string>
+    <string name="fragment_license__license_text" translatable="false">
+        Copyright © 2015-2016
+        \nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+        \n
+        \nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+    </string>
+    <string name="fragment_license__license_button">GNU GPLv3+ License</string>
+    <string name="fragment_license__license_gpl_link" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
+    <string name="fragment_license__thirdparty_libs">Thirdparty Libraries</string>
+    <string name="fragment_license__thirdparty_libs_text">The following libraries are used:</string>
+    <string name="fragment_license__misc">Miscellaneous</string>
+    <string name="fragment_license__misc_leafpic">We took some inspiration and code from LeafPic. Go check it out, its free software as well!</string>
+    <string name="fragment_license__misc_leafpic_button">Tell me more</string>
+    <string name="fragment_licesen__misc_leafpic_link" translatable="false">https://github.com/HoraApps/LeafPic</string>
 
-        Diaspora uses Markdown to format posts. You can find more information at&lt;br>
-        https://diasporafoundation.org/formatting &lt;br> &lt;br>
-
-        DiasporaForAndroid is developed free as in freedom and follows the ideas of the Diaspora project. &lt;br>
-        You can find the source code on Github: &lt;br>
-        https://github.com/Diaspora-for-Android/diaspora-android &lt;br> &lt;br>
-
-        If you face any problems or if you have suggestions, you can use our bug tracker at the link above.
-        Alternatively you can post your question with the hashtag #DFAQ on Diaspora. &lt;br> &lt;br>
-        This app is not available in your language? Check out our project on Crowdin.com and help to translate it!&lt;br>
-        https://crowdin.com/project/diaspora-for-android &lt;br> &lt;br>
-
-        Also feel free to tell your friends about #DiasporaForAndroid!</string>
-
-    <!-- Lorem ipsum -->
     <string name="lorem_ipsum" translatable="false">Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht? Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht?</string>
 </resources>