diff --git a/assets/modules/docmanager/templates/main.tpl b/assets/modules/docmanager/templates/main.tpl
index faf69f95e..8949bd110 100644
--- a/assets/modules/docmanager/templates/main.tpl
+++ b/assets/modules/docmanager/templates/main.tpl
@@ -75,8 +75,7 @@
 <h1>[+lang.DM_module_title+]</h1>
 <div id="actions">
     <ul class="actionButtons">
-        <li id="Button1"><a href="index.php?a=2"><img
-                        src="media/style/common/images/icons/stop.png"/> [+lang.DM_close+]</a></li>
+        <li id="Button1"><a href="index.php?a=2">[+lang.DM_close+]</a></li>
     </ul>
 </div>
 <div class="section">
diff --git a/assets/modules/docmanager/templates/sort.tpl b/assets/modules/docmanager/templates/sort.tpl
index 775218b7b..b96b72e29 100644
--- a/assets/modules/docmanager/templates/sort.tpl
+++ b/assets/modules/docmanager/templates/sort.tpl
@@ -9,8 +9,6 @@
 </form>
 
 <ul class="actionButtons">
-    <li id="sort_btn"><a href="#" onclick="save();"><img src="media/style/common/images/icons/save.png"
-                                                         align="absmiddle"> [+lang.DM_go+]</a></li>
-    <li id="cancel"><a href="#" onclick="document.location.href='index.php?a=2';"><img
-                    src="media/style/common/images/icons/cancel.png" align="absmiddle"> [+lang.DM_cancel+]</a></li>
+    <li id="sort_btn"><a href="#" onclick="save();">[+lang.DM_go+]</a></li>
+    <li id="cancel"><a href="#" onclick="document.location.href='index.php?a=2';">[+lang.DM_cancel+]</a></li>
 </ul>
\ No newline at end of file
diff --git a/assets/modules/docmanager/templates/sort_list.tpl b/assets/modules/docmanager/templates/sort_list.tpl
index 8e7c99f2e..b76bbbb0a 100644
--- a/assets/modules/docmanager/templates/sort_list.tpl
+++ b/assets/modules/docmanager/templates/sort_list.tpl
@@ -95,12 +95,9 @@
 </form>
 <div id="actions">
     <ul class="actionButtons">
-        <li id="Button1"><a href="index.php?a=2"><img
-                        src="media/style/common/images/icons/stop.png" align="absmiddle"> [+lang.DM_close+]</a></li>
-        <li id="Button2" style="display:[+sort.save+]"><a href="#" onclick="save();"><img
-                        src="media/style/common/images/icons/save.png" align="absmiddle"> [+lang.DM_save+]</a></li>
-        <li id="Button4"><a href="#" onclick="reset();"><img src="media/style/common/images/icons/cancel.png"
-                                                             align="absmiddle"> [+lang.DM_cancel+]</a></li>
+        <li id="Button1"><a href="index.php?a=2">[+lang.DM_close+]</a></li>
+        <li id="Button2" style="display:[+sort.save+]"><a href="#" onclick="save();">[+lang.DM_save+]</a></li>
+        <li id="Button4"><a href="#" onclick="reset();">[+lang.DM_cancel+]</a></li>
     </ul>
 </div>
 <div class="section">
diff --git a/assets/modules/docmanager/templates/update.tpl b/assets/modules/docmanager/templates/update.tpl
index d1f4953ba..e1f454966 100644
--- a/assets/modules/docmanager/templates/update.tpl
+++ b/assets/modules/docmanager/templates/update.tpl
@@ -24,10 +24,8 @@
 <h1>[+lang.DM_module_title+]</h1>
 <div id="actions">
     <ul class="actionButtons">
-        <li id="Button1"><a href="index.php?a=2"><img
-                        src="media/style/common/images/icons/stop.png" align="absmiddle"> [+lang.DM_close+]</a></li>
-        <li id="Button4"><a href="#" onclick="reset();"><img src="media/style/common/images/icons/cancel.png"
-                                                             align="absmiddle"> [+lang.DM_cancel+]</a></li>
+        <li id="Button1"><a href="index.php?a=2">[+lang.DM_close+]</a></li>
+        <li id="Button4"><a href="#" onclick="reset();">[+lang.DM_cancel+]</a></li>
     </ul>
 </div>
 
diff --git a/assets/plugins/qm/inc/on_doc_form_prerender.php b/assets/plugins/qm/inc/on_doc_form_prerender.php
index fab6abccb..88f051522 100644
--- a/assets/plugins/qm/inc/on_doc_form_prerender.php
+++ b/assets/plugins/qm/inc/on_doc_form_prerender.php
@@ -71,9 +71,6 @@
 // Hide default manager action buttons
 $mc->addLine('qmHide([document.getElementById("actions")]);');
 
-// Get MODx theme
-$qm_theme = evo()->config['manager_theme'];
-
 // Get doc id
 if (anyv('id')) {
     $doc_id = (int)anyv('id');
@@ -84,25 +81,22 @@
 }
 
 // Add action buttons
+// アイコンは付けない（どのテーマも .actionButtons a img を隠す。テーマに images/icons も無い）
 if ($this->conf('prop_loadtb')) {
     $mc->addLine(
         sprintf(
-            'var controls = "<div style=\\"padding:4px 0;position:fixed;top:10px;right:-10px;z-index:1000\\" id=\\"qmcontrols\\" class=\\"actionButtons\\"><ul><li class=\\"primary\\"><a href=\\"#\\" onclick=\\"documentDirty=false;gotosave=true;document.mutate.save.click();return false;\\"><img src=\\"media/style/%s/images/icons/save.png\\" />%s</a></li><li><a href=\\"#\\" id=\\"cancel\\" onclick=\\"parent.location.href=\'%s\';return false;\\"><img src=\\"media/style/%s/images/icons/stop.png\\"/>%s</a></li></ul></div>";',
-            $qm_theme,
+            'var controls = "<div style=\\"padding:4px 0;position:fixed;top:10px;right:-10px;z-index:1000\\" id=\\"qmcontrols\\" class=\\"actionButtons\\"><ul><li class=\\"primary\\"><a href=\\"#\\" onclick=\\"documentDirty=false;gotosave=true;document.mutate.save.click();return false;\\">%s</a></li><li><a href=\\"#\\" id=\\"cancel\\" onclick=\\"parent.location.href=\'%s\';return false;\\">%s</a></li></ul></div>";',
             $_lang['save'],
             evo()->makeUrl($doc_id, '', '', 'full'),
-            $qm_theme,
             $_lang['cancel']
         )
     );
 } else {
     $mc->addLine(
         sprintf(
-            'var controls = "<div style=\\"padding:4px 0;position:fixed;top:10px;right:-10px;z-index:1000\\" id=\\"qmcontrols\\" class=\\"actionButtons\\"><ul><li class=\\"primary\\"><a href=\\"#\\" onclick=\\"documentDirty=false;gotosave=true;document.mutate.save.click();return false;\\"><img src=\\"media/style/%s/images/icons/save.png\\" />%s</a></li><li><a href=\\"#\\" id=\\"cancel\\" onclick=\\"parent.location.href=\'%s\';return false;\\"><img src=\\"media/style/%s/images/icons/stop.png\\"/>%s</a></li></ul></div>";',
-            $qm_theme,
+            'var controls = "<div style=\\"padding:4px 0;position:fixed;top:10px;right:-10px;z-index:1000\\" id=\\"qmcontrols\\" class=\\"actionButtons\\"><ul><li class=\\"primary\\"><a href=\\"#\\" onclick=\\"documentDirty=false;gotosave=true;document.mutate.save.click();return false;\\">%s</a></li><li><a href=\\"#\\" id=\\"cancel\\" onclick=\\"parent.location.href=\'%s\';return false;\\">%s</a></li></ul></div>";',
             $_lang['save'],
             evo()->makeUrl($doc_id, '', '', 'full'),
-            $qm_theme,
             $_lang['cancel']
         )
     );
diff --git a/manager/actions/document/document_data.static.php b/manager/actions/document/document_data.static.php
index 058ad6ee4..1ede5f7ba 100644
--- a/manager/actions/document/document_data.static.php
+++ b/manager/actions/document/document_data.static.php
@@ -143,7 +143,6 @@ function movedocument() {
         <?php if (evo()->hasPermission('save_document')) : ?>
             <li id="Button1" class="mutate">
                 <a href="javascript:void(0)" onclick="editdocument();">
-                    <img src="<?= $_style["icons_edit_document"] ?>"/>
                     <?= $_lang['edit'] ?>
                 </a>
             </li>
@@ -151,7 +150,6 @@ function movedocument() {
         <?php if (evo()->hasPermission('save_document') && evo()->hasPermission('move_document')) : ?>
             <li id="Button2" class="mutate">
                 <a href="#" onclick="movedocument();">
-                    <img src="<?= $_style["icons_move_document"] ?>"/>
                     <?= $_lang['move'] ?>
                 </a>
             </li>
@@ -159,7 +157,6 @@ function movedocument() {
         <?php if (evo()->hasPermission('new_document') && evo()->hasPermission('save_document')) : ?>
             <li id="Button4">
                 <a href="#" onclick="duplicatedocument();">
-                    <img src="<?= $_style["icons_resource_duplicate"] ?>"/>
                     <?= $_lang['duplicate'] ?>
                 </a>
             </li>
@@ -167,7 +164,6 @@ function movedocument() {
         <?php if (evo()->hasPermission('delete_document') && evo()->hasPermission('save_document')) : ?>
             <li id="Button3">
                 <a href="#" onclick="deletedocument();">
-                    <img src="<?= $_style["icons_delete_document"] ?>"/>
                     <?= $_lang['delete'] ?>
                 </a>
             </li>
@@ -181,7 +177,6 @@ function movedocument() {
                     : sprintf("window.open('../index.php?id=%s','previeWin')", $id);
                 ?>"
             >
-                <img src="<?= $_style["icons_preview_resource"] ?>"/>
                 <?= $_lang['view_resource'] ?>
             </a>
         </li>
@@ -200,10 +195,7 @@ function movedocument() {
                     echo 'document.location.href=\'index.php?a=2\';';
                 }
                 ?>"
-            ><img
-                    alt="icons_cancel"
-                    src="<?= $_style["icons_cancel"] ?>"
-                /> <?= $_lang['cancel'] ?></a>
+            ><?= $_lang['cancel'] ?></a>
         </li>
     </ul>
 </div>
diff --git a/manager/actions/document/move_document.dynamic.php b/manager/actions/document/move_document.dynamic.php
index 3edf7d472..ee1f391c2 100644
--- a/manager/actions/document/move_document.dynamic.php
+++ b/manager/actions/document/move_document.dynamic.php
@@ -44,8 +44,8 @@ function get_src_content($id, $parent)
 <h1>{$_lang['move_resource_title']}</h1>
 <div id="actions">
 	<ul class="actionButtons">
-	  <li><a href="#" onclick="document.newdocumentparent.submit();" class="primary"><img src="{$_style["icons_save"]}" /> {$_lang['save']}</a></li>
-	  <li class="mutate"><a href="#" onclick="documentDirty=false;document.location.href='{$redirect}'"><img src="{$_style["icons_cancel"]}" /> {$_lang['cancel']}</a></li>
+	  <li><a href="#" onclick="document.newdocumentparent.submit();" class="primary">{$_lang['save']}</a></li>
+	  <li class="mutate"><a href="#" onclick="documentDirty=false;document.location.href='{$redirect}'">{$_lang['cancel']}</a></li>
 	</ul>
 </div>
 
diff --git a/manager/actions/document/mutate_content/action_buttons.php b/manager/actions/document/mutate_content/action_buttons.php
index f7b241b75..436821b57 100644
--- a/manager/actions/document/mutate_content/action_buttons.php
+++ b/manager/actions/document/mutate_content/action_buttons.php
@@ -65,18 +65,14 @@ function getActionButtons($id)
 
 function ab_preview($id = 0)
 {
-    $tpl = '<li id="preview"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style('icons_preview_resource');
-    $ph['alt'] = 'preview resource';
+    $tpl = '<li id="preview"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('preview');
     return parseText($tpl, $ph);
 }
 
 function ab_save()
 {
-    $tpl = '<li id="save" class="primary mutate"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a>[+select+]</li>';
-    $ph['icon'] = style('icons_save');
-    $ph['alt'] = 'icons_save';
+    $tpl = '<li id="save" class="primary mutate"><a href="#">[+label+]</a>[+select+]</li>';
     $ph['label'] = lang('update');
 
     $ph['select'] = '<span class="and"> + </span><select id="stay" name="stay">%s</select>';
@@ -114,9 +110,7 @@ function ab_save()
 
 function ab_open_draft($id)
 {
-    $tpl = '<li id="opendraft" class="opendraft mutate"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_save");
-    $ph['alt'] = 'icons_draft';
+    $tpl = '<li id="opendraft" class="opendraft mutate"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('open_draft');
     return parseText($tpl, $ph);
 }
@@ -131,9 +125,7 @@ function ab_create_draft($id)
         return false;
     }
 
-    $tpl = '<li id="createdraft" class="mutate"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_save");
-    $ph['alt'] = 'icons_draft';
+    $tpl = '<li id="createdraft" class="mutate"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('create_draft');
 
     return parseText($tpl, $ph);
@@ -141,53 +133,42 @@ function ab_create_draft($id)
 
 function ab_cancel($id)
 {
-    $tpl = '<li id="cancel" class="mutate"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_cancel");
-    $ph['alt'] = 'icons_cancel';
+    $tpl = '<li id="cancel" class="mutate"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('cancel');
     return parseText($tpl, $ph);
 }
 
 function ab_move()
 {
-    $tpl = '<li id="move" class="mutate"><a href="#"><img src="[+icon+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_move_document");
+    $tpl = '<li id="move" class="mutate"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('move');
     return parseText($tpl, $ph);
 }
 
 function ab_duplicate()
 {
-    $tpl = '<li id="duplicate"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_resource_duplicate");
-    $ph['alt'] = 'icons_resource_duplicate';
+    $tpl = '<li id="duplicate"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('duplicate');
     return parseText($tpl, $ph);
 }
 
 function ab_delete()
 {
-    $tpl = '<li id="delete"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_delete_document");
-    $ph['alt'] = 'icons_delete_document';
+    $tpl = '<li id="delete"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('delete');
     return parseText($tpl, $ph);
 }
 
 function ab_undelete()
 {
-    $tpl = '<li id="undelete"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_undelete_resource");
-    $ph['alt'] = 'icons_undelete_document';
+    $tpl = '<li id="undelete"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('undelete_resource');
     return parseText($tpl, $ph);
 }
 
 function ab_delete_draft()
 {
-    $tpl = '<li id="deletedraft"><a href="#"><img src="[+icon+]" alt="[+alt+]" /> [+label+]</a></li>';
-    $ph['icon'] = style("icons_delete_document");
-    $ph['alt'] = 'icons_delete_document';
+    $tpl = '<li id="deletedraft"><a href="#">[+label+]</a></li>';
     $ph['label'] = lang('delete_draft');
     return parseText($tpl, $ph);
 }
diff --git a/manager/actions/document/parent_picker.dynamic.php b/manager/actions/document/parent_picker.dynamic.php
index 24b864a2e..1e36ae759 100644
--- a/manager/actions/document/parent_picker.dynamic.php
+++ b/manager/actions/document/parent_picker.dynamic.php
@@ -46,8 +46,7 @@
         <?php if (evo()->checkPermissions(0)): ?>
             <li><a href="#" id="parentPickerRoot"><?= hsc(lang('parent_picker_root')) ?></a></li>
         <?php endif; ?>
-        <li class="mutate"><a href="#" onclick="EvoShell.closeModal({reloadMain: false}); return false;"><img
-                    src="<?= style('icons_cancel') ?>"/> <?= hsc(lang('cancel')) ?></a></li>
+        <li class="mutate"><a href="#" onclick="EvoShell.closeModal({reloadMain: false}); return false;"><?= hsc(lang('cancel')) ?></a></li>
     </ul>
 </div>
 
diff --git a/manager/actions/document/publish_draft.dynamic.php b/manager/actions/document/publish_draft.dynamic.php
index b9eee379a..8bd398a62 100644
--- a/manager/actions/document/publish_draft.dynamic.php
+++ b/manager/actions/document/publish_draft.dynamic.php
@@ -21,7 +21,6 @@
 include_once(MODX_MANAGER_PATH . 'actions/document/mutate_content/functions.php');
 
 $ph['id'] = $docid;
-$ph['style_icons_cancel'] = style('icons_cancel');
 $ph['lang_cancel'] = lang('cancel');
 
 $tpl = getTplDraft();
@@ -94,7 +93,7 @@ function getTplDraft()
     <ul class="actionButtons">
         <li class="mutate">
         <a href="javascript:void(0)" onclick="document.location.href='index.php?a=131&id=[+id+]'">
-        <img src="[+style_icons_cancel+]" /> [+lang_cancel+]
+        [+lang_cancel+]
         </a>
         </li>
     </ul>
diff --git a/manager/actions/document/resources_list.static.php b/manager/actions/document/resources_list.static.php
index 0deec5aef..ece03a39a 100644
--- a/manager/actions/document/resources_list.static.php
+++ b/manager/actions/document/resources_list.static.php
@@ -162,27 +162,26 @@
     <div id="actions">
         <ul class="actionButtons">
             <?php
-            $tpl = '<li id="%s" class="mutate"><a href="#" onclick="%s"><img src="%s" /> %s</a></li>';
+            $tpl = '<li id="%s" class="mutate"><a href="#" onclick="%s">%s</a></li>';
             if (hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) {
-                echo sprintf($tpl, 'Button1', 'editdocument();', $_style["icons_edit_document"], $_lang['edit']);
+                echo sprintf($tpl, 'Button1', 'editdocument();', $_lang['edit']);
             }
             if (hasPermission('move_document') && hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) {
-                echo sprintf($tpl, 'Button2', 'movedocument();', $_style["icons_move_document"], $_lang['move']);
+                echo sprintf($tpl, 'Button2', 'movedocument();', $_lang['move']);
             }
             if (evo()->doc->canCopyDoc() && $id != 0 && manager()->isAllowed($id)) {
-                echo sprintf($tpl, 'Button4', 'duplicatedocument();', $_style["icons_resource_duplicate"],
-                    $_lang['duplicate']);
+                echo sprintf($tpl, 'Button4', 'duplicatedocument();', $_lang['duplicate']);
             }
             if (hasPermission('delete_document') && hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) {
-                echo sprintf($tpl, 'Button3', 'deletedocument();', $_style["icons_delete_document"], $_lang['delete']);
+                echo sprintf($tpl, 'Button3', 'deletedocument();', $_lang['delete']);
             }
 
             $url = evo()->makeUrl($id);
             $prev = "window.open('" . $url . "','previeWin')";
-            echo sprintf($tpl, 'Button6', $prev, $_style["icons_preview_resource"],
+            echo sprintf($tpl, 'Button6', $prev,
                 $id == 0 ? $_lang["view_site"] : $_lang['view_resource']);
             $action = "documentDirty=false;document.location.href='" . getReturnAction($current) . "'";
-            echo sprintf($tpl, 'Button5', $action, $_style["icons_cancel"], $_lang['cancel']);
+            echo sprintf($tpl, 'Button5', $action, $_lang['cancel']);
             ?>
         </ul>
     </div>
@@ -194,19 +193,11 @@
                 <ul class="actionButtons">
                     <li class="mutate">
                         <a href="index.php?a=4&amp;pid=<?= $id ?>">
-                            <img
-                                src="<?= $_style["icons_new_document"] ?>"
-                                align="absmiddle"
-                            />
                             <?= $_lang['create_resource_here'] ?>
                         </a>
                     </li>
                     <li class="mutate">
                         <a href="index.php?a=72&amp;pid=<?= $id ?>">
-                            <img
-                                src="<?= $_style["icons_new_weblink"] ?>"
-                                align="absmiddle"
-                            />
                             <?= $_lang['create_weblink_here'] ?>
                         </a>
                     </li>
diff --git a/manager/actions/document/revision.dynamic.php b/manager/actions/document/revision.dynamic.php
index 545aa2135..f6714c5ef 100644
--- a/manager/actions/document/revision.dynamic.php
+++ b/manager/actions/document/revision.dynamic.php
@@ -16,7 +16,6 @@
 }
 
 $ph['id'] = $id;
-$ph['style_icons_cancel'] = $_style["icons_cancel"];
 $ph['lang_cancel'] = $_lang['cancel'];
 
 switch (getv('mode')) {
@@ -46,7 +45,7 @@ function tpl()
 <ul class="actionButtons">
     <li class="mutate">
     <a href="javascript:void(0)" onclick="document.location.href='index.php?a=2'">
-    <img src="[+style_icons_cancel+]" /> [+lang_cancel+]
+    [+lang_cancel+]
     </a>
     </li>
 </ul>
diff --git a/manager/actions/element/files.dynamic.php b/manager/actions/element/files.dynamic.php
index 0b4fa8d3c..c2e09ec90 100644
--- a/manager/actions/element/files.dynamic.php
+++ b/manager/actions/element/files.dynamic.php
@@ -71,24 +71,21 @@
             $_ = '';
             if (anyv('mode') === 'save') {
                 $_ = $modx->parseText(
-                    '<li class="primary"><a href="#" onclick="document.editFile.submit();"><img src="[+icons_save+]" /> [+lang_save+]</a></li>',
+                    '<li class="primary"><a href="#" onclick="document.editFile.submit();">[+lang_save+]</a></li>',
                     [
-                        'icons_save' => $_style['icons_save'],
                         'lang_save' => lang('save')
                     ]
                 ) . "\n";
             }
             $_ .= $modx->parseText(
-                '<li><a href="[+href+]" data-evo-post onclick="return getFolderName(this);"><img src="[+tree_folder+]" alt="" /> [+subject+]</a></li>',
+                '<li><a href="[+href+]" data-evo-post onclick="return getFolderName(this);">[+subject+]</a></li>',
                 [
                     'href' => hsc('index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name='),
-                    'tree_folder' => $_style['tree_folder'],
                     'subject' => lang('add_folder')
                 ]
             );
 
-            $tpl = '<li><a href="[+href+]" data-evo-post onclick="return getFileName(this);"><img src="[+image+]" alt="" /> [+lang_newfile+]</a></li>';
-            $ph['image'] = $_style['tree_page'];
+            $tpl = '<li><a href="[+href+]" data-evo-post onclick="return getFileName(this);">[+lang_newfile+]</a></li>';
             $ph['href'] = hsc('index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=');
             $ph['lang_newfile'] = lang('files_create_textfile');
             $_ .= $modx->parseText($tpl, $ph);
@@ -98,9 +95,7 @@
         <li id="Button5" class="mutate">
             <a
                 href="#"
-                onclick="documentDirty=false;document.location.href='index.php?<?= $href ?>';"><img
-                    alt="icons_cancel"
-                    src="<?= $_style["icons_cancel"] ?>" /> <?= lang('cancel') ?></a>
+                onclick="documentDirty=false;document.location.href='index.php?<?= $href ?>';"><?= lang('cancel') ?></a>
         </li>
     </ul>
 </div>
@@ -384,10 +379,7 @@ function deleteFile(file) {
             <input type="file" name="userfile" onchange="document.upload.submit();">
             <a
                 class="default" href="#" onclick="document.upload.submit()"
-                style="display:inline;float:none;"><?=
-                                                    '<img src="' . $_style['icons_add'] . '" /> '
-                                                        . lang('files_uploadfile')
-                                                    ?></a>
+                style="display:inline;float:none;"><?= lang('files_uploadfile') ?></a>
             <input type="submit" value="<?= lang('files_uploadfile') ?>" style="display:none;">
         </div>
     </form>
diff --git a/manager/actions/element/modules.static.php b/manager/actions/element/modules.static.php
index 45a8fb846..5ce365103 100644
--- a/manager/actions/element/modules.static.php
+++ b/manager/actions/element/modules.static.php
@@ -131,12 +131,10 @@ function menuAction(a) {
     <div id="actions">
         <ul class="actionButtons">
             <?php if ((evo()->hasPermission('new_module'))) {
-                echo '<li id="newModule" class="mutate"><a href="index.php?a=107"><img src="' . $_style["icons_save"] . '" />' . $_lang["new_module"] . '</a></li>';
+                echo '<li id="newModule" class="mutate"><a href="index.php?a=107">' . $_lang["new_module"] . '</a></li>';
             } ?>
             <li id="Button5" class="mutate"><a href="#"
-                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                        alt="icons_cancel"
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
         </ul>
     </div>
 
diff --git a/manager/actions/element/mutate_htmlsnippet.dynamic.php b/manager/actions/element/mutate_htmlsnippet.dynamic.php
index 481b4f532..8250cbb64 100644
--- a/manager/actions/element/mutate_htmlsnippet.dynamic.php
+++ b/manager/actions/element/mutate_htmlsnippet.dynamic.php
@@ -177,7 +177,7 @@ function resetpubdate() {
             <?php if (evo()->hasPermission('save_chunk')): ?>
                 <li id="save" class="primary mutate">
                     <a href="#">
-                        <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                        <?= $_lang['update'] ?>
                     </a>
                     <span class="and"> + </span>
                     <select id="stay" name="stay">
@@ -198,7 +198,6 @@ function resetpubdate() {
                     echo manager()->ab(
                         [
                             'onclick' => 'duplicaterecord();',
-                            'icon' => $_style['icons_resource_duplicate'],
                             'label' => $_lang['duplicate']
                         ]
                     );
@@ -207,7 +206,6 @@ function resetpubdate() {
                     echo manager()->ab(
                         [
                             'onclick' => 'deletedocument();',
-                            'icon' => $_style['icons_delete_document'],
                             'label' => $_lang['delete']
                         ]
                     );
@@ -216,7 +214,6 @@ function resetpubdate() {
             echo manager()->ab(
                 [
                     'onclick' => "document.location.href='index.php?a=76';",
-                    'icon' => $_style['icons_cancel'],
                     'label' => $_lang['cancel']
                 ]
             );
diff --git a/manager/actions/element/mutate_module.dynamic.php b/manager/actions/element/mutate_module.dynamic.php
index 279f3b0ab..2b94a2bbb 100644
--- a/manager/actions/element/mutate_module.dynamic.php
+++ b/manager/actions/element/mutate_module.dynamic.php
@@ -319,7 +319,7 @@ function SetUrl(url, width, height, alt) {
                 <li id="Button1" class="mutate">
                     <a href="#"
                         onclick="documentDirty=false;var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});">
-                        <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                        <?= $_lang['update'] ?>
                     </a>
                     <span class="and"> + </span>
                     <select id="stay" name="stay">
@@ -340,7 +340,6 @@ function SetUrl(url, width, height, alt) {
                     echo manager()->ab(
                         [
                             'onclick' => 'deletedocument();',
-                            'icon' => $_style['icons_delete_document'],
                             'label' => $_lang['delete']
                         ]
                     );
@@ -349,7 +348,6 @@ function SetUrl(url, width, height, alt) {
             echo manager()->ab(
                 [
                     'onclick' => "document.location.href='index.php?a=106';",
-                    'icon' => $_style['icons_cancel'],
                     'label' => $_lang['cancel']
                 ]
             );
@@ -532,7 +530,6 @@ class="inputBox" /><br />
                         <p><?= $_lang['module_viewdepend_msg'] ?></p>
                         <p class="actionButtons" style="float:none;overflow:hidden;zoom:1">
                             <a href="#" onclick="loadDependencies();return false;">
-                                <img src="<?= $_style["icons_edit_document"] ?>" align="absmiddle" />
                                 <?= $_lang['manage_depends'] ?>
                             </a>
                         </p>
diff --git a/manager/actions/element/mutate_module_resources.dynamic.php b/manager/actions/element/mutate_module_resources.dynamic.php
index b81acf723..ae658a52b 100644
--- a/manager/actions/element/mutate_module_resources.dynamic.php
+++ b/manager/actions/element/mutate_module_resources.dynamic.php
@@ -215,8 +215,7 @@ function openSelector(resource, mode, callback, w, h) {
 
     <div id="actions">
         <ul class="actionButtons">
-            <li class="mutate"><a href="index.php?a=106"><img
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a>
+            <li class="mutate"><a href="index.php?a=106"><?= $_lang['cancel'] ?></a>
         </ul>
     </div>
 
@@ -228,10 +227,8 @@ function openSelector(resource, mode, callback, w, h) {
             <br />
             <!-- Dependencies -->
             <ul class="actionButtons">
-                <li><a href="#" onclick="addSnippet();return false;"><img
-                            src="<?= $_style["icons_add"] ?>" /> <?= $_lang['add_snippet'] ?></a></li>
-                <li><a href="#" onclick="addPlugin();return false;"><img
-                            src="<?= $_style["icons_add"] ?>" /> <?= $_lang['add_plugin'] ?></a></li>
+                <li><a href="#" onclick="addSnippet();return false;"><?= $_lang['add_snippet'] ?></a></li>
+                <li><a href="#" onclick="addPlugin();return false;"><?= $_lang['add_plugin'] ?></a></li>
             </ul>
             <?php
             $sql = "SELECT smd.id,COALESCE(ss.name,sp.name) as 'name'," .
@@ -263,8 +260,7 @@ function openSelector(resource, mode, callback, w, h) {
             }
             ?>
             <ul class="actionButtons">
-                <li><a style="margin-bottom:10px;" href="#" onclick="removeDependencies();return false;"><img
-                            src="<?= $_style["icons_delete_document"] ?>" /> <?= $_lang['remove'] ?>
+                <li><a style="margin-bottom:10px;" href="#" onclick="removeDependencies();return false;"><?= $_lang['remove'] ?>
                     </a></li>
             </ul>
         </div>
diff --git a/manager/actions/element/mutate_plugin.dynamic.php b/manager/actions/element/mutate_plugin.dynamic.php
index 2dc1c571e..5d4809f17 100644
--- a/manager/actions/element/mutate_plugin.dynamic.php
+++ b/manager/actions/element/mutate_plugin.dynamic.php
@@ -464,7 +464,7 @@ function decode(s) {
                 <li id="Button1" class="mutate">
                     <a href="#"
                         onclick="documentDirty=false;var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});">
-                        <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                        <?= $_lang['update'] ?>
                     </a>
                     <span class="and"> + </span>
                     <select id="stay" name="stay">
@@ -481,7 +481,6 @@ function decode(s) {
             if (getv('a') == 102) {
                 $params = [
                     'onclick' => 'duplicaterecord();',
-                    'icon' => $_style['icons_resource_duplicate'],
                     'label' => $_lang['duplicate']
                 ];
                 if (evo()->hasPermission('new_plugin')) {
@@ -489,7 +488,6 @@ function decode(s) {
                 }
                 $params = [
                     'onclick' => 'deletedocument();',
-                    'icon' => $_style['icons_delete_document'],
                     'label' => $_lang['delete']
                 ];
                 if (evo()->hasPermission('delete_plugin')) {
@@ -498,7 +496,6 @@ function decode(s) {
             }
             $params = [
                 'onclick' => "document.location.href='index.php?a=76';",
-                'icon' => $_style['icons_cancel'],
                 'label' => $_lang['cancel']
             ];
             echo manager()->ab($params);
diff --git a/manager/actions/element/mutate_plugin_priority.dynamic.php b/manager/actions/element/mutate_plugin_priority.dynamic.php
index e8e6fa216..356a2582e 100644
--- a/manager/actions/element/mutate_plugin_priority.dynamic.php
+++ b/manager/actions/element/mutate_plugin_priority.dynamic.php
@@ -147,8 +147,8 @@
 
 <div id="actions">
    <ul class="actionButtons">
-        <li class="mutate"><a href="#" onclick="evoCancelPluginPriority(this, 'index.php?a=76'); return false;"><img src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
-        <li class="mutate"><a class="default" href="#" onclick="save(); return false;"><img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?></a></li>
+        <li class="mutate"><a href="#" onclick="evoCancelPluginPriority(this, 'index.php?a=76'); return false;"><?= $_lang['cancel'] ?></a></li>
+        <li class="mutate"><a class="default" href="#" onclick="save(); return false;"><?= $_lang['update'] ?></a></li>
         </ul>
 </div>
 
diff --git a/manager/actions/element/mutate_snippet.dynamic.php b/manager/actions/element/mutate_snippet.dynamic.php
index e37bb8ee8..212524d6c 100644
--- a/manager/actions/element/mutate_snippet.dynamic.php
+++ b/manager/actions/element/mutate_snippet.dynamic.php
@@ -278,7 +278,7 @@ function decode(s) {
                 <li id="Button1" class="mutate">
                     <a href="#"
                         onclick="documentDirty=false;var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});">
-                        <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                        <?= $_lang['update'] ?>
                     </a>
                     <span class="and"> + </span>
                     <select id="stay" name="stay">
@@ -296,21 +296,18 @@ function decode(s) {
                 if (evo()->hasPermission('new_snippet')) {
                     echo manager()->ab([
                         'onclick' => 'duplicaterecord();',
-                        'icon' => $_style['icons_resource_duplicate'],
                         'label' => $_lang['duplicate']
                     ]);
                 }
                 if (evo()->hasPermission('delete_snippet')) {
                     echo manager()->ab([
                         'onclick' => 'deletedocument();',
-                        'icon' => $_style['icons_delete_document'],
                         'label' => $_lang['delete']
                     ]);
                 }
             }
             echo manager()->ab([
                 'onclick' => "document.location.href='index.php?a=76';",
-                'icon' => $_style['icons_cancel'],
                 'label' => $_lang['cancel']
             ]);
             ?>
diff --git a/manager/actions/element/mutate_template_tv_rank.dynamic.php b/manager/actions/element/mutate_template_tv_rank.dynamic.php
index ffbeba583..4a5b18ff8 100644
--- a/manager/actions/element/mutate_template_tv_rank.dynamic.php
+++ b/manager/actions/element/mutate_template_tv_rank.dynamic.php
@@ -138,8 +138,8 @@
 
 <div id="actions">
     <ul class="actionButtons">
-        <li class="mutate"><a href="#" onclick="evoCancelTvRank(this, '<?= $cancelUrl ?>'); return false;"><img src="<?= $_style["icons_cancel"] ?>"> <?= $_lang['cancel'] ?></a></li>
-        <li class="mutate"><a class="default" href="#" onclick="save(); return false;"><img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?></a></li>
+        <li class="mutate"><a href="#" onclick="evoCancelTvRank(this, '<?= $cancelUrl ?>'); return false;"><?= $_lang['cancel'] ?></a></li>
+        <li class="mutate"><a class="default" href="#" onclick="save(); return false;"><?= $_lang['update'] ?></a></li>
     </ul>
 </div>
 
diff --git a/manager/actions/element/mutate_templates.dynamic.php b/manager/actions/element/mutate_templates.dynamic.php
index 9ca6b59e8..f8d1e98ec 100644
--- a/manager/actions/element/mutate_templates.dynamic.php
+++ b/manager/actions/element/mutate_templates.dynamic.php
@@ -64,8 +64,7 @@ function deletedocument() {
                 <?php if (evo()->hasPermission('save_template')) : ?>
                     <li id="Button1" class="mutate">
                         <a href="#"
-                            onclick="document.querySelectorAll('#templatesPane select').forEach(function(el){el.disabled=false;});documentDirty=false;document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();"><img
-                                src="<?= style('icons_save') ?>"/> <?= lang('update') ?>
+                            onclick="document.querySelectorAll('#templatesPane select').forEach(function(el){el.disabled=false;});documentDirty=false;document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();"><?= lang('update') ?>
                         </a>
                         <span class="and"> + </span>
                         <select id="stay" name="stay">
@@ -81,21 +80,18 @@ function deletedocument() {
                     if (evo()->hasPermission('new_template')) {
                         echo evo()->manager->ab([
                             'onclick' => 'duplicaterecord();',
-                            'icon' => style('icons_resource_duplicate'),
                             'label' => lang('duplicate')
                         ]);
                     }
                     if (evo()->hasPermission('delete_template')) {
                         echo evo()->manager->ab([
                             'onclick' => 'deletedocument();',
-                            'icon' => style('icons_delete_document'),
                             'label' => lang('delete')
                         ]);
                     }
                 }
                 echo evo()->manager->ab([
                     'onclick' => "document.location.href='index.php?a=76';",
-                    'icon' => style('icons_cancel'),
                     'label' => lang('cancel')
                 ]);
                 ?>
@@ -280,13 +276,12 @@ class="inputBox" style="width:300px;">
                                 ?>
                                 <li>
                                     <a href="index.php?&amp;a=300<?= $query ?>">
-                                        <img src="<?= style('icons_add') ?>"/>
                                         <?= lang('new_tmplvars') ?>
                                     </a>
                                 </li>
                                 <?php
                                 if (evo()->hasPermission('save_template') && $total > 1) {
-                                    echo '<li><a href="index.php?a=117&amp;id=' . get_intvar('id') . '" data-modal><img src="' . style('sort') . '" />' . lang('template_tv_edit') . '</a></li>';
+                                    echo '<li><a href="index.php?a=117&amp;id=' . get_intvar('id') . '" data-modal>' . lang('template_tv_edit') . '</a></li>';
                                 }
                                 ?>
                             </ul>
diff --git a/manager/actions/element/mutate_tmplvars.dynamic.php b/manager/actions/element/mutate_tmplvars.dynamic.php
index f1c5a5c3b..3f8c2a9ed 100644
--- a/manager/actions/element/mutate_tmplvars.dynamic.php
+++ b/manager/actions/element/mutate_tmplvars.dynamic.php
@@ -297,7 +297,7 @@ function decode(s) {
                 <li id="Button1" class="mutate">
                     <a href="#"
                         onclick="documentDirty=false;var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});">
-                        <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                        <?= $_lang['update'] ?>
                     </a><span class="and"> + </span>
                     <select id="stay" name="stay">
                         <option id="stay1"
@@ -313,7 +313,6 @@ function decode(s) {
             if (getv('a') == 301) {
                 $params = [
                     'onclick' => 'duplicaterecord();',
-                    'icon' => $_style['icons_resource_duplicate'],
                     'label' => $_lang['duplicate']
                 ];
                 if (evo()->hasPermission('new_template')) {
@@ -321,7 +320,6 @@ function decode(s) {
                 }
                 $params = [
                     'onclick' => 'deletedocument();',
-                    'icon' => $_style['icons_delete_document'],
                     'label' => $_lang['delete']
                 ];
                 if (evo()->hasPermission('delete_template')) {
@@ -330,7 +328,6 @@ function decode(s) {
             }
             $params = [
                 'onclick' => "document.location.href='index.php?a=76';",
-                'icon' => $_style['icons_cancel'],
                 'label' => $_lang['cancel']
             ];
             echo manager()->ab($params);
diff --git a/manager/actions/element/resource_selector.static.php b/manager/actions/element/resource_selector.static.php
index 6f7df046a..ae4501358 100644
--- a/manager/actions/element/resource_selector.static.php
+++ b/manager/actions/element/resource_selector.static.php
@@ -182,22 +182,18 @@ function setCheckbox(chk) {
                                                 <td class="actionButtons"><a href="#"
                                                                              title="<?= $_lang["reset"] ?>"
                                                                              onclick="resetSearch();return false;"><img
-                                                            src="<?= $_style['icons_refresh'] ?>"
-                                                            style="display:inline;"/></a></td>
+                                                            src="<?= $_style['icons_refresh'] ?>" /></a></td>
                                                 <td class="actionButtons"><a href="#"
                                                                              title="<?= $_lang["list_mode"] ?>"
                                                                              onclick="changeListMode();return false;"><img
-                                                            src="<?= $_style['icons_table'] ?>"
-                                                            style="display:inline;"/></a></td>
+                                                            src="<?= $_style['icons_table'] ?>" /></a></td>
                                             </tr>
                                         </table>
                                     </td>
                                     <td width="230" class="actionButtons">
-                                        <a href="#" style="float:right;margin-left:2px;" onclick="window.close()"><img
-                                                src="<?= $_style['icons_cancel'] ?>"/> <?= $_lang['cancel'] ?>
+                                        <a href="#" style="float:right;margin-left:2px;" onclick="window.close()"><?= $_lang['cancel'] ?>
                                         </a>
-                                        <a href="#" style="float:right;margin-left:2px;" onclick="saveSelection()"><img
-                                                src="<?= $_style['icons_add'] ?>"/> <?= $_lang['insert'] ?>
+                                        <a href="#" style="float:right;margin-left:2px;" onclick="saveSelection()"><?= $_lang['insert'] ?>
                                         </a>
                                     </td>
                                 </tr>
diff --git a/manager/actions/element/resources.static.php b/manager/actions/element/resources.static.php
index 39c334db0..12ecba649 100644
--- a/manager/actions/element/resources.static.php
+++ b/manager/actions/element/resources.static.php
@@ -16,8 +16,7 @@ function deleteCategory(catid) {
 
     <div id="actions">
         <ul class="actionButtons">
-            <li id="Button5" class="mutate"><a href="#" onclick="document.location.href='index.php?a=2';"><img
-                        alt="icons_cancel" src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?>
+            <li id="Button5" class="mutate"><a href="#" onclick="document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?>
                 </a></li>
         </ul>
     </div>
@@ -31,8 +30,7 @@ function deleteCategory(catid) {
                     <h2 class="tab"><?= $_lang["manage_templates"] ?></h2>
                     <div><?= $_lang['template_management_msg'] ?></div>
                     <ul class="actionButtons">
-                        <li><a class="default" href="index.php?a=19"><img
-                                    src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_template'] ?>
+                        <li><a class="default" href="index.php?a=19"><?= $_lang['new_template'] ?>
                             </a></li>
                     </ul>
                     <?= createResourceList('site_templates', 16, 'templatename') ?>
@@ -49,8 +47,7 @@ function deleteCategory(catid) {
                         -->
                     <div><?= $_lang['tmplvars_management_msg'] ?></div>
                     <ul class="actionButtons">
-                        <li><a class="default" href="index.php?a=300"><img
-                                    src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_tmplvars'] ?>
+                        <li><a class="default" href="index.php?a=300"><?= $_lang['new_tmplvars'] ?>
                             </a></li>
                     </ul>
                     <?= createResourceList('site_tmplvars', 301) ?>
@@ -64,8 +61,7 @@ function deleteCategory(catid) {
                     <div><?= $_lang['htmlsnippet_management_msg'] ?></div>
 
                     <ul class="actionButtons">
-                        <li><a class="default" href="index.php?a=77"><img
-                                    src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_htmlsnippet'] ?>
+                        <li><a class="default" href="index.php?a=77"><?= $_lang['new_htmlsnippet'] ?>
                             </a></li>
                     </ul>
                     <?= createResourceList('site_htmlsnippets', 78) ?>
@@ -79,8 +75,7 @@ function deleteCategory(catid) {
                     <div><?= $_lang['snippet_management_msg'] ?></div>
 
                     <ul class="actionButtons">
-                        <li><a class="default" href="index.php?a=23"><img
-                                    src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_snippet'] ?>
+                        <li><a class="default" href="index.php?a=23"><?= $_lang['new_snippet'] ?>
                             </a></li>
                     </ul>
                     <?= createResourceList('site_snippets', 22) ?>
@@ -94,12 +89,10 @@ function deleteCategory(catid) {
                     <div><?= $_lang['plugin_management_msg'] ?></div>
 
                     <ul class="actionButtons">
-                        <li><a class="default" href="index.php?a=101"><img
-                                    src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_plugin'] ?>
+                        <li><a class="default" href="index.php?a=101"><?= $_lang['new_plugin'] ?>
                             </a></li>
                         <?php if (evo()->hasPermission('save_plugin')) { ?>
-                            <li><a href="index.php?a=100" data-modal><img
-                                    src="<?= $_style["sort"] ?>"/> <?= $_lang['plugin_priority'] ?>
+                            <li><a href="index.php?a=100" data-modal><?= $_lang['plugin_priority'] ?>
                             </a></li><?php } ?>
                     </ul>
                     <?= createResourceList('site_plugins', 102) ?>
diff --git a/manager/actions/main/refresh_site.dynamic.php b/manager/actions/main/refresh_site.dynamic.php
index 70205a1c9..acbd05e30 100644
--- a/manager/actions/main/refresh_site.dynamic.php
+++ b/manager/actions/main/refresh_site.dynamic.php
@@ -42,9 +42,7 @@
         ?>
         <div>
             <ul class="actionButtons">
-                <li id="Button5"><a href="#" onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                            alt="icons_cancel"
-                            src="<?= $_style["icons_save"] ?>"/> <?= $_lang['close'] ?></a></li>
+                <li id="Button5"><a href="#" onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['close'] ?></a></li>
             </ul>
         </div>
     </div>
diff --git a/manager/actions/main/search.static.php b/manager/actions/main/search.static.php
index a2a5d8154..dd47e0f2f 100644
--- a/manager/actions/main/search.static.php
+++ b/manager/actions/main/search.static.php
@@ -14,10 +14,7 @@ class="mutate"
             ><a
                     href="#"
                     onclick="documentDirty=false;document.location.href='index.php?a=2';"
-                ><img
-                        alt="icons_cancel"
-                        src="<?= style('icons_cancel') ?>"
-                    /> <?= lang('cancel') ?></a></li>
+                ><?= lang('cancel') ?></a></li>
         </ul>
     </div>
     <div class="section">
@@ -80,15 +77,11 @@ class="mutate"
                                         class="default"
                                         href="#"
                                         onclick="document.getElementById('submitok').click();"
-                                    ><img
-                                            src="<?= style('icons_save') ?>"
-                                        /> <?= lang('search') ?></a
+                                    ><?= lang('search') ?></a
                                     ></li>
                                 <li><a
                                         href="index.php?a=2"
-                                    ><img
-                                            src="<?= style('icons_cancel') ?>"
-                                        /> <?= lang('cancel') ?></a
+                                    ><?= lang('cancel') ?></a
                                     ></li>
                             </ul>
                         </td>
diff --git a/manager/actions/permission/access_permissions.dynamic.php b/manager/actions/permission/access_permissions.dynamic.php
index 66e443038..c9f511a48 100644
--- a/manager/actions/permission/access_permissions.dynamic.php
+++ b/manager/actions/permission/access_permissions.dynamic.php
@@ -36,8 +36,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel" src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?>
+                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?>
             </a></li>
     </ul>
 </div>
diff --git a/manager/actions/permission/messages.static.php b/manager/actions/permission/messages.static.php
index fc61f2ea7..19b2b8268 100644
--- a/manager/actions/permission/messages.static.php
+++ b/manager/actions/permission/messages.static.php
@@ -21,9 +21,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                onclick="documentDirty=false;document.location.href='index.php?a=<?= $location ?>';"><img
-                    alt="icons_cancel"
-                    src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                onclick="documentDirty=false;document.location.href='index.php?a=<?= $location ?>';"><?= $_lang['cancel'] ?></a></li>
     </ul>
 </div>
 
@@ -59,14 +57,11 @@
                             <td colspan="2">
                                 <ul class="actionButtons">
                                     <li id="btn_reply"><a
-                                            href="index.php?a=10&t=c&m=rp&id=<?= $message['id'] ?>"><img
-                                                src="<?= $_style["icons_message_reply"] ?>" /> <?= $_lang['messages_reply'] ?>
+                                            href="index.php?a=10&t=c&m=rp&id=<?= $message['id'] ?>"><?= $_lang['messages_reply'] ?>
                                         </a></li>
-                                    <li><a href="index.php?a=10&t=c&m=f&id=<?= $message['id'] ?>"><img
-                                                src="<?= $_style["icons_message_forward"] ?>" /> <?= $_lang['messages_forward'] ?>
+                                    <li><a href="index.php?a=10&t=c&m=f&id=<?= $message['id'] ?>"><?= $_lang['messages_forward'] ?>
                                         </a></li>
-                                    <li><a href="<?= hsc('index.php?a=65&id=' . (int) $message['id']) ?>" data-evo-post><img
-                                                src="<?= $_style["icons_delete_document"] ?>" /> <?= $_lang['delete'] ?>
+                                    <li><a href="<?= hsc('index.php?a=65&id=' . (int) $message['id']) ?>" data-evo-post><?= $_lang['delete'] ?>
                                         </a></li>
                                     <?php if ($message['sender'] == 0) { ?>
                                         <script
@@ -358,11 +353,9 @@ class="inputBox"><?= hsc($messagetext) ?></textarea></td>
                         <td>
                             <ul class="actionButtons" style="margin-top:15px;">
                                 <li><a href="#" class="primary"
-                                        onclick="documentDirty=false; document.messagefrm.submit();"><img
-                                            src="<?= $_style["icons_save"] ?>" /> <?= $_lang['messages_send'] ?>
+                                        onclick="documentDirty=false; document.messagefrm.submit();"><?= $_lang['messages_send'] ?>
                                     </a></li>
-                                <li><a href="index.php?a=10&t=c"><img
-                                            src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?>
+                                <li><a href="index.php?a=10&t=c"><?= $_lang['cancel'] ?>
                                     </a></li>
                             </ul>
                         </td>
diff --git a/manager/actions/permission/mutate_password.dynamic.php b/manager/actions/permission/mutate_password.dynamic.php
index 66cdf600b..c0a187981 100644
--- a/manager/actions/permission/mutate_password.dynamic.php
+++ b/manager/actions/permission/mutate_password.dynamic.php
@@ -19,8 +19,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?></a></li>
+                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
     </ul>
 </div>
 <div class="section">
@@ -48,8 +47,7 @@
                     <td colspan="2">
                         <div class="actionButtons" style="float:right;">
                             <a class="default" href="#"
-                               onclick="documentDirty=false; document.userform.save.click();"><img
-                                    src="<?= $_style["icons_save"] ?>"/> <?= $_lang['update'] ?></a>
+                               onclick="documentDirty=false; document.userform.save.click();"><?= $_lang['update'] ?></a>
                         </div>
                     </td>
                 </tr>
diff --git a/manager/actions/permission/mutate_role.dynamic.php b/manager/actions/permission/mutate_role.dynamic.php
index 7effeeeb7..2f87d6926 100644
--- a/manager/actions/permission/mutate_role.dynamic.php
+++ b/manager/actions/permission/mutate_role.dynamic.php
@@ -110,14 +110,12 @@ function(r) {
     <div id="actions">
         <ul class="actionButtons">
             <?php if (evo()->hasPermission('save_role')): ?>
-                <li class="mutate"><a href="#" onclick="documentDirty=false; document.userform.save.click();"><img
-                            src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?></a></li>
+                <li class="mutate"><a href="#" onclick="documentDirty=false; document.userform.save.click();"><?= $_lang['update'] ?></a></li>
             <?php endif; ?>
             <?php
             if (getv('a') == 35) {
                 $params = [
                     'onclick' => 'deletedocument();',
-                    'icon' => $_style['icons_delete_document'],
                     'label' => $_lang['delete']
                 ];
                 if (evo()->hasPermission('delete_role')) {
@@ -126,7 +124,6 @@ function(r) {
             }
             $params = [
                 'onclick' => "document.location.href='index.php?a=86';",
-                'icon' => $_style['icons_cancel'],
                 'label' => $_lang['cancel']
             ];
             echo manager()->ab($params);
diff --git a/manager/actions/permission/mutate_user/functions.php b/manager/actions/permission/mutate_user/functions.php
index eb32125f6..1dec67d7f 100644
--- a/manager/actions/permission/mutate_user/functions.php
+++ b/manager/actions/permission/mutate_user/functions.php
@@ -196,11 +196,7 @@ function aButtonSave()
                 'href' => '#',
                 'onclick' => 'documentDirty=false; document.userform.save.click();'
             ],
-            html_tag(
-                'img',
-                ['src' => style('icons_save')]
-            )
-                . lang('update')
+            lang('update')
         )
             . html_tag(
                 'span',
@@ -227,7 +223,6 @@ function aButtonDelete($userid)
     return manager()->ab(
         [
             'onclick' => 'deleteuser();',
-            'icon' => style('icons_delete_document'),
             'label' => lang('delete')
         ]
     );
@@ -238,7 +233,6 @@ function aButtonCancel()
     return manager()->ab(
         [
             'onclick' => "document.location.href='index.php?a=75';",
-            'icon' => style('icons_cancel'),
             'label' => lang('cancel')
         ]
     );
diff --git a/manager/actions/permission/mutate_user_pf.dynamic.php b/manager/actions/permission/mutate_user_pf.dynamic.php
index c6e3abe7d..3de5bdaa2 100644
--- a/manager/actions/permission/mutate_user_pf.dynamic.php
+++ b/manager/actions/permission/mutate_user_pf.dynamic.php
@@ -163,7 +163,7 @@ function SetUrl(url, width, height, alt) {
         <ul class="actionButtons">
             <li id="Button1" class="mutate">
                 <a href="#" onclick="documentDirty=false; document.userform.save.click();">
-                    <img src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?>
+                    <?= $_lang['update'] ?>
                 </a>
                 <span class="and"> + </span>
                 <select id="stay" name="stay">
@@ -177,12 +177,10 @@ function SetUrl(url, width, height, alt) {
             </li>
             <?php
             if (anyv('a') == 74) { ?>
-                <li id="Button3"><a href="#" onclick="deleteuser();"><img
-                            src="<?= $_style["icons_delete_document"] ?>" /> <?= $_lang['delete'] ?>
+                <li id="Button3"><a href="#" onclick="deleteuser();"><?= $_lang['delete'] ?>
                     </a></li>
             <?php } ?>
-            <li id="Button5" class="mutate"><a href="#" onclick="document.location.href='index.php?a=2';"><img
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+            <li id="Button5" class="mutate"><a href="#" onclick="document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
         </ul>
     </div>
     <!-- Tab Start -->
diff --git a/manager/actions/permission/mutate_web_user.dynamic.php b/manager/actions/permission/mutate_web_user.dynamic.php
index 5757572ab..a598ef2a5 100644
--- a/manager/actions/permission/mutate_web_user.dynamic.php
+++ b/manager/actions/permission/mutate_web_user.dynamic.php
@@ -251,8 +251,7 @@ function SetUrl(url, width, height, alt) {
     <div id="actions">
         <ul class="actionButtons">
             <?php if (evo()->hasPermission('save_web_user')): ?>
-                <li class="mutate"><a href="#" onclick="documentDirty=false; document.userform.save.click();"><img
-                            src="<?= $_style["icons_save"] ?>" /> <?= $_lang['update'] ?></a><span
+                <li class="mutate"><a href="#" onclick="documentDirty=false; document.userform.save.click();"><?= $_lang['update'] ?></a><span
                         class="and"> + </span>
                     <select id="stay" name="stay">
                         <?php if (evo()->hasPermission('new_web_user')) { ?>
@@ -267,12 +266,10 @@ class="and"> + </span>
                 </li>
             <?php endif; ?>
             <?php if (anyv('a') == 88) { ?>
-                <li><a href="#" onclick="deleteuser();"><img
-                            src="<?= $_style["icons_delete"] ?>" /> <?= $_lang['delete'] ?></a>
+                <li><a href="#" onclick="deleteuser();"><?= $_lang['delete'] ?></a>
                 </li>
             <?php } ?>
-            <li><a href="#" onclick="document.location.href='index.php?a=99';"><img
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+            <li><a href="#" onclick="document.location.href='index.php?a=99';"><?= $_lang['cancel'] ?></a></li>
         </ul>
     </div>
 
diff --git a/manager/actions/permission/role_management.static.php b/manager/actions/permission/role_management.static.php
index 1123ef657..f4b66a00c 100644
--- a/manager/actions/permission/role_management.static.php
+++ b/manager/actions/permission/role_management.static.php
@@ -16,8 +16,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel" src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?>
+                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?>
             </a></li>
     </ul>
 </div>
@@ -27,8 +26,7 @@
         <p><?= $_lang['role_management_msg'] ?></p>
 
         <ul class="actionButtons">
-            <li><a class="default" href="index.php?a=38"><img
-                        src="<?= $_style["icons_add"] ?>"/> <?= $_lang['new_role'] ?></a></li>
+            <li><a class="default" href="index.php?a=38"><?= $_lang['new_role'] ?></a></li>
         </ul>
         <?php
 
diff --git a/manager/actions/permission/user_management.static.php b/manager/actions/permission/user_management.static.php
index 21f052363..68a3d0e96 100644
--- a/manager/actions/permission/user_management.static.php
+++ b/manager/actions/permission/user_management.static.php
@@ -100,9 +100,7 @@ function menuAction(a) {
     <div id="actions">
         <ul class="actionButtons">
             <li id="Button5" class="mutate"><a href="#"
-                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                        alt="icons_cancel"
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
         </ul>
     </div>
 
@@ -112,8 +110,7 @@ function menuAction(a) {
             <table border="0" style="width:100%">
                 <tr>
                     <?php if (evo()->hasPermission('new_user')): ?>
-                        <td><a href="index.php?a=11" class="default"><img
-                                    src="<?= $_style["icons_add"] ?>" /> <?= $_lang['new_user'] ?></a>
+                        <td><a href="index.php?a=11" class="default"><?= $_lang['new_user'] ?></a>
                         </td>
                     <?php endif; ?>
                     <td nowrap="nowrap">
@@ -126,12 +123,11 @@ function menuAction(a) {
                                         onclick="searchResource();return false;"><?= $_lang['go'] ?></a></td>
                                 <td><a href="#" title="<?= $_lang["reset"] ?>"
                                         onclick="resetSearch();return false;"><img
-                                            src="<?= $_style['icons_refresh'] ?>" style="display:inline;" /></a>
+                                            src="<?= $_style['icons_refresh'] ?>" /></a>
                                 </td>
                                 <td><a href="#" title="<?= $_lang["list_mode"] ?>"
                                         onclick="changeListMode();return false;"><img
-                                            src="<?= $_style['icons_table'] ?>"
-                                            style="display:inline;" /></a></td>
+                                            src="<?= $_style['icons_table'] ?>" /></a></td>
                             </tr>
                         </table>
                     </td>
diff --git a/manager/actions/permission/web_access_permissions.dynamic.php b/manager/actions/permission/web_access_permissions.dynamic.php
index 489dcf009..3e4118ca7 100644
--- a/manager/actions/permission/web_access_permissions.dynamic.php
+++ b/manager/actions/permission/web_access_permissions.dynamic.php
@@ -38,8 +38,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel" src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?>
+                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?>
             </a></li>
     </ul>
 </div>
diff --git a/manager/actions/permission/web_user_management.static.php b/manager/actions/permission/web_user_management.static.php
index bf2288c39..28fe06b7c 100644
--- a/manager/actions/permission/web_user_management.static.php
+++ b/manager/actions/permission/web_user_management.static.php
@@ -105,9 +105,7 @@ function menuAction(a) {
     <div id="actions">
         <ul class="actionButtons">
             <li id="Button5" class="mutate"><a href="#"
-                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                        alt="icons_cancel"
-                        src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                    onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
         </ul>
     </div>
 
@@ -116,8 +114,7 @@ function menuAction(a) {
         <div class="actionButtons">
             <table border="0" style="width:100%">
                 <tr>
-                    <td><a class="default" href="index.php?a=87"><img
-                                src="<?= $_style["icons_add"] ?>" /> <?= $_lang['new_web_user'] ?></a>
+                    <td><a class="default" href="index.php?a=87"><?= $_lang['new_web_user'] ?></a>
                     </td>
                     <td nowrap="nowrap">
                         <table border="0" style="float:right">
@@ -133,12 +130,11 @@ function menuAction(a) {
                                 </td>
                                 <td><a href="#" title="<?= $_lang["reset"] ?>"
                                         onclick="resetSearch();return false;"><img
-                                            src="<?= $_style['icons_refresh'] ?>" style="display:inline;" /></a>
+                                            src="<?= $_style['icons_refresh'] ?>" /></a>
                                 </td>
                                 <td><a href="#" title="<?= $_lang["list_mode"] ?>"
                                         onclick="changeListMode();return false;"><img
-                                            src="<?= $_style['icons_table'] ?>"
-                                            style="display:inline;" /></a>
+                                            src="<?= $_style['icons_table'] ?>" /></a>
                                 </td>
                             </tr>
                         </table>
diff --git a/manager/actions/report/eventlog.dynamic.php b/manager/actions/report/eventlog.dynamic.php
index 1a4c1bbd9..691476495 100644
--- a/manager/actions/report/eventlog.dynamic.php
+++ b/manager/actions/report/eventlog.dynamic.php
@@ -138,7 +138,7 @@
     <ul class="actionButtons">
         <li id="Button5" class="mutate">
             <a href="#" onclick="documentDirty=false;document.location.href='index.php?a=2';">
-                <img alt="icons_cancel" src="<?= style('icons_cancel') ?>" /> <?= lang('cancel') ?>
+                <?= lang('cancel') ?>
             </a>
         </li>
     </ul>
diff --git a/manager/actions/report/logging.static.php b/manager/actions/report/logging.static.php
index 7762531a0..c3023dc22 100644
--- a/manager/actions/report/logging.static.php
+++ b/manager/actions/report/logging.static.php
@@ -23,9 +23,7 @@
             class="mutate">
             <a
                 href="#"
-                onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel"
-                    src="<?= style('icons_cancel') ?>" /> <?= lang('cancel') ?>
+                onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= lang('cancel') ?>
             </a>
         </li>
     </ul>
@@ -191,13 +189,11 @@ class="inputbox" style="width:100px"
                 <li><a
                         href="#" class="default"
                         onclick="documentDirty=false;document.logging.log_submit.click();">
-                        <img src="<?= style('icons_save') ?>" />
                         <?= lang('search') ?>
                     </a>
                 </li>
                 <li>
                     <a href="index.php?a=2" onclick="documentDirty=false;">
-                        <img src="<?= style('icons_cancel') ?>" />
                         <?= lang('cancel') ?>
                     </a>
                 </li>
diff --git a/manager/actions/report/phpinfo.static.php b/manager/actions/report/phpinfo.static.php
index dce6000e9..659470923 100644
--- a/manager/actions/report/phpinfo.static.php
+++ b/manager/actions/report/phpinfo.static.php
@@ -123,9 +123,7 @@ class="mutate"
                 <a
                     href="#"
                     onclick="documentDirty=false;document.location.href='index.php?a=53';"
-                ><img
-                        alt="icons_cancel"
-                        src="<?= style("icons_cancel") ?>"/> <?= lang('cancel') ?></a>
+                ><?= lang('cancel') ?></a>
             </li>
         </ul>
     </div>
diff --git a/manager/actions/report/site_schedule.static.php b/manager/actions/report/site_schedule.static.php
index 0bd3829c6..5f5adee3f 100644
--- a/manager/actions/report/site_schedule.static.php
+++ b/manager/actions/report/site_schedule.static.php
@@ -18,10 +18,7 @@ class="mutate">
                 href="#"
                 onclick="documentDirty=false;document.location.href='index.php?a=2';"
             >
-                <img
-                    alt="icons_cancel"
-                    src="<?= style('icons_cancel') ?>"
-                /> <?= lang('cancel') ?>
+                <?= lang('cancel') ?>
             </a>
         </li>
     </ul>
diff --git a/manager/actions/report/sysinfo.static.php b/manager/actions/report/sysinfo.static.php
index 458ef5e5e..a71ffd0e7 100644
--- a/manager/actions/report/sysinfo.static.php
+++ b/manager/actions/report/sysinfo.static.php
@@ -14,9 +14,7 @@
         <li id="Button5" class="mutate">
             <a href="#"
                 onclick="documentDirty=false;document.location.href='index.php?a=2';">
-                <img
-                    alt="icons_cancel"
-                    src="<?= style("icons_cancel") ?>" /> <?= lang('cancel') ?>
+                <?= lang('cancel') ?>
             </a>
         </li>
     </ul>
diff --git a/manager/actions/tool/bkmanager.static.php b/manager/actions/tool/bkmanager.static.php
index 5f0372c8d..f76ec2dfe 100644
--- a/manager/actions/tool/bkmanager.static.php
+++ b/manager/actions/tool/bkmanager.static.php
@@ -19,8 +19,6 @@
 
 include_once(MODX_CORE_PATH . 'mysql_dumper.class.inc.php');
 
-$misc_path = manager_style_image_path('misc');
-
 $dumper = new Mysqldumper();
 if ($mode === 'backup') {
     $tables = postv('chk', '');
@@ -145,9 +143,7 @@ function backup() {
             id="Button5"
             class="mutate"><a
                 href="#"
-                onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel"
-                    src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
     </ul>
 </div>
 
@@ -159,8 +155,7 @@ class="mutate"><a
                 <input type="hidden" name="mode" value="" />
                 <p><?= $_lang['table_hoverinfo'] ?></p>
 
-                <p class="actionButtons"><a class="primary" href="#" onclick="backup();return false;"><img
-                            src="<?= $misc_path ?>ed_save.gif" /> <?= $_lang['database_table_clickbackup'] ?>
+                <p class="actionButtons"><a class="primary" href="#" onclick="backup();return false;"><?= $_lang['database_table_clickbackup'] ?>
                     </a></p>
                 <p>
                     <label>
@@ -376,9 +371,7 @@ function showhide(a) {
                     <a
                         href="#"
                         class="primary"
-                        onclick="document.mutate.save.click();"><img
-                            alt="icons_save"
-                            src="<?= $_style["icons_save"] ?>" /> <?= $_lang["bkmgr_run_sql_submit"] ?>
+                        onclick="document.mutate.save.click();"><?= $_lang["bkmgr_run_sql_submit"] ?>
                     </a>
                 </div>
                 <input type="submit" name="save" style="display:none;" />
@@ -419,8 +412,7 @@ class="primary"
                 </table>
                 <div class="actionButtons" style="margin-top:10px;margin-bottom:10px;">
                     <a href="#" class="primary" onclick="document.snapshot.save.click();">
-                        <img alt="icons_save"
-                            src="<?= $_style["icons_add"] ?>" /><?= $_lang["bkmgr_snapshot_submit"] ?>
+                        <?= $_lang["bkmgr_snapshot_submit"] ?>
                     </a>
                     <input type="submit" name="save" style="display:none;" />
             </form>
diff --git a/manager/actions/tool/export_site.static.php b/manager/actions/tool/export_site.static.php
index 5b35a4013..d2f96aa5f 100644
--- a/manager/actions/tool/export_site.static.php
+++ b/manager/actions/tool/export_site.static.php
@@ -20,10 +20,7 @@ class="mutate"
         ><a
                 href="#"
                 onclick="documentDirty=false;document.location.href='index.php?a=2';"
-            ><img
-                    alt="icons_cancel"
-                    src="<?= style('icons_cancel') ?>"
-                /> <?= lang('cancel') ?></a>
+            ><?= lang('cancel') ?></a>
         </li>
     </ul>
 </div>
@@ -175,9 +172,7 @@ class="mutate"
                                 href="#"
                                 class="default"
                                 onclick="document.exportFrm.submit();"
-                            ><img
-                                    src="<?= style('icons_save') ?>"
-                                /> <?= lang('export_site_start') ?></a>
+                            ><?= lang('export_site_start') ?></a>
                         </li>
                     </ul>
                 </form>
diff --git a/manager/actions/tool/help.static.php b/manager/actions/tool/help.static.php
index 2894a1687..1434d7619 100644
--- a/manager/actions/tool/help.static.php
+++ b/manager/actions/tool/help.static.php
@@ -8,8 +8,7 @@
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel" src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang['cancel'] ?>
+                                           onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?>
             </a></li>
     </ul>
 </div>
diff --git a/manager/actions/tool/import_site.static.php b/manager/actions/tool/import_site.static.php
index f1b7ea638..cc6f7d52e 100644
--- a/manager/actions/tool/import_site.static.php
+++ b/manager/actions/tool/import_site.static.php
@@ -25,9 +25,7 @@ function setParent(pId, pName) {
 <div id="actions">
     <ul class="actionButtons">
         <li id="Button5" class="mutate"><a href="#"
-                onclick="documentDirty=false;document.location.href='index.php?a=2';"><img
-                    alt="icons_cancel"
-                    src="<?= $_style["icons_cancel"] ?>" /> <?= $_lang['cancel'] ?></a></li>
+                onclick="documentDirty=false;document.location.href='index.php?a=2';"><?= $_lang['cancel'] ?></a></li>
     </ul>
 </div>
 
@@ -97,8 +95,7 @@ function setParent(pId, pName) {
                         </tr>
                     </table>
                     <ul class="actionButtons">
-                        <li><a href="#" class="default" onclick="document.importFrm.submit();"><img
-                                    src="<?= $_style["icons_save"] ?>" /> <?= $_lang['import_site_start'] ?>
+                        <li><a href="#" class="default" onclick="document.importFrm.submit();"><?= $_lang['import_site_start'] ?>
                             </a></li>
                     </ul>
                 </form>
@@ -109,8 +106,7 @@ function setParent(pId, pName) {
             evo()->clearCache();
         ?>
             <ul class="actionButtons">
-                <li><a href="#" onclick="document.location.href='index.php?a=2';"><img
-                            src="<?= $_style["icons_close"] ?>" /> <?= $_lang['close'] ?></a></li>
+                <li><a href="#" onclick="document.location.href='index.php?a=2';"><?= $_lang['close'] ?></a></li>
             </ul>
             <script type="text/javascript">
                 top.mainMenu.reloadtree();
diff --git a/manager/actions/tool/mutate_settings.dynamic.php b/manager/actions/tool/mutate_settings.dynamic.php
index 18eef31e2..b438a1c5a 100644
--- a/manager/actions/tool/mutate_settings.dynamic.php
+++ b/manager/actions/tool/mutate_settings.dynamic.php
@@ -52,16 +52,12 @@
         <ul class="actionButtons">
             <li id="Button1" class="mutate">
                 <a href="#" onclick="documentDirty=false; document.settings.submit();">
-                    <img
-                        src="<?= style('icons_save') ?>"
-                    /> <?= lang('update') ?>
+                    <?= lang('update') ?>
                 </a>
             </li>
             <li id="Button5" class="mutate">
                 <a href="#" onclick="document.location.href='index.php?a=2';">
-                    <img
-                        src="<?= style('icons_cancel') ?>"
-                    /> <?= lang('cancel') ?>
+                    <?= lang('cancel') ?>
                 </a>
             </li>
         </ul>
diff --git a/manager/includes/extenders/ex_managerapi.php b/manager/includes/extenders/ex_managerapi.php
index b011568b3..0756f676e 100644
--- a/manager/includes/extenders/ex_managerapi.php
+++ b/manager/includes/extenders/ex_managerapi.php
@@ -308,12 +308,7 @@ public function ab($ph)
                     'href' => '#',
                     'onclick' => $ph['onclick']
                 ],
-                img_tag(
-                    $ph['icon'],
-                    [
-                        'alt' => $ph['alt'] ?? '',
-                    ]
-                ) . $ph['label']
+                $ph['label']
             )
         );
     }
diff --git a/manager/media/style/AromaHop/style.css b/manager/media/style/AromaHop/style.css
index 9aabcb896..fd1bf7c8c 100644
--- a/manager/media/style/AromaHop/style.css
+++ b/manager/media/style/AromaHop/style.css
@@ -2314,10 +2314,6 @@ ul.actionButtons {
     transition: all var(--transition-fast);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: rgba(160, 195, 175, 0.55);
     background: rgba(252, 255, 253, 0.96);
diff --git a/manager/media/style/AuroraFlow/style.css b/manager/media/style/AuroraFlow/style.css
index eb808bfdc..1e5e31991 100644
--- a/manager/media/style/AuroraFlow/style.css
+++ b/manager/media/style/AuroraFlow/style.css
@@ -1745,10 +1745,6 @@ ul.actionButtons {
         box-shadow var(--transition-fast), border-color var(--transition-fast);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: var(--color-neutral-button-border);
     background-color: var(--color-neutral-button-hover-end);
diff --git a/manager/media/style/RevoClassic/style.css b/manager/media/style/RevoClassic/style.css
index 0708901f6..cacadc500 100644
--- a/manager/media/style/RevoClassic/style.css
+++ b/manager/media/style/RevoClassic/style.css
@@ -1705,10 +1705,6 @@ ul.actionButtons {
     background-color: var(--color-neutral-button-start);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: var(--color-neutral-button-border);
     background-color: var(--color-neutral-button-hover-end);
diff --git a/manager/media/style/RevoStyle/style.css b/manager/media/style/RevoStyle/style.css
index 90c86dcb3..52d51d54b 100644
--- a/manager/media/style/RevoStyle/style.css
+++ b/manager/media/style/RevoStyle/style.css
@@ -1653,10 +1653,6 @@ ul.actionButtons {
     background-image: linear-gradient(var(--color-neutral-button-start), var(--color-neutral-button-end));
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: #fff;
     background-image: linear-gradient(var(--color-surface), var(--color-neutral-button-hover-end));
diff --git a/manager/media/style/RubberWhite/style.css b/manager/media/style/RubberWhite/style.css
index 9707af901..8a5d752d1 100644
--- a/manager/media/style/RubberWhite/style.css
+++ b/manager/media/style/RubberWhite/style.css
@@ -1642,10 +1642,6 @@ ul.actionButtons {
     background-color: var(--color-neutral-button-start);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: var(--color-neutral-button-border);
     background-color: var(--color-neutral-button-hover-end);
diff --git a/manager/media/style/SakuraFlow/style.css b/manager/media/style/SakuraFlow/style.css
index 1ee419f69..31da431ab 100644
--- a/manager/media/style/SakuraFlow/style.css
+++ b/manager/media/style/SakuraFlow/style.css
@@ -2112,10 +2112,6 @@ ul.actionButtons {
     transition: all var(--transition-fast);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a:hover {
     border-color: rgba(220, 160, 200, 0.5);
     background: rgba(255, 245, 250, 0.95);
diff --git a/manager/media/style/SoftSlate/style.css b/manager/media/style/SoftSlate/style.css
index c22fa4d6e..8e0a0cda9 100644
--- a/manager/media/style/SoftSlate/style.css
+++ b/manager/media/style/SoftSlate/style.css
@@ -1814,10 +1814,6 @@ ul.actionButtons {
     background-color: var(--color-neutral-button-start);
 }
 
-.actionButtons a img {
-    display: none;
-}
-
 .actionButtons a.disabled img {
     opacity: .3;
 }
diff --git a/manager/processors/permission/save_user.functions.php b/manager/processors/permission/save_user.functions.php
index ddbf4db9a..e48dc7f23 100644
--- a/manager/processors/permission/save_user.functions.php
+++ b/manager/processors/permission/save_user.functions.php
@@ -546,8 +546,7 @@ function newUser()
 
     <div id="actions">
         <ul class="actionButtons">
-            <li class="mutate"><a href="<?= $stayUrl ?>"><img
-                        src="<?= style('icons_save') ?>" /> <?= lang('close') ?>
+            <li class="mutate"><a href="<?= $stayUrl ?>"><?= lang('close') ?>
                 </a></li>
         </ul>
     </div>
@@ -730,8 +729,7 @@ function updateUser()
     <div id="actions">
         <ul class="actionButtons">
             <li class="mutate">
-                <a href="<?= hsc($stayUrl) ?>"<?= postv('userid') == evo()->getLoginUserID() ? ' data-evo-post="full"' : '' ?>><img
-                        src="<?= style('icons_save') ?>" /> <?= (postv('userid') == evo()->getLoginUserID()) ? lang('logout') : lang('close') ?>
+                <a href="<?= hsc($stayUrl) ?>"<?= postv('userid') == evo()->getLoginUserID() ? ' data-evo-post="full"' : '' ?>><?= (postv('userid') == evo()->getLoginUserID()) ? lang('logout') : lang('close') ?>
                 </a>
             </li>
         </ul>
diff --git a/manager/processors/permission/save_web_user.processor.php b/manager/processors/permission/save_web_user.processor.php
index 9e7e16cfa..8a4f1f530 100644
--- a/manager/processors/permission/save_web_user.processor.php
+++ b/manager/processors/permission/save_web_user.processor.php
@@ -217,8 +217,7 @@
 
             <div id="actions">
                 <ul class="actionButtons">
-                    <li class="mutate"><a href="<?= $stayUrl ?>"><img
-                                src="<?= $_style['icons_save'] ?>" /> <?= $_lang['close'] ?></a></li>
+                    <li class="mutate"><a href="<?= $stayUrl ?>"><?= $_lang['close'] ?></a></li>
                 </ul>
             </div>
 
@@ -432,8 +431,7 @@
 
             <div id="actions">
                 <ul class="actionButtons">
-                    <li class="mutate"><a href="<?= $stayUrl ?>"><img
-                                src="<?= $_style["icons_save"] ?>" /> <?= $_lang['close'] ?></a></li>
+                    <li class="mutate"><a href="<?= $stayUrl ?>"><?= $_lang['close'] ?></a></li>
                 </ul>
             </div>
 
diff --git a/manager/processors/tmplvars/delete_tmplvars.processor.php b/manager/processors/tmplvars/delete_tmplvars.processor.php
index aab03e8a3..52cf68bac 100644
--- a/manager/processors/tmplvars/delete_tmplvars.processor.php
+++ b/manager/processors/tmplvars/delete_tmplvars.processor.php
@@ -38,10 +38,8 @@ function deletedocument() {
 
         <div id="actions">
             <ul class="actionButtons">
-                <li><a href="#" onclick="deletedocument();"><img
-                            src="<?= $_style["icons_delete"] ?>"/> <?= $_lang["delete"] ?></a></li>
-                <li class="mutate"><a href="index.php?a=301&id=<?= $id ?>"><img
-                            src="<?= $_style["icons_cancel"] ?>"/> <?= $_lang["cancel"] ?></a></li>
+                <li><a href="#" onclick="deletedocument();"><?= $_lang["delete"] ?></a></li>
+                <li class="mutate"><a href="index.php?a=301&id=<?= $id ?>"><?= $_lang["cancel"] ?></a></li>
             </ul>
         </div>