diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php
index 9dd7ba445f..bde0f357d1 100644
--- a/phpBB/phpbb/storage/controller/attachment.php
+++ b/phpBB/phpbb/storage/controller/attachment.php
@@ -253,7 +253,7 @@ class attachment extends controller
 		// Content-type header
 		$response->headers->set('Content-Type', $attachment['mimetype']);
 
-		// Display images in browser and force download for other file types
+		// Display file types in browser and force download for others
 		if (strpos($attachment['mimetype'], 'image') !== false
 			|| strpos($attachment['mimetype'], 'audio') !== false
 			|| strpos($attachment['mimetype'], 'video') !== false
diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html
index 7d47ec13d0..7d1b0bb818 100644
--- a/phpBB/styles/prosilver/template/attachment.html
+++ b/phpBB/styles/prosilver/template/attachment.html
@@ -32,9 +32,7 @@
 		{% if _file.S_AUDIO_FILE %}
 			<dl class="file">
 				<dt class="c-file-header">
-					<audio class="c-file-audio-controls" controls="controls" preload="metadata">
-						<source class="c-file-audio-source" src="{{ _file.U_DOWNLOAD_LINK }}" type="{{ _file.MIMETYPE }}">
-					</audio>
+					<audio src="{{ _file.U_DOWNLOAD_LINK }}" type="{{ _file.MIMETYPE }}" class="c-file-audio-controls" controls="controls" preload="metadata"></audio>
 				</dt>
 				{% if _file.COMMENT %}
 					<dd class="c-file-comment">{{ _file.COMMENT }}</dd>
@@ -43,7 +41,7 @@
 					{% if _file.UPLOAD_ICON %}
 						<span class="o-icon c-file-icon">{{ _file.UPLOAD_ICON }}</span>
 					{% endif %}
-					<a class="c-file-actions-link postlink" href="{{ _file.U_DOWNLOAD_LINK }}" download>{{ _file.DOWNLOAD_NAME }}</a>
+					<a class="c-file-actions-link postlink" href="{{ _file.U_DOWNLOAD_LINK }}">{{ _file.DOWNLOAD_NAME }}</a>
 					<span class="c-file-actions-meta">({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}</span>
 				</dd>
 			</dl>
@@ -52,9 +50,7 @@
 		{% if _file.S_VIDEO_FILE %}
 			<dl class="file">
 				<dt class="c-file-header">
-					<video class="c-file-video-controls" controls="controls" preload="metadata">
-						<source class="c-file-video-source" src="{{ _file.U_DOWNLOAD_LINK }}" type="{{ _file.MIMETYPE }}">
-					</video>
+					<video src="{{ _file.U_DOWNLOAD_LINK }}" type="{{ _file.MIMETYPE }}" class="c-file-video-controls" controls="controls" preload="metadata"></video>
 				</dt>
 				{% if _file.COMMENT %}
 					<dd class="c-file-comment">{{ _file.COMMENT }}</dd>
@@ -63,7 +59,7 @@
 					{% if _file.UPLOAD_ICON %}
 						<span class="o-icon c-file-icon">{{ _file.UPLOAD_ICON }}</span>
 					{% endif %}
-					<a class="c-file-actions-link postlink" href="{{ _file.U_DOWNLOAD_LINK }}" download>{{ _file.DOWNLOAD_NAME }}</a>
+					<a class="c-file-actions-link postlink" href="{{ _file.U_DOWNLOAD_LINK }}">{{ _file.DOWNLOAD_NAME }}</a>
 					<span class="c-file-actions-meta">({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}</span>
 				</dd>
 			</dl>
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 0f1ea9fc0f..d945a14bd6 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -688,18 +688,10 @@ dl.thumbnail dt a:hover img {
 	max-width: 100%;
 }
 
-.c-file-audio-source {
-	/** placeholder */
-}
-
 .c-file-video-controls {
 	max-width: 100%;
 }
 
-.c-file-video-source {
-	/** placeholder */
-}
-
 /* Post poll styles
 ---------------------------------------- */
 fieldset.polls {