diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 2c10bb4a3..2fd4391ce 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -535,18 +535,20 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <b><%=intl._t("Local destination")%></b>
             </td>
         </tr>
+
         <tr>
             <td colspan="2">
-                    <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" id="localDestination" title="<%=intl._t("Read Only: Local Destination (if known)")%>" wrap="off" spellcheck="false"><%=destb64%></textarea>
+                <div class="displayText" title="<%=intl._t("Read Only: Local Destination (if known)")%>" tabindex="0"><%=destb64%></div>
             </td>
         </tr>
 
         <tr>
             <td colspan="2">
-                <b><%=intl._t("Local Base 32")%>:</b>
+                <b><%=intl._t("Local Base 32")%>:</b>&nbsp;
                 <%=editBean.getDestHashBase32(curTunnel)%>
             </td>
         </tr>
+
          <% } // if destb64  %>
          <% } %>
 
@@ -594,11 +596,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
         <tr>
             <td colspan="2">
                 <span class="multiOption">
-                    <label><input value="0" type="radio" name="sigType"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <label title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>"><input value="0" type="radio" name="sigType"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
                     DSA-SHA1</label>
                 </span>
 
-
            <% if (editBean.isSigTypeAvailable(1)) { %>
 
                 <span class="multiOption">
@@ -606,7 +607,6 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     ECDSA-P256</label>
                 </span>
 
-
            <% }
 
               if (editBean.isSigTypeAvailable(2)) { %>
@@ -624,12 +624,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     ECDSA-P521</label>
                 </span>
 
-
            <% }
               if (editBean.isSigTypeAvailable(7)) { %>
 
                 <span class="multiOption">
-                    <label><input value="7" type="radio" name="sigType"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    <label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" name="sigType"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
                     Ed25519-SHA-512</label>
                 </span>
             </td>
diff --git a/history.txt b/history.txt
index 3a35d14df..b11dbfc59 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,7 @@
 2017-06-19 str4d
  * Console: cleanup & formatting tidyups for welcome page readmes, remove
    unneeded classes
+ * i2ptunnel: consistent tooltips and Destinations for editClient and editServer
 
 2017-06-15 zzz
  * Data: Cache hostname lookups in RouterAddress (ticket #1998)