diff --git a/assets/layers/gps_location/gps_location.json b/assets/layers/gps_location/gps_location.json
index 292c16fce..7f4aaad3e 100644
--- a/assets/layers/gps_location/gps_location.json
+++ b/assets/layers/gps_location/gps_location.json
@@ -6,14 +6,33 @@
     "osmTags": "id=gps",
     "maxCacheAge": 0
   },
+  "title": "Current position",
+  "name": "GPS Location",
   "mapRendering": [
     {
-      "icon": "crosshair:var(--catch-detail-color)",
+      "icon": {
+        "render":"crosshair:var(--catch-detail-color)",
+        "mappings": [
+          {
+            "if": "speed>2",
+            "then": "gps_arrow"
+          }
+        ]
+      },
       "iconSize": "40,40,center",
+      "rotation": {
+        "render": "0deg",
+        "mappings": [{
+          "if": {
+            "and":["speed>2","heading!=NaN"]
+          },
+          "then": "{heading}deg"
+        }]
+      },
       "location": [
         "point",
         "centroid"
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/license_info.json b/assets/license_info.json
index c4510d13a..29038529a 100644
--- a/assets/license_info.json
+++ b/assets/license_info.json
@@ -33,6 +33,22 @@
     ],
     "sources": []
   },
+  {
+    "path": "SocialImageRepo.png",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
+  {
+    "path": "SocialImageRepo.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "SocialImageSmall.png",
     "license": "CC-BY-SA 4.0",
diff --git a/assets/svg/gps_arrow.svg b/assets/svg/gps_arrow.svg
new file mode 100644
index 000000000..9b476a484
--- /dev/null
+++ b/assets/svg/gps_arrow.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="375px"
+   height="375px"
+   viewBox="0 0 375 375"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="gps_arrow.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.7173333"
+     inkscape:cx="187.79115"
+     inkscape:cy="187.5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
+  <g
+     id="surface1"
+     transform="matrix(0.63906155,0,0,0.98221939,67.675844,3.3354774)"
+     style="stroke:#ffffff;stroke-opacity:1;stroke-width:3.78656711;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:bevel;fill:#5454eb;fill-opacity:0.98823529">
+    <path
+       style="fill:#5454eb;fill-opacity:0.98823529;fill-rule:nonzero;stroke:#ffffff;stroke-opacity:1;stroke-width:3.78656711;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:bevel"
+       d="M 0,374.61719 C 0,373.62109 187.49609,-0.375 187.80469,0 188.84766,1.261719 375.34375,374.71094 375,374.85156 c -0.22266,0.0899 -42.48047,-18.05078 -93.90234,-40.3125 l -93.4961,-40.47265 -93.343748,40.46875 C 42.917969,356.78906 0.707031,375 0.457031,375 0.207031,375 0,374.82812 0,374.61719 Z m 0,0"
+       id="path2" />
+  </g>
+</svg>
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index f645f3eb1..2e75fd955 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -577,6 +577,14 @@
       "https://www.svgrepo.com/svg/22182/map"
     ]
   },
+  {
+    "path": "gps_arrow.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "hand.svg",
     "license": "CC0",