diff --git a/app/controllers/antennas_controller.rb b/app/controllers/antennas_controller.rb
index 5e51e9a68a..ca7ee5d2a2 100644
--- a/app/controllers/antennas_controller.rb
+++ b/app/controllers/antennas_controller.rb
@@ -12,28 +12,8 @@ class AntennasController < ApplicationController
     @antennas = current_account.antennas.includes(:antenna_domains).includes(:antenna_tags).includes(:antenna_accounts)
   end
 
-  def new
-    @antenna = current_account.antennas.build
-    @antenna.antenna_domains.build
-    @antenna.antenna_tags.build
-    @antenna.antenna_accounts.build
-  end
-
   def edit; end
 
-  def create
-    @antenna = current_account.antennas.build(thin_resource_params)
-
-    saved = @antenna.save
-    saved = @antenna.update(resource_params) if saved
-
-    if saved
-      redirect_to antennas_path
-    else
-      render action: :new
-    end
-  end
-
   def update
     if @antenna.update(resource_params)
       redirect_to antennas_path
diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx
index 8b15b4c6ae..6889a83210 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.jsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.jsx
@@ -202,7 +202,7 @@ class AccountCard extends ImmutablePureComponent {
         <div className='account-card__actions'>
           <div className='account-card__counters'>
             <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('statuses_count')} />
+              <ShortNumber value={account.get('statuses_count')} isHide={account.getIn(['other_settings', 'hide_statuses_count']) || false} />
               <small>
                 <FormattedMessage id='account.posts' defaultMessage='Posts' />
               </small>
diff --git a/app/javascript/mastodon/features/emoji_reactions/index.jsx b/app/javascript/mastodon/features/emoji_reactions/index.jsx
index 5ab2a34958..2140238499 100644
--- a/app/javascript/mastodon/features/emoji_reactions/index.jsx
+++ b/app/javascript/mastodon/features/emoji_reactions/index.jsx
@@ -86,7 +86,7 @@ class EmojiReactions extends ImmutablePureComponent {
           showBackButton
           multiColumn={multiColumn}
           extraButton={(
-            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleLoadMore}><Icon id='refresh' /></button>
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
           )}
         />
 
diff --git a/app/views/antennas/index.html.haml b/app/views/antennas/index.html.haml
index d0b9bbcc14..27a7933051 100644
--- a/app/views/antennas/index.html.haml
+++ b/app/views/antennas/index.html.haml
@@ -1,9 +1,6 @@
 - content_for :page_title do
   = t('antennas.index.title')
 
-- content_for :heading_actions do
-  = link_to t('antennas.new.title'), new_antenna_path, class: 'button'
-
 - if @antennas.empty?
   .muted-hint.center-text= t 'antennas.index.empty'
 - else
diff --git a/app/views/antennas/new.html.haml b/app/views/antennas/new.html.haml
deleted file mode 100644
index 9ff46b253c..0000000000
--- a/app/views/antennas/new.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-- content_for :page_title do
-  = t('antennas.new.title')
-
-= simple_form_for @antenna, url: antennas_path do |f|
-  = render 'shared/error_messages', object: @antenna
-  = render 'antenna_fields', f: f, lists: @lists
-
-  .actions
-    = f.button :button, t('antennas.new.save'), type: :submit
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf45976a7c..d56dd1d3fb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1131,9 +1131,6 @@ en:
       expires_on: Expires on %{date}
       stl: This antenna is in STL mode, ignoring reject-subscription settings.
       title: Antennas
-    new:
-      save: Save new antenna
-      title: Add new antenna
   appearance:
     advanced_web_interface: Advanced web interface
     advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index efdfe1661d..a305a82ea0 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1125,9 +1125,6 @@ ja:
       tags:
         other: "%{count}件のタグ"
       title: アンテナ
-    new:
-      save: 新規アンテナを保存
-      title: 新規アンテナを追加
   appearance:
     advanced_web_interface: 上級者向けUI
     advanced_web_interface_hint: 'ディスプレイを幅いっぱいまで活用したい場合、上級者向け UI をおすすめします。ホーム、通知、連合タイムライン、更にはリストやハッシュタグなど、様々な異なるカラムから望む限りの情報を一度に受け取れるような設定が可能になります。'