diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index f92e0b2fb..05d8989ad 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -1,119 +1,7 @@
- content_for :page_title do
- = site_hostname
+ = t('about.title')
- content_for :header_tags do
- = javascript_pack_tag 'public', crossorigin: 'anonymous'
= render partial: 'shared/og'
-.grid-4
- .column-0
- .public-account-header.public-account-header--no-bar
- .public-account-header__image
- %div{:class => ("originalheader")}
- %h1
- = link_to root_url, class: 'brand' do
- = site_title
- .box-widget
- %p Sign in
- - if !closed_registrations?
- %p Create account
- - if closed_registrations? && @instance_presenter.closed_registrations_message.present?
- .closed
- .rich-formatting
- %h3= 'Registrations closed.'
- %p= @instance_presenter.closed_registrations_message.html_safe
- - if closed_registrations? && !@instance_presenter.closed_registrations_message.present?
- %hr
- .closed
- .rich-formatting
- %h3= 'Registrations closed.'
- %p= 'This server is closed to registrations.'
- .column-1
- .landing-page__call-to-action{ dir: 'ltr' }
- .row
- .row__information-board
- .information-board__section
- %span= t 'about.user_count_before'
- %strong= friendly_number_to_human @instance_presenter.user_count
- %span= t 'about.user_count_after', count: @instance_presenter.user_count
- .information-board__section
- %span= t 'about.status_count_before'
- %strong= friendly_number_to_human @instance_presenter.status_count
- %span= t 'about.status_count_after', count: @instance_presenter.status_count
- .row__mascot
- - if @instance_presenter.mascot&.file&.url
- .landing-page__mascot
- = image_tag @instance_presenter.mascot&.file&.url
- - else
- .landing-page__mascot{:class => ("originalmascot")}
- %div{:class => ("originalmascotimg")}
- = logo_as_symbol
-
- .column-2
- .contact-widget
- %h4= t 'about.administered_by'
-
- = account_link_to(@instance_presenter.contact.account)
-
- - if @instance_presenter.contact.email.present?
- %h4
- = succeed ':' do
- = t 'about.contact'
-
- = mail_to @instance_presenter.contact.email, nil, title: @instance_presenter.contact.email
-
- .column-3
- = render 'application/flashes'
-
- - if @contents.blank? && @rules.empty? && (!display_blocks? || @blocks&.empty?)
- = nothing_here
- - else
- .box-widget
- .rich-formatting
- - unless @rules.empty?
- %h2#rules= t('about.rules')
-
- %p= t('about.rules_html')
-
- %ol.rules-list
- - @rules.each do |rule|
- %li
- .rules-list__text= rule.text
-
- = @contents.html_safe
-
- - if display_blocks? && !@blocks.empty?
- %h2#unavailable-content= t('about.unavailable_content')
-
- %p= t('about.unavailable_content_html')
-
- - if (blocks = @blocks.select(&:reject_media?)) && !blocks.empty?
- %h3= t('about.unavailable_content_description.rejecting_media_title')
- %p= t('about.unavailable_content_description.rejecting_media')
- = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
- - if (blocks = @blocks.select(&:silence?)) && !blocks.empty?
- %h3= t('about.unavailable_content_description.silenced_title')
- %p= t('about.unavailable_content_description.silenced')
- = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
- - if (blocks = @blocks.select(&:suspend?)) && !blocks.empty?
- %h3= t('about.unavailable_content_description.suspended_title')
- %p= t('about.unavailable_content_description.suspended')
- = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
-
- .column-4
- %ul.table-of-contents
- - unless @rules.empty?
- %li= link_to t('about.rules'), '#rules'
-
- - @table_of_contents.each do |item|
- %li
- = link_to item.title, "##{item.anchor}"
-
- - unless item.children.empty?
- %ul
- - item.children.each do |sub_item|
- %li= link_to sub_item.title, "##{sub_item.anchor}"
-
- - if display_blocks? && !@blocks.empty?
- %li= link_to t('about.unavailable_content'), '#unavailable-content'
-
+= render partial: 'shared/web_app'
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml
index 9edb97a6b..757ef0a09 100644
--- a/app/views/auth/shared/_links.html.haml
+++ b/app/views/auth/shared/_links.html.haml
@@ -5,7 +5,7 @@
- if controller_name != 'sessions'
%li= link_to_login t('auth.login')
- - if controller_name != 'registrations' && !whitelist_mode?
+ - if controller_name != 'registrations'
%li= link_to t('auth.register'), available_sign_up_path
- if controller_name != 'passwords' && controller_name != 'registrations'