diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
index 80be3f6f265..4964ed33065 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -7,7 +7,6 @@
       icon="bars"
       action=toggleToolbar
       title=toggleToolbarTitle
-      ariaLabel=toggleToolbarTitle
       preventFocus=true
       tabindex=-1
     }}
@@ -18,7 +17,6 @@
     icon=toggleIcon
     action=toggleComposer
     title=toggleTitle
-    ariaLabel=toggleTitle
     tabindex=-1
   }}
 
@@ -28,7 +26,6 @@
       icon=fullscreenIcon
       action=toggleFullscreen
       title=fullscreenTitle
-      ariaLabel=fullscreenTitle
       tabindex=-1
     }}
   {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
index a0da06d06a7..338af161e5c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
@@ -3,7 +3,12 @@
     <div class="modal-inner-container">
       <div class="modal-header {{headerClass}}">
         {{#if dismissable}}
-          {{d-button icon="times" action=(route-action "closeModal" "initiatedByCloseButton") class="btn-flat modal-close close" title="modal.close" ariaLabel="modal.close"}}
+          {{d-button
+            icon="times"
+            action=(route-action "closeModal" "initiatedByCloseButton")
+            class="btn-flat modal-close close"
+            title="modal.close"
+          }}
         {{/if}}
 
         {{#if title}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
index 01e3edaa282..cea4521ecf3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
@@ -2,6 +2,5 @@
   action=(action "share" source)
   class=(concat "btn-default share-" source.id)
   translatedTitle=source.title
-  translatedAriaLabel=source.title
   icon=(if source.icon source.icon source.htmlIcon)
  }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
index df46dad3426..c2cb0d0a1ed 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
@@ -6,7 +6,6 @@
     <div class="topic-timer-modify">
       {{#if showEdit}}
         {{~d-button
-          ariaLabel="post.controls.edit_timer"
           title="post.controls.edit_timer"
           icon="pencil-alt"
           class="btn topic-timer-edit no-text"
@@ -15,7 +14,6 @@
       {{/if}}
       {{#if showTrashCan}}
         {{~d-button
-          ariaLabel="post.controls.remove_timer"
           title="post.controls.remove_timer"
           icon="trash-alt"
           class="btn topic-timer-remove no-text"
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 3ae8ef2ff9c..977de97cf5a 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -222,7 +222,6 @@
             {{d-button
               action=(action "togglePreview")
               translatedTitle=toggleText
-              translatedAriaLabel=toggleText
               icon="angle-double-left"
               class=(concat "btn-flat btn-mini-toggle toggle-preview " (unless showPreview "active"))
               }}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index c935e10ed98..96975d797be 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -69,7 +69,7 @@
                   tagName=""
                 }}
               {{else}}
-                {{private-message-glyph shouldShow=model.isPrivateMessage  tagName=""}}
+                {{private-message-glyph shouldShow=model.isPrivateMessage tagName=""}}
               {{/if}}
             {{/unless}}