diff --git a/_i18n/en/general/download.md b/_i18n/en/general/download.md
index 5050b9d4b..6f0f4dc47 100644
--- a/_i18n/en/general/download.md
+++ b/_i18n/en/general/download.md
@@ -10,6 +10,7 @@
    loc="/assets/images/badges"
    file="get-it-on-google-play.png"
    width="170"
+   islink = true
 %}
 {% endcapture %}
 
@@ -23,6 +24,7 @@
    loc="/assets/images/badges"
    file="get-it-on-fdroid.png"
    width="170"
+   islink = true
 %}
 {% endcapture %}
 
@@ -31,7 +33,7 @@
 Official versions of AntennaPod are available on Google Play and F-Droid:
 
 <!-- mdpo-disable-next-line -->
-[{{ img-GP | strip }}](https://play.google.com/store/apps/details?id=de.danoeh.antennapod) [{{ img-FD | strip }}](https://f-droid.org/packages/de.danoeh.antennapod/)
+<a href="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" target="_blank">{{- img-GP | strip -}}</a> <a href="https://f-droid.org/packages/de.danoeh.antennapod" target="_blank">{{- img-FD | strip -}}</a>
 
 AntennaPod is only officially published in above two app stores because we don't have the time to support more. All other stores listing AntennaPod copied the app without our explicit permission. We are not responsible for updating those or making sure they work correctly. The F-Droid repository is not maintained by us, but by the people behind F-Droid. F-Droid usually takes a few days until updates get available ([read more](/documentation/general/f-droid)). If an update is still not available more than a week after its release, feel free to let us know by creating a post on our [forum](https://forum.antennapod.org/)), and we'll investigate it.
 
diff --git a/_includes/image.html b/_includes/image.html
index 3f7b07309..ba5eec229 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -12,7 +12,9 @@
 {%- endfor %}
 
 {%- capture url %}
-   {%- if native-exists == true %}
+   {%- if include.file contains 'http' == true %}
+       {{ include.file }}
+   {%- elsif native-exists == true %}
       {{- native-url }}
    {%- elsif english-exists == true %}
       {{- english-url }}
@@ -21,11 +23,14 @@
    {%- endif %}
 {%- endcapture -%}
 
-<a href="" data-toggle="modal" data-target="#imgModal{{ include.file | remove:'.' }}">
+{% unless include.islink == true %}<a data-toggle="modal" data-target="#imgModal{{ include.file | remove:'.' }}" style="cursor: pointer;">{% endunless %}
   <img src="{{ url }}" alt="{{ img-alt }}"
     {%- if include.width %} width="{{ include.width }}"{% endif %}
-    {%- if include.max-width %} style="max-width:{{ include.max-width }};"{% endif %}
-    class="rounded {{ include.class }}"></a>
+    style="
+      {%- if include.max-width %}max-width:{{ include.max-width }}; {% endif %}
+      {%- if include.max-height %}max-height:{{ include.max-height }}; {% endif %}"
+    class="rounded mt-2 {{ include.class }}">
+{% unless include.islink == true %}</a>
 
 <div class="modal fade" id="imgModal{{ include.file | remove:'.' }}" tabindex="-1" role="dialog" aria-labelledby="imgModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
@@ -42,3 +47,4 @@
     </div>
   </div>
 </div>
+{%- endunless %}