diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 90ead8465..0d41b2852 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -109,7 +109,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 
         <tr>
             <td>
-                <input type="text" size="60" maxlength="80" name="nofilter_description"  title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext tunnelDescription" />                
+                <input type="text" size="60" maxlength="80" name="nofilter_description"  title="Tunnel Description" value="<%=editBean.getTunnelDescription(curTunnel)%>" class="freetext tunnelDescription" />
             </td>
 
             <td>
@@ -143,7 +143,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                            out.write(" <span class=\"required\"><font color=\"red\">(");
                            out.write(intl._t("required"));
                            out.write(")</font></span>");
-                       }   
+                       }
                      %>
                 <input type="text" size="6" maxlength="5" id="targetPort" name="targetPort" title="Target Port Number" value="<%=editBean.getTargetPort(curTunnel)%>" class="freetext port" placeholder="required" />
             </td>
@@ -169,7 +169,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
         <tr>
             <td>
                 <b><%=intl._t("Port")%>:</b>
-           	    
+
            	     <% String value4 = editBean.getClientPort(curTunnel);
            	        if (value4 == null || "".equals(value4.trim())) {
            	            out.write(" <span class=\"required\"><font color=\"red\">(");
@@ -205,7 +205,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
          <% } /* httpbidirserver || streamrserver */ %>
         </tr>
 
-            
+
             <% if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) {
           %>
 
@@ -217,15 +217,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
         </tr>
 
         <tr>
-            <td>
+            <td colspan="2">
                 <input type="text" size="20" id="websiteName" name="spoofedHost" title="Website Hostname" value="<%=editBean.getSpoofedHost(curTunnel)%>" class="freetext" />
                 <%=intl._t("(leave blank for outproxies)")%>
             </td>
-            <td></td>
         </tr>
             <% }
           %>
-          
+
         <tr>
             <th colspan="2">
                 <%=intl._t("Private key file")%>
@@ -267,7 +266,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <label for="signature">
                     <%=intl._t("Hostname Signature")%>
                 </label>
-                <input type="text" size="30" readonly="readonly" title="Use to prove that the website name is for this destination" value="<%=sig%>" wrap="off" class="freetext" />                
+                <input type="text" size="30" readonly="readonly" title="Use to prove that the website name is for this destination" value="<%=sig%>" wrap="off" class="freetext" />
             </div>
          <%
                    }  // sig
@@ -393,7 +392,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
               %></select>
             </td>
         </tr>
-                           
+
          <% if (!"streamrserver".equals(tunnelType)) { %>
 
         <tr>
@@ -625,11 +624,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                         <td>
                             <input type="text" name="postMax" value="<%=editBean.getPostMax(curTunnel)%>" class="freetext quantity"/>
                         </td>
-                        <td>
+                        <td colspan="2">
                             <input type="text" name="postBanTime" value="<%=editBean.getPostBanTime(curTunnel)%>" class="freetext period"/>
                             <%=intl._t("minutes")%>
                         </td>
-                        <td></td>
                         <td class="blankColumn"></td>
                     </tr>
                     <tr>
@@ -640,11 +638,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                         <td>
                             <input type="text" name="postTotalMax" value="<%=editBean.getPostTotalMax(curTunnel)%>" class="freetext quantity"/>
                         </td>
-                        <td>
+                        <td colspan="2">
                             <input type="text" name="postTotalBanTime" value="<%=editBean.getPostTotalBanTime(curTunnel)%>" class="freetext period"/>
                             <%=intl._t("minutes")%>
                         </td>
-                        <td></td>
                         <td class="blankColumn"></td>
                     </tr>
                     <tr>
@@ -652,12 +649,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                             <b><%=intl._t("POST limit period")%>
                             </b>
                         </td>
-                        <td>
+                        <td colspan="2">
                             <input type="text" name="postCheckTime" value="<%=editBean.getPostCheckTime(curTunnel)%>" class="freetext period"/>
                             <%=intl._t("minutes")%>
                         </td>
                         <td></td>
-                        <td></td>
                         <td class="blankColumn"></td>
                     </tr>
 
@@ -693,7 +689,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <%=intl._t("minutes")%>
             </td>
         </tr>
-           
+
 <% /***************** %>
             <div id="tunnelOptionsField" class="rowItem">
                 <label for="cert" accesskey="c">
@@ -703,12 +699,12 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
             <div id="hostField" class="rowItem">
               <div id="portField" class="rowItem">
                 <label><%=intl._t("None")%></label>
-                <input value="0" type="radio" id="startOnLoad" name="cert" title="No Certificate"<%=(editBean.getCert(curTunnel)==0 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <input value="0" type="radio" id="startOnLoad" name="cert" title="No Certificate"<%=(editBean.getCert(curTunnel)==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
               </div>
               <div id="portField" class="rowItem">
                 <label><%=intl._t("Hashcash (effort)")%></label>
-                <input value="1" type="radio" id="startOnLoad" name="cert" title="Hashcash Certificate"<%=(editBean.getCert(curTunnel)==1 ? " checked=\"checked\"" : "")%> class="tickbox" />                
-                <input type="text" id="port" name="effort" size="2" maxlength="2" title="Hashcash Effort" value="<%=editBean.getEffort(curTunnel)%>" class="freetext" />                
+                <input value="1" type="radio" id="startOnLoad" name="cert" title="Hashcash Certificate"<%=(editBean.getCert(curTunnel)==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
+                <input type="text" id="port" name="effort" size="2" maxlength="2" title="Hashcash Effort" value="<%=editBean.getEffort(curTunnel)%>" class="freetext" />
               </div>
             </div>
             <div id="portField" class="rowItem">
@@ -720,14 +716,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
             <div id="hostField" class="rowItem">
               <div id="portField" class="rowItem">
                 <label><%=intl._t("Hidden")%></label>
-                <input value="2" type="radio" id="startOnLoad" name="cert" title="Hidden Certificate"<%=(editBean.getCert(curTunnel)==2 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <input value="2" type="radio" id="startOnLoad" name="cert" title="Hidden Certificate"<%=(editBean.getCert(curTunnel)==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
               </div>
               <div id="portField" class="rowItem">
                 <label for="signer" accesskey="c">
                     <%=intl._t("Signed (signed by)")%>:
                 </label>
-                <input value="3" type="radio" id="startOnLoad" name="cert" title="Signed Certificate"<%=(editBean.getCert(curTunnel)==3 ? " checked=\"checked\"" : "")%> class="tickbox" />                
-                <input type="text" id="port" name="signer" size="50" title="Cert Signer" value="<%=editBean.getSigner(curTunnel)%>" class="freetext" />                
+                <input value="3" type="radio" id="startOnLoad" name="cert" title="Signed Certificate"<%=(editBean.getCert(curTunnel)==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
+                <input type="text" id="port" name="signer" size="50" title="Cert Signer" value="<%=editBean.getSigner(curTunnel)%>" class="freetext" />
               </div>
             </div>
             <div id="portField" class="rowItem">
diff --git a/installer/resources/themes/console/classic/i2ptunnel.css b/installer/resources/themes/console/classic/i2ptunnel.css
index 9aefdb6ee..fccfd49c5 100644
--- a/installer/resources/themes/console/classic/i2ptunnel.css
+++ b/installer/resources/themes/console/classic/i2ptunnel.css
@@ -325,16 +325,10 @@ td.infohelp {
      background: #ffd !important;
 }
 
-/*
-.tunnelProperties td > * {
-     vertical-align: middle;
-}
-*/
-
 .newTunnel {
      text-align: right;
      border-top: 1px solid #89f !important;
-     padding: 5px !important;
+     padding: 7px !important;
      background: #fff;
 }
 
@@ -409,6 +403,7 @@ input[type="checkbox"], input[type="radio"] {
      min-width: 16px;
      min-height: 16px;
      margin: 0;
+     background: none;
 }
 
 textarea, input, select, button {
@@ -470,7 +465,7 @@ a.control {
 
 .buttons, .newTunnel {
      text-align: right;
-     padding: 7px 5px !important;
+     padding: 7px 5px;
      background: #fff;
      background: linear-gradient(to bottom, #fff, #eff1ff);
      border-top: 1px solid #89f;
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
index ad941985a..b11807381 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -152,7 +152,7 @@ hr {
 }
 
 h2, h3 {
-     padding: 6px 10px;
+     padding: 8px 10px;
      border: 1px solid #494;
      background: linear-gradient(to bottom, #1a261a 0%, #1a261a 50%, #000 50%, #000 100%) !important;
      font-size: 11pt;
@@ -225,6 +225,14 @@ td.infohelp {
      width: 50%;
 }
 
+.tunnelConfig th:first-child, .tunnelConfig td:first-child {
+     border-left: 1px solid #494;
+}
+
+.tunnelConfig th:last-child, .tunnelConfig td:last-child {
+     border-right: 1px solid #494;
+}
+
 #clientTunnels tr, #serverTunnels tr, .tunnelConfig tr {
      background: rgba(0,0,0,0.4);
 }
@@ -352,7 +360,7 @@ textarea#statusMessages, textarea#statusMessages:active  {
      width: 150px; 
      border: 1px solid #494;
      padding: 4px;
-     font: 9pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 8pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      background: #fff;
      color: #333;
      border-radius: 2px;
@@ -397,8 +405,7 @@ input {
      text-decoration: none;
 }
 
-input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner,
-button::-moz-focus-inner {
+input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner, button::-moz-focus-inner {
      border: none;
      outline: none;
 }
@@ -413,6 +420,7 @@ input[type="checkbox"], input[type="radio"] {
      min-width: 16px;
      min-height: 16px;
      margin: 0;
+     background: none;
      filter: invert(100%) sepia(100%) hue-rotate(70deg) saturate(200%); /* colorize radios and checkboxes */
      -webkit-filter: invert(100%) sepia(100%) hue-rotate(70deg) saturate(200%);
 }
@@ -659,7 +667,7 @@ textarea[name="accessList"] {
 }
 
 #localDestination {
-     height: 30px !important;
+     height: 34px !important;
      margin: 0 !important;
 }
 
@@ -689,7 +697,7 @@ td#throttle {
 }
 
 #throttler {
-     border: none;
+     border: none !important;
 }
 
 #throttler th {
@@ -706,6 +714,15 @@ td#throttle {
      white-space: nowrap;
 }
 
+#throttler th:first-child, #throttler td:first-child {
+     border-left: none !important;
+}
+
+#throttler th:last-child, #throttler td:last-child {
+     border-right: none !important;
+}
+
+
 #throttler tr:first-child th {
      border-top: none;
 }
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index a9e775dbf..1b39027f8 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -46,6 +46,7 @@ input[type="checkbox"], input[type="radio"] {
      min-width: 16px;
      min-height: 16px;
      margin: 0;
+     background: none;
 }
 
 textarea, input, select, button {
@@ -382,17 +383,13 @@ div[class^="status"] {
      background-size: auto 16px;
 }
 
-/*
-#serverTunnels input, #serverTunnels .control,#serverTunnels select, #clientTunnels input, #clientTunnels .control, #clientTunnels select,
-#clientTunnelEdit input, #serverTunnelEdit .control
- {
-     float: none;
+.tunnelConfig th:first-child, .tunnelConfig td:first-child {
+     border-left: 1px solid #7778bf;
 }
 
-#clientTunnelEdit td, #advancedClientTunnelOptions td, #serverTunnelEdit td {
-     width: 50% !important;
+.tunnelConfig th:last-child, .tunnelConfig td:last-child {
+     border-right: 1px solid #7778bf;
 }
-*/
 
 .tunnelConfig td {
      width: 50%;
@@ -415,7 +412,7 @@ div[class^="status"] {
 .newTunnel {
      text-align: right;
      border-top: 2px solid #7778bf !important;
-     padding: 5px !important;
+     padding: 7px !important;
      background: #fff;
 }
 
@@ -484,7 +481,7 @@ th.tunnelControl {
 
 .buttons, .newTunnel {
      text-align: right;
-     padding: 5px;
+     padding: 7px 5px;
      background: #fff;
      background: linear-gradient(to bottom, #fff, #eef);
      border-top: 1px solid #7778bf !important;
@@ -578,6 +575,14 @@ td#throttle {
      border: none;
 }
 
+#throttler th:first-child, #throttler td:first-child {
+     border-left: none;
+}
+
+#throttler th:last-child, #throttler td:last-child {
+     border-right: none;
+}
+
 #throttler th {
      padding-left: 20px;
 }
diff --git a/installer/resources/themes/console/midnight/i2ptunnel.css b/installer/resources/themes/console/midnight/i2ptunnel.css
index 83ab1728f..00e5338f9 100644
--- a/installer/resources/themes/console/midnight/i2ptunnel.css
+++ b/installer/resources/themes/console/midnight/i2ptunnel.css
@@ -146,7 +146,7 @@ hr {
 }
 
 h2, h3 {
-     padding: 6px 10px;
+     padding: 7px 10px;
      border: 1px solid #2d295f;
      background: linear-gradient(to bottom, #191729 0%, #191729 50%, #000 50%, #000 100%) !important;
      font-size: 11pt;
@@ -186,7 +186,6 @@ th {
      border-bottom: 1px solid #2d295f;
      font-size: 10pt;
      color: #c9ceff;
-     text-transform: uppercase;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
 }
@@ -400,6 +399,7 @@ input[type="checkbox"], input[type="radio"] {
      min-width: 16px;
      min-height: 16px;
      margin: 0;
+     background: none;
      filter: invert(100%) sepia(100%) hue-rotate(200deg) saturate(200%); /* colorize radios and checkboxes */
      -webkit-filter: invert(100%) sepia(100%) hue-rotate(200deg) saturate(200%);
 }
@@ -597,7 +597,6 @@ input {
 
 select#profile, select#connectionProfile {
     width: 70%;
-    
 }
 
 #customOptions, #userAgents {
@@ -865,7 +864,7 @@ input.tunnelName, input.tunnelDescription, #userAgents {
 
 .tunnelConfig td, td {
      border-top: 1px inset #17142f;
-     padding: 5px;
+     padding: 6px 5px;
 }
 
 input[type="checkbox"], input[type="radio"] {
@@ -923,23 +922,15 @@ td.tunnelDestination, td.tunnelDescription {
 /* responsive layout */
 
 @media screen and (min-width: 1300px) {
-body, td {     
-     font-size: 10pt;
+body, td, .control, select, input {
+     font-size: 10pt !important;
 }
 
-.control, select, input {
-     font-size: 9pt;
-}
-
-/*
-select {
-     box-sizing: border-box;
-     padding-top: 3px;
-     padding-bottom: 3px;
-}
-*/
-
 td {
      padding: 7px 5px;
 }
+
+#localDestination, .authentication {
+     height: 34px !important;
+}
 }
\ No newline at end of file