diff --git a/layouts/_default/app.html b/layouts/_default/app.html
index c6a2dec..a340381 100644
--- a/layouts/_default/app.html
+++ b/layouts/_default/app.html
@@ -144,12 +144,14 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                                     {{ partial "badge.html" (dict "Icon" "flathub" "Lang" $lang "Alt" "storeFlathub" ) }}
                                     </a>
                                     <br>
-                                    <img src="https://img.shields.io/flathub/v/{{ .Index }}?label=on%20flathub"/>
+                                    <img src="https://img.shields.io/flathub/v/{{ .Index }}?label=on%20flathub" alt="Version on flathub"/>
                                     <br><br>{{ i18n "warnExternalWebsite" "flathub.org" }}
                                 {{ else if hasPrefix .Title "Snap" }}
                                     {{ $disclaimers.Set "snapcraft" true }}
                                     <a rel="nofollow noreferrer" href="https://snapcraft.io/{{ .Index }}">
                                     {{ partial "badge.html" (dict "Icon" "snapcraft" "Lang" $lang "Alt" "storeSnapcraft" ) }}
+                                    <br>
+                                    <img src="https://badgen.net/snapcraft/v/{{ .Index }}?label=on%20snapcraft" alt="Version on snapcraft"/>
                                     </a>
                                     <br><br>{{ i18n "warnExternalWebsite" "snapcraft.io" }}
                                 {{ else if hasPrefix .Title "Launchpad" }}
@@ -164,8 +166,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                                     {{ partial "badge.html" (dict "Icon" "amo" "Lang" $lang "Alt" "storeFirefoxAddons" ) }}
                                     </a>
                                     <br>
-                                    <img src="https://img.shields.io/amo/v/{{ .Index }}?logo=Firefox"/>
-                                    <img src="https://img.shields.io/amo/rating/{{ .Index }}?logo=Firefox"/>
+                                    <img src="https://img.shields.io/amo/v/{{ .Index }}?logo=Firefox" alt="{{ $AppData.version }} on addons.mozilla.org"/>
+                                    <img src="https://badgen.net/amo/stars/{{ .Index }}?logo=Firefox" alt="Rating on addons.mozilla.org"/>
+                                    <img src="https://badgen.net/amo/users/{{ .Index }}?logo=Firefox" alt="User count on addons.mozilla.org"/>
                                     <br><br>{{ i18n "warnExternalWebsite" "addons.mozilla.org" }}
                                 {{ else }}
                                 {{ i18n "file" }} {{ replace .Name "<version>" $AppData.version }}<br><br>