diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c8196805..8e8c5475c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Unreleased
+
+### Bugfix
+
+- Overlay
+  - Fix consistency issue in overlays where form input is used
+
 ### Feature
 
 - Admin Credential
diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
index baff724ad..8d2b04533 100644
--- a/src/assets/locales/de/main.json
+++ b/src/assets/locales/de/main.json
@@ -1032,8 +1032,8 @@
         "addOverlay": {
           "service": "Technical User Role",
           "serviceSubHeading": "Select one of the following service roles:",
-          "username": "Username",
-          "description": "Beschreibung",
+          "username": "Username*",
+          "description": "Beschreibung*",
           "spocHeadline": "Single Point of Contact (SPoC)",
           "org": "Organization name",
           "email": "E-Mail Address",
@@ -1894,18 +1894,18 @@
         "description": "Select the certificate flow and upload your company certificate below. Please note - you are responsible for the certificate validity - only upload valid and official documents.",
         "successTitle": "Certificate successfully uploaded.",
         "successDescription": "The upload was successful. The document is now available under your company certificate management page as well as shared with all dataspace providers.",
-        "certificateTypeTitle": "Certificate Type",
+        "certificateTypeTitle": "Certificate Type*",
         "certificateTypeError": "",
         "certificateTypeLabel": "",
         "certificateTypePlaceholder": "Please select",
-        "certificateSiteTitle": "Certificate Site/Level",
+        "certificateSiteTitle": "Certificate Site/Level*",
         "certificateSiteError": "",
         "certificateSiteLabel": "",
         "certificateSitePlaceholder": "Please select",
-        "uploadDocumentTitle": "Certificate file upload",
+        "uploadDocumentTitle": "Certificate file upload*",
         "note": "",
         "comingsoon": "Coming soon",
-        "expiry": "Expiry Date",
+        "expiry": "Expiry Date*",
         "dateplaceholder": "Enter a Date",
         "dateError": "Select a valid date"
       },
diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
index 4f222266b..6fd5c1a27 100644
--- a/src/assets/locales/en/main.json
+++ b/src/assets/locales/en/main.json
@@ -1035,8 +1035,8 @@
         "addOverlay": {
           "service": "Technical User Role",
           "serviceSubHeading": "Select one of the following service roles:",
-          "username": "Username",
-          "description": "Description",
+          "username": "Username*",
+          "description": "Description*",
           "spocHeadline": "Single Point of Contact (SPoC)",
           "org": "Organization name",
           "email": "E-Mail Address",
@@ -1820,18 +1820,18 @@
         "description": "Select the certificate flow and upload your company certificate below. Please note - you are responsible for the certificate validity - only upload valid and official documents.",
         "successTitle": "Certificate successfully uploaded.",
         "successDescription": "The upload was successful. The document is now available under your company certificate management page as well as shared with all dataspace providers.",
-        "certificateTypeTitle": "Certificate Type",
+        "certificateTypeTitle": "Certificate Type*",
         "certificateTypeError": "",
         "certificateTypeLabel": "",
         "certificateTypePlaceholder": "Please select",
-        "certificateSiteTitle": "Certificate Site/Level",
+        "certificateSiteTitle": "Certificate Site/Level*",
         "certificateSiteError": "",
         "certificateSiteLabel": "",
         "certificateSitePlaceholder": "Please select",
-        "uploadDocumentTitle": "Certificate file upload",
+        "uploadDocumentTitle": "Certificate file upload*",
         "note": "",
         "comingsoon": "Coming soon",
-        "expiry": "Expiry Date",
+        "expiry": "Expiry Date*",
         "dateplaceholder": "Enter a Date",
         "dateError": "Select a valid date"
       },
diff --git a/src/components/overlays/AddTechnicalUser/TechnicalUserAddForm.tsx b/src/components/overlays/AddTechnicalUser/TechnicalUserAddForm.tsx
index 971cda025..8638a9182 100644
--- a/src/components/overlays/AddTechnicalUser/TechnicalUserAddForm.tsx
+++ b/src/components/overlays/AddTechnicalUser/TechnicalUserAddForm.tsx
@@ -168,7 +168,7 @@ const TechnicalUserAddFormTextfield = ({
             error={!!errors[name as keyof Object]}
             sx={{ marginBottom: '7px', color: '#000' }}
           >
-            <Typography variant="body2">{label}</Typography>
+            <Typography variant="label3">{label}</Typography>
           </InputLabel>
           <TextField
             error={!!errors[name as keyof Object]}
diff --git a/src/components/pages/CompanyCertificates/UploadCompanyCerificate.tsx b/src/components/pages/CompanyCertificates/UploadCompanyCerificate.tsx
index 8caf76b8b..10fb49b0d 100644
--- a/src/components/pages/CompanyCertificates/UploadCompanyCerificate.tsx
+++ b/src/components/pages/CompanyCertificates/UploadCompanyCerificate.tsx
@@ -128,7 +128,14 @@ export default function UploadCompanyCertificate({
       ) : (
         <DialogContent>
           <div className="upload-certificate">
-            <Typography variant="h4" className="title">
+            <Typography
+              variant="label3"
+              sx={{
+                display: 'block',
+                marginBottom: '-10px',
+              }}
+              className="title"
+            >
               {t('content.companyCertificate.upload.certificateTypeTitle')}
             </Typography>
             <SelectList
@@ -154,7 +161,14 @@ export default function UploadCompanyCertificate({
               keyTitle={'certificateType'}
               disabled={certificateTypes?.length === 1}
             />
-            <Typography variant="h4" className="title">
+            <Typography
+              variant="label3"
+              sx={{
+                display: 'block',
+                marginBottom: '-10px',
+              }}
+              className="title"
+            >
               {t('content.companyCertificate.upload.certificateSiteTitle')}
             </Typography>
             <Tooltips
@@ -187,10 +201,11 @@ export default function UploadCompanyCertificate({
               </span>
             </Tooltips>
             <Typography
-              variant="h4"
+              variant="label3"
               className="title"
               sx={{
-                marginBottom: '20px',
+                marginBottom: '15px',
+                display: 'block',
               }}
             >
               {t('content.companyCertificate.upload.expiry')}
@@ -219,10 +234,11 @@ export default function UploadCompanyCertificate({
               label={''}
             />
             <Typography
-              variant="h4"
+              variant="label3"
               className="title"
               sx={{
-                marginBottom: '20px',
+                marginBottom: '15px',
+                display: 'block',
               }}
             >
               {t('content.companyCertificate.upload.uploadDocumentTitle')}
diff --git a/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx
index 6937cac71..416cda21a 100644
--- a/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx
+++ b/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx
@@ -126,11 +126,7 @@ const ConfigurationDetailsOverlay = ({
         }}
       >
         <DialogHeader
-          title={
-            <Typography variant="h3">
-              {t('content.edcconnector.configurationDetails.title')}
-            </Typography>
-          }
+          title={t('content.edcconnector.configurationDetails.title')}
           intro={
             <Box
               sx={{