diff --git a/templates/CRM/Chat/Page/Contact/Tab.tpl b/templates/CRM/Chat/Page/Contact/Tab.tpl
index d3aab01..040c7ea 100644
--- a/templates/CRM/Chat/Page/Contact/Tab.tpl
+++ b/templates/CRM/Chat/Page/Contact/Tab.tpl
@@ -1,6 +1,6 @@
 <div id="sms-conversations-tab" class="view-content">
 <div class="action-link">
-  <a accesskey="N" href='{crmURL p="civicrm/sms/conversation/schedule" q="cid=`$contactId`"}' class="button medium-popup"><span><i class="crm-i fa-comment"></i> Schedule Conversation</span></a>
+  <a accesskey="N" href='{crmURL p="civicrm/sms/conversation/schedule" q="cid=`$contactId`"}' class="button medium-popup"><span><i class="crm-i fa-comment" role="img" aria-hidden="true"></i> Schedule Conversation</span></a>
 </div>
 
 <table class="crm-chat-selector crm-ajax-table">
diff --git a/templates/CRM/Chat/Page/ConversationType/View.tpl b/templates/CRM/Chat/Page/ConversationType/View.tpl
index ac3d2ab..6973b5b 100644
--- a/templates/CRM/Chat/Page/ConversationType/View.tpl
+++ b/templates/CRM/Chat/Page/ConversationType/View.tpl
@@ -7,7 +7,7 @@
   <h4>
     {$question.number}.
     {$question.text}
-    <a href="{crmURL p='civicrm/chat/question/edit' q="id=`$question.id`"}" title="edit action"><i class="crm-i fa-pencil"></i></a>
+    <a href="{crmURL p='civicrm/chat/question/edit' q="id=`$question.id`"}" title="edit action"><i class="crm-i fa-pencil" role="img" aria-hidden="true"></i></a>
   </h4>
 
   <ul>
@@ -28,11 +28,11 @@
       go to question {$questionMap[$action.action_data]}
     {/if}
 
-  <a href="{crmURL p='civicrm/chat/action/edit' q="id=`$action.id`"}" title="edit action"><i class="crm-i fa-pencil"></i></a>
+  <a href="{crmURL p='civicrm/chat/action/edit' q="id=`$action.id`"}" title="edit action"><i class="crm-i fa-pencil" role="img" aria-hidden="true"></i></a>
 
   </li>
   {/foreach}
-  <li><em>add action <a href="{crmURL p='civicrm/chat/action/add' q="questionId=`$question.id`"}" title="add action"><i class="crm-i fa-plus"></i></em></a></li>
+  <li><em>add action <a href="{crmURL p='civicrm/chat/action/add' q="questionId=`$question.id`"}" title="add action"><i class="crm-i fa-plus" role="img" aria-hidden="true"></i></em></a></li>
   </ul>
 
 {foreachelse}
@@ -51,7 +51,7 @@
     </ul>
   </div>
 {/if}
-<h4><em>{ts}Add question{/ts} <a href="{crmURL p='civicrm/chat/question/add' q="conversationTypeId=`$conversationType.id`"}" role="button"><i class="crm-i fa-plus"></i></a></em></h4>
+<h4><em>{ts}Add question{/ts} <a href="{crmURL p='civicrm/chat/question/add' q="conversationTypeId=`$conversationType.id`"}" role="button"><i class="crm-i fa-plus" role="img" aria-hidden="true"></i></a></em></h4>
 <p>{ts}Conversation timeout:{/ts} {$conversationType.timeout} {ts}minutes{/ts}</p>
 <br/><br/>
 <p>