diff --git a/templates/hostapd/advanced.php b/templates/hostapd/advanced.php
index 89d90c72..916b3308 100644
--- a/templates/hostapd/advanced.php
+++ b/templates/hostapd/advanced.php
@@ -56,7 +56,7 @@
     <div class="row">
       <div class="form-group col-md-6">
         <label for="cbxtxpower"><?php echo _("Transmit power (dBm)") ?></label>
-        <i class="fas fa-question-circle text-muted" data-toggle="tooltip" data-placement="auto" title="<?php echo _("dBm is a unit of level used to indicate that a power ratio is expressed in decibels (dB) with reference to one milliwatt (mW). 30 dBm is equal to 1000 mW, while 0 dBm equals 1.25 mW."); ?>"></i>
+        <?php echo getTooltip('dBm is a unit of level used to indicate that a power ratio is expressed in decibels (dB) with reference to one milliwatt (mW). 30 dBm is equal to 1000 mW, while 0 dBm equals 1.25 mW.', 'tiptxpower'); ?>
         <?php
           SelectorOptions('txpower', $arrTxPower, $txpower, 'cbxtxpower');
         ?>
diff --git a/templates/hostapd/basic.php b/templates/hostapd/basic.php
index 90fd18d2..77475b27 100644
--- a/templates/hostapd/basic.php
+++ b/templates/hostapd/basic.php
@@ -4,7 +4,7 @@
     <div class="form-group col-md-6">
       <label for="cbxinterface"><?php echo _("Interface") ;?></label>
       <?php
-        SelectorOptions('interface', $interfaces, $arrConfig['interface'], 'cbxinterface');
+        SelectorOptions('interface', $interfaces, $arrConfig['interface'], 'cbxinterface', 'setHardwareModeTooltip');
       ?>
     </div>
   </div>
@@ -17,6 +17,7 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="cbxhwmode"><?php echo _("Wireless Mode") ;?></label>
+      <?php echo getTooltip('Initial state.', 'tiphwmode', true); ?>
       <?php
       $countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2;
       $selectedHwMode = $arrConfig['hw_mode'];