diff --git a/src/components/Article/Article.module.scss b/src/components/Article/Article.module.scss
index abdd02e7..9f632f7a 100644
--- a/src/components/Article/Article.module.scss
+++ b/src/components/Article/Article.module.scss
@@ -144,7 +144,6 @@ img {
 
 .shoutStatsItem {
   @include font-size(1.5rem);
-
   font-weight: 500;
   display: inline-block;
   margin: 0 3.2rem 1em 0;
@@ -166,17 +165,33 @@ img {
     max-height: 1.8em;
   }
 
+  .shoutStatsItemInner .iconEdit {
+    margin-right: 0.3em;
+  }
+
   img {
     display: block;
   }
 
   a {
     border: none;
+  }
+}
 
-    &:hover {
-      .icon {
-        filter: invert(1);
-      }
+.shoutStatsItemInner {
+  cursor: pointer;
+  margin: -0.3em -0.3em 0;
+  padding: 0.3em;
+
+  .icon {
+    margin-right: 0;
+  }
+
+  &:hover {
+    background: #000;
+
+    img {
+      filter: invert(1);
     }
   }
 }
@@ -300,6 +315,11 @@ img {
   margin-top: 0;
 }
 
+.commentsViewSwitcherButton {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+
 .help {
   border-bottom: 1px solid #e8e8e8;
   margin-bottom: 1.6rem;
diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx
index c372e95b..f5e6e1be 100644
--- a/src/components/Article/CommentsTree.tsx
+++ b/src/components/Article/CommentsTree.tsx
@@ -126,6 +126,7 @@ export const CommentsTree = (props: Props) => {
                 onClick={() => {
                   setCommentsOrder('newOnly')
                 }}
+                className={styles.commentsViewSwitcherButton}
               />
             </li>
           </Show>
@@ -136,6 +137,7 @@ export const CommentsTree = (props: Props) => {
               onClick={() => {
                 setCommentsOrder('createdAt')
               }}
+              className={styles.commentsViewSwitcherButton}
             />
           </li>
           <li classList={{ selected: commentsOrder() === 'rating' }}>
@@ -145,6 +147,7 @@ export const CommentsTree = (props: Props) => {
               onClick={() => {
                 setCommentsOrder('rating')
               }}
+              className={styles.commentsViewSwitcherButton}
             />
           </li>
         </ul>
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index 8d66d814..b1fe6a7d 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -206,8 +206,10 @@ export const FullArticle = (props: ArticleProps) => {
               </Show>
 
               <div class={styles.shoutStatsItem} onClick={() => scrollToComments()}>
-                <Icon name="comment" class={styles.icon} />
-                {/*{props.article.stat?.commented || ''}*/}
+                <div class={styles.shoutStatsItemInner}>
+                  <Icon name="comment" class={styles.icon} />
+                  {/*{props.article.stat?.commented || ''}*/}
+                </div>
               </div>
 
               <div class={styles.shoutStatsItem}>
@@ -216,18 +218,24 @@ export const FullArticle = (props: ArticleProps) => {
                   description={getDescription(props.article.body)}
                   imageUrl={props.article.cover}
                   containerCssClass={stylesHeader.control}
-                  trigger={<Icon name="share-outline" class={styles.icon} />}
+                  trigger={
+                    <div class={styles.shoutStatsItemInner}>
+                      <Icon name="share-outline" class={styles.icon} />
+                    </div>
+                  }
                 />
               </div>
 
               <div class={styles.shoutStatsItem} onClick={bookmark}>
-                <Icon name="bookmark" class={styles.icon} />
+                <div class={styles.shoutStatsItemInner}>
+                  <Icon name="bookmark" class={styles.icon} />
+                </div>
               </div>
 
               <Show when={canEdit()}>
                 <div class={styles.shoutStatsItem}>
-                  <a href="/edit">
-                    <Icon name="edit" />
+                  <a href="/edit" class={styles.shoutStatsItemInner}>
+                    <Icon name="edit" class={clsx(styles.icon, styles.iconEdit)} />
                     {t('Edit')}
                   </a>
                 </div>
diff --git a/src/components/_shared/Button/Button.tsx b/src/components/_shared/Button/Button.tsx
index eee81efe..382cba8c 100644
--- a/src/components/_shared/Button/Button.tsx
+++ b/src/components/_shared/Button/Button.tsx
@@ -10,6 +10,7 @@ type Props = {
   loading?: boolean
   disabled?: boolean
   onClick?: () => void
+  className?: string | ''
 }
 
 export const Button = (props: Props) => {
@@ -18,9 +19,15 @@ export const Button = (props: Props) => {
       onClick={props.onClick}
       type={props.type ?? 'button'}
       disabled={props.loading || props.disabled}
-      class={clsx(styles.button, styles[props.size ?? 'M'], styles[props.variant ?? 'primary'], {
-        [styles.loading]: props.loading
-      })}
+      class={clsx(
+        styles.button,
+        styles[props.size ?? 'M'],
+        styles[props.variant ?? 'primary'],
+        {
+          [styles.loading]: props.loading
+        },
+        props.className
+      )}
     >
       {props.value}
     </button>