diff --git a/assets/js/components/BatterySettingsModal.vue b/assets/js/components/BatterySettingsModal.vue
index ed8816d87..54b9fe79d 100644
--- a/assets/js/components/BatterySettingsModal.vue
+++ b/assets/js/components/BatterySettingsModal.vue
@@ -216,10 +216,11 @@
 										</small>
 									</span>
 								</p>
-								<p>
-									<small>
-										{{ $t("batterySettings.note") }}
-									</small>
+								<p class="small text-muted">
+									<strong class="text-evcc">
+										{{ $t("batterySettings.disclaimerHint") }}
+									</strong>
+									{{ $t("batterySettings.disclaimerText") }}
 								</p>
 							</div>
 						</div>
diff --git a/assets/js/components/ChargingPlanArrival.vue b/assets/js/components/ChargingPlanArrival.vue
index a7a5b7276..a42f09e5c 100644
--- a/assets/js/components/ChargingPlanArrival.vue
+++ b/assets/js/components/ChargingPlanArrival.vue
@@ -1,7 +1,4 @@
 <template>
-	<div v-if="!socBasedCharging" class="alert alert-secondary my-4" role="alert">
-		{{ $t("main.loadpointSettings.onlyForSocBasedCharging") }}
-	</div>
 	<div class="mt-4 container">
 		<div class="row">
 			<div class="col-6 col-lg-3 col-form-label">
@@ -50,6 +47,12 @@
 			</small>
 		</div>
 	</div>
+	<div v-if="!socBasedCharging" class="mx-2 small text-muted">
+		<strong class="text-evcc">
+			{{ $t("main.loadpointSettings.disclaimerHint") }}
+		</strong>
+		{{ $t("main.loadpointSettings.onlyForSocBasedCharging") }}
+	</div>
 </template>
 
 <script>
diff --git a/i18n/bg.toml b/i18n/bg.toml
index 4049e4422..51f9094d6 100644
--- a/i18n/bg.toml
+++ b/i18n/bg.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Батерия %"
 capacity = "{energy} от {total}"
+disclaimerHint = "Бележка:"
+disclaimerText = "Тези настройки важат само за режим на работа използвайки енергия от фотоволтаици. Зареждането ще бъде настроено спрямо тях"
 legendBottomName = "приоритизиране на дом"
 legendBottomSubline = "не се използва за зареждане"
 legendMiddleName = "приоритизиране на кола"
@@ -10,7 +12,6 @@ legendTopAutostart = "автоматично стартиране"
 legendTopName = "зареждане използвайки батерия"
 legendTopSubline = "без прекъсвания"
 modalTitle = "Настройки на батерия"
-note = "Бележка: Тези настройки важат само за режим на работа използвайки енергия от фотоволтаици. Зареждането ще бъде настроено спрямо тях"
 
 [batterySettings.bufferStart]
 full = "при почти заредена батерия"
diff --git a/i18n/ca.toml b/i18n/ca.toml
index 29c93c7ee..a4a22980d 100644
--- a/i18n/ca.toml
+++ b/i18n/ca.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Nivell de bateria"
 capacity = "{energy} de {total}"
+disclaimerHint = "Nota:"
+disclaimerText = "aquests paràmetres només afecten el mode solar. El comportament de càrrega s'ajusta en conseqüència."
 legendBottomName = "prioritat de la casa"
 legendBottomSubline = "no utilitzat per carregar"
 legendMiddleName = "primer, el vehicle"
@@ -10,7 +12,6 @@ legendTopAutostart = "s'inicia automaticament"
 legendTopName = "càrrega soportada per bateria"
 legendTopSubline = "sensa interrupcions"
 modalTitle = "Configuració bateria"
-note = "Nota: aquests paràmetres només afecten el mode solar. El comportament de càrrega s'ajusta en conseqüència."
 
 [batterySettings.bufferStart]
 full = "quan gairebé ple"
diff --git a/i18n/cs.toml b/i18n/cs.toml
index fd86d4fa7..3408a4820 100644
--- a/i18n/cs.toml
+++ b/i18n/cs.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Nabití baterie"
 capacity = "{energy} z {total}"
+disclaimerHint = "Poznámka:"
+disclaimerText = "Tato nastavení ovlivňují pouze solární režim. Chování dobíjení je příslušně upraveno."
 legendBottomName = "dom má přednost"
 legendBottomSubline = "nepoužito pro dobíjení"
 legendMiddleName = "nejdříve vozidlo"
@@ -10,7 +12,6 @@ legendTopAutostart = "startuje automaticky"
 legendTopName = "dobíjení podporované baterií"
 legendTopSubline = "bez přerušování"
 modalTitle = "Nastavení baterie"
-note = "Poznámka: Tato nastavení ovlivňují pouze solární režim. Chování dobíjení je příslušně upraveno."
 
 [batterySettings.bufferStart]
 full = "když je skoro plná"
diff --git a/i18n/da.toml b/i18n/da.toml
index 39ac4ef46..6a250c6e8 100644
--- a/i18n/da.toml
+++ b/i18n/da.toml
@@ -3,6 +3,8 @@ batteryLevel = "Batteriniveau"
 capacity = "{energy} af {total}"
 control = "Batteri indstillinger"
 discharge = "Forhindrer afladning ved planlagt opladning og i hurtig mode"
+disclaimerHint = "OBS:"
+disclaimerText = "Disse indstillinger gælder kun for solar modus. Indstillingerne ændres tilsvarende."
 legendBottomName = "Prioritér hjemmet"
 legendBottomSubline = "Anvendes ikke til opladning"
 legendMiddleName = "Køretøj først"
@@ -13,7 +15,6 @@ legendTopName = "batteri understøttet opladning"
 legendTopSubline = "uden afbrydelser"
 modalTitle = "batteri indstillinger"
 notControllable = "Indstilling af batteriet er ikke mulig for dette batteri"
-note = "OBS: Disse indstillinger gælder kun for solar modus. Indstillingerne ændres tilsvarende."
 
 [batterySettings.bufferStart]
 full = "næsten fyldt"
diff --git a/i18n/de.toml b/i18n/de.toml
index 88b4f5854..1e7ba4f24 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -3,17 +3,18 @@ batteryLevel = "Ladestand"
 capacity = "{energy} von {total}"
 control = "Batteriesteuerung"
 discharge = "Verhindere Entladung im Schnell-Modus und bei geplantem Laden."
+disclaimerHint = "Hinweis:"
+disclaimerText = "Nur relevant im PV-Modus. Das Ladeverhalten wird entsprechend angepasst."
 legendBottomName = "Haus hat Priorität"
 legendBottomSubline = "nicht zum Laden verwenden"
 legendMiddleName = "Fahrzeug zuerst"
 legendMiddleSubline = "dann das Haus"
 legendTitle = "Wie soll Sonnenstrom genutzt werden?"
 legendTopAutostart = "startet automatisch"
-legendTopName = "batterieunterstütztes Laden"
+legendTopName = "Batterieunterstütztes Laden"
 legendTopSubline = "ohne Unterbrechungen"
 modalTitle = "Batterieeinstellungen"
 notControllable = "Batteriesteuerung ist für diesen Speicher nicht verfügbar."
-note = "Hinweis: Nur relevant im PV-Modus. Das Ladeverhalten wird entsprechend angepasst."
 
 [batterySettings.bufferStart]
 full = "wenn fast voll"
diff --git a/i18n/en.toml b/i18n/en.toml
index d8590900c..672831014 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -3,6 +3,8 @@ batteryLevel = "Battery level"
 capacity = "{energy} of {total}"
 control = "Battery control"
 discharge = "Prevent discharge in fast mode and planned charging."
+disclaimerHint = "Note:"
+disclaimerText = "These settings only affect solar mode. Charging behaviour is adjusted accordingly."
 legendBottomName = "home priority"
 legendBottomSubline = "not used for charging"
 legendMiddleName = "vehicle first"
@@ -13,7 +15,6 @@ legendTopName = "battery supported charging"
 legendTopSubline = "without interruptions"
 modalTitle = "Battery settings"
 notControllable = "Battery control is not available for this battery."
-note = "Note: These settings only affect the solar mode. Charging behaviour is adjusted accordingly."
 
 [batterySettings.bufferStart]
 full = "when nearly full"
diff --git a/i18n/es.toml b/i18n/es.toml
index 77eaedf24..8dd51b972 100644
--- a/i18n/es.toml
+++ b/i18n/es.toml
@@ -3,6 +3,8 @@ batteryLevel = "Nivel de bateria"
 capacity = "{energy} de {total}"
 control = "Control de la batería"
 discharge = "Evitar la descarga en modo rápido y la carga planificada"
+disclaimerHint = "Nota:"
+disclaimerText = "Estos parámetros solo afectan al modo solar. El comportamiento de carga se ajusta correspondientemente."
 legendBottomName = "prioridad de la casa"
 legendBottomSubline = "no se usa para la carga"
 legendMiddleName = "primero el vehículo"
@@ -13,7 +15,6 @@ legendTopName = "carga soportada por bateria"
 legendTopSubline = "sin interrupciones"
 modalTitle = "Configuración de batería"
 notControllable = "El control de la batería no está disponible para esta batería"
-note = "Nota: Estos parámetros solo afectan al modo solar. El comportamiento de carga se ajusta correspondientemente."
 
 [batterySettings.bufferStart]
 full = "cuando está casi llena"
diff --git a/i18n/fi.toml b/i18n/fi.toml
index 5106ef18d..1c44bf27f 100644
--- a/i18n/fi.toml
+++ b/i18n/fi.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Akun varaustaso"
 capacity = "{energy} / {total}"
+disclaimerHint = "Huomaa:"
+disclaimerText = "Nämä asetukset vaikuttavat vain aurinkotilaan. Latauskäyttäytymistä säädetään vastaavasti."
 legendBottomName = "talo on etusijalla"
 legendBottomSubline = "ei käytetty lataamiseen"
 legendMiddleName = "ajoneuvo ensin"
@@ -10,7 +12,6 @@ legendTopAutostart = "alkaa automaattisesti"
 legendTopName = "akkutuettu lataus"
 legendTopSubline = "keskeytyksettä"
 modalTitle = "Akun asetukset"
-note = "Huomaa: Nämä asetukset vaikuttavat vain aurinkotilaan. Latauskäyttäytymistä säädetään vastaavasti."
 
 [batterySettings.bufferStart]
 full = "kun melkein täynnä"
diff --git a/i18n/fr.toml b/i18n/fr.toml
index 63b0997b8..02226d7a9 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Niveau de la batterie"
 capacity = "{energy} sur {total}"
+disclaimerHint = "NB :"
+disclaimerText = "ces réglages n'affectent que le mode solaire. Le comportement de charge est adapté en conséquence."
 legendBottomName = "priorité maison"
 legendBottomSubline = "pas utilisé pour la recharge"
 legendMiddleName = "véhicule en premier"
@@ -10,7 +12,6 @@ legendTopAutostart = "démarre automatiquement"
 legendTopName = "recharge soutenue par la batterie"
 legendTopSubline = "sans interruption"
 modalTitle = "Réglages de la batterie"
-note = "NB : ces réglages n'affectent que le mode solaire. Le comportement de charge est adapté en conséquence."
 
 [batterySettings.bufferStart]
 full = "quand presque pleine"
diff --git a/i18n/hr.toml b/i18n/hr.toml
index 3c6c46c3f..0fbca8983 100644
--- a/i18n/hr.toml
+++ b/i18n/hr.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Razina baterije"
 capacity = "{energy} od {total}"
+disclaimerHint = "Napomena:"
+disclaimerText = "Ove postavke utječu samo na solarni modus. Napajanje se prilagođava u skladu s tim."
 legendBottomName = "kuća ima prioritet"
 legendBottomSubline = "ne koristi se za napajanje"
 legendMiddleName = "najprije vozilo"
@@ -10,7 +12,6 @@ legendTopAutostart = "počinje automatski"
 legendTopName = "podržano baterijsko napajanje"
 legendTopSubline = "bez prekida"
 modalTitle = "Postavke baterije"
-note = "Napomena: Ove postavke utječu samo na solarni modus. Napajanje se prilagođava u skladu s tim."
 
 [batterySettings.bufferStart]
 full = "kad je skoro pun"
diff --git a/i18n/lt.toml b/i18n/lt.toml
index 89242b9e3..3adda7656 100644
--- a/i18n/lt.toml
+++ b/i18n/lt.toml
@@ -3,6 +3,8 @@ batteryLevel = "Kaupiklio įkrova"
 capacity = "{energy} iš {total}"
 control = "Kaupiklio valdymas"
 discharge = "Neleisti kaupiklio iškrovimo režime Greitas ir planiniame įkrovime."
+disclaimerHint = "Pastaba:"
+disclaimerText = "Šie nustatymai paveikia tik įkrovimą Saulė. Įkrovimo algoritmas atitinkamai pakeičiamas."
 legendBottomName = "namo pirmumas"
 legendBottomSubline = "nenaudojama įkrovimui"
 legendMiddleName = "pirmiau automobilis"
@@ -13,7 +15,6 @@ legendTopName = "kaupiklis padeda įkrauti"
 legendTopSubline = "be pertraukų"
 modalTitle = "Kaupiklio nustatymai"
 notControllable = "Šiam kaupikliui valdymo nėra."
-note = "Pastaba: Šie nustatymai paveikia tik įkrovimą Saulė. Įkrovimo algoritmas atitinkamai pakeičiamas."
 
 [batterySettings.bufferStart]
 full = "kai beveik pilnas"
diff --git a/i18n/nl.toml b/i18n/nl.toml
index 44668a575..d7ea44a1b 100644
--- a/i18n/nl.toml
+++ b/i18n/nl.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Batterij-niveau"
 capacity = "{energy} van {total}"
+disclaimerHint = "Opgelet:"
+disclaimerText = "Deze instellingen beïnvloeden enkel de zonnemodus. Oplaadgedrag wordt overeenkomstig aangepast."
 legendBottomName = "huis heeft prioriteit"
 legendBottomSubline = "niet gebruikt voor opladen"
 legendMiddleName = "eerst voertuig"
@@ -10,7 +12,6 @@ legendTopAutostart = "start automatisch"
 legendTopName = "batterij-ondersteund opladen"
 legendTopSubline = "zonder onderbrekingen"
 modalTitle = "Batterij-instellingen"
-note = "Opgelet: Deze instellingen beïnvloeden enkel de zonnemodus. Oplaadgedrag wordt overeenkomstig aangepast."
 
 [batterySettings.bufferStart]
 full = "als bijna vol"
diff --git a/i18n/no.toml b/i18n/no.toml
index 579152696..f01c38406 100644
--- a/i18n/no.toml
+++ b/i18n/no.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Ladenivå"
 capacity = "{energy} av {total}"
+disclaimerHint = "Merk:"
+disclaimerText = "Kun relevant i PV-modus. Ladeadferden justeres deretter."
 legendBottomName = "Hjemmelading har prioritet"
 legendBottomSubline = "ikke bruk til lading"
 legendMiddleName = "kjøretøy først"
@@ -10,7 +12,6 @@ legendTopAutostart = "starter automatisk"
 legendTopName = "batteriassistert lading"
 legendTopSubline = "uten avbrudd"
 modalTitle = "Batteriinnstillinger"
-note = "Merk: Kun relevant i PV-modus. Ladeadferden justeres deretter."
 
 [batterySettings.bufferStart]
 full = "når det er nesten fullt"
diff --git a/i18n/pl.toml b/i18n/pl.toml
index 1605ee569..de08a7de8 100644
--- a/i18n/pl.toml
+++ b/i18n/pl.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Poziom baterii"
 capacity = "{energy} z {total}"
+disclaimerHint = "Uwaga:"
+disclaimerText = "te ustawienia mają wpływ tylko na tryb solarny. Sposób ładowania jest odpowiednio dostosowywany."
 legendBottomName = "priorytet domu"
 legendBottomSubline = "nie używany do ładowania"
 legendMiddleName = "pojazd najpierw"
@@ -10,7 +12,6 @@ legendTopAutostart = "uruchamia się automatycznie"
 legendTopName = "ładowanie wspomagane bateryjnie"
 legendTopSubline = "bez przerw"
 modalTitle = "Ustawienia baterii"
-note = "Uwaga: te ustawienia mają wpływ tylko na tryb solarny. Sposób ładowania jest odpowiednio dostosowywany."
 
 [batterySettings.bufferStart]
 full = "kiedy prawie pełny"
diff --git a/i18n/pt.toml b/i18n/pt.toml
index 766f4858d..214f110ae 100644
--- a/i18n/pt.toml
+++ b/i18n/pt.toml
@@ -3,6 +3,8 @@ batteryLevel = "Nível da bateria"
 capacity = "{energy} de {total}"
 control = "Controle de bateria"
 discharge = "Prevenir a descarga no modo rápido e o carregamento planejado."
+disclaimerHint = "Nota:"
+disclaimerText = "Estas configurações só afetam o modo solar. O comportamento de carregamento é ajustado de acordo."
 legendBottomName = "prioridade doméstica"
 legendBottomSubline = "não usado para carregar"
 legendMiddleName = "veículo primeiro"
@@ -13,7 +15,6 @@ legendTopName = "carregamento suportado por bateria"
 legendTopSubline = "sem interrupções"
 modalTitle = "Configuraçao da bateria"
 notControllable = "O controle de bateria não está disponível para esta bateria."
-note = "Nota: Estas configurações só afetam o modo solar. O comportamento de carregamento é ajustado de acordo."
 
 [batterySettings.bufferStart]
 full = "quando quase cheio"
diff --git a/i18n/ro.toml b/i18n/ro.toml
index 8f8d2a34b..71c14cb4d 100644
--- a/i18n/ro.toml
+++ b/i18n/ro.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Nivelul bateriei"
 capacity = "{energy} din {total}"
+disclaimerHint = "Nota:"
+disclaimerText = "Aceste setari afecteaza doar modul solar. Procesul de incarcare este ajustat corespunzator"
 legendBottomName = "prioritate casa"
 legendBottomSubline = "neutilizat pentru incarcare"
 legendMiddleName = "in primul rand vehiculul"
@@ -10,7 +12,6 @@ legendTopAutostart = "porneste automat"
 legendTopName = "Incarcare ajutata de baterie"
 legendTopSubline = "fara intreruperi"
 modalTitle = "Setari baterie"
-note = "Nota: Aceste setari afecteaza doar modul solar. Procesul de incarcare este ajustat corespunzator"
 
 [batterySettings.bufferStart]
 full = "cand este aproape plin"
diff --git a/i18n/ru.toml b/i18n/ru.toml
index 7bb55ae2a..29857030e 100644
--- a/i18n/ru.toml
+++ b/i18n/ru.toml
@@ -3,6 +3,8 @@ batteryLevel = "Уровень заряда батареи"
 capacity = "{energy} из {total}"
 control = "Управление батареей"
 discharge = "Предотвратить разряд в быстром режиме и запланированной зарядке."
+disclaimerHint = "Примечание:"
+disclaimerText = "Эти настройки влияют только на режим солнечной батареи. Поведение зарядки изменяется соответствующе."
 legendBottomName = "домашний приоритет"
 legendBottomSubline = "не используется для зарядки"
 legendMiddleName = "сначала автомобиль"
@@ -13,7 +15,6 @@ legendTopName = "зарядка с поддержкой от аккумулят
 legendTopSubline = "без перебоев"
 modalTitle = "Настройки батареи"
 notControllable = "Управление батарей недоступно для этой батареи"
-note = "Примечание: Эти настройки влияют только на режим солнечной батареи. Поведение зарядки изменяется соответствующе."
 
 [batterySettings.bufferStart]
 full = "когда почти полная"
diff --git a/i18n/sl.toml b/i18n/sl.toml
index 94e193d45..878366d6f 100644
--- a/i18n/sl.toml
+++ b/i18n/sl.toml
@@ -3,6 +3,8 @@ batteryLevel = "Raven baterije"
 capacity = "{energy} od {total}"
 control = "Nadzor baterije"
 discharge = "Preprečite praznjenje v hitrem načinu in načrtovano polnjenje."
+disclaimerHint = "Opomba:"
+disclaimerText = "Te nastavitve vplivajo samo na solarni način. Obnašanje pri polnjenju je ustrezno prilagojeno."
 legendBottomName = "domača prednost"
 legendBottomSubline = "se ne uporablja za polnjenje"
 legendMiddleName = "najprej vozilo"
@@ -13,7 +15,6 @@ legendTopName = "polnjenje, ki ga podpira baterija"
 legendTopSubline = "brez prekinitev"
 modalTitle = "Nastavitve baterije"
 notControllable = "Nadzor baterije ni na voljo za to baterijo."
-note = "Opomba: Te nastavitve vplivajo samo na solarni način. Obnašanje pri polnjenju je ustrezno prilagojeno."
 
 [batterySettings.bufferStart]
 full = "ko je skoraj poln"
diff --git a/i18n/sv.toml b/i18n/sv.toml
index 87d1e3a92..d1074079c 100644
--- a/i18n/sv.toml
+++ b/i18n/sv.toml
@@ -3,6 +3,8 @@ batteryLevel = "Batterinivå"
 capacity = "{energy} av {total}"
 control = "Batteriinställningar"
 discharge = "Förhindra urladdning i snabbt läge och vid schemalagd laddning."
+disclaimerHint = "OBS:"
+disclaimerText = "Inställningarna gäller enbart sol-läge. Laddning justeras därefter"
 legendBottomName = "Prioritera hem"
 legendBottomSubline = "används inte till laddning"
 legendMiddleName = "fordon först"
@@ -13,7 +15,6 @@ legendTopName = "laddning med batteristöd"
 legendTopSubline = "utan avbrott"
 modalTitle = "Batteriinställningar"
 notControllable = "Inställning ej möjligt för detta batteri"
-note = "OBS: Inställningarna gäller enbart sol-läge. Laddning justeras därefter"
 
 [batterySettings.bufferStart]
 full = "när det är nästan fullt"
diff --git a/i18n/uk.toml b/i18n/uk.toml
index 8cef343f5..2a09796ae 100644
--- a/i18n/uk.toml
+++ b/i18n/uk.toml
@@ -1,6 +1,8 @@
 [batterySettings]
 batteryLevel = "Рівень заряду батареї"
 capacity = "{energy} із {total}"
+disclaimerHint = "Примітка:"
+disclaimerText = "Ці налаштування впливають лише на сонячний режим. Поведінка зарядки регулюється відповідно."
 legendBottomName = "домашній пріоритет"
 legendBottomSubline = "не використовується для зарядки"
 legendMiddleName = "спочатку транспортний засіб"
@@ -10,7 +12,6 @@ legendTopAutostart = "запускається автоматично"
 legendTopName = "заряджання з підтримкою батареї"
 legendTopSubline = "без перебоїв"
 modalTitle = "Налаштування батареї"
-note = "Примітка: Ці налаштування впливають лише на сонячний режим. Поведінка зарядки регулюється відповідно."
 
 [batterySettings.bufferStart]
 full = "коли майже повний"