diff --git a/.changelog/1941.trivial.md b/.changelog/1941.trivial.md
new file mode 100644
index 0000000000..fb709af793
--- /dev/null
+++ b/.changelog/1941.trivial.md
@@ -0,0 +1 @@
+Improve footer layout
diff --git a/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap b/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap
index b42535f33e..aecbf6602b 100644
--- a/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap
+++ b/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Footer /> should render mobile version of footer 1`] = `
-.c8 {
+.c9 {
   display: inline-block;
   -webkit-flex: 0 0 auto;
   -ms-flex: 0 0 auto;
@@ -12,25 +12,25 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   stroke: currentColor;
 }
 
-.c8 g {
+.c9 g {
   fill: inherit;
   stroke: inherit;
 }
 
-.c8 *:not([stroke])[fill='none'] {
+.c9 *:not([stroke])[fill='none'] {
   stroke-width: 0;
 }
 
-.c8 *[stroke*='#'],
-.c8 *[STROKE*='#'] {
+.c9 *[stroke*='#'],
+.c9 *[STROKE*='#'] {
   stroke: inherit;
   fill: none;
 }
 
-.c8 *[fill-rule],
-.c8 *[FILL-RULE],
-.c8 *[fill*='#'],
-.c8 *[FILL*='#'] {
+.c9 *[fill-rule],
+.c9 *[FILL-RULE],
+.c9 *[fill*='#'],
+.c9 *[FILL*='#'] {
   fill: inherit;
   stroke: none;
 }
@@ -63,17 +63,15 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   border-radius: 5px;
 }
 
-.c4 {
+.c3 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
   box-sizing: border-box;
   max-width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
+  margin-left: 6px;
+  margin-right: 6px;
   min-width: 0;
   min-height: 0;
   -webkit-flex-direction: column;
@@ -81,7 +79,7 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   flex-direction: column;
 }
 
-.c7 {
+.c8 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -104,7 +102,7 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   justify-content: center;
 }
 
-.c9 {
+.c10 {
   -webkit-flex: 0 0 auto;
   -ms-flex: 0 0 auto;
   flex: 0 0 auto;
@@ -141,13 +139,20 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   text-align: center;
 }
 
-.c3 {
+.c4 {
+  margin-top: 12px;
   font-size: 14px;
   line-height: 20px;
   text-align: center;
 }
 
-.c5 {
+.c11 {
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+}
+
+.c6 {
   background-color: #FFFFFF;
   position: fixed;
   bottom: 0;
@@ -173,7 +178,7 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   flex-direction: row;
 }
 
-.c6 {
+.c7 {
   -webkit-box-flex: 1;
   -webkit-flex-grow: 1;
   -ms-flex-positive: 1;
@@ -183,10 +188,68 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
   flex-basis: 0;
 }
 
-.c6:hover {
+.c7:hover {
   background-color: #11111108;
 }
 
+.c5 {
+  display: inline-block;
+  box-sizing: border-box;
+  cursor: pointer;
+  font: inherit;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  margin: 0;
+  background: transparent;
+  overflow: visible;
+  text-transform: none;
+  color: #0500e2;
+  outline: none;
+  border: none;
+  padding: 0;
+  text-align: inherit;
+}
+
+.c5:focus {
+  outline: none;
+  box-shadow: 0 0 2px 2px #00A9FF;
+}
+
+.c5:focus > circle,
+.c5:focus > ellipse,
+.c5:focus > line,
+.c5:focus > path,
+.c5:focus > polygon,
+.c5:focus > polyline,
+.c5:focus > rect {
+  outline: none;
+  box-shadow: 0 0 2px 2px #00A9FF;
+}
+
+.c5:focus::-moz-focus-inner {
+  border: 0;
+}
+
+.c5:focus:not(:focus-visible) {
+  outline: none;
+  box-shadow: none;
+}
+
+.c5:focus:not(:focus-visible) > circle,
+.c5:focus:not(:focus-visible) > ellipse,
+.c5:focus:not(:focus-visible) > line,
+.c5:focus:not(:focus-visible) > path,
+.c5:focus:not(:focus-visible) > polygon,
+.c5:focus:not(:focus-visible) > polyline,
+.c5:focus:not(:focus-visible) > rect {
+  outline: none;
+  box-shadow: none;
+}
+
+.c5:focus:not(:focus-visible)::-moz-focus-inner {
+  border: 0;
+}
+
 @media only screen and (max-width:768px) {
   .c0 {
     margin-bottom: 24px;
@@ -213,7 +276,19 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
 }
 
 @media only screen and (max-width:768px) {
-  .c9 {
+  .c3 {
+    margin-left: 3px;
+  }
+}
+
+@media only screen and (max-width:768px) {
+  .c3 {
+    margin-right: 3px;
+  }
+}
+
+@media only screen and (max-width:768px) {
+  .c10 {
     height: 6px;
   }
 }
@@ -237,27 +312,34 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
         open source
       </span>
     </a>
-    <span>
-       - Feedback and issues are appreciated!
-    </span>
-  </span>
-  <span
-    class="c1"
-  >
-    <a
-      class="c2"
-      href="https://wallet.oasis.io/t-c.pdf"
-      rel="noopener noreferrer"
-      target="_blank"
+    <div
+      class="c3"
+      style="display: inline-block;"
     >
-      <span>
-        Terms and Conditions
-      </span>
-    </a>
+      Powered by Oasis Scan API & Oasis gRPC
+    </div>
   </span>
   <span
-    class="c3"
+    class="c4"
   >
+    <span>
+      <a
+        class="c2"
+        href="https://wallet.oasis.io/t-c.pdf"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        <span>
+          Terms and Conditions
+        </span>
+      </a>
+      <div
+        class="c3"
+        style="display: inline-block;"
+      >
+        |
+      </div>
+    </span>
     <span>
       Version: 
     </span>
@@ -270,39 +352,47 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
       1.0.0-dev.1
     </a>
     <span>
-       (commit: 
+       
+    </span>
+    <span>
+      <button
+        class="c5"
+        type="button"
+      >
+        [show details]
+      </button>
+      <span />
+    </span>
+  </span>
+  <span
+    class="c4"
+  >
+    <span>
+      We’d love your feedback at 
     </span>
     <a
       class="c2"
-      href="https://github.com/oasisprotocol/oasis-wallet-web/commit/sha0000000000000000000000000000000000000"
-      rel="noopener noreferrer"
-      target="_blank"
+      href="mailto:wallet@oasisprotocol.org"
     >
-      sha0000
+      <span>
+        wallet@oasisprotocol.org
+      </span>
     </a>
-    <span>
-      ) built at 1/1/1970, 12:00:00 AM
-    </span>
-    <div
-      class="c4"
-    >
-      Powered by Oasis Scan API & Oasis gRPC
-    </div>
   </span>
   <nav
-    class="c5"
+    class="c6"
     data-testid="mobile-footer-navigation"
   >
     <a
-      class="c6"
+      class="c7"
       href="/account/dummy"
     >
       <span
-        class="c7"
+        class="c8"
       >
         <svg
           aria-label="Money"
-          class="c8"
+          class="c9"
           viewBox="0 0 24 24"
         >
           <path
@@ -313,10 +403,10 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
           />
         </svg>
         <span
-          class="c9"
+          class="c10"
         />
         <span
-          class="c3"
+          class="c11"
           style="line-height: 1;"
         >
           ROSE Wallet
@@ -324,15 +414,15 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
       </span>
     </a>
     <a
-      class="c6"
+      class="c7"
       href="/account/dummy/stake"
     >
       <span
-        class="c7"
+        class="c8"
       >
         <svg
           aria-label="LineChart"
-          class="c8"
+          class="c9"
           viewBox="0 0 24 24"
         >
           <path
@@ -343,10 +433,10 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
           />
         </svg>
         <span
-          class="c9"
+          class="c10"
         />
         <span
-          class="c3"
+          class="c11"
           style="line-height: 1;"
         >
           Stake
@@ -354,15 +444,15 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
       </span>
     </a>
     <a
-      class="c6"
+      class="c7"
       href="/account/dummy/paratimes"
     >
       <span
-        class="c7"
+        class="c8"
       >
         <svg
           aria-label="Inherit"
-          class="c8"
+          class="c9"
           viewBox="0 0 24 24"
         >
           <path
@@ -373,10 +463,10 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
           />
         </svg>
         <span
-          class="c9"
+          class="c10"
         />
         <span
-          class="c3"
+          class="c11"
           style="line-height: 1;"
         >
           ParaTimes
@@ -384,15 +474,15 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
       </span>
     </a>
     <a
-      class="c6"
+      class="c7"
       href="/account/dummy/fiat"
     >
       <span
-        class="c7"
+        class="c8"
       >
         <svg
           aria-label="CreditCard"
-          class="c8"
+          class="c9"
           viewBox="0 0 24 24"
         >
           <path
@@ -403,10 +493,10 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
           />
         </svg>
         <span
-          class="c9"
+          class="c10"
         />
         <span
-          class="c3"
+          class="c11"
           style="line-height: 1;"
         >
           Buy
diff --git a/src/app/components/Footer/__tests__/index.test.tsx b/src/app/components/Footer/__tests__/index.test.tsx
index 1b0be49739..20dfc8f68e 100644
--- a/src/app/components/Footer/__tests__/index.test.tsx
+++ b/src/app/components/Footer/__tests__/index.test.tsx
@@ -5,6 +5,7 @@ import { Provider } from 'react-redux'
 import { ThemeProvider } from 'styles/theme/ThemeProvider'
 import { configureAppStore } from 'store/configureStore'
 import { Wallet } from 'app/state/wallet/types'
+import userEvent from '@testing-library/user-event'
 
 import { Footer } from '..'
 
@@ -41,10 +42,14 @@ describe('<Footer />', () => {
     })
   })
 
-  it('should render a link with commit sha', () => {
+  it('should render a link with commit sha after toggling', async () => {
     renderComponent(store, 'large')
 
-    expect(screen.getByRole('link', { name: 'sha0000' })).toHaveAttribute(
+    const toggleLink = await screen.findByText(/\[show details\]/i)
+    await userEvent.click(toggleLink)
+
+    const commitLink = await screen.findByRole('link', { name: /sha0000/i })
+    expect(commitLink).toHaveAttribute(
       'href',
       'https://github.com/oasisprotocol/oasis-wallet-web/commit/sha0000000000000000000000000000000000000',
     )
diff --git a/src/app/components/Footer/index.tsx b/src/app/components/Footer/index.tsx
index 2e0ad479b0..ece2f11bde 100644
--- a/src/app/components/Footer/index.tsx
+++ b/src/app/components/Footer/index.tsx
@@ -2,7 +2,7 @@ import { Anchor } from 'grommet/es6/components/Anchor'
 import { Box } from 'grommet/es6/components/Box'
 import { Text } from 'grommet/es6/components/Text'
 import { ResponsiveContext } from 'grommet/es6/contexts/ResponsiveContext'
-import React, { memo } from 'react'
+import React, { memo, useState } from 'react'
 import { useSelector } from 'react-redux'
 import { Trans, useTranslation } from 'react-i18next'
 import { selectHasAccounts } from 'app/state/wallet/selectors'
@@ -11,9 +11,13 @@ import { backend } from 'vendors/backend'
 import { BackendAPIs } from 'config'
 import { MobileFooterNavigation } from '../MobileFooterNavigation'
 import { mobileFooterNavigationHeight } from '../../../styles/theme/elementSizes'
+import { Button } from 'grommet/es6/components/Button'
 
 const githubLink = 'https://github.com/oasisprotocol/oasis-wallet-web/'
 const githubReleaseLink = (tag: string) => `${githubLink}releases/tag/${tag}`
+const buildTime =
+  process.env.REACT_APP_BUILD_DATETIME &&
+  `${intlDateTimeFormat(Number(process.env.REACT_APP_BUILD_DATETIME))}`
 
 function NoReleaseLink() {
   return <>-</>
@@ -23,6 +27,11 @@ export const Footer = memo(() => {
   const walletHasAccounts = useSelector(selectHasAccounts)
   const isMobile = React.useContext(ResponsiveContext) === 'small'
   const { t } = useTranslation()
+  const [showCommitLink, setShowCommitLink] = useState(false)
+
+  const toggleCommitLink = () => {
+    setShowCommitLink(!showCommitLink)
+  }
 
   const backendToLabel = {
     [BackendAPIs.OasisMonitor]: t(
@@ -52,24 +61,34 @@ export const Footer = memo(() => {
         <Trans
           i18nKey="footer.github"
           t={t}
-          components={{ GithubLink: <Anchor href={githubLink} target="_blank" rel="noopener noreferrer" /> }}
-          defaults="ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!"
-        />
-      </Text>
-      <Text size={responsiveSize} textAlign="center" margin={{ bottom: responsiveSize }}>
-        <Trans
-          i18nKey="footer.terms"
-          t={t}
           components={{
-            TermsLink: (
-              <Anchor href="https://wallet.oasis.io/t-c.pdf" target="_blank" rel="noopener noreferrer" />
-            ),
+            GithubLink: <Anchor href={githubLink} target="_blank" rel="noopener noreferrer" />,
           }}
-          defaults="<TermsLink>Terms and Conditions</TermsLink>"
+          defaults="ROSE Wallet is fully <GithubLink>open source</GithubLink>"
         />
+        {poweredByLabel && (
+          <Box margin={{ right: 'xsmall', left: 'xsmall' }} style={{ display: 'inline-block' }}>
+            {poweredByLabel}
+          </Box>
+        )}
       </Text>
       {process.env.REACT_APP_BUILD_DATETIME && process.env.REACT_APP_BUILD_SHA && (
-        <Text size="small" textAlign="center">
+        <Text size="small" textAlign="center" margin={{ top: 'small' }}>
+          <span>
+            <Trans
+              i18nKey="footer.terms"
+              t={t}
+              components={{
+                TermsLink: (
+                  <Anchor href="https://wallet.oasis.io/t-c.pdf" target="_blank" rel="noopener noreferrer" />
+                ),
+              }}
+              defaults="<TermsLink>Terms and Conditions</TermsLink>"
+            />
+            <Box margin={{ right: 'xsmall', left: 'xsmall' }} style={{ display: 'inline-block' }}>
+              |
+            </Box>
+          </span>
           <Trans
             i18nKey="footer.version"
             t={t}
@@ -85,23 +104,49 @@ export const Footer = memo(() => {
                 <NoReleaseLink />
               ),
               CommitLink: (
-                <Anchor
-                  href={`${githubLink}commit/${process.env.REACT_APP_BUILD_SHA}`}
-                  label={process.env.REACT_APP_BUILD_SHA.substring(0, 7)}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                />
+                <span>
+                  <Button
+                    onClick={toggleCommitLink}
+                    label={
+                      showCommitLink
+                        ? t('footer.hideDetails', '[hide details]')
+                        : t('footer.showDetails', '[show details]')
+                    }
+                    plain
+                    color="link"
+                  />
+                  <span>
+                    {showCommitLink && process.env.REACT_APP_BUILD_SHA && (
+                      <span>
+                        <br />
+                        (commit:
+                        <Anchor
+                          href={`${githubLink}commit/${process.env.REACT_APP_BUILD_SHA}`}
+                          label={process.env.REACT_APP_BUILD_SHA.substring(0, 7)}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                        />
+                        ) built at {buildTime}
+                      </span>
+                    )}
+                  </span>
+                </span>
               ),
             }}
-            defaults="Version: <ReleaseLink/> (commit: <CommitLink/>) built at {{buildTime}}"
-            values={{
-              buildTime: intlDateTimeFormat(Number(process.env.REACT_APP_BUILD_DATETIME)),
-            }}
+            defaults="Version: <ReleaseLink/> <CommitLink/>"
           />
-          {poweredByLabel && <Box align="center">{poweredByLabel}</Box>}
         </Text>
       )}
-
+      <Text size="small" textAlign="center" margin={{ top: 'small' }}>
+        <Trans
+          i18nKey="footer.feedback"
+          t={t}
+          components={{
+            EmailLink: <Anchor href="mailto:wallet@oasisprotocol.org" />,
+          }}
+          defaults="We’d love your feedback at <EmailLink>wallet@oasisprotocol.org</EmailLink>"
+        />
+      </Text>
       <MobileFooterNavigation walletHasAccounts={walletHasAccounts} isMobile={isMobile} />
     </Box>
   )
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 6ff367856b..79fbef7d2d 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -188,13 +188,16 @@
     "thirdPartyDisclaimer": "This service is provided by an external party. Oasis* does not carry any responsibility. All fees charged by Transak."
   },
   "footer": {
-    "github": "ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!",
+    "feedback": "We’d love your feedback at <EmailLink>wallet@oasisprotocol.org</EmailLink>",
+    "github": "ROSE Wallet is fully <GithubLink>open source</GithubLink>",
+    "hideDetails": "[hide details]",
     "poweredBy": {
       "oasismonitor": "Powered by Oasis Monitor API & Oasis gRPC",
       "oasisscan": "Powered by Oasis Scan API & Oasis gRPC"
     },
+    "showDetails": "[show details]",
     "terms": "<TermsLink>Terms and Conditions</TermsLink>",
-    "version": "Version: <ReleaseLink/> (commit: <CommitLink/>) built at {{buildTime}}"
+    "version": "Version: <ReleaseLink/> <CommitLink/>"
   },
   "home": {
     "create": {
@@ -421,6 +424,7 @@
       "enterPasswordHere": "Enter your password",
       "hidePassword": "Hide password",
       "showPassword": "Show password",
+      "skipUnlocking": "Continue without the profile",
       "title": "Welcome Back!",
       "unlock": "Unlock",
       "wrongPassword": "Wrong password"