diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index eaf84bd38..1e2785891 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -91,7 +91,7 @@ template(name="attachmentGallery")
                 unless currentUser.isCommentOnly
                   unless currentUser.isWorker
                     a.js-rename
-                      i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
+                      i.fa.fa-pen-to-square.icon(title="{{_ 'rename'}}")
                     a.js-confirm-delete
                       i.fa.fa-trash.icon(title="{{_ 'delete'}}")
                     a.fa.fa-navicon.icon.js-open-attachment-menu(data-attachment-link="{{link}}" title="{{_ 'attachmentActionsPopup-title'}}")
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 5f9d5e9da..9877d9777 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -659,7 +659,7 @@ template(name="cardDetailsActionsPopup")
         //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
         li
           a.js-spent-time
-            i.fa.fa-clock-o
+            i.fa.fa-clock
             | {{_ 'editCardSpentTimePopup-title'}}
         li
           a.js-set-card-color
diff --git a/client/components/notifications/notificationIcon.jade b/client/components/notifications/notificationIcon.jade
index ff35739c4..f1fe67341 100644
--- a/client/components/notifications/notificationIcon.jade
+++ b/client/components/notifications/notificationIcon.jade
@@ -21,15 +21,15 @@ template(name='notificationIcon')
   else if($in activityType 'checkedItem' 'uncheckedItem' 'addChecklistItem' 'removedChecklistItem')
     i.fa.fa-check-square.activity-type(title="checklist item")
   else if($in activityType 'addComment')
-    i.fa.fa-comment-o.activity-type(title="comment")
+    i.fa.fa-comment.activity-type(title="comment")
   else if($in activityType 'createCustomField' 'setCustomField' 'unsetCustomField')
     i.fa.fa-code.activity-type(title="custom field")
   else if($in activityType 'addedLabel' 'removedLabel')
     i.fa.fa-tag.activity-type(title="label")
   else if($in activityType 'a-startAt' 'a-receivedAt')
-    i.fa.fa-clock-o.activity-type(title="date")
+    i.fa.fa-clock.activity-type(title="date")
   else if($in activityType 'a-dueAt' 'a-endAt')
-    i.fa.fa-clock-o.activity-type(title="date")
+    i.fa.fa-clock.activity-type(title="date")
 
   else if($in activityType 'createList' 'removeList' 'archivedList')
     +listNotificationIcon