diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Fragments/AboutFragment.java b/app/src/main/java/org/shadowice/flocke/andotp/Fragments/AboutFragment.java
index 2114a734..564bf482 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Fragments/AboutFragment.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Fragments/AboutFragment.java
@@ -49,7 +49,7 @@ public class AboutFragment extends Fragment {
 
     static final int[] imageResources = {
             R.id.aboutImgVersion, R.id.aboutImgLicense, R.id.aboutImgChangelog, R.id.aboutImgSource,
-            R.id.aboutImgAuthor1, R.id.aboutImgAuthorOriginal, R.id.aboutImgContributors,
+            R.id.aboutImgAuthor2, R.id.aboutImgAuthorOriginal, R.id.aboutImgContributors,
             R.id.aboutImgTranslators, R.id.aboutImgBugs, R.id.aboutImgTranslate
     };
 
@@ -137,15 +137,15 @@ public class AboutFragment extends Fragment {
             }
         });
 
-        TextView author1GitHub = v.findViewById(R.id.about_author1_github);
-        TextView author1Paypal = v.findViewById(R.id.about_author1_extra);
-        author1GitHub.setOnClickListener(new View.OnClickListener() {
+        LinearLayout author1Layout = v.findViewById(R.id.aboutLayoutAuthor1);
+        TextView author1Donate = v.findViewById(R.id.about_author1_extra);
+        author1Layout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 openURI(AUTHOR1_GITHUB);
             }
         });
-        author1Paypal.setOnClickListener(new View.OnClickListener() {
+        author1Donate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 try {
@@ -157,15 +157,15 @@ public class AboutFragment extends Fragment {
         });
 
 
-        TextView author2GitHub = v.findViewById(R.id.about_author2_github);
-        TextView author2Paypal = v.findViewById(R.id.about_author2_extra);
-        author2GitHub.setOnClickListener(new View.OnClickListener() {
+        LinearLayout author2Layout = v.findViewById(R.id.aboutLayoutAuthor2);
+        TextView author2Donate = v.findViewById(R.id.about_author2_extra);
+        author2Layout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 openURI(AUTHOR2_GITHUB);
             }
         });
-        author2Paypal.setOnClickListener(new View.OnClickListener() {
+        author2Donate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 try {
@@ -176,9 +176,9 @@ public class AboutFragment extends Fragment {
             }
         });
 
-        TextView authorOriginalGitHub = v.findViewById(R.id.about_author_original_github);
+        LinearLayout authorOrigialLayout = v.findViewById(R.id.aboutLayoutOriginalAuthor);
         TextView authorOriginalApp = v.findViewById(R.id.about_author_original_extra);
-        authorOriginalGitHub.setOnClickListener(new View.OnClickListener() {
+        authorOrigialLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 openURI(AUTHOR_ORIGINAL_GITHUB);
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 454484bb..bc72b2f5 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -226,6 +226,7 @@
 
                 <!-- 1st author -->
                 <LinearLayout
+                    android:id="@+id/aboutLayoutAuthor1"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -237,11 +238,11 @@
 
                     <ImageView
                         android:id="@+id/aboutImgAuthor1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/author_image_size"
+                        android:layout_height="@dimen/author_image_size"
                         android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin_large"
-                        android:src="@drawable/ic_account_circle_gray" />
+                        android:layout_marginEnd="@dimen/activity_margin"
+                        android:src="@mipmap/ic_author_flocke" />
 
                     <LinearLayout
                         android:orientation="vertical"
@@ -262,34 +263,16 @@
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:text="@string/about_label_main_developer"/>
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/about_author1_extra"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/activity_margin"
-                            android:layout_gravity="center_vertical">
-
-                            <TextView
-                                android:id="@+id/about_author1_github"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorGithub"
-                                android:text="@string/about_label_github" />
-
-                            <TextView
-                                android:id="@+id/about_author1_extra"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/activity_margin_large"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorPaypal"
-                                android:text="@string/about_label_donate" />
-                        </LinearLayout>
+                            android:layout_marginTop="@dimen/activity_margin_small"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textStyle="bold"
+                            android:textColor="?attr/colorPaypal"
+                            android:text="@string/about_label_donate_paypal" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -301,6 +284,7 @@
 
                 <!-- Original author -->
                 <LinearLayout
+                    android:id="@+id/aboutLayoutAuthor2"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -311,10 +295,11 @@
 
                     <ImageView
                         android:id="@+id/aboutImgAuthor2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/author_image_size"
+                        android:layout_height="@dimen/author_image_size"
                         android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin_large"
+                        android:layout_marginEnd="@dimen/activity_margin"
+                        android:padding="@dimen/activity_margin_small"
                         android:src="@drawable/ic_account_circle_gray" />
 
                     <LinearLayout
@@ -336,34 +321,16 @@
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:text="@string/about_label_developer"/>
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/about_author2_extra"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/activity_margin"
-                            android:layout_gravity="center_vertical">
-
-                            <TextView
-                                android:id="@+id/about_author2_github"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorGithub"
-                                android:text="@string/about_label_github" />
-
-                            <TextView
-                                android:id="@+id/about_author2_extra"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/activity_margin_large"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorPaypal"
-                                android:text="@string/about_label_donate" />
-                        </LinearLayout>
+                            android:layout_marginTop="@dimen/activity_margin_small"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textStyle="bold"
+                            android:textColor="?attr/colorPaypal"
+                            android:text="@string/about_label_donate_bitcoin" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -375,6 +342,7 @@
 
                 <!-- Original author -->
                 <LinearLayout
+                    android:id="@+id/aboutLayoutOriginalAuthor"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -385,10 +353,11 @@
 
                     <ImageView
                         android:id="@+id/aboutImgAuthorOriginal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/author_image_size"
+                        android:layout_height="@dimen/author_image_size"
                         android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin_large"
+                        android:layout_marginEnd="@dimen/activity_margin"
+                        android:padding="@dimen/activity_margin_small"
                         android:src="@drawable/ic_account_circle_gray" />
 
                     <LinearLayout
@@ -410,34 +379,16 @@
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:text="@string/about_label_original_author"/>
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/about_author_original_extra"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/activity_margin"
-                            android:layout_gravity="center_vertical">
-
-                            <TextView
-                                android:id="@+id/about_author_original_github"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorGithub"
-                                android:text="@string/about_label_github" />
-
-                            <TextView
-                                android:id="@+id/about_author_original_extra"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/activity_margin_large"
-                                android:background="?android:attr/selectableItemBackground"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold"
-                                android:textColor="?attr/colorGithub"
-                                android:text="@string/about_label_original_app" />
-                        </LinearLayout>
+                            android:layout_marginTop="@dimen/activity_margin_small"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textStyle="bold"
+                            android:textColor="?attr/colorGithub"
+                            android:text="@string/about_label_original_app" />
                     </LinearLayout>
                 </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_author_flocke.png b/app/src/main/res/mipmap-hdpi/ic_author_flocke.png
new file mode 100644
index 00000000..cac19f1e
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_author_flocke.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_author_flocke.png b/app/src/main/res/mipmap-mdpi/ic_author_flocke.png
new file mode 100644
index 00000000..e2594b7c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_author_flocke.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_author_flocke.png b/app/src/main/res/mipmap-xhdpi/ic_author_flocke.png
new file mode 100644
index 00000000..65312696
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_author_flocke.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_author_flocke.png b/app/src/main/res/mipmap-xxhdpi/ic_author_flocke.png
new file mode 100644
index 00000000..3d10e35b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_author_flocke.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_author_flocke.png b/app/src/main/res/mipmap-xxxhdpi/ic_author_flocke.png
new file mode 100644
index 00000000..56851eba
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_author_flocke.png differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4d90d39b..6bb10726 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,6 +12,8 @@
     <dimen name="card_padding_without_corners">14dp</dimen>
     <dimen name="card_thumbnail_size">46dp</dimen>
 
+    <dimen name="author_image_size">64dp</dimen>
+
     <!-- The default letter tile text size -->
     <dimen name="tile_letter_font_size">33sp</dimen>
 
diff --git a/app/src/main/res/values/strings_about.xml b/app/src/main/res/values/strings_about.xml
index 289e31a1..a1aaca60 100644
--- a/app/src/main/res/values/strings_about.xml
+++ b/app/src/main/res/values/strings_about.xml
@@ -23,7 +23,8 @@
     <string name="about_label_original_app">Original App</string>
     <string name="about_label_website">Website</string>
     <string name="about_label_github" translatable="false">Github</string>
-    <string name="about_label_donate">Donate</string>
+    <string name="about_label_donate_paypal">Donate (PayPal)</string>
+    <string name="about_label_donate_bitcoin">Donate (Bitcoin)</string>
 
     <string name="about_name_author1" translatable="false">Jakob Nixdorf</string>
     <string name="about_name_author_original" translatable="false">Bruno Bierbaumer</string>