diff --git a/src/components/molecules/AccountStatus/Popover.module.scss b/src/components/molecules/AccountStatus/Popover.module.scss
index 2818c7b..944c3a2 100644
--- a/src/components/molecules/AccountStatus/Popover.module.scss
+++ b/src/components/molecules/AccountStatus/Popover.module.scss
@@ -16,9 +16,6 @@ $popoverWidth: 18rem;
 .popoverInfoline {
     border-bottom: .05rem solid $brand-grey;
     padding: $spacer / 3 0;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
 
     &:first-child {
         padding-top: 0;
@@ -34,22 +31,9 @@ $popoverWidth: 18rem;
     }
 }
 
-.accountName {
-    composes: popoverInfoline;
-    flex-wrap: nowrap;
-
-    // blockies avatar
-    canvas {
-        display: inline-block;
-        border-radius: 50%;
-        overflow: hidden;
-        flex: 0 0 20px;
-        margin-right: $spacer / 4;
-    }
-}
-
 .address {
     width: 15rem;
+    display: block;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/src/components/molecules/AccountStatus/Popover.tsx b/src/components/molecules/AccountStatus/Popover.tsx
index 51918b5..47d51a4 100644
--- a/src/components/molecules/AccountStatus/Popover.tsx
+++ b/src/components/molecules/AccountStatus/Popover.tsx
@@ -9,7 +9,7 @@ const Popover = ({ togglePopover }: { togglePopover: any }) => (
         onMouseOver={togglePopover}
         onMouseOut={togglePopover}
     >
-        <div className={styles.accountName}>
+        <div className={styles.popoverInfoline}>
             <User.Consumer>
                 {states =>
                     states.account ? (
diff --git a/src/components/Web3message.module.scss b/src/components/molecules/Web3message.module.scss
similarity index 92%
rename from src/components/Web3message.module.scss
rename to src/components/molecules/Web3message.module.scss
index f24ef53..5ff7574 100644
--- a/src/components/Web3message.module.scss
+++ b/src/components/molecules/Web3message.module.scss
@@ -1,4 +1,4 @@
-@import '../styles/variables';
+@import '../../styles/variables';
 
 .message {
     margin-bottom: $spacer;
diff --git a/src/components/Web3message.tsx b/src/components/molecules/Web3message.tsx
similarity index 93%
rename from src/components/Web3message.tsx
rename to src/components/molecules/Web3message.tsx
index 05aa3ad..9b31253 100644
--- a/src/components/Web3message.tsx
+++ b/src/components/molecules/Web3message.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from 'react'
-import Button from '../components/atoms/Button'
-import AccountStatus from './molecules/AccountStatus/'
+import Button from '../atoms/Button'
+import AccountStatus from './AccountStatus/'
 import styles from './Web3message.module.scss'
-import { User } from '../context/User'
+import { User } from '../../context/User'
 
 export default class Web3message extends PureComponent {
     public render() {
diff --git a/src/routes/Publish/index.tsx b/src/routes/Publish/index.tsx
index 8e23393..299eb0e 100644
--- a/src/routes/Publish/index.tsx
+++ b/src/routes/Publish/index.tsx
@@ -8,7 +8,7 @@ import Label from '../../components/atoms/Form/Label'
 import Row from '../../components/atoms/Form/Row'
 import { User } from '../../context/User'
 import AssetModel from '../../models/AssetModel'
-import Web3message from '../../components/Web3message'
+import Web3message from '../../components/molecules/Web3message'
 import Files from './Files/'
 
 import form from '../../data/form-publish.json'