diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index d99b78f4..ddffb179 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -24,34 +24,6 @@ open class PillButton: VDS.Button, MVMCoreUIViewConstrainingProtocol, MoleculeVi
 
     internal var onClickCancellable: Cancellable?
     
-    //--------------------------------------------------
-    // MARK: - Convenience
-    //--------------------------------------------------
-    
-    @objc public convenience init(asPrimaryButton isPrimary: Bool, makeTiny istiny: Bool) {
-        let model = ButtonModel(with: "", action: ActionNoopModel())
-        model.style = isPrimary ? .primary : .secondary
-        model.size = istiny ? .small : .large
-        self.init(model: model, nil, nil)
-    }
-    
-    /// The primary styling for a button. Should be used for main buttons
-    open func stylePrimary() {
-        viewModel = ButtonModel(primaryButtonWith: "", action: ActionNoopModel())
-        use = .primary
-    }
-    
-    /// The secondary styling for a button. Should be used for secondary buttons
-    open func styleSecondary() {
-        viewModel = ButtonModel(secondaryButtonWith: "", action: ActionNoopModel())
-        use = .secondary
-    }
-    
-    open override func setup() {
-        super.setup()
-        setupView()
-    }
-    
     //--------------------------------------------------
     // MARK: - VDSMoleculeViewProtocol
     //--------------------------------------------------
@@ -91,6 +63,11 @@ open class PillButton: VDS.Button, MVMCoreUIViewConstrainingProtocol, MoleculeVi
     
     open func updateView(_ size: CGFloat) {}
     
+    open override func setup() {
+        super.setup()
+        setupView()
+    }
+    
     open func setupView() {}
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
index 5f846730..9a70c12e 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-
+import VDS
 
 @objcMembers open class TwoButtonView: View, MVMCoreUIViewConstrainingProtocol {
     //--------------------------------------------------
@@ -29,9 +29,8 @@ import UIKit
     //--------------------------------------------------
     
     public func setDefaultAppearance() {
-        
-        primaryButton.stylePrimary()
-        secondaryButton.styleSecondary()
+        primaryButton.use = .primary
+        secondaryButton.use = .secondary
     }
     
     open override func updateView(_ size: CGFloat) {
diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
index c731f6d6..200dea16 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
@@ -15,7 +15,7 @@ import Foundation
     
     public let headline = Label(fontStyle: .BoldBodySmall)
     public let body = Label(fontStyle: .RegularBodySmall)
-    public let button = PillButton(asPrimaryButton: false, makeTiny: true)
+    public let button = PillButton()
     public let closeButton = NotificationXButton()
     public var labelStack: Stack<StackModel>!
     public var horizontalStack: Stack<StackModel>!
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButton.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButton.swift
index a40066e2..d7fced36 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButton.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButton.swift
@@ -64,7 +64,7 @@
         
         headlineBody.headlineLabel.font = Styler.Font.BoldTitleMedium.getFont()
         headlineBody.messageLabel.font = Styler.Font.RegularMicro.getFont()
-        button.styleSecondary()
+        button.use = .secondary
         button.isHidden = false
         buttonHeadlinePadding = PaddingTwo
     }