diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index bda2edba60..ca8aa90d12 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -28,7 +28,7 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
-  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 4096),
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/models/concerns/account/avatar.rb b/app/models/concerns/account/avatar.rb
index 329549d26a..df0789f84a 100644
--- a/app/models/concerns/account/avatar.rb
+++ b/app/models/concerns/account/avatar.rb
@@ -5,6 +5,7 @@ module Account::Avatar
 
   IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
   LIMIT = 200.megabytes
+  MAX_PIXELS = 5_000_000 # 1500x500px
 
   class_methods do
     def avatar_styles(file)
diff --git a/app/models/concerns/account/header.rb b/app/models/concerns/account/header.rb
index 9c8f122ba0..692bdeecf2 100644
--- a/app/models/concerns/account/header.rb
+++ b/app/models/concerns/account/header.rb
@@ -5,7 +5,7 @@ module Account::Header
 
   IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
   LIMIT = 200.megabytes
-  MAX_PIXELS = 750_000 # 1500x500px
+  MAX_PIXELS = 5_000_000 # 1500x500px
 
   class_methods do
     def header_styles(file)
diff --git a/app/models/status.rb b/app/models/status.rb
index e0630733d8..4e68036a6e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -39,7 +39,7 @@ class Status < ApplicationRecord
   include Status::SnapshotConcern
   include Status::ThreadingConcern
 
-  MEDIA_ATTACHMENTS_LIMIT = 4
+  MEDIA_ATTACHMENTS_LIMIT = 16
 
   rate_limit by: :account, family: :statuses
 
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index dc841ded3e..b4af50f721 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StatusLengthValidator < ActiveModel::Validator
-  MAX_CHARS = 500
+  MAX_CHARS = 4096
   URL_PLACEHOLDER_CHARS = 23
   URL_PLACEHOLDER = 'x' * 23