diff --git a/packages/omgx/wallet-frontend/src/components/input/Input.js b/packages/omgx/wallet-frontend/src/components/input/Input.js
index 01968593e72fb..d22eb1c4a6db6 100644
--- a/packages/omgx/wallet-frontend/src/components/input/Input.js
+++ b/packages/omgx/wallet-frontend/src/components/input/Input.js
@@ -41,6 +41,9 @@ function Input({
   variant,
   newStyle = false,
   allowUseAll = false,
+  allowExitAll = false,
+  onExitAll,
+  loading,
 }) {
 
   async function handlePaste() {
@@ -112,6 +115,21 @@ function Input({
                 </Button>
               </Box>
             )}
+            {allowExitAll && (
+              <Box>
+                <Button 
+                  onClick={onExitAll}
+                  variant="small" 
+                  size="small"
+                  sx={{margin: '10px 0px'}}
+                  loading={loading}
+                  triggerTime={new Date()}
+                  tooltip={loading ? "Your transaction is still pending. Please wait for confirmation." : "Click here to bridge your funds to L1"}
+                >
+                  Bridge All to L1
+                </Button>
+              </Box>
+            )}
           </S.ActionsWrapper>
         )}
         {paste && (
diff --git a/packages/omgx/wallet-frontend/src/components/input/Input.styles.js b/packages/omgx/wallet-frontend/src/components/input/Input.styles.js
index 6a333d02a1247..6f6cc74d5117c 100644
--- a/packages/omgx/wallet-frontend/src/components/input/Input.styles.js
+++ b/packages/omgx/wallet-frontend/src/components/input/Input.styles.js
@@ -58,6 +58,7 @@ export const InputWrapper = styled(Box)(({ theme }) => ({
 export const ActionsWrapper = styled(Box)`
   display: flex;
   flex-direction: column;
-  align-items: flex-end;
+  align-items: center;
   flex: 3;
+  margin-left: 10px;
 `;
diff --git a/packages/omgx/wallet-frontend/src/containers/modals/exit/steps/DoExitStepFast.js b/packages/omgx/wallet-frontend/src/containers/modals/exit/steps/DoExitStepFast.js
index 89b28975c6f51..8545fbc24af3a 100644
--- a/packages/omgx/wallet-frontend/src/containers/modals/exit/steps/DoExitStepFast.js
+++ b/packages/omgx/wallet-frontend/src/containers/modals/exit/steps/DoExitStepFast.js
@@ -186,8 +186,11 @@ function DoExitStepFast({ handleClose, token }) {
           maxValue={maxValue}
           newStyle
           variant="standard"
+          loading={loading}
+          onExitAll={doExitAll}
+          allowExitAll={true}
         />
-
+{/* 
         <Button
           onClick={doExitAll}
           color='primary'
@@ -200,7 +203,7 @@ function DoExitStepFast({ handleClose, token }) {
           size='small'
         >
           Bridge All to L1
-        </Button>
+        </Button> */}
 
         {validValue && token && (
           <Typography variant="body2" sx={{mt: 2}}>