diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue
index f8f308fdc8..01fcf04e4e 100644
--- a/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue
+++ b/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue
@@ -61,7 +61,7 @@
           class="flex-grow"
           :color="planLimitSelected.value === 'amount' ? 'primary' : 'grey'"
           @click="planLimitSelected.value = 'amount'"
-          label="Amount"
+          label="Energie"
         />
       </q-btn-group>
       <div v-if="planLimitSelected.value === 'soc'" class="q-mt-md">
@@ -86,9 +86,13 @@
       <q-input
         v-if="planLimitSelected.value === 'amount'"
         v-model="planLimitAmount.value"
-        label="Energiemenge (kWh)"
+        label="Ziel-Energie"
         class="col"
-      />
+      >
+        <template v-slot:append>
+          <div class="text-body2">kWh</div>
+        </template>
+      </q-input>
 
       <div
         v-if="
diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledSettings.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledSettings.vue
index 972dbac27b..627ed96a3e 100644
--- a/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledSettings.vue
+++ b/packages/modules/web_themes/koala/source/src/components/ChargePointScheduledSettings.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="row justify-between items-center">
-    <div class="text-subtitle2 q-mr-sm q-mt-md">Termine Zielladen:</div>
-  </div>
-  <div class="row q-mb-md justify-end">
+  <div class="row justify-between items-center q-mt-md">
+    <div class="text-subtitle2">Termine Zielladen:</div>
     <q-btn
       round
       size="sm"
@@ -11,7 +9,6 @@
       @click="addScheduledChargingPlan"
     />
   </div>
-
   <div
     v-if="plans.length === 0"
     class="row q-mt-sm q-pa-sm bg-primary text-white no-wrap message-text"
diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingPlanDetails.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingPlanDetails.vue
index 0dbf91f998..a1b2331c7c 100644
--- a/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingPlanDetails.vue
+++ b/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingPlanDetails.vue
@@ -48,9 +48,13 @@
       <q-input
         v-if="planDcChargingEnabled"
         v-model="planDcPower.value"
-        label="Ladeleistung (DC) (kW)"
+        label="Ladeleistung (DC)"
         class="col q-mb-sm"
-      />
+      >
+        <template v-slot:append>
+          <div class="text-body2">kW</div>
+        </template>
+      </q-input>
 
       <div class="text-subtitle2 q-mb-sm">Begrenzung</div>
       <q-btn-group class="full-width">
@@ -73,7 +77,7 @@
           class="flex-grow"
           :color="planLimitSelected.value === 'amount' ? 'primary' : 'grey'"
           @click="planLimitSelected.value = 'amount'"
-          label="Amount"
+          label="Energie"
         />
       </q-btn-group>
       <div v-if="planLimitSelected.value === 'soc'" class="q-mt-md">
@@ -90,9 +94,13 @@
       <q-input
         v-if="planLimitSelected.value === 'amount'"
         v-model="planLimitAmount.value"
-        label="Energiemenge (kWh)"
+        label="Ziel-Energie"
         class="col"
-      />
+      >
+        <template v-slot:append>
+          <div class="text-body2">kWh</div>
+        </template>
+      </q-input>
 
       <div class="q-mb-md">
         <div class="text-subtitle2 q-mb-sm q-mt-md">Wiederholungen</div>
diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingSettings.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingSettings.vue
index 921db87d8e..7e50071cf2 100644
--- a/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingSettings.vue
+++ b/packages/modules/web_themes/koala/source/src/components/ChargePointTimeChargingSettings.vue
@@ -13,15 +13,13 @@
     class="row justify-between items-center q-mt-md"
   >
     <div class="text-subtitle2">Termine Zeitladen:</div>
-    <div class="row q-mb-md justify-end">
-      <q-btn
-        round
-        size="sm"
-        color="primary"
-        icon="add"
-        @click="addScheduledChargingPlan"
-      />
-    </div>
+    <q-btn
+      round
+      size="sm"
+      color="primary"
+      icon="add"
+      @click="addScheduledChargingPlan"
+    />
   </div>
   <div
     v-if="plans.length === 0 && timeChargingEnabled"