diff --git a/src/features/helpers/preview/Preview.jsx b/src/features/helpers/preview/Preview.jsx
index b73826ab..5502ebd3 100644
--- a/src/features/helpers/preview/Preview.jsx
+++ b/src/features/helpers/preview/Preview.jsx
@@ -1,4 +1,6 @@
 import { memo } from 'react';
+import { MdArrowForwardIos } from 'react-icons/md';
+import { Button } from 'components/Elements';
 import variables from 'config/variables';
 import './preview.scss';
 
@@ -13,9 +15,13 @@ function Preview(props) {
     <div className="preview-mode">
       <span className="title">{variables.getMessage('modals.main.settings.reminder.title')}</span>
       <span className="subtitle">{variables.getMessage('modals.welcome.preview.description')}</span>
-      <button onClick={() => setup()}>
-        {variables.getMessage('modals.welcome.preview.continue')}
-      </button>
+      <Button
+        type="settings"
+        onClick={() => setup()}
+        icon={<MdArrowForwardIos />}
+        label={variables.getMessage('modals.welcome.preview.continue')}
+        iconPlacement={'right'}
+      />
     </div>
   );
 }
diff --git a/src/features/misc/modals/Modals.jsx b/src/features/misc/modals/Modals.jsx
index 91036b46..402a72c0 100644
--- a/src/features/misc/modals/Modals.jsx
+++ b/src/features/misc/modals/Modals.jsx
@@ -92,18 +92,6 @@ export default class Modals extends PureComponent {
         >
           <MainModal modalClose={() => this.toggleModal('mainModal', false)} />
         </Modal>
-        {/*<Modal
-          closeTimeoutMS={300}
-          onRequestClose={() => this.closeWelcome()}
-          isOpen={this.state.welcomeModal}
-          className="Modal welcomemodal mainModal"
-          overlayClassName="Overlay mainModal"
-          shouldCloseOnOverlayClick={false}
-          ariaHideApp={false}
-        >
-          <Welcome modalClose={() => this.closeWelcome()} modalSkip={() => this.previewWelcome()} />
-        </Modal>
-        {this.state.preview && <Preview setup={() => window.location.reload()} />}*/}
       </>
     );
   }
diff --git a/src/features/welcome/Welcome.jsx b/src/features/welcome/Welcome.jsx
index b5219644..ab8cfa08 100644
--- a/src/features/welcome/Welcome.jsx
+++ b/src/features/welcome/Welcome.jsx
@@ -91,7 +91,7 @@ function WelcomeModal() {
   const nextTab = () => {
     setDirection(1);
     if (buttonText === variables.getMessage('modals.welcome.buttons.finish')) {
-      // modalClose();
+      completeSetup();
       return;
     }
     updateTabAndButtonText(currentTab + 1);
@@ -108,7 +108,11 @@ function WelcomeModal() {
     window.location.reload();
   };
 
-  console.log(localStorage.getItem('showWelcome'));
+  const completeSetup = () => {
+    localStorage.setItem('showWelcome', false);
+    localStorage.setItem('welcomePreview', false);
+    window.location.reload();
+  };
 
   const Navigation = () => {
     return (