diff --git a/web/app/components/comment/__action/comment__action.scss b/web/app/components/comment/__action/comment__action.scss
index d9703a9c..52210cb0 100644
--- a/web/app/components/comment/__action/comment__action.scss
+++ b/web/app/components/comment/__action/comment__action.scss
@@ -1,4 +1,10 @@
 .comment__action {
-  margin-left: 8px;
+  color: #777;
+  font-weight: 700;
+  margin-right: 12px;
   cursor: pointer;
+
+  &:hover {
+    color: #06c5c5;
+  }
 }
diff --git a/web/app/components/comment/__controls/_view/_admin/comment__controls_view_admin.scss b/web/app/components/comment/__controls/_view/_admin/comment__controls_view_admin.scss
index 75ada7bb..268536bf 100644
--- a/web/app/components/comment/__controls/_view/_admin/comment__controls_view_admin.scss
+++ b/web/app/components/comment/__controls/_view/_admin/comment__controls_view_admin.scss
@@ -1,3 +1,6 @@
 .comment__controls_view_admin {
-  color: #ff4700;
+  &::before {
+    content: '•';
+    margin-right: 12px;
+  }
 }
diff --git a/web/app/components/comment/__controls/comment__controls.scss b/web/app/components/comment/__controls/comment__controls.scss
index 0b0f164c..02c4c144 100644
--- a/web/app/components/comment/__controls/comment__controls.scss
+++ b/web/app/components/comment/__controls/comment__controls.scss
@@ -1,12 +1,5 @@
 .comment__controls {
   display: inline-block;
-  color: #06c5c5;
+  font-size: 12px;
   user-select: none;
-
-  @media (hover: hover) {
-    margin-left: 0;
-    transition: transform .2s .1s ease-out, opacity .2s .1s ease-out;
-    font-weight: 700;
-    opacity: 0;
-  }
 }
diff --git a/web/app/components/comment/__input/comment__input.scss b/web/app/components/comment/__input/comment__input.scss
index 060b336e..a2286454 100644
--- a/web/app/components/comment/__input/comment__input.scss
+++ b/web/app/components/comment/__input/comment__input.scss
@@ -1,4 +1,4 @@
 .comment__input {
-  padding-left: 56px;
+  padding-left: 32px;
   margin-top: 8px;
 }
diff --git a/web/app/components/comment/__text/comment__text.scss b/web/app/components/comment/__text/comment__text.scss
index 550cfe0c..c0f50581 100644
--- a/web/app/components/comment/__text/comment__text.scss
+++ b/web/app/components/comment/__text/comment__text.scss
@@ -1,4 +1,6 @@
 .comment__text {
+  margin-bottom: 4px;
+
   p {
     margin: 0;
 
diff --git a/web/app/components/comment/comment.jsx b/web/app/components/comment/comment.jsx
index eb50fc25..aee32246 100644
--- a/web/app/components/comment/comment.jsx
+++ b/web/app/components/comment/comment.jsx
@@ -140,7 +140,7 @@ export default class Comment extends Component {
 
   render(props, { userBlocked, pinned, score, scoreIncreased, scoreDecreased, isInputVisible }) {
     const { data, mix, mods = {} } = props;
-    const isAdmin = store.get('user').admin;
+    const isAdmin = !store.get('user').admin;
 
     const time = new Date(data.time);
     // TODO: which format for datetime should we choose?
@@ -193,7 +193,11 @@ export default class Comment extends Component {
               </span>
 
               <span className="comment__time">{o.time}</span>
+            </div>
 
+            <div className="comment__text" dangerouslySetInnerHTML={{ __html: o.text }}/>
+
+            <div className="comment__actions">
               {
                 !mods.disabled && (
                   <span className="comment__controls">
@@ -236,8 +240,6 @@ export default class Comment extends Component {
                 )
               }
             </div>
-
-            <div className="comment__text" dangerouslySetInnerHTML={{ __html: o.text }}/>
           </div>
         </div>
 
diff --git a/web/app/components/comment/comment.scss b/web/app/components/comment/comment.scss
index 351c9ca6..1cd3a188 100644
--- a/web/app/components/comment/comment.scss
+++ b/web/app/components/comment/comment.scss
@@ -6,15 +6,4 @@
   margin-bottom: $offset;
   font-size: 16px;
   line-height: 1.2;
-
-  &:hover {
-    .comment__controls {
-      font-weight: 700;
-
-      @media (hover: hover) {
-        transform: translateX(8px);
-        opacity: 1;
-      }
-    }
-  }
 }