diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index ac157d3f0..793bcd168 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -47,8 +47,8 @@
         <div class="editor-image-upload">
           <input type="file" id="image-upload-main" name="file" accept="image/*" style="display:none">
           <button type="button" class="crayons-btn crayons-btn--s crayons-btn--icon-left crayons-btn--ghost-dimmed" onclick="handleImageUpload(event,'main')">
-            <%= inline_svg_tag("image.svg", aria: true, class: "crayons-icon", title: "Image") %>
-            <span class="hidden s:inline-block">Upload image</span>
+            <%= inline_svg_tag("image.svg", aria: true, class: "crayons-icon") %>
+            <span class="hidden s:inline-block" aria-hidden="false">Upload image</span>
           </button>
           <label class="image-upload-file-label" id="image-upload-file-label-main"></label>
           <input type="submit" id='image-upload-submit-main' value="Upload" style="display:none">
@@ -56,8 +56,8 @@
         </div>
 
         <button type="button" class="crayons-btn crayons-btn--s crayons-btn--icon-left crayons-btn--ghost-dimmed response-templates-button" title="Use a response template" data-has-listener="false" data-form-id="new_comment">
-          <%= inline_svg_tag("templates.svg", aria: true, class: "crayons-icon", title: "Templates") %>
-          <span class="hidden s:inline-block">Templates</span>
+          <%= inline_svg_tag("templates.svg", aria: true, class: "crayons-icon") %>
+          <span class="hidden s:inline-block" aria-hidden="false">Templates</span>
         </button>
 
         <a href="/p/editor_guide" class="crayons-btn crayons-btn--ghost-dimmed crayons-btn--icon crayons-btn--s ml-auto" target="_blank" rel="noopener" title="Markdown Guide">