diff --git a/app/build.gradle b/app/build.gradle
index 68280cde164b8356302d2fcc5bb6f7f8a2df5d07..caf74e3939eaccc95159aabdc8f5b2d7fc8e5a51 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.benoitharrault.ameixanonfree"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 124
-        versionName "1.62.0"
+        versionCode 125
+        versionName "1.64.0"
         archivesBaseName = "$applicationId" + "_" + "$versionCode"
     }
 
diff --git a/app/src/chromatic/res/drawable-hdpi/opengolf.png b/app/src/chromatic/res/drawable-hdpi/opengolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..38affd021bf0bc681284e939fbdd5a4b9ca9ca21
Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/opengolf.png differ
diff --git a/app/src/chromatic/res/drawable-mdpi/opengolf.png b/app/src/chromatic/res/drawable-mdpi/opengolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..34b16e62e31cba4c402f2ae357f6d638b67c4e4a
Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/opengolf.png differ
diff --git a/app/src/chromatic/res/drawable-xhdpi/opengolf.png b/app/src/chromatic/res/drawable-xhdpi/opengolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec080ccc996c52c9d64d60d3dfe12bef1e5432ef
Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/opengolf.png differ
diff --git a/app/src/chromatic/res/drawable-xxhdpi/opengolf.png b/app/src/chromatic/res/drawable-xxhdpi/opengolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd9584a183dbab1267471e98a5c350f3200237cf
Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/opengolf.png differ
diff --git a/app/src/chromatic/res/drawable-xxxhdpi/opengolf.png b/app/src/chromatic/res/drawable-xxxhdpi/opengolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..df8509b508fdcdf737f57b827257aeb4a34c648d
Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/opengolf.png differ
diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml
index 03413d98e991a10b6f855fb402f4e355b6acf8c4..b1f3071da3dc88d4598b5c0fd8db8d9919cbe1a9 100644
--- a/app/src/main/res/values/iconpack.xml
+++ b/app/src/main/res/values/iconpack.xml
@@ -812,6 +812,7 @@
         <item>openexplorer</item>
         <item>openflood</item>
         <item>openfoodfacts</item>
+        <item>opengolf</item>
         <item>openhab</item>
         <item>openimgur</item>
         <item>openinwhatsapp</item>
diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml
index 47414c2c9d1804916ee3a2bc51f0c6fc6c4e7d81..4e022a5ea9d4b7c572c391014449bbb5364bb17c 100644
--- a/app/src/main/res/xml/appfilter.xml
+++ b/app/src/main/res/xml/appfilter.xml
@@ -3126,6 +3126,9 @@
     <item
         component="ComponentInfo{openfoodfacts.github.scrachx.openfood/openfoodfacts.github.scrachx.openfood.features.splash.SplashActivity}"
         drawable="openfoodfacts" />
+    <item
+        component="ComponentInfo{me.mgerdes.open_golf/android.app.NativeActivity}"
+        drawable="opengolf" />
     <item
         component="ComponentInfo{org.openhab.habdroid/org.openhab.habdroid.ui.OpenHABMainActivity}"
         drawable="openhab" />
diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml
index ce4e85e2246875f65736921c1c47ea3ba48999ee..76f41c8aa75cc4bee1d355e5ee3d5c89015ee3d2 100644
--- a/app/src/main/res/xml/drawable.xml
+++ b/app/src/main/res/xml/drawable.xml
@@ -812,6 +812,7 @@
     <item drawable="openexplorer" />
     <item drawable="openflood" />
     <item drawable="openfoodfacts" />
+    <item drawable="opengolf" />
     <item drawable="openhab" />
     <item drawable="openimgur" />
     <item drawable="openinwhatsapp" />
diff --git a/icons/chromatic/opengolf.svg b/icons/chromatic/opengolf.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c86aac5ee2ccbce23a47b6acd2e13f682f76ac40
--- /dev/null
+++ b/icons/chromatic/opengolf.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 28.747 28.747" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <filter id="filter6206-7" x="-.072" y="-.072" width="1.144" height="1.144" color-interpolation-filters="sRGB">
+            <feGaussianBlur stdDeviation="0.658125"/>
+        </filter>
+    </defs>
+    <g transform="translate(0 -1093.8)">
+        <path transform="matrix(1.0781 0 0 1.0641 -.093733 2.7509)" d="m4.4177 1028.2v1.6051h-1.6052v18.192h1.6052v2.1402h18.192v-2.1402h2.1402v-18.192h-2.1402v-1.6051z" fill="#263238" filter="url(#filter6206-7)" opacity=".2"/>
+        <rect x="2.9987" y="1096.8" width="22.749" height="22.749" rx="1.1973" ry="1.1974" fill="#4caf50"/>
+        <g transform="translate(-22.32 1056.5)">
+            <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+            <g transform="matrix(.33601 0 0 .33601 1.5296 73.043)">
+                <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+            </g>
+            <g transform="matrix(.37187 0 0 .37187 38.802 63.239)">
+                <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+                <g transform="matrix(2.6891 0 0 2.6891 -82.906 -48.45)">
+                    <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+                </g>
+            </g>
+        </g>
+        <path d="m4.1958 1096.8c-0.66332 0-1.1979 0.5346-1.1979 1.1979v0.3334c0-0.6634 0.53459-1.1979 1.1979-1.1979h20.354c0.66332 0 1.1979 0.5345 1.1979 1.1979v-0.3334c0-0.6633-0.5346-1.1979-1.1979-1.1979z" fill="#fff" opacity=".2"/>
+        <rect x="128" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="128" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="128" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="128" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="128" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="128" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="213.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="298.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="170.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="256" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="341.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
+        <rect x="160" y="578.52" width="192" height="192" fill="none" stroke-width="1.0667"/>
+        <g transform="matrix(.37344 0 0 .37344 4.7333 1097.4)">
+            <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+        </g>
+        <g transform="matrix(.36471 0 0 .36471 5.1356 1097.4)">
+            <path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
+        </g>
+        <g transform="matrix(.41585 0 0 .41585 84.325 1055.9)">
+            <g transform="matrix(.062269 0 0 .062269 -28.238 185.29)">
+                <g transform="matrix(38.618 0 0 38.618 14724 -13542)">
+                    <g transform="matrix(.71436 0 0 .71436 -400.52 188.34)">
+                        <path d="m1293.2-120.67c-181.75 0.2763-511.18 0.13525-699.05 0.13998-2.3216 10.413-3.593 21.251-3.593 32.384v114c207.65 0.73695 494.72 0.38136 706.23 0.3733v-114.37c0-11.18-1.2522-22.07-3.593-32.523zm-458.69 295.56c-78.385-4e-3 -158.85 0.17892-243.95 0.55995v138.63c286.34-0.39317 421.73-0.13827 706.23-0.32664v-137.75c-163.2-0.53005-311.22-1.1113-462.28-1.1199z" opacity="0" stroke-width="1.4932"/>
+                    </g>
+                </g>
+            </g>
+        </g>
+        <path d="m24.549 1119.5c0.66325 0 1.1979-0.5346 1.1979-1.1979v-0.3333c0 0.6632-0.53461 1.1978-1.1979 1.1978h-20.354c-0.66325 0-1.1979-0.5346-1.1979-1.1978v0.3333c0 0.6633 0.53461 1.1979 1.1979 1.1979z" fill="#263238" opacity=".2"/>
+    </g>
+    <g transform="matrix(.026276 0 0 .026276 5.1768 7.0163)" fill="#fff">
+        <path d="m298.34 51.926v182.54s122.59-79.945 223.9-81.27c0-0.0156-33.211-136.64-223.9-101.27z"/>
+        <path d="m231.11 431.13h48.125l4e-3 -394.66c0-13.289-10.777-24.062-24.062-24.062-13.289 0-24.066 10.773-24.066 24.062z"/>
+        <path d="m349.98 341.31c-17.75 0-34.871 0.91797-51.641 2.1875v55.711c30.562 5.9727 51.641 17.953 51.641 31.922 0 19.887-42.457 36.027-94.809 36.027-52.402 0-94.859-16.137-94.859-36.027 0-13.984 21.078-25.945 51.672-31.922v-43.426c-79.812 17.973-133.5 50.895-133.5 88.668 0 56.949 121.57 103.12 271.5 103.12 149.96 0 271.53-46.176 271.53-103.12 0-56.969-121.57-103.14-271.53-103.14zm127.29 120.31c-21.906 0-39.676-17.766-39.676-39.676 0-21.906 17.766-39.676 39.676-39.676 21.941 0 39.676 17.766 39.676 39.676s-17.734 39.676-39.676 39.676z"/>
+    </g>
+</svg>