diff --git a/modules/backend/assets/less/controls/simplelist.less b/modules/backend/assets/less/controls/simplelist.less
index b8cb4f136..b7a9280b0 100644
--- a/modules/backend/assets/less/controls/simplelist.less
+++ b/modules/backend/assets/less/controls/simplelist.less
@@ -11,7 +11,7 @@
 // With icons:
 //   <div class="control-simplelist with-icons">
 //       <ul>
-//           <li class="oc-icon-ok">Hello friend</li>
+//           <li class="oc-icon-check">Hello friend</li>
 //       </ul>
 //   </div>
 //
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 15e2c909b..81e2ae1aa 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -29,7 +29,7 @@
             ?>
             <li class="icon preview">
                 <a href="<?= URL::to('/') ?>" target="_blank" data-toggle="tooltip" data-placement="bottom" title="<?= trans('backend::lang.tooltips.preview_website') ?>">
-                    <i class="icon-bullseye"></i>
+                    <i class="icon-crosshairs"></i>
                 </a>
             </li>
             <li class="highlight account">
diff --git a/modules/cms/controllers/index/_content_toolbar.htm b/modules/cms/controllers/index/_content_toolbar.htm
index 31937f4bc..89d3d6045 100644
--- a/modules/cms/controllers/index/_content_toolbar.htm
+++ b/modules/cms/controllers/index/_content_toolbar.htm
@@ -1,7 +1,7 @@
 <div class="form-buttons loading-indicator-container" data-toolbar-type="content">
     <a
         href="javascript:;"
-        class="btn btn-primary oc-icon-ok save"
+        class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-hotkey="ctrl+s"
diff --git a/modules/cms/controllers/index/_layout_toolbar.htm b/modules/cms/controllers/index/_layout_toolbar.htm
index 9db1d7338..97b9eab7f 100644
--- a/modules/cms/controllers/index/_layout_toolbar.htm
+++ b/modules/cms/controllers/index/_layout_toolbar.htm
@@ -1,7 +1,7 @@
 <div class="form-buttons loading-indicator-container">
     <a
         href="javascript:;"
-        class="btn btn-primary oc-icon-ok save"
+        class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-hotkey="ctrl+s"
diff --git a/modules/cms/controllers/index/_page_toolbar.htm b/modules/cms/controllers/index/_page_toolbar.htm
index 9b3b7ed46..ef0e64b07 100644
--- a/modules/cms/controllers/index/_page_toolbar.htm
+++ b/modules/cms/controllers/index/_page_toolbar.htm
@@ -1,7 +1,7 @@
 <div class="form-buttons loading-indicator-container">
     <a
         href="javascript:;" 
-        class="btn btn-primary oc-icon-ok save"
+        class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-hotkey="ctrl+s"
@@ -15,7 +15,7 @@
     <a
         href="<?= URL::to($pageUrl) ?>"
         target="_blank"
-        class="btn btn-primary oc-icon-screenshot <?php if (!$templatePath): ?>hide<?php endif ?>"
+        class="btn btn-primary oc-icon-crosshairs <?php if (!$templatePath): ?>hide<?php endif ?>"
         data-control="preview-button">
         <?= e(trans('cms::lang.editor.preview')) ?>
     </a>
diff --git a/modules/cms/controllers/index/_partial_toolbar.htm b/modules/cms/controllers/index/_partial_toolbar.htm
index 8d0692d60..8b0cc791f 100644
--- a/modules/cms/controllers/index/_partial_toolbar.htm
+++ b/modules/cms/controllers/index/_partial_toolbar.htm
@@ -1,7 +1,7 @@
 <div class="form-buttons loading-indicator-container">
     <a
         href="javascript:;"
-        class="btn btn-primary oc-icon-ok save"
+        class="btn btn-primary oc-icon-check save"
         data-request="onSave"
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-hotkey="ctrl+s"