diff --git a/js/app/map/util.js b/js/app/map/util.js
index 1ab7e8b1..e66ad305 100644
--- a/js/app/map/util.js
+++ b/js/app/map/util.js
@@ -948,6 +948,8 @@ define([
                     data.maxStableTime = tooltipData.maxStableTime + ' h';
                 }
 
+                let title = tooltipData.name +
+                    '<span class="pull-right ' + tooltipData.class +'">' + tooltipData.security + '</span>';
                 let content = Mustache.render(template, data);
 
                 element.popover({
@@ -956,16 +958,16 @@ define([
                     trigger: 'hover',
                     content: '',
                     container: 'body',
-                    title: tooltipData.name +
-                    '<span class="pull-right ' + tooltipData.class +'">' + tooltipData.security + '</span>',
+                    title: title,
                     delay: {
-                        show: 250,
+                        show: 150,
                         hide: 0
                     }
                 });
 
                 // set new popover content
                 let popover = element.data('bs.popover');
+                popover.options.title = title;
                 popover.options.content = content;
             });
         });
diff --git a/js/app/ui/connection_info.js b/js/app/ui/connection_info.js
index f3b90cb9..d73d7aa6 100644
--- a/js/app/ui/connection_info.js
+++ b/js/app/ui/connection_info.js
@@ -14,42 +14,43 @@ define([
         // module info
         modulePosition: 1,
         moduleName: 'connectionInfo',
-        moduleHeadClass: 'pf-module-head',                                          // class for module header
-        moduleHandlerClass: 'pf-module-handler-drag',                               // class for "drag" handler
+        moduleHeadClass: 'pf-module-head',                                                      // class for module header
+        moduleHandlerClass: 'pf-module-handler-drag',                                           // class for "drag" handler
 
-        headUserShipClass: 'pf-head-user-ship',                                     // class for "user settings" link
+        headUserShipClass: 'pf-head-user-ship',                                                 // class for "user settings" link
 
         // connection info module
-        moduleTypeClass: 'pf-connection-info-module',                               // class for this module
+        moduleTypeClass: 'pf-connection-info-module',                                           // class for this module
 
         // headline toolbar
-        moduleHeadlineIconClass: 'pf-module-icon-button',                           // class for toolbar icons in the head
-        moduleHeadlineIconRefreshClass: 'pf-module-icon-button-refresh',            // class for "refresh" icon
-        moduleHeadlineIconCurrentMassClass: 'pf-module-icon-button-mass',           // class for "current ship mass" toggle icon
+        moduleHeadlineIconClass: 'pf-module-icon-button',                                       // class for toolbar icons in the head
+        moduleHeadlineIconRefreshClass: 'pf-module-icon-button-refresh',                        // class for "refresh" icon
+        moduleHeadlineIconCurrentMassClass: 'pf-module-icon-button-mass',                       // class for "current ship mass" toggle icon
 
-        connectionInfoPanelClass: 'pf-connection-info-panel',                       // class for connection info panels
-        connectionInfoPanelId: 'pf-connection-info-panel-',                         // id prefix for connection info panels
+        connectionInfoPanelClass: 'pf-connection-info-panel',                                   // class for connection info panels
+        connectionInfoPanelId: 'pf-connection-info-panel-',                                     // id prefix for connection info panels
 
         // info table
-        moduleTableClass: 'pf-module-table',                                        // class for module tables
-        connectionInfoTableLabelSourceClass: 'pf-connection-info-label-source',     // class for source label
-        connectionInfoTableLabelTargetClass: 'pf-connection-info-label-target',     // class for target label
-        connectionInfoTableRowMassShipClass: 'pf-connection-info-row-mass-ship',    // class for "current ship mass" table row
-        connectionInfoTableCellMassTotalClass: 'pf-connection-info-mass-total',     // class for "mass total" table cell
-        connectionInfoTableCellMassLogClass: 'pf-connection-info-mass-log',         // class for "mass log" table cell
-        connectionInfoTableCellMassShipClass: 'pf-connection-info-mass-ship',       // class for "current ship mass" table cell
-        connectionInfoTableCellMassLeftClass: 'pf-connection-info-mass-left',       // class for "mass left" table cell
+        moduleTableClass: 'pf-module-table',                                                    // class for module tables
+        connectionInfoTableLabelSourceClass: 'pf-connection-info-label-source',                 // class for source label
+        connectionInfoTableLabelTargetClass: 'pf-connection-info-label-target',                 // class for target label
+        connectionInfoTableRowMassShipClass: 'pf-connection-info-row-mass-ship',                // class for "current ship mass" table row
+        connectionInfoTableCellMassTotalTooltipClass: 'pf-connection-info-mass-total-tooltip',  // class for "mass total tooltip" table cell
+        connectionInfoTableCellMassTotalClass: 'pf-connection-info-mass-total',                 // class for "mass total" table cell
+        connectionInfoTableCellMassLogClass: 'pf-connection-info-mass-log',                     // class for "mass log" table cell
+        connectionInfoTableCellMassShipClass: 'pf-connection-info-mass-ship',                   // class for "current ship mass" table cell
+        connectionInfoTableCellMassLeftClass: 'pf-connection-info-mass-left',                   // class for "mass left" table cell
 
-        connectionInfoTableTooltipIconClass: 'pf-connection-info-tooltip-icon',     // class for "tooltip" icon
-        connectionInfoTableWarningIconClass: 'pf-connection-info-warning-icon',     // class for "warning" icon
+        connectionInfoTableTooltipIconClass: 'pf-connection-info-tooltip-icon',                 // class for "tooltip" icon
+        connectionInfoTableWarningIconClass: 'pf-connection-info-warning-icon',                 // class for "warning" icon
 
         // dataTable
-        connectionInfoTableClass: 'pf-connection-info-table',                       // class for connection tables
-        tableCellImageClass: 'pf-table-image-cell',                                 // class for table "image" cells
-        tableCellCounterClass: 'pf-table-counter-cell',                             // class for table "counter" cells
+        connectionInfoTableClass: 'pf-connection-info-table',                                   // class for connection tables
+        tableCellImageClass: 'pf-table-image-cell',                                             // class for table "image" cells
+        tableCellCounterClass: 'pf-table-counter-cell',                                         // class for table "counter" cells
 
         // config
-        showShip: true                                                              // default for "show current ship mass" toggle
+        showShip: true                                                                          // default for "show current ship mass" toggle
     };
 
     /**
@@ -188,7 +189,10 @@ define([
                 ),
                 $('<tbody>').append(
                     $('<tr>').append(
-                        $('<td>'),
+                        $('<td>', {
+                            class: ['text-right', 'pf-help', config.connectionInfoTableCellMassTotalTooltipClass].join(' '),
+                            html: '<i class="fa fa-fw fa-question-circle"></i>'
+                        }),
                         $('<td>', {
                             text: scopeLabel.charAt(0).toUpperCase() + scopeLabel.slice(1)
                         }),
@@ -305,7 +309,12 @@ define([
                             wormholeName &&
                             Init.wormholes.hasOwnProperty(wormholeName)
                         ){
-                            wormholeData = Init.wormholes[wormholeName];
+                            wormholeData = Object.assign({}, Init.wormholes[wormholeName]);
+                            wormholeData.class = Util.getSecurityClassForSystem(wormholeData.security);
+
+                            // init wormhole tooltip ----------------------------------------------
+                            let massTotalTooltipCell = tableElement.find('.' + config.connectionInfoTableCellMassTotalTooltipClass);
+                            massTotalTooltipCell.addWormholeInfoTooltip(wormholeData);
                         }
 
                         // all required data is set -> re-calculate rows
diff --git a/public/js/v1.3.1/app/map/util.js b/public/js/v1.3.1/app/map/util.js
index 1ab7e8b1..e66ad305 100644
--- a/public/js/v1.3.1/app/map/util.js
+++ b/public/js/v1.3.1/app/map/util.js
@@ -948,6 +948,8 @@ define([
                     data.maxStableTime = tooltipData.maxStableTime + ' h';
                 }
 
+                let title = tooltipData.name +
+                    '<span class="pull-right ' + tooltipData.class +'">' + tooltipData.security + '</span>';
                 let content = Mustache.render(template, data);
 
                 element.popover({
@@ -956,16 +958,16 @@ define([
                     trigger: 'hover',
                     content: '',
                     container: 'body',
-                    title: tooltipData.name +
-                    '<span class="pull-right ' + tooltipData.class +'">' + tooltipData.security + '</span>',
+                    title: title,
                     delay: {
-                        show: 250,
+                        show: 150,
                         hide: 0
                     }
                 });
 
                 // set new popover content
                 let popover = element.data('bs.popover');
+                popover.options.title = title;
                 popover.options.content = content;
             });
         });
diff --git a/public/js/v1.3.1/app/ui/connection_info.js b/public/js/v1.3.1/app/ui/connection_info.js
index f3b90cb9..d73d7aa6 100644
--- a/public/js/v1.3.1/app/ui/connection_info.js
+++ b/public/js/v1.3.1/app/ui/connection_info.js
@@ -14,42 +14,43 @@ define([
         // module info
         modulePosition: 1,
         moduleName: 'connectionInfo',
-        moduleHeadClass: 'pf-module-head',                                          // class for module header
-        moduleHandlerClass: 'pf-module-handler-drag',                               // class for "drag" handler
+        moduleHeadClass: 'pf-module-head',                                                      // class for module header
+        moduleHandlerClass: 'pf-module-handler-drag',                                           // class for "drag" handler
 
-        headUserShipClass: 'pf-head-user-ship',                                     // class for "user settings" link
+        headUserShipClass: 'pf-head-user-ship',                                                 // class for "user settings" link
 
         // connection info module
-        moduleTypeClass: 'pf-connection-info-module',                               // class for this module
+        moduleTypeClass: 'pf-connection-info-module',                                           // class for this module
 
         // headline toolbar
-        moduleHeadlineIconClass: 'pf-module-icon-button',                           // class for toolbar icons in the head
-        moduleHeadlineIconRefreshClass: 'pf-module-icon-button-refresh',            // class for "refresh" icon
-        moduleHeadlineIconCurrentMassClass: 'pf-module-icon-button-mass',           // class for "current ship mass" toggle icon
+        moduleHeadlineIconClass: 'pf-module-icon-button',                                       // class for toolbar icons in the head
+        moduleHeadlineIconRefreshClass: 'pf-module-icon-button-refresh',                        // class for "refresh" icon
+        moduleHeadlineIconCurrentMassClass: 'pf-module-icon-button-mass',                       // class for "current ship mass" toggle icon
 
-        connectionInfoPanelClass: 'pf-connection-info-panel',                       // class for connection info panels
-        connectionInfoPanelId: 'pf-connection-info-panel-',                         // id prefix for connection info panels
+        connectionInfoPanelClass: 'pf-connection-info-panel',                                   // class for connection info panels
+        connectionInfoPanelId: 'pf-connection-info-panel-',                                     // id prefix for connection info panels
 
         // info table
-        moduleTableClass: 'pf-module-table',                                        // class for module tables
-        connectionInfoTableLabelSourceClass: 'pf-connection-info-label-source',     // class for source label
-        connectionInfoTableLabelTargetClass: 'pf-connection-info-label-target',     // class for target label
-        connectionInfoTableRowMassShipClass: 'pf-connection-info-row-mass-ship',    // class for "current ship mass" table row
-        connectionInfoTableCellMassTotalClass: 'pf-connection-info-mass-total',     // class for "mass total" table cell
-        connectionInfoTableCellMassLogClass: 'pf-connection-info-mass-log',         // class for "mass log" table cell
-        connectionInfoTableCellMassShipClass: 'pf-connection-info-mass-ship',       // class for "current ship mass" table cell
-        connectionInfoTableCellMassLeftClass: 'pf-connection-info-mass-left',       // class for "mass left" table cell
+        moduleTableClass: 'pf-module-table',                                                    // class for module tables
+        connectionInfoTableLabelSourceClass: 'pf-connection-info-label-source',                 // class for source label
+        connectionInfoTableLabelTargetClass: 'pf-connection-info-label-target',                 // class for target label
+        connectionInfoTableRowMassShipClass: 'pf-connection-info-row-mass-ship',                // class for "current ship mass" table row
+        connectionInfoTableCellMassTotalTooltipClass: 'pf-connection-info-mass-total-tooltip',  // class for "mass total tooltip" table cell
+        connectionInfoTableCellMassTotalClass: 'pf-connection-info-mass-total',                 // class for "mass total" table cell
+        connectionInfoTableCellMassLogClass: 'pf-connection-info-mass-log',                     // class for "mass log" table cell
+        connectionInfoTableCellMassShipClass: 'pf-connection-info-mass-ship',                   // class for "current ship mass" table cell
+        connectionInfoTableCellMassLeftClass: 'pf-connection-info-mass-left',                   // class for "mass left" table cell
 
-        connectionInfoTableTooltipIconClass: 'pf-connection-info-tooltip-icon',     // class for "tooltip" icon
-        connectionInfoTableWarningIconClass: 'pf-connection-info-warning-icon',     // class for "warning" icon
+        connectionInfoTableTooltipIconClass: 'pf-connection-info-tooltip-icon',                 // class for "tooltip" icon
+        connectionInfoTableWarningIconClass: 'pf-connection-info-warning-icon',                 // class for "warning" icon
 
         // dataTable
-        connectionInfoTableClass: 'pf-connection-info-table',                       // class for connection tables
-        tableCellImageClass: 'pf-table-image-cell',                                 // class for table "image" cells
-        tableCellCounterClass: 'pf-table-counter-cell',                             // class for table "counter" cells
+        connectionInfoTableClass: 'pf-connection-info-table',                                   // class for connection tables
+        tableCellImageClass: 'pf-table-image-cell',                                             // class for table "image" cells
+        tableCellCounterClass: 'pf-table-counter-cell',                                         // class for table "counter" cells
 
         // config
-        showShip: true                                                              // default for "show current ship mass" toggle
+        showShip: true                                                                          // default for "show current ship mass" toggle
     };
 
     /**
@@ -188,7 +189,10 @@ define([
                 ),
                 $('<tbody>').append(
                     $('<tr>').append(
-                        $('<td>'),
+                        $('<td>', {
+                            class: ['text-right', 'pf-help', config.connectionInfoTableCellMassTotalTooltipClass].join(' '),
+                            html: '<i class="fa fa-fw fa-question-circle"></i>'
+                        }),
                         $('<td>', {
                             text: scopeLabel.charAt(0).toUpperCase() + scopeLabel.slice(1)
                         }),
@@ -305,7 +309,12 @@ define([
                             wormholeName &&
                             Init.wormholes.hasOwnProperty(wormholeName)
                         ){
-                            wormholeData = Init.wormholes[wormholeName];
+                            wormholeData = Object.assign({}, Init.wormholes[wormholeName]);
+                            wormholeData.class = Util.getSecurityClassForSystem(wormholeData.security);
+
+                            // init wormhole tooltip ----------------------------------------------
+                            let massTotalTooltipCell = tableElement.find('.' + config.connectionInfoTableCellMassTotalTooltipClass);
+                            massTotalTooltipCell.addWormholeInfoTooltip(wormholeData);
                         }
 
                         // all required data is set -> re-calculate rows
diff --git a/public/templates/tooltip/wormhole_info.html b/public/templates/tooltip/wormhole_info.html
index 84ba6fa6..8fc11baf 100644
--- a/public/templates/tooltip/wormhole_info.html
+++ b/public/templates/tooltip/wormhole_info.html
@@ -1,25 +1,25 @@
 <table>
     {{#massTotal}}
         <tr>
-            <td>Max Stable Mass</td>
+            <td>Total mass</td>
             <td class="text-right">{{massTotal}}</td>
         </tr>
     {{/massTotal}}
     {{#massIndividual}}
         <tr>
-            <td>Max Jump Mass</td>
+            <td>Jump mass</td>
             <td class="text-right">{{massIndividual}}</td>
         </tr>
     {{/massIndividual}}
     {{#massRegeneration}}
         <tr>
-            <td>Max Mass Regeneration</td>
+            <td>Mass regeneration</td>
             <td class="text-right">{{massRegeneration}}</td>
         </tr>
     {{/massRegeneration}}
     {{#maxStableTime}}
         <tr>
-            <td>Max Lifetime</td>
+            <td>Lifetime</td>
             <td class="text-right">{{maxStableTime}}</td>
         </tr>
     {{/maxStableTime}}