diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index b4cdfb141..dcd372bab 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -247,7 +247,6 @@ a.user.user-mention {
 #sidebar a.selected svg.icon-svg { stroke: var(--oc-white) !important; }
 #sidebar .query.default {font-weight: bold;}
 #admin-menu a {line-height:1.7em;}
-#admin-menu a.selected:not(:has(svg))  {padding-left: 20px !important; background-position: 2px 40%;}
 
 a#toggle-completed-versions {color:var(--oc-gray-6);}
 a#toggle-completed-versions span.icon-label {margin-left: 0}
@@ -328,11 +327,6 @@ div + .drdn-items {border-top:1px solid var(--oc-gray-4);}
   padding: 5px 8px;
 }
 
-.contextual .drdn-items > a.icon:not(:has(svg)), .journal-actions .drdn-items > a.icon:not(:has(svg)) {
-  padding-left: 24px;
-  background-position-x: 4px;
-}
-
 .contextual .drdn-items > a:hover, .journal-actions .drdn-items > a:hover {
   color: var(--oc-blue-9);
   border: 1px solid var(--oc-blue-7);
@@ -764,7 +758,6 @@ div#sticky-issue-header .subject {
 
 fieldset.collapsible {border-width: 1px 0 0 0;}
 fieldset.collapsible>legend { cursor:pointer;}
-fieldset.collapsible>legend:not(:has(svg)) {padding-left: 18px; background-position: 4px;}
 fieldset#date-range p { margin: 2px 0 2px 0; }
 
 #query_form_content > fieldset {
@@ -1251,18 +1244,15 @@ div.flash.error, #errorExplanation {
   border-color: var(--oc-red-3);
   color: var(--oc-pink-9);
 }
-div.flash.error:not(:has(svg)), #errorExplanation:not(:has(svg)) {
-  background: url(/exclamation.png) 8px 50% no-repeat var(--oc-red-1);
-}
 div.flash.error svg.icon-svg, #errorExplanation svg.icon-svg {
   stroke: var(--oc-pink-9);
 }
 
-#errorExplanation:has(svg) {
+#errorExplanation {
   position: relative;
 }
 
-#errorExplanation:has(svg) > svg.icon-svg {
+#errorExplanation > svg.icon-svg {
   position: absolute;
   top: 50%;
   bottom: 50%;
@@ -1275,9 +1265,6 @@ div.flash.notice {
   border-color: var(--oc-green-3);
   color: var(--oc-green-9);
 }
-div.flash.notice:not(:has(svg)) {
-  background: url(/true.png) 8px 50% no-repeat var(--oc-green-1);
-}
 div.flash.notice svg.icon-svg {
   stroke: var(--oc-green-9);
 }
@@ -1288,9 +1275,6 @@ div.flash.warning, .conflict {
   color: var(--oc-pink-9);
   text-align: left;
 }
-div.flash.warning:not(:has(svg)), .conflict:not(:has(svg)) {
-  background: url(/warning.png) 8px 5px no-repeat var(--oc-yellow-1);
-}
 div.flash.warning svg.icon-svg, .conflict svg.icon-svg {
   stroke: var(--oc-pink-9);
 }
@@ -1359,14 +1343,6 @@ opacity: 0.5;
 
 html>body #ajax-indicator { position: fixed; }
 
-#ajax-indicator:not(:has(svg)) span {
-background-position: 0% 40%;
-background-repeat: no-repeat;
-background-image: url(/loading.gif);
-padding-left: 26px;
-vertical-align: bottom;
-}
-
 /***** Calendar *****/
 ul.cal {
   list-style: none;
@@ -1555,17 +1531,11 @@ button.tab-left {
   right: 28px;
   border-top-left-radius:3px;
 }
-button.tab-left:not(:has(svg)) {
-  background: var(--oc-gray-2) url(/arrow_left.png) no-repeat 50% 50%;
-}
 
 button.tab-right {
   right: 4px;
   border-top-right-radius:3px;
 }
-button.tab-right:not(:has(svg)) {
-  background: var(--oc-gray-2) url(/arrow_right.png) no-repeat 50% 50%;
-}
 
 button.tab-left.disabled, button.tab-right.disabled {
   background-color: var(--oc-gray-4);
@@ -2062,128 +2032,6 @@ span.icon-label {
   margin-left: 4px;
 }
 
-/***** Legacy icons *****/
-.icon:not(:has(svg)) {
-  background-position: 0% 50%;
-  background-repeat: no-repeat;
-  padding-left: 20px;
-}
-.icon-only:not(:has(svg)) {
-  background-position: 0% 50%;
-  background-repeat: no-repeat;
-  padding-left: 16px;
-  display: inline-block;
-  width: 0;
-  height: 16px;
-  overflow: hidden;
-  padding-top: 0;
-  padding-bottom: 0;
-  font-size: 0.5rem;
-  vertical-align: middle;
-}
-.icon-only:not(:has(svg))::after {
-  content: "\a0";
-}
-
-.icon-add:not(:has(svg)) { background-image: url(/add.png); }
-.icon-edit:not(:has(svg)) { background-image: url(/edit.png); }
-.icon-copy:not(:has(svg)) { background-image: url(/copy.png); }
-.icon-duplicate { background-image: url(/duplicate.png); }
-.icon-del:not(:has(svg)) { background-image: url(/delete.png); }
-.icon-move:not(:has(svg)) { background-image: url(/move.png); }
-.icon-save:not(:has(svg)) { background-image: url(/save.png); }
-.icon-download:not(:has(svg)) { background-image: url(/download.png); }
-.icon-cancel:not(:has(svg)) { background-image: url(/cancel.png); }
-.icon-multiple:not(:has(svg)) { background-image: url(/table_multiple.png); }
-.icon-folder:not(:has(svg)) { background-image: url(/folder.png); }
-.open .icon-folder:not(:has(svg)) { background-image: url(/folder_open.png); }
-.icon-package:not(:has(svg)) { background-image: url(/package.png); }
-.icon-user:not(:has(svg)) { background-image: url(/user.png); }
-.icon-project:not(:has(svg)), .icon-projects:not(:has(svg)) { background-image: url(/projects.png); }
-.icon-help:not(:has(svg)) { background-image: url(/help.png); }
-.icon-attachment:not(:has(svg)) { background-image: url(/attachment.png); }
-.icon-history:not(:has(svg)) { background-image: url(/history.png); }
-.icon-time-entry:not(:has(svg)), .icon-time:not(:has(svg))  { background-image: url(/time.png); }
-.icon-time-add:not(:has(svg)) { background-image: url(/time_add.png); }
-.icon-stats:not(:has(svg)) { background-image: url(/stats.png); }
-.icon-warning:not(:has(svg)) { background-image: url(/warning.png); }
-.icon-error:not(:has(svg)) { background-image: url(/exclamation.png); }
-.icon-fav:not(:has(svg))  { background-image: url(/fav.png); }
-.icon-fav-off:not(:has(svg))  { background-image: url(/fav_off.png); }
-.icon-reload:not(:has(svg)) { background-image: url(/reload.png); }
-.icon-lock:not(:has(svg)), .icon-locked:not(:has(svg))  { background-image: url(/locked.png); }
-.icon-unlock:not(:has(svg)) { background-image: url(/unlock.png); }
-.icon-checked:not(:has(svg)) { background-image: url(/toggle_check.png); }
-.icon-report { background-image: url(/report.png); }
-.icon-comment:not(:has(svg)), .icon-comments:not(:has(svg)) { background-image: url(/comment.png); }
-.icon-summary:not(:has(svg)) { background-image: url(/lightning.png); }
-.icon-server-authentication:not(:has(svg)) { background-image: url(/server_key.png); }
-.icon-issue:not(:has(svg)) { background-image: url(/ticket.png); }
-.icon-zoom-in:not(:has(svg)) { background-image: url(/zoom_in.png); }
-.icon-zoom-out:not(:has(svg)) { background-image: url(/zoom_out.png); }
-.icon-magnifier { background-image: url(/magnifier.png); }
-.icon-passwd:not(:has(svg)) { background-image: url(/textfield_key.png); }
-.icon-arrow-right, .icon-test:not(:has(svg)), .icon-sticky:not(:has(svg)) { background-image: url(/bullet_go.png); }
-.icon-email:not(:has(svg)) { background-image: url(/email.png); }
-.icon-email-disabled:not(:has(svg)) { background-image: url(/email_disabled.png); }
-.icon-email-add:not(:has(svg)) { background-image: url(/email_add.png); }
-.icon-ok:not(:has(svg)) { background-image: url(/true.png); }
-.icon-not-ok:not(svg) { background-image: url(/false.png); }
-.icon-link-break:not(:has(svg)) { background-image: url(/link_break.png); }
-.icon-list:not(:has(svg)) { background-image: url(/text_list_bullets.png); }
-.icon-close:not(:has(svg)) { background-image: url(/close.png); }
-.icon-close:hover:not(:has(svg)) { background-image: url(/close_hl.png); }
-.icon-settings:not(:has(svg)) { background-image: url(/changeset.png); }
-.icon-group:not(:has(svg)),.icon-groupnonmember:not(:has(svg)), .icon-groupanonymous:not(:has(svg)) { background-image: url(/group.png); }
-.icon-roles:not(:has(svg)) { background-image: url(/database_key.png); }
-.icon-issue-edit:not(:has(svg)) { background-image: url(/ticket_edit.png); }
-.icon-workflows:not(:has(svg)) { background-image: url(/ticket_go.png); }
-.icon-custom-fields:not(:has(svg)) { background-image: url(/textfield.png); }
-.icon-plugins:not(:has(svg)) { background-image: url(/plugin.png); }
-.icon-news:not(:has(svg)) { background-image: url(/news.png); }
-.icon-issue-closed:not(:has(svg)) { background-image: url(/ticket_checked.png); }
-.icon-issue-note:not(:has(svg)) { background-image: url(/ticket_note.png); }
-.icon-changeset:not(:has(svg)) { background-image: url(/changeset.png); }
-.icon-message:not(:has(svg)) { background-image: url(/message.png); }
-.icon-reply:not(:has(svg)) { background-image: url(/comments.png); }
-.icon-wiki-page:not(:has(svg)) { background-image: url(/wiki_edit.png); }
-.icon-document:not(:has(svg)) { background-image: url(/document.png); }
-.icon-add-bullet:not(:has(svg)) { background-image: url(/bullet_add.png); }
-.icon-shared:not(:has(svg)) { background-image: url(/link.png); }
-.icon-actions:not(:has(svg)) { background-image: url(/3_bullets.png); }
-.icon-sort-handle:not(:has(svg)) { background-image: url(/reorder.png); }
-.icon-expanded:not(:has(svg)) { background-image: url(/arrow_down.png); }
-.icon-collapsed:not(:has(svg)) { background-image: url(/arrow_right.png); }
-.icon-bookmark:not(:has(svg)) { background-image: url(/tag_blue_delete.png); }
-.icon-bookmark-off:not(:has(svg)) { background-image: url(/tag_blue_add.png); }
-.icon-bookmarked-project:not(:has(svg)) { background-image: url(/tag_blue.png); }
-.icon-sorted-asc:not(:has(svg)) { background-image: url(/arrow_down.png); }
-.icon-sorted-desc:not(:has(svg)) { background-image: url(/arrow_up.png); }
-.icon-toggle-plus:not(:has(svg)) { background-image: url(/bullet_toggle_plus.png) }
-.icon-toggle-minus:not(:has(svg)) { background-image: url(/bullet_toggle_minus.png) }
-.icon-clear-query:not(:has(svg)) { background-image: url(/close_hl.png); }
-.icon-import:not(:has(svg)) { background-image: url(/database_go.png); }
-
-.icon-file:not(:has(svg)) { background-image: url(/files/default.png); }
-.icon-file.text-plain:not(:has(svg)) { background-image: url(/files/text.png); }
-.icon-file.text-x-c:not(:has(svg)) { background-image: url(/files/c.png); }
-.icon-file.text-x-csharp:not(:has(svg)) { background-image: url(/files/csharp.png); }
-.icon-file.text-x-java:not(:has(svg)) { background-image: url(/files/java.png); }
-.icon-file.application-javascript:not(:has(svg)) { background-image: url(/files/js.png); }
-.icon-file.text-x-php:not(:has(svg)) { background-image: url(/files/php.png); }
-.icon-file.text-x-ruby:not(:has(svg)) { background-image: url(/files/ruby.png); }
-.icon-file.text-xml:not(:has(svg)) { background-image: url(/files/xml.png); }
-.icon-file.text-css:not(:has(svg)) { background-image: url(/files/css.png); }
-.icon-file.text-html:not(:has(svg)) { background-image: url(/files/html.png); }
-.icon-file.image-gif:not(:has(svg)) { background-image: url(/files/image.png); }
-.icon-file.image-jpeg:not(:has(svg)) { background-image: url(/files/image.png); }
-.icon-file.image-png:not(:has(svg)) { background-image: url(/files/image.png); }
-.icon-file.image-tiff:not(:has(svg)) { background-image: url(/files/image.png); }
-.icon-file.application-pdf:not(:has(svg)) { background-image: url(/files/pdf.png); }
-.icon-file.application-zip:not(:has(svg)) { background-image: url(/files/zip.png); }
-.icon-file.application-gzip:not(:has(svg)) { background-image: url(/files/zip.png); }
-.icon-copy-link:not(:has(svg)) { background-image: url(/copy_link.png); }
-
 .sort-handle.ajax-loading { background-image: url(/loading.gif); }
 tr.ui-sortable-helper { border:1px solid var(--oc-gray-4); }
 svg.svg-loader {
diff --git a/app/assets/stylesheets/responsive.css b/app/assets/stylesheets/responsive.css
index 7425029f8..703110186 100644
--- a/app/assets/stylesheets/responsive.css
+++ b/app/assets/stylesheets/responsive.css
@@ -576,10 +576,6 @@
     padding: 0;
   }
 
-  #admin-menu a.icon:not(:has(svg)) {
-    padding-left: 20px !important;
-  }
-
   /*----------------------------------------*\
     E) UX ELEMENTS
   \*----------------------------------------*/
@@ -621,12 +617,6 @@
     padding-bottom: 9px;
   }
 
-  #content>.contextual a.icon:not(:has(svg)),
-  p.buttons a.icon:not(:has(svg)) {
-    background-position-x: 4px;
-    padding-left: 25px;
-  }
-
   .flyout-menu .contextual {
     float: none;
   }
diff --git a/app/assets/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css
index aa21aeaf9..ec8a2e96f 100644
--- a/app/assets/stylesheets/rtl.css
+++ b/app/assets/stylesheets/rtl.css
@@ -21,8 +21,6 @@ h1, h2, h3, h4 {padding:2px 00px 1px 10px;}
 #main-menu {left:auto;right:6px;margin-right:0;margin-left:-500px;}
 #main-menu li {float:right;margin:0px 0px 0px 2px;}
 
-#admin-menu a:not(:has(svg)) {padding-left:0;padding-right:20px;}
-
 #sidebar {float:left; padding-right: 20px; padding-left: 8px; border-left: 0; border-right: 1px solid var(--oc-gray-4);}
 * html #sidebar hr {left: auto; right: -6px;}
 
@@ -55,10 +53,6 @@ div.modal p.buttons {text-align:left;}
 /***** Links *****/
 
 #sidebar a.selected {padding:1px 2px 2px 3px; margin-left:0px; margin-right:-2px;}
-#admin-menu a.selected:not(:has(svg)) {padding-left:0!important; padding-right:20px!important; background-position:right 2px 40%;}
-
-a.collapsible:not(:has(svg)) {padding-left:0px; padding-right:12px; background: url(/arrow_down.png) no-repeat right 0px top 50%;}
-a.collapsible.collapsed:not(:has(svg)) {background-image: url(/arrow_left.png);}
 
 /***** Tables *****/
 table.list td {padding-left:0px; padding-right:10px;}
@@ -139,8 +133,6 @@ div.projects h3 {padding-left:0px; padding-right:20px;}
 #watchers li {margin: 0px 0px 0px 2px; padding: 0px 0px 0px 0px;}
 #watchers img.gravatar {margin: 0 0 2px 4px;}
 
-span.search_for_watchers a:not(:has(svg)), span.add_attachment a:not(:has(svg)) {padding-left:0px; padding-right:16px; background: url(/bullet_add.png) no-repeat right 50%; }
-
 div.square {float:right;}
 .contextual {float:left; padding-left:0px; padding-right:10px;}
 
@@ -154,9 +146,6 @@ div.issue div.subject div div {padding-left:0px; padding-right:16px;}
 
 div.issue span.private, div.journal span.private {margin-right:0px; margin-left:2px;}
 
-fieldset.collapsible>legend:not(:has(svg)) {padding-left:0px; padding-right:18px; background: url(/arrow_down.png) no-repeat right 50%;}
-fieldset.collapsible.collapsed>legend:not(:has(svg)) { background-image: url(/arrow_left.png); }
-
 fieldset#filters td.add-filter {text-align:left; }
 
 div#issue-changesets {float:left;  margin-left:0em; margin-right:1em; padding-left:0em; padding-right:1em;}
@@ -263,19 +252,6 @@ div.flash svg.icon-svg, #errorExplanation svg.icon-svg {
   margin-left: 4px;
 }
 
-div.flash.error:not(:has(svg)), #errorExplanation:not(:has(svg)) {
-  background: url(/exclamation.png) right 8px top 50% no-repeat var(--oc-red-1);
-}
-
-div.flash.notice:not(:has(svg)) {
-  background: url(/true.png) right 8px top 5px no-repeat var(--oc-green-1);
-}
-
-div.flash.warning:not(:has(svg)), .conflict {
-  background: url(/warning.png) right 8px top 5px no-repeat var(--oc-yellow-1);
-  text-align:right;
-}
-
 /***** Ajax indicator ******/
 #ajax-indicator {
   left:auto; right:40%;
@@ -367,11 +343,6 @@ a.wiki-anchor {margin-left:0px; margin-right:6px;}
 .project.marker {margin-left:0; margin-right:-4px;}
 
 /***** Icons *****/
-.icon:not(:has(svg)) {
-  background-position: right 50%;
-  padding-left:0; padding-right:20px;
-}
-
 svg.icon-svg.icon-rtl {
   transform: scaleX(-1);
 }
diff --git a/app/assets/stylesheets/scm.css b/app/assets/stylesheets/scm.css
index e059cd9ee..4d7699188 100644
--- a/app/assets/stylesheets/scm.css
+++ b/app/assets/stylesheets/scm.css
@@ -27,36 +27,25 @@ li.change {
     padding-left: 20px;
     margin: 0;
 }
-li.change:not(:has(svg)) {
-    background-image: url(/bullet_black.png);
-    background-position: 1px 2px;
-    background-repeat: no-repeat;
-}
-li.change.folder:not(:has(svg)) { background-image: url(/folder_open.png); }
 li.change.folder.change-A { background-image: url(/folder_open_add.png); }
 li.change.folder.change-M { background-image: url(/folder_open_orange.png); }
 
-li.change.change-A:not(:has(svg)) { background-image: url(/bullet_add.png); }
 li.change.change-A svg.icon-svg {
     fill: var(--oc-green-7);
     stroke: var(--oc-white);
 }
-li.change.change-M:not(:has(svg)) { background-image: url(/bullet_orange.png); }
 li.change.change-M svg.icon-svg {
     fill: var(--oc-yellow-7);
     stroke: var(--oc-white);
 }
-li.change.change-C:not(:has(svg)) { background-image: url(/bullet_blue.png); }
 li.change.change-C svg.icon-svg {
     fill: var(--oc-cyan-7);
     stroke: var(--oc-white);
 }
-li.change.change-R:not(:has(svg)) { background-image: url(/bullet_purple.png); }
 li.change.change-R svg.icon-svg {
     fill: var(--oc-grape-7);
     stroke: var(--oc-white);
 }
-li.change.change-D:not(:has(svg)) { background-image: url(/bullet_delete.png); }
 li.change.change-D svg.icon-svg {
     fill: var(--oc-red-7);
     stroke: var(--oc-white);