7 files changed, 11 insertions, 7 deletions
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 565c4ed59..68a5fee55 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -8,8 +8,7 @@
 .landing
   .landing__brand
     = link_to root_url, class: 'brand' do
-      = svg_logo_full
-      %span.brand__tagline=t 'about.tagline'
+      = image_pack_tag 'logo-cybre.png', width: 100, alt: 'Cybrespace'
 
   .landing__grid
     .landing__grid__column.landing__grid__column-registration
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 1a81b96f6..aa2c83dec 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -19,6 +19,11 @@
 
 = render 'header', account: @account, with_bio: true
 
+- if @account.user&.disabled?
+  .header
+    .nav-center
+      %h2 This user's account has been locked by a moderator.
+
 .grid
   .column-0
     .h-feed
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 62716ab1e..fd3a86698 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -8,7 +8,7 @@
       .sidebar-wrapper__inner
         .sidebar
           = link_to root_path do
-            = image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
+            = image_pack_tag 'logo-cybre.png', class: 'logo', alt: 'Cybrespace'
 
           .sidebar__toggle
             .sidebar__toggle__logo
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 0ea3bbe3b..d035ce0c6 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,7 @@
     .logo-container
       %h1
         = link_to root_path do
-          = svg_logo_full
+          = image_pack_tag 'logo-cybre.png', alt: 'Cybrespace'
 
     .form-container
       = render 'flashes'
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index e63cf0848..05513f241 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -42,7 +42,7 @@
               %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
           .column-2
             %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
-            = link_to svg_logo, root_url, class: 'brand'
+            = link_to (image_pack_tag 'logo-cybre.png', width: 50), root_url, class: 'brand', alt: 'Cybrespace'
           .column-3
             %h4= site_hostname
             %ul
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index 4c879472d..dfe2107ad 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -71,7 +71,7 @@
         = " "
       ·
     = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do
-      = fa_icon('star')
+      = fa_icon('floppy-o')
       %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true
       = " "
 
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 545470828..c70d199d7 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -68,4 +68,4 @@
       - else
         = fa_icon 'envelope fw'
     = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button' do
-      = fa_icon 'star fw'
+      = fa_icon 'floppy-o fw'