diff --git a/src/components/yield/YieldPushFeeV3.tsx b/src/components/yield/YieldPushFeeV3.tsx
index d6fdb01b90..166e8d1b0a 100644
--- a/src/components/yield/YieldPushFeeV3.tsx
+++ b/src/components/yield/YieldPushFeeV3.tsx
@@ -25,7 +25,7 @@ import {
   SkeletonLine,
   SpanV2,
 } from 'components/reusables/SharedStylingV2';
-import { Button } from 'blocks';
+import { Box, Button } from 'blocks';
 
 // Internal Configs
 import { abis, addresses } from 'config/index.js';
@@ -720,24 +720,29 @@ const YieldPushFeeV3 = ({ userDataPush, getUserDataPush, PUSHPoolstats, getPUSHP
                   ButtonTitle={'Unstake PUSH'}
                 />
               ) : (
-                <Button
-                  variant="outline"
-                  size="medium"
-                  block
-                  onClick={unstakeTokensPaginated}
+                <Box
+                  display="flex"
+                  width="-webkit-fill-available"
                 >
-                  {txInProgressWithdraw ? (
-                    <LoaderSpinner
-                      type={LOADER_TYPE.SEAMLESS}
-                      spinnerSize={26}
-                      spinnerColor={theme.activeButtonText}
-                      title="Unstaking"
-                      titleColor={theme.activeButtonText}
-                    />
-                  ) : (
-                    'Unstake $PUSH'
-                  )}
-                </Button>
+                  <Button
+                    variant="outline"
+                    size="medium"
+                    block
+                    onClick={unstakeTokensPaginated}
+                  >
+                    {txInProgressWithdraw ? (
+                      <LoaderSpinner
+                        type={LOADER_TYPE.SEAMLESS}
+                        spinnerSize={26}
+                        spinnerColor={theme.activeButtonText}
+                        title="Unstaking"
+                        titleColor={theme.activeButtonText}
+                      />
+                    ) : (
+                      'Unstake $PUSH'
+                    )}
+                  </Button>
+                </Box>
               )}
 
               {userDataPush?.availableRewards === 0.0 ? (
@@ -765,24 +770,29 @@ const YieldPushFeeV3 = ({ userDataPush, getUserDataPush, PUSHPoolstats, getPUSHP
                   </Button>
                 </StakingToolTip>
               ) : (
-                <Button
-                  variant="outline"
-                  size="medium"
-                  block
-                  onClick={claimRewards}
+                <Box
+                  display="flex"
+                  width="-webkit-fill-available"
                 >
-                  {txInProgressClaimRewards ? (
-                    <LoaderSpinner
-                      type={LOADER_TYPE.SEAMLESS}
-                      spinnerSize={26}
-                      spinnerColor={theme.activeButtonText}
-                      title="Claiming"
-                      titleColor={theme.activeButtonText}
-                    />
-                  ) : (
-                    'Claim Rewards'
-                  )}
-                </Button>
+                  <Button
+                    variant="outline"
+                    size="medium"
+                    block
+                    onClick={claimRewards}
+                  >
+                    {txInProgressClaimRewards ? (
+                      <LoaderSpinner
+                        type={LOADER_TYPE.SEAMLESS}
+                        spinnerSize={26}
+                        spinnerColor={theme.activeButtonText}
+                        title="Claiming"
+                        titleColor={theme.activeButtonText}
+                      />
+                    ) : (
+                      'Claim Rewards'
+                    )}
+                  </Button>
+                </Box>
               )}
             </ButtonsContainer>
           </>
@@ -817,6 +827,7 @@ const ErrorToolTip = (props) => {
       <Button
         size="medium"
         disabled={true}
+        block
       >
         {props.ButtonTitle}
       </Button>
@@ -864,7 +875,7 @@ const OuterContainer = styled.div`
   position: relative;
   @media ${device.tablet} {
     width: 100%;
-    min-width: 100%;
+    /* min-width: 100%; */
     max-width: 100%;
   }
 `;
diff --git a/src/components/yield/YieldUniswapV3.tsx b/src/components/yield/YieldUniswapV3.tsx
index 2ad7bbb898..cddb1ca440 100644
--- a/src/components/yield/YieldUniswapV3.tsx
+++ b/src/components/yield/YieldUniswapV3.tsx
@@ -25,7 +25,7 @@ import {
   SkeletonLine,
   SpanV2,
 } from 'components/reusables/SharedStylingV2';
-import { Button } from 'blocks';
+import { Box, Button } from 'blocks';
 
 // Internal Configs
 import { abis, addresses } from 'config/index.js';
@@ -595,24 +595,29 @@ const YieldUniswapV3 = ({ lpPoolStats, userDataLP, getLpPoolStats, getUserDataLP
                   </Button>
                 </StakingToolTip>
               ) : (
-                <Button
-                  size="medium"
-                  variant="outline"
-                  block
-                  onClick={withdrawAmountTokenFarmAutomatic}
+                <Box
+                  display="flex"
+                  width="-webkit-fill-available"
                 >
-                  {txInProgressWithdraw ? (
-                    <LoaderSpinner
-                      type={LOADER_TYPE.SEAMLESS}
-                      spinnerSize={26}
-                      spinnerColor={theme.activeButtonText}
-                      title="Unstaking"
-                      titleColor={theme.activeButtonText}
-                    />
-                  ) : (
-                    'Unstake $UNI-V2'
-                  )}
-                </Button>
+                  <Button
+                    size="medium"
+                    variant="outline"
+                    block
+                    onClick={withdrawAmountTokenFarmAutomatic}
+                  >
+                    {txInProgressWithdraw ? (
+                      <LoaderSpinner
+                        type={LOADER_TYPE.SEAMLESS}
+                        spinnerSize={26}
+                        spinnerColor={theme.activeButtonText}
+                        title="Unstaking"
+                        titleColor={theme.activeButtonText}
+                      />
+                    ) : (
+                      'Unstake $UNI-V2'
+                    )}
+                  </Button>
+                </Box>
               )}
 
               {userDataLP?.totalAvailableReward === '0.00' ? (
@@ -640,24 +645,29 @@ const YieldUniswapV3 = ({ lpPoolStats, userDataLP, getLpPoolStats, getUserDataLP
                   </Button>
                 </StakingToolTip>
               ) : (
-                <Button
-                  variant="outline"
-                  size="medium"
-                  block
-                  onClick={() => massClaimRewardsTokensAll()}
+                <Box
+                  display="flex"
+                  width="-webkit-fill-available"
                 >
-                  {txInProgressClaimRewards ? (
-                    <LoaderSpinner
-                      type={LOADER_TYPE.SEAMLESS}
-                      spinnerSize={26}
-                      spinnerColor={theme.activeButtonText}
-                      title="Claiming"
-                      titleColor={theme.activeButtonText}
-                    />
-                  ) : (
-                    'Claim Rewards'
-                  )}
-                </Button>
+                  <Button
+                    variant="outline"
+                    size="medium"
+                    block
+                    onClick={() => massClaimRewardsTokensAll()}
+                  >
+                    {txInProgressClaimRewards ? (
+                      <LoaderSpinner
+                        type={LOADER_TYPE.SEAMLESS}
+                        spinnerSize={26}
+                        spinnerColor={theme.activeButtonText}
+                        title="Claiming"
+                        titleColor={theme.activeButtonText}
+                      />
+                    ) : (
+                      'Claim Rewards'
+                    )}
+                  </Button>
+                </Box>
               )}
             </ButtonsContainer>
           </>