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 1c8ed3dc6..a934b7cfa 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -264,14 +264,14 @@ public class I2PSnarkServlet extends Default {
             if (peerParam != null) {
                 out.write("\">");
                 out.write("<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/showpeers.png\" title=\"");
-                out.write(_("Hide Peers"));
+                out.write(_("Hide All Attached Peers [connected/total in swarm]"));
                 out.write("\" alt=\"");
                 out.write(_("Hide Peers"));
                 out.write("\">");
             } else {
                 out.write("?p=1\">");
                 out.write("<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/hidepeers.png\" title=\"");
-                out.write(_("Show Peers"));
+                out.write(_("Show All Attached Peers [connected/total in swarm]"));
                 out.write("\" alt=\"");
                 out.write(_("Show Peers"));
                 out.write("\">");
@@ -343,8 +343,13 @@ public class I2PSnarkServlet extends Default {
         } else if (snarks.size() > 1) {
             out.write("<tfoot><tr>\n" +
                       "    <th align=\"left\" colspan=\"2\">");
+//            out.write(_("Totals"));
+//            out.write(" &raquo;&nbsp;");
+            out.write("<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/status.png\"");
+            out.write(" title=\"");
             out.write(_("Totals"));
-            out.write(" &raquo;&nbsp;");
+            out.write("\"> ");
+            out.write("&nbsp;");
             out.write(ngettext("1 torrent", "{0} torrents", snarks.size()));
             out.write(", ");
             out.write(DataHelper.formatSize2(stats[5]) + "B, ");
@@ -714,11 +719,13 @@ public class I2PSnarkServlet extends Default {
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/trackererror.png\" title=\"" + _("Tracker Error") +
                                "\"><a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               // ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               ngettext("1", "{0}", knownPeers) + "</a>";
             else if (isRunning)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/trackererror.png\" title=\"" + _("Tracker Error") +
                                "\">" + ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               // ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               ngettext("1", "{0}", knownPeers) + "</a>";
             else {
                 if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
                     err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;";
@@ -730,11 +737,13 @@ public class I2PSnarkServlet extends Default {
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/seeding.png\" title=\"" + _("Seeding") + "\">" +
                                "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               // ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               ngettext("1", "{0}", knownPeers) + "</a>";
             else if (isRunning)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/seeding.png\" title=\"" + _("Seeding") + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers)  + "</a>";
+                               // ngettext("1 peer", "{0} peers", knownPeers)  + "</a>";
+                               ngettext("1", "{0}", knownPeers)  + "</a>";
             else
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/complete.png\" title=\"" + _("Complete") + "\"> " + _("Complete");
         } else {
@@ -742,24 +751,29 @@ public class I2PSnarkServlet extends Default {
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/downloading.png\" title=\"" + _("Downloading") + "\">" +
                                "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                             //  ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               ngettext("1", "{0}", knownPeers) + "</a>";
             else if (isRunning && curPeers > 0 && downBps > 0)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/downloading.png\" title=\"" + _("Downloading") + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers);
+                               ngettext("1", "{0}", knownPeers);
+                              //  ngettext("1 peer", "{0} peers", knownPeers);
             else if (isRunning && curPeers > 0 && !showPeers)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/stalled.png\" title=\"" + _("Stalled") + "\">" +
                                "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               // ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
+                               ngettext("1", "{0}", knownPeers) + "</a>";                               
             else if (isRunning && curPeers > 0)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/stalled.png\" title=\"" + _("Stalled") + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers);
+                               // ngettext("1 peer", "{0} peers", knownPeers);
+                               ngettext("1", "{0}", knownPeers);
             else if (isRunning)
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/nopeers.png\" title=\"" + _("No Peers") + "\">" +
                                ' ' + curPeers + "&thinsp;/&thinsp;" +
-                               ngettext("1 peer", "{0} peers", knownPeers);
+                               // ngettext("1 peer", "{0} peers", knownPeers);
+                               ngettext("1", "{0}", knownPeers);
             else
                 statusString = "<img border=\"0\" src=\"/themes/snark/" + _manager.getTheme() + "/images/stopped.png\" title=\"" + _("Stopped") + "\"> " + _("Stopped");
         }
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 8071f01fc..70c61ab1c 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -267,20 +267,21 @@ td:first-child {
 }
 
 .snarkTorrentStatus {
-     padding: 1px 0 2px;
+     padding: 2px 0 2px;
 }
 
 .snarkTorrentStatus:first-child {
      text-align: left !important;
      padding-left: 0px;
-     min-width: 120px;
+     min-width: 48px;
      font-weight: bold;
      color: #dd9 !important;
      font-size: 8pt;
+     padding: 1px !important;
 }
 
 .snarkTorrentStatus:first-child img {
-     margin-right: 0px !important;
+     margin-right: 8px !important;
 }
 
 .snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css
index 0f4b16f6e..d95f2ea37 100644
--- a/installer/resources/themes/snark/vanilla/snark.css
+++ b/installer/resources/themes/snark/vanilla/snark.css
@@ -270,6 +270,8 @@ td:first-child {
 
 .snarkTorrentStatus {
      padding: 1px 0 2px;
+     font-size: 8pt !important;
+     letter-spacing: -0.05em;
 }
 
 .snarkTorrentStatus:first-child {
@@ -282,7 +284,7 @@ td:first-child {
 }
 
 .snarkTorrentStatus:first-child img {
-     margin-right: 0px !important;
+     margin-right: 10px !important;
 }
 
 .snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {