diff --git a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodySwitch.swift b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodySwitch.swift
index c856832d..ffab9920 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodySwitch.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodySwitch.swift
@@ -38,7 +38,7 @@ import UIKit
     }
     
     public override static func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return MVMCoreUISwitch.estimatedHeight(forRow: json, delegateObject: delegateObject)
+        return 30
     }
     
     public override func setAsMolecule() {
diff --git a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodyTextButtonSwitch.swift b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodyTextButtonSwitch.swift
index 87ca50d5..754f508b 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodyTextButtonSwitch.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/HeadlineBodyTextButtonSwitch.swift
@@ -38,7 +38,7 @@ import UIKit
     }
     
     public override static func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return MVMCoreUISwitch.estimatedHeight(forRow: json, delegateObject: delegateObject)
+        return HeadlineBodyTextButton.estimatedHeight(forRow: json, delegateObject: delegateObject)
     }
     
     public override func setAsMolecule() {
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyTextButton.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyTextButton.swift
index fbfc279b..bb638624 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyTextButton.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyTextButton.swift
@@ -73,6 +73,6 @@ import UIKit
     }
     
     public override static func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return 58
+        return 60
     }
 }