diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
index 504b005eb6..c3d1297bff 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
@@ -354,14 +354,6 @@ tr {
             font-weight: bold;
         }
     }
-
-    &.debug {
-        td {
-            color: #CC0000;
-            font-style: italic;
-            font-weight: bold;
-        }
-    }
 }
 
 .selections-table {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index ca3fb11723..389394b88a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -256,6 +256,7 @@
 
     [% IF servers_count > 0 %]
         <div class="page-section">
+            <h3>All SMTP servers</h3>
             <table id="smtp_servers">
                 <thead>
                     <tr>
@@ -405,7 +406,7 @@
                                 return "[% tp("Active", "On") | html %]";
                             }
                             else {
-                                return _("Off");
+                                return _("");
                             }
                         },
                         "searchable": false,
@@ -414,10 +415,9 @@
                     {
                         "data": function( row, type, val, meta ) {
                             if ( row.is_default ) {
-                                return _("Yes");
-                            }
-                            else {
-                                return _("No");
+                                return _("Default");
+                            } else {
+                                return "";
                             }
                         },
                         "searchable": false,
@@ -435,7 +435,7 @@
                 ],
                 createdRow: function (row, data, dataIndex) {
                     if ( data.is_default ) {
-                        $(row).addClass('default warn');
+                        $(row).addClass('default');
                     }
                     if ( data.debug ) {
                         $(row).addClass('debug');
@@ -489,16 +489,20 @@
 [% END %]
 
 [% BLOCK default_server_info %]
-    <div class="alert alert-info" id="default_server_message">
-        <p>Current default configuration:</p>
-
-        <ul>
-            <li><strong>Host</strong>: [%- default_config.host | html -%]</li>
-            <li><strong>Port</strong>: [%- default_config.port | html -%]</li>
-            <li><strong>Timeout (secs)</strong>: [%- default_config.timeout | html -%]</li>
-            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
-            <li><strong>Debug mode</strong>: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
-        </ul>
+    <div class="page-section">
+        <div class="rows" id="default_server_message">
+            <h2>Current default configuration</h2>
+            <ul>
+                <li><span class="label">Host: </span> [%- default_config.host | html -%]</li>
+                <li><span class="label">Port: </span> [%- default_config.port | html -%]</li>
+                <li><span class="label">Timeout (secs): </span> [%- default_config.timeout | html -%]</li>
+                <li><span class="label">SSL: </span> [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
+                <li><span class="label">Debug mode: </span> [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
+                [% IF op == 'list' %]
+                    <li><a href="/cgi-bin/koha/admin/smtp_servers.pl?op=edit_form&smtp_server_id=[% default_config.id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
+                [% END %]
+            </ul>
+        </div>
     </div>
 [% END %]