diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 4165536ef..d1367a4ef 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -270,14 +270,14 @@ public class I2PSnarkServlet extends Default {
                       "\" title=\"");
             out.write(_("Stop all torrents and the I2P tunnel"));
             out.write("\">");
-            out.write(_("Stop All"));
+            out.write(_("<img src=\"/themes/console/snark/images/stop_all.png\" title=\"Stop All Torrents\" alt=\"Stop All\">"));
             out.write("</a>");
         } else if (!snarks.isEmpty()) {
             out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
                       "\" title=\"");
             out.write(_("Start all torrents and the I2P tunnel"));
             out.write("\">");
-            out.write(_("Start All"));
+            out.write(_("<img src=\"/themes/console/snark/images/start_all.png\" title=\"Start All Torrents\" alt=\"Start All\">"));
             out.write("</a>");
         } else {
             out.write("&nbsp;");
@@ -784,7 +784,7 @@ public class I2PSnarkServlet extends Default {
                       + "\" title=\"");
             out.write(_("Stop the torrent"));
             out.write("\">");
-            out.write(_("Stop"));
+            out.write(_("<img src=\"/themes/console/snark/images/stop.png\" title=\"Stop Torrent\" alt=\"Stop\">"));
             out.write("</a>");
         } else {
             if (isValid) {
@@ -792,8 +792,8 @@ public class I2PSnarkServlet extends Default {
                           + "\" title=\"");
                 out.write(_("Start the torrent"));
                 out.write("\">");
-                out.write(_("Start"));
-                out.write("</a>\n");
+                out.write(_("<img src=\"/themes/console/snark/images/start.png\" title=\"Start Torrent\" alt=\"Start\">"));
+                out.write("</a>");
             }
             out.write("<a href=\"" + uri + "?action=Remove" + parameters
                       + "\" title=\"");
@@ -804,8 +804,8 @@ public class I2PSnarkServlet extends Default {
             // Then the remaining single quite must be escaped
             out.write(_("Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?", fullFilename));
             out.write("')) { return false; }\">");
-            out.write(_("Remove"));
-            out.write("</a><br>");
+            out.write(_("<img src=\"/themes/console/snark/images/remove.png\" title=\"Remove Torrent\" alt=\"Remove\">"));
+            out.write("</a>");
             out.write("<a href=\"" + uri + "?action=Delete" + parameters
                       + "\" title=\"");
             out.write(_("Delete the .torrent file and the associated data file(s)"));
@@ -815,7 +815,7 @@ public class I2PSnarkServlet extends Default {
             // Then the remaining single quite must be escaped
             out.write(_("Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?", fullFilename));
             out.write("')) { return false; }\">");
-            out.write(_("Delete"));
+            out.write(_("<img src=\"/themes/console/snark/images/delete.png\" title=\"Delete Torrent + Data\" alt=\"Delete\">"));
             out.write("</a>");
         }
         out.write("</td>\n</tr>\n");
diff --git a/installer/resources/themes/console/snark/images/delete.png b/installer/resources/themes/console/snark/images/delete.png
new file mode 100644
index 000000000..45399d175
Binary files /dev/null and b/installer/resources/themes/console/snark/images/delete.png differ
diff --git a/installer/resources/themes/console/snark/images/remove.png b/installer/resources/themes/console/snark/images/remove.png
new file mode 100644
index 000000000..92c63f502
Binary files /dev/null and b/installer/resources/themes/console/snark/images/remove.png differ
diff --git a/installer/resources/themes/console/snark/images/start.png b/installer/resources/themes/console/snark/images/start.png
new file mode 100644
index 000000000..1edee823a
Binary files /dev/null and b/installer/resources/themes/console/snark/images/start.png differ
diff --git a/installer/resources/themes/console/snark/images/start_all.png b/installer/resources/themes/console/snark/images/start_all.png
new file mode 100644
index 000000000..3070cdd3a
Binary files /dev/null and b/installer/resources/themes/console/snark/images/start_all.png differ
diff --git a/installer/resources/themes/console/snark/images/stop.png b/installer/resources/themes/console/snark/images/stop.png
new file mode 100644
index 000000000..afb50a44a
Binary files /dev/null and b/installer/resources/themes/console/snark/images/stop.png differ
diff --git a/installer/resources/themes/console/snark/images/stop_all.png b/installer/resources/themes/console/snark/images/stop_all.png
new file mode 100644
index 000000000..eeaca8162
Binary files /dev/null and b/installer/resources/themes/console/snark/images/stop_all.png differ
diff --git a/installer/resources/themes/console/snark/images/tile2.png b/installer/resources/themes/console/snark/images/tile2.png
new file mode 100644
index 000000000..d4db14c97
Binary files /dev/null and b/installer/resources/themes/console/snark/images/tile2.png differ
diff --git a/installer/resources/themes/console/snark/snark.css b/installer/resources/themes/console/snark/snark.css
index f7d09e748..1580d8f48 100644
--- a/installer/resources/themes/console/snark/snark.css
+++ b/installer/resources/themes/console/snark/snark.css
@@ -1,4 +1,4 @@
-/* I2PSnark theme "faze to gray" by dr|z3d */
+/* I2PSnark theme "Ubergine" by dr|z3d */
 /* Guantanamo Commemorative Edition. */
 
 body {
@@ -168,7 +168,19 @@ td:first-child {
 
 .snarkTorrentAction {
      text-shadow:1px 1px #550000;
-	 padding: 0 0 1px;
+	 padding: 1px 0 !important;
+	 margin: 0 !important;
+	 text-align: center;
+}
+
+.snarkTorrentAction img {
+     margin: 0 2px !important;
+	 opacity: 0.6;
+}
+
+.snarkTorrentAction img:hover {
+     -moz-box-shadow: 0 0 1px 1px #f90;
+     opacity: 1;
 }
 
 .snarkTorrentEven {
@@ -202,9 +214,9 @@ td:first-child {
 .snarkTorrentOdd {
      background: #656;
      font-size: 8pt;
-	 border: 1px inset #434;
-	 border-left: 0;
-	 border-right: 0;
+	 border: 1px inset #434 !important;
+	 border-left: 0 !important;
+	 border-right: 0 !important;
 }
 
 .snarkFileName {
@@ -259,7 +271,7 @@ td:first-child {
 }
 
 .page {
-     background: #323;
+     background: #323 url('/themes/console/snark/images/tile2.png');
      color: #310;
      min-width: 820px !important;
      margin: 5px 0 0 0;
@@ -270,11 +282,11 @@ td:first-child {
      border: 1px solid #101;
      font-size: 9pt !important;
      line-height: 160% !important;
-     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+     -moz-box-shadow: inset 0px 0px 1px 0px #212;
      -khtml-box-shadow: inset 0px 0px 1px 0px #002;
      box-shadow: inset 0px 0px 1px 0px #002;
      text-align: center;
-     opacity: 1
+     opacity: 1;
 }
 
 form {