diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 1fcaaff9c..4f5b34ddf 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -349,26 +349,25 @@ public class ConfigClientsHelper extends HelperBase {
                 buf.append("disabled=\"disabled\" ");
         }
         buf.append("></td><td align=\"center\" width=\"15%\">");
-        // The icons were way too much, so there's an X in each button class,
-        // remove if you wnat to put them back
+
         if (showStartButton && (!ro) && !edit) {
-            buf.append("<button type=\"submit\" title=\"").append(_t("Start")).append("\" class=\"Xaccept\" name=\"action\" value=\"Start ").append(index).append("\" >")
+            buf.append("<button type=\"submit\" title=\"").append(_t("Start")).append("\" class=\"control accept\" name=\"action\" value=\"Start ").append(index).append("\" >")
                .append(_t("Start")).append("<span class=hide> ").append(index).append("</span></button>");
         }
         if (showStopButton && (!edit))
-            buf.append("<button type=\"submit\" title=\"").append(_t("Stop")).append("\" class=\"Xstop\" name=\"action\" value=\"Stop ").append(index).append("\" >")
+            buf.append("<button type=\"submit\" title=\"").append(_t("Stop")).append("\" class=\"control stop\" name=\"action\" value=\"Stop ").append(index).append("\" >")
                .append(_t("Stop")).append("<span class=hide> ").append(index).append("</span></button>");
         if (isClientChangeEnabled() && showEditButton && (!edit) && !ro)
-            buf.append("<button type=\"submit\" title=\"").append(_t("Edit")).append("\" class=\"Xadd\" name=\"edit\" value=\"Edit ").append(index).append("\" >")
+            buf.append("<button type=\"submit\" title=\"").append(_t("Edit")).append("\" class=\"control add\" name=\"edit\" value=\"Edit ").append(index).append("\" >")
                .append(_t("Edit")).append("<span class=hide> ").append(index).append("</span></button>");
         if (showUpdateButton && (!edit) && !ro) {
-            buf.append("<button type=\"submit\" title=\"").append(_t("Check for updates")).append("\" class=\"Xcheck\" name=\"action\" value=\"Check ").append(index).append("\" >")
-               .append("<span class=hide> ").append(index).append("</span></button>");
-            buf.append("<button type=\"submit\" title=\"").append(_t("Update")).append("\" class=\"Xdownload\" name=\"action\" value=\"Update ").append(index).append("\" >")
-                .append("<span class=hide> ").append(index).append("</span></button>");
+            buf.append("<button type=\"submit\" title=\"").append(_t("Check for updates")).append("\" class=\"control check\" name=\"action\" value=\"Check ").append(index).append("\" >")
+               .append(_t("Check for updates")).append("<span class=hide> ").append(index).append("</span></button>");
+            buf.append("<button type=\"submit\" title=\"").append(_t("Update")).append("\" class=\"control download\" name=\"action\" value=\"Update ").append(index).append("\" >")
+                .append(_t("Update")).append("<span class=hide> ").append(index).append("</span></button>");
         }
         if (showDeleteButton && (!edit) && !ro) {
-            buf.append("<button type=\"submit\" title=\"").append(_t("Delete")).append("\" class=\"Xdelete\" name=\"action\" value=\"Delete ").append(index)
+            buf.append("<button type=\"submit\" title=\"").append(_t("Delete")).append("\" class=\"control delete\" name=\"action\" value=\"Delete ").append(index)
                .append("\" onclick=\"if (!confirm('")
                .append(_t("Are you sure you want to delete {0}?", _t(escapedName)))
                .append("')) { return false; }\">")
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 5ae478ea1..1b0f1908c 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -925,10 +925,9 @@ button.search:focus {
      background: url(/themes/console/images/buttons/search_hover.png) no-repeat 6px 6px, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-
 /* client config buttons aka project "X" */
 
-button.Xaccept {
+button.accept.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstart.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -936,11 +935,11 @@ button.Xaccept {
      padding: 12px 11px;
 }
 
-button.Xaccept:hover, button.Xaccept:focus {
+button.accept.control:hover, button.accept.control:focus {
      background: url(/themes/console/images/buttons/Xstart.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xstop {
+button.stop.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstop.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -948,11 +947,11 @@ button.Xstop {
      padding: 12px 11px;
 }
 
-button.Xstop:hover, button.Xstop:focus {
+button.stop.control:hover, button.stop.control:focus {
      background: url(/themes/console/images/buttons/Xstop.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xadd {
+button.add.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/edit2.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -960,11 +959,11 @@ button.Xadd {
      padding: 12px 11px;
 }
 
-button.Xadd:hover, button.Xadd:focus {
+button.add.control:hover, button.add.control:focus {
      background: url(/themes/console/images/buttons/edit2.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xdelete {
+button.delete.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -972,11 +971,11 @@ button.Xdelete {
      padding: 12px 11px;
 }
 
-button.Xdelete:hover, button.Xdelete:focus {
+button.delete.control:hover, button.delete.control:focus {
      background: url(/themes/console/images/buttons/delete_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xcheck {
+button.check.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/update.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -984,11 +983,11 @@ button.Xcheck {
      padding: 12px 11px;
 }
 
-button.Xcheck:hover, button.Xcheck:focus {
+button.check.control:hover, button.check.control:focus {
      background: url(/themes/console/images/buttons/update_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xdownload {
+button.download.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -996,7 +995,7 @@ button.Xdownload {
      padding: 12px 11px;
 }
 
-button.Xdownload:hover, button.Xdownload:focus {
+button.download.control:hover, button.download.control:focus {
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
@@ -4429,7 +4428,7 @@ h3#webappconfig {
      margin-top: -15px;
 }
 
-button[class^="X"] {
+button.control {
      font-size: 0 !important;
 }
 
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index bc8732105..4fe0daaad 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -2475,7 +2475,11 @@ input.stop:focus, button.stop:focus {
 
 /* client config buttons aka project "X" */
 
-button.Xaccept {
+button.control {
+     font-size: 0 !important;
+}
+
+button.accept.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstart.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2483,11 +2487,11 @@ button.Xaccept {
      padding: 12px 11px;
 }
 
-button.Xaccept:hover, button.Xaccept:focus {
+button.accept.control:hover, button.accept.control:focus {
      background: url(/themes/console/images/buttons/Xstart.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xstop {
+button.stop.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstop.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2495,11 +2499,11 @@ button.Xstop {
      padding: 12px 11px;
 }
 
-button.Xstop:hover, button.Xstop:focus {
+button.stop.control:hover, button.stop.control:focus {
      background: url(/themes/console/images/buttons/Xstop.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xadd {
+button.add.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/edit2.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2507,11 +2511,11 @@ button.Xadd {
      padding: 12px 11px;
 }
 
-button.Xadd:hover, button.Xadd:focus {
+button.add.control:hover, button.add.control:focus {
      background: url(/themes/console/images/buttons/edit2.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xdelete {
+button.delete.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2519,11 +2523,11 @@ button.Xdelete {
      padding: 12px 11px;
 }
 
-button.Xdelete:hover, button.Xdelete:focus {
+button.delete.control:hover, button.delete.control:focus {
      background: url(/themes/console/images/buttons/delete_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xcheck {
+button.check.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/update.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2531,11 +2535,11 @@ button.Xcheck {
      padding: 12px 11px;
 }
 
-button.Xcheck:hover, button.Xcheck:focus {
+button.check.control:hover, button.check.control:focus {
      background: url(/themes/console/images/buttons/update_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
-button.Xdownload {
+button.download.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -2543,7 +2547,7 @@ button.Xdownload {
      padding: 12px 11px;
 }
 
-button.Xdownload:hover, button.Xdownload:focus {
+button.download.control:hover, button.download.control:focus {
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
@@ -4231,10 +4235,6 @@ code, tt, div.news {
      font-size: 9pt !important;
 }
 
-button[class^="X"] {
-     font-size: 0 !important;
-}
-
 .main, .news, h1 {
      margin-left: 232px !important;
 }
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index 1c2b5d540..cdd47fd66 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -867,4 +867,5 @@ body, select, .control, input, textarea {
 th {
      font-size: 10.5pt;
 }
-}
\ No newline at end of file
+}
+
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index e521ab522..b0eaf2232 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -735,7 +735,11 @@ button.search:active {
 
 /* client/plugin/webapps buttons aka project "X" */
 
-button.Xaccept {
+button.control {
+     font-size: 0 !important;
+}
+
+button.accept.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstart.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -743,15 +747,15 @@ button.Xaccept {
      padding: 12px 11px;
 }
 
-button.Xaccept:hover, button.Xaccept:focus {
+button.accept.control:hover, button.accept.control:focus {
      background: #000 url(/themes/console/images/buttons/Xstart.png) center center no-repeat !important;
 }
 
-button.Xaccept:active {
+button.accept.control:active {
      background: #652787 url(/themes/console/images/buttons/Xstart.png) center center no-repeat !important;
 }
 
-button.Xstop {
+button.stop.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/Xstop.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -759,15 +763,15 @@ button.Xstop {
      padding: 12px 11px;
 }
 
-button.Xstop:hover, button.Xstop:focus {
+button.stop.control:hover, button.stop.control:focus {
      background: #000 url(/themes/console/images/buttons/Xstop.png) center center no-repeat !important;
 }
 
-button.Xstop:active {
+button.stop.control:active {
      background: #652787 url(/themes/console/images/buttons/Xstop.png) center center no-repeat !important;
 }
 
-button.Xadd {
+button.add.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/edit2.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -775,15 +779,15 @@ button.Xadd {
      padding: 12px 11px;
 }
 
-button.Xadd:hover, button.Xadd:focus {
+button.add.control:hover, button.add.control:focus {
      background: #000 url(/themes/console/images/buttons/edit2.png) center center no-repeat !important;
 }
 
-button.Xadd:active {
+button.add.control:active {
      background: #652787 url(/themes/console/images/buttons/edit2.png) center center no-repeat !important;
 }
 
-button.Xdelete {
+button.delete.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -791,15 +795,15 @@ button.Xdelete {
      padding: 12px 11px;
 }
 
-button.Xdelete:hover, button.Xdelete:focus {
+button.delete.control:hover, button.delete.control:focus {
      background: #000 url(/themes/console/images/buttons/delete_hover.png) center center no-repeat !important;
 }
 
-button.Xdelete:active {
+button.delete.control:active {
      background: #652787 url(/themes/console/images/buttons/delete_hover.png) center center no-repeat !important;
 }
 
-button.Xcheck {
+button.check.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/update.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -807,15 +811,15 @@ button.Xcheck {
      padding: 12px 11px;
 }
 
-button.Xcheck:hover, button.Xcheck:focus {
+button.check.control:hover, button.check.control:focus {
      background: #000 url(/themes/console/images/buttons/update_hover.png) center center no-repeat !important;
 }
 
-button.Xcheck:active {
+button.check.control:active {
      background: #652787 url(/themes/console/images/buttons/update_hover.png) center center no-repeat !important;
 }
 
-button.Xdownload {
+button.download.control {
      font-size: 0;
      text-indent: -99999px;
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
@@ -823,11 +827,11 @@ button.Xdownload {
      padding: 12px 11px;
 }
 
-button.Xdownload:hover, button.Xdownload:focus {
+button.download.control:hover, button.download.control:focus {
      background: #000 url(/themes/console/images/buttons/download.png) center center no-repeat !important;
 }
 
-button.Xdownload:active {
+button.download.control:active {
      background: #652787 url(/themes/console/images/buttons/download.png) center center no-repeat !important;
 }
 
@@ -5251,10 +5255,6 @@ h1 {
      font-size: 9pt !important;
 }
 
-button[class^="X"] {
-     font-size: 0 !important;
-}
-
 .main, .news, h1 {
      margin-left: 232px !important;
 }