diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
index e8a3e668..e2c3c7f5 100644
--- a/webapp/src/locales/de.json
+++ b/webapp/src/locales/de.json
@@ -941,7 +941,8 @@
         "StopBatterySoCThreshold": "Laden bei SoC beenden",
         "StopBatterySoCThresholdHint": "Zur Verlängerung der Akku-Lebensdauer kann der Ladevorgang bei einem bestimmten SoC gestoppt werden.\nHinweis: Manche LiFePO-Akkus müssen gelegentlich voll geladen werden, um die SoC-Anzeige akkurat zu halten.",
         "Seconds": "@:base.Seconds",
-        "EnableEmergencyCharge": "Notfallladen: Batterie wird mit maximaler Leistung geladen wenn durch das Batterie BMS angefordert",
+        "EnableEmergencyCharge": "Notfallladen",
+        "EnableEmergencyChargeHint": "Batterie wird mit maximaler Leistung geladen wenn durch das Batterie BMS angefordert",
         "targetPowerConsumption": "Angestrebter Netzbezug",
         "targetPowerConsumptionHint": "Bei postiven Werten wird die eingestellte Leistung aus dem Stromnetz bezogen. Bei negativen Werten wird das Netzteil vorzeitig abgeschaltet."
     },
diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
index d5a6f5f3..fb76b2df 100644
--- a/webapp/src/locales/en.json
+++ b/webapp/src/locales/en.json
@@ -945,7 +945,8 @@
         "StopBatterySoCThreshold": "Stop charging at SoC",
         "StopBatterySoCThresholdHint": "To prolong the battery's lifespan, charging can be stopped at a certain SoC level.\nHint: In order to keep the SoC reading accurate, some LiFePO cells must be charged to full capacity regularly.",
         "Seconds": "@:base.Seconds",
-        "EnableEmergencyCharge": "Emergency charge. Battery charged with maximum power if requested by Battery BMS",
+        "EnableEmergencyCharge": "Emergency charge",
+        "EnableEmergencyChargeHint": "Battery charged with maximum power if requested by Battery BMS",
         "targetPowerConsumption": "Target power consumption",
         "targetPowerConsumptionHint": "Postitive values use grid power to charge the battery. Negative values result in early shutdown"
     },
diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
index f66297a7..4ff30aa3 100644
--- a/webapp/src/locales/fr.json
+++ b/webapp/src/locales/fr.json
@@ -891,7 +891,8 @@
         "StopBatterySoCThreshold": "Stop charging at SoC",
         "StopBatterySoCThresholdHint": "To prolong the battery's lifespan, charging can be stopped at a certain SoC level.\nHint: In order to keep the SoC reading accurate, some LiFePO cells must be charged to full capacity regularly.",
         "Seconds": "@:base.Seconds",
-        "EnableEmergencyCharge": "Emergency charge. Battery charged with maximum power if requested by Battery BMS",
+        "EnableEmergencyCharge": "Emergency charge",
+        "EnableEmergencyChargeHint": "Battery charged with maximum power if requested by Battery BMS",
         "targetPowerConsumption": "Target power consumption",
         "targetPowerConsumptionHint": "Postitive values use grid power to charge the battery. Negative values result in early shutdown"
     },
diff --git a/webapp/src/views/AcChargerAdminView.vue b/webapp/src/views/AcChargerAdminView.vue
index 8b2fa911..44193bcf 100644
--- a/webapp/src/views/AcChargerAdminView.vue
+++ b/webapp/src/views/AcChargerAdminView.vue
@@ -55,152 +55,98 @@
 
                     <InputElement
                         :label="$t('acchargeradmin.EnableEmergencyCharge')"
+                        :tooltip="$t('acchargeradmin.EnableEmergencyChargeHint')"
                         v-model="acChargerConfigList.emergency_charge_enabled"
                         type="checkbox"
                         wide
                     />
                 </template>
+            </CardElement>
 
-                <CardElement
-                    :text="$t('acchargeradmin.Limits')"
-                    textVariant="text-bg-primary"
-                    add-space
-                    v-if="acChargerConfigList.auto_power_enabled || acChargerConfigList.emergency_charge_enabled"
-                >
-                    <div class="row mb-3">
-                        <label for="voltageLimit" class="col-sm-2 col-form-label"
-                            >{{ $t('acchargeradmin.VoltageLimit') }}
-                            <BIconInfoCircle v-tooltip :title="$t('acchargeradmin.stopVoltageLimitHint')" />
-                        </label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    step="0.01"
-                                    class="form-control"
-                                    id="voltageLimit"
-                                    placeholder="42"
-                                    v-model="acChargerConfigList.voltage_limit"
-                                    aria-describedby="voltageLimitDescription"
-                                    min="42"
-                                    max="58.5"
-                                    required
-                                />
-                                <span class="input-group-text" id="voltageLimitDescription">V</span>
-                            </div>
-                        </div>
-                        <label for="enableVoltageLimit" class="col-sm-2 col-form-label"
-                            >{{ $t('acchargeradmin.enableVoltageLimit') }}
-                            <BIconInfoCircle v-tooltip :title="$t('acchargeradmin.enableVoltageLimitHint')" />
-                        </label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    step="0.01"
-                                    class="form-control"
-                                    id="enableVoltageLimit"
-                                    placeholder="42"
-                                    v-model="acChargerConfigList.enable_voltage_limit"
-                                    aria-describedby="enableVoltageLimitDescription"
-                                    min="42"
-                                    max="58.5"
-                                    required
-                                />
-                                <span class="input-group-text" id="enableVoltageLimitDescription">V</span>
-                            </div>
-                        </div>
-                        <label for="lowerPowerLimit" class="col-sm-2 col-form-label">{{
-                            $t('acchargeradmin.lowerPowerLimit')
-                        }}</label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    class="form-control"
-                                    id="lowerPowerLimit"
-                                    placeholder="150"
-                                    v-model="acChargerConfigList.lower_power_limit"
-                                    aria-describedby="lowerPowerLimitDescription"
-                                    min="50"
-                                    max="3000"
-                                    required
-                                />
-                                <span class="input-group-text" id="lowerPowerLimitDescription">W</span>
-                            </div>
-                        </div>
-                        <label for="upperPowerLimit" class="col-sm-2 col-form-label"
-                            >{{ $t('acchargeradmin.upperPowerLimit') }}
-                            <BIconInfoCircle v-tooltip :title="$t('acchargeradmin.upperPowerLimitHint')" />
-                        </label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    class="form-control"
-                                    id="upperPowerLimit"
-                                    placeholder="2000"
-                                    v-model="acChargerConfigList.upper_power_limit"
-                                    aria-describedby="upperPowerLimitDescription"
-                                    min="100"
-                                    max="3000"
-                                    required
-                                />
-                                <span class="input-group-text" id="upperPowerLimitDescription">W</span>
-                            </div>
-                        </div>
-                        <label for="targetPowerConsumption" class="col-sm-2 col-form-label"
-                            >{{ $t('acchargeradmin.targetPowerConsumption') }}
-                            <BIconInfoCircle v-tooltip :title="$t('acchargeradmin.targetPowerConsumptionHint')" />
-                        </label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    class="form-control"
-                                    id="targetPowerConsumption"
-                                    placeholder="0"
-                                    v-model="acChargerConfigList.target_power_consumption"
-                                    aria-describedby="targetPowerConsumptionDescription"
-                                    required
-                                />
-                                <span class="input-group-text" id="targetPowerConsumptionDescription">W</span>
-                            </div>
-                        </div>
-                    </div>
-                </CardElement>
-                <CardElement
-                    :text="$t('acchargeradmin.BatterySoCLimits')"
-                    textVariant="text-bg-primary"
-                    add-space
-                    v-if="
-                        acChargerConfigList.auto_power_enabled &&
-                        acChargerConfigList.auto_power_batterysoc_limits_enabled
-                    "
-                >
-                    <div class="row mb-3">
-                        <label for="stopBatterySoCThreshold" class="col-sm-2 col-form-label"
-                            >{{ $t('acchargeradmin.StopBatterySoCThreshold') }}
-                            <BIconInfoCircle v-tooltip :title="$t('acchargeradmin.StopBatterySoCThresholdHint')" />
-                        </label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <input
-                                    type="number"
-                                    class="form-control"
-                                    id="stopBatterySoCThreshold"
-                                    placeholder="95"
-                                    v-model="acChargerConfigList.stop_batterysoc_threshold"
-                                    aria-describedby="stopBatterySoCThresholdDescription"
-                                    min="2"
-                                    max="99"
-                                    required
-                                />
-                                <span class="input-group-text" id="stopBatterySoCThresholdDescription">%</span>
-                            </div>
-                        </div>
-                    </div>
-                </CardElement>
+            <CardElement
+                :text="$t('acchargeradmin.Limits')"
+                textVariant="text-bg-primary"
+                add-space
+                v-if="acChargerConfigList.auto_power_enabled || acChargerConfigList.emergency_charge_enabled"
+            >
+                <InputElement
+                    :label="$t('acchargeradmin.VoltageLimit')"
+                    :tooltip="$t('acchargeradmin.stopVoltageLimitHint')"
+                    v-model="acChargerConfigList.voltage_limit"
+                    postfix="V"
+                    type="number"
+                    wide
+                    required
+                    step="0.01"
+                    min="42"
+                    max="58.5"
+                />
+
+                <InputElement
+                    :label="$t('acchargeradmin.enableVoltageLimit')"
+                    :tooltip="$t('acchargeradmin.enableVoltageLimitHint')"
+                    v-model="acChargerConfigList.enable_voltage_limit"
+                    postfix="V"
+                    type="number"
+                    wide
+                    required
+                    step="0.01"
+                    min="42"
+                    max="58.5"
+                />
+
+                <InputElement
+                    :label="$t('acchargeradmin.lowerPowerLimit')"
+                    v-model="acChargerConfigList.lower_power_limit"
+                    postfix="W"
+                    type="number"
+                    wide
+                    required
+                    min="50"
+                    max="3000"
+                />
+
+                <InputElement
+                    :label="$t('acchargeradmin.upperPowerLimit')"
+                    :tooltip="$t('acchargeradmin.upperPowerLimitHint')"
+                    v-model="acChargerConfigList.upper_power_limit"
+                    postfix="W"
+                    type="number"
+                    wide
+                    required
+                    min="100"
+                    max="3000"
+                />
+
+                <InputElement
+                    :label="$t('acchargeradmin.targetPowerConsumption')"
+                    :tooltip="$t('acchargeradmin.targetPowerConsumptionHint')"
+                    v-model="acChargerConfigList.target_power_consumption"
+                    postfix="W"
+                    type="number"
+                    wide
+                    required
+                />
+            </CardElement>
+            <CardElement
+                :text="$t('acchargeradmin.BatterySoCLimits')"
+                textVariant="text-bg-primary"
+                add-space
+                v-if="
+                    acChargerConfigList.auto_power_enabled && acChargerConfigList.auto_power_batterysoc_limits_enabled
+                "
+            >
+                <InputElement
+                    :label="$t('acchargeradmin.StopBatterySoCThreshold')"
+                    :tooltip="$t('acchargeradmin.StopBatterySoCThresholdHint')"
+                    v-model="acChargerConfigList.stop_batterysoc_threshold"
+                    postfix="%"
+                    type="number"
+                    wide
+                    required
+                    min="2"
+                    max="99"
+                />
             </CardElement>
 
             <FormFooter @reload="getChargerConfig" />
@@ -214,7 +160,6 @@ import BootstrapAlert from '@/components/BootstrapAlert.vue';
 import CardElement from '@/components/CardElement.vue';
 import FormFooter from '@/components/FormFooter.vue';
 import InputElement from '@/components/InputElement.vue';
-import { BIconInfoCircle } from 'bootstrap-icons-vue';
 import type { AcChargerConfig } from '@/types/AcChargerConfig';
 import { authHeader, handleResponse } from '@/utils/authentication';
 import { defineComponent } from 'vue';
@@ -226,7 +171,6 @@ export default defineComponent({
         CardElement,
         FormFooter,
         InputElement,
-        BIconInfoCircle,
     },
     data() {
         return {