diff --git a/packages/modules/web_themes/standard_legacy/web/index.html b/packages/modules/web_themes/standard_legacy/web/index.html
index cc72405cfe..18eb65b196 100644
--- a/packages/modules/web_themes/standard_legacy/web/index.html
+++ b/packages/modules/web_themes/standard_legacy/web/index.html
@@ -584,7 +584,7 @@ <h3 class="mb-0">Termine Zeitladen</h3>
 												<span class="charge-point-time-charge-name">--</span>
 											</div>
 											<div class="col-lg-6 text-right">
-												<span class="charge-point-time-charge-pill charge-point-time-charge-active cursor-pointer border rounded p-1">
+												<span class="charge-point-time-charge-pill cursor-pointer border rounded p-1">
 													<span class="charge-point-time-charge-frequency">
 														<i class="fas fa-calendar-alt"></i>
 														<span class="charge-point-time-charge-frequency-value">--</span>
@@ -1000,7 +1000,7 @@ <h3 class="mb-0">Einstellungen für "Ziel"</h3>
 											<span class="charge-point-schedule-name">--</span>
 										</div>
 										<div class="col-lg-6 text-right">
-											<span class="charge-point-schedule-plan-pill charge-point-schedule-active cursor-pointer border rounded p-1">
+											<span class="charge-point-schedule-plan-pill cursor-pointer border rounded p-1">
 												<span class="charge-point-schedule-frequency">
 													<i class="fas fa-calendar-alt"></i>
 													<span class="charge-point-schedule-frequency-value">--</span>
@@ -1637,7 +1637,7 @@ <h4 class="modal-title">
 					const object = "chargeTemplate";
 					const objectPath = "time_charging.plans." + planId + ".active";
 					const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template";
-					const option = !$(this).hasClass('charge-point-time-charge-active');
+					const option = !$(this).hasClass('charge-point-plan-pill-active');
 					if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) {
 						let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex]));
 						currentObjectState = updateObject(currentObjectState, objectPath, option);
@@ -1670,7 +1670,7 @@ <h4 class="modal-title">
 					const object = "chargeTemplate";
 					const objectPath = "chargemode.scheduled_charging.plans." + planId + ".active";
 					const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template";
-					const option = !$(this).hasClass('charge-point-schedule-active');
+					const option = !$(this).hasClass('charge-point-plan-pill-active');
 					if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) {
 						let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex]));
 						currentObjectState = updateObject(currentObjectState, objectPath, option);
diff --git a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
index e77fe831ef..74a6617c2f 100644
--- a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
+++ b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
@@ -303,11 +303,9 @@ function refreshChargeTemplate(chargePointIndex) {
 					}
 					schedulePlanElement.find('.charge-point-schedule-time').text(value.time);
 					if (value.active == true) {
-						schedulePlanElement.find('.charge-point-schedule-active').removeClass('alert-danger border-danger');
-						schedulePlanElement.find('.charge-point-schedule-active').addClass('alert-success border-success');
+						schedulePlanElement.find('.charge-point-schedule-plan-pill').addClass('charge-point-plan-pill-active');
 					} else {
-						schedulePlanElement.find('.charge-point-schedule-active').removeClass('alert-success border-success');
-						schedulePlanElement.find('.charge-point-schedule-active').addClass('alert-danger border-danger');
+						schedulePlanElement.find('.charge-point-schedule-plan-pill').removeClass('charge-point-plan-pill-active');
 					}
 					switch (value.frequency.selected) {
 						case "once":
@@ -383,11 +381,9 @@ function refreshChargeTemplate(chargePointIndex) {
 					timeChargePlanElement.find('.charge-point-time-charge-name').text(value.name);
 					timeChargePlanElement.find('.charge-point-time-charge-time').text(value.time[0] + " - " + value.time[1]);
 					if (value.active == true) {
-						timeChargePlanElement.find('.charge-point-time-charge-active').removeClass('alert-danger border-danger');
-						timeChargePlanElement.find('.charge-point-time-charge-active').addClass('alert-success border-success');
+						timeChargePlanElement.find('.charge-point-time-charge-pill').addClass('charge-point-plan-pill-active');
 					} else {
-						timeChargePlanElement.find('.charge-point-time-charge-active').removeClass('alert-success border-success');
-						timeChargePlanElement.find('.charge-point-time-charge-active').addClass('alert-danger border-danger');
+						timeChargePlanElement.find('.charge-point-time-charge-pill').removeClass('charge-point-plan-pill-active');
 					}
 					if (value.limit.selected == "soc") {
 						timeChargePlanElement.find('.charge-point-time-charge-limit').removeClass('hide');
diff --git a/packages/modules/web_themes/standard_legacy/web/style.css b/packages/modules/web_themes/standard_legacy/web/style.css
index 1ba0cf9de3..8b8b912141 100644
--- a/packages/modules/web_themes/standard_legacy/web/style.css
+++ b/packages/modules/web_themes/standard_legacy/web/style.css
@@ -145,6 +145,20 @@ body>.container {
 	text-decoration: line-through;
 }
 
+.charge-point-schedule-plan-pill,
+.charge-point-time-charge-pill {
+	border-color: #dc3545!important;
+	color: #721c24;
+	background-color: #f8d7da;
+}
+
+.charge-point-schedule-plan-pill.charge-point-plan-pill-active,
+.charge-point-time-charge-pill.charge-point-plan-pill-active {
+	border-color: #28a745!important;
+	color: #155724;
+	background-color: #d4edda;
+}
+
 .text-green {
 	color: #006515;
 }