diff --git a/app/views/jst/conversations/composeButtonBar.handlebars b/app/views/jst/conversations/composeButtonBar.handlebars
index 437f317ee18..fff4c463b37 100644
--- a/app/views/jst/conversations/composeButtonBar.handlebars
+++ b/app/views/jst/conversations/composeButtonBar.handlebars
@@ -1,11 +1,23 @@
-<div class='ui-dialog-buttonset attachments'>
-  <button class='ui-button ui-widget ui-state-default ui-corner-all attach-file' type="button"
-          role="button" aria-disabled="false" title="{{#t "titles.add_attachment"}}Add an attachment{{/t}}">
-    <span class="ui-button-text"><i class='icon-paperclip'></i></span>
+<div class="ui-dialog-buttonset attachments">
+  <button class="ui-button ui-widget ui-state-default ui-corner-all attach-file"
+          type="button"
+          title="{{#t "titles.add_attachment"}}Add an attachment{{/t}}">
+    <span class="ui-button-text">
+      <i class="icon-paperclip"></i>
+      <span class="screenreader-only">
+        {{#t "titles.add_attachment"}}Add an attachment{{/t}}
+      </span>
+    </span>
   </button>
 
-  <button class='ui-button ui-widget ui-state-default ui-corner-all attach-media' type="button"
-          role="button" aria-disabled="false" title="{{#t "titles.record_media_comment"}}Record an audio or video comment{{/t}}">
-    <span class="ui-button-text"><i class='icon-media'></i></span>
+  <button class="ui-button ui-widget ui-state-default ui-corner-all attach-media"
+          type="button"
+          title="{{#t "titles.record_media_comment"}}Record an audio or video comment{{/t}}">
+    <span class="ui-button-text">
+      <i class="icon-media"></i>
+      <span class="screenreader-only">
+        {{#t "titles.record_media_comment"}}Record an audio or video comment{{/t}}
+      </span>
+    </span>
   </button>
 </div>
diff --git a/public/partials/_media_comments.html b/public/partials/_media_comments.html
index 747546cd042..f99d142c4e8 100644
--- a/public/partials/_media_comments.html
+++ b/public/partials/_media_comments.html
@@ -5,17 +5,17 @@
   </ul>
   <div id="record_media_tab" class="clearfix media_tab">
     <div id="media_record_option_holder">
-      <a id="video_record_option" class="record_option tooltip" title="Record with Webcam">
-        <span class="tooltip_wrap" style="display: none;">
-          <span class="tooltip_text">Record with Webcam</span>
-        </span>
-        <span class="icon"><img src="/images/webcam.png" alt="webcam"/></span>
+      <a id="video_record_option"
+         class="record_option tooltip"
+         href="#"
+         title="Record with Webcam">
+        <img src="/images/webcam.png" alt="Record with Webcam" />
       </a>
-      <a id="audio_record_option" class="record_option tooltip" title="Record with Microphone Only">
-        <span class="tooltip_wrap" style="display: none;">
-          <span class="tooltip_text">Record with Microphone Only</span>
-        </span>
-        <span class="icon"><img src="/images/microphone.png" alt="microphone"/></span>
+      <a id="audio_record_option"
+         class="record_option tooltip"
+         href="#"
+         title="Record with Microphone Only">
+        <img src="/images/microphone.png" alt="Record with Microphone Only" />
       </a>
     </div>
     <div id="video_record_holder_holder">
@@ -23,7 +23,11 @@
         <div class="recorder_message">Saving Recording...</div>
       </div>
       <div style="margin-bottom: 1px; margin-left: 10px;">
-        Title: <input id="video_record_title" type="text" style="width: 250px;" maxlength="255"/>
+        <label for="video_record_title">Title:</label>
+        <input id="video_record_title"
+               type="text"
+               style="width: 250px;"
+               maxlength="255" />
       </div>
       <div id="video_record_holder">
         <div id="video_record_meter" class="volume_meter">