diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 303413b55..26a2e2db0 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -13,7 +13,7 @@
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
           keypath="post_status.account_not_locked_warning"
           tag="p"
-          class="visibility-notice"
+          class="alert neutral"
           scope="global"
         >
           <button
@@ -25,52 +25,52 @@
         </i18n-t>
         <p
           v-if="!hideScopeNotice && newStatus.visibility === 'public'"
-          class="visibility-notice notice-dismissible"
+          class="alert neutral notice-dismissible"
         >
           <span>{{ $t('post_status.scope_notice.public') }}</span>
-          <a
-            class="fa-scale-110 fa-old-padding dismiss"
+          <button
+            class="fa-scale-110 button-unstyled fa-old-padding dismiss"
             :title="$t('post_status.scope_notice_dismiss')"
             role="button"
             tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
-          </a>
+          </button>
         </p>
         <p
           v-else-if="!hideScopeNotice && newStatus.visibility === 'unlisted'"
-          class="visibility-notice notice-dismissible"
+          class="alert neutral notice-dismissible"
         >
           <span>{{ $t('post_status.scope_notice.unlisted') }}</span>
-          <a
-            class="fa-scale-110 fa-old-padding dismiss"
+          <button
+            class="fa-scale-110 button-unstyled fa-old-padding dismiss"
             :title="$t('post_status.scope_notice_dismiss')"
             role="button"
             tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
-          </a>
+          </button>
         </p>
         <p
           v-else-if="!hideScopeNotice && newStatus.visibility === 'private' && $store.state.users.currentUser.locked"
-          class="visibility-notice notice-dismissible"
+          class="alert neutral notice-dismissible"
         >
           <span>{{ $t('post_status.scope_notice.private') }}</span>
-          <a
-            class="fa-scale-110 fa-old-padding dismiss"
+          <button
+            class="fa-scale-110 button-unstyled fa-old-padding dismiss"
             :title="$t('post_status.scope_notice_dismiss')"
             role="button"
             tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
-          </a>
+          </button>
         </p>
         <p
           v-else-if="newStatus.visibility === 'direct'"
-          class="visibility-notice"
+          class="alert neutral"
         >
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 8a99c4ceb..159d09e36 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -438,9 +438,6 @@ export default {
     propsToNative (props) {
       return propsToNative(props)
     },
-    cancelImageText () {
-      return
-    },
     resetState () {
       const user = this.$store.state.users.currentUser