diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 2b2f265aa..7430193d4 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -103,4 +103,8 @@ module AccountsHelper
   def svg_logo
     content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 216.4144 232.00976')
   end
+
+  def svg_logo_full
+    content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 216.4144 232.00976')
+  end
 end
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index f71a3e4de..589c66885 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -348,16 +348,6 @@ export default function compose(state = initialState, action) {
     return state.set('is_changing_upload', true);
   case COMPOSE_REPLY_CANCEL:
   case COMPOSE_RESET:
-    return state.withMutations(map => {
-      map.set('in_reply_to', null);
-      map.set('text', '');
-      map.set('spoiler', false);
-      map.set('spoiler_text', '');
-      map.set('privacy', state.get('default_privacy'));
-      map.set('poll', null);
-      map.set('federation', state.get('default_federation'));
-      map.set('idempotencyKey', uuid());
-    });
   case COMPOSE_SUBMIT_SUCCESS:
     return clearAll(state);
   case COMPOSE_SUBMIT_FAIL:
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 5ad37198f..424f20be5 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -115,8 +115,8 @@ class PostStatusService < BaseService
     DistributionWorker.perform_async(@status.id)
     unless @status.local_only?
       ActivityPub::DistributionWorker.perform_async(@status.id)
-      PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
     end
+    PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
   end
 
   def validate_media!
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 2897158c4..8c98b63dc 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -65,7 +65,7 @@ class ProcessMentionsService < BaseService
 
   def assign_mentions!
     @current_mentions.each do |mention|
-      mention.save if mention.new_record? && ()
+      mention.save if mention.new_record?
     end
 
     # If previous mentions are no longer contained in the text, convert them