diff --git a/freedata_gui/src/components/settings_chat.vue b/freedata_gui/src/components/settings_chat.vue
index 616ecae22..d910a8e09 100644
--- a/freedata_gui/src/components/settings_chat.vue
+++ b/freedata_gui/src/components/settings_chat.vue
@@ -29,9 +29,14 @@ export default {
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Enable message auto repeat
-      <span id="enableAutoRepeatHelp" class="ms-2 badge bg-secondary text-wrap">
-        Re-send message on beacon
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Re-send message on beacon"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline ms-2">
@@ -39,7 +44,6 @@ export default {
           class="form-check-input"
           type="checkbox"
           id="enableMessagesAutoRepeatSwitch"
-          aria-describedby="enableAutoRepeatHelp"
           @change="onChange"
           v-model="settings.remote.MESSAGES.enable_auto_repeat"
         />
@@ -52,16 +56,20 @@ export default {
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       ADIF Log Host
-      <span id="adifLogHostHelp" class="ms-2 badge bg-secondary text-wrap">
-        ADIF server host, e.g., 127.0.0.1
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="ADIF server host, e.g., 127.0.0.1"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="text"
       class="form-control"
       placeholder="Enter ADIF server host"
       id="adifLogHost"
-      aria-describedby="adifLogHostHelp"
       @change="onChange"
       v-model="settings.remote.MESSAGES.adif_log_host"
     />
@@ -71,9 +79,14 @@ export default {
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       ADIF Log Port
-      <span id="adifLogPortHelp" class="ms-2 badge bg-secondary text-wrap">
-        ADIF server port, e.g., 2237
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="ADIF server port, e.g., 2237"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="number"
@@ -82,7 +95,6 @@ export default {
       id="adifLogPort"
       max="65534"
       min="1025"
-      aria-describedby="adifLogPortHelp"
       @change="onChange"
       v-model.number="settings.remote.MESSAGES.adif_log_port"
     />
diff --git a/freedata_gui/src/components/settings_exp.vue b/freedata_gui/src/components/settings_exp.vue
index bd824f1ff..f01cbf899 100644
--- a/freedata_gui/src/components/settings_exp.vue
+++ b/freedata_gui/src/components/settings_exp.vue
@@ -18,9 +18,14 @@ import { settingsStore as settings } from "../store/settingsStore.js";
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Enable MESH protocol
-      <span id="enableMeshHelp" class="ms-2 badge bg-secondary text-wrap">
-        Experimental feature
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Experimental feature"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline ms-2">
@@ -28,7 +33,6 @@ import { settingsStore as settings } from "../store/settingsStore.js";
           class="form-check-input"
           type="checkbox"
           id="enableMeshSwitch"
-          aria-describedby="enableMeshHelp"
           @change="setConfig"
           v-model="settings.remote.MESH.enable_protocol"
           disabled
diff --git a/freedata_gui/src/components/settings_gui.vue b/freedata_gui/src/components/settings_gui.vue
index 4f7ba253d..deaac07ce 100644
--- a/freedata_gui/src/components/settings_gui.vue
+++ b/freedata_gui/src/components/settings_gui.vue
@@ -8,14 +8,18 @@
   <div class="input-group input-group-sm mb-1">
     <span class="input-group-text w-50 text-wrap">
       Waterfall theme
-      <span id="wfThemeHelp" class="ms-2 badge bg-secondary text-wrap">
-        Select color theme for waterfall display
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Select color theme for waterfall display"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </span>
     <select
       class="form-select form-select-sm w-50"
       id="wftheme_selector"
-      aria-describedby="wfThemeHelp"
       @change="saveSettings"
       v-model="settings.local.wf_theme"
     >
@@ -33,9 +37,14 @@
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Auto launch browser
-      <span id="autoLaunchBrowserHelp" class="ms-2 badge bg-secondary text-wrap">
-        Launch browser to GUI URL on server startup
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Launch browser to GUI URL on server startup"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline">
@@ -43,7 +52,6 @@
           class="form-check-input"
           type="checkbox"
           id="autoLaunchBrowserSwitch"
-          aria-describedby="autoLaunchBrowserHelp"
           @change="onChange"
           v-model="settings.remote.GUI.auto_run_browser"
         />
@@ -56,9 +64,14 @@
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Enable notifications
-      <span id="enableNotificationsHelp" class="ms-2 badge bg-secondary text-wrap">
-        Show system pop-ups
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Show system pop-ups"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline">
@@ -66,7 +79,6 @@
           class="form-check-input"
           type="checkbox"
           id="enableNotificationsSwitch"
-          aria-describedby="enableNotificationsHelp"
           @change="saveSettings"
           v-model="settings.local.enable_sys_notification"
         />
@@ -76,7 +88,6 @@
   </div>
 </template>
 
-
 <script>
 import { setColormap } from "../js/waterfallHandler";
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
diff --git a/freedata_gui/src/components/settings_hamlib.vue b/freedata_gui/src/components/settings_hamlib.vue
index 0517dc276..ba872b99c 100644
--- a/freedata_gui/src/components/settings_hamlib.vue
+++ b/freedata_gui/src/components/settings_hamlib.vue
@@ -33,9 +33,14 @@ const settings = ref({
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Rigctld IP
-      <span id="rigctldIpHelp" class="ms-2 badge bg-secondary text-wrap">
-        Enter the IP address of the rigctld server
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enter the IP address of the rigctld server"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="text"
@@ -43,7 +48,6 @@ const settings = ref({
       placeholder="Enter Rigctld IP"
       id="rigctldIp"
       aria-label="Rigctld IP"
-      aria-describedby="rigctldIpHelp"
       @change="onChange"
       v-model="settings.remote.RIGCTLD.ip"
     />
@@ -53,9 +57,14 @@ const settings = ref({
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Rigctld Port
-      <span id="rigctldPortHelp" class="ms-2 badge bg-secondary text-wrap">
-        Enter the port number of the rigctld server
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enter the port number of the rigctld server"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="number"
@@ -63,7 +72,6 @@ const settings = ref({
       placeholder="Enter Rigctld port"
       id="rigctldPort"
       aria-label="Rigctld Port"
-      aria-describedby="rigctldPortHelp"
       @change="onChange"
       v-model.number="settings.remote.RIGCTLD.port"
     />
@@ -73,9 +81,14 @@ const settings = ref({
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Rigctld VFO parameter
-      <span id="rigctldVfoHelp" class="ms-2 badge bg-secondary text-wrap">
-        Enable VFO support in rigctld
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enable VFO support in rigctld"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline">
@@ -83,7 +96,6 @@ const settings = ref({
           class="form-check-input"
           type="checkbox"
           id="enableVfoSwitch"
-          aria-describedby="rigctldVfoHelp"
           v-model="settings.remote.RIGCTLD.enable_vfo"
           @change="onChange"
         />
@@ -92,32 +104,30 @@ const settings = ref({
     </label>
   </div>
 
-  <hr class="m-2" />
-
   <!-- Conditional Section for Rigctld Bundle -->
   <div :class="settings.remote.RADIO.control == 'rigctld_bundle' ? '' : 'd-none'">
     <!-- Radio Model -->
     <div class="input-group input-group-sm mb-1">
       <label class="input-group-text w-50 text-wrap">
         Radio model
-        <span id="radioModelHelp" class="ms-2 badge bg-secondary text-wrap">
-          Select your radio model for rig control
-        </span>
+        <button
+          type="button"
+          class="btn btn-link p-0 ms-2"
+          data-bs-toggle="tooltip"
+          title="Select your radio model for rig control"
+        >
+          <i class="bi bi-question-circle"></i>
+        </button>
       </label>
       <select
         class="form-select form-select-sm w-50"
-        aria-label="Radio Model"
-        aria-describedby="radioModelHelp"
         id="radioModelSelect"
         @change="onChange"
         v-model.number="settings.remote.RADIO.model_id"
       >
         <option selected value="0">-- ignore --</option>
-        <!-- Include your list of radio models here -->
-        <!-- Example options -->
         <option value="2">Hamlib NET rigctl</option>
         <option value="2021">Elecraft K2</option>
-        <!-- ... -->
       </select>
     </div>
 
@@ -125,13 +135,17 @@ const settings = ref({
     <div class="input-group input-group-sm mb-1">
       <label class="input-group-text w-50 text-wrap">
         Radio port
-        <span id="radioPortHelp" class="ms-2 badge bg-secondary text-wrap">
-          Select the serial port connected to your radio
-        </span>
+        <button
+          type="button"
+          class="btn btn-link p-0 ms-2"
+          data-bs-toggle="tooltip"
+          title="Select the serial port connected to your radio"
+        >
+          <i class="bi bi-question-circle"></i>
+        </button>
       </label>
       <select
         class="form-select form-select-sm w-50"
-        aria-describedby="radioPortHelp"
         @change="onChange"
         v-model="settings.remote.RADIO.serial_port"
       >
@@ -149,233 +163,28 @@ const settings = ref({
     <div class="input-group input-group-sm mb-1">
       <label class="input-group-text w-50 text-wrap">
         Serial speed
-        <span id="serialSpeedHelp" class="ms-2 badge bg-secondary text-wrap">
-          Set the baud rate for serial communication
-        </span>
+        <button
+          type="button"
+          class="btn btn-link p-0 ms-2"
+          data-bs-toggle="tooltip"
+          title="Set the baud rate for serial communication"
+        >
+          <i class="bi bi-question-circle"></i>
+        </button>
       </label>
       <select
         class="form-select form-select-sm w-50"
-        aria-describedby="serialSpeedHelp"
         id="serialSpeedSelect"
         @change="onChange"
         v-model.number="settings.remote.RADIO.serial_speed"
       >
         <option selected value="0">-- ignore --</option>
-        <option value="1200">1200</option>
-        <option value="2400">2400</option>
-        <option value="4800">4800</option>
         <option value="9600">9600</option>
         <option value="19200">19200</option>
-        <option value="38400">38400</option>
-        <option value="57600">57600</option>
         <option value="115200">115200</option>
       </select>
     </div>
-
-    <!-- Data Bits -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        Data bits
-        <span id="dataBitsHelp" class="ms-2 badge bg-secondary text-wrap">
-          Choose the number of data bits
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="dataBitsHelp"
-        id="dataBitsSelect"
-        @change="onChange"
-        v-model.number="settings.remote.RADIO.data_bits"
-      >
-        <option selected value="0">-- ignore --</option>
-        <option value="7">7</option>
-        <option value="8">8</option>
-      </select>
-    </div>
-
-    <!-- Stop Bits -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        Stop bits
-        <span id="stopBitsHelp" class="ms-2 badge bg-secondary text-wrap">
-          Choose the number of stop bits
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="stopBitsHelp"
-        id="stopBitsSelect"
-        @change="onChange"
-        v-model.number="settings.remote.RADIO.stop_bits"
-      >
-        <option selected value="0">-- ignore --</option>
-        <option value="1">1</option>
-        <option value="2">2</option>
-      </select>
-    </div>
-
-    <!-- Serial Handshake -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        Serial handshake
-        <span id="serialHandshakeHelp" class="ms-2 badge bg-secondary text-wrap">
-          Set the serial handshake method
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="serialHandshakeHelp"
-        id="serialHandshakeSelect"
-        @change="onChange"
-        v-model="settings.remote.RADIO.serial_handshake"
-      >
-        <option selected value="ignore">-- ignore --</option>
-        <option value="None">None (Default)</option>
-        <!-- Add more options if needed -->
-      </select>
-    </div>
-
-    <!-- PTT Device Port -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        PTT device port
-        <span id="pttDevicePortHelp" class="ms-2 badge bg-secondary text-wrap">
-          Select the port used for PTT control
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="pttDevicePortHelp"
-        @change="onChange"
-        v-model="settings.remote.RADIO.ptt_port"
-      >
-        <option
-          v-for="device in serialStore.serialDevices"
-          :value="device.port"
-          :key="device.port"
-        >
-          {{ device.description }}
-        </option>
-      </select>
-    </div>
-
-    <!-- PTT Type -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        PTT type
-        <span id="pttTypeHelp" class="ms-2 badge bg-secondary text-wrap">
-          Select the method for PTT control
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="pttTypeHelp"
-        id="pttTypeSelect"
-        @change="onChange"
-        v-model="settings.remote.RADIO.ptt_type"
-      >
-        <option selected value="ignore">-- ignore --</option>
-        <option value="NONE">NONE</option>
-        <option value="RIG">RIG</option>
-        <option value="USB">USB</option>
-        <option value="RTS">Serial RTS</option>
-        <option value="PARALLEL">Rig PARALLEL</option>
-        <option value="MICDATA">Rig MICDATA</option>
-        <option value="CM108">Rig CM108</option>
-      </select>
-    </div>
-
-    <!-- DCD -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        DCD
-        <span id="dcdHelp" class="ms-2 badge bg-secondary text-wrap">
-          Select the Data Carrier Detect method
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="dcdHelp"
-        id="dcdSelect"
-        @change="onChange"
-        v-model="settings.remote.RADIO.serial_dcd"
-      >
-        <option selected value="ignore">-- ignore --</option>
-        <option value="NONE">NONE</option>
-        <option value="RIG">RIG/CAT</option>
-        <option value="DSR">DSR</option>
-        <option value="CTS">CTS</option>
-        <option value="CD">CD</option>
-        <option value="PARALLEL">PARALLEL</option>
-      </select>
-    </div>
-
-    <!-- DTR -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        DTR
-        <span id="dtrHelp" class="ms-2 badge bg-secondary text-wrap">
-          Set the DTR line state
-        </span>
-      </label>
-      <select
-        class="form-select form-select-sm w-50"
-        aria-describedby="dtrHelp"
-        id="dtrSelect"
-        @change="onChange"
-        v-model="settings.remote.RADIO.serial_dtr"
-      >
-        <option selected value="ignore">-- ignore --</option>
-        <option value="OFF">OFF</option>
-        <option value="ON">ON</option>
-      </select>
-    </div>
-
-    <!-- Rigctld Command -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        Rigctld command
-        <span id="rigctldCommandHelp" class="ms-2 badge bg-secondary text-wrap">
-          Auto-populated command based on settings
-        </span>
-      </label>
-      <input
-        type="text"
-        class="form-control"
-        id="rigctldCommand"
-        aria-label="Rigctld Command"
-        aria-describedby="rigctldCommandHelp"
-        disabled
-        placeholder="Auto-populated from above settings"
-      />
-      <button
-        class="btn btn-outline-secondary"
-        type="button"
-        id="btnHamlibCopyCommand"
-      >
-        <i id="btnHamlibCopyCommandBi" class="bi bi-clipboard"></i>
-      </button>
-    </div>
-
-    <!-- Rigctld Custom Arguments -->
-    <div class="input-group input-group-sm mb-1">
-      <label class="input-group-text w-50 text-wrap">
-        Rigctld custom arguments
-        <span id="rigctldArgsHelp" class="ms-2 badge bg-secondary text-wrap">
-          Additional arguments for rigctld (usually not needed)
-        </span>
-      </label>
-      <input
-        type="text"
-        class="form-control"
-        placeholder="Optional custom arguments"
-        id="rigctldCustomArgs"
-        aria-label="Rigctld Custom Arguments"
-        aria-describedby="rigctldArgsHelp"
-        @change="onChange"
-        v-model="settings.remote.RIGCTLD.arguments"
-      />
-    </div>
   </div>
 </template>
 
+
diff --git a/freedata_gui/src/components/settings_modem.vue b/freedata_gui/src/components/settings_modem.vue
index d36b40a95..0d3127f91 100644
--- a/freedata_gui/src/components/settings_modem.vue
+++ b/freedata_gui/src/components/settings_modem.vue
@@ -24,44 +24,57 @@ const audioStore = useAudioStore(pinia);
   </div>
 
   <!-- Start and Stop Modem Buttons -->
-  <div class="mb-2">
-    <button
-      type="button"
-      id="startModem"
-      class="btn btn-sm btn-outline-success"
-      data-bs-toggle="tooltip"
-      data-bs-trigger="hover"
-      data-bs-html="false"
-      title="Start the Modem. Please set your audio and radio settings first!"
-      @click="startModem"
-      :class="{ disabled: state.is_modem_running === true }"
-    >
-      <i class="bi bi-play-fill"></i>
-      <span class="ms-2">Start Modem</span>
-    </button>
-    <button
-      type="button"
-      id="stopModem"
-      class="btn btn-sm btn-outline-danger"
-      data-bs-toggle="tooltip"
-      data-bs-trigger="hover"
-      data-bs-html="false"
-      title="Stop the Modem."
-      @click="stopModem"
-      :class="{ disabled: state.is_modem_running === false }"
-    >
-      <i class="bi bi-stop-fill"></i>
-      <span class="ms-2">Stop Modem</span>
-    </button>
+  <div class="input-group input-group-sm mb-1">
+    <label class="input-group-text w-50 text-wrap">
+      Manual modem control
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Start or stop the modem. Ensure your audio and radio settings are configured first."
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
+    </label>
+    <div class="w-50 d-flex justify-content-between">
+      <button
+        type="button"
+        id="startModem"
+        class="btn btn-outline-success btn-sm w-50 me-1"
+        data-bs-toggle="tooltip"
+        title="Start the Modem"
+        @click="startModem"
+        :disabled="state.is_modem_running"
+      >
+        <i class="bi bi-play-fill"></i>
+        Start
+      </button>
+      <button
+        type="button"
+        id="stopModem"
+        class="btn btn-outline-danger btn-sm w-50 ms-1"
+        data-bs-toggle="tooltip"
+        title="Stop the Modem"
+        @click="stopModem"
+        :disabled="!state.is_modem_running"
+      >
+        <i class="bi bi-stop-fill"></i>
+        Stop
+      </button>
+    </div>
   </div>
-
   <!-- Modem Port -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Modem port
-      <span id="modemPortHelp" class="ms-2 badge bg-secondary text-wrap">
-        Server restart required
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Server restart required"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="number"
@@ -71,7 +84,6 @@ const audioStore = useAudioStore(pinia);
       maxlength="5"
       max="65534"
       min="1025"
-      aria-describedby="modemPortHelp"
       @change="onChange"
       v-model.number="settings.remote.NETWORK.modemport"
     />
@@ -81,14 +93,18 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Modem host
-      <span id="modemHostHelp" class="ms-2 badge bg-secondary text-wrap">
-        Server restart required
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Server restart required"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
       id="modem_host"
-      aria-describedby="modemHostHelp"
       @change="onChange"
       v-model="settings.remote.NETWORK.modemaddress"
     >
@@ -102,13 +118,17 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Audio Input device
-      <span id="audioInputHelp" class="ms-2 badge bg-secondary text-wrap">
-        Select your microphone or line-in device
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Select your microphone or line-in device"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
-      aria-describedby="audioInputHelp"
       @change="onChange"
       v-model="settings.remote.AUDIO.input_device"
     >
@@ -122,13 +142,17 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Audio Output device
-      <span id="audioOutputHelp" class="ms-2 badge bg-secondary text-wrap">
-        Select your speakers or output device
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Select your speakers or output device"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
-      aria-describedby="audioOutputHelp"
       @change="onChange"
       v-model="settings.remote.AUDIO.output_device"
     >
@@ -142,9 +166,14 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       RX Audio Level
-      <span id="rxAudioLevelHelp" class="ms-2 badge bg-secondary text-wrap">
-        Adjust to set the receive audio gain
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Adjust to set the receive audio gain"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <div class="input-group-text w-25">
       {{ settings.remote.AUDIO.rx_audio_level }}
@@ -157,7 +186,6 @@ const audioStore = useAudioStore(pinia);
         max="20"
         step="1"
         id="audioLevelRX"
-        aria-describedby="rxAudioLevelHelp"
         @change="onChange"
         v-model.number="settings.remote.AUDIO.rx_audio_level"
       />
@@ -168,9 +196,14 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       TX Audio Level
-      <span id="txAudioLevelHelp" class="ms-2 badge bg-secondary text-wrap">
-        Adjust to set the transmit audio gain
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Adjust to set the transmit audio gain"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <div class="input-group-text w-25">
       {{ settings.remote.AUDIO.tx_audio_level }}
@@ -183,7 +216,6 @@ const audioStore = useAudioStore(pinia);
         max="20"
         step="1"
         id="audioLevelTX"
-        aria-describedby="txAudioLevelHelp"
         @change="onChange"
         v-model.number="settings.remote.AUDIO.tx_audio_level"
       />
@@ -194,14 +226,18 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       TX delay in ms
-      <span id="txDelayHelp" class="ms-2 badge bg-secondary text-wrap">
-        Delay before transmitting, in milliseconds
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Delay before transmitting, in milliseconds"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
       id="tx_delay"
-      aria-describedby="txDelayHelp"
       @change="onChange"
       v-model.number="settings.remote.MODEM.tx_delay"
     >
@@ -233,14 +269,18 @@ const audioStore = useAudioStore(pinia);
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Maximum used bandwidth
-      <span id="maxBandwidthHelp" class="ms-2 badge bg-secondary text-wrap">
-        Select the maximum bandwidth the modem will use
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Select the maximum bandwidth the modem will use"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
       id="maximum_bandwidth"
-      aria-describedby="maxBandwidthHelp"
       @change="onChange"
       v-model.number="settings.remote.MODEM.maximum_bandwidth"
     >
@@ -252,3 +292,4 @@ const audioStore = useAudioStore(pinia);
   </div>
 </template>
 
+
diff --git a/freedata_gui/src/components/settings_rigcontrol.vue b/freedata_gui/src/components/settings_rigcontrol.vue
index 48a17ff36..57b3cf2ad 100644
--- a/freedata_gui/src/components/settings_rigcontrol.vue
+++ b/freedata_gui/src/components/settings_rigcontrol.vue
@@ -10,27 +10,32 @@
 
 
   <!-- Rig Control Selection -->
-  <div class="input-group input-group-sm mb-1">
-    <label class="input-group-text w-50 text-wrap">
-      Rig Control
-      <span id="rigControlHelp" class="ms-2 badge bg-secondary text-wrap">
-        Choose how the software controls your radio
-      </span>
-    </label>
-    <select
-      class="form-select form-select-sm w-50"
-      aria-describedby="rigControlHelp"
-      id="rigcontrol_radiocontrol"
-      @change="onChange"
-      v-model="settings.remote.RADIO.control"
+<div class="input-group mb-1">
+  <label class="input-group-text w-50 text-wrap">
+    Rig Control
+    <button
+      type="button"
+      class="btn btn-link p-0 ms-2"
+      data-bs-toggle="tooltip"
+      title="Choose how the software controls your radio"
     >
-      <option value="disabled">Disabled / VOX (no rig control - use with VOX)</option>
-      <option value="serial_ptt">Serial PTT via DTR/RTS</option>
-      <option value="rigctld">Rigctld (external Hamlib)</option>
-      <option value="rigctld_bundle">Rigctld (internal Hamlib)</option>
-      <option value="tci">TCI</option>
-    </select>
-  </div>
+      <i class="bi bi-question-circle"></i>
+    </button>
+  </label>
+  <select
+    class="form-select form-select-sm w-50"
+    id="rigcontrol_radiocontrol"
+    @change="onChange"
+    v-model="settings.remote.RADIO.control"
+  >
+    <option value="disabled">Disabled / VOX (no rig control - use with VOX)</option>
+    <option value="serial_ptt">Serial PTT via DTR/RTS</option>
+    <option value="rigctld">Rigctld (external Hamlib)</option>
+    <option value="rigctld_bundle">Rigctld (internal Hamlib)</option>
+    <option value="tci">TCI</option>
+  </select>
+</div>
+
 
   <hr class="m-2" />
 
@@ -77,7 +82,7 @@
   </nav>
 
   <!-- Tab Content -->
-  <div class="tab-content" id="nav-tabContent">
+  <div class="tab-content mt-2" id="nav-tabContent">
     <!-- Hamlib Settings -->
     <div
       class="tab-pane fade show active"
diff --git a/freedata_gui/src/components/settings_serial_ptt.vue b/freedata_gui/src/components/settings_serial_ptt.vue
index 884b688e0..350a4a5eb 100644
--- a/freedata_gui/src/components/settings_serial_ptt.vue
+++ b/freedata_gui/src/components/settings_serial_ptt.vue
@@ -1,16 +1,19 @@
 <template>
-
   <!-- PTT COM Port Selector -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       PTT COM port
-      <span id="pttComPortHelp" class="ms-2 badge bg-secondary text-wrap">
-        Select the COM port connected to your radio for PTT control
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Select the COM port connected to your radio for PTT control"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
-      aria-describedby="pttComPortHelp"
       @change="onChange"
       v-model="settings.remote.RADIO.ptt_port"
     >
@@ -28,14 +31,18 @@
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       PTT via DTR
-      <span id="pttDtrHelp" class="ms-2 badge bg-secondary text-wrap">
-        Configure DTR line behavior for PTT control
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Configure DTR line behavior for PTT control"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
       id="pttDtrSelect"
-      aria-describedby="pttDtrHelp"
       @change="onChange"
       v-model="settings.remote.RADIO.serial_dtr"
     >
@@ -49,14 +56,18 @@
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       PTT via RTS
-      <span id="pttRtsHelp" class="ms-2 badge bg-secondary text-wrap">
-        Configure RTS line behavior for PTT control
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Configure RTS line behavior for PTT control"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <select
       class="form-select form-select-sm w-50"
       id="pttRtsSelect"
-      aria-describedby="pttRtsHelp"
       @change="onChange"
       v-model="settings.remote.RADIO.serial_rts"
     >
@@ -67,6 +78,7 @@
   </div>
 </template>
 
+
 <script setup>
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 import { useSerialStore } from "../store/serialStore";
diff --git a/freedata_gui/src/components/settings_tci.vue b/freedata_gui/src/components/settings_tci.vue
index 5cdf685c9..6e12d8a3f 100644
--- a/freedata_gui/src/components/settings_tci.vue
+++ b/freedata_gui/src/components/settings_tci.vue
@@ -1,12 +1,16 @@
 <template>
-
   <!-- TCI IP Address Input -->
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       TCI IP Address
-      <span id="tciIpHelp" class="ms-2 badge bg-secondary text-wrap">
-        Enter the IP address of your TCI device
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enter the IP address of your TCI device"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="text"
@@ -14,7 +18,6 @@
       placeholder="Enter TCI IP Address"
       id="tciIpAddress"
       aria-label="TCI IP Address"
-      aria-describedby="tciIpHelp"
       @change="onChange"
       v-model="settings.remote.TCI.tci_ip"
     />
@@ -24,9 +27,14 @@
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       TCI Port
-      <span id="tciPortHelp" class="ms-2 badge bg-secondary text-wrap">
-        Enter the port number for TCI communication
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Enter the port number for TCI communication"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <input
       type="text"
@@ -34,7 +42,6 @@
       placeholder="Enter TCI Port"
       id="tciPort"
       aria-label="TCI Port"
-      aria-describedby="tciPortHelp"
       @change="onChange"
       v-model="settings.remote.TCI.tci_port"
     />
@@ -42,6 +49,7 @@
 </template>
 
 
+
 <script>
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 
diff --git a/freedata_gui/src/components/settings_web.vue b/freedata_gui/src/components/settings_web.vue
index bf77f758d..3ea4ff9f4 100644
--- a/freedata_gui/src/components/settings_web.vue
+++ b/freedata_gui/src/components/settings_web.vue
@@ -17,9 +17,14 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Explorer publishing
-      <span id="explorerPublishingHelp" class="ms-2 badge bg-secondary text-wrap">
-        Share your station's data with the Explorer network
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Share your station's data with the Explorer network"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline">
@@ -27,7 +32,6 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
           class="form-check-input"
           type="checkbox"
           id="ExplorerSwitch"
-          aria-describedby="explorerPublishingHelp"
           @change="onChange"
           v-model="settings.remote.STATION.enable_explorer"
         />
@@ -40,9 +44,14 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50 text-wrap">
       Explorer stats publishing
-      <span id="explorerStatsPublishingHelp" class="ms-2 badge bg-secondary text-wrap">
-        Share your station's statistics with the Explorer network
-      </span>
+      <button
+        type="button"
+        class="btn btn-link p-0 ms-2"
+        data-bs-toggle="tooltip"
+        title="Share your station's statistics with the Explorer network"
+      >
+        <i class="bi bi-question-circle"></i>
+      </button>
     </label>
     <label class="input-group-text w-50">
       <div class="form-check form-switch form-check-inline">
@@ -50,7 +59,6 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
           class="form-check-input"
           type="checkbox"
           id="ExplorerStatsSwitch"
-          aria-describedby="explorerStatsPublishingHelp"
           @change="onChange"
           v-model="settings.remote.STATION.enable_stats"
         />
@@ -60,3 +68,4 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
   </div>
 </template>
 
+