diff --git a/.changeset/rich-geckos-end.md b/.changeset/rich-geckos-end.md
new file mode 100644
index 0000000000..2a1f2dc09f
--- /dev/null
+++ b/.changeset/rich-geckos-end.md
@@ -0,0 +1,10 @@
+---
+"go-web-app": minor
+---
+
+Address feedbacks in [DREF superticket feedbacks](https://github.com/IFRCGo/go-web-app/issues/1816)
+
+- Make end date of operation readonly field in all DREF forms
+- Fix font and spacing issues in the DREF exports (caused by link text overflow)
+- Update styling of Risk and Security Considerations section to match that of Previous Operations
+- Update visibility condition of National Society Actions in Final Report export
diff --git a/app/src/components/printable/Link/styles.module.css b/app/src/components/printable/Link/styles.module.css
index d2ba012a94..898738d75d 100644
--- a/app/src/components/printable/Link/styles.module.css
+++ b/app/src/components/printable/Link/styles.module.css
@@ -1,4 +1,5 @@
 .link {
+    overflow-wrap: anywhere;
     color: var(--go-ui-color-blue);
-    font-size: var(--go-ui-font-size-md);
+    font-size: inherit;
 }
diff --git a/app/src/views/DrefApplicationExport/index.tsx b/app/src/views/DrefApplicationExport/index.tsx
index 19e8676972..7f09f6723a 100644
--- a/app/src/views/DrefApplicationExport/index.tsx
+++ b/app/src/views/DrefApplicationExport/index.tsx
@@ -285,13 +285,15 @@ export function Component() {
     const hasChildrenSafeguardingDefined = isDefined(
         drefResponse?.has_child_safeguarding_risk_analysis_assessment,
     );
-    const showRiskAndSecuritySection = riskSecurityDefined
-        || riskSecurityConcernDefined
-        || hasAntiFraudPolicy
+    const hasRiskAndSecurityPoliciesDefined = hasAntiFraudPolicy
         || hasSexualAbusePolicy
         || hasChildProtectionPolicy
         || hasWhistleblowerProtectionPolicy
-        || hasAntiSexualHarassmentPolicy
+        || hasAntiSexualHarassmentPolicy;
+
+    const showRiskAndSecuritySection = riskSecurityDefined
+        || riskSecurityConcernDefined
+        || hasRiskAndSecurityPoliciesDefined
         || hasChildrenSafeguardingDefined;
 
     const plannedInterventionDefined = isDefined(drefResponse)
@@ -697,7 +699,8 @@ export function Component() {
                             label={strings.childSafeguardingRiskLevelLabel}
                             value={drefResponse?.child_safeguarding_risk_level}
                             valueType="text"
-                            strongLabel
+                            strongValue
+                            variant="contents"
                         />
                     )}
                 </Container>
@@ -981,66 +984,56 @@ export function Component() {
                 />
             </Container>
             {showRiskAndSecuritySection && (
-                <>
-                    <Heading level={2}>
-                        {strings.riskAndSecuritySectionHeading}
-                    </Heading>
+                <Container
+                    childrenContainerClassName={styles.riskAndSecuritySection}
+                    heading={strings.riskAndSecuritySectionHeading}
+                    headingLevel={2}
+                >
                     {hasAntiFraudPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiFraudPolicy}
-                                value={drefResponse?.has_anti_fraud_corruption_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiFraudPolicy}
+                            value={drefResponse?.has_anti_fraud_corruption_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasSexualAbusePolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasSexualAbusePolicy}
-                                value={drefResponse?.has_sexual_abuse_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasSexualAbusePolicy}
+                            value={drefResponse?.has_sexual_abuse_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasChildProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildProtectionPolicy}
-                                value={drefResponse?.has_child_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildProtectionPolicy}
+                            value={drefResponse?.has_child_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasWhistleblowerProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasWhistleblowerProtectionPolicy}
-                                value={drefResponse?.has_whistleblower_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasWhistleblowerProtectionPolicy}
+                            value={drefResponse?.has_whistleblower_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasAntiSexualHarassmentPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiSexualHarassmentPolicy}
-                                value={drefResponse?.has_anti_sexual_harassment_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiSexualHarassmentPolicy}
+                            value={drefResponse?.has_anti_sexual_harassment_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {riskSecurityDefined && (
-                        <Container
-                            heading={strings.riskSecurityHeading}
-                            childrenContainerClassName={styles.riskList}
-                            headingLevel={6}
-                        >
+                        <>
+                            <div className={styles.potentialRisksHeading}>
+                                {strings.riskSecurityHeading}
+                            </div>
                             <div className={styles.riskTitle}>
                                 {strings.drefApplicationExportRisk}
                             </div>
@@ -1059,32 +1052,27 @@ export function Component() {
                                     </Fragment>
                                 ),
                             )}
-                        </Container>
+                        </>
                     )}
                     {riskSecurityConcernDefined && (
-                        <Container
-                            heading={strings.safetyConcernHeading}
-                            headingLevel={6}
-                        >
-                            <DescriptionText
-                                className={styles.description}
-                            >
-                                {drefResponse?.risk_security_concern}
-                            </DescriptionText>
-                        </Container>
+                        <TextOutput
+                            className={styles.riskSecurityConcern}
+                            label={strings.safetyConcernHeading}
+                            value={drefResponse?.risk_security_concern}
+                            valueType="text"
+                            strongLabel
+                        />
                     )}
                     {hasChildrenSafeguardingDefined && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildRiskCompleted}
-                                // eslint-disable-next-line max-len
-                                value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildRiskCompleted}
+                            // eslint-disable-next-line max-len
+                            value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
-                </>
+                </Container>
             )}
             {plannedInterventionDefined && (
                 <>
diff --git a/app/src/views/DrefApplicationExport/styles.module.css b/app/src/views/DrefApplicationExport/styles.module.css
index 7390b4facd..45f3576203 100644
--- a/app/src/views/DrefApplicationExport/styles.module.css
+++ b/app/src/views/DrefApplicationExport/styles.module.css
@@ -154,12 +154,27 @@
         }
     }
 
-    .risk-list,
+    .risk-and-security-section,
     .source-information-list {
         display: grid;
         grid-template-columns: 1fr 1fr;
         grid-gap: var(--go-ui-width-separator-md);
 
+        .potential-risks-heading {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            color: var(--go-ui-color-black);
+            font-weight: var(--go-ui-font-weight-semibold);
+        }
+
+        .risk-security-concern {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            gap: var(--go-ui-spacing-sm);
+        }
+
         .risk,
         .name,
         .link,
diff --git a/app/src/views/DrefFinalReportExport/index.tsx b/app/src/views/DrefFinalReportExport/index.tsx
index 6784095ef3..71eb020f7f 100644
--- a/app/src/views/DrefFinalReportExport/index.tsx
+++ b/app/src/views/DrefFinalReportExport/index.tsx
@@ -174,8 +174,7 @@ export function Component() {
     const partnerNsActionsDefined = isTruthyString(drefResponse?.partner_national_society?.trim());
     const showMovementPartnersActionsSection = ifrcActionsDefined || partnerNsActionsDefined;
 
-    const showNsActionsSection = isDefined(drefResponse?.has_national_society_conducted)
-        || isTruthyString(drefResponse?.national_society_conducted_description);
+    const showNsActionsSection = isDefined(drefResponse?.has_national_society_conducted);
 
     const icrcActionsDefined = isTruthyString(drefResponse?.icrc?.trim());
 
@@ -550,12 +549,14 @@ export function Component() {
                         valueType="boolean"
                         strongLabel
                     />
-                    <BlockTextOutput
-                        label={strings.nsInterventionDescriptionLabel}
-                        value={drefResponse?.national_society_conducted_description}
-                        valueType="text"
-                        strongLabel
-                    />
+                    {drefResponse?.has_national_society_conducted === true && (
+                        <BlockTextOutput
+                            label={strings.nsInterventionDescriptionLabel}
+                            value={drefResponse?.national_society_conducted_description}
+                            valueType="text"
+                            strongLabel
+                        />
+                    )}
                 </Container>
             )}
             {showMovementPartnersActionsSection && (
@@ -778,66 +779,56 @@ export function Component() {
                 />
             </Container>
             {showRiskAndSecuritySection && (
-                <>
-                    <Heading level={2}>
-                        {strings.riskAndSecuritySectionHeading}
-                    </Heading>
+                <Container
+                    childrenContainerClassName={styles.riskAndSecuritySection}
+                    heading={strings.riskAndSecuritySectionHeading}
+                    headingLevel={2}
+                >
                     {hasAntiFraudPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiFraudPolicy}
-                                value={drefResponse?.has_anti_fraud_corruption_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiFraudPolicy}
+                            value={drefResponse?.has_anti_fraud_corruption_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasSexualAbusePolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasSexualAbusePolicy}
-                                value={drefResponse?.has_sexual_abuse_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasSexualAbusePolicy}
+                            value={drefResponse?.has_sexual_abuse_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasChildProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildProtectionPolicy}
-                                value={drefResponse?.has_child_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildProtectionPolicy}
+                            value={drefResponse?.has_child_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasWhistleblowerProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasWhistleblowerProtectionPolicy}
-                                value={drefResponse?.has_whistleblower_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasWhistleblowerProtectionPolicy}
+                            value={drefResponse?.has_whistleblower_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasAntiSexualHarassmentPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiSexualHarassmentPolicy}
-                                value={drefResponse?.has_anti_sexual_harassment_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiSexualHarassmentPolicy}
+                            value={drefResponse?.has_anti_sexual_harassment_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {riskSecurityDefined && (
-                        <Container
-                            heading={strings.riskSecurityHeading}
-                            childrenContainerClassName={styles.riskList}
-                            headingLevel={6}
-                        >
+                        <>
+                            <div className={styles.potentialRisksHeading}>
+                                {strings.riskSecurityHeading}
+                            </div>
                             <div className={styles.riskTitle}>
                                 {strings.riskLabel}
                             </div>
@@ -856,32 +847,26 @@ export function Component() {
                                     </Fragment>
                                 ),
                             )}
-                        </Container>
+                        </>
                     )}
                     {riskSecurityConcernDefined && (
-                        <Container
-                            heading={strings.safetyConcernHeading}
-                            headingLevel={6}
-                        >
-                            <DescriptionText
-                                className={styles.description}
-                            >
-                                {drefResponse?.risk_security_concern}
-                            </DescriptionText>
-                        </Container>
+                        <TextOutput
+                            className={styles.riskSecurityConcern}
+                            label={strings.safetyConcernHeading}
+                            value={drefResponse?.risk_security_concern}
+                            valueType="text"
+                            strongLabel
+                        />
                     )}
                     {hasChildrenSafeguardingDefined && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildRiskCompleted}
-                                // eslint-disable-next-line max-len
-                                value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildRiskCompleted}
+                            value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
-                </>
+                </Container>
             )}
             {plannedInterventionDefined && (
                 <>
diff --git a/app/src/views/DrefFinalReportExport/styles.module.css b/app/src/views/DrefFinalReportExport/styles.module.css
index f28e6618de..9f04c3f2d9 100644
--- a/app/src/views/DrefFinalReportExport/styles.module.css
+++ b/app/src/views/DrefFinalReportExport/styles.module.css
@@ -134,12 +134,27 @@
         }
     }
 
-    .risk-list,
+    .risk-and-security-section,
     .source-information-list {
         display: grid;
         grid-template-columns: 1fr 1fr;
         grid-gap: var(--go-ui-width-separator-md);
 
+        .potential-risks-heading {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            color: var(--go-ui-color-black);
+            font-weight: var(--go-ui-font-weight-semibold);
+        }
+
+        .risk-security-concern {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            gap: var(--go-ui-spacing-sm);
+        }
+
         .risk,
         .name,
         .link,
diff --git a/app/src/views/DrefFinalReportForm/Submission/index.tsx b/app/src/views/DrefFinalReportForm/Submission/index.tsx
index 254e223a60..3f66df1154 100644
--- a/app/src/views/DrefFinalReportForm/Submission/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Submission/index.tsx
@@ -110,6 +110,7 @@ function Submission(props: Props) {
                         onChange={setFieldValue}
                         error={error?.operation_end_date}
                         disabled={disabled}
+                        readOnly
                     />
                     <DateInput
                         label={strings.finalReportDateOfPublication}
diff --git a/app/src/views/DrefOperationalUpdateExport/index.tsx b/app/src/views/DrefOperationalUpdateExport/index.tsx
index bbf698f8ea..6f4992b1d5 100644
--- a/app/src/views/DrefOperationalUpdateExport/index.tsx
+++ b/app/src/views/DrefOperationalUpdateExport/index.tsx
@@ -949,66 +949,56 @@ export function Component() {
                 />
             </Container>
             {showRiskAndSecuritySection && (
-                <>
-                    <Heading level={2}>
-                        {strings.riskAndSecuritySectionHeading}
-                    </Heading>
+                <Container
+                    childrenContainerClassName={styles.riskAndSecuritySection}
+                    heading={strings.riskAndSecuritySectionHeading}
+                    headingLevel={2}
+                >
                     {hasAntiFraudPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiFraudPolicy}
-                                value={drefResponse?.has_anti_fraud_corruption_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiFraudPolicy}
+                            value={drefResponse?.has_anti_fraud_corruption_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasSexualAbusePolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasSexualAbusePolicy}
-                                value={drefResponse?.has_sexual_abuse_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasSexualAbusePolicy}
+                            value={drefResponse?.has_sexual_abuse_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasChildProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildProtectionPolicy}
-                                value={drefResponse?.has_child_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildProtectionPolicy}
+                            value={drefResponse?.has_child_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasWhistleblowerProtectionPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasWhistleblowerProtectionPolicy}
-                                value={drefResponse?.has_whistleblower_protection_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasWhistleblowerProtectionPolicy}
+                            value={drefResponse?.has_whistleblower_protection_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {hasAntiSexualHarassmentPolicy && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasAntiSexualHarassmentPolicy}
-                                value={drefResponse?.has_anti_sexual_harassment_policy}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasAntiSexualHarassmentPolicy}
+                            value={drefResponse?.has_anti_sexual_harassment_policy}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
                     {riskSecurityDefined && (
-                        <Container
-                            heading={strings.riskSecurityHeading}
-                            childrenContainerClassName={styles.riskList}
-                            headingLevel={6}
-                        >
+                        <>
+                            <div className={styles.potentialRisksHeading}>
+                                {strings.riskSecurityHeading}
+                            </div>
                             <div className={styles.riskTitle}>
                                 {strings.drefOperationalRisk}
                             </div>
@@ -1027,32 +1017,26 @@ export function Component() {
                                     </Fragment>
                                 ),
                             )}
-                        </Container>
+                        </>
                     )}
                     {riskSecurityConcernDefined && (
-                        <Container
-                            heading={strings.safetyConcernHeading}
-                            headingLevel={6}
-                        >
-                            <DescriptionText
-                                className={styles.description}
-                            >
-                                {drefResponse?.risk_security_concern}
-                            </DescriptionText>
-                        </Container>
+                        <TextOutput
+                            className={styles.riskSecurityConcern}
+                            label={strings.safetyConcernHeading}
+                            value={drefResponse?.risk_security_concern}
+                            valueType="text"
+                            strongLabel
+                        />
                     )}
                     {hasChildrenSafeguardingDefined && (
-                        <Container>
-                            <BlockTextOutput
-                                label={strings.hasChildRiskCompleted}
-                                // eslint-disable-next-line max-len
-                                value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
-                                valueType="boolean"
-                                strongLabel
-                            />
-                        </Container>
+                        <BlockTextOutput
+                            label={strings.hasChildRiskCompleted}
+                            value={drefResponse?.has_child_safeguarding_risk_analysis_assessment}
+                            valueType="boolean"
+                            strongValue
+                        />
                     )}
-                </>
+                </Container>
             )}
             {plannedInterventionDefined && (
                 <>
diff --git a/app/src/views/DrefOperationalUpdateExport/styles.module.css b/app/src/views/DrefOperationalUpdateExport/styles.module.css
index 189ec8e509..108639a55b 100644
--- a/app/src/views/DrefOperationalUpdateExport/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateExport/styles.module.css
@@ -163,12 +163,27 @@
         }
     }
 
-    .risk-list,
+    .risk-and-security-section,
     .source-information-list {
         display: grid;
         grid-template-columns: 1fr 1fr;
         grid-gap: var(--go-ui-width-separator-md);
 
+        .potential-risks-heading {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            color: var(--go-ui-color-black);
+            font-weight: var(--go-ui-font-weight-semibold);
+        }
+
+        .risk-security-concern {
+            grid-column: span 2;
+            background-color: var(--pdf-element-bg);
+            padding: var(--go-ui-spacing-sm) var(--go-ui-spacing-xs);
+            gap: var(--go-ui-spacing-sm);
+        }
+
         .risk,
         .name,
         .link,
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
index 1d9cd39fce..a3dd9c7524 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
@@ -131,6 +131,7 @@ function Submission(props: Props) {
                             onChange={setFieldValue}
                             error={error?.new_operational_end_date}
                             disabled={disabled}
+                            readOnly
                         />
                     )}
                     {value.type_of_dref === TYPE_LOAN && (
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css b/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
index efdc9f5abd..7bb7c082b3 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
@@ -6,9 +6,12 @@
     .warning {
         display: flex;
         align-items: flex-start;
-        gap: var(--go-ui-spacing-sm);
-        padding: var(--go-ui-spacing-sm) 0;
+        gap: var(--go-ui-spacing-2xs);
+        padding: var(--go-ui-spacing-2xs) 0;
         color: var(--go-ui-color-warning);
-        font-weight: var(--go-ui-font-weight-semibold);
+
+        .icon {
+            font-size: var(--go-ui-height-icon-multiplier);
+        }
     }
 }