diff --git a/F-Droid/res/layout/about.xml b/F-Droid/res/layout/about.xml
index 6a55dc9d2..3d3d49a18 100644
--- a/F-Droid/res/layout/about.xml
+++ b/F-Droid/res/layout/about.xml
@@ -1,101 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="24dp"
-    android:paddingStart="24dp"
-    android:paddingRight="24dp"
-    android:paddingEnd="24dp"
-    android:paddingTop="20dp"
-    android:baselineAligned="false"
-    android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:paddingTop="4dp"
+        android:orientation="vertical">
 
         <TextView
             android:text="@string/about_version"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView android:id="@+id/version"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+            style="@style/CaptionText" />
+        <TextView
+            android:id="@+id/version"
+            android:text="@string/unknown"
+            style="@style/BodyText" />
 
         <TextView
             android:text="@string/about_site"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
+            style="@style/CaptionText" />
         <TextView
             android:text="@string/site_link"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
             android:autoLink="web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
-
-        <TextView
-            android:text="@string/about_source"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:text="@string/source_link"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
-            android:autoLink="web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+            style="@style/BodyText" />
 
         <TextView
             android:text="@string/about_mail"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
+            style="@style/CaptionText" />
         <TextView
             android:text="@string/team_email"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
             android:autoLink="email"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            style="@style/BodyText" />
+
+        <TextView
+            android:text="@string/about_source"
+            style="@style/CaptionText" />
+        <TextView
+            android:text="@string/source_link"
+            android:autoLink="web"
+            style="@style/BodyText" />
+
+        <TextView
+            android:text="@string/about_license"
+            style="@style/CaptionText" />
+        <TextView
+            android:text="@string/license_gplv3_later"
+            style="@style/BodyText" />
 
     </LinearLayout>
 
-    <TextView
-        android:text="@string/about_desc"
-        android:paddingTop="12dp"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-</LinearLayout>
+</ScrollView>
diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 1c6460782..dfe712438 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -13,80 +13,56 @@
 
         <!-- URL of this repo -->
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_url"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/input_repo_url"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <!-- Name of this repo -->
         <TextView
             android:id="@+id/label_repo_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_name"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_repo_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <!-- Description - as pulled from the index file during last update... -->
         <TextView
             android:id="@+id/label_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_description"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <!-- Number of apps belonging to this repo -->
         <TextView
             android:id="@+id/label_num_apps"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_num_apps"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_num_apps"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <!-- The last time this repo was updated -->
         <TextView
             android:id="@+id/label_last_update"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_last_update"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_last_update"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <!-- The credentials used to access this repo (optional) -->
         <TextView
             android:id="@+id/label_username"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/login_name"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_username"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
         <Button
             android:id="@+id/button_edit_credentials"
             android:layout_height="wrap_content"
@@ -97,28 +73,20 @@
         <!-- Signature (or "unsigned" if none) -->
         <TextView
             android:id="@+id/label_repo_fingerprint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_fingerprint"
-            style="@style/RepoDetailsCaption"/>
+            style="@style/CaptionText" />
         <TextView
             android:id="@+id/text_repo_fingerprint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:typeface="monospace"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
         <TextView
             android:id="@+id/text_repo_fingerprint_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <TextView
             android:id="@+id/text_not_yet_updated"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/repo_not_yet_updated"
-            style="@style/RepoDetailsBody"/>
+            style="@style/BodyText" />
 
         <ImageView
             android:id="@+id/qr_code"
diff --git a/F-Droid/res/values-ast/strings.xml b/F-Droid/res/values-ast/strings.xml
index 9ac7233b4..e5015bede 100644
--- a/F-Droid/res/values-ast/strings.xml
+++ b/F-Droid/res/values-ast/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Detalles d\'aplicación</string>
   <string name="no_such_app">Nun s\'alcontraron aplicaciones.</string>
   <string name="about_title">Tocante a F-Droid</string>
-  <string name="about_desc">Basáu orixinalmente n\'Aptoide.
-\nLlanzáu so la llicencia GNU GPLv3.</string>
   <string name="about_site">Sitiu web:</string>
   <string name="about_mail">Corréu:</string>
   <string name="about_version">Versión:</string>
diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index 42bbcce48..eda6bf0cc 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -30,8 +30,6 @@
   <string name="app_details">Детайли за приложението</string>
   <string name="no_such_app">Не е намерено такова приложение.</string>
   <string name="about_title">Относно F-Droid</string>
-  <string name="about_desc">Първоначално базиран на Aptoide.
-Лицензиран под GNU GPLv3.</string>
   <string name="about_site">Уебсайт:</string>
   <string name="about_mail">Имейл:</string>
   <string name="about_version">Версия:</string>
diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index e74cb08f8..48fd2c01b 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -30,8 +30,6 @@
   <string name="app_details">Detalls de l\'aplicació</string>
   <string name="no_such_app">No s\'ha trobat l\'aplicació.</string>
   <string name="about_title">Quant a l\'F-Droid</string>
-  <string name="about_desc">Originalment basat en Aptoide.
-Publicat amb la llicència GNU GPL v3.</string>
   <string name="about_site">Pàgina web:</string>
   <string name="about_mail">Correu:</string>
   <string name="about_version">Versió:</string>
diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml
index fd402ee62..17abbf56c 100644
--- a/F-Droid/res/values-cs/strings.xml
+++ b/F-Droid/res/values-cs/strings.xml
@@ -28,8 +28,6 @@
   <string name="app_details">Detaily aplikace</string>
   <string name="no_such_app">Žádná taková aplikace nebyla nalezena.</string>
   <string name="about_title">O aplikaci F-Droid</string>
-  <string name="about_desc">Původně založeno na Aptoide.
-Uvolněno pod GPLv3 licencí.</string>
   <string name="about_site">Webová stránka:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Verze:</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index 3e8778bca..bddde3388 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -31,7 +31,6 @@
   <string name="app_details">Anwendungsdetails</string>
   <string name="no_such_app">Keine solche Anwendung gefunden.</string>
   <string name="about_title">Über F-Droid</string>
-  <string name="about_desc">Ursprünglich basierend auf Aptoide.\nVeröffentlicht unter der GNU GPLv3 Lizenz.</string>
   <string name="about_site">Internetseite:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Version:</string>
diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml
index 003cc20d4..8397551a0 100644
--- a/F-Droid/res/values-el/strings.xml
+++ b/F-Droid/res/values-el/strings.xml
@@ -25,8 +25,6 @@
   <string name="app_details">Λεπτομέρειες Εφαρμογής</string>
   <string name="no_such_app">Δεν βρέθηκε τέτοια εφαρμογή.</string>
   <string name="about_title">Σχετικά με το F-Droid</string>
-  <string name="about_desc">Αρχικά βασιζόταν στο Aptoide.
-Κυκλοφόρεί υπό την άδεια GNU GPLv3.</string>
   <string name="about_site">Ιστοσελίδα:</string>
   <string name="about_mail">Ηλ. ταχυδρομείο:</string>
   <string name="about_version">Έκδοση:</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index 8abf991ba..06dc1f7be 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Detalles de la aplicación</string>
   <string name="no_such_app">No se encontró la aplicación.</string>
   <string name="about_title">Acerca de F-Droid</string>
-  <string name="about_desc">Basado originalmente en Aptoide.
-\nPublicado bajo la licencia GNU GPLv3.</string>
   <string name="about_site">Sitio web:</string>
   <string name="about_mail">Correo electrónico:</string>
   <string name="about_version">Versión:</string>
diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml
index 346bf2d91..9c31099c5 100644
--- a/F-Droid/res/values-eu/strings.xml
+++ b/F-Droid/res/values-eu/strings.xml
@@ -19,8 +19,6 @@
   <string name="app_details">Aplikazioaren xehetasunak</string>
   <string name="no_such_app">Ez da aplikazio hori aurkitu.</string>
   <string name="about_title">F-Droid-i buruz</string>
-  <string name="about_desc">Jatorrian Aptoide-n oinarritua.
-GNU GPLv3 lizentziapean argitaratua.</string>
   <string name="about_site">Webgunea:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Bertsioa:</string>
diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml
index 62d0e16d3..9aac3c625 100644
--- a/F-Droid/res/values-fi/strings.xml
+++ b/F-Droid/res/values-fi/strings.xml
@@ -31,9 +31,6 @@
   <string name="app_details">Sovelluksen tiedot</string>
   <string name="no_such_app">Sovellusta ei löytynyt</string>
   <string name="about_title">Tietoa F-Droidista</string>
-  <string name="about_desc">Pohjautuu alkujaan Aptoideen.
-Julkaistu GNU GPLv3 -lisenssin
-käyttöehtojen mukaisesti.</string>
   <string name="about_site">Verkkosivu:</string>
   <string name="about_mail">Sähköposti:</string>
   <string name="about_version">Versio:</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index 9dddfe4d7..2e33c2d2b 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Détails de l\'app</string>
   <string name="no_such_app">Pas d\'app trouvée.</string>
   <string name="about_title">À propos de F-Droid</string>
-  <string name="about_desc">Initialement basée sur Aptoide.
-\nPubliée sous licence GNU GPLv3.</string>
   <string name="about_site">Site web :</string>
   <string name="about_mail">Courriel :</string>
   <string name="about_version">Version :</string>
diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml
index 1f251befc..c56d1fd05 100644
--- a/F-Droid/res/values-gl/strings.xml
+++ b/F-Droid/res/values-gl/strings.xml
@@ -17,8 +17,6 @@
   <string name="app_details">Detalles da ap</string>
   <string name="no_such_app">Non se atopou ese aplicativo.</string>
   <string name="about_title">Sobre F-Droid</string>
-  <string name="about_desc">Baseado en Aptoide.
-Publicado con licenza GNU GPLv3.</string>
   <string name="about_site">Sitio web:</string>
   <string name="about_mail">Enderezo electrónico:</string>
   <string name="about_version">Versión:</string>
diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml
index b8eac7d26..ecc5c70ed 100644
--- a/F-Droid/res/values-he/strings.xml
+++ b/F-Droid/res/values-he/strings.xml
@@ -34,8 +34,6 @@
     <string name="no_such_app">לא נמצאה אפליקציה.</string>
 
     <string name="about_title">אודות F-Droid</string>
-    <string name="about_desc">מבוססת במקור על Aptoide.\nמשוחררת תחת הרשיון
-        GNU GPLv3.</string>
     <string name="about_site">אתר רשת:</string>
     <string name="about_mail">דוא״ל:</string>
     <string name="about_version">גרסה:</string>
diff --git a/F-Droid/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml
index 4d44ade5b..bc866378d 100644
--- a/F-Droid/res/values-hu/strings.xml
+++ b/F-Droid/res/values-hu/strings.xml
@@ -23,10 +23,6 @@
   <string name="app_details">App részletei</string>
   <string name="no_such_app">Nem található ilyen app</string>
   <string name="about_title">Az F-Droid</string>
-  <string name="about_desc">\"Eredetileg az Aptoide alapján.
-Kiadva GNU GPLv3 licensz alatt.
-
-Honosítás: gidano | sympda.info\"</string>
   <string name="about_site">Weboldal:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Verzió:</string>
diff --git a/F-Droid/res/values-id/strings.xml b/F-Droid/res/values-id/strings.xml
index 663f584af..661465bbc 100644
--- a/F-Droid/res/values-id/strings.xml
+++ b/F-Droid/res/values-id/strings.xml
@@ -41,8 +41,6 @@
     <string name="about_site">Situs Web:</string>
     <string name="about_source">Sumber:</string>
     <string name="about_mail">Surel:</string>
-    <string name="about_desc">Mulanya berdasarkan pada Aptoide.\nDirilis di bawah lisensi lisensi GNU GPLv3.</string>
-
     <string name="app_incompatible">Tidak kompatibel</string>
     <string name="app_installed">Terpasang</string>
     <string name="app_not_installed">Tidak Terpasang</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index e43af4f52..df3a83069 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Dettagli App</string>
   <string name="no_such_app">Nessuna app corrispondente trovata</string>
   <string name="about_title">Informazioni</string>
-  <string name="about_desc">Basato su Aptoide.
-Rilasciato sotto licenza GNU GPLv3.</string>
   <string name="about_site">Sito Web:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Versione:</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index d096a9f03..862050a9a 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -31,7 +31,6 @@
   <string name="app_details">ｱﾌﾟﾘ詳細</string>
   <string name="no_such_app">該当するｱﾌﾟﾘｹｰｼｮﾝが存在しません｡</string>
   <string name="about_title">F-Droidについて</string>
-  <string name="about_desc">Aptoideを基にしています。\nGNU GPLv3 ﾗｲｾﾝｽに基づいてﾘﾘｰｽされました｡</string>
   <string name="about_site">Webｻｲﾄ:</string>
   <string name="about_mail">電子ﾒｰﾙ:</string>
   <string name="about_version">ﾊﾞｰｼﾞｮﾝ:</string>
diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml
index 63b842c43..deafb9f2b 100644
--- a/F-Droid/res/values-ko/strings.xml
+++ b/F-Droid/res/values-ko/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">앱 상세정보</string>
   <string name="no_such_app">앱이 발견되지 않음</string>
   <string name="about_title">F-Droid 대하여</string>
-  <string name="about_desc">Aptoide에 기반합니다.
-GNU GPLv3 라이센스 하에 배포됩니다.</string>
   <string name="about_site">웹사이트:</string>
   <string name="about_mail">이메일:</string>
   <string name="about_version">버전:</string>
diff --git a/F-Droid/res/values-lv/strings.xml b/F-Droid/res/values-lv/strings.xml
index 0f09928f4..149a03e90 100644
--- a/F-Droid/res/values-lv/strings.xml
+++ b/F-Droid/res/values-lv/strings.xml
@@ -23,7 +23,6 @@
   <string name="app_details">Programmas detaļas</string>
   <string name="no_such_app">Nav atrasts</string>
   <string name="about_title">Par F-Droid</string>
-  <string name="about_desc">Veidots uz Aptoide bāzes Izlaists zem GNU GPLv3 licenzes.</string>
   <string name="about_site">Mājaslapa:</string>
   <string name="about_mail">Epasts:</string>
   <string name="about_version">Versija:</string>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index db5023c93..6e05f7a68 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Programdetaljer</string>
   <string name="no_such_app">Program ikke funnet.</string>
   <string name="about_title">Om F-Droid</string>
-  <string name="about_desc">Basert på Aptoide.
-Lisensiert GNU GPLv3.</string>
   <string name="about_site">Nettside:</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Versjon:</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 44a78d3e8..53fb0bec6 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -31,7 +31,6 @@
   <string name="app_details">App-details</string>
   <string name="no_such_app">Geen dergelijke app gevonden.</string>
   <string name="about_title">Over F-Droid</string>
-  <string name="about_desc">Gebaseerd op Aptoide.\nUitgegeven onder de GNU GPLv3 licentie.</string>
   <string name="about_site">Website:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Versie:</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index 3d2c5e633..e2569bbfa 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -155,7 +155,6 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
     <string name="notify_on">Wyświetlaj powiadomienie gdy znalezione zostaną nowe aktualizacje</string>
     <string name="uninstall_system">Aktualizuj/Odinstaluj Uprzywilejowany dodatek F-Droida</string>
     <string name="uninstall_system_summary">Pokaż szczegóły Uprzywilejowanego dodatku</string>
-    <string name="about_desc">Oryginalnie bazuje na Aptiode.\nWydano pod licencją GNU GPLv3.</string>
     <string name="about_mail">Email:</string>
     <string name="app_incompatible">Niekompatybilne</string>
     <string name="app_installed">Zainstalowano</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index 927350a59..f0081f4b5 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -31,7 +31,6 @@
   <string name="app_details">Detalhes do aplicativo</string>
   <string name="no_such_app">O aplicativo não foi encontrado.</string>
   <string name="about_title">Sobre o F-Droid</string>
-  <string name="about_desc">Baseado originalmente no Aptoide.\nLançado sob a licença GNU GPLv3.</string>
   <string name="about_site">Página web:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Versão:</string>
diff --git a/F-Droid/res/values-pt-rPT/strings.xml b/F-Droid/res/values-pt-rPT/strings.xml
index 1e61b98dd..9bd25ee82 100644
--- a/F-Droid/res/values-pt-rPT/strings.xml
+++ b/F-Droid/res/values-pt-rPT/strings.xml
@@ -43,8 +43,6 @@
     <string name="about_site">Sítio web:</string>
     <string name="about_source">Fonte:</string>
     <string name="about_mail">E-Mail:</string>
-    <string name="about_desc">Baseada no Aptoide.\nDisponibilizada nos termos da GNU GPLv3 .</string>
-
     <string name="app_incompatible">Incompatível</string>
     <string name="app_installed">Instaladas</string>
     <string name="app_not_installed">Não instaladas</string>
diff --git a/F-Droid/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml
index 74d107daf..8dcfd9814 100644
--- a/F-Droid/res/values-ro/strings.xml
+++ b/F-Droid/res/values-ro/strings.xml
@@ -11,8 +11,6 @@
   <string name="notify">Notificare</string>
   <string name="app_details">Detalii aplicaţie</string>
   <string name="about_title">Despre F-Droid</string>
-  <string name="about_desc">Bazat pe Aptoide.
-Distribuit sub licenta GNU GPLv3.</string>
   <string name="about_site">Website</string>
   <string name="about_mail">Email</string>
   <string name="about_version">Versiune</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index a3ddcf3ea..dddfc8736 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Описание приложения</string>
   <string name="no_such_app">Приложение не найдено.</string>
   <string name="about_title">О F-Droid</string>
-  <string name="about_desc">Изначально основан на Aptoide.
-Выпущен под лицензией GNU GPLv3.</string>
   <string name="about_site">Сайт:</string>
   <string name="about_mail">E-mail:</string>
   <string name="about_version">Версия:</string>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index 12b7d61da..b6bf20fe1 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -31,9 +31,6 @@
   <string name="app_details">Minujas/detallios aplicatzione</string>
   <string name="no_such_app">Peruna aplicatzione currispondente.</string>
   <string name="about_title">Informatziones</string>
-  <string name="about_desc">Basadu in supra de Aptoide.
-Intregadu cun sa litzèntzia
-        GNU GPLv3.</string>
   <string name="about_site">Giassu/situ web:</string>
   <string name="about_mail">Posta eletrònica:</string>
   <string name="about_version">Versione:</string>
diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml
index 656e32291..8f40de302 100644
--- a/F-Droid/res/values-sk/strings.xml
+++ b/F-Droid/res/values-sk/strings.xml
@@ -31,9 +31,6 @@
   <string name="app_details">Detaily aplikácie</string>
   <string name="no_such_app">Aplikácia sa nenašla.</string>
   <string name="about_title">O F-Droide</string>
-  <string name="about_desc">Pôvodne založený na Aptoide.
-Vydaný pod licenciou
-        GNU GPLv3.</string>
   <string name="about_site">Webstránka:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Verzia:</string>
diff --git a/F-Droid/res/values-sl/strings.xml b/F-Droid/res/values-sl/strings.xml
index 9bd1da8e8..3ff4edc3d 100644
--- a/F-Droid/res/values-sl/strings.xml
+++ b/F-Droid/res/values-sl/strings.xml
@@ -9,8 +9,6 @@
   <string name="updates">Posodobitve</string>
   <string name="notify">Opozorilo</string>
   <string name="update_history">Päivityshistoria</string>
-  <string name="about_desc">Izvorno osnovan na Aptoide.
-Izdan z licenco GNU GPLv3.</string>
   <string name="about_site">Spletna stran:</string>
   <string name="about_mail">E-pošta:</string>
   <string name="about_version">Različica:</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index a55a0157d..7f3aac1b7 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -30,7 +30,6 @@
   <string name="app_details">Детаљи апликације</string>
   <string name="no_such_app">Нема такве апликације.</string>
   <string name="about_title">О Ф-дроиду</string>
-  <string name="about_desc">Оригинално засновано на пројекту Aptoide.\nОбјављено под ГНУовом ГПЛв3 лиценцом.</string>
   <string name="about_site">Вебсајт:</string>
   <string name="about_mail">Е-адреса:</string>
   <string name="about_version">Издање:</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index a2bcf55c6..83b308a8b 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -31,7 +31,6 @@
   <string name="app_details">Detaljer för app</string>
   <string name="no_such_app">Hittade ingen sådan app.</string>
   <string name="about_title">Om F-Droid</string>
-  <string name="about_desc">Ursprungligen baserad på Aptoide.\nSläppt under GNU GPLv3-licensen.</string>
   <string name="about_site">Hemsida:</string>
   <string name="about_mail">E-postadress:</string>
   <string name="about_version">Version:</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index 76498e620..1261b987c 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -31,8 +31,6 @@
   <string name="app_details">Uygulama Detayları</string>
   <string name="no_such_app">Böyle bir uygulama bulunamadı</string>
   <string name="about_title">F-Droid Hakkında</string>
-  <string name="about_desc">Aptoide\'den türetilmiştir.
-GNU GPLv3 lisansı kapsamında yayınlanmıştır.</string>
   <string name="about_site">Ağ sitesi:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Sürüm:</string>
diff --git a/F-Droid/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml
index fde1077bf..fc2083f8a 100644
--- a/F-Droid/res/values-ug/strings.xml
+++ b/F-Droid/res/values-ug/strings.xml
@@ -17,8 +17,6 @@
   <string name="app_details">ئەپ تەپسىلاتلىرى</string>
   <string name="no_such_app">بۇنداق ئەپ تېپىلمىدى</string>
   <string name="about_title">F-Droid ھەققىدە</string>
-  <string name="about_desc">دەسلەپتە Aptoide نى ئاساس قىلغان.
-بۇ GNU GPLv3 ئىجازىتىدە تارقىتىلغان.</string>
   <string name="about_site">تور تۇرا:</string>
   <string name="about_mail">تورخەت:</string>
   <string name="about_version">نەشرى:</string>
diff --git a/F-Droid/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml
index 2b93d3aa9..e52d5ee19 100644
--- a/F-Droid/res/values-uk/strings.xml
+++ b/F-Droid/res/values-uk/strings.xml
@@ -227,8 +227,6 @@
     <string name="perm_costs_money">Це може вам коштувати грошей</string>
     <string name="unstable_updates_summary">Пропонувати оновлення до нестабільних версій</string>
     <string name="local_repo_name_summary">Ваш локальний репозиторії пропонується під назвою: %s</string>
-    <string name="about_desc">Оснований на Aptoide.\nВипущено під ліцензією GNU GPLv3.</string>
-
     <string name="app_incompatible">Несумісний</string>
     <string name="bluetooth_activity_not_found">Жодного методу надсилання по Bluetooth не знайдено, оберіть один з них!</string>
     <string name="choose_bt_send">Оберіть метод надсилання через Bluetooth</string>
diff --git a/F-Droid/res/values-v16/styles.xml b/F-Droid/res/values-v16/styles.xml
index 89f9ee467..42294ae72 100644
--- a/F-Droid/res/values-v16/styles.xml
+++ b/F-Droid/res/values-v16/styles.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="RepoDetailsBody">
+    <style name="BodyTextV16" parent="BodyTextBase">
         <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
+    <style name="BodyText" parent="BodyTextV16" />
 
 </resources>
diff --git a/F-Droid/res/values-v17/styles.xml b/F-Droid/res/values-v17/styles.xml
new file mode 100644
index 000000000..bf5eeee8b
--- /dev/null
+++ b/F-Droid/res/values-v17/styles.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="CaptionTextV17" parent="CaptionTextBase">
+        <item name="android:textDirection">locale</item>
+    </style>
+    <style name="CaptionText" parent="CaptionTextV17" />
+
+    <style name="BodyTextV17" parent="BodyTextV16">
+        <item name="android:textDirection">locale</item>
+    </style>
+    <style name="BodyText" parent="BodyTextV17" />
+
+</resources>
diff --git a/F-Droid/res/values-vi/strings.xml b/F-Droid/res/values-vi/strings.xml
index 3bca28a28..865135767 100644
--- a/F-Droid/res/values-vi/strings.xml
+++ b/F-Droid/res/values-vi/strings.xml
@@ -30,7 +30,6 @@
   <string name="app_details">Thông tin ứng dụng</string>
   <string name="no_such_app">Không tìm thấy ứng dụng.</string>
   <string name="about_title">Giới thiệu về F-Droid</string>
-  <string name="about_desc">Được xây dựng dựa trên Aptoide. Phát hành theo giấy phép GNU GPLv3.</string>
   <string name="about_site">Trang web:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Phiên bản:</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index 29189387c..4e01159a4 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -26,9 +26,6 @@
   <string name="app_details">应用程序详情</string>
   <string name="no_such_app">未找到此类应用程序。</string>
   <string name="about_title">关于 F-Droid</string>
-  <string name="about_desc">最初基于 Aptoide.
-在以下许可协议下发布：
-        GNU GPLv3 license.</string>
   <string name="about_site">网站:</string>
   <string name="about_mail">邮件:</string>
   <string name="about_version">版本:</string>
diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml
index cf7faf75b..9288dea0f 100644
--- a/F-Droid/res/values-zh-rHK/strings.xml
+++ b/F-Droid/res/values-zh-rHK/strings.xml
@@ -27,7 +27,6 @@
   <string name="app_details">應用程式詳細資料</string>
   <string name="no_such_app">找不到這樣的應用程式。</string>
   <string name="about_title">關於 F-Droid</string>
-  <string name="about_desc">原始碼源自 Aptoide，\n以 GNU GPL 第三版特許條款發行。</string>
   <string name="about_site">網站：</string>
   <string name="about_mail">電郵：</string>
   <string name="about_version">版本：</string>
diff --git a/F-Droid/res/values/donottranslate.xml b/F-Droid/res/values/donottranslate.xml
index 9a9e0c51c..4830e10f0 100644
--- a/F-Droid/res/values/donottranslate.xml
+++ b/F-Droid/res/values/donottranslate.xml
@@ -4,6 +4,7 @@
     <string name="site_link">https://f-droid.org</string>
     <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
     <string name="team_email">team@f-droid.org</string>
+    <string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string>
 
     <string name="https">https://</string>
 
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index d7a9a57f4..e37d5e5ee 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -47,12 +47,11 @@
     <string name="no_such_app">No such app found.</string>
 
     <string name="about_title">About F-Droid</string>
-    <string name="about_version">Version:</string>
-    <string name="about_site">Website:</string>
-    <string name="about_source">Source:</string>
-    <string name="about_mail">E-Mail:</string>
-    <string name="about_desc">Originally based on Aptoide.\nReleased under the
-        GNU GPLv3 license.</string>
+    <string name="about_version">Version</string>
+    <string name="about_site">Website</string>
+    <string name="about_source">Source code</string>
+    <string name="about_mail">Email</string>
+    <string name="about_license">License</string>
 
     <string name="app_incompatible">Incompatible</string>
     <string name="app_installed">Installed</string>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 8308c08d9..397e2581e 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -52,14 +52,24 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="RepoDetailsCaption">
+    <!-- use this style for a text view that is a caption to a paragraph of text -->
+    <style name="CaptionTextBase">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">4dp</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Caption</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
+    <style name="CaptionText" parent="CaptionTextBase" />
 
-    <style name="RepoDetailsBody" />
+    <!-- use this style for a text views that is a paragraph of text -->
+    <style name="BodyTextBase">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
+    </style>
+    <style name="BodyText" parent="BodyTextBase" />
 
     <style name="AppList">
         <item name="android:id">@android:id/list</item>
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 84dcc8197..d5eda5c4b 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -289,10 +289,9 @@ public class FDroid extends ActionBarActivity {
                 View view = LayoutInflater.from(this).inflate(R.layout.about, null);
 
                 String versionName = Utils.getVersionName(this);
-                if (versionName == null) {
-                    versionName = getString(R.string.unknown);
+                if (versionName != null) {
+                    ((TextView) view.findViewById(R.id.version)).setText(versionName);
                 }
-                ((TextView) view.findViewById(R.id.version)).setText(versionName);
 
                 AlertDialog alrt = new AlertDialog.Builder(this).setView(view).create();
                 alrt.setTitle(R.string.about_title);