diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
index debd2c8d..58ac0f6e 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift
@@ -34,7 +34,6 @@ import VDS
         buttonGroup.alignment = .center
         buttonGroup.rowQuantityPhone = 2
         buttonGroup.rowQuantityTablet = 2
-        buttonGroup.childWidth = .percentage(50)
     }
         
     //--------------------------------------------------
@@ -69,8 +68,12 @@ import VDS
             primaryButton.set(with: primaryModel, delegateObject, additionalData)
             buttons.append(primaryButton)
         }
+
+        buttonGroup.childWidth = viewModel.fillContainer ? .percentage(100) : nil
         
-        buttonGroup.buttons = buttons
+        if buttons.count != buttonGroup.buttons.count {
+            buttonGroup.buttons = buttons
+        }
     }
 
     //--------------------------------------------------
@@ -84,6 +87,7 @@ import VDS
     //--------------------------------------------------
     // MARK: - MVMCoreViewProtocol
     //--------------------------------------------------
+    
     public func updateView(_ size: CGFloat) {
         setNeedsUpdate()
     }