diff --git a/src/ServicePulse.Host/app/js/views/failed_groups/view.html b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
index 14c953ed8e..12544303b4 100644
--- a/src/ServicePulse.Host/app/js/views/failed_groups/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
@@ -99,7 +99,7 @@ <h6>Failed message groups</h6>
 
                                                 <span class="metadata"><i aria-hidden="true" class="fa fa-clock-o"></i> Last failed: <sp-moment date="{{group.last}}"></sp-moment></span>
 
-                                                <span class="metadata"><i aria-hidden="true" class="fa fa-refresh"></i> Last retried: <sp-moment empty-message="never" date="{{group.last_retry_completion_time}}"></sp-moment></span>
+                                                <span class="metadata"><i aria-hidden="true" class="fa fa-repeat"></i> Last retried: <sp-moment empty-message="never" date="{{group.last_retry_completion_time}}"></sp-moment></span>
                                             </p>
                                         </div>
                                     </div>
@@ -109,7 +109,7 @@ <h6>Failed message groups</h6>
                                                 <i aria-hidden="true" class="fa fa-eye no-link-underline">&nbsp</i>View Messages
                                             </button>
                                             <button type="button" class="btn btn-link btn-sm" confirm-click="vm.retryExceptionGroup(group)" ng-disabled="group.count == 0 || vm.isBeingRetried(group)" confirm-title="Are you sure you want to retry this group?" confirm-message="Retrying a whole group can take some time and put extra load on your system. Are you sure you want to retry this group of {{group.count}} messages?">
-                                                <i aria-hidden="true" class="fa fa-refresh no-link-underline">&nbsp</i>Request retry
+                                                <i aria-hidden="true" class="fa fa-repeat no-link-underline">&nbsp</i>Request retry
                                             </button>
                                             <button type="button" class="btn btn-link btn-sm" confirm-click="vm.archiveExceptionGroup(group)" ng-disabled="group.count == 0 || vm.isBeingRetried(group)" confirm-title="Are you sure you want to archive this group?" confirm-message="If you do, they will not be available for Retry.">
                                                 <i aria-hidden="true" class="fa fa-archive no-link-underline">&nbsp</i>Archive Group
diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/view.html b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
index 2675d1e23f..98b21cf262 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
@@ -26,9 +26,9 @@ <h1>Failed Messages</h1>
         <div class="row" ng-show="vm.failedMessages.length > 0">
             <div class="col-sm-12">
                 <div class="btn-toolbar">
-                    <button type="button" class="btn btn-default" ng-click="vm.retrySelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-refresh"></i> Retry {{vm.selectedIds.length | number}} selected</button>
+                    <button type="button" class="btn btn-default" ng-click="vm.retrySelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-repeat"></i> Retry {{vm.selectedIds.length | number}} selected</button>
                     <button type="button" class="btn btn-default" confirm-title="Are you sure you want to archive the selected messages?" confirm-message="If you archive, these messages won't be available for retrying unless they're later unarchived." confirm-click="vm.archiveSelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-archive"></i> Archive {{vm.selectedIds.length | number}} selected</button>
-                    <button type="button" class="btn btn-default" confirm-title="Are you sure you want to retry the whole group?" confirm-message="Retrying a whole group can take some time and put extra load on your system. Are you sure you want to retry all these messages?" confirm-click="vm.retryExceptionGroup(vm.selectedExceptionGroup)"><i class="fa fa-refresh"></i> Retry all</button>
+                    <button type="button" class="btn btn-default" confirm-title="Are you sure you want to retry the whole group?" confirm-message="Retrying a whole group can take some time and put extra load on your system. Are you sure you want to retry all these messages?" confirm-click="vm.retryExceptionGroup(vm.selectedExceptionGroup)"><i class="fa fa-repeat"></i> Retry all</button>
                     <button type="button" class="btn btn-default" ng-show="vm.selectedExceptionGroup.id" confirm-title="Are you sure you want to archive this group?" confirm-message="If you archive, the messages in the group won't be available for retrying unless they're later unarchived." confirm-click="vm.archiveExceptionGroup(vm.selectedExceptionGroup)"><i class="fa fa-archive"></i> Archive all</button>
                     <div class="btn-group pull-right">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/view.html b/src/ServicePulse.Host/app/js/views/pending_retries/view.html
index 3a4baedcfe..4ef83bb3c7 100644
--- a/src/ServicePulse.Host/app/js/views/pending_retries/view.html
+++ b/src/ServicePulse.Host/app/js/views/pending_retries/view.html
@@ -31,9 +31,9 @@ <h1>Failed Messages</h1>
                                 </div>
                             </div>
                             <div class="action-btns">
-                                <button type="button" class="btn btn-default" confirm-title="Are you sure you want to retry the selected messages?" confirm-message="Ensure that the selected messages were not processed previously as this will create a duplicate message." confirm-second-paragraph="NOTE: If the selection includes messages to be processed via unaudited endpoints, those messages will need to be marked as resolved once the retry is manually verified." confirm-click="vm.retrySelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-refresh"></i> <span>Retry</span> ({{vm.selectedIds.length | number}})</button>
+                                <button type="button" class="btn btn-default" confirm-title="Are you sure you want to retry the selected messages?" confirm-message="Ensure that the selected messages were not processed previously as this will create a duplicate message." confirm-second-paragraph="NOTE: If the selection includes messages to be processed via unaudited endpoints, those messages will need to be marked as resolved once the retry is manually verified." confirm-click="vm.retrySelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-repeat"></i> <span>Retry</span> ({{vm.selectedIds.length | number}})</button>
                                 <button type="button" class="btn btn-default" confirm-title="Are you sure you want to mark as resolved the selected messages?" confirm-message="If you mark these messages as resolved they will not be available for Retry. Messages should only be marked as resolved only if they belong to unaudited endpoints." confirm-click="vm.markAsResolvedSelected()" ng-disabled="vm.selectedIds.length == 0"><i class="fa fa-check-square-o"></i> <span>Mark as resolved</span> ({{vm.selectedIds.length | number}})</button>
-                                <button type="button" class="btn btn-default" ng-disabled="vm.filteredTotal === '0'" confirm-title="{{vm.retryAllConfirmationTitle()}}" confirm-message="{{vm.retryAllConfirmationMessage()}}" confirm-click="vm.retryAll()" confirm-ok-only="{{vm.isQueueFilterEmpty()}}"><i class="fa fa-refresh"></i> <span>Retry all</span> ({{vm.filteredTotal | number}})</button>
+                                <button type="button" class="btn btn-default" ng-disabled="vm.filteredTotal === '0'" confirm-title="{{vm.retryAllConfirmationTitle()}}" confirm-message="{{vm.retryAllConfirmationMessage()}}" confirm-click="vm.retryAll()" confirm-ok-only="{{vm.isQueueFilterEmpty()}}"><i class="fa fa-repeat"></i> <span>Retry all</span> ({{vm.filteredTotal | number}})</button>
                                 <button type="button" class="btn btn-default" ng-disabled="vm.filteredTotal === '0'" confirm-message="Are you sure you want to mark as resolved all {{vm.filteredTotal}} retried messages out of {{vm.total}}? If you do they will not be available for Retry. {{vm.filteredTotal < vm.total ? 'If you want to mark as resolved all clear the filtering.' : ''}}" confirm-click="vm.markAsResolvedAll()"><i class="fa fa-check-square-o"></i> <span>Mark all as resolved</span> ({{vm.filteredTotal | number}})</button>
                             </div>
                         </div>