diff --git a/app/components/Panel/FullHeightPanel/FullHeightPanel.jsx b/app/components/Panel/FullHeightPanel/FullHeightPanel.jsx
index 552317e08..90d7915fe 100644
--- a/app/components/Panel/FullHeightPanel/FullHeightPanel.jsx
+++ b/app/components/Panel/FullHeightPanel/FullHeightPanel.jsx
@@ -26,8 +26,7 @@ export default class ViewLayout extends Component<Props> {
     shouldRenderHeader: true,
     renderInstructions: () => (
       <div>
-        {' '}
-        <FormattedMessage id="walletCreationInstruction" />{' '}
+        <FormattedMessage id="walletCreationInstruction" />
       </div>
     ),
     iconColor: '#4CFFB3',
diff --git a/app/components/Settings/EncryptForm/EncryptForm.jsx b/app/components/Settings/EncryptForm/EncryptForm.jsx
index 3d9ba73d3..f5b3a0c5b 100644
--- a/app/components/Settings/EncryptForm/EncryptForm.jsx
+++ b/app/components/Settings/EncryptForm/EncryptForm.jsx
@@ -140,7 +140,6 @@ const EncryptForm = ({
           error={confirmPassphraseError}
         />
         <Button
-          className={styles.submitButton}
           primary
           type="submit"
           renderIcon={AddIcon}
diff --git a/app/components/Settings/EncryptForm/EncryptForm.scss b/app/components/Settings/EncryptForm/EncryptForm.scss
index fd787c444..789193b29 100644
--- a/app/components/Settings/EncryptForm/EncryptForm.scss
+++ b/app/components/Settings/EncryptForm/EncryptForm.scss
@@ -1,18 +1,12 @@
 .encryptForm {
   width: 500px;
   margin: 0 auto;
-  height: 100%;
   display: flex;
   flex-direction: column;
 
   form {
     align-self: flex-start;
   }
-
-  .submitButton {
-    margin-top: auto;
-    margin-bottom: 50px;
-  }
 }
 
 .formContainer {
diff --git a/app/components/Settings/EncryptSuccess/EncryptSuccess.scss b/app/components/Settings/EncryptSuccess/EncryptSuccess.scss
index 74dc11983..5f4ec1d48 100644
--- a/app/components/Settings/EncryptSuccess/EncryptSuccess.scss
+++ b/app/components/Settings/EncryptSuccess/EncryptSuccess.scss
@@ -3,7 +3,7 @@ $encrypt-icon-size: 24px;
 .encryptSuccess {
   display: flex;
   flex-direction: column;
-  height: 500px;
+  justify-content: center;
   max-width: 500px;
   flex: 1;
 
diff --git a/app/containers/Encrypt/Encrypt.jsx b/app/containers/Encrypt/Encrypt.jsx
index 23eb6f8de..e59a2d8ca 100644
--- a/app/containers/Encrypt/Encrypt.jsx
+++ b/app/containers/Encrypt/Encrypt.jsx
@@ -33,9 +33,9 @@ const Encrypt = ({ encryptedWIF, resetEncryptedWIF }: Props) => {
       )}
       renderHeaderIcon={HeaderIcon}
       renderInstructions={
-        encryptedWIF
+        !encryptedWIF
           ? () => intl.formatMessage({ id: 'encryptInstructions' })
-          : undefined
+          : null
       }
     >
       {!encryptedWIF ? (
diff --git a/app/containers/Encrypt/Encrypt.scss b/app/containers/Encrypt/Encrypt.scss
index 42164ac83..79679a9c4 100644
--- a/app/containers/Encrypt/Encrypt.scss
+++ b/app/containers/Encrypt/Encrypt.scss
@@ -1,4 +1,5 @@
 .encrypt {
   display: flex;
   justify-content: center;
+  flex: 1;
 }
diff --git a/app/hocs/withCopyCanvasToClipboard.js b/app/hocs/withCopyCanvasToClipboard.js
index a845c19a1..4caf9aaf2 100644
--- a/app/hocs/withCopyCanvasToClipboard.js
+++ b/app/hocs/withCopyCanvasToClipboard.js
@@ -45,7 +45,7 @@ export default function withCopyCanvasToClipboard(Component) {
       // $FlowFixMe
       const url = ref.toDataURL('image/jpg', 0.8)
       const base64Data = url.replace(/^data:image\/png;base64,/, '')
-      const storagePath = storage.getDataPath()
+      const storagePath = await ipcRenderer.invoke('getStoragePath')
       await writeFile(`${storagePath}/${fileName}.jpg`, base64Data, 'base64')
       clipboard.writeImage(`${storagePath}/${fileName}.jpg`)
     }