diff --git a/app/javascript/styles/mastodon-material/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
index f0470dfa6..2cd0c8a52 100644
--- a/app/javascript/styles/mastodon-material/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -1,8 +1,3 @@
-$name: "Plus Classic";
-$target-version: "1.0.0";
-$website: "";
-@include version-check($name, $target-version, $website);
-
 $color-scheme: light;
 
 // Base color
diff --git a/app/javascript/styles/mastodon-material/plugins/plus.scss b/app/javascript/styles/mastodon-material/plugins/plus.scss
index 96d0bd3f6..f28da5971 100644
--- a/app/javascript/styles/mastodon-material/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material/plugins/plus.scss
@@ -1,7 +1,8 @@
-$name: Plus;
+$name: "Plus";
+$plugin-version: "1.0.0";
 $target-version: "1.0.0";
 $website: "";
-@include version-check($name, $target-version, $website);
+@include version-check($name, $plugin-version, $target-version, $website);
 
 .status__action-bar-button {
     background: #eeeeee;
@@ -34,11 +35,6 @@ $website: "";
     }
 }
 
-// single column mode
-@media screen and (min-width: 415px) {
-    .columns-area__panels__main { box-shadow: none }
-}
-
 // Fedibird bottom bar in mobile
 .tabs-bar.bottom-bar {
     background: #212121;
diff --git a/app/javascript/styles/mastodon-material/plugins/quote.scss b/app/javascript/styles/mastodon-material/plugins/quote.scss
index 14c1ffe2a..83e78c1ba 100644
--- a/app/javascript/styles/mastodon-material/plugins/quote.scss
+++ b/app/javascript/styles/mastodon-material/plugins/quote.scss
@@ -1,3 +1,9 @@
+$name: "Quote";
+$plugin-version: "1.0.0";
+$target-version: "1.0.0";
+$website: "";
+@include version-check($name, $plugin-version, $target-version, $website);
+
 .quote-indicator,
 .reply-indicator {
     @include card-elevation(false);
diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
index 7c0229770..eab36e2e7 100644
--- a/app/javascript/styles/mastodon-material/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -277,9 +277,8 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
-// version checker
-@mixin version-check($name, $target-version, $website) {
+@mixin version-check($name, $plugin-version, $target-version, $website) {
     @if $target-version != $version {
-        @debug "[Info] #{$name} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check plugin website: #{$website}";
+        @debug "[Info] #{$name} #{$plugin-version} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check the following website: #{$website}";
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index c016e5db4..1c90d11fd 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -396,6 +396,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { padding: 8px 0 }
     }
 
     &__chart {
diff --git a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
index 545bab92c..25a976d0c 100644
--- a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
@@ -32,7 +32,6 @@
 }
 
 .emoji-mart {
-    width: 388px !important;
     font-size: 14px;
     color: $menu-text-color;
 
@@ -55,7 +54,7 @@
             &:hover { color: $tab-item-active-color }
         }
 
-        &:hover { color: $tab-item-color }
+        &:hover { color: $tab-item-active-color }
     }
 
     &-search {
@@ -65,6 +64,10 @@
             right: auto;
             left: 16px;
             padding: 2px 6px;
+
+            svg { fill: $icon-color }
+
+            &:disabled { opacity: 1 }
         }
 
         input {
@@ -80,6 +83,8 @@
                 background: $search-bar-focus-color;
                 color: $search-bar-text-color;
             }
+
+            &::placeholder { color: $tips-text-color }
         }
     }
 
diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
index 18054c4f4..2c7b8510f 100644
--- a/app/javascript/styles/mastodon-material/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -140,6 +140,8 @@
         &>.fa {
             font-size: 26px;
         }
+
+        &-image { border-radius: $card-radius 0 0 $card-radius }
     }
 
     &__title {