diff --git a/download/index.md b/download/index.md
index 3cc6c76..25a3e72 100644
--- a/download/index.md
+++ b/download/index.md
@@ -6,29 +6,29 @@ menu: download
 version: stable
 ---
 
-## XCSoar {{ site.xcsoar_stable_version }} on Android
+## XCSoar {{ site.xcsoar_stable_version }} for Android
 
 The Android version of XCSoar {{ site.xcsoar_stable_version }} runs on phones and tablets with Android 5 or newer.
 
-- {:.list-item-android}[XCSoar on Google Play](https://play.google.com/store/apps/details?id=org.xcsoar)
+- {:.list-item-android}[XCSoar on F-Droid](https://f-droid.org/packages/org.xcsoar/)
 - {:.list-item-android}[XCSoar {{ site.xcsoar_stable_version }} on Android]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/ANDROID/)
 
-## XCSoar {{ site.xcsoar_stable_version }} on Kobo
+## XCSoar {{ site.xcsoar_stable_version }} for Kobo
 
 XCSoar runs on the - Kobo Mini, Kobo Glo, Kobo Touch 2.0, Kobo Glo HD and
 Kobo Aura Edition 2.  To install, copy *KoboRoot.tgz* to the data partition to a
 directory called ".kobo" (note the leading dot; the directory already exists,
 but is hidden).  Reboot the Kobo.
 
-- [XCSoar {{ site.xcsoar_stable_version }} Kobo installer]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/KOBO/KoboRoot.tgz)
+- {:.list-item-kobo}[[XCSoar {{ site.xcsoar_stable_version }} Kobo installer]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/KOBO/KoboRoot.tgz)
 
-## XCSoar {{ site.xcsoar_stable_version }} on desktop computers
+## XCSoar {{ site.xcsoar_stable_version }} for desktop computers
 
 - {:.list-item-windows}[XCSoar {{ site.xcsoar_stable_version }} on Windows]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/PC/)
 - {:.list-item-windows}[XCSoar {{ site.xcsoar_stable_version }} on Windows (64 bit)]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/WIN64/)
 - {:.list-item-linux}[XCSoar {{ site.xcsoar_stable_version }} on Linux]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/LINUX/)
 
-## XCSoar {{ site.xcsoar_stable_version }} on single-board computers
+## XCSoar {{ site.xcsoar_stable_version }} for single-board computers
 
 - {:.list-item-linux}[XCSoar {{ site.xcsoar_stable_version }} on Raspberry Pi]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/PI/)
 - {:.list-item-linux}[XCSoar {{ site.xcsoar_stable_version }} on Raspberry Pi4]({{ site.download_server_url }}/{{ site.xcsoar_stable_version }}/PI4/)