diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
index 92cde87c..0eea3036 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
@@ -151,6 +151,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         
         if enabledTextColor == nil && enabledBorderColor == nil {
             enabledTextColor = Color(uiColor: VDSColor.elementsPrimaryOnlight)
+            enabledFillColor = Color(uiColor: UIColor.clear)
             enabledBorderColor = Color(uiColor: VDSColor.elementsPrimaryOnlight)
         }
         
@@ -160,7 +161,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         }
         
         enabledTextColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark)
-        enabledFillColor_inverted = Color(uiColor: UIColor.clear)
+        enabledFillColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOnlight)
         enabledBorderColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark)
         disabledTextColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark)
         disabledBorderColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark)
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index de955378..b70f4ccb 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -154,8 +154,8 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
             horizontalPadding = Padding.Four
             break
         case .tiny:
-            verticalPadding = getInnerPadding()
-            horizontalPadding = getInnerPadding()
+            verticalPadding = Padding.One
+            horizontalPadding = Padding.Two
             break
         }
         return UIEdgeInsets(top: verticalPadding, left: horizontalPadding, bottom: verticalPadding, right: horizontalPadding)
@@ -211,7 +211,9 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         if let contraint = buttonModel?.width, widthConstraint == nil {
             widthConstraint = widthAnchor.constraint(equalToConstant: contraint)
             widthConstraint?.isActive = true
-            minimumWidthConstraint?.isActive = false
+        } else {
+            minimumWidthConstraint = widthAnchor.constraint(greaterThanOrEqualToConstant: buttonSize.minimumWidth())
+            minimumWidthConstraint?.isActive = true
         }
     }
     
@@ -223,9 +225,6 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         titleLabel?.textAlignment = .center
         contentHorizontalAlignment = .center
         stylePrimary()
-        
-        minimumWidthConstraint = widthAnchor.constraint(greaterThanOrEqualToConstant: buttonSize.minimumWidth())
-        minimumWidthConstraint?.isActive = true
     }
     
     //--------------------------------------------------