diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index d0a776ef..43483da8 100755
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -157,7 +157,7 @@
                       </div>
 
                       <!-- Owner -->
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Owner_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Owner');?></label>
                         <div class="col-sm-9">
                           <div class="input-group">
@@ -174,7 +174,7 @@
                       </div>
 
                       <!-- Type -->
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Type_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Type');?></label>
                         <div class="col-sm-9">
                           <div class="input-group">
@@ -192,14 +192,14 @@
                       </div>
 
                       <!-- Icon -->
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Icon_Descr');?>">
                         <label class="col-sm-3 control-label">
                           <?= lang('DevDetail_Icon');?> 
                           <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/ICONS.md" target="_blank"> <span><i class="fa fa-circle-question"></i></a><span>
                         </label>
                         <div class="col-sm-9">
                           <div class="input-group">
-                            <input class="form-control" title="<?= lang('DevDetail_Icon_Descr');?>" id="txtIcon" type="text" value="--">
+                            <input class="form-control"  id="txtIcon" type="text" value="--">
                             <span class="input-group-addon" title='<?= lang('DevDetail_button_OverwriteIcons_Tooltip');?>'><i class="fa fa-copy pointer" onclick="askOverwriteIconType();"></i></span>
                             <span class="input-group-addon"><i class="fa fa-pencil pointer" onclick="editDrp('txtIcon');"></i></span>
                             <div class="input-group-btn">
@@ -214,7 +214,7 @@
                       </div>
 
                       <!-- Vendor -->
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Vendor_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Vendor');?></label>
                         <div class="col-sm-9">
                           <input class="form-control" id="txtVendor" type="text" value="--">
@@ -325,7 +325,7 @@
 
                       <!-- Network -->
                       <h4 class="bottom-border-aqua"><?= lang('DevDetail_MainInfo_Network_Title');?><span class="networkPageHelp"> <a target="_blank" href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a><span></h4>                    
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Network_Node_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Network');?></label>
                         <div class="col-sm-9">  
                           <div class="input-group"> 
@@ -342,7 +342,7 @@
                           </div>
                         </div>
                       </div>
-                      <div class="form-group">
+                      <div class="form-group" title="<?= lang('DevDetail_Network_Port_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Network_Port');?></label>
                         <div class="col-sm-9">
                           <input class="form-control" id="txtNetworkPort" type="text" value="--">
@@ -431,7 +431,7 @@
                       </div>
 
                       <!-- Randomized MAC -->
-                      <div class="form-group" >
+                      <div class="form-group" title="<?= lang('RandomMAC_hover');?>" >
                         <label class="col-sm-5 control-label"><?= lang('DevDetail_EveandAl_RandomMAC');?>:</label>
                         <div class="col-sm-7" style="padding-top:6px;">
                           <span id="iconRandomMACinactive" data-toggle="tooltip" data-placement="right" title="Random MAC is Inactive">
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 326673c2..78d5d266 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -151,18 +151,23 @@
         "DevDetail_MainInfo_mac" : "MAC",
         "DevDetail_MainInfo_Name" : "Name",
         "DevDetail_MainInfo_Owner" : "Owner",
+        "DevDetail_Owner_hover" : "Who owns this device. Free text field.",
         "DevDetail_MainInfo_Type" : "Type",
+        "DevDetail_Type_hover" : "The Type of the device. If you select any of the pre-defined network devices (e.g.: AP, Firewall, Router, Switch...) they will show up in the Network tree configuration as possible parent network nodes.",
         "DevDetail_Icon" : "Icon",
         "DevDetail_Icon_Descr" : "Enter a font awesome icon name without the fa- prefix or with complete class, e.g.: fa fa-brands fa-apple.",
         "DevDetail_MainInfo_Vendor" : "Vendor",
+        "DevDetail_Vendor_hover" : "Vendor should be auto-detected. You can overwrite or add your custom value.",
         "DevDetail_MainInfo_Favorite" : "Favorite",
         "DevDetail_MainInfo_Group" : "Group",
         "DevDetail_MainInfo_Location" : "Location",
         "DevDetail_MainInfo_Comments" : "Comments",
         "DevDetail_MainInfo_Network_Title" : "<i class=\"fa fa-network-wired\"></i> Network",
         "DevDetail_MainInfo_Network" : "<i class=\"fa fa-server\"></i> Node (MAC)",
+        "DevDetail_Network_Node_hover" : "Select the parent network device the current device is connected to to populate the Network tree.",
         "DevDetail_GoToNetworkNode" : "Navigate to the Network page of the given node.",
         "DevDetail_MainInfo_Network_Port" : "<i class=\"fa fa-ethernet\"></i> Port",
+        "DevDetail_Network_Port_hover" : "The port this device is connected to on the parent network device. If left empty a wifi icon is displayed in the Network tree.",
         "DevDetail_SessionInfo_Title" : "<i class=\"fa fa-calendar\"></i> Session Info",
         "DevDetail_SessionInfo_Status" : "Status",
         "DevDetail_SessionInfo_FirstSession" : "First Session",
@@ -177,6 +182,7 @@
         "DevDetail_EveandAl_NewDevice" : "New Device",
         "DevDetail_EveandAl_Archived" : "Archived",
         "DevDetail_EveandAl_RandomMAC" : "Random MAC",
+        "RandomMAC_hover" : "Autodetected - indicates if the device randomizes it's MAC address.",
         "DevDetail_EveandAl_ScanCycle_a" : "Scan Device",
         "DevDetail_EveandAl_ScanCycle_z" : "Don&#39;t Scan Device",
         "DevDetail_button_Delete" : "Delete Device",