diff --git a/packages/yoroi-extension/app/assets/images/revamp/icons/info.inline.svg b/packages/yoroi-extension/app/assets/images/revamp/icons/info.inline.svg
new file mode 100644
index 0000000000..dc2f19dbf1
--- /dev/null
+++ b/packages/yoroi-extension/app/assets/images/revamp/icons/info.inline.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 7.5C11.4477 7.5 11 7.94771 11 8.5C11 9.05229 11.4477 9.5 12 9.5H12.01C12.5623 9.5 13.01 9.05229 13.01 8.5C13.01 7.94771 12.5623 7.5 12.01 7.5H12Z" fill="currentColor"/>
+<path d="M12 10.5C11.4477 10.5 11 10.9477 11 11.5V16.5C11 17.0523 11.4477 17.5 12 17.5C12.5523 17.5 13 17.0523 13 16.5V11.5C13 10.9477 12.5523 10.5 12 10.5Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 12.5C2 6.97715 6.47715 2.5 12 2.5C17.5228 2.5 22 6.97715 22 12.5C22 18.0228 17.5228 22.5 12 22.5C6.47715 22.5 2 18.0228 2 12.5ZM12 4.5C7.58172 4.5 4 8.08172 4 12.5C4 16.9183 7.58172 20.5 12 20.5C16.4183 20.5 20 16.9183 20 12.5C20 8.08172 16.4183 4.5 12 4.5Z" fill="currentColor"/>
+</svg>
diff --git a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
index fe8a5749ff..e368431362 100644
--- a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
+++ b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
@@ -8,13 +8,14 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { truncateAddress } from '../../utils/formatters';
 import Dialog from '../widgets/Dialog';
 import DialogCloseButton from '../widgets/DialogCloseButton';
-import ChangellyFetcher from './ChangellyFetcher'
+import ChangellyFetcher from './ChangellyFetcher';
 
 import styles from './BuySellDialog.scss';
-import { ReactComponent as VerifyIcon }  from '../../assets/images/verify-icon.inline.svg'
-import VerticalFlexContainer from '../layout/VerticalFlexContainer'
-import LoadingSpinner from '../widgets/LoadingSpinner'
+import { ReactComponent as VerifyIcon } from '../../assets/images/verify-icon.inline.svg';
+import VerticalFlexContainer from '../layout/VerticalFlexContainer';
+import LoadingSpinner from '../widgets/LoadingSpinner';
 import globalMessages from '../../i18n/global-messages';
+import { Box } from '@mui/material';
 
 const messages = defineMessages({
   dialogTitle: {
@@ -23,11 +24,13 @@ const messages = defineMessages({
   },
   dialogSelectAddress: {
     id: 'buysell.dialog.selectAddress',
-    defaultMessage: '!!!Please select the receiving address. This will be shared with the third party provider called Changelly for the buy / sell of ADA. ',
+    defaultMessage:
+      '!!!Please select the receiving address. This will be shared with the third party provider called Changelly for the buy / sell of ADA. ',
   },
   dialogDescription: {
     id: 'buysell.dialog.instructions',
-    defaultMessage: '!!!Please select your preferences. On the next screen, confirm your selection by pressing the green arrow on the top right',
+    defaultMessage:
+      '!!!Please select your preferences. On the next screen, confirm your selection by pressing the green arrow on the top right',
   },
   dialogManual: {
     id: 'buysell.dialog.manual',
@@ -39,14 +42,15 @@ export type WalletInfo = {|
   walletName: string,
   currencyName: string,
   anAddressFormatted: string,
-|}
+|};
 
 type Props = {|
   +onCancel: void => void,
-  +genWalletList: () => Promise<Array<WalletInfo>>
+  +genWalletList: () => Promise<Array<WalletInfo>>,
 |};
 
-const WIDGET_URL = 'https://widget.changelly.com?from=*&to=*&amount=200&fromDefault=usd&toDefault=ada&theme=default&merchant_id=g9qheu8vschp16jj&payment_id=&v=3'
+const WIDGET_URL =
+  'https://widget.changelly.com?from=*&to=*&amount=200&fromDefault=usd&toDefault=ada&theme=default&merchant_id=g9qheu8vschp16jj&payment_id=&v=3';
 
 type State = {|
   addressSelected: ?string,
@@ -55,7 +59,7 @@ type State = {|
 
 @observer
 export default class BuySellDialog extends Component<Props, State> {
-  static contextTypes: {|intl: $npm$ReactIntl$IntlFormat|} = {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
@@ -64,41 +68,38 @@ export default class BuySellDialog extends Component<Props, State> {
     walletList: null,
   };
 
-  async componentDidMount () {
+  async componentDidMount() {
     const { intl } = this.context;
 
-    const resp = await this.props.genWalletList()
+    const resp = await this.props.genWalletList();
     const wallets = [
       ...resp,
       {
         walletName: intl.formatMessage(messages.dialogManual),
         currencyName: '',
         anAddressFormatted: '',
-      }
-    ]
-    this.setState({ walletList: wallets })
+      },
+    ];
+    this.setState({ walletList: wallets });
   }
 
-  createRows: ($npm$ReactIntl$IntlFormat, Array<WalletInfo>) => Node = (intl, wallets) => (
+  createRows: ($npm$ReactIntl$IntlFormat, Array<WalletInfo>) => Node = (intl, wallets) =>
     wallets.map((wallet, i) => {
       return (
         // eslint-disable-next-line react/no-array-index-key
         <div key={i} className={styles.row}>
           <div className={styles.left}>
             <div className={styles.nameAndCurrency}>
-              { wallet.currencyName ? `(${wallet.currencyName}) ` : ''}{wallet.walletName}
-            </div>
-            <div className={styles.address}>
-              {truncateAddress(wallet.anAddressFormatted)}
+              {wallet.currencyName ? `(${wallet.currencyName}) ` : ''}
+              {wallet.walletName}
             </div>
+            <div className={styles.address}>{truncateAddress(wallet.anAddressFormatted)}</div>
           </div>
           <div className={styles.right}>
             {/* Verify Address action */}
             <button
               type="button"
-              onClick={() =>
-                this.setState({ addressSelected: wallet.anAddressFormatted })
-              }
+              onClick={() => this.setState({ addressSelected: wallet.anAddressFormatted })}
             >
               <div>
                 <span className={styles.verifyIcon}>
@@ -109,9 +110,8 @@ export default class BuySellDialog extends Component<Props, State> {
             {/* Action block end */}
           </div>
         </div>
-      )
-    })
-  )
+      );
+    });
 
   render(): Node {
     const { intl } = this.context;
@@ -137,32 +137,27 @@ export default class BuySellDialog extends Component<Props, State> {
           closeOnOverlayClick={false}
           onClose={this.props.onCancel}
           closeButton={<DialogCloseButton />}
-          className=""
         >
           <div className={styles.content}>
-            {intl.formatMessage(messages.dialogSelectAddress)}
+            <Box mb="24px">{intl.formatMessage(messages.dialogSelectAddress)}</Box>
             {addressNodes}
           </div>
         </Dialog>
-      )
-    }
-
-      return (
-        <Dialog
-          title={intl.formatMessage(messages.dialogTitle)}
-          closeOnOverlayClick={false}
-          onClose={this.props.onCancel}
-          closeButton={<DialogCloseButton />}
-          className=""
-        >
-          <div className={styles.component}>
-            <div className={styles.description}>
-              {intl.formatMessage(messages.dialogDescription)}
-            </div>
-            <ChangellyFetcher widgetURL={WIDGET_URL} address={this.state.addressSelected} />
-          </div>
-        </Dialog>
       );
+    }
 
+    return (
+      <Dialog
+        title={intl.formatMessage(messages.dialogTitle)}
+        closeOnOverlayClick={false}
+        onClose={this.props.onCancel}
+        closeButton={<DialogCloseButton />}
+      >
+        <div className={styles.component}>
+          <div className={styles.description}>{intl.formatMessage(messages.dialogDescription)}</div>
+          <ChangellyFetcher widgetURL={WIDGET_URL} address={this.state.addressSelected} />
+        </div>
+      </Dialog>
+    );
   }
 }
diff --git a/packages/yoroi-extension/app/components/buySell/BuySellDialog.scss b/packages/yoroi-extension/app/components/buySell/BuySellDialog.scss
index 9c50988475..cf70c7a277 100644
--- a/packages/yoroi-extension/app/components/buySell/BuySellDialog.scss
+++ b/packages/yoroi-extension/app/components/buySell/BuySellDialog.scss
@@ -4,6 +4,7 @@
   padding-left: 40px;
   padding-right: 40px;
   max-height: 600px;
+  max-width: 600px;
 
   .description {
     color: var(--yoroi-palette-gray-900);
@@ -20,17 +21,16 @@
   flex-direction: column;
   letter-spacing: 0;
   line-height: 22px;
+  max-width: 600px;
 }
 
 .row {
   display: flex;
-  flex-direction: row;
-  height: 60px;
-  align-items: flex-start;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: space-between;
 
   .left {
-    flex: 7;
-
     .nameAndCurrency {
       color: var(--yoroi-palette-gray-900);
       font-size: 16px;
@@ -44,15 +44,6 @@
       line-height: 22px;
     }
   }
-  .right {
-    flex: 1;
-    width: 40px;
-    height: 40px;
-  }
-}
-
-.row:first-child {
-  margin-top: 40px;
 }
 
 .verifyIcon {
diff --git a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
index 997bb302bb..de71fcc31d 100644
--- a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
+++ b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
@@ -1,27 +1,26 @@
 // @flow
-import { BigNumber } from 'bignumber.js';
 import type { Node } from 'react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
+import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
+import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
+import type { WalletsNavigation } from '../../api/localStorage';
+import { BigNumber } from 'bignumber.js';
 import { Component } from 'react';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
-import DialogRevamp from '../widgets/DialogRevamp';
-import DialogCloseButton from '../widgets/DialogCloseButton';
-import styles from './WalletListDialog.scss';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { ReactComponent as IconEyeOpen } from '../../assets/images/my-wallets/icon_eye_open.inline.svg';
 import { ReactComponent as IconEyeClosed } from '../../assets/images/my-wallets/icon_eye_closed.inline.svg';
-import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
-import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import { MultiToken } from '../../api/common/lib/MultiToken';
-import WalletCard from './WalletCard';
 import { DragDropContext, Droppable } from 'react-beautiful-dnd';
-import globalMessages from '../../i18n/global-messages';
-import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
-import AmountDisplay, { FiatDisplay } from '../common/AmountDisplay';
-import type { WalletsNavigation } from '../../api/localStorage';
-import { Button, Stack } from '@mui/material';
 import { Box } from '@mui/system';
 import { PublicDeriver } from '../../api/ada/lib/storage/models/PublicDeriver';
+import Dialog from '../widgets/Dialog';
+import DialogCloseButton from '../widgets/DialogCloseButton';
+import styles from './WalletListDialog.scss';
+import WalletCard from './WalletCard';
+import globalMessages from '../../i18n/global-messages';
+import AmountDisplay, { FiatDisplay } from '../common/AmountDisplay';
 
 const messages = defineMessages({
   addWallet: {
@@ -185,12 +184,31 @@ export default class WalletListDialog extends Component<Props, State> {
     const walletsTotal = this.renderWalletsTotal();
 
     return (
-      <DialogRevamp
+      <Dialog
         className={styles.component}
         title={intl.formatMessage(globalMessages.changeWallet)}
         closeOnOverlayClick
         closeButton={<DialogCloseButton />}
         onClose={this.props.close}
+        actions={[
+          {
+            id: 'addWalletButton',
+            onClick: onAddWallet,
+            size: 'large',
+            label: intl.formatMessage(messages.addWallet),
+          },
+          {
+            id: 'applyWalletButton',
+            onClick: this.onSelect,
+            size: 'large',
+            disabled:
+              this.state.selectedWallet === null ||
+              this.isCurrentWallet(this.state.selectedWallet, 'global'),
+            primary: true,
+            label: intl.formatMessage(messages.applyWallet),
+          },
+        ]}
+        scrollableContentClass="WalletList"
       >
         <Box>
           <div className={styles.header}>
@@ -206,7 +224,7 @@ export default class WalletListDialog extends Component<Props, State> {
               </button>
             </div>
           </div>
-          <Box sx={{ overflow: 'auto',  overflowY: 'auto', paddingX: '40px', height: '400px' }}>
+          <Box className="WalletList" sx={{ overflow: 'auto', overflowY: 'auto', height: '400px' }}>
             {cardanoWalletsIdx.length > 0 && (
               <div className={styles.sectionHeader}>
                 <h1>{intl.formatMessage(messages.cardano)}</h1>
@@ -277,42 +295,8 @@ export default class WalletListDialog extends Component<Props, State> {
               </Droppable>
             </DragDropContext>
           </Box>
-          <Stack
-            spacing={1}
-            direction="row"
-            sx={{
-              alignItems: 'center',
-              justifyContent: 'center',
-              padding: '40px',
-              borderTop: '1px solid var(--yoroi-palette-gray-100)',
-            }}
-          >
-            <Button
-              id="addWalletButton"
-              onClick={onAddWallet}
-              size="large"
-              variant="outlined"
-              color="primary"
-              fullWidth
-            >
-              {intl.formatMessage(messages.addWallet)}
-            </Button>
-            <Button
-              id="applyWalletButton"
-              onClick={this.onSelect}
-              size="large"
-              disabled={
-                this.state.selectedWallet === null ||
-                this.isCurrentWallet(this.state.selectedWallet, 'global')
-              }
-              fullWidth
-              variant="primary"
-            >
-              {intl.formatMessage(messages.applyWallet)}
-            </Button>
-          </Stack>
         </Box>
-      </DialogRevamp>
+      </Dialog>
     );
   }
 
diff --git a/packages/yoroi-extension/app/components/topbar/WalletListDialog.scss b/packages/yoroi-extension/app/components/topbar/WalletListDialog.scss
index 7208cf4288..0e65e3615b 100644
--- a/packages/yoroi-extension/app/components/topbar/WalletListDialog.scss
+++ b/packages/yoroi-extension/app/components/topbar/WalletListDialog.scss
@@ -1,25 +1,9 @@
 .component {
-  font-size: 16px;
-  min-width: 675px !important;
-  height: 700px;
-  max-height: unset !important;
-  padding-right: 0 !important;
-  padding-bottom: 0px !important;
-
-  & > div {
-    padding: 0px;
-    max-height: unset !important;
-  }
-
   .header {
     position: sticky;
     top: 0px;
     background: var(--yoroi-comp-dialog-background);
     padding-bottom: 14px;
-
-    padding-top: 14px;
-    padding-left: 40px;
-
   }
 
   .totalInfo {
@@ -48,7 +32,7 @@
   }
 
   .sectionHeader {
-    color: #A7AFC0;
+    color: #a7afc0;
     font-size: 14px;
     margin-top: 26px;
   }
@@ -60,4 +44,3 @@
     overflow-y: auto;
   }
 }
-
diff --git a/packages/yoroi-extension/app/components/transfer/ErrorPage.js b/packages/yoroi-extension/app/components/transfer/ErrorPage.js
index bc61d0d791..daaaa04b28 100644
--- a/packages/yoroi-extension/app/components/transfer/ErrorPage.js
+++ b/packages/yoroi-extension/app/components/transfer/ErrorPage.js
@@ -46,7 +46,6 @@ export default class ErrorPage extends Component<Props> {
         closeOnOverlayClick={false}
         closeButton={<DialogCloseButton />}
         onClose={onCancel}
-        className={styles.dialog}
       >
         <div className={styles.component}>
           <div>
diff --git a/packages/yoroi-extension/app/components/transfer/ErrorPage.scss b/packages/yoroi-extension/app/components/transfer/ErrorPage.scss
index c0ac735a62..af65710ca6 100644
--- a/packages/yoroi-extension/app/components/transfer/ErrorPage.scss
+++ b/packages/yoroi-extension/app/components/transfer/ErrorPage.scss
@@ -5,6 +5,7 @@
   height: 100%;
   align-items: center;
   justify-content: center;
+  max-width: 600px;
 }
 
 .body {
diff --git a/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js b/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js
index a7e292ddbc..e89d2387a8 100644
--- a/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js
+++ b/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js
@@ -7,7 +7,7 @@ import DialogCloseButton from '../widgets/DialogCloseButton';
 import LoadingSpinner from '../widgets/LoadingSpinner';
 import { Box, Typography } from '@mui/material';
 import { ReactComponent as SuccessImg } from '../../assets/images/transfer-success.inline.svg';
-import DialogRevamp from '../widgets/DialogRevamp';
+import Dialog from '../widgets/Dialog';
 
 type Props = {|
   +title: string,
@@ -38,7 +38,7 @@ export class SuccessPageRevamp extends Component<Props> {
           ];
 
     return (
-      <DialogRevamp
+      <Dialog
         title={title}
         actions={actions}
         closeOnOverlayClick={false}
@@ -58,12 +58,12 @@ export class SuccessPageRevamp extends Component<Props> {
           >
             <SuccessImg />
           </Box>
-          <Typography variant="body2" color="gray.900" textAlign="left" mt="4px" mb="24px">
+          <Typography variant="body1" color="grayscale.900" textAlign="left" mt="4px">
             {text}
           </Typography>
           {this.props.closeInfo == null && <LoadingSpinner />}
         </Box>
-      </DialogRevamp>
+      </Dialog>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js b/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js
index cf992d525a..afd571598a 100644
--- a/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js
+++ b/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js
@@ -1,21 +1,22 @@
 // @flow
 import type { Node } from 'react';
+import type { Notification } from '../../types/notificationType';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { Component } from 'react';
-import classnames from 'classnames';
 import { observer } from 'mobx-react';
 import { intlShape, defineMessages } from 'react-intl';
 import { buildURI } from '../../utils/URIHandling';
+import { ReactComponent as InfoIcon } from '../../assets/images/revamp/icons/info.inline.svg';
+import { Box, Typography } from '@mui/material';
+import classnames from 'classnames';
 import Dialog from '../widgets/Dialog';
 import DialogBackButton from '../widgets/DialogBackButton';
 import DialogCloseButton from '../widgets/DialogCloseButton';
 import QrCodeWrapper from '../widgets/QrCodeWrapper';
-import WarningBox from '../widgets/WarningBox';
 import CopyableAddress from '../widgets/CopyableAddress';
-import type { Notification } from '../../types/notificationType';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import BigNumber from 'bignumber.js';
-
 import styles from './URIDisplayDialog.scss';
+import globalMessages from '../../i18n/global-messages';
 
 const messages = defineMessages({
   uriDisplayDialogTitle: {
@@ -28,8 +29,9 @@ const messages = defineMessages({
   },
   usabilityWarning: {
     id: 'uri.display.dialog.usabilityWarning',
-    defaultMessage: '!!!This link can only be opened by users with Yoroi installed on their browser',
-  }
+    defaultMessage:
+      '!!!This link can only be opened by users with Yoroi installed on their browser',
+  },
 });
 
 type Props = {|
@@ -43,32 +45,18 @@ type Props = {|
 
 @observer
 export default class URIDisplayDialog extends Component<Props> {
-
-  static contextTypes: {|intl: $npm$ReactIntl$IntlFormat|} = {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
   render(): Node {
-    const {
-      onClose,
-      onBack,
-      notification,
-      onCopyAddressTooltip,
-      address,
-      amount,
-    } = this.props;
+    const { onClose, onBack, notification, onCopyAddressTooltip, address, amount } = this.props;
 
     const { intl } = this.context;
 
     const uri = buildURI(address, amount);
     const uriNotificationId = 'uri-copyNotification';
 
-    const uriUsabilityWarning = (
-      <WarningBox>
-        {intl.formatMessage(messages.usabilityWarning)}
-      </WarningBox>
-    );
-
     return (
       <Dialog
         title={intl.formatMessage(messages.uriDisplayDialogTitle)}
@@ -78,27 +66,51 @@ export default class URIDisplayDialog extends Component<Props> {
         onClose={onClose}
         backButton={<DialogBackButton onBack={onBack} />}
       >
-        {uriUsabilityWarning}
-        <div className={styles.qrCode}>
-          <QrCodeWrapper
-            value={uri}
-            size={152}
-          />
-        </div>
-        <div className={styles.uriDisplay}>
-          <CopyableAddress
-            hash={uri}
-            elementId={uriNotificationId}
-            onCopyAddress={() => onCopyAddressTooltip(uriNotificationId)}
-            notification={notification}
-            placementTooltip="bottom-start"
+        <Box maxWidth="600px">
+          <Box
+            sx={{
+              p: '16px',
+              pt: '12px',
+              borderRadius: '8px',
+              background: 'linear-gradient(269.97deg, #E4E8F7 0%, #C6F7ED 100%)',
+            }}
           >
-            <span className={styles.uri}>{uri}</span>
-          </CopyableAddress>
-        </div>
+            <Box mb="8px" display="flex" alignItems="center" justifyContent="flex-start" gap="8px">
+              <Box component="span" color="grayscale.max">
+                <InfoIcon />
+              </Box>
+              <Typography variant="body1" fontWeight={500}>
+                {intl.formatMessage(globalMessages.important)}
+              </Typography>
+            </Box>
+            <Typography variant="body1" color="grayscale.max">
+              {intl.formatMessage(messages.usabilityWarning)}
+            </Typography>
+          </Box>
+          <div className={styles.qrCode}>
+            <QrCodeWrapper value={uri} fgColor="black" size={152} />
+          </div>
+          <div className={styles.uriDisplay}>
+            <CopyableAddress
+              hash={uri}
+              elementId={uriNotificationId}
+              onCopyAddress={() => onCopyAddressTooltip(uriNotificationId)}
+              notification={notification}
+              placementTooltip="bottom-start"
+              sx={{
+                alignItems: 'flex-start',
+                '& > .CopyableAddress_copyIconBig': {
+                  p: '6px',
+                  width: 'auto',
+                  height: 'auto',
+                },
+              }}
+            >
+              <span className={styles.uri}>{uri}</span>
+            </CopyableAddress>
+          </div>
+        </Box>
       </Dialog>
-
     );
   }
-
 }
diff --git a/packages/yoroi-extension/app/components/uri/URIDisplayDialog.scss b/packages/yoroi-extension/app/components/uri/URIDisplayDialog.scss
index 8b7083b8cc..053c5fd381 100644
--- a/packages/yoroi-extension/app/components/uri/URIDisplayDialog.scss
+++ b/packages/yoroi-extension/app/components/uri/URIDisplayDialog.scss
@@ -1,38 +1,27 @@
 .component {
-  min-width: var(--yoroi-comp-dialog-min-width-lg) !important;
-  max-width: var(--yoroi-comp-dialog-min-width-lg) !important;
-
   :global {
     .Dialog_title {
       margin-bottom: 24px;
     }
-
-    .CopyableAddress_copyIconBig {
-      & > svg {
-        margin-top: -7px;
-      }
-    }
   }
 
   .uriDisplay {
-    width: 90%;
     margin-left: auto;
     margin-right: auto;
-    margin-bottom: 24px;
     display: flex;
-    align-items: center;
+    align-items: flex-start;
 
     .uri {
       font-weight: 400;
       word-break: break-all;
       font-size: 16px;
       line-height: 24px;
-      text-align: center;
+      text-align: left;
     }
   }
 
   .qrCode {
-    margin: 34px auto 20px auto;
+    margin: 24px auto;
     text-align: center;
   }
 }
diff --git a/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js b/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js
index 9b9bb35013..af5d20f7a7 100644
--- a/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js
+++ b/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js
@@ -22,7 +22,8 @@ import { getTokenName } from '../../stores/stateless/tokenHelpers';
 import BigNumber from 'bignumber.js';
 
 import styles from './URIGenerateDialog.scss';
-import ThemedDialog from '../widgets/ThemedDialog';
+// import ThemedDialog from '../widgets/ThemedDialog';
+import Dialog from '../widgets/Dialog';
 
 const messages = defineMessages({
   uriGenerateDialogTitle: {
@@ -140,7 +141,7 @@ export default class URIGenerateDialog extends Component<Props> {
     ];
 
     return (
-      <ThemedDialog
+      <Dialog
         title={intl.formatMessage(messages.uriGenerateDialogTitle)}
         actions={actions}
         className={dialogClasses}
@@ -171,7 +172,7 @@ export default class URIGenerateDialog extends Component<Props> {
             />
           </div>
         </div>
-      </ThemedDialog>
+      </Dialog>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/uri/URIGenerateDialog.scss b/packages/yoroi-extension/app/components/uri/URIGenerateDialog.scss
index 39c08504b6..19e693410f 100644
--- a/packages/yoroi-extension/app/components/uri/URIGenerateDialog.scss
+++ b/packages/yoroi-extension/app/components/uri/URIGenerateDialog.scss
@@ -1,7 +1,4 @@
 .component {
-  min-width: var(--yoroi-comp-dialog-min-width-lg) !important;
-  max-width: var(--yoroi-comp-dialog-min-width-lg) !important;
-
   :global {
     .Dialog_title {
       margin-bottom: 30px;
diff --git a/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js b/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js
index 5168af2a05..39587180cd 100644
--- a/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js
@@ -6,8 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import LocalizableError from '../../../i18n/LocalizableError';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import type { TransactionRowsToExportRequest } from '../../../actions/common/transactions-actions';
-import ClassicDialog from '../../widgets/Dialog';
-import DialogRevamp from '../../widgets/DialogRevamp';
+import Dialog from '../../widgets/Dialog';
 import DialogCloseButton from '../../widgets/DialogCloseButton';
 import ErrorBlock from '../../widgets/ErrorBlock';
 import globalMessages from '../../../i18n/global-messages';
@@ -110,8 +109,6 @@ class ExportTransactionDialog extends Component<Props & InjectedLayoutProps, Sta
       },
     ];
 
-    const Dialog = isRevampLayout ? DialogRevamp : ClassicDialog;
-
     return (
       <Dialog
         className="ExportTransactionDialog"
diff --git a/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.js b/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.js
index f771c01bf2..3f61fcb899 100644
--- a/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.js
@@ -3,30 +3,18 @@
 /* eslint react/jsx-one-expression-per-line: 0 */ // the &nbsp; in the html breaks this
 
 import type { Node, ComponentType } from 'react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { Notification } from '../../../types/notificationType';
+import type { StandardAddress } from '../../../types/AddressFilterTypes';
+import type { Addressing } from '../../../api/ada/lib/storage/models/PublicDeriver/interfaces';
+import type { ComplexityLevelType } from '../../../types/complexityLevelType';
+import type { InjectedLayoutProps } from '../../../styles/context/layout';
 import { Component } from 'react';
 import { observer } from 'mobx-react';
-import classnames from 'classnames';
 import { defineMessages, intlShape } from 'react-intl';
 import { toDerivationPathString } from '../../../api/common/lib/crypto/keys/path';
-
-import QrCodeWrapper from '../../widgets/QrCodeWrapper';
-import DialogClassic from '../../widgets/Dialog';
-import DialogRevamp from '../../widgets/DialogRevamp';
-import DialogCloseButton from '../../widgets/DialogCloseButton';
-import ErrorBlock from '../../widgets/ErrorBlock';
-import RawHash from '../../widgets/hashWrappers/RawHash';
-import ExplorableHashContainer from '../../../containers/widgets/ExplorableHashContainer';
 import { SelectedExplorer } from '../../../domain/SelectedExplorer';
-
-import LocalizableError from '../../../i18n/LocalizableError';
-import globalMessages from '../../../i18n/global-messages';
-import styles from './VerifyAddressDialog.scss';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { truncateAddress } from '../../../utils/formatters';
-import CopyableAddress from '../../widgets/CopyableAddress';
-import type { Notification } from '../../../types/notificationType';
-import type { StandardAddress } from '../../../types/AddressFilterTypes';
-import type { Addressing } from '../../../api/ada/lib/storage/models/PublicDeriver/interfaces';
 import { CoreAddressTypes } from '../../../api/ada/lib/storage/database/primitives/enums';
 import { RustModule } from '../../../api/ada/lib/cardanoCrypto/rustLoader';
 import {
@@ -34,10 +22,19 @@ import {
   getCardanoSpendingKeyHash,
   normalizeToAddress,
 } from '../../../api/ada/lib/storage/bridge/utils';
-import type { ComplexityLevelType } from '../../../types/complexityLevelType';
 import { ComplexityLevels } from '../../../types/complexityLevelType';
 import { withLayout } from '../../../styles/context/layout';
-import type { InjectedLayoutProps } from '../../../styles/context/layout';
+import classnames from 'classnames';
+import QrCodeWrapper from '../../widgets/QrCodeWrapper';
+import Dialog from '../../widgets/Dialog';
+import DialogCloseButton from '../../widgets/DialogCloseButton';
+import ErrorBlock from '../../widgets/ErrorBlock';
+import RawHash from '../../widgets/hashWrappers/RawHash';
+import ExplorableHashContainer from '../../../containers/widgets/ExplorableHashContainer';
+import LocalizableError from '../../../i18n/LocalizableError';
+import globalMessages from '../../../i18n/global-messages';
+import styles from './VerifyAddressDialog.scss';
+import CopyableAddress from '../../widgets/CopyableAddress';
 
 const messages = defineMessages({
   addressDetailsTitleLabel: {
@@ -78,7 +75,6 @@ class VerifyAddressDialog extends Component<Props & InjectedLayoutProps> {
 
   render(): Node {
     const { intl } = this.context;
-    const { isRevampLayout } = this.props;
 
     const dialogActions = !this.props.isHardware
       ? []
@@ -91,8 +87,6 @@ class VerifyAddressDialog extends Component<Props & InjectedLayoutProps> {
           },
         ];
 
-    const Dialog = isRevampLayout ? DialogClassic : DialogRevamp;
-
     return (
       <Dialog
         className={classnames([styles.component, 'VerifyAddressDialog'])}
@@ -154,7 +148,7 @@ class VerifyAddressDialog extends Component<Props & InjectedLayoutProps> {
     return (
       <>
         <div align="center">
-          <QrCodeWrapper value={this.props.addressInfo.address} size={152} />
+          <QrCodeWrapper fgColor="black" value={this.props.addressInfo.address} size={152} />
         </div>
         <br />
         <br />
diff --git a/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.scss b/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.scss
index 8be3422a0b..44f6729fd2 100644
--- a/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.scss
+++ b/packages/yoroi-extension/app/components/wallet/receive/VerifyAddressDialog.scss
@@ -26,7 +26,7 @@
   line-height: 22px;
 }
 
-:global(.YoroiModern), :global(.YoroiRevamp) {
+:global(.YoroiModern) {
   .component {
     min-width: var(--yoroi-comp-dialog-min-width-lg);
     max-width: var(--yoroi-comp-dialog-min-width-lg);
diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.js
index 4db8eea8db..3c24dcd12a 100644
--- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.js
@@ -1,31 +1,31 @@
 // @flow
 /* eslint react/jsx-one-expression-per-line: 0 */ // the &nbsp; in the html breaks this
-import { Component } from 'react';
 import type { Node } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import Dialog from '../../../widgets/Dialog';
-import styles from './AddNFTDialog.scss';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { MultiToken } from '../../../../api/common/lib/MultiToken';
-import { ReactComponent as SearchIcon } from '../../../../assets/images/assets-page/search.inline.svg';
-import { ReactComponent as NoItemsFoundImg } from '../../../../assets/images/assets-page/no-nfts.inline.svg';
-import { getNFTs } from '../../../../utils/wallet';
 import type { FormattedNFTDisplay } from '../../../../utils/wallet';
-import BigNumber from 'bignumber.js';
 import type { TokenLookupKey } from '../../../../api/common/lib/MultiToken';
 import type {
   TokenRow,
   NetworkRow,
 } from '../../../../api/ada/lib/storage/database/primitives/tables';
-import { Button, OutlinedInput, Typography } from '@mui/material';
+import { Component } from 'react';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { MultiToken } from '../../../../api/common/lib/MultiToken';
+import { ReactComponent as SearchIcon } from '../../../../assets/images/assets-page/search.inline.svg';
+import { ReactComponent as NoItemsFoundImg } from '../../../../assets/images/assets-page/no-nfts.inline.svg';
+import { getNFTs } from '../../../../utils/wallet';
+import { OutlinedInput, Typography } from '@mui/material';
 import { isCardanoHaskell } from '../../../../api/ada/lib/storage/database/prepackaged/networks';
+import { Box } from '@mui/system';
+import { ampli } from '../../../../../ampli/index';
 import MinAda from './MinAda';
+import Dialog from '../../../widgets/Dialog';
+import styles from './AddNFTDialog.scss';
+import BigNumber from 'bignumber.js';
 import NFTImage from './NFTImage';
 import globalMessages from '../../../../i18n/global-messages';
 import MaxAssetsError from '../MaxAssetsError';
-import { Box } from '@mui/system';
-import { ampli } from '../../../../../ampli/index';
 
 type Props = {|
   +onClose: void => void,
@@ -161,8 +161,8 @@ export default class AddNFTDialog extends Component<Props, State> {
           changed = true;
         }
       } else if (included) {
-          tokens.push({ tokenId: token.TokenId });
-          changed = true;
+        tokens.push({ tokenId: token.TokenId });
+        changed = true;
       }
       if (!included) {
         toRemove.push(token);
@@ -188,6 +188,8 @@ export default class AddNFTDialog extends Component<Props, State> {
     const { onClose, calculateMinAda, shouldAddMoreTokens } = this.props;
     const { currentNftsList, fullNftsList, selectedTokens } = this.state;
     const shouldAddMore = shouldAddMoreTokens(selectedTokens);
+    const hasSelectedTokensIncluded = selectedTokens.filter(t => t.included);
+
     return (
       <Dialog
         title={intl.formatMessage(messages.nNft, { number: fullNftsList.length })}
@@ -195,6 +197,18 @@ export default class AddNFTDialog extends Component<Props, State> {
         className={styles.dialog}
         onClose={onClose}
         withCloseButton
+        scrollableContentClass={styles.nftsGrid}
+        actions={[
+          {
+            disabled:
+              hasSelectedTokensIncluded.length === 0 ||
+              !shouldAddMore ||
+              currentNftsList.length === 0,
+            onClick: this.onAddAll,
+            primary: true,
+            label: intl.formatMessage(globalMessages.confirm),
+          },
+        ]}
       >
         <div className={styles.component}>
           <Box sx={{ position: 'relative', width: '100%' }}>
@@ -288,16 +302,6 @@ export default class AddNFTDialog extends Component<Props, State> {
             </>
           )}
         </div>
-        <Box p="24px">
-          <Button
-            fullWidth
-            disabled={selectedTokens.length === 0 || !shouldAddMore || currentNftsList.length === 0}
-            onClick={this.onAddAll}
-            variant="primary"
-          >
-            {intl.formatMessage(globalMessages.confirm)}
-          </Button>
-        </Box>
       </Dialog>
     );
   }
diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.scss b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.scss
index a9b67d629f..b591a09a42 100644
--- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.scss
+++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddNFTDialog.scss
@@ -3,14 +3,13 @@
   width: 100%;
   display: flex;
   flex-direction: column;
-  padding: 0px 24px;
+  max-width: 648px;
 
   .search {
     border-radius: 8px;
     background-color: #f0f3f5;
     display: flex;
     align-items: center;
-    padding: 0px 20px;
     margin-bottom: 20px;
 
     .searchInput {
@@ -70,7 +69,7 @@
   .nftsGrid {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
-    grid-gap: 25px;
+    grid-gap: 24px;
     padding-bottom: 20px;
     height: 100%;
     max-height: 360px;
@@ -99,18 +98,3 @@
     }
   }
 }
-
-.dialog {
-  min-width: 690px !important;
-  padding: 0px !important;
-  
-  & > div {
-    padding-left: 0px !important;
-    padding-right: 0px;
-    max-height: unset;
-  }
-
-  h1 {
-    padding: 0px;
-  }
-}
diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.js
index f0638b9374..4aa1235546 100644
--- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.js
@@ -14,27 +14,27 @@ import { Component } from 'react';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { MultiToken } from '../../../../api/common/lib/MultiToken';
-import { Button, Typography } from '@mui/material';
+import { Typography } from '@mui/material';
 import { isCardanoHaskell } from '../../../../api/ada/lib/storage/database/prepackaged/networks';
 import { compareNumbers, compareStrings } from '../../assets/AssetsList';
 import { getTokens } from '../../../../utils/wallet';
 import { Box } from '@mui/system';
 import { formattedAmountToNaturalUnits } from '../../../../utils/formatters';
-import Dialog from '../../../widgets/Dialog';
-import styles from './AddTokenDialog.scss';
 import { ReactComponent as SearchIcon } from '../../../../assets/images/assets-page/search.inline.svg';
 import { ReactComponent as ArrowsListFromBottom } from '../../../../assets/images/assets-page/arrows-list-from-bottom.inline.svg';
 import { ReactComponent as ArrowsListFromTop } from '../../../../assets/images/assets-page/arrows-list-from-top.inline.svg';
 import { ReactComponent as InfoIcon } from '../../../../assets/images/revamp/fingerprint-info.inline.svg';
 import { ReactComponent as ArrowsList } from '../../../../assets/images/assets-page/arrows-list.inline.svg';
 import { ReactComponent as NoItemsFoundImg } from '../../../../assets/images/assets-page/no-tokens.inline.svg';
+import { ampli } from '../../../../../ampli/index';
+import Dialog from '../../../widgets/Dialog';
+import styles from './AddTokenDialog.scss';
 import SingleTokenRow from './SingleTokenRow';
 import BigNumber from 'bignumber.js';
 import MinAda from './MinAda';
 import globalMessages from '../../../../i18n/global-messages';
 import MaxAssetsError from '../MaxAssetsError';
 import OutlinedInput from '@mui/material/OutlinedInput';
-import { ampli } from '../../../../../ampli/index';
 
 type Props = {|
   +onClose: void => void,
@@ -332,6 +332,8 @@ export default class AddTokenDialog extends Component<Props, State> {
     const shouldAddMore = shouldAddMoreTokens(
       selectedTokens.map(({ token, included }) => ({ token, included }))
     );
+    const hasSelectedTokensIncluded = selectedTokens.filter(t => t.included);
+
     return (
       <Dialog
         title={
@@ -339,14 +341,27 @@ export default class AddTokenDialog extends Component<Props, State> {
             ? intl.formatMessage(globalMessages.tokens)
             : intl.formatMessage(messages.nTokens, { number: fullTokensList.length })
         }
+        actions={[
+          {
+            disabled:
+              fullTokensList.length === 0 ||
+              hasSelectedTokensIncluded.length === 0 ||
+              !this.isValidAmounts() ||
+              !shouldAddMore,
+            onClick: this.onAddAll,
+            primary: true,
+            label: intl.formatMessage(globalMessages.confirm),
+          },
+        ]}
         closeOnOverlayClick={false}
         className={styles.dialog}
         onClose={onClose}
         withCloseButton
+        scrollableContentClass="CurrentTokensList"
       >
-        <Box py="24px" className={styles.component}>
+        <Box className={styles.component}>
           <Box sx={{ width: '100%' }}>
-            <Box sx={{ position: 'relative', mx: '24px' }}>
+            <Box sx={{ position: 'relative' }}>
               <Box
                 sx={{
                   position: 'absolute',
@@ -381,7 +396,7 @@ export default class AddTokenDialog extends Component<Props, State> {
             </Box>
           )}
           {!shouldAddMore && (
-            <Box sx={{ marginTop: '10px', px: '24px' }}>
+            <Box sx={{ marginTop: '10px' }}>
               <MaxAssetsError maxAssetsAllowed={10} />
             </Box>
           )}
@@ -401,7 +416,6 @@ export default class AddTokenDialog extends Component<Props, State> {
                 borderBottom="1px solid"
                 borderBottomColor="grayscale.200"
                 className={styles.columns}
-                px="24px"
               >
                 <li>
                   <button type="button" onClick={() => this.sortTokens(SORTING_COLUMNS.LABEL)}>
@@ -432,8 +446,8 @@ export default class AddTokenDialog extends Component<Props, State> {
                 height="320px"
                 overflow="auto"
                 pr={currentTokensList.length > 4 ? '4px' : '24px'}
-                pl="24px"
                 pt="10px"
+                className="CurrentTokensList"
               >
                 {currentTokensList.map(token => (
                   <SingleTokenRow
@@ -451,21 +465,6 @@ export default class AddTokenDialog extends Component<Props, State> {
             </Box>
           )}
         </Box>
-        <Box p="24px">
-          <Button
-            fullWidth
-            disabled={
-              fullTokensList.length === 0 ||
-              selectedTokens.length === 0 ||
-              !this.isValidAmounts() ||
-              !shouldAddMore
-            }
-            onClick={this.onAddAll}
-            variant="primary"
-          >
-            {intl.formatMessage(globalMessages.confirm)}
-          </Button>
-        </Box>
       </Dialog>
     );
   }
diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.scss b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.scss
index 49ab27abb7..5144dc91b2 100644
--- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.scss
+++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AddTokenDialog.scss
@@ -3,6 +3,7 @@
   height: 100%;
   display: flex;
   flex-direction: column;
+  max-width: 600px;
 
   .search {
     border-radius: 8px;
@@ -96,14 +97,3 @@
     }
   }
 }
-
-.dialog {
-  min-width: 670px !important;
-  padding: 0 !important;
-
-  & > div {
-    padding-left: 0px !important;
-    max-height: unset;
-    padding-right: 0px !important;
-  }
-}
diff --git a/packages/yoroi-extension/app/components/wallet/settings/ChangeWalletPasswordDialog.js b/packages/yoroi-extension/app/components/wallet/settings/ChangeWalletPasswordDialog.js
index 55b15d8f4b..97d7e229f9 100644
--- a/packages/yoroi-extension/app/components/wallet/settings/ChangeWalletPasswordDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/settings/ChangeWalletPasswordDialog.js
@@ -8,8 +8,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
 import vjf from 'mobx-react-form/lib/validators/VJF';
 import DialogCloseButton from '../../widgets/DialogCloseButton';
-import DialogClassic from '../../widgets/Dialog';
-import DialogRevamp from '../../widgets/DialogRevamp';
+import Dialog from '../../widgets/Dialog';
 import { isValidWalletPassword, isValidRepeatPassword } from '../../../utils/validations';
 import globalMessages from '../../../i18n/global-messages';
 import LocalizableError from '../../../i18n/LocalizableError';
@@ -141,7 +140,7 @@ export default class ChangeWalletPasswordDialog extends Component<Props> {
   render(): Node {
     const { form } = this;
     const { intl } = this.context;
-    const { onCancel, isSubmitting, dialogData, error, isClassicTheme, isRevampTheme } = this.props;
+    const { onCancel, isSubmitting, dialogData, error, isClassicTheme } = this.props;
 
     const dialogClasses = classnames(['changePasswordDialog', styles.dialog]);
 
@@ -176,8 +175,6 @@ export default class ChangeWalletPasswordDialog extends Component<Props> {
       },
     ];
 
-    const Dialog = isRevampTheme ? DialogRevamp : DialogClassic;
-
     return (
       <Dialog
         title={intl.formatMessage(messages.dialogTitleChangePassword)}
diff --git a/packages/yoroi-extension/app/components/wallet/staking/DelegationTxDialog.js b/packages/yoroi-extension/app/components/wallet/staking/DelegationTxDialog.js
index c749155270..6c7c0af962 100644
--- a/packages/yoroi-extension/app/components/wallet/staking/DelegationTxDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/staking/DelegationTxDialog.js
@@ -34,7 +34,6 @@ import { withLayout } from '../../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../../styles/context/layout';
 import { toSvg } from 'jdenticon';
 import { CopyAddress } from '../assets/NFTDetails';
-import DialogRevamp from '../../widgets/DialogRevamp';
 
 const messages = defineMessages({
   delegationTips: {
@@ -260,7 +259,7 @@ class DelegationTxDialog extends Component<Props & InjectedLayoutProps> {
     );
 
     const revampLayout = (
-      <DialogRevamp
+      <Dialog
         title={intl.formatMessage(
           isRevampLayout
             ? globalMessages.delegateLabel
@@ -441,7 +440,7 @@ class DelegationTxDialog extends Component<Props & InjectedLayoutProps> {
             </Typography>
           </Box>
         ) : null}
-      </DialogRevamp>
+      </Dialog>
     );
 
     return this.props.renderLayoutComponent({
diff --git a/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.js b/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.js
index a232cf47d0..011dcf6bd5 100644
--- a/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.js
@@ -17,7 +17,6 @@ import LoadingSpinner from '../../../widgets/LoadingSpinner';
 import VerticallyCenteredLayout from '../../../layout/VerticallyCenteredLayout';
 import LocalizableError from '../../../../i18n/LocalizableError';
 import { groupByPoolName } from '../utils';
-import styles from './RewardHistoryDialog.scss';
 
 const messages = defineMessages({
   epoch: {
@@ -53,49 +52,49 @@ function RewardHistoryDialog({ graphData, onClose, intl }: Props & Intl): Node {
 
   return (
     <Dialog
-      styleOverride={{ minWidth: '673px' }}
       title={intl.formatMessage(globalMessages.rewardHistory)}
       closeOnOverlayClick={false}
       closeButton={<DialogCloseButton onClose={onClose} />}
       onClose={onClose}
-      className={styles.dialog}
     >
-      <Typography mb="24px" variant="body1" fontWeight={500}>
-        {intl.formatMessage(globalMessages.rewardsListLabel)} ({rewardList.length})
-      </Typography>
-      <Box>
-        {graphData.rewardsGraphData.error && (
-          <div>
-            <center>
-              <InvalidURIImg />
-            </center>
-            <ErrorBlock error={graphData.rewardsGraphData.error} />
-          </div>
-        )}
-        {rewardList == null ? (
-          <VerticallyCenteredLayout>
-            <LoadingSpinner />
-          </VerticallyCenteredLayout>
-        ) : (
-          Object.entries(rewardsByPoolName ?? {}).map(([poolName, data]) => (
-            <RewardHistoryItem
-              key={poolName}
-              // $FlowFixMe[incompatible-use]: Object entries flow type
-              poolId={data.poolId}
-              poolName={poolName || '-'}
-              // $FlowFixMe[incompatible-use]: Object entries flow type
-              poolAvatar={data.poolAvatar}
-              // $FlowFixMe[incompatible-use]: Object entries flow type
-              historyList={data.map(item => ({
-                // TODO: Make sure it's "received" in all use cases
-                type: intl.formatMessage(messages.epoch, { number: item.name }),
-                date: item.date,
-                balance: item.primary,
-                currency: item.currency,
-              }))}
-            />
-          ))
-        )}
+      <Box maxWidth="600px">
+        <Typography mb="24px" variant="body1" fontWeight={500}>
+          {intl.formatMessage(globalMessages.rewardsListLabel)} ({rewardList.length})
+        </Typography>
+        <Box>
+          {graphData.rewardsGraphData.error && (
+            <div>
+              <center>
+                <InvalidURIImg />
+              </center>
+              <ErrorBlock error={graphData.rewardsGraphData.error} />
+            </div>
+          )}
+          {rewardList == null ? (
+            <VerticallyCenteredLayout>
+              <LoadingSpinner />
+            </VerticallyCenteredLayout>
+          ) : (
+            Object.entries(rewardsByPoolName ?? {}).map(([poolName, data]) => (
+              <RewardHistoryItem
+                key={poolName}
+                // $FlowFixMe[incompatible-use]: Object entries flow type
+                poolId={data.poolId}
+                poolName={poolName || '-'}
+                // $FlowFixMe[incompatible-use]: Object entries flow type
+                poolAvatar={data.poolAvatar}
+                // $FlowFixMe[incompatible-use]: Object entries flow type
+                historyList={data.map(item => ({
+                  // TODO: Make sure it's "received" in all use cases
+                  type: intl.formatMessage(messages.epoch, { number: item.name }),
+                  date: item.date,
+                  balance: item.primary,
+                  currency: item.currency,
+                }))}
+              />
+            ))
+          )}
+        </Box>
       </Box>
     </Dialog>
   );
diff --git a/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.scss b/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.scss
deleted file mode 100644
index f24bb23d7b..0000000000
--- a/packages/yoroi-extension/app/components/wallet/staking/dashboard-revamp/RewardHistoryDialog.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.dialog {
-  & > h1.dialog__title {
-    margin-bottom: 26px;
-  }
-}
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.js b/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.js
index 65dbe7e26b..fd52157579 100644
--- a/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.js
+++ b/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.js
@@ -1,19 +1,19 @@
 // @flow
-import { Component } from 'react';
 import type { Node, ComponentType } from 'react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { InjectedLayoutProps } from '../../styles/context/layout';
+import { Component } from 'react';
 import { observer } from 'mobx-react';
-import classnames from 'classnames';
 import { intlShape } from 'react-intl';
+import { withLayout } from '../../styles/context/layout';
+import { Box, FormControlLabel, Checkbox as MuiCheckbox } from '@mui/material';
+import classnames from 'classnames';
 import DialogCloseButton from './DialogCloseButton';
-import ThemedDialog from './ThemedDialog';
+import Dialog from './Dialog';
 import globalMessages from '../../i18n/global-messages';
 import LocalizableError from '../../i18n/LocalizableError';
 import CheckboxLabel from '../common/CheckboxLabel';
 import styles from './DangerousActionDialog.scss';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { withLayout } from '../../styles/context/layout';
-import type { InjectedLayoutProps } from '../../styles/context/layout';
-import { Box, FormControlLabel, Checkbox as MuiCheckbox } from '@mui/material';
 
 type Props = {|
   +title: string,
@@ -27,6 +27,7 @@ type Props = {|
   +primaryButton: {|
     +label: string,
     +onClick: void => PossiblyAsync<void>,
+    +danger?: boolean,
   |},
   +secondaryButton: {|
     label?: string,
@@ -64,7 +65,7 @@ class DangerousActionDialog extends Component<Props & InjectedLayoutProps> {
         primary: true,
         className: confirmButtonClasses,
         disabled: !this.props.isChecked ? true : undefined,
-        danger: true,
+        danger: this.props.primaryButton.danger ?? true,
         isSubmitting: this.props.isSubmitting,
         ...(this.props.primaryButton ?? Object.freeze({})),
       },
@@ -86,25 +87,19 @@ class DangerousActionDialog extends Component<Props & InjectedLayoutProps> {
     );
 
     const revampLayout = (
-      <Box maxWidth="600px" minHeight="145px">
+      <Box maxWidth="600px">
         {this.props.children}
-        <Box>
+        <Box mb="24px">
           <FormControlLabel
             label={this.props.checkboxAcknowledge}
             control={
               <MuiCheckbox
                 onChange={this.props.toggleCheck}
                 checked={this.props.isSubmitting || this.props.isChecked}
-                sx={{
-                  marginRight: '8px',
-                  width: '16px',
-                  height: '16px',
-                }}
+                sx={{ marginRight: '8px', width: '16px', height: '16px' }}
               />
             }
-            sx={{
-              marginLeft: '-0px',
-            }}
+            sx={{ marginLeft: '-0px' }}
           />
         </Box>
         {error ? <p className={styles.error}>{intl.formatMessage(error, error.values)}</p> : null}
@@ -117,7 +112,7 @@ class DangerousActionDialog extends Component<Props & InjectedLayoutProps> {
     });
 
     return (
-      <ThemedDialog
+      <Dialog
         title={this.props.title}
         actions={actions}
         closeOnOverlayClick={false}
@@ -126,7 +121,7 @@ class DangerousActionDialog extends Component<Props & InjectedLayoutProps> {
         closeButton={<DialogCloseButton onClose={this.props.onCancel} />}
       >
         {content}
-      </ThemedDialog>
+      </Dialog>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.scss b/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.scss
index ea273b8d24..cb2e458e25 100644
--- a/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.scss
+++ b/packages/yoroi-extension/app/components/widgets/DangerousActionDialog.scss
@@ -45,10 +45,6 @@
     .checkbox {
       padding-bottom: 0px;
     }
-
-    & > div:nth-child(3) {
-      margin-top: 24px;
-    }
   }
 }
 
diff --git a/packages/yoroi-extension/app/components/widgets/Dialog.js b/packages/yoroi-extension/app/components/widgets/Dialog.js
index d4b0c3013d..a6b36532eb 100644
--- a/packages/yoroi-extension/app/components/widgets/Dialog.js
+++ b/packages/yoroi-extension/app/components/widgets/Dialog.js
@@ -1,10 +1,10 @@
 /* eslint-disable no-nested-ternary */
 // @flow
 import type { Node, Element, ComponentType } from 'react';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import classnames from 'classnames';
 import { map } from 'lodash';
-import { IconButton, Modal, Typography } from '@mui/material';
+import { IconButton, Modal, Typography, alpha } from '@mui/material';
 import { Box, styled } from '@mui/system';
 import { LoadingButton } from '@mui/lab';
 import { withLayout } from '../../styles/context/layout';
@@ -19,6 +19,8 @@ export type ActionType = {|
   +isSubmitting?: boolean,
   +disabled?: boolean,
   +className?: ?string,
+  +id?: ?string,
+  +size?: ?string,
 |};
 
 export type Props = {|
@@ -29,6 +31,7 @@ export type Props = {|
   +withCloseButton?: boolean,
   +backButton?: Node,
   +className?: string,
+  +scrollableContentClass?: string,
   +styleOverride?: { ... },
   +onClose?: ?(void) => PossiblyAsync<void>,
   +closeOnOverlayClick?: boolean,
@@ -48,9 +51,36 @@ function DialogFn(props: Props & InjectedProps): Node {
     closeButton,
     withCloseButton,
     backButton,
+    scrollableContentClass,
     isRevampLayout,
   } = props;
 
+  const [contentHasScroll, setContentHasScroll] = useState(false);
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      const el = document.querySelector(
+        scrollableContentClass ? `.${scrollableContentClass}` : '.ModalContent'
+      );
+
+      if (!el) return;
+
+      if (el.clientHeight < el.scrollHeight) {
+        setContentHasScroll(true);
+        el.style.marginRight = '-24px';
+      } else {
+        setContentHasScroll(false);
+        el.style.marginRight = '0';
+      }
+    }, 30);
+
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [children]);
+
+  const hasActions = actions && actions.length > 0;
+
   const hasCloseButton = withCloseButton || closeButton;
 
   const hasSubmitting =
@@ -69,7 +99,9 @@ function DialogFn(props: Props & InjectedProps): Node {
             }
       }
       sx={{
-        background: 'var(--yoroi-comp-dialog-overlay-background-color)',
+        bgcolor: isRevampLayout
+          ? alpha('#121F4D', 0.7) // primary.900 70%
+          : 'var(--yoroi-comp-dialog-overlay-background-color)',
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'center',
@@ -81,15 +113,23 @@ function DialogFn(props: Props & InjectedProps): Node {
         className={className}
         style={props.styleOverride}
         boxShadow="0px 13px 20px -1px #00000026"
+        contentHasScroll={contentHasScroll}
       >
         {title != null && title !== '' ? (
           <Typography as="h1" variant="body1" className="dialog__title">
             {title}
           </Typography>
         ) : null}
-        {children != null ? <ModalContent>{children}</ModalContent> : null}
-        {actions && actions.length > 0 && (
-          <ModalFooter>
+        {children != null ? (
+          <ModalContent
+            pb={contentHasScroll || !hasActions ? '24px' : '0px !important'}
+            className="ModalContent"
+          >
+            {children}
+          </ModalContent>
+        ) : null}
+        {hasActions && (
+          <ModalFooter contentHasScroll={contentHasScroll}>
             {map(actions, (action, i: number) => {
               const buttonClasses = classnames([
                 // Keep classnames for testing
@@ -98,13 +138,14 @@ function DialogFn(props: Props & InjectedProps): Node {
               ]);
               return (
                 <LoadingButton
-                  id={action.primary === true ? 'primaryButton' : 'secondaryButton'}
+                  id={action.id ?? action.primary === true ? 'primaryButton' : 'secondaryButton'}
                   key={i}
                   {...getBtnVariant(action.danger, action.primary, isRevampLayout)}
                   className={buttonClasses}
                   loading={action.isSubmitting}
                   onClick={action.onClick}
                   disabled={action.disabled === true || action.isSubmitting === true}
+                  size={action.size}
                 >
                   {action.label}
                 </LoadingButton>
@@ -131,6 +172,7 @@ DialogFn.defaultProps = {
   closeButton: undefined,
   backButton: undefined,
   className: undefined,
+  scrollableContentClass: undefined,
   styleOverride: undefined,
   onClose: undefined,
   closeOnOverlayClick: false,
@@ -155,15 +197,15 @@ const CloseButton = ({ onClose, closeButton }) => (
   </Box>
 );
 
-const ModalContainer = styled(Box)(({ theme }) => ({
+const ModalContainer = styled(Box)(({ theme, contentHasScroll }) => ({
   position: 'relative',
   minWidth:
     theme.name === 'classic' || theme.name === 'modern'
       ? 'var(--yoroi-comp-dialog-min-width-md)'
-      : '612px',
+      : '648px',
   borderRadius: theme.name === 'classic' ? 0 : 8,
   paddingTop: theme.name === 'classic' ? '25px' : '0px',
-  paddingBottom: theme.name === 'classic' ? '30px' : '24px',
+  paddingBottom: theme.name === 'classic' || theme.name === 'modern' ? '30px' : '0px',
   maxWidth: theme.name === 'classic' ? '785px' : '824px',
   backgroundColor: 'var(--yoroi-comp-dialog-background)',
   color: 'var(--yoroi-comp-dialog-text)',
@@ -178,34 +220,46 @@ const ModalContainer = styled(Box)(({ theme }) => ({
     textTransform: 'uppercase',
     letterSpacing: 0,
     display: 'block',
-    borderBottom: '1px solid',
-    borderBottomColor: theme.palette.grayscale['200'],
+    borderBottom:
+      theme.name === 'classic' || theme.name === 'modern'
+        ? ''
+        : contentHasScroll
+        ? '1px solid'
+        : '',
+    borderBottomColor:
+      theme.name === 'classic' || theme.name === 'modern'
+        ? theme.palette.gray['200']
+        : theme.palette.grayscale['200'],
   },
 }));
 
 const ModalContent = styled(Box)(({ theme }) => ({
   overflowX: 'hidden',
   overflowY: 'overlay',
-  maxHeight: '60vh',
+  maxHeight: '70vh',
   paddingLeft: theme.name === 'classic' ? '30px' : '24px',
   paddingRight: theme.name === 'classic' ? '30px' : '24px',
-  paddingTop: theme.name === 'classic' ? '0px' : '16px',
+  paddingTop: theme.name === 'classic' ? '0px' : '24px',
+  paddingBottom: theme.name === 'classic' || theme.name === 'modern' ? '0px' : '24px',
 }));
 
-const ModalFooter = styled(Box)(({ theme }) => ({
+const ModalFooter = styled(Box)(({ theme, contentHasScroll }) => ({
   display: 'flex',
+  gap: '24px',
   paddingLeft: theme.name === 'classic' ? '30px' : '24px',
   paddingRight: theme.name === 'classic' ? '30px' : '24px',
-  marginTop: theme.name === 'classic' ? '20px' : '34px',
+  paddingTop: theme.name === 'classic' || theme.name === 'modern' ? '0' : '24px',
+  paddingBottom: theme.name === 'classic' || theme.name === 'modern' ? '0' : '24px',
+  marginTop: theme.name === 'classic' ? '20px' : '0px',
+  borderTop:
+    theme.name === 'classic' || theme.name === 'modern' ? '' : contentHasScroll ? '1px solid' : '',
+  borderTopColor:
+    theme.name === 'classic' || theme.name === 'modern'
+      ? theme.palette.gray['200']
+      : theme.palette.grayscale['200'],
   '& button': {
     width: '50%',
-    '&:only-child': {
-      margin: 'auto',
-      width: '100%',
-    },
-    '& + button': {
-      marginLeft: '20px',
-    },
+    '&:only-child': { width: '100%' },
   },
 }));
 
diff --git a/packages/yoroi-extension/app/components/widgets/DialogCloseButton.js b/packages/yoroi-extension/app/components/widgets/DialogCloseButton.js
index 32de3cffd2..6a7be958cd 100644
--- a/packages/yoroi-extension/app/components/widgets/DialogCloseButton.js
+++ b/packages/yoroi-extension/app/components/widgets/DialogCloseButton.js
@@ -28,15 +28,7 @@ class DialogCloseButton extends Component<Props & InjectedLayoutProps> {
     const Svg = icon != null && icon !== '' ? icon : defaultIcon;
 
     return (
-      <IconButton
-        onClick={onClose}
-        sx={{
-          position: 'absolute',
-          top: isRevampLayout ? '15px' : '18px',
-          right: isRevampLayout ? '12px' : '30px',
-          marginLeft: '5px',
-        }}
-      >
+      <IconButton onClick={onClose} sx={{ position: 'relative' }}>
         <Svg />
       </IconButton>
     );
diff --git a/packages/yoroi-extension/app/components/widgets/ThemedDialog.js b/packages/yoroi-extension/app/components/widgets/ThemedDialog.js
index 8ee0ded39b..d2d024c667 100644
--- a/packages/yoroi-extension/app/components/widgets/ThemedDialog.js
+++ b/packages/yoroi-extension/app/components/widgets/ThemedDialog.js
@@ -4,13 +4,11 @@ import type { Node, ComponentType } from 'react';
 import type { Props } from './Dialog';
 import { withLayout } from '../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../styles/context/layout';
-import DialogClassic from './Dialog';
-import DialogRevamp from './DialogRevamp';
+import Dialog from './Dialog';
 
 class ThemedDialog extends Component<Props & InjectedLayoutProps> {
   render(): Node {
     const {
-      isRevampLayout,
       children,
       title,
       actions,
@@ -20,7 +18,6 @@ class ThemedDialog extends Component<Props & InjectedLayoutProps> {
       closeButton,
       backButton,
     } = this.props;
-    const Dialog = isRevampLayout ? DialogRevamp : DialogClassic;
 
     const dialogProps = {
       title,
@@ -31,6 +28,7 @@ class ThemedDialog extends Component<Props & InjectedLayoutProps> {
       className,
       backButton,
     };
+
     return <Dialog {...dialogProps}>{children}</Dialog>;
   }
 }
diff --git a/packages/yoroi-extension/app/containers/settings/categories/ResyncWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/ResyncWalletDialogContainer.js
index e41c482456..e16b9ba2c4 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/ResyncWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/ResyncWalletDialogContainer.js
@@ -1,16 +1,14 @@
 // @flow
 import type { Node } from 'react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { InjectedOrGenerated } from '../../../types/injectedPropsType';
 import { Component } from 'react';
 import { computed, action, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
-import globalMessages from '../../../i18n/global-messages';
 import { messages } from '../../../components/wallet/settings/ResyncBlock';
 import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver/index';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-
-import type { InjectedOrGenerated } from '../../../types/injectedPropsType';
-
+import globalMessages from '../../../i18n/global-messages';
 import DangerousActionDialog from '../../../components/widgets/DangerousActionDialog';
 import LocalizableError from '../../../i18n/LocalizableError';
 
@@ -24,13 +22,14 @@ type Props = {|
 const dialogMessages = defineMessages({
   warning: {
     id: 'wallet.settings.resync.warning',
-    defaultMessage: '!!!This will also cause failed transactions to disappear as they are not stored on the blockchain.',
+    defaultMessage:
+      '!!!This will also cause failed transactions to disappear as they are not stored on the blockchain.',
   },
 });
 
 @observer
 export default class ResyncWalletDialogContainer extends Component<Props> {
-  static contextTypes: {|intl: $npm$ReactIntl$IntlFormat|} = {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
@@ -44,7 +43,7 @@ export default class ResyncWalletDialogContainer extends Component<Props> {
   toggleCheck: void => void = () => {
     if (this.generated.stores.walletSettings.clearHistory.isExecuting) return;
     this.isChecked = !this.isChecked;
-  }
+  };
 
   render(): Node {
     const { intl } = this.context;
@@ -60,16 +59,17 @@ export default class ResyncWalletDialogContainer extends Component<Props> {
         error={settingsStore.clearHistory.error}
         primaryButton={{
           label: intl.formatMessage(globalMessages.resyncButtonLabel),
+          danger: false,
           onClick: async () => {
             await this.generated.actions.walletSettings.resyncHistory.trigger({
               publicDeriver: this.props.publicDeriver,
             });
             this.generated.actions.dialogs.closeActiveDialog.trigger();
-          }
+          },
         }}
         onCancel={this.generated.actions.dialogs.closeActiveDialog.trigger}
         secondaryButton={{
-          onClick: this.generated.actions.dialogs.closeActiveDialog.trigger
+          onClick: this.generated.actions.dialogs.closeActiveDialog.trigger,
         }}
       >
         <p>{intl.formatMessage(messages.resyncExplanation)}</p>
@@ -82,27 +82,27 @@ export default class ResyncWalletDialogContainer extends Component<Props> {
     actions: {|
       dialogs: {|
         closeActiveDialog: {|
-          trigger: (params: void) => void
-        |}
+          trigger: (params: void) => void,
+        |},
       |},
       walletSettings: {|
         resyncHistory: {|
           trigger: (params: {|
-            publicDeriver: PublicDeriver<>
-          |}) => Promise<void>
-        |}
-      |}
+            publicDeriver: PublicDeriver<>,
+          |}) => Promise<void>,
+        |},
+      |},
     |},
     stores: {|
       walletSettings: {|
         clearHistory: {|
           error: ?LocalizableError,
           isExecuting: boolean,
-          reset: () => void
-        |}
-      |}
-    |}
-    |} {
+          reset: () => void,
+        |},
+      |},
+    |},
+  |} {
     if (this.props.generated !== undefined) {
       return this.props.generated;
     }
diff --git a/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.js b/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.js
index 96f6752ba6..898c136379 100644
--- a/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.js
+++ b/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.js
@@ -2,7 +2,7 @@
 
 import { Component } from 'react';
 import type { Node } from 'react';
-import DialogRevamp from '../../../components/widgets/DialogRevamp';
+import Dialog from '../../../components/widgets/Dialog';
 import { defineMessages, intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import { ReactComponent as NewThemeIllustration } from '../../../assets/images/new-theme-illustration.inline.svg';
@@ -76,22 +76,14 @@ export class RevampAnnouncementDialog extends Component<Props> {
       },
     ];
     return (
-      <DialogRevamp
+      <Dialog
         title={intl.formatMessage(messages.title)}
         className={styles.dialog}
         onClose={onClose}
         closeButton={<DialogCloseButton onClose={onClose} />}
         actions={actions}
       >
-        <Box
-          sx={{
-            py: '24px',
-            display: 'flex',
-            flexDirection: 'column',
-            gap: '24px',
-          }}
-          id='dialogRevampBox'
-        >
+        <Box sx={{ display: 'flex', flexDirection: 'column', gap: '24px' }} id="dialogRevampBox">
           <Typography
             variant="body1"
             sx={{
@@ -146,7 +138,7 @@ export class RevampAnnouncementDialog extends Component<Props> {
             </Box>
           </Stack>
         </Box>
-      </DialogRevamp>
+      </Dialog>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.scss b/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.scss
index 955e3e45d6..4d2aa1d88c 100644
--- a/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.scss
+++ b/packages/yoroi-extension/app/containers/wallet/dialogs/RevampAnnouncementDialog.scss
@@ -1,19 +1,3 @@
 .dialog {
-  padding-top: 25px;
-  padding-bottom: 24px;
-  max-width: 650px !important;
-
-  & > h1 {
-    margin-bottom: 25px !important;
-  }
-
-  & > div {
-    padding: 0px 24px !important;
-  }
-
-  & > div:nth-child(3) {
-    margin-top: 27px !important;
-    padding-left: 24px !important;
-    padding-right: 24px !important;
-  }
+  max-width: 648px !important;
 }
diff --git a/packages/yoroi-extension/app/containers/wallet/staking/WithdrawRewardsDialog.js b/packages/yoroi-extension/app/containers/wallet/staking/WithdrawRewardsDialog.js
index 0a60f59061..1eb1b6210d 100644
--- a/packages/yoroi-extension/app/containers/wallet/staking/WithdrawRewardsDialog.js
+++ b/packages/yoroi-extension/app/containers/wallet/staking/WithdrawRewardsDialog.js
@@ -22,9 +22,16 @@ import type { NetworkRow, TokenRow } from '../../../api/ada/lib/storage/database
 import type { ISignRequest } from '../../../api/common/lib/transactions/ISignRequest';
 import type { SelectedExplorer } from '../../../domain/SelectedExplorer';
 import type { SendUsingTrezorParams } from '../../../actions/ada/trezor-send-actions';
-import { genFormatTokenAmount, genLookupOrFail, getTokenName, } from '../../../stores/stateless/tokenHelpers';
+import {
+  genFormatTokenAmount,
+  genLookupOrFail,
+  getTokenName,
+} from '../../../stores/stateless/tokenHelpers';
 import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
-import { isLedgerNanoWallet, isTrezorTWallet, } from '../../../api/ada/lib/storage/models/ConceptualWallet';
+import {
+  isLedgerNanoWallet,
+  isTrezorTWallet,
+} from '../../../api/ada/lib/storage/models/ConceptualWallet';
 import { asGetSigningKey } from '../../../api/ada/lib/storage/models/PublicDeriver/traits';
 import SpendingPasswordInput from '../../../components/widgets/forms/SpendingPasswordInput';
 import VerticallyCenteredLayout from '../../../components/layout/VerticallyCenteredLayout';
@@ -34,7 +41,7 @@ import YoroiTransferErrorPage from '../../transfer/YoroiTransferErrorPage';
 import ExplorableHashContainer from '../../widgets/ExplorableHashContainer';
 import RawHash from '../../../components/widgets/hashWrappers/RawHash';
 import Warning from '../../../components/common/Warning';
-import DialogRevamp from '../../../components/widgets/DialogRevamp';
+import Dialog from '../../../components/widgets/Dialog';
 import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver';
 import type { SendUsingLedgerParams } from '../../../actions/ada/ledger-send-actions';
 import LocalizableError from '../../../i18n/LocalizableError';
@@ -215,7 +222,7 @@ export default class WithdrawRewardsDialog extends Component<Props> {
     const tentativeTx = createWithdrawalTx.result;
     if (!tentativeTx)
       return (
-        <DialogRevamp
+        <Dialog
           title={intl.formatMessage(globalMessages.processingLabel)}
           closeOnOverlayClick={false}
         >
@@ -226,7 +233,7 @@ export default class WithdrawRewardsDialog extends Component<Props> {
               </VerticallyCenteredLayout>
             </LegacyTransferLayout>
           </Box>
-        </DialogRevamp>
+        </Dialog>
       );
     const receivers = tentativeTx.receivers(true);
     const receiverAddress = addressToDisplayString(receivers[0], network);
@@ -258,7 +265,7 @@ export default class WithdrawRewardsDialog extends Component<Props> {
     if (!selectedExplorer) throw new Error('No explorer for wallet network');
 
     return (
-      <DialogRevamp
+      <Dialog
         title={intl.formatMessage(messages.dialogTitle)}
         actions={[
           {
@@ -277,8 +284,10 @@ export default class WithdrawRewardsDialog extends Component<Props> {
         closeOnOverlayClick={false}
         onClose={this.props.onClose}
         closeButton={<DialogCloseButton />}
+        scrollableContentClass="WithdrawRewards"
+        styleOverride={{ width: '648px' }}
       >
-        <Box maxWidth="600px">
+        <Box className="WithdrawRewards" overflowY="auto" maxHeight="70vh" maxWidth="604px">
           {shouldDeregister && (
             <Box mb="24px">
               <Warning>
@@ -413,7 +422,7 @@ export default class WithdrawRewardsDialog extends Component<Props> {
             </Box>
           ) : null}
         </Box>
-      </DialogRevamp>
+      </Dialog>
     );
   }
 
diff --git a/packages/yoroi-extension/app/i18n/global-messages.js b/packages/yoroi-extension/app/i18n/global-messages.js
index 2c5132610a..a1d723bbdb 100644
--- a/packages/yoroi-extension/app/i18n/global-messages.js
+++ b/packages/yoroi-extension/app/i18n/global-messages.js
@@ -84,6 +84,10 @@ const globalMessages: * = defineMessages({
     id: 'wallet.nav.type.ledger',
     defaultMessage: '!!!Ledger wallet',
   },
+  important: {
+    id: 'global.dialogs.important',
+    defaultMessage: '!!!Important',
+  },
   fieldIsRequired: {
     id: 'global.errors.fieldIsRequired',
     defaultMessage: '!!!This field is required.',
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index c80cd1607a..ff4e808fa2 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -191,6 +191,7 @@
   "global.language.spanish": "Español",
   "global.language.turkish": "Turkish",
   "global.language.vietnamese": "Vietnamese",
+  "global.dialogs.important": "Important",
   "global.ok": "Ok",
   "global.passwordInstructionsPaperWallet": "Note: Paper Wallet password needs to be at least <strong>10 characters</strong> long.",
   "global.publicKey.explanation": "Public keys allow seeing the wallet history for the wallet, but does <strong>not</strong> allow to spend or move the funds in any way (private key is <strong>not</strong> included)",
@@ -1074,4 +1075,4 @@
   "yoroiTransfer.waiting.progressInfo.checkingAddresses": "Checking addresses funds",
   "yoroiTransfer.waiting.progressInfo.restoringAddresses": "Fetching addresses",
   "yoroiTransfer.waiting.title.label": "Wallet is being restored"
-}
\ No newline at end of file
+}
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index d3f5aca9d8..bf76a683c3 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.23.101",
+  "version": "4.23.102",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 39df562866..342a156be9 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.23.101",
+  "version": "4.23.102",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && babel-node scripts-mv2/build --type=debug --env 'mainnet'",