diff --git a/components/main/analogeEingaenge/AnalogInputsSettingsModal.tsx b/components/main/analogeEingaenge/AnalogInputsSettingsModal.tsx
index c405e1e..7560b01 100644
--- a/components/main/analogeEingaenge/AnalogInputsSettingsModal.tsx
+++ b/components/main/analogeEingaenge/AnalogInputsSettingsModal.tsx
@@ -103,9 +103,19 @@ export default function AnalogInputSettingsModal({
   return (
     <div className="fixed top-0 left-0 w-full h-full bg-black bg-opacity-50 flex justify-center items-center z-50">
       <div className="bg-white rounded-lg shadow-lg p-6 w-1/2 max-w-lg">
-        <h2 className="text-base font-bold  mb-4 border-b pb-2">
-          Einstellungen Messwerteingang {selectedInput.id}
-        </h2>
+        <div className="mb-4 border-b pb-2 flex justify-between items-center">
+          <h2 className="text-base font-bold">
+            Einstellungen Messwerteingang {selectedInput.id}
+          </h2>
+          <button
+            onClick={onClose}
+            className="text-2xl hover:text-gray-400"
+            aria-label="Modal schließen"
+          >
+            <i className="bi bi-x-circle-fill"></i>
+          </button>
+        </div>
+
         {/* Bezeichnung */}
         <div className="grid grid-cols-2 gap-x-4 gap-y-3">
           <div>
@@ -186,13 +196,6 @@ export default function AnalogInputSettingsModal({
         </div>
 
         <div className="flex justify-end gap-2 mt-6">
-          <button
-            onClick={onClose}
-            disabled={isSaving}
-            className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
-          >
-            Schließen
-          </button>
           <button
             onClick={handleSave}
             disabled={isSaving}
diff --git a/components/main/einausgaenge/modals/DigitalOutputsModal.tsx b/components/main/einausgaenge/modals/DigitalOutputsModal.tsx
index 5565b2b..919f7ce 100644
--- a/components/main/einausgaenge/modals/DigitalOutputsModal.tsx
+++ b/components/main/einausgaenge/modals/DigitalOutputsModal.tsx
@@ -71,9 +71,18 @@ export default function DigitalOutputsModal({
   return (
     <div className="fixed top-0 left-0 w-full h-full bg-black bg-opacity-50 flex justify-center items-center z-50">
       <div className="bg-white rounded-lg shadow-lg p-6 w-1/2 max-w-lg">
-        <h2 className="text-base font-bold  mb-4 border-b pb-2">
-          Einstellungen Schaltausgang {selectedOutput.id}
-        </h2>
+        <div className="mb-4 border-b pb-2 flex justify-between items-center">
+          <h2 className="text-base font-bold">
+            Einstellungen Schaltausgang {selectedOutput.id}
+          </h2>
+          <button
+            onClick={closeOutputModal}
+            className="text-2xl hover:text-gray-400"
+            aria-label="Modal schließen"
+          >
+            <i className="bi bi-x-circle-fill"></i>
+          </button>
+        </div>
 
         <div className="grid grid-cols-2 gap-x-4 gap-y-3">
           <div>
@@ -91,13 +100,6 @@ export default function DigitalOutputsModal({
         {errorMsg && <p className="text-red-600 text-sm mb-2">{errorMsg}</p>}
 
         <div className="flex justify-end gap-2 mt-6">
-          <button
-            onClick={closeOutputModal}
-            disabled={isSaving}
-            className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
-          >
-            Schließen
-          </button>
           <button
             onClick={handleSave}
             disabled={isSaving}
diff --git a/components/main/einausgaenge/modals/InputModal.tsx b/components/main/einausgaenge/modals/InputModal.tsx
index 5a981bc..e66d554 100644
--- a/components/main/einausgaenge/modals/InputModal.tsx
+++ b/components/main/einausgaenge/modals/InputModal.tsx
@@ -147,9 +147,18 @@ export default function InputModal({ selectedInput, closeInputModal, isOpen }) {
   return (
     <div className="fixed top-0 left-0 w-full h-full bg-black bg-opacity-50 flex justify-center items-center z-50">
       <div className="bg-white rounded-lg shadow-lg p-6 w-1/2 max-w-lg">
-        <h2 className="text-base font-bold  mb-4 border-b pb-2">
-          Einstellungen Meldungseingang {selectedInput.id}
-        </h2>
+        <div className="mb-4 border-b pb-2 flex justify-between items-center">
+          <h2 className="text-base font-bold">
+            Einstellungen Meldungseingang {selectedInput.id}
+          </h2>
+          <button
+            onClick={handleClose}
+            className="text-2xl hover:text-gray-400"
+            aria-label="Modal schließen"
+          >
+            <i className="bi bi-x-circle-fill"></i>
+          </button>
+        </div>
 
         <div className="grid grid-cols-2 gap-x-4 gap-y-3">
           <div>
@@ -256,12 +265,6 @@ export default function InputModal({ selectedInput, closeInputModal, isOpen }) {
         </div>
 
         <div className="mt-6 flex justify-end gap-2">
-          <button
-            onClick={handleClose}
-            className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
-          >
-            Schließen
-          </button>
           <button
             onClick={handleSpeichern}
             className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
diff --git a/config/webVersion.ts b/config/webVersion.ts
index 5ddfc1a..2d4b7eb 100644
--- a/config/webVersion.ts
+++ b/config/webVersion.ts
@@ -6,5 +6,5 @@
 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
 
 */
-const webVersion = "1.6.388";
+const webVersion = "1.6.389";
 export default webVersion;