diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
index 3cb09a0f..d3ea7497 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift
@@ -33,9 +33,13 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol {
     //--------------------------------------------------
     
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         super.setDefaults()
-        topPadding = PaddingDefaultVerticalSpacing3
-        bottomPadding = PaddingDefaultVerticalSpacing3
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
index a6cfc0ce..96d30730 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift
@@ -27,9 +27,13 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     }
 
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         super.setDefaults()
-        topPadding = PaddingDefaultVerticalSpacing3
-        bottomPadding = PaddingDefaultVerticalSpacing3
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
index 219f539f..01bd72e4 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
@@ -39,6 +39,12 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol {
     // MARK: - Methods
     //--------------------------------------------------
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         super.setDefaults()
         subBody?.attributes = [LabelAttributeStrikeThroughModel(0, subBody?.text.count ?? 0)]
         subBody2?.attributes = [LabelAttributeStrikeThroughModel(0, subBody2?.text.count ?? 0)]
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
index 55c2c6e4..d4edfd38 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift
@@ -33,9 +33,13 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol {
     //--------------------------------------------------
     
     public override func setDefaults() {
+        if topPadding == nil {
+            topPadding = Padding.Component.VerticalMarginSpacing
+        }
+        if bottomPadding == nil {
+            bottomPadding = Padding.Component.VerticalMarginSpacing
+        }
         super.setDefaults()
-        topPadding = PaddingDefaultVerticalSpacing3
-        bottomPadding = PaddingDefaultVerticalSpacing3
         button.style = .secondary
         button.size = .tiny
     }