diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
new file mode 100755
index 0000000..1d11d6a
--- /dev/null
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2014-07-17T12:47:06Z"
+		  product-name="filecollection_gallery">
+		<header/>
+		<body>
+			<trans-unit id="pagination_first">
+				<source>First</source>
+				<target>Erste</target>
+			</trans-unit>
+			<trans-unit id="pagination_last">
+				<source>Last</source>
+				<target>Letzte</target>
+			</trans-unit>
+			<trans-unit id="pagination_previous">
+				<source>&lt;</source>
+			</trans-unit>
+			<trans-unit id="pagination_next">
+				<source>&gt;</source>
+			</trans-unit>
+			<trans-unit id="back_to_gallery_selection">
+				<source>Back to gallery selection</source>
+				<target>Zurück zur Galerie-Auswahl</target>
+			</trans-unit>
+
+			<trans-unit id="error.noGallerySelected">
+				<source>No gallery selected</source>
+			</trans-unit>
+			<trans-unit id="btn.download">
+				<source>Download</source>
+				<target>Herunterladen</target>
+			</trans-unit>
+			<trans-unit id="btn.download_image">
+				<source>Download image "%s"</source>
+				<target>Das Bild "%s" herunterladen</target>
+			</trans-unit>
+			<trans-unit id="btn.maximize">
+				<source>Maximize in lightbox</source>
+				<target>Maximiere in einer Lightbox</target>
+			</trans-unit>
+
+			<trans-unit id="image.download.alt">
+				<source>Download</source>
+				<target>Herunterladen</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 826f5c6..ba64b99 100755
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
 	<file source-language="en" datatype="plaintext" original="messages" date="2014-07-17T12:47:06Z"
-		  product-name="sf-filecollection-gallery">
+		  product-name="filecollection_gallery">
 		<header/>
 		<body>
 			<trans-unit id="pagination_first">
@@ -26,9 +26,16 @@
 			<trans-unit id="btn.download">
 				<source>Download</source>
 			</trans-unit>
+			<trans-unit id="btn.download_image">
+				<source>Download image "%s"</source>
+			</trans-unit>
 			<trans-unit id="btn.maximize">
 				<source>Maximize in lightbox</source>
 			</trans-unit>
+
+			<trans-unit id="image.download.alt">
+				<source>Download</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf
index fe3404a..61fa220 100755
--- a/Resources/Private/Language/locallang_be.xlf
+++ b/Resources/Private/Language/locallang_be.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2014-07-17T12:47:06Z" product-name="sf-filecollection-gallery">
+	<file source-language="en" datatype="plaintext" original="messages" date="2014-07-17T12:47:06Z" product-name="filecollection_gallery">
         <header/>
         <body>
             <trans-unit id="flexforms_tab.settings">
diff --git a/Resources/Private/Partials/Gallery.html b/Resources/Private/Partials/Gallery.html
index 9f3ea8c..3e24af9 100755
--- a/Resources/Private/Partials/Gallery.html
+++ b/Resources/Private/Partials/Gallery.html
@@ -29,8 +29,8 @@ <h2>{galleryListName}</h2>
                             <f:image class="fc-gallery__item__thumbnail" image="{mediaItem}" maxWidth="{settings.mobile.image.maxWidth}" />
 
                             <f:if condition="{settings.downloadButton}">
-                                <f:link.file class="fc-gallery__download-btn" download="1" file="{mediaItem}">
-                                    <f:image loading="lazy" title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Languages/locallang.xlf:btn.download')}" src="EXT:filecollection_gallery/Resources/Public/Images/download-solid.svg" />
+                                <f:link.file aria-label="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download_image', arguments: '{0:mediaItem.properties.title}')}" class="fc-gallery__download-btn" download="1" file="{mediaItem}">
+                                    <f:image alt="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:image.download.alt')}" loading="lazy" title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Languages/locallang.xlf:btn.download')}" src="EXT:filecollection_gallery/Resources/Public/Images/download-solid.svg" />
                                 </f:link.file>
                             </f:if>
 
@@ -59,8 +59,8 @@ <h2>{galleryListName}</h2>
                                 </div>
                             </a>
                             <f:if condition="{settings.downloadButton}">
-                                <f:link.file title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download')}" class="fc-gallery__download-btn" download="1" file="{mediaItem}">
-                                    <f:image title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download')}" src="EXT:filecollection_gallery/Resources/Public/Images/download-solid.svg" />
+                                <f:link.file aria-label="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download_image', arguments: '{0:mediaItem.properties.title}')}" title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download')}" class="fc-gallery__download-btn" download="1" file="{mediaItem}">
+                                    <f:image alt="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:image.download.alt')}" title="{f:translate(key: 'LLL:EXT:filecollection_gallery/Resources/Private/Language/locallang.xlf:btn.download')}" src="EXT:filecollection_gallery/Resources/Public/Images/download-solid.svg" />
                                 </f:link.file>
                             </f:if>
 
diff --git a/Resources/Private/Templates/Gallery/ListFromFolder.html b/Resources/Private/Templates/Gallery/ListFromFolder.html
index 696f093..506d55a 100644
--- a/Resources/Private/Templates/Gallery/ListFromFolder.html
+++ b/Resources/Private/Templates/Gallery/ListFromFolder.html
@@ -17,7 +17,7 @@ <h2>{galleryFolderName}</h2>
             <f:for each="{paginatedObject}" as="object">
                 <f:if condition="{settings.enableLightbox}">
                     <f:then>
-                        <div class="sf-filecollection-gallery-image-container">
+                        <div class="filecollection_gallery-image-container">
                             <a rel="{settings.lightbox}" class="{settings.lightbox}" title="{object.properties.title}"
                                href="{f:uri.image(src:'{object.uid}', treatIdAsReference:0, maxWidth:'{settings.image.lightboxWidth}')}">
                                 <f:image image="{object}" width="{settings.image.width}" height="{settings.image.height}"
@@ -32,7 +32,7 @@ <h2>{galleryFolderName}</h2>
                         </div>
                     </f:then>
                     <f:else>
-                        <div class="sf-filecollection-gallery-image-container">
+                        <div class="filecollection_gallery-image-container">
                             <f:image image="{object}" width="{settings.image.width}" height="{settings.image.height}" alt="{object.properties.alternative}"
                                      title="{object.properties.title}"/>
                             <f:if condition="{object.properties.description}">
diff --git a/Resources/Private/Templates/Gallery/Nested.html b/Resources/Private/Templates/Gallery/Nested.html
index fedfa56..4c9ff17 100644
--- a/Resources/Private/Templates/Gallery/Nested.html
+++ b/Resources/Private/Templates/Gallery/Nested.html
@@ -5,7 +5,7 @@
 <f:section name="main">
     <f:if condition="{imageItems}">
             <f:for each="{paginatedObject}" as="object">
-                <div class="sf-filecollection-gallery-image-container">
+                <div class="filecollection_gallery-image-container">
                     <f:link.action action="list" arguments="{galleryUID : object.galleryUID}" title="{object.properties.title}">
                         <f:image image="{object}" width="{settings.image.width}" height="{settings.image.height}"
                                  alt="{object.properties.alternative}"
diff --git a/Resources/Private/Templates/Gallery/NestedFromFolder.html b/Resources/Private/Templates/Gallery/NestedFromFolder.html
index 6dd736c..5b9360b 100644
--- a/Resources/Private/Templates/Gallery/NestedFromFolder.html
+++ b/Resources/Private/Templates/Gallery/NestedFromFolder.html
@@ -5,7 +5,7 @@
 <f:section name="main">
     <f:if condition="{imageItems}">
             <f:for each="{paginatedObject}" as="object">
-                <div class="sf-filecollection-gallery-image-container">
+                <div class="filecollection_gallery-image-container">
                     <f:link.action action="listFromFolder" arguments="{galleryFolder: object.galleryFolder, galleryUID: object.galleryUID}" title="{object.properties.title}">
                         <f:image image="{object}" width="{settings.image.width}" height="{settings.image.height}"
                                  alt="{object.properties.alternative}"
