diff --git a/scss/components/_remark.scss b/scss/components/_remark.scss
index 5db942a8..9c5023b7 100644
--- a/scss/components/_remark.scss
+++ b/scss/components/_remark.scss
@@ -1,21 +1,25 @@
 .#{$ns}Remark {
   display: inline-block;
   margin-left: $Remark-marginLeft;
-  color: $Remark-iconColor;
-  font-size: $fontSizeBase;
-  line-height: 1;
+
   cursor: pointer;
-  background-color: $Remark-bg;
-  border: $Remark-borderWidth solid $Remark-borderColor;
   text-align: center;
-  width: $Remark-width;
 
   &-icon {
-    color: inherit;
+    color: $Remark-iconColor;
     font-size: $Remark-icon-fontSize;
+    background-color: $Remark-bg;
+    border: $Remark-borderWidth solid $Remark-borderColor;
+    width: $Remark-width;
+    height: $Remark-width;
+    line-height: 1;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font-size: $fontSizeBase;
   }
 
-  &:hover {
+  &:hover > &-icon {
     color: $Remark-onHover-iconColor;
     background-color: $Remark-onHover-bg;
     border-color: $Remark-onHover-borderColor;
diff --git a/scss/components/form/_form.scss b/scss/components/form/_form.scss
index 2a540ca0..571fe896 100644
--- a/scss/components/form/_form.scss
+++ b/scss/components/form/_form.scss
@@ -271,6 +271,10 @@
           display: inline-block;
         }
 
+        > .#{$ns}Remark {
+          padding-top: $Form-label-paddingTop;
+        }
+
         > .#{$ns}Form-control.#{$ns}InputGroup {
           display: inline-flex;
         }