diff --git a/Gemfile.lock b/Gemfile.lock
index 141afc122..8d6132849 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -582,7 +582,7 @@ GEM
       uri (>= 0.11.1)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.24)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-pop (0.1.2)
diff --git a/VERSION_CW b/VERSION_CW
index 0fb7a35b6..5c517bf11 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.14.2
+4.15.0
diff --git a/app/builders/contact_inbox_with_contact_builder.rb b/app/builders/contact_inbox_with_contact_builder.rb
index 2c0e6087e..2ba9179ed 100644
--- a/app/builders/contact_inbox_with_contact_builder.rb
+++ b/app/builders/contact_inbox_with_contact_builder.rb
@@ -50,7 +50,7 @@ class ContactInboxWithContactBuilder
 
   def create_contact
     account.contacts.create!(
-      name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
+      name: contact_name,
       phone_number: contact_attributes[:phone_number],
       email: contact_attributes[:email],
       identifier: contact_attributes[:identifier],
@@ -59,6 +59,11 @@ class ContactInboxWithContactBuilder
     )
   end
 
+  def contact_name
+    name = contact_attributes[:name] || ::Haikunator.haikunate(1000)
+    name.truncate(ApplicationRecord::MAX_STRING_COLUMN_LENGTH, omission: '')
+  end
+
   def find_contact
     contact = find_contact_by_identifier(contact_attributes[:identifier])
     contact ||= find_contact_by_email(contact_attributes[:email])
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index 686ffaeec..655b3c890 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -53,7 +53,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
 
   def category_params
     params.require(:category).permit(
-      :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
+      :name, :description, :position, :slug, :locale, :icon, :icon_color, :parent_category_id, :associated_category_id
     )
   end
 
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index eafda0fe2..bc1082583 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -214,3 +214,5 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     render json: error, status: error_status
   end
 end
+
+Api::V1::Accounts::ContactsController.prepend_mod_with('Api::V1::Accounts::ContactsController')
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 2856c7817..2e53fa7c9 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -140,7 +140,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def destroy
     authorize @conversation, :destroy?
-    ::DeleteObjectJob.perform_later(@conversation, Current.user, request.ip)
+    ::Conversations::DeleteService.new(conversation: @conversation, user: Current.user, ip: request.ip).perform
     head :ok
   end
 
diff --git a/app/controllers/api/v1/profile/sessions_controller.rb b/app/controllers/api/v1/profile/sessions_controller.rb
new file mode 100644
index 000000000..72e9451eb
--- /dev/null
+++ b/app/controllers/api/v1/profile/sessions_controller.rb
@@ -0,0 +1,36 @@
+class Api::V1::Profile::SessionsController < Api::BaseController
+  before_action :set_session, only: [:destroy]
+
+  def index
+    @sessions = current_user.user_sessions.where(client_id: active_token_client_ids).order(last_activity_at: :desc)
+    @current_client_id = request.headers['client']
+  end
+
+  def destroy
+    if @session.current?(request.headers['client'])
+      render json: { error: I18n.t('profile_settings.sessions.cannot_revoke_current') }, status: :unprocessable_entity
+      return
+    end
+
+    revoke_token!(@session.client_id)
+    @session.destroy!
+    head :ok
+  end
+
+  private
+
+  def set_session
+    @session = current_user.user_sessions.find(params[:id])
+  end
+
+  def revoke_token!(client_id)
+    tokens = current_user.tokens
+    tokens.delete(client_id)
+    current_user.update!(tokens: tokens)
+  end
+
+  def active_token_client_ids
+    now = Time.current.to_i
+    (current_user.tokens || {}).select { |_, v| v['expiry'].to_i > now }.keys
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2f389049d..9dea4b4da 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,7 @@ class ApplicationController < ActionController::Base
   include RequestExceptionHandler
   include Pundit::Authorization
   include SwitchLocale
+  include TrackSessionActivity
 
   skip_before_action :verify_authenticity_token
 
diff --git a/app/controllers/concerns/track_session_activity.rb b/app/controllers/concerns/track_session_activity.rb
new file mode 100644
index 000000000..f6a512922
--- /dev/null
+++ b/app/controllers/concerns/track_session_activity.rb
@@ -0,0 +1,22 @@
+module TrackSessionActivity
+  extend ActiveSupport::Concern
+
+  included do
+    after_action :update_session_activity
+  end
+
+  private
+
+  def update_session_activity
+    return unless current_user
+    return if request.headers['client'].blank?
+
+    UserSessionTrackingService.new(
+      user: current_user,
+      request: request,
+      client_id: request.headers['client']
+    ).update_activity!
+  rescue StandardError => e
+    Rails.logger.warn "Session activity update failed: #{e.message}"
+  end
+end
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index bd7bb9b44..587b52c83 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -1,4 +1,6 @@
 class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
+  MAX_SESSIONS = ENV.fetch('MAX_USER_SESSIONS', 25).to_i
+
   # Prevent session parameter from being passed
   # Unpermitted parameter: session
   wrap_parameters format: []
@@ -14,12 +16,14 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
 
     user = find_user_for_authentication
     return handle_mfa_required(user) if user&.mfa_enabled?
+    return if user && enforce_session_limit_for_password_login(user)
 
     # Only proceed with standard authentication if no MFA is required
     super
   end
 
   def render_create_success
+    track_user_session unless @impersonation
     render partial: 'devise/auth', formats: [:json], locals: { resource: @resource }
   end
 
@@ -53,6 +57,8 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   end
 
   def handle_sso_authentication
+    return if !@impersonation && enforce_session_limit_for_password_login(@resource)
+
     authenticate_resource_with_sso_token
     yield @resource if block_given?
     render_create_success
@@ -65,7 +71,10 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   end
 
   def authenticate_resource_with_sso_token
-    @token = @resource.create_token
+    # DTA evicts the earliest-expiring token after save when at max_number_of_devices.
+    # The short-lived impersonation token would always be that one, so pre-evict to make room.
+    make_room_for_impersonation_token if @impersonation
+    @token = @resource.create_token(lifespan: @impersonation ? 2.days.to_i : nil)
     @resource.save!
 
     sign_in(:user, @resource, store: false, bypass: false)
@@ -73,11 +82,21 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
     @resource.invalidate_sso_auth_token(params[:sso_auth_token])
   end
 
+  def make_room_for_impersonation_token
+    return if @resource.tokens.size < DeviseTokenAuth.max_number_of_devices
+
+    oldest_client_id = @resource.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+    @resource.tokens.delete(oldest_client_id) if oldest_client_id
+  end
+
   def process_sso_auth_token
     return if params[:email].blank?
 
     user = User.from_email(params[:email])
-    @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
+    return unless user&.valid_sso_auth_token?(params[:sso_auth_token])
+
+    @resource = user
+    @impersonation = user.sso_auth_token_impersonation?(params[:sso_auth_token])
   end
 
   def handle_mfa_required(user)
@@ -103,6 +122,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   end
 
   def sign_in_mfa_user(user)
+    evict_oldest_session(user) if sessions_limit_reached?(user)
     @resource = user
     @token = @resource.create_token
     @resource.save!
@@ -114,6 +134,103 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   def render_mfa_error(message_key, status = :bad_request)
     render json: { error: I18n.t(message_key) }, status: status
   end
+
+  def sessions_limit_reached?(user)
+    active_token_count(user) >= MAX_SESSIONS
+  end
+
+  def active_token_count(user)
+    now = Time.current.to_i
+    (user.tokens || {}).count { |_, v| v['expiry'].to_i > now }
+  end
+
+  # Returns true when a response has been rendered (e.g., 409 picker). Non-browser clients
+  # auto-evict instead of getting stuck on a UI they can't render.
+  def enforce_session_limit_for_password_login(user)
+    if revoking_sessions?
+      revoke_sessions_for_login(user)
+      return false
+    end
+
+    return false unless sessions_limit_reached?(user)
+
+    # Picker only when every token has a tracked session; partial tracking would
+    # show a misleading count, so fall through to silent eviction instead.
+    if browser_request? && user.user_sessions.count >= user.tokens.size
+      handle_sessions_limit_for_login(user)
+      true
+    else
+      evict_oldest_session(user)
+      false
+    end
+  end
+
+  def browser_request?
+    request.user_agent.to_s.include?('Mozilla')
+  end
+
+  def revoking_sessions?
+    params[:revoke_session_id].present? || params[:revoke_all_sessions].present?
+  end
+
+  def revoke_sessions_for_login(user)
+    if params[:revoke_all_sessions].present?
+      user.tokens = {}
+      user.save!
+      user.user_sessions.destroy_all
+    elsif params[:revoke_session_id].present?
+      session = user.user_sessions.find_by(id: params[:revoke_session_id])
+      return unless session
+
+      user.tokens.delete(session.client_id)
+      user.save!
+      session.destroy!
+    end
+  end
+
+  def evict_oldest_session(user)
+    # Drop pre-rollout untracked tokens first so freshly tracked logins aren't evicted.
+    return evict_oldest_token(user) if user.user_sessions.count < user.tokens.size
+
+    oldest_session = user.user_sessions.order(Arel.sql('COALESCE(last_activity_at, created_at) ASC')).first
+    return evict_oldest_token(user) unless oldest_session
+
+    user.tokens.delete(oldest_session.client_id)
+    user.save!
+    oldest_session.destroy!
+  end
+
+  # Fallback if a token exists without a UserSession row (e.g., legacy data before tracking shipped).
+  def evict_oldest_token(user)
+    return if user.tokens.blank?
+
+    oldest_client_id = user.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+    return unless oldest_client_id
+
+    user.tokens.delete(oldest_client_id)
+    user.save!
+  end
+
+  PICKER_SESSION_FIELDS = %i[id browser_name browser_version device_name platform_name platform_version
+                             ip_address city country last_activity_at created_at].freeze
+
+  def handle_sessions_limit_for_login(user)
+    sessions = user.user_sessions.order(last_activity_at: :desc).map { |s| s.slice(*PICKER_SESSION_FIELDS) }
+    render json: { sessions_limit_reached: true, sessions: sessions }, status: :conflict
+  end
+
+  def track_user_session
+    client_id = @token&.try(:client) || response.headers['client']
+    return unless client_id.present? && @resource.present?
+
+    UserSessionTrackingService.new(
+      user: @resource,
+      request: request,
+      client_id: client_id
+    ).create_or_update!
+  rescue StandardError => e
+    Rails.logger.warn "Session tracking failed: #{e.message}"
+  end
 end
 
 DeviseOverrides::SessionsController.prepend_mod_with('DeviseOverrides::SessionsController')
diff --git a/app/controllers/twilio/callback_controller.rb b/app/controllers/twilio/callback_controller.rb
index 53075a555..ed1a05376 100644
--- a/app/controllers/twilio/callback_controller.rb
+++ b/app/controllers/twilio/callback_controller.rb
@@ -35,7 +35,17 @@ class Twilio::CallbackController < ApplicationController
       :ExternalUserId,
       :ParentExternalUserId,
       :ProfileUsername,
-      :Username
+      :Username,
+      :ReferralBody,
+      :ReferralHeadline,
+      :ReferralSourceId,
+      :ReferralSourceType,
+      :ReferralSourceUrl,
+      :ReferralMediaId,
+      :ReferralMediaContentType,
+      :ReferralMediaUrl,
+      :ReferralNumMedia,
+      :ReferralCtwaClid
     )
   end
 end
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index fa437327d..9d53ec97e 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -12,6 +12,7 @@ class ConversationFinder
     'waiting_since_asc' => %w[sort_on_waiting_since asc],
     'waiting_since_desc' => %w[sort_on_waiting_since desc],
     'priority_desc_created_at_asc' => %w[sort_on_priority_created_at desc],
+    'unread' => %w[sort_on_unread desc],
 
     # To be removed in v3.5.0
     'latest' => %w[sort_on_last_activity_at desc],
@@ -40,7 +41,7 @@ class ConversationFinder
   def perform
     set_up
 
-    mine_count, unassigned_count, all_count, = set_count_for_all_conversations
+    mine_count, unassigned_count, all_count = set_count_for_all_conversations
     assigned_count = all_count - unassigned_count
 
     filter_by_assignee_type
@@ -141,7 +142,7 @@ class ConversationFinder
       conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
       @conversations = @conversations.where(id: conversation_ids)
     when 'participating'
-      @conversations = current_user.participating_conversations.where(account_id: current_account.id)
+      @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
     when 'unattended'
       @conversations = @conversations.unattended
     end
@@ -184,6 +185,17 @@ class ConversationFinder
   end
 
   def set_count_for_all_conversations
+    return legacy_count_for_all_conversations if @conversations.limit_value || @conversations.offset_value || @conversations.eager_loading?
+
+    counts = @conversations.unscope(:order).pick(
+      Arel.sql("COUNT(*) FILTER (WHERE assignee_id = #{current_user.id})"),
+      Arel.sql('COUNT(*) FILTER (WHERE assignee_id IS NULL)'),
+      Arel.sql('COUNT(*)')
+    )
+    counts || [0, 0, 0]
+  end
+
+  def legacy_count_for_all_conversations
     [
       @conversations.assigned_to(current_user).count,
       @conversations.unassigned.count,
diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 0c993ec59..64e46f0b7 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -17,15 +17,11 @@ module PortalHelper
     uri.to_s
   end
 
-  def generate_portal_bg_color(portal_color, theme)
+  def generate_portal_bg(portal_color, theme)
     base_color = theme == 'dark' ? 'black' : 'white'
     "color-mix(in srgb, #{portal_color} 20%, #{base_color})"
   end
 
-  def generate_portal_bg(portal_color, theme)
-    generate_portal_bg_color(portal_color, theme)
-  end
-
   def generate_gradient_to_bottom(theme)
     base_color = theme == 'dark' ? '#151718' : 'white'
     "linear-gradient(to bottom, transparent, #{base_color})"
@@ -41,6 +37,10 @@ module PortalHelper
     language_map[locale] || locale
   end
 
+  def html_lang_attribute(locale)
+    locale.to_s.tr('_', '-')
+  end
+
   def theme_query_string(theme)
     theme.present? && theme != 'system' ? "?theme=#{theme}" : ''
   end
@@ -97,6 +97,18 @@ module PortalHelper
     ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
   end
 
+  # Renders a stored category icon: a bare ri icon name (e.g. `vip-crown-2-fill/line`) saved color, or a plain emoji character.
+  def render_emoji_or_icon(value, color = nil)
+    return '' if value.blank?
+
+    # Emojis are non-ascii; bare icon names match this safe charset.
+    return ERB::Util.html_escape(value) unless value.match?(/\A[a-z][a-z0-9-]*\z/)
+
+    icon_class = value.start_with?('i-') ? value : "i-ri-#{value}"
+    style = "color: #{color};" if color.to_s.match?(/\A#\h{3,8}\z/)
+    tag.span(class: icon_class, style: style, 'aria-hidden': true)
+  end
+
   def thumbnail_bg_color(username)
     colors = ['#6D95BA', '#A4C3C3', '#E19191']
     return colors.sample if username.blank?
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index a1b15ee79..b9dc59964 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -106,4 +106,10 @@ export default {
     const urlData = endPoints('resetAccessToken');
     return axios.post(urlData.url);
   },
+  getSessions() {
+    return axios.get('/api/v1/profile/sessions');
+  },
+  revokeSession(id) {
+    return axios.delete(`/api/v1/profile/sessions/${id}`);
+  },
 };
diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index c39a4cf9d..0b32c0bc2 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -40,6 +40,12 @@ class ContactAPI extends ApiClient {
     return axios.get(`${this.url}/${contactId}/conversations`, { params });
   }
 
+  getAttachments(contactId, page = 1) {
+    return axios.get(`${this.url}/${contactId}/attachments`, {
+      params: { page },
+    });
+  }
+
   getContactableInboxes(contactId) {
     return axios.get(`${this.url}/${contactId}/contactable_inboxes`);
   }
diff --git a/app/javascript/dashboard/api/inboxes.js b/app/javascript/dashboard/api/inboxes.js
index 114dbb6f4..3c1d17fc8 100644
--- a/app/javascript/dashboard/api/inboxes.js
+++ b/app/javascript/dashboard/api/inboxes.js
@@ -60,6 +60,12 @@ class Inboxes extends CacheEnabledApiClient {
   disableWhatsappCalling(inboxId) {
     return axios.post(`${this.url}/${inboxId}/disable_whatsapp_calling`);
   }
+
+  setInboundCalls(inboxId, enabled) {
+    return axios.post(`${this.url}/${inboxId}/set_inbound_calls`, {
+      inbound_calls_enabled: enabled,
+    });
+  }
 }
 
 export default new Inboxes();
diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss
index 784edce6c..4a67e5182 100644
--- a/app/javascript/dashboard/assets/scss/_next-colors.scss
+++ b/app/javascript/dashboard/assets/scss/_next-colors.scss
@@ -145,6 +145,12 @@
     --black-alpha-2: 0, 0, 0, 0.04;
     --border-blue: 39, 129, 246, 0.5;
     --white-alpha: 255, 255, 255, 0.8;
+
+    // Voice call widget - light mode
+    --call-widget: 33, 34, 38, 0.95;
+    --call-widget-border: 255, 255, 255, 0.1;
+    --call-widget-text: 237, 238, 240, 1;
+    --call-widget-sub-text: 173, 177, 184, 1;
   }
 
   .dark {
@@ -291,6 +297,12 @@
     --border-blue: 39, 129, 246, 0.5;
     --border-container: 255, 255, 255, 0;
     --white-alpha: 255, 255, 255, 0.1;
+
+    // Voice call widget - dark mode
+    --call-widget: 50, 53, 61, 1;
+    --call-widget-border: 255, 255, 255, 0.07;
+    --call-widget-text: 237, 238, 240, 1;
+    --call-widget-sub-text: 173, 177, 184, 1;
   }
 }
 // NEXT COLORS END
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
index b3847030b..4b9d0b466 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
@@ -26,6 +26,13 @@ const resetForm = () => {
   form.description = '';
 };
 
+const open = (company = {}) => {
+  form.name = company.name || '';
+  form.domain = company.domain || '';
+  form.description = company.description || '';
+  dialogRef.value?.open();
+};
+
 const handleConfirm = () => {
   if (isFormInvalid.value) return;
 
@@ -45,7 +52,7 @@ const onSuccess = () => {
   closeDialog();
 };
 
-defineExpose({ dialogRef, onSuccess });
+defineExpose({ dialogRef, onSuccess, open });
 </script>
 
 <template>
diff --git a/app/javascript/dashboard/components-next/Companies/CompanySelector.vue b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
new file mode 100644
index 000000000..f8cfc8058
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
@@ -0,0 +1,153 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDebounceFn } from '@vueuse/core';
+import CompanyAPI from 'dashboard/api/companies';
+import { useAlert } from 'dashboard/composables';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import CompanyCreateDialog from 'dashboard/components-next/Companies/CompanyCreateDialog.vue';
+
+const props = defineProps({
+  modelValue: {
+    type: [String, Number],
+    default: '',
+  },
+  // Name of the linked company, so the label shows before the list is loaded.
+  selectedName: {
+    type: String,
+    default: '',
+  },
+  isDetailsView: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['select']);
+
+const { t } = useI18n();
+
+const CREATE_PREFIX = 'create:';
+
+const options = ref([]);
+const searchQuery = ref('');
+const createDialogRef = ref(null);
+const isCreatingCompany = ref(false);
+
+const toOption = company => ({ label: company.name, value: company.id });
+
+const createOption = computed(() => {
+  const name = searchQuery.value.trim();
+  if (!name) return null;
+
+  const exists = options.value.some(
+    option => option.label.toLowerCase() === name.toLowerCase()
+  );
+  if (exists) return null;
+
+  return {
+    label: t('COMPANIES.SELECTOR.CREATE_OPTION', { name }),
+    value: `${CREATE_PREFIX}${name}`,
+  };
+});
+
+const comboboxOptions = computed(() => {
+  const list = [...options.value];
+
+  // Keep the linked company visible even when it is not in the loaded results.
+  if (
+    props.modelValue &&
+    props.selectedName &&
+    !list.some(option => option.value === Number(props.modelValue))
+  ) {
+    list.unshift({
+      label: props.selectedName,
+      value: Number(props.modelValue),
+    });
+  }
+
+  if (createOption.value) list.push(createOption.value);
+  return list;
+});
+
+const fetchCompanies = async query => {
+  try {
+    const {
+      data: { payload },
+    } = query
+      ? await CompanyAPI.search(query)
+      : await CompanyAPI.get({ page: 1 });
+    options.value = (payload || []).map(toOption);
+  } catch {
+    options.value = [];
+  }
+};
+
+// Fetch lazily, only when the dropdown opens, instead of on mount.
+const handleOpen = () => {
+  searchQuery.value = '';
+  fetchCompanies('');
+};
+
+const handleSearch = useDebounceFn(query => {
+  searchQuery.value = query?.trim() || '';
+  fetchCompanies(searchQuery.value);
+}, 300);
+
+// Open the create dialog (prefilled with the typed name) so the user can add
+// domain/description before saving, instead of creating with just a name.
+const createCompany = async company => {
+  isCreatingCompany.value = true;
+  try {
+    const {
+      data: { payload },
+    } = await CompanyAPI.create({ company });
+    createDialogRef.value?.onSuccess();
+    emit('select', { id: payload.id, name: payload.name });
+    useAlert(t('COMPANIES.CREATE.MESSAGES.SUCCESS'));
+  } catch {
+    useAlert(t('COMPANIES.CREATE.MESSAGES.ERROR'));
+  } finally {
+    isCreatingCompany.value = false;
+  }
+};
+
+const handleSelect = value => {
+  if (typeof value === 'string' && value.startsWith(CREATE_PREFIX)) {
+    createDialogRef.value?.open({ name: value.slice(CREATE_PREFIX.length) });
+    // Drop the transient "Add …" option so the button label doesn't stick to
+    // it if the dialog is dismissed without creating.
+    searchQuery.value = '';
+    return;
+  }
+
+  const id = value ? Number(value) : '';
+  const selected = comboboxOptions.value.find(option => option.value === id);
+  emit('select', { id, name: selected?.label || '' });
+};
+</script>
+
+<template>
+  <ComboBox
+    :model-value="modelValue"
+    :options="comboboxOptions"
+    :display-label="selectedName"
+    :placeholder="t('COMPANIES.SELECTOR.PLACEHOLDER')"
+    :search-placeholder="t('COMPANIES.SEARCH_PLACEHOLDER')"
+    use-api-results
+    class="[&>div>button]:h-8 [&>div>div_ul]:max-h-56"
+    :class="{
+      '[&>div>button]:bg-n-alpha-black2 [&>div>button:not(.focused)]:!outline-transparent':
+        !isDetailsView,
+      '[&>div>button]:!bg-n-alpha-black2': isDetailsView,
+    }"
+    @open="handleOpen"
+    @search="handleSearch"
+    @update:model-value="handleSelect"
+  />
+  <CompanyCreateDialog
+    ref="createDialogRef"
+    :is-loading="isCreatingCompany"
+    @create="createCompany"
+  />
+</template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 50af6f0c0..8dd9d63e2 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -15,6 +15,7 @@ const props = defineProps({
   id: { type: Number, required: true },
   name: { type: String, default: '' },
   email: { type: String, default: '' },
+  companyId: { type: [Number, String], default: '' },
   additionalAttributes: { type: Object, default: () => ({}) },
   phoneNumber: { type: String, default: '' },
   thumbnail: { type: String, default: '' },
@@ -41,6 +42,7 @@ const getInitialContactData = () => ({
   id: props.id,
   name: props.name,
   email: props.email,
+  companyId: props.companyId,
   phoneNumber: props.phoneNumber,
   additionalAttributes: props.additionalAttributes,
 });
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
index 351cc7071..44fafb6c5 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
@@ -128,9 +128,14 @@ const closeMobileSidebar = () => {
     <!-- Desktop sidebar -->
     <div
       v-if="slots.sidebar"
-      class="hidden lg:block overflow-y-auto justify-end min-w-52 w-full py-6 max-w-md border-l border-n-weak bg-n-solid-2"
+      class="hidden lg:flex flex-col min-w-52 w-full max-w-md border-l border-n-weak bg-n-solid-2"
     >
-      <slot name="sidebar" />
+      <div class="shrink-0">
+        <slot name="sidebarHeader" />
+      </div>
+      <div class="flex-1 min-h-0 overflow-y-auto pb-6 pt-3">
+        <slot name="sidebar" />
+      </div>
     </div>
 
     <!-- Mobile sidebar container -->
@@ -179,9 +184,14 @@ const closeMobileSidebar = () => {
         <div
           v-if="isContactSidebarOpen"
           id="contact-sidebar-content"
-          class="order-2 w-[85%] sm:w-[50%] bg-n-solid-2 ltr:border-l rtl:border-r border-n-weak overflow-y-auto py-6 shadow-lg"
+          class="order-2 w-[85%] sm:w-[50%] flex flex-col bg-n-solid-2 ltr:border-l rtl:border-r border-n-weak shadow-lg"
         >
-          <slot name="sidebar" />
+          <div class="shrink-0">
+            <slot name="sidebarHeader" />
+          </div>
+          <div class="flex-1 min-h-0 overflow-y-auto pb-6 pt-3">
+            <slot name="sidebar" />
+          </div>
         </div>
       </Transition>
     </div>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
index 66296257f..62978875e 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
@@ -5,8 +5,11 @@ import { required, email } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
 import { splitName } from '@chatwoot/utils';
 import countries from 'shared/constants/countries.js';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { useAccount } from 'dashboard/composables/useAccount';
 import Input from 'dashboard/components-next/input/Input.vue';
 import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import CompanySelector from 'dashboard/components-next/Companies/CompanySelector.vue';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import PhoneNumberInput from 'dashboard/components-next/phonenumberinput/PhoneNumberInput.vue';
 
@@ -28,6 +31,7 @@ const props = defineProps({
 const emit = defineEmits(['update']);
 
 const { t } = useI18n();
+const { currentAccount, isCloudFeatureEnabled } = useAccount();
 
 const FORM_CONFIG = {
   FIRST_NAME: { field: 'firstName' },
@@ -54,6 +58,7 @@ const defaultState = {
   id: 0,
   name: '',
   email: '',
+  companyId: '',
   firstName: '',
   lastName: '',
   phoneNumber: '',
@@ -85,6 +90,23 @@ const validationRules = {
 const v$ = useVuelidate(validationRules, state);
 
 const isFormInvalid = computed(() => v$.value.$invalid);
+const hasCompaniesFeature = computed(
+  () =>
+    currentAccount.value?.id && isCloudFeatureEnabled(FEATURE_FLAGS.COMPANIES)
+);
+const showCompanySelector = computed(
+  () =>
+    hasCompaniesFeature.value &&
+    (Boolean(state.companyId) || !state.additionalAttributes.companyName)
+);
+
+const emitContactUpdate = async () => {
+  const isFormValid = await v$.value.$validate();
+  if (!isFormValid) return;
+
+  const { firstName, lastName, ...stateWithoutNames } = state;
+  emit('update', stateWithoutNames);
+};
 
 const prepareStateBasedOnProps = () => {
   if (props.isNewContact) {
@@ -96,6 +118,7 @@ const prepareStateBasedOnProps = () => {
     name = '',
     email: emailAddress,
     phoneNumber,
+    companyId = '',
     additionalAttributes = {},
   } = props.contactData || {};
   const { firstName, lastName } = splitName(name || '');
@@ -115,6 +138,7 @@ const prepareStateBasedOnProps = () => {
   Object.assign(state, {
     id,
     name,
+    companyId: companyId || '',
     firstName,
     lastName,
     email: emailAddress,
@@ -200,11 +224,7 @@ const getFormBinding = key => {
         }
       }
 
-      const isFormValid = await v$.value.$validate();
-      if (isFormValid) {
-        const { firstName, lastName, ...stateWithoutNames } = state;
-        emit('update', stateWithoutNames);
-      }
+      await emitContactUpdate();
     },
   });
 };
@@ -221,6 +241,12 @@ const handleCountrySelection = value => {
   emit('update', state);
 };
 
+const handleCompanySelection = async ({ id, name }) => {
+  state.companyId = id || '';
+  state.additionalAttributes.companyName = name || '';
+  await emitContactUpdate();
+};
+
 const resetValidation = () => {
   v$.value.$reset();
 };
@@ -273,6 +299,13 @@ defineExpose({
             :placeholder="item.placeholder"
             :show-border="isDetailsView"
           />
+          <CompanySelector
+            v-else-if="item.key === 'COMPANY_NAME' && showCompanySelector"
+            :model-value="state.companyId"
+            :selected-name="state.additionalAttributes.companyName"
+            :is-details-view="isDetailsView"
+            @select="handleCompanySelection"
+          />
           <Input
             v-else
             v-model="getFormBinding(item.key).value"
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
index 039d2c709..1a9246e27 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
@@ -108,7 +108,7 @@ const hasNoUsedAttributes = computed(() => usedAttributes.value.length === 0);
 </script>
 
 <template>
-  <div v-if="hasContactAttributes" class="flex flex-col gap-6 px-6 py-6">
+  <div v-if="hasContactAttributes" class="flex flex-col gap-6 px-6">
     <div v-if="!hasNoUsedAttributes" class="flex flex-col gap-2">
       <ContactCustomAttributeItem
         v-for="attribute in usedAttributes"
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue
index 3763d198a..075c2e6e1 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue
@@ -36,7 +36,7 @@ const contactConversations = computed(() =>
   </div>
   <div
     v-else-if="contactConversations.length > 0"
-    class="px-6 py-4 divide-y divide-n-strong [&>*:hover]:!border-y-transparent [&>*:hover+*]:!border-t-transparent"
+    class="px-6 divide-y divide-n-strong [&>*:hover]:!border-y-transparent [&>*:hover+*]:!border-t-transparent"
   >
     <ConversationCard
       v-for="conversation in contactConversations"
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMedia.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMedia.vue
new file mode 100644
index 000000000..6545c255d
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMedia.vue
@@ -0,0 +1,108 @@
+<script setup>
+import { computed, onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import {
+  MEDIA_TYPES,
+  NON_FILE_TYPES,
+} from 'dashboard/components-next/message/constants';
+
+import GalleryView from 'dashboard/components/widgets/conversation/components/GalleryView.vue';
+import Media from 'dashboard/components-next/SharedAttachments/Media.vue';
+import Files from 'dashboard/components-next/SharedAttachments/Files.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+
+const MEDIA_PEEK_LIMIT = 12;
+const FILES_PEEK_LIMIT = 6;
+
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+const { t } = useI18n();
+
+const attachmentsByContact = useMapGetter('contacts/getContactAttachments');
+const uiFlags = useMapGetter('contacts/getUIFlags');
+
+const attachments = computed(() =>
+  attachmentsByContact.value(route.params.contactId)
+);
+const isFetching = computed(() => uiFlags.value.isFetchingAttachments);
+
+const hasContent = computed(() =>
+  attachments.value.some(
+    a => a.data_url && !NON_FILE_TYPES.includes(a.file_type)
+  )
+);
+
+const mediaAttachments = computed(() =>
+  attachments.value
+    .filter(a => MEDIA_TYPES.includes(a.file_type) && a.data_url)
+    .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
+);
+
+const showGallery = ref(false);
+const selectedAttachment = ref(null);
+
+const onMediaSelect = attachment => {
+  selectedAttachment.value = attachment;
+  showGallery.value = true;
+};
+
+const onFileSelect = attachment => {
+  if (attachment.data_url) {
+    window.open(attachment.data_url, '_blank', 'noopener,noreferrer');
+  }
+};
+
+const onJumpToMessage = attachment => {
+  if (!attachment.conversation_id || !attachment.message_id) return;
+  router.push({
+    name: 'inbox_conversation',
+    params: {
+      accountId: route.params.accountId,
+      conversation_id: attachment.conversation_id,
+    },
+    query: { messageId: attachment.message_id },
+  });
+};
+
+onMounted(() => {
+  store.dispatch('contacts/fetchAttachments', route.params.contactId);
+});
+</script>
+
+<template>
+  <div class="px-6">
+    <div v-if="isFetching" class="flex justify-center p-3">
+      <Spinner class="size-5" />
+    </div>
+    <p v-else-if="!hasContent" class="p-3 text-sm text-center text-n-slate-11">
+      {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.EMPTY') }}
+    </p>
+    <div v-else class="flex flex-col gap-5">
+      <Media
+        :attachments="attachments"
+        :peek-limit="MEDIA_PEEK_LIMIT"
+        show-jump-to-message
+        @select="onMediaSelect"
+        @jump-to-message="onJumpToMessage"
+      />
+      <Files
+        :attachments="attachments"
+        :peek-limit="FILES_PEEK_LIMIT"
+        show-jump-to-message
+        @select="onFileSelect"
+        @jump-to-message="onJumpToMessage"
+      />
+    </div>
+    <GalleryView
+      v-if="showGallery && selectedAttachment"
+      v-model:show="showGallery"
+      :attachment="selectedAttachment"
+      :all-attachments="mediaAttachments"
+      auto-play
+      @close="showGallery = false"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
index d569ae900..1d019ff80 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
@@ -103,7 +103,7 @@ const onMergeContacts = async () => {
 </script>
 
 <template>
-  <div class="flex flex-col gap-8 px-6 py-6">
+  <div class="flex flex-col gap-8 px-6">
     <div class="flex flex-col gap-2">
       <h4 class="text-base text-n-slate-12">
         {{ t('CONTACTS_LAYOUT.SIDEBAR.MERGE.TITLE') }}
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
index 789aba1c8..218a1293f 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
@@ -55,7 +55,7 @@ useKeyboardEvents(keyboardEvents);
 </script>
 
 <template>
-  <div class="flex flex-col gap-6 py-6">
+  <div class="flex flex-col gap-6">
     <Editor
       v-model="state.message"
       :placeholder="t('CONTACTS_LAYOUT.SIDEBAR.NOTES.PLACEHOLDER')"
diff --git a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
index 72bc2c7dd..87fe1d214 100644
--- a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
+++ b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
@@ -92,6 +92,7 @@ const handleAvatarHover = (id, isHovered) => {
         :id="contact.id"
         :name="contact.name"
         :email="contact.email"
+        :company-id="contact.companyId"
         :thumbnail="contact.thumbnail"
         :phone-number="contact.phoneNumber"
         :additional-attributes="contact.additionalAttributes"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
index 93ff15251..9b1c48a90 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
@@ -13,6 +13,7 @@ import { useMapGetter } from 'dashboard/composables/store.js';
 import { useConfig } from 'dashboard/composables/useConfig';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
@@ -131,7 +132,7 @@ const statusText = computed(() => {
 
 const categoryName = computed(() => {
   if (props.category?.slug) {
-    return `${props.category.icon} ${props.category.name}`;
+    return props.category.name;
   }
   return t(
     'HELP_CENTER.ARTICLES_PAGE.ARTICLE_CARD.CARD.CATEGORY.UNCATEGORISED'
@@ -222,7 +223,15 @@ const handleClick = id => {
             {{ authorName || '-' }}
           </span>
         </div>
-        <span class="block text-sm whitespace-nowrap text-n-slate-11">
+        <span
+          class="flex items-center gap-1 text-sm whitespace-nowrap text-n-slate-11"
+        >
+          <EmojiIcon
+            v-if="category?.icon"
+            :value="category.icon"
+            :color="category.icon_color"
+            class="flex-shrink-0 size-4"
+          />
           {{ categoryName }}
         </span>
         <div
diff --git a/app/javascript/dashboard/components-next/HelpCenter/CategoryCard/CategoryCard.vue b/app/javascript/dashboard/components-next/HelpCenter/CategoryCard/CategoryCard.vue
index 9c0cad686..b738e0937 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/CategoryCard/CategoryCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/CategoryCard/CategoryCard.vue
@@ -6,6 +6,7 @@ import { useToggle } from '@vueuse/core';
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 
 const props = defineProps({
   id: {
@@ -20,6 +21,10 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  iconColor: {
+    type: String,
+    default: '',
+  },
   description: {
     type: String,
     required: true,
@@ -55,10 +60,6 @@ const categoryMenuItems = [
   },
 ];
 
-const categoryTitleWithIcon = computed(() => {
-  return `${props.icon} ${props.title}`;
-});
-
 const description = computed(() => {
   return props.description ? props.description : 'No description added';
 });
@@ -83,10 +84,16 @@ const handleAction = ({ action, value }) => {
       <div class="flex justify-between w-full gap-2">
         <div class="flex items-center justify-start w-full min-w-0 gap-2">
           <span
-            class="text-base truncate cursor-pointer hover:underline underline-offset-2 hover:text-n-blue-11 text-n-slate-12"
+            class="flex items-center gap-1.5 text-base truncate cursor-pointer hover:underline underline-offset-2 hover:text-n-blue-11 text-n-slate-12"
             @click="handleClick(slug)"
           >
-            {{ categoryTitleWithIcon }}
+            <EmojiIcon
+              v-if="icon"
+              :value="icon"
+              :color="iconColor"
+              class="shrink-0 size-4"
+            />
+            <span class="truncate">{{ title }}</span>
           </span>
           <span
             class="inline-flex items-center justify-center h-6 px-2 py-1 text-xs text-center border rounded-lg bg-n-slate-1 whitespace-nowrap shrink-0 text-n-slate-11 border-n-slate-4"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
index 26c02874d..0f652a7b7 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorControls.vue
@@ -8,6 +8,7 @@ import { useMapGetter } from 'dashboard/composables/store';
 import Button from 'dashboard/components-next/button/Button.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 import ArticleEditorProperties from 'dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorProperties.vue';
 
 const props = defineProps({
@@ -107,10 +108,11 @@ const selectedCategory = computed(() => {
 const categoryList = computed(() => {
   return (
     categories.value
-      .map(({ name, id, icon }) => ({
+      .map(({ name, id, icon, icon_color: iconColor }) => ({
         label: name,
         value: id,
         emoji: icon,
+        iconColor,
         isSelected: isNewArticle.value
           ? id === (selectedCategoryId.value || selectedCategory.value?.id)
           : id === props.article?.category?.id,
@@ -202,10 +204,6 @@ onMounted(() => {
     <div class="relative">
       <OnClickOutside @trigger="openCategoryList = false">
         <Button
-          :label="
-            selectedCategory?.name ||
-            t('HELP_CENTER.EDIT_ARTICLE_PAGE.EDIT_ARTICLE.UNCATEGORIZED')
-          "
           :icon="!selectedCategory?.icon ? 'i-lucide-shapes' : ''"
           variant="ghost"
           color="slate"
@@ -213,12 +211,20 @@ onMounted(() => {
           @click="openCategoryList = !openCategoryList"
         >
           <span
-            v-if="selectedCategory"
-            class="text-sm text-n-slate-12 hover:text-n-slate-11"
+            class="flex items-center gap-1.5 min-w-0 text-sm text-n-slate-12 hover:text-n-slate-11"
           >
-            {{
-              `${selectedCategory.icon || ''} ${selectedCategory.name || t('HELP_CENTER.EDIT_ARTICLE_PAGE.EDIT_ARTICLE.UNCATEGORIZED')}`
-            }}
+            <EmojiIcon
+              v-if="selectedCategory?.icon"
+              :value="selectedCategory.icon"
+              :color="selectedCategory.icon_color"
+              class="flex-shrink-0 size-4"
+            />
+            <span class="truncate">
+              {{
+                selectedCategory?.name ||
+                t('HELP_CENTER.EDIT_ARTICLE_PAGE.EDIT_ARTICLE.UNCATEGORIZED')
+              }}
+            </span>
           </span>
         </Button>
         <DropdownMenu
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
index b49b3e61f..7b6df6bda 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleHeaderControls.vue
@@ -13,6 +13,7 @@ import {
 import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 
 const props = defineProps({
   categories: {
@@ -63,18 +64,15 @@ const activeTabIndex = computed(() => {
   return tabs.value.findIndex(tab => tab.value === tabParam);
 });
 
-const activeCategoryName = computed(() => {
-  const activeCategory = props.categories.find(
-    category => category.slug === route.params.categorySlug
-  );
+const activeCategory = computed(() =>
+  props.categories.find(category => category.slug === route.params.categorySlug)
+);
 
-  if (activeCategory) {
-    const { icon, name } = activeCategory;
-    return `${icon} ${name}`;
-  }
-
-  return t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL');
-});
+const activeCategoryName = computed(
+  () =>
+    activeCategory.value?.name ||
+    t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL')
+);
 
 const activeLocaleName = computed(() => {
   return props.allowedLocales.find(
@@ -94,6 +92,7 @@ const categoryMenuItems = computed(() => {
     value: category.slug,
     action: 'filter',
     emoji: category.icon,
+    iconColor: category.icon_color,
   }));
 
   const hasCategorySlug = !!route.params.categorySlug;
@@ -167,14 +166,23 @@ const handleTabChange = value => {
         <div v-if="hasCategoryMenuItems" class="relative group">
           <OnClickOutside @trigger="isCategoryMenuOpen = false">
             <Button
-              :label="activeCategoryName"
               icon="i-lucide-chevron-down"
               size="sm"
               color="slate"
               trailing-icon
               class="max-w-48"
               @click="isCategoryMenuOpen = !isCategoryMenuOpen"
-            />
+            >
+              <span class="flex items-center gap-1.5 min-w-0">
+                <EmojiIcon
+                  v-if="activeCategory?.icon"
+                  :value="activeCategory.icon"
+                  :color="activeCategory.icon_color"
+                  class="flex-shrink-0 size-4"
+                />
+                <span class="truncate">{{ activeCategoryName }}</span>
+              </span>
+            </Button>
 
             <DropdownMenu
               v-if="isCategoryMenuOpen"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
index c15578533..68c93c007 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
@@ -230,6 +230,7 @@ const categoryMenuItems = computed(() =>
     value: category.id,
     action: 'move',
     emoji: category.icon,
+    iconColor: category.icon_color,
   }))
 );
 
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
index d71c17260..efb6be73f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
@@ -38,8 +38,8 @@ const { t } = useI18n();
 const route = useRoute();
 
 const handleCategory = async formData => {
-  const { id, name, slug, icon, description, locale } = formData;
-  const categoryData = { name, icon, slug, description };
+  const { id, name, slug, icon, iconColor, description, locale } = formData;
+  const categoryData = { name, icon, icon_color: iconColor, slug, description };
 
   if (props.mode === 'create') {
     categoryData.locale = locale;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
index d2bf42ef5..a1d5624c9 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
@@ -18,6 +18,7 @@ import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import Input from 'dashboard/components-next/input/Input.vue';
 import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 
 const props = defineProps({
   mode: {
@@ -49,8 +50,9 @@ const props = defineProps({
 
 const emit = defineEmits(['submit', 'cancel']);
 
-const EmojiInput = defineAsyncComponent(
-  () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+  () =>
+    import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
 );
 
 const { t } = useI18n();
@@ -72,6 +74,7 @@ const state = reactive({
   id: '',
   name: '',
   icon: '',
+  iconColor: '',
   slug: '',
   description: '',
   locale: '',
@@ -109,8 +112,19 @@ const slugHelpText = computed(() => {
   });
 });
 
-const onClickInsertEmoji = emoji => {
-  state.icon = emoji;
+const onSelectIcon = ({ type, value, color }) => {
+  state.icon = value;
+  state.iconColor = type === 'icon' ? color : '';
+  isEmojiPickerOpen.value = false;
+};
+
+const onColorChange = color => {
+  state.iconColor = color;
+};
+
+const onRemoveIcon = () => {
+  state.icon = '';
+  state.iconColor = '';
   isEmojiPickerOpen.value = false;
 };
 
@@ -139,7 +153,14 @@ watch(
   newCategory => {
     if (props.mode === 'edit' && newCategory) {
       const { id, name, icon, slug, description } = newCategory;
-      Object.assign(state, { id, name, icon, slug, description });
+      Object.assign(state, {
+        id,
+        name,
+        icon,
+        iconColor: newCategory.icon_color || '',
+        slug,
+        description,
+      });
     }
   },
   { immediate: true }
@@ -197,19 +218,29 @@ defineExpose({ state, isSubmitDisabled });
           <template #prefix>
             <OnClickOutside @trigger="isEmojiPickerOpen = false">
               <Button
-                :label="state.icon"
-                color="slate"
-                size="sm"
                 type="button"
-                :icon="!state.icon ? 'i-lucide-smile-plus' : ''"
-                class="!h-[2.38rem] !w-[2.375rem] absolute top-[2rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
+                variant="ghost"
+                color="slate"
+                class="!h-[2.38rem] !w-[2.375rem] !p-0 absolute top-[2rem] start-px ltr:!rounded-r-none rtl:!rounded-l-none"
                 @click="isEmojiPickerOpen = !isEmojiPickerOpen"
-              />
-              <EmojiInput
+              >
+                <EmojiIcon
+                  v-if="state.icon"
+                  :value="state.icon"
+                  :color="state.iconColor"
+                  class="size-5 text-xl !leading-5"
+                />
+                <span v-else class="i-lucide-smile-plus size-4" />
+              </Button>
+              <EmojiIconPicker
                 v-if="isEmojiPickerOpen"
                 class="left-0 top-16"
+                :value="state.icon"
+                :color="state.iconColor"
                 show-remove-button
-                :on-click="onClickInsertEmoji"
+                @select="onSelectIcon"
+                @color-change="onColorChange"
+                @remove="onRemoveIcon"
               />
             </OnClickOutside>
           </template>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
index f25ac8027..d134f1168 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
@@ -106,6 +106,7 @@ const breadcrumbItems = computed(() => {
         }
       ),
       emoji: selectedCategoryEmoji.value,
+      iconColor: selectedCategory.value?.icon_color,
     });
   }
   return items;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
index 0dc0de895..45e783246 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
@@ -68,6 +68,7 @@ watch(
           :id="element.id"
           :title="element.name"
           :icon="element.icon"
+          :icon-color="element.icon_color"
           :description="element.description"
           :articles-count="element.meta?.articles_count || 0"
           :slug="element.slug"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
index 5b339e568..2456ce596 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
@@ -52,8 +52,8 @@ const activeLocaleCode = computed(() => activeLocale.value?.code ?? '');
 const onUpdateCategory = async () => {
   if (!categoryFormRef.value) return;
   const { state } = categoryFormRef.value;
-  const { id, name, slug, icon, description } = state;
-  const categoryData = { name, icon, slug, description };
+  const { id, name, slug, icon, iconColor, description } = state;
+  const categoryData = { name, icon, icon_color: iconColor, slug, description };
   categoryData.id = id;
 
   try {
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 22c142322..e488ee107 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -53,8 +53,9 @@ const generateUid = () => {
 const uploadAttachment = ref(null);
 const isEmojiPickerOpen = ref(false);
 
-const EmojiInput = defineAsyncComponent(
-  () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+  () =>
+    import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
 );
 
 const {
@@ -215,10 +216,11 @@ useEventListener(document, 'paste', onPaste);
           class="!w-10"
           @click="isEmojiPickerOpen = !isEmojiPickerOpen"
         />
-        <EmojiInput
+        <EmojiIconPicker
           v-if="isEmojiPickerOpen"
+          mode="emoji"
           class="!top-auto !bottom-full mb-1.5 ltr:left-0 rtl:right-0"
-          :on-click="onClickInsertEmoji"
+          @select="onClickInsertEmoji($event.value)"
         />
       </div>
       <FileUpload
diff --git a/app/javascript/dashboard/components-next/SharedAttachments/Files.vue b/app/javascript/dashboard/components-next/SharedAttachments/Files.vue
new file mode 100644
index 000000000..01b2b9ee2
--- /dev/null
+++ b/app/javascript/dashboard/components-next/SharedAttachments/Files.vue
@@ -0,0 +1,175 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import { formatBytes } from 'shared/helpers/FileHelper';
+import { dynamicTime, shortTimestamp } from 'shared/helpers/timeHelper';
+import { downloadFile } from '@chatwoot/utils';
+import {
+  MEDIA_TYPES,
+  NON_FILE_TYPES,
+} from 'dashboard/components-next/message/constants';
+
+import FileIcon from 'next/icon/FileIcon.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  attachments: { type: Array, default: () => [] },
+  peekLimit: { type: Number, default: 0 },
+  showJumpToMessage: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(['select', 'jumpToMessage']);
+
+const { t } = useI18n();
+
+const fileAttachments = computed(() =>
+  [...props.attachments]
+    .filter(
+      a =>
+        a.data_url &&
+        !MEDIA_TYPES.includes(a.file_type) &&
+        !NON_FILE_TYPES.includes(a.file_type)
+    )
+    .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
+);
+
+const showAll = ref(false);
+const downloadingId = ref(null);
+
+const isPeekable = computed(() => props.peekLimit > 0);
+
+const visibleFiles = computed(() => {
+  if (!isPeekable.value || showAll.value) return fileAttachments.value;
+  return fileAttachments.value.slice(0, props.peekLimit);
+});
+
+const fileNameFromUrl = url => {
+  if (!url) return '';
+  const name = url.split('/').pop();
+  return name ? decodeURIComponent(name) : '';
+};
+
+const displayName = attachment =>
+  fileNameFromUrl(attachment.data_url) ||
+  t('CONVERSATION_SIDEBAR.SHARED_FILES.UNTITLED_FILE');
+
+const displaySize = attachment => {
+  if (attachment.file_size) return formatBytes(attachment.file_size);
+  if (attachment.extension) return attachment.extension.toUpperCase();
+  return '—';
+};
+
+const displayTime = attachment => {
+  if (!attachment.created_at) return '';
+  return shortTimestamp(dynamicTime(attachment.created_at), true);
+};
+
+const onActivate = attachment => emit('select', attachment);
+
+const onDownloadFile = async attachment => {
+  const { id, file_type: type, data_url: url, extension } = attachment;
+  try {
+    downloadingId.value = id;
+    await downloadFile({ url, type, extension });
+  } catch (error) {
+    useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
+  } finally {
+    downloadingId.value = null;
+  }
+};
+</script>
+
+<template>
+  <section v-if="fileAttachments.length" class="flex flex-col gap-2.5">
+    <header class="flex items-center justify-between px-0.5">
+      <h4
+        class="text-xs font-semibold tracking-wider uppercase text-n-slate-11"
+      >
+        {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }}
+        <span
+          class="ms-1 font-medium tracking-normal normal-case text-n-slate-10"
+        >
+          {{ fileAttachments.length }}
+        </span>
+      </h4>
+      <NextButton
+        v-if="isPeekable && fileAttachments.length > peekLimit"
+        ghost
+        slate
+        xs
+        trailing-icon
+        :icon="showAll ? 'i-lucide-chevron-up' : 'i-lucide-chevron-right'"
+        :label="
+          showAll
+            ? t('CONVERSATION_SIDEBAR.SHARED_FILES.SHOW_LESS')
+            : t('CONVERSATION_SIDEBAR.SHARED_FILES.VIEW_ALL')
+        "
+        @click="showAll = !showAll"
+      />
+    </header>
+    <ul class="flex flex-col gap-0.5">
+      <li
+        v-for="attachment in visibleFiles"
+        :key="attachment.id"
+        role="button"
+        tabindex="0"
+        class="flex items-center gap-3 px-2 py-2 transition-colors rounded-lg cursor-pointer hover:bg-n-slate-3 group focus:outline-none focus-visible:ring-2 focus-visible:ring-n-blue-9"
+        @click="onActivate(attachment)"
+        @keydown.enter="onActivate(attachment)"
+        @keydown.space.prevent="onActivate(attachment)"
+      >
+        <div
+          class="flex items-center justify-center rounded-lg size-9 shrink-0 bg-gradient-to-br from-n-slate-3 to-n-slate-4 ring-1 ring-inset ring-n-slate-4/40"
+        >
+          <FileIcon
+            :file-type="attachment.extension?.toLowerCase() || ''"
+            class="size-4 text-n-slate-11"
+          />
+        </div>
+        <div class="flex-1 min-w-0">
+          <p class="text-sm font-medium truncate text-n-slate-12 mb-1">
+            {{ displayName(attachment) }}
+          </p>
+          <p class="text-xs text-n-slate-11">
+            {{ displaySize(attachment) }}
+            <template v-if="displayTime(attachment)">
+              · {{ displayTime(attachment) }}
+            </template>
+          </p>
+        </div>
+        <div class="flex items-center gap-1">
+          <NextButton
+            v-if="showJumpToMessage && attachment.message_id"
+            v-tooltip.top="{
+              content: t('CONVERSATION_SIDEBAR.SHARED_FILES.JUMP_TO_MESSAGE'),
+              delay: { show: 500, hide: 0 },
+            }"
+            ghost
+            slate
+            sm
+            icon="i-lucide-external-link"
+            class="opacity-0 group-hover:opacity-100"
+            :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.JUMP_TO_MESSAGE')"
+            @click.stop="emit('jumpToMessage', attachment)"
+            @keydown.enter.stop
+            @keydown.space.stop
+          />
+          <NextButton
+            ghost
+            slate
+            sm
+            icon="i-lucide-download"
+            class="opacity-0 group-hover:opacity-100"
+            :is-loading="downloadingId === attachment.id"
+            :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD')"
+            @click.stop="onDownloadFile(attachment)"
+            @keydown.enter.stop
+            @keydown.space.stop
+          />
+        </div>
+      </li>
+    </ul>
+  </section>
+  <template v-else />
+</template>
diff --git a/app/javascript/dashboard/components-next/SharedAttachments/Media.vue b/app/javascript/dashboard/components-next/SharedAttachments/Media.vue
new file mode 100644
index 000000000..6a3875583
--- /dev/null
+++ b/app/javascript/dashboard/components-next/SharedAttachments/Media.vue
@@ -0,0 +1,305 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import {
+  dynamicTime,
+  formatDuration,
+  shortTimestamp,
+} from 'shared/helpers/timeHelper';
+import { downloadFile } from '@chatwoot/utils';
+import {
+  ATTACHMENT_TYPES,
+  MEDIA_TYPES,
+} from 'dashboard/components-next/message/constants';
+
+import Icon from 'next/icon/Icon.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  attachments: { type: Array, default: () => [] },
+  peekLimit: { type: Number, default: 0 },
+  showJumpToMessage: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(['select', 'jumpToMessage']);
+
+const { t } = useI18n();
+
+const mediaAttachments = computed(() =>
+  [...props.attachments]
+    .filter(a => a.data_url && MEDIA_TYPES.includes(a.file_type))
+    .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
+);
+
+const showAll = ref(false);
+const failedThumbs = ref(new Set());
+const failedPreviews = ref(new Set());
+const durations = ref({});
+const downloadingId = ref(null);
+
+const isPeekable = computed(() => props.peekLimit > 0);
+
+const visibleMedia = computed(() => {
+  if (!isPeekable.value || showAll.value) return mediaAttachments.value;
+  return mediaAttachments.value.slice(0, props.peekLimit);
+});
+
+const overflow = computed(() => {
+  if (!isPeekable.value) return 0;
+  const total = mediaAttachments.value.length;
+  return total > props.peekLimit ? total - (props.peekLimit - 1) : 0;
+});
+
+const fileNameFromUrl = url => {
+  if (!url) return '';
+  const name = url.split('/').pop();
+  return name ? decodeURIComponent(name) : '';
+};
+
+const isVideoType = type =>
+  [ATTACHMENT_TYPES.VIDEO, ATTACHMENT_TYPES.IG_REEL].includes(type);
+const isAudioType = type => type === ATTACHMENT_TYPES.AUDIO;
+const isPlayableType = type => isVideoType(type) || isAudioType(type);
+
+const imagePreviewSrc = ({
+  id,
+  file_type: type,
+  thumb_url: thumbUrl,
+  data_url: dataUrl,
+}) => {
+  const canUseThumb = thumbUrl && !failedThumbs.value.has(id);
+  if (type === ATTACHMENT_TYPES.IMAGE) return canUseThumb ? thumbUrl : dataUrl;
+  if (isVideoType(type)) return canUseThumb ? thumbUrl : null;
+  return null;
+};
+
+const onPreviewError = ({
+  id,
+  file_type: type,
+  thumb_url: thumbUrl,
+  data_url: dataUrl,
+}) => {
+  const canRetryWithFull = thumbUrl && !failedThumbs.value.has(id) && dataUrl;
+  if (
+    canRetryWithFull &&
+    (type === ATTACHMENT_TYPES.IMAGE || isVideoType(type))
+  ) {
+    failedThumbs.value.add(id);
+    return;
+  }
+  failedPreviews.value.add(id);
+};
+
+const hasPreview = attachment =>
+  !!imagePreviewSrc(attachment) && !failedPreviews.value.has(attachment.id);
+
+const hasVideoPreview = attachment =>
+  isVideoType(attachment.file_type) &&
+  attachment.data_url &&
+  !failedPreviews.value.has(attachment.id);
+
+const fallbackIcon = type => {
+  if (isAudioType(type)) return 'i-lucide-music';
+  if (isVideoType(type)) return 'i-lucide-video';
+  return 'i-lucide-image';
+};
+
+const onLoadedMetadata = (attachment, event) => {
+  const seconds = event.target?.duration;
+  if (Number.isFinite(seconds) && seconds > 0) {
+    durations.value[attachment.id] = seconds;
+  }
+};
+
+const displayDuration = attachment => {
+  const seconds = durations.value[attachment.id];
+  return seconds ? formatDuration(Math.round(seconds)) : '';
+};
+
+const displayTime = attachment => {
+  if (!attachment.created_at) return '';
+  return shortTimestamp(dynamicTime(attachment.created_at), true);
+};
+
+const isOverflowTile = index =>
+  isPeekable.value &&
+  !showAll.value &&
+  overflow.value > 0 &&
+  index === props.peekLimit - 1;
+
+const onTileActivate = (attachment, index) => {
+  if (isOverflowTile(index)) {
+    showAll.value = true;
+    return;
+  }
+  emit('select', attachment);
+};
+
+const onDownloadFile = async attachment => {
+  const { id, file_type: type, data_url: url, extension } = attachment;
+  try {
+    downloadingId.value = id;
+    await downloadFile({ url, type, extension });
+  } catch (error) {
+    useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
+  } finally {
+    downloadingId.value = null;
+  }
+};
+</script>
+
+<template>
+  <section v-if="mediaAttachments.length" class="flex flex-col gap-2.5">
+    <header class="flex items-center justify-between px-0.5">
+      <h4
+        class="text-xs font-semibold tracking-wider uppercase text-n-slate-11"
+      >
+        {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }}
+        <span
+          class="ms-1 font-medium tracking-normal normal-case text-n-slate-10"
+        >
+          {{ mediaAttachments.length }}
+        </span>
+      </h4>
+      <NextButton
+        v-if="overflow > 0"
+        ghost
+        slate
+        xs
+        trailing-icon
+        :icon="showAll ? 'i-lucide-chevron-up' : 'i-lucide-chevron-right'"
+        :label="
+          showAll
+            ? t('CONVERSATION_SIDEBAR.SHARED_FILES.SHOW_LESS')
+            : t('CONVERSATION_SIDEBAR.SHARED_FILES.VIEW_ALL')
+        "
+        @click="showAll = !showAll"
+      />
+    </header>
+    <div class="grid grid-cols-3 gap-2">
+      <div
+        v-for="(attachment, index) in visibleMedia"
+        :key="attachment.id"
+        role="button"
+        tabindex="0"
+        class="relative w-full overflow-hidden transition-all duration-200 rounded-lg cursor-pointer aspect-square bg-n-slate-3 shadow-sm hover:shadow-md hover:-translate-y-px group focus:outline-none focus-visible:ring-2 focus-visible:ring-n-blue-9"
+        @click="onTileActivate(attachment, index)"
+        @keydown.enter="onTileActivate(attachment, index)"
+        @keydown.space.prevent="onTileActivate(attachment, index)"
+      >
+        <template v-if="!isOverflowTile(index)">
+          <img
+            v-if="hasPreview(attachment)"
+            :src="imagePreviewSrc(attachment)"
+            class="object-cover w-full h-full transition-transform duration-300 group-hover:scale-110"
+            loading="lazy"
+            :alt="fileNameFromUrl(attachment.data_url)"
+            @error="onPreviewError(attachment)"
+          />
+          <video
+            v-else-if="hasVideoPreview(attachment)"
+            :src="`${attachment.data_url}#t=0.1`"
+            preload="metadata"
+            muted
+            playsinline
+            class="object-cover w-full h-full transition-transform duration-300 group-hover:scale-110 pointer-events-none"
+            @loadedmetadata="onLoadedMetadata(attachment, $event)"
+            @error="onPreviewError(attachment)"
+          />
+          <div
+            v-else
+            class="flex items-center justify-center w-full h-full bg-gradient-to-br from-n-slate-3 to-n-slate-4"
+          >
+            <Icon
+              :icon="fallbackIcon(attachment.file_type)"
+              class="size-6 text-n-slate-11"
+            />
+          </div>
+
+          <audio
+            v-if="isAudioType(attachment.file_type) && attachment.data_url"
+            :src="attachment.data_url"
+            preload="metadata"
+            class="hidden"
+            @loadedmetadata="onLoadedMetadata(attachment, $event)"
+          />
+
+          <div
+            class="absolute inset-0 transition-opacity duration-200 opacity-0 pointer-events-none group-hover:opacity-100 bg-gradient-to-t from-black/40 via-transparent to-transparent"
+          />
+
+          <div
+            v-if="hasVideoPreview(attachment)"
+            class="absolute inset-0 flex items-center justify-center pointer-events-none bg-gradient-to-t from-black/30 via-transparent to-transparent"
+          >
+            <div
+              class="flex items-center justify-center rounded-full size-7 bg-white/95 shadow-md"
+            >
+              <Icon icon="i-lucide-play" class="ms-0.5 size-3.5 text-n-black" />
+            </div>
+          </div>
+
+          <span
+            v-if="
+              isPlayableType(attachment.file_type) &&
+              displayDuration(attachment)
+            "
+            class="absolute text-xxs font-medium tabular-nums transition-opacity bottom-1.5 ltr:right-1.5 rtl:left-1.5 text-white [text-shadow:_0_1px_3px_rgba(0,0,0,0.95),_0_0_10px_rgba(0,0,0,0.7)] group-hover:opacity-0"
+          >
+            {{ displayDuration(attachment) }}
+          </span>
+
+          <span
+            v-if="displayTime(attachment)"
+            class="absolute text-xxs font-medium transition-opacity opacity-0 bottom-1.5 ltr:left-1.5 rtl:right-1.5 text-white [text-shadow:_0_1px_3px_rgba(0,0,0,0.95),_0_0_10px_rgba(0,0,0,0.7)] group-hover:opacity-100"
+          >
+            {{ displayTime(attachment) }}
+          </span>
+
+          <button
+            type="button"
+            class="absolute flex items-center justify-center !p-px transition-all rounded-full opacity-0 bottom-1.5 ltr:right-1.5 rtl:left-1.5 size-6 bg-white/95 shadow-md group-hover:opacity-100 hover:bg-white disabled:opacity-50"
+            :disabled="downloadingId === attachment.id"
+            :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD')"
+            @click.stop="onDownloadFile(attachment)"
+            @keydown.enter.stop
+            @keydown.space.stop
+          >
+            <Icon icon="i-lucide-download" class="size-3 text-n-black" />
+          </button>
+
+          <button
+            v-if="showJumpToMessage && attachment.message_id"
+            v-tooltip.top="{
+              content: t('CONVERSATION_SIDEBAR.SHARED_FILES.JUMP_TO_MESSAGE'),
+              delay: { show: 500, hide: 0 },
+            }"
+            type="button"
+            class="absolute flex items-center justify-center !p-px transition-all rounded-full opacity-0 top-1.5 ltr:right-1.5 rtl:left-1.5 size-6 bg-white/95 shadow-md group-hover:opacity-100 hover:bg-white"
+            :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.JUMP_TO_MESSAGE')"
+            @click.stop="emit('jumpToMessage', attachment)"
+            @keydown.enter.stop
+            @keydown.space.stop
+          >
+            <Icon icon="i-lucide-external-link" class="size-3 text-n-black" />
+          </button>
+        </template>
+
+        <div
+          v-if="isOverflowTile(index)"
+          class="absolute inset-0 flex items-center justify-center bg-n-slate-5"
+        >
+          <span class="text-base font-semibold text-n-slate-12">
+            {{
+              t('CONVERSATION_SIDEBAR.SHARED_FILES.MORE_COUNT', {
+                count: overflow,
+              })
+            }}
+          </span>
+        </div>
+      </div>
+    </div>
+  </section>
+  <template v-else />
+</template>
diff --git a/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue b/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
index 4e717d762..eccc4b3fa 100644
--- a/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
+++ b/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 
 import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 
 defineProps({
   items: {
@@ -47,8 +48,17 @@ const onClick = (item, index) => {
         </button>
 
         <!-- The last breadcrumb item is plain text -->
-        <span v-else class="text-sm truncate text-n-slate-12 min-w-0 block">
-          {{ item.emoji ? item.emoji : '' }} {{ item.label }}
+        <span
+          v-else
+          class="inline-flex items-center gap-1 text-sm truncate min-w-0"
+        >
+          <EmojiIcon
+            v-if="item.emoji"
+            :value="item.emoji"
+            :color="item.iconColor"
+            class="flex-shrink-0 size-4"
+          />
+          <span class="truncate text-n-slate-12">{{ item.label }}</span>
         </span>
       </li>
     </ol>
diff --git a/app/javascript/dashboard/components-next/call/CallCard.vue b/app/javascript/dashboard/components-next/call/CallCard.vue
index 55da3dacf..d041150c2 100644
--- a/app/javascript/dashboard/components-next/call/CallCard.vue
+++ b/app/javascript/dashboard/components-next/call/CallCard.vue
@@ -75,11 +75,11 @@ const channelIcon = computed(() => {
 
 <template>
   <div
-    class="flex flex-col gap-2 pt-4 bg-n-solid-2/95 rounded-2xl shadow-xl outline outline-1 outline-n-strong backdrop-blur-md"
+    class="flex flex-col gap-1 pt-4 bg-n-call-widget rounded-2xl shadow-xl outline outline-1 outline-n-call-widget-border backdrop-blur-md"
     :class="call?.conversationId ? 'pb-2' : 'pb-4'"
   >
     <!-- Top section: status badge + location/inbox + duration -->
-    <div class="flex flex-col gap-3">
+    <div class="flex flex-col gap-3 pb-3 border-b border-n-call-widget-border">
       <div class="flex items-center gap-2 px-4">
         <!-- Ongoing: status badge on left -->
         <div v-if="isOngoing" class="flex items-center gap-1.5 shrink-0">
@@ -100,10 +100,10 @@ const channelIcon = computed(() => {
           <Icon
             v-else-if="!isOngoing"
             :icon="channelIcon"
-            class="size-3.5 text-n-slate-10 shrink-0"
+            class="size-3.5 text-n-call-widget-sub-text shrink-0"
           />
           <span
-            class="text-xs font-medium text-n-slate-11 tracking-tight truncate"
+            class="text-xs font-medium text-n-call-widget-sub-text tracking-tight truncate"
           >
             {{ callInfo.location }}
           </span>
@@ -112,7 +112,7 @@ const channelIcon = computed(() => {
         <!-- Ongoing: duration on right -->
         <p
           v-if="isOngoing"
-          class="font-display text-base font-medium text-n-slate-11 shrink-0 mb-0 tabular-nums tracking-tight"
+          class="font-display text-base font-medium text-n-call-widget-sub-text shrink-0 mb-0 tabular-nums tracking-tight"
         >
           {{ duration }}
         </p>
@@ -132,7 +132,7 @@ const channelIcon = computed(() => {
             slate
             ghost
             xs
-            class="!rounded-full -my-1"
+            class="!rounded-full -my-1 -me-1 !text-n-call-widget-sub-text"
             @click="$emit('dismiss')"
           />
         </div>
@@ -149,13 +149,13 @@ const channelIcon = computed(() => {
         </div>
         <div class="flex-1 min-w-0">
           <p
-            class="font-display text-sm font-medium text-n-slate-12 truncate mb-0.5 tracking-tight leading-tight"
+            class="font-display text-sm font-medium text-n-call-widget-text truncate mb-0.5 tracking-tight leading-tight"
           >
             {{ callInfo.contactName }}
           </p>
           <p
             v-if="callInfo.phoneNumber"
-            class="text-sm text-n-slate-11 truncate mb-0 tracking-tight leading-tight"
+            class="text-sm text-n-call-widget-sub-text truncate mb-0 tracking-tight leading-tight"
           >
             {{ callInfo.phoneNumber }}
           </p>
@@ -217,23 +217,23 @@ const channelIcon = computed(() => {
     >
       <template #icon>
         <span
-          class="flex items-center gap-1 text-n-slate-11 group-hover:text-n-slate-12"
+          class="flex items-center gap-1 text-n-call-widget-sub-text group-hover:text-n-call-widget-text"
         >
           <Icon
             icon="i-ph-chat-circle-text-bold"
-            class="size-3.5 text-n-slate-11 shrink-0"
+            class="size-3.5 text-n-call-widget-sub-text shrink-0"
           />
           <span class="text-sm tracking-tight tabular-nums">
             #{{ call.conversationId }}
           </span>
           <Icon
             icon="i-ph-caret-right-bold"
-            class="size-3 text-n-slate-11 shrink-0"
+            class="size-3 text-n-call-widget-sub-text shrink-0"
           />
         </span>
       </template>
       <span
-        class="text-sm text-n-slate-11 tracking-tight group-hover:text-n-slate-12"
+        class="text-sm text-n-call-widget-sub-text tracking-tight group-hover:text-n-call-widget-text"
       >
         {{ $t('CONVERSATION.VOICE_WIDGET.GO_TO_CONVERSATION') }}
       </span>
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBox.vue b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
index 58d9e634d..a39a6f6a1 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBox.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
@@ -14,6 +14,9 @@ const props = defineProps({
       value.every(option => 'value' in option && 'label' in option),
   },
   placeholder: { type: String, default: '' },
+  // Fallback label shown when the selected value is not in `options` yet
+  // (e.g. API-backed lists that load lazily on open).
+  displayLabel: { type: String, default: '' },
   modelValue: { type: [String, Number], default: '' },
   disabled: { type: Boolean, default: false },
   searchPlaceholder: { type: String, default: '' },
@@ -23,7 +26,7 @@ const props = defineProps({
   useApiResults: { type: Boolean, default: false }, // useApiResults prop to determine if search is handled by API
 });
 
-const emit = defineEmits(['update:modelValue', 'search']);
+const emit = defineEmits(['update:modelValue', 'search', 'open']);
 
 const { t } = useI18n();
 
@@ -52,7 +55,7 @@ const selectedLabel = computed(() => {
   const selected = props.options.find(
     option => option.value === selectedValue.value
   );
-  return selected?.label ?? selectPlaceholder.value;
+  return selected?.label ?? (props.displayLabel || selectPlaceholder.value);
 });
 
 const selectOption = option => {
@@ -72,6 +75,7 @@ const toggleDropdown = () => {
   open.value = !open.value;
   if (open.value) {
     search.value = '';
+    emit('open');
     nextTick(() => dropdownRef.value?.focus());
   }
 };
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue b/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
index 46826a6cd..1ab9e9503 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
@@ -87,7 +87,7 @@ defineExpose({
         }"
         role="option"
         :aria-selected="isSelected(option)"
-        @click="emit('select', option)"
+        @click.stop="emit('select', option)"
       >
         <span
           :class="{
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
index 8fa465704..1849bf685 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
@@ -3,6 +3,7 @@ import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
@@ -162,7 +163,7 @@ onMounted(() => {
         >
           <p
             v-if="section.title"
-            class="px-2 py-2 text-xs mb-0 font-medium text-n-slate-11 uppercase tracking-wide sticky top-0 z-10 bg-n-alpha-3 backdrop-blur-sm"
+            class="px-2 py-2 text-xs mb-0 font-medium text-n-slate-11 uppercase tracking-wide sticky top-0 z-10 bg-n-alpha-3 backdrop-blur-sm truncate min-w-0"
           >
             {{ section.title }}
           </p>
@@ -207,9 +208,12 @@ onMounted(() => {
                 class="flex-shrink-0 size-3.5"
               />
             </slot>
-            <span v-if="item.emoji" class="flex-shrink-0">{{
-              item.emoji
-            }}</span>
+            <EmojiIcon
+              v-if="item.emoji"
+              :value="item.emoji"
+              :color="item.iconColor"
+              class="flex-shrink-0 size-4"
+            />
             <slot name="label" :item="item">
               <span
                 v-if="item.label"
@@ -260,7 +264,12 @@ onMounted(() => {
               class="flex-shrink-0 size-3.5"
             />
           </slot>
-          <span v-if="item.emoji" class="flex-shrink-0">{{ item.emoji }}</span>
+          <EmojiIcon
+            v-if="item.emoji"
+            :value="item.emoji"
+            :color="item.iconColor"
+            class="flex-shrink-0 size-4"
+          />
           <slot name="label" :item="item">
             <span
               v-if="item.label"
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/ColorPalette.vue b/app/javascript/dashboard/components-next/emoji-icon-picker/ColorPalette.vue
new file mode 100644
index 000000000..0e884bd22
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/ColorPalette.vue
@@ -0,0 +1,27 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ICON_COLORS } from './constants';
+
+const { t } = useI18n();
+const selectedColor = defineModel({ type: String, default: '' });
+</script>
+
+<template>
+  <div class="flex items-center justify-between gap-1 px-0.5 mx-2 py-1 mb-px">
+    <button
+      v-for="color in ICON_COLORS"
+      :key="color.value"
+      v-tooltip.top="t(`EMOJI_ICON_PICKER.COLORS.${color.name}`)"
+      type="button"
+      class="flex items-center justify-center flex-shrink-0 transition-all rounded-full size-5 ring-offset-2 ring-offset-n-surface-2 hover:ring-2"
+      :class="{ 'ring-2': selectedColor === color.value }"
+      :style="{ backgroundColor: color.value, '--tw-ring-color': color.value }"
+      @click="selectedColor = color.value"
+    >
+      <span
+        v-if="selectedColor === color.value"
+        class="text-white i-lucide-check size-3"
+      />
+    </button>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
new file mode 100644
index 000000000..c4ca21be5
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
@@ -0,0 +1,35 @@
+<script setup>
+import { computed } from 'vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import { isIconValue, iconClassFor } from './constants';
+
+// Renders a saved picker value: a color-tinted icon or an emoji.
+const props = defineProps({
+  value: {
+    type: String,
+    default: '',
+  },
+  color: {
+    type: String,
+    default: '',
+  },
+});
+
+const isIcon = computed(() => isIconValue(props.value));
+const iconClass = computed(() => iconClassFor(props.value));
+const iconStyle = computed(() =>
+  props.color ? { color: props.color } : undefined
+);
+</script>
+
+<template>
+  <span class="inline-flex items-center justify-center leading-none">
+    <Icon
+      v-if="isIcon"
+      :icon="iconClass"
+      class="size-full"
+      :style="iconStyle"
+    />
+    <span v-else v-dompurify-html="value" />
+  </span>
+</template>
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue
new file mode 100644
index 000000000..2272d1b7b
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue
@@ -0,0 +1,310 @@
+<script setup>
+import { ref, computed, watch, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { Virtualizer } from 'virtua/vue';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import ColorPalette from './ColorPalette.vue';
+import { CURATED_ICONS } from './icons';
+import {
+  DEFAULT_ICON_COLOR,
+  ICON_STYLE,
+  PICKER_MODE,
+  PICKER_TAB,
+  isIconValue,
+} from './constants';
+import {
+  buildEmojiSections,
+  getEmojiTint,
+  getRecentEmojis,
+  addRecentEmoji,
+} from 'shared/components/emoji/pickerHelper';
+
+const props = defineProps({
+  // 'both' shows Icons + Emojis tabs; 'emoji' shows only the emoji panel.
+  mode: {
+    type: String,
+    default: PICKER_MODE.BOTH,
+    validator: value => Object.values(PICKER_MODE).includes(value),
+  },
+  // Saved value: an emoji char or an icon name (e.g. "rocket-line").
+  value: {
+    type: String,
+    default: '',
+  },
+  // Current stored icon color (hex), used to preselect a swatch.
+  color: {
+    type: String,
+    default: '',
+  },
+  showRemoveButton: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['select', 'remove', 'colorChange']);
+
+const { t } = useI18n();
+
+const showTabs = computed(() => props.mode === PICKER_MODE.BOTH);
+const showHeader = computed(
+  () => showTabs.value || (props.showRemoveButton && props.value)
+);
+
+const activeTab = ref(
+  props.value && !isIconValue(props.value)
+    ? PICKER_TAB.EMOJIS
+    : PICKER_TAB.ICONS
+);
+
+const tabs = computed(() => [
+  {
+    id: PICKER_TAB.ICONS,
+    label: t('EMOJI_ICON_PICKER.TABS.ICONS'),
+    icon: 'i-lucide-shapes',
+  },
+  {
+    id: PICKER_TAB.EMOJIS,
+    label: t('EMOJI_ICON_PICKER.TABS.EMOJIS'),
+    icon: 'i-lucide-smile',
+  },
+]);
+
+// Icons
+const iconSearch = ref('');
+const selectedColor = ref(props.color || DEFAULT_ICON_COLOR);
+// Preselect the outline/filled toggle from the saved icon's style suffix.
+const iconStyle = ref(
+  props.value.endsWith(`-${ICON_STYLE.FILL}`)
+    ? ICON_STYLE.FILL
+    : ICON_STYLE.LINE
+);
+
+const filteredIcons = computed(() => {
+  const term = iconSearch.value.trim().toLowerCase();
+  if (!term) return CURATED_ICONS;
+  return CURATED_ICONS.filter(
+    icon => icon.name.includes(term) || icon.keywords.includes(term)
+  );
+});
+
+const toggleIconStyle = () => {
+  iconStyle.value =
+    iconStyle.value === ICON_STYLE.LINE ? ICON_STYLE.FILL : ICON_STYLE.LINE;
+};
+
+// Each icon button tints its hover with the selected color (low opacity).
+const iconHoverStyle = computed(() => ({
+  '--ep-tint': `${selectedColor.value}24`,
+}));
+
+const selectIcon = icon => {
+  // Store the name with its style suffix, e.g. "rocket-fill".
+  const value = `${icon.name}-${iconStyle.value}`;
+  emit('select', {
+    type: 'icon',
+    value,
+    icon: value,
+    color: selectedColor.value,
+  });
+};
+
+watch(selectedColor, color => {
+  if (isIconValue(props.value)) emit('colorChange', color);
+});
+
+// Emojis
+const emojiSearch = ref('');
+const recentEmojis = ref([]);
+
+onMounted(() => {
+  recentEmojis.value = getRecentEmojis();
+});
+
+const emojiSections = computed(() =>
+  buildEmojiSections(
+    emojiSearch.value,
+    recentEmojis.value,
+    t('EMOJI_ICON_PICKER.FREQUENTLY_USED')
+  )
+);
+
+// Tints an emoji button with a light shade of the emoji's own color on hover.
+const applyEmojiTint = (event, emoji) => {
+  event.currentTarget.style.setProperty('--ep-tint', getEmojiTint(emoji));
+};
+
+const selectEmoji = emoji => {
+  recentEmojis.value = addRecentEmoji(emoji);
+  emit('select', { type: 'emoji', value: emoji.emoji, emoji: emoji.emoji });
+};
+</script>
+
+<template>
+  <div
+    role="dialog"
+    class="absolute z-20 flex flex-col overflow-hidden shadow-xl w-[22rem] bg-n-surface-2 backdrop-blur-[100px] rounded-2xl outline outline-1 outline-n-weak dark:outline-n-strong/50"
+  >
+    <div v-if="showHeader" class="flex items-center justify-between gap-2 p-2">
+      <div v-if="showTabs" class="flex gap-0.5 p-0.5 rounded-lg bg-n-alpha-1">
+        <button
+          v-for="tab in tabs"
+          :key="tab.id"
+          v-tooltip.top="tab.label"
+          type="button"
+          class="flex items-center justify-center !p-0 transition-all rounded-md size-7 active:scale-[0.92]"
+          :class="
+            activeTab === tab.id
+              ? 'bg-n-surface-1 shadow-sm text-n-slate-12'
+              : 'text-n-slate-10 hover:text-n-slate-12'
+          "
+          @click="activeTab = tab.id"
+        >
+          <span :class="tab.icon" class="size-4" />
+        </button>
+      </div>
+      <Button
+        v-if="showRemoveButton && value"
+        v-tooltip.top="t('EMOJI_ICON_PICKER.REMOVE')"
+        variant="ghost"
+        color="slate"
+        size="sm"
+        icon="i-lucide-eraser"
+        class="flex-shrink-0"
+        @click="emit('remove')"
+      />
+    </div>
+
+    <!-- Icons panel -->
+    <div
+      v-if="showTabs && activeTab === PICKER_TAB.ICONS"
+      class="flex flex-col gap-1.5"
+      :style="iconHoverStyle"
+    >
+      <ColorPalette v-model="selectedColor" />
+      <div class="flex items-center gap-1 px-2">
+        <Input
+          v-model="iconSearch"
+          size="md"
+          class="flex-1"
+          :placeholder="t('EMOJI_ICON_PICKER.SEARCH_ICON')"
+          custom-input-class="!ps-9 !bg-transparent"
+          autofocus
+        >
+          <template #prefix>
+            <span
+              class="absolute z-10 -translate-y-1/2 i-lucide-search size-4 text-n-slate-10 top-1/2 start-3"
+            />
+          </template>
+        </Input>
+        <button
+          v-tooltip.top="
+            iconStyle === ICON_STYLE.FILL
+              ? t('EMOJI_ICON_PICKER.STYLE.FILLED')
+              : t('EMOJI_ICON_PICKER.STYLE.OUTLINE')
+          "
+          type="button"
+          class="flex items-center justify-center flex-shrink-0 transition-all rounded-lg !p-2 size-9 text-n-slate-11 hover:bg-[var(--ep-tint)] active:scale-[0.92]"
+          @click="toggleIconStyle"
+        >
+          <span
+            :class="
+              iconStyle === ICON_STYLE.FILL
+                ? 'i-ri-contrast-2-fill'
+                : 'i-ri-contrast-2-line'
+            "
+            class="size-[1.2rem]"
+            :style="{ color: selectedColor }"
+          />
+        </button>
+      </div>
+      <div
+        v-if="filteredIcons.length"
+        class="grid grid-cols-10 h-52 gap-0.5 overflow-y-auto no-scrollbar content-start px-2 pb-2"
+      >
+        <button
+          v-for="icon in filteredIcons"
+          :key="icon.name"
+          type="button"
+          :title="icon.name"
+          class="flex items-center justify-center !p-0 size-8 transition-colors rounded-lg aspect-square hover:bg-[var(--ep-tint)] active:enabled:scale-[0.97]"
+          @click="selectIcon(icon)"
+        >
+          <span
+            :class="icon[iconStyle]"
+            class="size-[1.125rem]"
+            :style="{ color: selectedColor }"
+          />
+        </button>
+      </div>
+      <div
+        v-else
+        class="flex flex-col items-center justify-center gap-2 h-52 text-n-slate-10"
+      >
+        <span class="i-lucide-search-x size-7" />
+        <span class="text-sm font-medium">
+          {{ t('EMOJI_ICON_PICKER.NO_ICON') }}
+        </span>
+      </div>
+    </div>
+
+    <!-- Emojis panel -->
+    <div
+      v-if="!showTabs || activeTab === PICKER_TAB.EMOJIS"
+      class="flex flex-col gap-1.5"
+      :class="{ 'pt-2': !showHeader }"
+    >
+      <div class="px-2">
+        <Input
+          v-model="emojiSearch"
+          size="md"
+          :placeholder="t('EMOJI_ICON_PICKER.SEARCH_EMOJI')"
+          custom-input-class="!ps-9 !bg-transparent"
+          autofocus
+        >
+          <template #prefix>
+            <span
+              class="absolute z-10 -translate-y-1/2 i-lucide-search size-4 text-n-slate-10 top-1/2 start-3"
+            />
+          </template>
+        </Input>
+      </div>
+      <div
+        v-if="emojiSections.length"
+        class="h-60 overflow-y-auto px-2 no-scrollbar pb-2"
+      >
+        <Virtualizer v-slot="{ item: section }" :data="emojiSections">
+          <h5
+            class="px-1 pt-2 pb-1 m-0 text-xs font-medium tracking-wide uppercase text-n-slate-10"
+          >
+            {{ section.name }}
+          </h5>
+          <div class="grid grid-cols-10 gap-0.5">
+            <button
+              v-for="emoji in section.emojis"
+              :key="`${section.name}-${emoji.slug}`"
+              type="button"
+              :title="emoji.name"
+              class="flex items-center justify-center !p-0 size-8 w-full max-w-[2rem] text-xl transition-colors rounded-lg aspect-square hover:bg-[var(--ep-tint)] active:enabled:scale-[0.97]"
+              @mouseenter="applyEmojiTint($event, emoji.emoji)"
+              @click="selectEmoji(emoji)"
+            >
+              {{ emoji.emoji }}
+            </button>
+          </div>
+        </Virtualizer>
+      </div>
+      <div
+        v-else
+        class="flex flex-col items-center justify-center gap-2 h-60 text-n-slate-10"
+      >
+        <span class="i-lucide-smile-plus size-7" />
+        <span class="text-sm font-medium">
+          {{ t('EMOJI_ICON_PICKER.NO_EMOJI') }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js b/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
new file mode 100644
index 000000000..bfb28741a
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
@@ -0,0 +1,40 @@
+// Prefix that turns a stored icon name (e.g. "rocket-line") into a class.
+// Swapping icon libraries means changing this and the curated set only.
+export const ICON_PREFIX = 'i-ri-';
+
+export const ICON_STYLE = {
+  LINE: 'line',
+  FILL: 'fill',
+};
+
+// Icon values are ascii names (e.g. "rocket-line"); emoji are non-ascii.
+export const isIconValue = value =>
+  typeof value === 'string' && /^[a-z][a-z0-9-]*$/.test(value);
+
+export const iconClassFor = value =>
+  value.startsWith(ICON_PREFIX) ? value : `${ICON_PREFIX}${value}`;
+
+export const ICON_COLORS = [
+  { name: 'SLATE', value: '#64748B' },
+  { name: 'RED', value: '#EF4444' },
+  { name: 'ORANGE', value: '#F97316' },
+  { name: 'AMBER', value: '#F59E0B' },
+  { name: 'GREEN', value: '#22C55E' },
+  { name: 'TEAL', value: '#14B8A6' },
+  { name: 'BLUE', value: '#3B82F6' },
+  { name: 'INDIGO', value: '#6366F1' },
+  { name: 'VIOLET', value: '#8B5CF6' },
+  { name: 'PINK', value: '#EC4899' },
+];
+
+export const DEFAULT_ICON_COLOR = '#3B82F6';
+
+export const PICKER_MODE = {
+  BOTH: 'both',
+  EMOJI: 'emoji',
+};
+
+export const PICKER_TAB = {
+  ICONS: 'icons',
+  EMOJIS: 'emojis',
+};
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js b/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
new file mode 100644
index 000000000..3cf0d7b3d
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
@@ -0,0 +1,983 @@
+// Curated Remix (ri) icons, each with a `line` and `fill` class. The class
+// literals are kept here so Tailwind generates them. { name, keywords, line, fill }
+
+export const CURATED_ICONS = [
+  {
+    name: 'home',
+    keywords: 'home house main',
+    line: 'i-ri-home-line',
+    fill: 'i-ri-home-fill',
+  },
+  {
+    name: 'star',
+    keywords: 'favorite star',
+    line: 'i-ri-star-line',
+    fill: 'i-ri-star-fill',
+  },
+  {
+    name: 'heart',
+    keywords: 'like love',
+    line: 'i-ri-heart-line',
+    fill: 'i-ri-heart-fill',
+  },
+  {
+    name: 'bookmark',
+    keywords: 'save',
+    line: 'i-ri-bookmark-line',
+    fill: 'i-ri-bookmark-fill',
+  },
+  {
+    name: 'flag-2',
+    keywords: 'flag report',
+    line: 'i-ri-flag-2-line',
+    fill: 'i-ri-flag-2-fill',
+  },
+  {
+    name: 'price-tag-3',
+    keywords: 'tag label',
+    line: 'i-ri-price-tag-3-line',
+    fill: 'i-ri-price-tag-3-fill',
+  },
+  {
+    name: 'map-pin',
+    keywords: 'location place',
+    line: 'i-ri-map-pin-line',
+    fill: 'i-ri-map-pin-fill',
+  },
+  {
+    name: 'sparkling-2',
+    keywords: 'magic ai shine sparkle',
+    line: 'i-ri-sparkling-2-line',
+    fill: 'i-ri-sparkling-2-fill',
+  },
+  {
+    name: 'fire',
+    keywords: 'flame hot trending',
+    line: 'i-ri-fire-line',
+    fill: 'i-ri-fire-fill',
+  },
+  {
+    name: 'lightbulb',
+    keywords: 'idea tip',
+    line: 'i-ri-lightbulb-line',
+    fill: 'i-ri-lightbulb-fill',
+  },
+  {
+    name: 'rocket',
+    keywords: 'launch startup ship',
+    line: 'i-ri-rocket-line',
+    fill: 'i-ri-rocket-fill',
+  },
+  {
+    name: 'focus-3',
+    keywords: 'target goal aim',
+    line: 'i-ri-focus-3-line',
+    fill: 'i-ri-focus-3-fill',
+  },
+  {
+    name: 'award',
+    keywords: 'prize badge medal',
+    line: 'i-ri-award-line',
+    fill: 'i-ri-award-fill',
+  },
+  {
+    name: 'trophy',
+    keywords: 'win achievement',
+    line: 'i-ri-trophy-line',
+    fill: 'i-ri-trophy-fill',
+  },
+  {
+    name: 'vip-crown-2',
+    keywords: 'crown premium vip',
+    line: 'i-ri-vip-crown-2-line',
+    fill: 'i-ri-vip-crown-2-fill',
+  },
+  {
+    name: 'vip-diamond',
+    keywords: 'gem diamond premium',
+    line: 'i-ri-vip-diamond-line',
+    fill: 'i-ri-vip-diamond-fill',
+  },
+  {
+    name: 'gift',
+    keywords: 'present reward',
+    line: 'i-ri-gift-line',
+    fill: 'i-ri-gift-fill',
+  },
+  {
+    name: 'notification-3',
+    keywords: 'bell alert',
+    line: 'i-ri-notification-3-line',
+    fill: 'i-ri-notification-3-fill',
+  },
+  {
+    name: 'global',
+    keywords: 'globe world web',
+    line: 'i-ri-global-line',
+    fill: 'i-ri-global-fill',
+  },
+  {
+    name: 'compass-3',
+    keywords: 'explore discover',
+    line: 'i-ri-compass-3-line',
+    fill: 'i-ri-compass-3-fill',
+  },
+  {
+    name: 'puzzle-2',
+    keywords: 'extension integration',
+    line: 'i-ri-puzzle-2-line',
+    fill: 'i-ri-puzzle-2-fill',
+  },
+  {
+    name: 'ticket-2',
+    keywords: 'support coupon',
+    line: 'i-ri-ticket-2-line',
+    fill: 'i-ri-ticket-2-fill',
+  },
+  {
+    name: 'megaphone',
+    keywords: 'announce broadcast marketing',
+    line: 'i-ri-megaphone-line',
+    fill: 'i-ri-megaphone-fill',
+  },
+  {
+    name: 'briefcase-4',
+    keywords: 'work job business',
+    line: 'i-ri-briefcase-4-line',
+    fill: 'i-ri-briefcase-4-fill',
+  },
+  {
+    name: 'building-2',
+    keywords: 'company office org',
+    line: 'i-ri-building-2-line',
+    fill: 'i-ri-building-2-fill',
+  },
+  {
+    name: 'store-2',
+    keywords: 'shop commerce',
+    line: 'i-ri-store-2-line',
+    fill: 'i-ri-store-2-fill',
+  },
+  {
+    name: 'community',
+    keywords: 'group team',
+    line: 'i-ri-community-line',
+    fill: 'i-ri-community-fill',
+  },
+  {
+    name: 'folder',
+    keywords: 'directory',
+    line: 'i-ri-folder-line',
+    fill: 'i-ri-folder-fill',
+  },
+  {
+    name: 'folder-open',
+    keywords: 'directory open',
+    line: 'i-ri-folder-open-line',
+    fill: 'i-ri-folder-open-fill',
+  },
+  {
+    name: 'file',
+    keywords: 'document',
+    line: 'i-ri-file-line',
+    fill: 'i-ri-file-fill',
+  },
+  {
+    name: 'file-text',
+    keywords: 'document doc',
+    line: 'i-ri-file-text-line',
+    fill: 'i-ri-file-text-fill',
+  },
+  {
+    name: 'file-copy',
+    keywords: 'documents files',
+    line: 'i-ri-file-copy-line',
+    fill: 'i-ri-file-copy-fill',
+  },
+  {
+    name: 'clipboard',
+    keywords: 'copy tasks',
+    line: 'i-ri-clipboard-line',
+    fill: 'i-ri-clipboard-fill',
+  },
+  {
+    name: 'book-2',
+    keywords: 'read guide book',
+    line: 'i-ri-book-2-line',
+    fill: 'i-ri-book-2-fill',
+  },
+  {
+    name: 'book-open',
+    keywords: 'read guide docs',
+    line: 'i-ri-book-open-line',
+    fill: 'i-ri-book-open-fill',
+  },
+  {
+    name: 'graduation-cap',
+    keywords: 'learn course education',
+    line: 'i-ri-graduation-cap-line',
+    fill: 'i-ri-graduation-cap-fill',
+  },
+  {
+    name: 'newspaper',
+    keywords: 'news article blog',
+    line: 'i-ri-newspaper-line',
+    fill: 'i-ri-newspaper-fill',
+  },
+  {
+    name: 'sticky-note',
+    keywords: 'note memo',
+    line: 'i-ri-sticky-note-line',
+    fill: 'i-ri-sticky-note-fill',
+  },
+  {
+    name: 'pencil',
+    keywords: 'write edit',
+    line: 'i-ri-pencil-line',
+    fill: 'i-ri-pencil-fill',
+  },
+  {
+    name: 'quill-pen',
+    keywords: 'write author',
+    line: 'i-ri-quill-pen-line',
+    fill: 'i-ri-quill-pen-fill',
+  },
+  {
+    name: 'mark-pen',
+    keywords: 'highlight',
+    line: 'i-ri-mark-pen-line',
+    fill: 'i-ri-mark-pen-fill',
+  },
+  {
+    name: 'calendar-2',
+    keywords: 'date schedule calendar',
+    line: 'i-ri-calendar-2-line',
+    fill: 'i-ri-calendar-2-fill',
+  },
+  {
+    name: 'calendar-event',
+    keywords: 'schedule event',
+    line: 'i-ri-calendar-event-line',
+    fill: 'i-ri-calendar-event-fill',
+  },
+  {
+    name: 'time',
+    keywords: 'clock time',
+    line: 'i-ri-time-line',
+    fill: 'i-ri-time-fill',
+  },
+  {
+    name: 'timer',
+    keywords: 'countdown',
+    line: 'i-ri-timer-line',
+    fill: 'i-ri-timer-fill',
+  },
+  {
+    name: 'history',
+    keywords: 'recent past',
+    line: 'i-ri-history-line',
+    fill: 'i-ri-history-fill',
+  },
+  {
+    name: 'hourglass',
+    keywords: 'wait time',
+    line: 'i-ri-hourglass-line',
+    fill: 'i-ri-hourglass-fill',
+  },
+  {
+    name: 'shopping-cart-2',
+    keywords: 'buy ecommerce cart',
+    line: 'i-ri-shopping-cart-2-line',
+    fill: 'i-ri-shopping-cart-2-fill',
+  },
+  {
+    name: 'shopping-bag-3',
+    keywords: 'buy purchase bag',
+    line: 'i-ri-shopping-bag-3-line',
+    fill: 'i-ri-shopping-bag-3-fill',
+  },
+  {
+    name: 'box-3',
+    keywords: 'package box shipping',
+    line: 'i-ri-box-3-line',
+    fill: 'i-ri-box-3-fill',
+  },
+  {
+    name: 'archive',
+    keywords: 'store box archive',
+    line: 'i-ri-archive-line',
+    fill: 'i-ri-archive-fill',
+  },
+  {
+    name: 'bank-card',
+    keywords: 'pay billing card credit',
+    line: 'i-ri-bank-card-line',
+    fill: 'i-ri-bank-card-fill',
+  },
+  {
+    name: 'wallet-3',
+    keywords: 'money pay wallet',
+    line: 'i-ri-wallet-3-line',
+    fill: 'i-ri-wallet-3-fill',
+  },
+  {
+    name: 'money-dollar-circle',
+    keywords: 'money price usd',
+    line: 'i-ri-money-dollar-circle-line',
+    fill: 'i-ri-money-dollar-circle-fill',
+  },
+  {
+    name: 'copper-coin',
+    keywords: 'coins money',
+    line: 'i-ri-copper-coin-line',
+    fill: 'i-ri-copper-coin-fill',
+  },
+  {
+    name: 'currency',
+    keywords: 'money exchange',
+    line: 'i-ri-currency-line',
+    fill: 'i-ri-currency-fill',
+  },
+  {
+    name: 'receipt',
+    keywords: 'invoice bill',
+    line: 'i-ri-receipt-line',
+    fill: 'i-ri-receipt-fill',
+  },
+  {
+    name: 'percent',
+    keywords: 'discount sale',
+    line: 'i-ri-percent-line',
+    fill: 'i-ri-percent-fill',
+  },
+  {
+    name: 'calculator',
+    keywords: 'math',
+    line: 'i-ri-calculator-line',
+    fill: 'i-ri-calculator-fill',
+  },
+  {
+    name: 'mail',
+    keywords: 'email message',
+    line: 'i-ri-mail-line',
+    fill: 'i-ri-mail-fill',
+  },
+  {
+    name: 'send-plane',
+    keywords: 'send submit',
+    line: 'i-ri-send-plane-line',
+    fill: 'i-ri-send-plane-fill',
+  },
+  {
+    name: 'chat-3',
+    keywords: 'chat talk message',
+    line: 'i-ri-chat-3-line',
+    fill: 'i-ri-chat-3-fill',
+  },
+  {
+    name: 'message-2',
+    keywords: 'chat comment',
+    line: 'i-ri-message-2-line',
+    fill: 'i-ri-message-2-fill',
+  },
+  {
+    name: 'question-answer',
+    keywords: 'chat conversation faq',
+    line: 'i-ri-question-answer-line',
+    fill: 'i-ri-question-answer-fill',
+  },
+  {
+    name: 'phone',
+    keywords: 'call',
+    line: 'i-ri-phone-line',
+    fill: 'i-ri-phone-fill',
+  },
+  {
+    name: 'vidicon',
+    keywords: 'video call meeting',
+    line: 'i-ri-vidicon-line',
+    fill: 'i-ri-vidicon-fill',
+  },
+  {
+    name: 'mic',
+    keywords: 'record voice audio',
+    line: 'i-ri-mic-line',
+    fill: 'i-ri-mic-fill',
+  },
+  {
+    name: 'group',
+    keywords: 'team people users',
+    line: 'i-ri-group-line',
+    fill: 'i-ri-group-fill',
+  },
+  {
+    name: 'user',
+    keywords: 'person account',
+    line: 'i-ri-user-line',
+    fill: 'i-ri-user-fill',
+  },
+  {
+    name: 'user-add',
+    keywords: 'add member',
+    line: 'i-ri-user-add-line',
+    fill: 'i-ri-user-add-fill',
+  },
+  {
+    name: 'contacts',
+    keywords: 'person card contact',
+    line: 'i-ri-contacts-line',
+    fill: 'i-ri-contacts-fill',
+  },
+  {
+    name: 'emotion-happy',
+    keywords: 'happy smile emoji',
+    line: 'i-ri-emotion-happy-line',
+    fill: 'i-ri-emotion-happy-fill',
+  },
+  {
+    name: 'thumb-up',
+    keywords: 'like approve',
+    line: 'i-ri-thumb-up-line',
+    fill: 'i-ri-thumb-up-fill',
+  },
+  {
+    name: 'hand-heart',
+    keywords: 'care support',
+    line: 'i-ri-hand-heart-line',
+    fill: 'i-ri-hand-heart-fill',
+  },
+  {
+    name: 'at',
+    keywords: 'mention email at',
+    line: 'i-ri-at-line',
+    fill: 'i-ri-at-fill',
+  },
+  {
+    name: 'image-2',
+    keywords: 'picture photo image',
+    line: 'i-ri-image-2-line',
+    fill: 'i-ri-image-2-fill',
+  },
+  {
+    name: 'camera-3',
+    keywords: 'photo camera',
+    line: 'i-ri-camera-3-line',
+    fill: 'i-ri-camera-3-fill',
+  },
+  {
+    name: 'film',
+    keywords: 'movie video',
+    line: 'i-ri-film-line',
+    fill: 'i-ri-film-fill',
+  },
+  {
+    name: 'music-2',
+    keywords: 'audio song music',
+    line: 'i-ri-music-2-line',
+    fill: 'i-ri-music-2-fill',
+  },
+  {
+    name: 'headphone',
+    keywords: 'audio support',
+    line: 'i-ri-headphone-line',
+    fill: 'i-ri-headphone-fill',
+  },
+  {
+    name: 'palette',
+    keywords: 'color design art',
+    line: 'i-ri-palette-line',
+    fill: 'i-ri-palette-fill',
+  },
+  {
+    name: 'brush-3',
+    keywords: 'paint design brush',
+    line: 'i-ri-brush-3-line',
+    fill: 'i-ri-brush-3-fill',
+  },
+  {
+    name: 'scissors-2',
+    keywords: 'cut',
+    line: 'i-ri-scissors-2-line',
+    fill: 'i-ri-scissors-2-fill',
+  },
+  {
+    name: 'code-s-slash',
+    keywords: 'develop code programming',
+    line: 'i-ri-code-s-slash-line',
+    fill: 'i-ri-code-s-slash-fill',
+  },
+  {
+    name: 'terminal-box',
+    keywords: 'console cli terminal',
+    line: 'i-ri-terminal-box-line',
+    fill: 'i-ri-terminal-box-fill',
+  },
+  {
+    name: 'git-branch',
+    keywords: 'version code git',
+    line: 'i-ri-git-branch-line',
+    fill: 'i-ri-git-branch-fill',
+  },
+  {
+    name: 'github',
+    keywords: 'git code',
+    line: 'i-ri-github-line',
+    fill: 'i-ri-github-fill',
+  },
+  {
+    name: 'cpu',
+    keywords: 'chip processor',
+    line: 'i-ri-cpu-line',
+    fill: 'i-ri-cpu-fill',
+  },
+  {
+    name: 'database-2',
+    keywords: 'storage data',
+    line: 'i-ri-database-2-line',
+    fill: 'i-ri-database-2-fill',
+  },
+  {
+    name: 'server',
+    keywords: 'host backend',
+    line: 'i-ri-server-line',
+    fill: 'i-ri-server-fill',
+  },
+  {
+    name: 'cloud',
+    keywords: 'storage cloud',
+    line: 'i-ri-cloud-line',
+    fill: 'i-ri-cloud-fill',
+  },
+  {
+    name: 'wifi',
+    keywords: 'network internet',
+    line: 'i-ri-wifi-line',
+    fill: 'i-ri-wifi-fill',
+  },
+  {
+    name: 'computer',
+    keywords: 'screen desktop monitor',
+    line: 'i-ri-computer-line',
+    fill: 'i-ri-computer-fill',
+  },
+  {
+    name: 'smartphone',
+    keywords: 'mobile phone',
+    line: 'i-ri-smartphone-line',
+    fill: 'i-ri-smartphone-fill',
+  },
+  {
+    name: 'macbook',
+    keywords: 'laptop computer',
+    line: 'i-ri-macbook-line',
+    fill: 'i-ri-macbook-fill',
+  },
+  {
+    name: 'bug',
+    keywords: 'issue error bug',
+    line: 'i-ri-bug-line',
+    fill: 'i-ri-bug-fill',
+  },
+  {
+    name: 'command',
+    keywords: 'keyboard shortcut',
+    line: 'i-ri-command-line',
+    fill: 'i-ri-command-fill',
+  },
+  {
+    name: 'settings-3',
+    keywords: 'config gear options settings',
+    line: 'i-ri-settings-3-line',
+    fill: 'i-ri-settings-3-fill',
+  },
+  {
+    name: 'equalizer',
+    keywords: 'controls adjust sliders filter',
+    line: 'i-ri-equalizer-line',
+    fill: 'i-ri-equalizer-fill',
+  },
+  {
+    name: 'tools',
+    keywords: 'fix tools config',
+    line: 'i-ri-tools-line',
+    fill: 'i-ri-tools-fill',
+  },
+  {
+    name: 'hammer',
+    keywords: 'build fix hammer',
+    line: 'i-ri-hammer-line',
+    fill: 'i-ri-hammer-fill',
+  },
+  {
+    name: 'key-2',
+    keywords: 'password access key',
+    line: 'i-ri-key-2-line',
+    fill: 'i-ri-key-2-fill',
+  },
+  {
+    name: 'lock',
+    keywords: 'secure private lock',
+    line: 'i-ri-lock-line',
+    fill: 'i-ri-lock-fill',
+  },
+  {
+    name: 'lock-unlock',
+    keywords: 'open access',
+    line: 'i-ri-lock-unlock-line',
+    fill: 'i-ri-lock-unlock-fill',
+  },
+  {
+    name: 'shield',
+    keywords: 'security protect',
+    line: 'i-ri-shield-line',
+    fill: 'i-ri-shield-fill',
+  },
+  {
+    name: 'shield-check',
+    keywords: 'secure verified',
+    line: 'i-ri-shield-check-line',
+    fill: 'i-ri-shield-check-fill',
+  },
+  {
+    name: 'eye',
+    keywords: 'view visible preview',
+    line: 'i-ri-eye-line',
+    fill: 'i-ri-eye-fill',
+  },
+  {
+    name: 'search',
+    keywords: 'find lookup search',
+    line: 'i-ri-search-line',
+    fill: 'i-ri-search-fill',
+  },
+  {
+    name: 'filter-3',
+    keywords: 'sort refine filter',
+    line: 'i-ri-filter-3-line',
+    fill: 'i-ri-filter-3-fill',
+  },
+  {
+    name: 'links',
+    keywords: 'url chain link',
+    line: 'i-ri-links-line',
+    fill: 'i-ri-links-fill',
+  },
+  {
+    name: 'share-forward',
+    keywords: 'share send distribute',
+    line: 'i-ri-share-forward-line',
+    fill: 'i-ri-share-forward-fill',
+  },
+  {
+    name: 'plug',
+    keywords: 'connect integration',
+    line: 'i-ri-plug-line',
+    fill: 'i-ri-plug-fill',
+  },
+  {
+    name: 'shut-down',
+    keywords: 'power on off',
+    line: 'i-ri-shut-down-line',
+    fill: 'i-ri-shut-down-fill',
+  },
+  {
+    name: 'qr-scan-2',
+    keywords: 'qr scan',
+    line: 'i-ri-qr-scan-2-line',
+    fill: 'i-ri-qr-scan-2-fill',
+  },
+  {
+    name: 'fingerprint',
+    keywords: 'identity auth fingerprint',
+    line: 'i-ri-fingerprint-line',
+    fill: 'i-ri-fingerprint-fill',
+  },
+  {
+    name: 'bar-chart',
+    keywords: 'analytics stats graph bar',
+    line: 'i-ri-bar-chart-line',
+    fill: 'i-ri-bar-chart-fill',
+  },
+  {
+    name: 'pie-chart',
+    keywords: 'analytics stats pie',
+    line: 'i-ri-pie-chart-line',
+    fill: 'i-ri-pie-chart-fill',
+  },
+  {
+    name: 'line-chart',
+    keywords: 'analytics trend graph line',
+    line: 'i-ri-line-chart-line',
+    fill: 'i-ri-line-chart-fill',
+  },
+  {
+    name: 'stock',
+    keywords: 'growth increase trending',
+    line: 'i-ri-stock-line',
+    fill: 'i-ri-stock-fill',
+  },
+  {
+    name: 'pulse',
+    keywords: 'activity health monitor',
+    line: 'i-ri-pulse-line',
+    fill: 'i-ri-pulse-fill',
+  },
+  {
+    name: 'dashboard-3',
+    keywords: 'speed performance dashboard gauge',
+    line: 'i-ri-dashboard-3-line',
+    fill: 'i-ri-dashboard-3-fill',
+  },
+  {
+    name: 'check',
+    keywords: 'done complete ok check',
+    line: 'i-ri-check-line',
+    fill: 'i-ri-check-fill',
+  },
+  {
+    name: 'checkbox-circle',
+    keywords: 'done success check',
+    line: 'i-ri-checkbox-circle-line',
+    fill: 'i-ri-checkbox-circle-fill',
+  },
+  {
+    name: 'close-circle',
+    keywords: 'error fail close',
+    line: 'i-ri-close-circle-line',
+    fill: 'i-ri-close-circle-fill',
+  },
+  {
+    name: 'information',
+    keywords: 'info information',
+    line: 'i-ri-information-line',
+    fill: 'i-ri-information-fill',
+  },
+  {
+    name: 'error-warning',
+    keywords: 'warning alert',
+    line: 'i-ri-error-warning-line',
+    fill: 'i-ri-error-warning-fill',
+  },
+  {
+    name: 'alert',
+    keywords: 'warning caution',
+    line: 'i-ri-alert-line',
+    fill: 'i-ri-alert-fill',
+  },
+  {
+    name: 'question',
+    keywords: 'support faq help',
+    line: 'i-ri-question-line',
+    fill: 'i-ri-question-fill',
+  },
+  {
+    name: 'layout-grid',
+    keywords: 'dashboard apps grid',
+    line: 'i-ri-layout-grid-line',
+    fill: 'i-ri-layout-grid-fill',
+  },
+  {
+    name: 'table',
+    keywords: 'grid data table',
+    line: 'i-ri-table-line',
+    fill: 'i-ri-table-fill',
+  },
+  {
+    name: 'function',
+    keywords: 'kanban board',
+    line: 'i-ri-function-line',
+    fill: 'i-ri-function-fill',
+  },
+  {
+    name: 'map-2',
+    keywords: 'location navigate map',
+    line: 'i-ri-map-2-line',
+    fill: 'i-ri-map-2-fill',
+  },
+  {
+    name: 'navigation',
+    keywords: 'direction gps',
+    line: 'i-ri-navigation-line',
+    fill: 'i-ri-navigation-fill',
+  },
+  {
+    name: 'car',
+    keywords: 'drive vehicle car',
+    line: 'i-ri-car-line',
+    fill: 'i-ri-car-fill',
+  },
+  {
+    name: 'truck',
+    keywords: 'delivery shipping',
+    line: 'i-ri-truck-line',
+    fill: 'i-ri-truck-fill',
+  },
+  {
+    name: 'plane',
+    keywords: 'travel flight plane',
+    line: 'i-ri-plane-line',
+    fill: 'i-ri-plane-fill',
+  },
+  {
+    name: 'bike',
+    keywords: 'cycle bike',
+    line: 'i-ri-bike-line',
+    fill: 'i-ri-bike-fill',
+  },
+  {
+    name: 'anchor',
+    keywords: 'ship marine anchor',
+    line: 'i-ri-anchor-line',
+    fill: 'i-ri-anchor-fill',
+  },
+  {
+    name: 'leaf',
+    keywords: 'eco nature green leaf',
+    line: 'i-ri-leaf-line',
+    fill: 'i-ri-leaf-fill',
+  },
+  {
+    name: 'plant',
+    keywords: 'nature plant grow',
+    line: 'i-ri-plant-line',
+    fill: 'i-ri-plant-fill',
+  },
+  {
+    name: 'sun',
+    keywords: 'day light weather sun',
+    line: 'i-ri-sun-line',
+    fill: 'i-ri-sun-fill',
+  },
+  {
+    name: 'moon',
+    keywords: 'night dark moon',
+    line: 'i-ri-moon-line',
+    fill: 'i-ri-moon-fill',
+  },
+  {
+    name: 'rainy',
+    keywords: 'weather rain',
+    line: 'i-ri-rainy-line',
+    fill: 'i-ri-rainy-fill',
+  },
+  {
+    name: 'umbrella',
+    keywords: 'rain protect umbrella',
+    line: 'i-ri-umbrella-line',
+    fill: 'i-ri-umbrella-fill',
+  },
+  {
+    name: 'landscape',
+    keywords: 'outdoor hike mountain',
+    line: 'i-ri-landscape-line',
+    fill: 'i-ri-landscape-fill',
+  },
+  {
+    name: 'drop',
+    keywords: 'water drop',
+    line: 'i-ri-drop-line',
+    fill: 'i-ri-drop-fill',
+  },
+  {
+    name: 'cup',
+    keywords: 'coffee drink cup',
+    line: 'i-ri-cup-line',
+    fill: 'i-ri-cup-fill',
+  },
+  {
+    name: 'restaurant',
+    keywords: 'food eat restaurant',
+    line: 'i-ri-restaurant-line',
+    fill: 'i-ri-restaurant-fill',
+  },
+  {
+    name: 'cake-3',
+    keywords: 'birthday celebrate cake',
+    line: 'i-ri-cake-3-line',
+    fill: 'i-ri-cake-3-fill',
+  },
+  {
+    name: 'goblet',
+    keywords: 'drink wine bar',
+    line: 'i-ri-goblet-line',
+    fill: 'i-ri-goblet-fill',
+  },
+  {
+    name: 'heart-pulse',
+    keywords: 'health medical',
+    line: 'i-ri-heart-pulse-line',
+    fill: 'i-ri-heart-pulse-fill',
+  },
+  {
+    name: 'stethoscope',
+    keywords: 'health doctor medical',
+    line: 'i-ri-stethoscope-line',
+    fill: 'i-ri-stethoscope-fill',
+  },
+  {
+    name: 'capsule',
+    keywords: 'medicine pill health',
+    line: 'i-ri-capsule-line',
+    fill: 'i-ri-capsule-fill',
+  },
+  {
+    name: 'add',
+    keywords: 'add new create plus',
+    line: 'i-ri-add-line',
+    fill: 'i-ri-add-fill',
+  },
+  {
+    name: 'delete-bin',
+    keywords: 'delete remove trash',
+    line: 'i-ri-delete-bin-line',
+    fill: 'i-ri-delete-bin-fill',
+  },
+  {
+    name: 'download',
+    keywords: 'save export download',
+    line: 'i-ri-download-line',
+    fill: 'i-ri-download-fill',
+  },
+  {
+    name: 'upload',
+    keywords: 'import upload',
+    line: 'i-ri-upload-line',
+    fill: 'i-ri-upload-fill',
+  },
+  {
+    name: 'refresh',
+    keywords: 'reload sync update refresh',
+    line: 'i-ri-refresh-line',
+    fill: 'i-ri-refresh-fill',
+  },
+  {
+    name: 'external-link',
+    keywords: 'open new external',
+    line: 'i-ri-external-link-line',
+    fill: 'i-ri-external-link-fill',
+  },
+  {
+    name: 'logout-box',
+    keywords: 'exit signout logout',
+    line: 'i-ri-logout-box-line',
+    fill: 'i-ri-logout-box-fill',
+  },
+  {
+    name: 'fullscreen',
+    keywords: 'expand maximize fullscreen',
+    line: 'i-ri-fullscreen-line',
+    fill: 'i-ri-fullscreen-fill',
+  },
+  {
+    name: 'drag-move',
+    keywords: 'drag reorder move',
+    line: 'i-ri-drag-move-line',
+    fill: 'i-ri-drag-move-fill',
+  },
+  {
+    name: 'paint-brush',
+    keywords: 'brush paint',
+    line: 'i-ri-paint-brush-line',
+    fill: 'i-ri-paint-brush-fill',
+  },
+];
diff --git a/app/javascript/dashboard/components-next/message/constants.js b/app/javascript/dashboard/components-next/message/constants.js
index 4f8b4f23c..517c083a1 100644
--- a/app/javascript/dashboard/components-next/message/constants.js
+++ b/app/javascript/dashboard/components-next/message/constants.js
@@ -78,6 +78,12 @@ export const MEDIA_TYPES = [
   ATTACHMENT_TYPES.IG_REEL,
 ];
 
+export const NON_FILE_TYPES = [
+  ATTACHMENT_TYPES.LOCATION,
+  ATTACHMENT_TYPES.FALLBACK,
+  ATTACHMENT_TYPES.CONTACT,
+];
+
 export const VOICE_CALL_STATUS = {
   IN_PROGRESS: 'in-progress',
   RINGING: 'ringing',
diff --git a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
index a995cf510..234737008 100644
--- a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
@@ -22,6 +22,10 @@ const props = defineProps({
     type: [Number, String],
     default: 0,
   },
+  badgeTooltip: {
+    type: String,
+    default: '',
+  },
 });
 
 const reauthorizationRequired = computed(() => {
@@ -34,7 +38,7 @@ const reauthorizationRequired = computed(() => {
     <ChannelIcon :inbox="inbox" class="size-4" />
   </span>
   <div class="flex-1 truncate min-w-0">{{ label }}</div>
-  <SidebarUnreadBadge :count="badgeCount" />
+  <SidebarUnreadBadge :count="badgeCount" :tooltip="badgeTooltip" />
   <div
     v-if="reauthorizationRequired"
     v-tooltip.top-end="$t('SIDEBAR.REAUTHORIZE')"
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index d9f523dfc..aaee349e3 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -21,6 +21,12 @@ import ChannelIcon from 'next/icon/ChannelIcon.vue';
 import SidebarAccountSwitcher from './SidebarAccountSwitcher.vue';
 import Logo from 'next/icon/Logo.vue';
 import ComposeConversation from 'dashboard/components-next/NewConversation/ComposeConversation.vue';
+import {
+  SIDEBAR_SORT_SECTIONS,
+  getSidebarSortOptions,
+  resolveSidebarSort,
+  sortSidebarItems,
+} from 'dashboard/helper/sidebarSort';
 
 const props = defineProps({
   isMobileSidebarOpen: {
@@ -50,6 +56,7 @@ const { width: windowWidth } = useWindowSize();
 const isMobile = computed(() => windowWidth.value < 768);
 
 const accountId = useMapGetter('getCurrentAccountId');
+const currentUserId = useMapGetter('getCurrentUserID');
 const isFeatureEnabledonAccount = useMapGetter(
   'accounts/isFeatureEnabledonAccount'
 );
@@ -79,6 +86,11 @@ const fetchConversationUnreadCounts = ([currentAccountId, isEnabled]) => {
   store.dispatch('conversationUnreadCounts/get');
 };
 
+const fetchSidebarSortPreferences = ([currentAccountId, userId]) => {
+  if (!currentAccountId || !userId) return;
+  store.dispatch('sidebarSortPreferences/initialize');
+};
+
 const toggleShortcutModalFn = show => {
   if (show) {
     emit('openKeyShortcutModal');
@@ -175,6 +187,9 @@ useEventListener(document, 'touchend', onResizeEnd);
 
 const inboxes = useMapGetter('inboxes/getInboxes');
 const labels = useMapGetter('labels/getLabelsOnSidebar');
+const allUnreadCount = useMapGetter(
+  'conversationUnreadCounts/getAllUnreadCount'
+);
 const getInboxUnreadCount = useMapGetter(
   'conversationUnreadCounts/getInboxUnreadCount'
 );
@@ -184,11 +199,26 @@ const getLabelUnreadCount = useMapGetter(
 const getTeamUnreadCount = useMapGetter(
   'conversationUnreadCounts/getTeamUnreadCount'
 );
+const mentionsUnreadCount = useMapGetter(
+  'conversationUnreadCounts/getMentionsUnreadCount'
+);
+const participatingUnreadCount = useMapGetter(
+  'conversationUnreadCounts/getParticipatingUnreadCount'
+);
+const unattendedUnreadCount = useMapGetter(
+  'conversationUnreadCounts/getUnattendedUnreadCount'
+);
+const getFolderUnreadCount = useMapGetter(
+  'conversationUnreadCounts/getFolderUnreadCount'
+);
 const teams = useMapGetter('teams/getMyTeams');
 const contactCustomViews = useMapGetter('customViews/getContactCustomViews');
 const conversationCustomViews = useMapGetter(
   'customViews/getConversationCustomViews'
 );
+const getSidebarSectionSort = useMapGetter(
+  'sidebarSortPreferences/getSectionSort'
+);
 
 onMounted(() => {
   store.dispatch('labels/get');
@@ -204,46 +234,77 @@ watch([accountId, hasConversationUnreadCounts], fetchConversationUnreadCounts, {
   immediate: true,
 });
 
-const normalizeUnreadCount = count => {
-  const unreadCount = Number(count);
-  return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0;
-};
+watch([accountId, currentUserId], fetchSidebarSortPreferences, {
+  immediate: true,
+});
 
-const sortByUnreadCount = (items, labelKey, unreadCountKey) =>
-  items.slice().sort((a, b) => {
-    const unreadCountDiff =
-      normalizeUnreadCount(unreadCountKey(b)) -
-      normalizeUnreadCount(unreadCountKey(a));
-
-    if (unreadCountDiff !== 0) return unreadCountDiff;
-
-    return labelKey(a).localeCompare(labelKey(b));
+const getSortOptionsForSection = section =>
+  getSidebarSortOptions(section, {
+    hasUnreadCounts: hasConversationUnreadCounts.value,
   });
 
+const getSortForSection = section =>
+  resolveSidebarSort(section, getSidebarSectionSort.value(section), {
+    hasUnreadCounts: hasConversationUnreadCounts.value,
+  });
+
+const updateSortPreference = (section, sortBy) => {
+  store.dispatch('sidebarSortPreferences/setSectionSort', {
+    section,
+    sortBy,
+  });
+};
+
+const buildSortConfig = section => ({
+  sortOptions: getSortOptionsForSection(section),
+  activeSort: getSortForSection(section),
+  onSortChange: sortBy => updateSortPreference(section, sortBy),
+});
+
+const sortedFolders = computed(() =>
+  sortSidebarItems(conversationCustomViews.value, {
+    sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.FOLDERS),
+    labelKey: view => view.name,
+  })
+);
+
 const sortedTeams = computed(() =>
-  sortByUnreadCount(
-    teams.value,
-    team => team.name,
-    team => getTeamUnreadCount.value(team.id)
-  )
+  sortSidebarItems(teams.value, {
+    sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.TEAMS),
+    labelKey: team => team.name,
+    unreadCountKey: team => getTeamUnreadCount.value(team.id),
+  })
 );
 
 const sortedInboxes = computed(() =>
-  sortByUnreadCount(
-    inboxes.value,
-    inbox => inbox.name,
-    inbox => getInboxUnreadCount.value(inbox.id)
-  )
+  sortSidebarItems(inboxes.value, {
+    sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.CHANNELS),
+    labelKey: inbox => inbox.name,
+    unreadCountKey: inbox => getInboxUnreadCount.value(inbox.id),
+  })
 );
 
 const sortedLabels = computed(() =>
-  sortByUnreadCount(
-    labels.value,
-    label => label.title,
-    label => getLabelUnreadCount.value(label.id)
-  )
+  sortSidebarItems(labels.value, {
+    sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.LABELS),
+    labelKey: label => label.title,
+    unreadCountKey: label => getLabelUnreadCount.value(label.id),
+  })
 );
 
+const unreadBadgeTooltips = computed(() => ({
+  ALL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.ALL'),
+  INBOX: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.INBOX'),
+  LABEL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.LABEL'),
+  TEAM: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.TEAM'),
+  FOLDER: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.FOLDER'),
+  MENTIONS: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.MENTIONS'),
+  PARTICIPATING: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.PARTICIPATING'),
+  UNATTENDED: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.UNATTENDED'),
+}));
+
+const unreadBadgeTooltip = type => unreadBadgeTooltips.value[type];
+
 const closeMobileSidebar = () => {
   if (!props.isMobileSidebarOpen) return;
   emit('closeMobileSidebar');
@@ -297,25 +358,37 @@ const menuItems = computed(() => {
         {
           name: 'All',
           label: t('SIDEBAR.ALL_CONVERSATIONS'),
+          icon: 'i-lucide-inbox',
+          badgeCount: allUnreadCount.value,
+          badgeTooltip: unreadBadgeTooltip('ALL'),
           activeOn: ['inbox_conversation'],
           to: accountScopedRoute('home'),
         },
         {
           name: 'Mentions',
           label: t('SIDEBAR.MENTIONED_CONVERSATIONS'),
+          badgeCount: mentionsUnreadCount.value,
+          badgeTooltip: unreadBadgeTooltip('MENTIONS'),
+          icon: 'i-lucide-at-sign',
           activeOn: ['conversation_through_mentions'],
           to: accountScopedRoute('conversation_mentions'),
         },
         {
           name: 'Participating',
           label: t('SIDEBAR.PARTICIPATING_CONVERSATIONS'),
+          badgeCount: participatingUnreadCount.value,
+          badgeTooltip: unreadBadgeTooltip('PARTICIPATING'),
+          icon: 'i-lucide-user-round-check',
           activeOn: ['conversation_through_participating'],
           to: accountScopedRoute('conversation_participating'),
         },
         {
           name: 'Unattended',
           activeOn: ['conversation_through_unattended'],
+          badgeCount: unattendedUnreadCount.value,
+          badgeTooltip: unreadBadgeTooltip('UNATTENDED'),
           label: t('SIDEBAR.UNATTENDED_CONVERSATIONS'),
+          icon: 'i-lucide-clock-alert',
           to: accountScopedRoute('conversation_unattended'),
         },
         {
@@ -323,9 +396,14 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.CUSTOM_VIEWS_FOLDER'),
           icon: 'i-lucide-folder',
           activeOn: ['conversations_through_folders'],
-          children: conversationCustomViews.value.map(view => ({
+          ...buildSortConfig(SIDEBAR_SORT_SECTIONS.FOLDERS),
+          collapsible: true,
+          showTreeLine: true,
+          children: sortedFolders.value.map(view => ({
             name: `${view.name}-${view.id}`,
             label: view.name,
+            badgeCount: getFolderUnreadCount.value(view.id),
+            badgeTooltip: unreadBadgeTooltip('FOLDER'),
             to: accountScopedRoute('folder_conversations', { id: view.id }),
           })),
         },
@@ -334,10 +412,14 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.TEAMS'),
           icon: 'i-lucide-users',
           activeOn: ['conversations_through_team'],
+          ...buildSortConfig(SIDEBAR_SORT_SECTIONS.TEAMS),
+          collapsible: true,
+          showTreeLine: true,
           children: sortedTeams.value.map(team => ({
             name: `${team.name}-${team.id}`,
             label: team.name,
             badgeCount: getTeamUnreadCount.value(team.id),
+            badgeTooltip: unreadBadgeTooltip('TEAM'),
             to: accountScopedRoute('team_conversations', { teamId: team.id }),
           })),
         },
@@ -346,10 +428,14 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.CHANNELS'),
           icon: 'i-lucide-mailbox',
           activeOn: ['conversation_through_inbox'],
+          ...buildSortConfig(SIDEBAR_SORT_SECTIONS.CHANNELS),
+          collapsible: true,
+          showTreeLine: true,
           children: sortedInboxes.value.map(inbox => ({
             name: `${inbox.name}-${inbox.id}`,
             label: inbox.name,
             badgeCount: getInboxUnreadCount.value(inbox.id),
+            badgeTooltip: unreadBadgeTooltip('INBOX'),
             icon: h(ChannelIcon, { inbox, class: 'size-[16px]' }),
             to: accountScopedRoute('inbox_dashboard', { inbox_id: inbox.id }),
             component: leafProps =>
@@ -358,6 +444,7 @@ const menuItems = computed(() => {
                 active: leafProps.active,
                 inbox,
                 badgeCount: leafProps.badgeCount,
+                badgeTooltip: leafProps.badgeTooltip,
               }),
           })),
         },
@@ -366,10 +453,14 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.LABELS'),
           icon: 'i-lucide-tag',
           activeOn: ['conversations_through_label'],
+          ...buildSortConfig(SIDEBAR_SORT_SECTIONS.LABELS),
+          collapsible: true,
+          showTreeLine: true,
           children: sortedLabels.value.map(label => ({
             name: `${label.title}-${label.id}`,
             label: label.title,
             badgeCount: getLabelUnreadCount.value(label.id),
+            badgeTooltip: unreadBadgeTooltip('LABEL'),
             icon: h('span', {
               class: `size-[8px] rounded-sm`,
               style: { backgroundColor: label.color },
@@ -477,6 +568,8 @@ const menuItems = computed(() => {
           name: 'Segments',
           icon: 'i-lucide-group',
           label: t('SIDEBAR.CUSTOM_VIEWS_SEGMENTS'),
+          collapsible: true,
+          showTreeLine: true,
           children: contactCustomViews.value.map(view => ({
             name: `${view.name}-${view.id}`,
             label: view.name,
@@ -495,6 +588,8 @@ const menuItems = computed(() => {
           name: 'Tagged With',
           icon: 'i-lucide-tag',
           label: t('SIDEBAR.TAGGED_WITH'),
+          collapsible: true,
+          showTreeLine: true,
           children: labels.value.map(label => ({
             name: `${label.title}-${label.id}`,
             label: label.title,
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
index 18e1aea23..8f1de246e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
@@ -1,11 +1,13 @@
 <script setup>
 import { computed, ref, onMounted, nextTick } from 'vue';
+import { onClickOutside } from '@vueuse/core';
 import { useRouter } from 'vue-router';
 import { useSidebarContext } from './provider';
 import { useMapGetter } from 'dashboard/composables/store';
 import Icon from 'next/icon/Icon.vue';
 import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
 import SidebarUnreadBadge from './SidebarUnreadBadge.vue';
+import SidebarSortMenu from './SidebarSortMenu.vue';
 
 const props = defineProps({
   label: { type: String, required: true },
@@ -14,7 +16,7 @@ const props = defineProps({
   triggerRect: { type: Object, default: () => ({ top: 0, left: 0 }) },
 });
 
-const emit = defineEmits(['close', 'mouseenter', 'mouseleave']);
+const emit = defineEmits(['close', 'mouseenter', 'mouseleave', 'sortToggle']);
 
 const router = useRouter();
 const { isAllowed, sidebarWidth } = useSidebarContext();
@@ -29,6 +31,14 @@ const toggleSubGroup = name => {
   expandedSubGroup.value = expandedSubGroup.value === name ? null : name;
 };
 
+const handleSortToggle = isSortOpen => {
+  emit('sortToggle', isSortOpen);
+};
+
+onClickOutside(popoverRef, () => emit('close'), {
+  ignore: ['[data-popover-content]'],
+});
+
 const navigateAndClose = to => {
   router.push(to);
   emit('close');
@@ -123,24 +133,44 @@ onMounted(async () => {
         >
           <template v-for="child in accessibleChildren" :key="child.name">
             <!-- SubGroup with children -->
-            <li v-if="child.children" class="py-0.5">
-              <button
-                class="flex items-center gap-2 px-2 py-1.5 w-full rounded-lg text-n-slate-11 hover:bg-n-alpha-2 transition-colors duration-150 ease-out text-left rtl:text-right"
-                @click="toggleSubGroup(child.name)"
+            <li v-if="child.children" class="group/sidebar-section py-0.5">
+              <div
+                class="flex items-center rounded-lg text-n-slate-11 hover:bg-n-alpha-2 transition-colors duration-150 ease-out"
               >
-                <Icon
-                  v-if="child.icon"
-                  :icon="child.icon"
-                  class="size-4 flex-shrink-0"
-                />
-                <span class="flex-1 truncate text-sm">{{ child.label }}</span>
-                <span
-                  class="size-3 transition-transform i-lucide-chevron-down"
-                  :class="{
-                    'rotate-180': expandedSubGroup === child.name,
-                  }"
-                />
-              </button>
+                <button
+                  class="flex flex-1 min-w-0 items-center gap-2 ps-2 py-1.5 text-left rtl:text-right"
+                  @click="toggleSubGroup(child.name)"
+                >
+                  <Icon
+                    v-if="child.icon"
+                    :icon="child.icon"
+                    class="size-4 flex-shrink-0"
+                  />
+                  <span class="flex-1 truncate text-sm">{{ child.label }}</span>
+                </button>
+                <div class="flex flex-shrink-0 items-center gap-1 pe-2">
+                  <SidebarSortMenu
+                    v-if="child.sortOptions?.length"
+                    :active-sort="child.activeSort"
+                    :options="child.sortOptions"
+                    :open-on-hover="false"
+                    @sort="child.onSortChange"
+                    @toggle="handleSortToggle"
+                  />
+                  <button
+                    type="button"
+                    class="flex size-6 flex-shrink-0 items-center justify-center rounded-md text-n-slate-11 hover:bg-n-alpha-2 focus-visible:bg-n-alpha-2 focus-visible:outline-none"
+                    @click.stop="toggleSubGroup(child.name)"
+                  >
+                    <span
+                      class="size-4 flex-shrink-0 transition-transform i-lucide-chevron-down"
+                      :class="{
+                        'rotate-180': expandedSubGroup === child.name,
+                      }"
+                    />
+                  </button>
+                </div>
+              </div>
               <Transition v-bind="transition">
                 <ul
                   v-if="expandedSubGroup === child.name"
@@ -167,7 +197,10 @@ onMounted(async () => {
                         class="size-4 flex-shrink-0"
                       />
                       <span class="flex-1 truncate">{{ subChild.label }}</span>
-                      <SidebarUnreadBadge :count="subChild.badgeCount" />
+                      <SidebarUnreadBadge
+                        :count="subChild.badgeCount"
+                        :tooltip="subChild.badgeTooltip"
+                      />
                     </button>
                   </li>
                 </ul>
@@ -190,7 +223,10 @@ onMounted(async () => {
                   class="size-4 flex-shrink-0"
                 />
                 <span class="flex-1 truncate">{{ child.label }}</span>
-                <SidebarUnreadBadge :count="child.badgeCount" />
+                <SidebarUnreadBadge
+                  :count="child.badgeCount"
+                  :tooltip="child.badgeTooltip"
+                />
               </button>
             </li>
           </template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
index 048a99cf8..de2ad8e28 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
@@ -55,6 +55,9 @@ const hasChildren = computed(
 const isPopoverOpen = computed(() => activePopover.value === props.name);
 const triggerRef = ref(null);
 const triggerRect = ref({ top: 0, left: 0, bottom: 0, right: 0 });
+// The sort dropdown teleports outside the popover; keep the popover open while
+// it is showing so moving the cursor onto it does not close everything.
+const isSortMenuOpen = ref(false);
 
 const openPopover = () => {
   if (triggerRef.value) {
@@ -82,7 +85,7 @@ const handleMouseEnter = () => {
 };
 
 const handleMouseLeave = () => {
-  if (!hasChildren.value) return;
+  if (!hasChildren.value || isSortMenuOpen.value) return;
   scheduleClose(200);
 };
 
@@ -91,28 +94,53 @@ const handlePopoverMouseEnter = () => {
 };
 
 const handlePopoverMouseLeave = () => {
+  if (isSortMenuOpen.value) return;
   scheduleClose(100);
 };
 
+const handleSortToggle = isOpen => {
+  isSortMenuOpen.value = isOpen;
+  cancelClose();
+};
+
 // Close popover when mouse leaves the window
 const handleWindowBlur = () => {
   closeActivePopover();
 };
 
-const accessibleItems = computed(() => {
+const hasAccessibleSubChildren = child => {
+  return child.children?.some(
+    subChild => subChild.to && isAllowed(subChild.to)
+  );
+};
+
+const visibleChildren = computed(() => {
   if (!hasChildren.value) return [];
+
   return props.children.filter(child => {
-    // If a item has no link, it means it's just a subgroup header
-    // So we don't need to check for permissions here, because there's nothing to
-    // access here anyway
+    if (child.children) return hasAccessibleSubChildren(child);
+
     return child.to && isAllowed(child.to);
   });
 });
 
-const hasAccessibleChildren = computed(() => {
-  return accessibleItems.value.length > 0;
+const accessibleItems = computed(() => {
+  if (!hasChildren.value) return [];
+
+  return visibleChildren.value
+    .flatMap(child => child.children || child)
+    .filter(child => child.to && isAllowed(child.to));
 });
 
+const hasAccessibleChildren = computed(() => {
+  return visibleChildren.value.length > 0;
+});
+
+const isLastVisibleChild = child => {
+  const lastChild = visibleChildren.value[visibleChildren.value.length - 1];
+  return lastChild === child;
+};
+
 const isActive = computed(() => {
   if (props.to) {
     if (route.path === resolvePath(props.to)) return true;
@@ -254,6 +282,7 @@ watch(
           @close="closePopover"
           @mouseenter="handlePopoverMouseEnter"
           @mouseleave="handlePopoverMouseLeave"
+          @sort-toggle="handleSortToggle"
         />
       </div>
     </template>
@@ -274,16 +303,23 @@ watch(
       <ul
         v-if="hasChildren"
         v-show="isExpanded || hasActiveChild"
-        class="grid m-0 list-none sidebar-group-children min-w-0"
+        class="grid m-0 list-none min-w-0"
       >
-        <template v-for="child in children" :key="child.name">
+        <template v-for="child in visibleChildren" :key="child.name">
           <SidebarSubGroup
             v-if="child.children"
+            :name="`${name}:${child.name}`"
             :label="child.label"
             :icon="child.icon"
             :children="child.children"
+            :collapsible="child.collapsible"
+            :show-tree-line="child.showTreeLine"
+            :end-tree-line="child.showTreeLine && isLastVisibleChild(child)"
             :is-expanded="isExpanded"
             :active-child="activeChild"
+            :sort-options="child.sortOptions"
+            :active-sort="child.activeSort"
+            @update-sort="child.onSortChange"
           />
           <SidebarGroupLeaf
             v-else-if="isAllowed(child.to)"
@@ -299,59 +335,3 @@ watch(
     </template>
   </Policy>
 </template>
-
-<style>
-.sidebar-group-children .child-item::before {
-  content: '';
-  position: absolute;
-  width: 0.125rem;
-  /* 0.5px */
-  height: 100%;
-}
-
-.sidebar-group-children .child-item:first-child::before {
-  border-radius: 4px 4px 0 0;
-}
-
-/* This selects the last child in a group */
-/* https://codepen.io/scmmishra/pen/yLmKNLW */
-.sidebar-group-children > .child-item:last-child::before,
-.sidebar-group-children
-  > *:last-child
-  > *:last-child
-  > .child-item:last-child::before {
-  height: 20%;
-}
-
-.sidebar-group-children > .child-item:last-child::after,
-.sidebar-group-children
-  > *:last-child
-  > *:last-child
-  > .child-item:last-child::after {
-  content: '';
-  position: absolute;
-  width: 10px;
-  height: 12px;
-  bottom: calc(50% - 2px);
-  border-bottom-width: 0.125rem;
-  border-left-width: 0.125rem;
-  border-right-width: 0px;
-  border-top-width: 0px;
-  border-radius: 0 0 0 4px;
-  left: 0;
-}
-
-#app[dir='rtl'] .sidebar-group-children > .child-item:last-child::after,
-#app[dir='rtl']
-  .sidebar-group-children
-  > *:last-child
-  > *:last-child
-  > .child-item:last-child::after {
-  right: 0;
-  border-bottom-width: 0.125rem;
-  border-right-width: 0.125rem;
-  border-left-width: 0px;
-  border-top-width: 0px;
-  border-radius: 0 0 4px 0px;
-}
-</style>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroupHeader.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroupHeader.vue
index a40330f01..c59cfe85e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroupHeader.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroupHeader.vue
@@ -45,7 +45,9 @@ const count = computed(() =>
         class="size-2 -top-px ltr:-right-px rtl:-left-px bg-n-brand absolute rounded-full border border-n-solid-2"
       />
     </div>
-    <div class="flex items-center gap-1.5 flex-grow min-w-0 flex-1">
+    <div
+      class="flex items-center gap-1.5 flex-grow justify-between min-w-0 flex-1"
+    >
       <span
         class="truncate"
         :class="{
@@ -57,11 +59,7 @@ const count = computed(() =>
       </span>
       <span
         v-if="dynamicCount && !expandable"
-        class="rounded-md capitalize text-xs leading-5 font-medium text-center outline outline-1 px-1 flex-shrink-0"
-        :class="{
-          'text-n-slate-12 outline-n-slate-6': isActive,
-          'text-n-slate-11 outline-n-strong': !isActive,
-        }"
+        class="inline-grid h-5 min-w-5 place-items-center rounded-full bg-n-slate-4 px-1 text-xxs font-medium leading-3 text-n-slate-12 dark:bg-n-slate-5 flex-shrink-0"
       >
         {{ count }}
       </span>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
index 31e41a6c2..404bbe3f3 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
@@ -12,6 +12,9 @@ const props = defineProps({
   active: { type: Boolean, default: false },
   component: { type: Function, default: null },
   badgeCount: { type: [Number, String], default: 0 },
+  badgeTooltip: { type: String, default: '' },
+  hideTreeLine: { type: Boolean, default: false },
+  thinTreeLine: { type: Boolean, default: false },
 });
 
 const { resolvePermissions, resolveFeatureFlag } = useSidebarContext();
@@ -19,21 +22,30 @@ const { resolvePermissions, resolveFeatureFlag } = useSidebarContext();
 const shouldRenderComponent = computed(() => {
   return typeof props.component === 'function' || isVNode(props.component);
 });
+
+// Tree-line connector per leaf: vertical line (::before) + rounded elbow on the
+// last child (::after). Logical props (start / border-s / rounded-es)
+const TREE_CONNECTOR =
+  "child-item before:content-[''] before:absolute before:start-0 before:w-0.5 before:h-full before:bg-n-slate-4 first:before:rounded-t last:before:h-1/5 last:after:content-[''] last:after:absolute last:after:start-0 last:after:bottom-[calc(50%_-_2px)] last:after:h-3 last:after:w-2.5 last:after:border-b-2 last:after:border-s-2 last:after:rounded-es last:after:border-n-slate-4";
 </script>
 
-<!-- eslint-disable-next-line vue/no-root-v-if -->
 <template>
   <Policy
     :permissions="resolvePermissions(to)"
     :feature-flag="resolveFeatureFlag(to)"
     as="li"
-    class="py-0.5 ltr:pl-2 rtl:pr-2 rtl:mr-3 ltr:ml-3 relative text-n-slate-11 child-item before:bg-n-slate-4 after:bg-transparent after:border-n-slate-4 before:left-0 rtl:before:right-0 min-w-0"
+    class="py-0.5 ps-2 ms-3 relative text-n-slate-11 min-w-0"
+    :class="{
+      [TREE_CONNECTOR]: !hideTreeLine,
+      'before:!w-px last:after:!border-b last:after:!border-s':
+        !hideTreeLine && thinTreeLine,
+    }"
   >
     <component
       :is="to ? 'router-link' : 'div'"
       :to="to"
       :title="label"
-      class="flex h-8 items-center gap-2 px-2 py-1 rounded-lg hover:bg-gradient-to-r from-transparent via-n-slate-3/70 to-n-slate-3/70 group min-w-0"
+      class="flex h-8 items-center gap-2 px-2 py-1 rounded-lg ltr:hover:bg-gradient-to-r rtl:hover:bg-gradient-to-l from-transparent via-n-slate-3/70 to-n-slate-3/70 group min-w-0"
       :class="{
         'text-n-slate-12 bg-n-alpha-2 active': active,
       }"
@@ -41,14 +53,14 @@ const shouldRenderComponent = computed(() => {
       <component
         :is="component"
         v-if="shouldRenderComponent"
-        v-bind="{ label, icon, active, badgeCount }"
+        v-bind="{ label, icon, active, badgeCount, badgeTooltip }"
       />
       <template v-else>
         <span v-if="icon" class="size-4 grid place-content-center rounded-full">
           <Icon :icon="icon" class="size-4 inline-block" />
         </span>
         <div class="flex-1 truncate min-w-0 text-sm">{{ label }}</div>
-        <SidebarUnreadBadge :count="badgeCount" />
+        <SidebarUnreadBadge :count="badgeCount" :tooltip="badgeTooltip" />
       </template>
     </component>
   </Policy>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroupSeparator.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroupSeparator.vue
index ddc92a2b3..393a88523 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroupSeparator.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroupSeparator.vue
@@ -1,25 +1,104 @@
 <script setup>
 import Icon from 'next/icon/Icon.vue';
+import SidebarSortMenu from './SidebarSortMenu.vue';
 
 defineProps({
+  collapsible: {
+    type: Boolean,
+    default: false,
+  },
+  isExpanded: {
+    type: Boolean,
+    default: true,
+  },
   label: {
     type: String,
     default: '',
   },
   icon: {
+    type: [Object, String],
+    default: '',
+  },
+  sortOptions: {
+    type: Array,
+    default: () => [],
+  },
+  activeSort: {
     type: String,
     default: '',
   },
+  showTreeLine: {
+    type: Boolean,
+    default: false,
+  },
+  endTreeLine: {
+    type: Boolean,
+    default: false,
+  },
 });
+
+const emit = defineEmits(['toggle', 'update-sort']);
+
+const TREE_VERTICAL_LINE =
+  "before:content-[''] before:absolute before:-top-1 before:w-0.5 before:bg-n-slate-4 before:start-[-0.5rem]";
+const TREE_ELBOW =
+  "after:content-[''] after:absolute after:w-2.5 after:h-3 after:bottom-1/2 after:start-[-0.5rem] after:border-b-2 after:border-s-2 after:rounded-es after:border-n-slate-4";
 </script>
 
 <template>
-  <div
-    class="flex items-center gap-2 px-2 py-1.5 rounded-lg h-8 text-n-slate-10 select-none pointer-events-none"
-  >
-    <Icon v-if="icon" :icon="icon" class="size-4" />
-    <span class="text-sm font-medium leading-5 flex-grow">
-      {{ label }}
-    </span>
+  <div class="relative min-w-0" :class="{ 'ms-5': collapsible }">
+    <component
+      :is="collapsible ? 'button' : 'div'"
+      :type="collapsible ? 'button' : undefined"
+      :aria-expanded="collapsible ? isExpanded : undefined"
+      :title="label"
+      class="relative flex h-8 w-full min-w-0 items-center justify-between gap-2 rounded-lg px-2 py-1.5 text-n-slate-10 select-none"
+      :class="[
+        showTreeLine && TREE_VERTICAL_LINE,
+        showTreeLine &&
+          (endTreeLine ? `before:h-3 ${TREE_ELBOW}` : 'before:-bottom-1'),
+        {
+          'pointer-events-none': !collapsible,
+          'cursor-pointer hover:bg-n-alpha-2': collapsible,
+          'pe-14': collapsible && sortOptions.length,
+          'pe-8': collapsible && !sortOptions.length,
+          'pe-10': !collapsible && sortOptions.length,
+        },
+      ]"
+      @click.stop="collapsible ? emit('toggle') : undefined"
+    >
+      <div class="inline-flex min-w-0 items-center gap-2">
+        <Icon v-if="icon" :icon="icon" class="size-4 flex-shrink-0" />
+        <span
+          class="flex-grow truncate text-start text-sm font-medium leading-5"
+        >
+          {{ label }}
+        </span>
+      </div>
+    </component>
+    <div
+      v-if="collapsible || sortOptions.length"
+      class="absolute end-2 top-1/2 flex -translate-y-1/2 items-center gap-1"
+    >
+      <SidebarSortMenu
+        v-if="sortOptions.length"
+        :active-sort="activeSort"
+        :options="sortOptions"
+        @sort="sortBy => emit('update-sort', sortBy)"
+      />
+      <button
+        v-if="collapsible"
+        type="button"
+        class="flex size-6 flex-shrink-0 items-center justify-center rounded-md text-n-slate-10 hover:bg-n-alpha-2 focus-visible:bg-n-alpha-2 focus-visible:outline-none"
+        :aria-expanded="isExpanded"
+        :aria-label="label"
+        @click.stop="emit('toggle')"
+      >
+        <span
+          class="size-3 flex-shrink-0"
+          :class="isExpanded ? 'i-lucide-chevron-up' : 'i-lucide-chevron-down'"
+        />
+      </button>
+    </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue b/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
new file mode 100644
index 000000000..c4e29d881
--- /dev/null
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
@@ -0,0 +1,209 @@
+<script setup>
+import { computed, nextTick, onBeforeUnmount, ref } from 'vue';
+import { vOnClickOutside } from '@vueuse/components';
+import { useI18n } from 'vue-i18n';
+import { useDropdownPosition } from 'dashboard/composables/useDropdownPosition';
+import Button from 'dashboard/components-next/button/Button.vue';
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import TeleportWithDirection from 'dashboard/components-next/TeleportWithDirection.vue';
+import { SIDEBAR_SORT_KEYS } from 'dashboard/helper/sidebarSort';
+
+const props = defineProps({
+  activeSort: {
+    type: String,
+    default: '',
+  },
+  options: {
+    type: Array,
+    default: () => [],
+  },
+  openOnHover: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+const emit = defineEmits(['sort', 'toggle']);
+
+const SORT_OPTION_GROUPS = [
+  {
+    key: 'created',
+    options: [SIDEBAR_SORT_KEYS.CREATED_DESC, SIDEBAR_SORT_KEYS.CREATED_ASC],
+  },
+  {
+    key: 'alphabetical',
+    options: [
+      SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+      SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+    ],
+  },
+  {
+    key: 'unread_count',
+    options: [
+      SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+      SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+    ],
+  },
+];
+
+const { t } = useI18n();
+const isOpen = ref(false);
+const triggerRef = ref(null);
+const popoverRef = ref(null);
+let closeTimer;
+
+const { fixedPosition, updatePosition } = useDropdownPosition(
+  triggerRef,
+  popoverRef,
+  isOpen,
+  { align: 'start' }
+);
+
+const getSortOptionLabel = option => {
+  if (option === SIDEBAR_SORT_KEYS.CREATED_DESC) {
+    return t('SIDEBAR.SORT_OPTIONS.CREATED_DESC');
+  }
+
+  if (option === SIDEBAR_SORT_KEYS.CREATED_ASC) {
+    return t('SIDEBAR.SORT_OPTIONS.CREATED_ASC');
+  }
+
+  if (option === SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC) {
+    return t('SIDEBAR.SORT_OPTIONS.ALPHABETICAL_ASC');
+  }
+
+  if (option === SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC) {
+    return t('SIDEBAR.SORT_OPTIONS.ALPHABETICAL_DESC');
+  }
+
+  if (option === SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC) {
+    return t('SIDEBAR.SORT_OPTIONS.UNREAD_COUNT_DESC');
+  }
+
+  if (option === SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC) {
+    return t('SIDEBAR.SORT_OPTIONS.UNREAD_COUNT_ASC');
+  }
+
+  return '';
+};
+
+const getSortGroupLabel = groupKey => {
+  if (groupKey === 'created') {
+    return t('SIDEBAR.SORT_GROUPS.CREATED');
+  }
+
+  if (groupKey === 'alphabetical') {
+    return t('SIDEBAR.SORT_GROUPS.ALPHABETICAL');
+  }
+
+  if (groupKey === 'unread_count') {
+    return t('SIDEBAR.SORT_GROUPS.UNREAD_COUNT');
+  }
+
+  return '';
+};
+
+const sortMenuSections = computed(() =>
+  SORT_OPTION_GROUPS.map(group => ({
+    title: getSortGroupLabel(group.key),
+    items: group.options
+      .filter(option => props.options.includes(option))
+      .map(option => ({
+        label: getSortOptionLabel(option),
+        value: option,
+        action: 'sort',
+        isActive: option === props.activeSort,
+      })),
+  })).filter(section => section.items.length)
+);
+
+const clearCloseTimer = () => {
+  if (closeTimer) {
+    clearTimeout(closeTimer);
+    closeTimer = null;
+  }
+};
+
+const openMenu = async () => {
+  clearCloseTimer();
+  isOpen.value = true;
+  emit('toggle', true);
+
+  await nextTick();
+  updatePosition();
+};
+
+const closeMenu = () => {
+  clearCloseTimer();
+  isOpen.value = false;
+  emit('toggle', false);
+};
+
+const scheduleClose = () => {
+  clearCloseTimer();
+  closeTimer = setTimeout(closeMenu, 150);
+};
+
+const handleTriggerEnter = () => {
+  if (props.openOnHover) openMenu();
+};
+
+const handleTriggerLeave = () => {
+  if (props.openOnHover) scheduleClose();
+};
+
+const handleClickOutside = event => {
+  if (triggerRef.value?.contains(event.target)) return;
+  closeMenu();
+};
+
+const handleSortChange = ({ value }) => {
+  emit('sort', value);
+  closeMenu();
+};
+
+onBeforeUnmount(clearCloseTimer);
+</script>
+
+<template>
+  <div
+    ref="triggerRef"
+    class="relative invisible flex-shrink-0 opacity-0 pointer-events-none transition-opacity duration-150 group-hover/sidebar-section:visible group-hover/sidebar-section:opacity-100 group-hover/sidebar-section:pointer-events-auto"
+    :class="{ '!visible !opacity-100 !pointer-events-auto': isOpen }"
+    @mouseenter="handleTriggerEnter"
+    @mouseleave="handleTriggerLeave"
+  >
+    <Button
+      :title="t('SIDEBAR.SORT_TOOLTIP')"
+      icon="i-lucide-arrow-up-down"
+      ghost
+      slate
+      xs
+      class="!size-6 !text-n-slate-11 hover:!text-n-slate-12"
+      :class="{ '!bg-n-alpha-2': isOpen }"
+      @click.stop="openMenu"
+    />
+    <TeleportWithDirection>
+      <DropdownMenu
+        v-if="isOpen"
+        ref="popoverRef"
+        v-on-click-outside="handleClickOutside"
+        data-popover-content
+        :menu-sections="sortMenuSections"
+        :class="fixedPosition.class"
+        :style="fixedPosition.style"
+        class="w-60 !fixed"
+        @action="handleSortChange"
+        @mouseenter="clearCloseTimer"
+        @mouseleave="handleTriggerLeave"
+      >
+        <template #trailing-icon="{ item }">
+          <span
+            v-if="item.isActive"
+            class="i-lucide-check ms-auto size-4 flex-shrink-0 text-n-slate-11"
+          />
+        </template>
+      </DropdownMenu>
+    </TeleportWithDirection>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
index 9aae04019..82005b49a 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
@@ -1,21 +1,56 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
+import { useEventListener } from '@vueuse/core';
+import { useMapGetter } from 'dashboard/composables/store';
+import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
+import { LocalStorage } from 'shared/helpers/localStorage';
+import Icon from 'next/icon/Icon.vue';
 import SidebarGroupLeaf from './SidebarGroupLeaf.vue';
 import SidebarGroupSeparator from './SidebarGroupSeparator.vue';
 
 import { useSidebarContext } from './provider';
-import { useEventListener } from '@vueuse/core';
 
 const props = defineProps({
+  name: { type: String, required: true },
   isExpanded: { type: Boolean, default: false },
   label: { type: String, required: true },
   icon: { type: [Object, String], required: true },
   children: { type: Array, default: undefined },
   activeChild: { type: Object, default: undefined },
+  sortOptions: { type: Array, default: () => [] },
+  activeSort: { type: String, default: '' },
+  collapsible: { type: Boolean, default: false },
+  showTreeLine: { type: Boolean, default: false },
+  endTreeLine: { type: Boolean, default: false },
 });
 
+const emit = defineEmits(['update-sort']);
+
 const { isAllowed } = useSidebarContext();
 const scrollableContainer = ref(null);
+const accountId = useMapGetter('getCurrentAccountId');
+
+const minimizedSectionsKey = LOCAL_STORAGE_KEYS.SIDEBAR_MINIMIZED_SECTIONS;
+
+const getMinimizedSections = () => {
+  const minimizedSections = LocalStorage.get(minimizedSectionsKey);
+  return minimizedSections &&
+    typeof minimizedSections === 'object' &&
+    !Array.isArray(minimizedSections)
+    ? minimizedSections
+    : {};
+};
+
+const minimizedSections = ref(getMinimizedSections());
+const storageKey = computed(() =>
+  accountId.value ? `${accountId.value}:${props.name}` : props.name
+);
+const isSubGroupExpanded = computed(
+  () => !props.collapsible || !minimizedSections.value[storageKey.value]
+);
+const hasActiveChild = computed(() =>
+  props.children.some(child => child.name === props.activeChild?.name)
+);
 
 const accessibleItems = computed(() =>
   props.children.filter(child => {
@@ -28,84 +63,120 @@ const hasAccessibleItems = computed(() => {
 });
 
 const isScrollable = computed(() => {
-  return accessibleItems.value.length > 7;
+  return (
+    props.isExpanded &&
+    isSubGroupExpanded.value &&
+    accessibleItems.value.length > 7
+  );
 });
 
 const scrollEnd = ref(false);
 
+const CHILDREN_TRUNK =
+  "before:content-[''] before:absolute before:top-0 before:bottom-0 before:w-0.5 before:bg-n-slate-4 before:start-[-0.5rem]";
+
+const hideLeafTreeLine = computed(
+  () => props.showTreeLine && !props.isExpanded
+);
+
+const toggleSubGroup = () => {
+  if (!props.collapsible) return;
+
+  if (isSubGroupExpanded.value) {
+    LocalStorage.updateJsonStore(minimizedSectionsKey, storageKey.value, true);
+  } else {
+    LocalStorage.deleteFromJsonStore(minimizedSectionsKey, storageKey.value);
+  }
+
+  minimizedSections.value = getMinimizedSections();
+};
+
+const expandSubGroupOnActiveChild = () => {
+  if (!props.collapsible || !hasActiveChild.value || isSubGroupExpanded.value) {
+    return;
+  }
+
+  LocalStorage.deleteFromJsonStore(minimizedSectionsKey, storageKey.value);
+  minimizedSections.value = getMinimizedSections();
+};
+
+const shouldShowItem = child => {
+  return (
+    isSubGroupExpanded.value &&
+    (props.isExpanded || props.activeChild?.name === child.name)
+  );
+};
+
 // set scrollEnd to true when the scroll reaches the end
 useEventListener(scrollableContainer, 'scroll', () => {
   const { scrollHeight, scrollTop, clientHeight } = scrollableContainer.value;
   scrollEnd.value = scrollHeight - scrollTop === clientHeight;
 });
+
+useEventListener(window, 'storage', event => {
+  if (event.key === minimizedSectionsKey) {
+    minimizedSections.value = getMinimizedSections();
+  }
+});
+
+watch([hasActiveChild, storageKey], expandSubGroupOnActiveChild, {
+  immediate: true,
+});
 </script>
 
 <template>
-  <SidebarGroupSeparator
-    v-if="hasAccessibleItems"
-    v-show="isExpanded"
-    :label
-    :icon
-    class="my-1"
-  />
-  <ul
-    v-if="children.length"
-    class="m-0 list-none reset-base relative group min-w-0"
-  >
-    <!-- Each element has h-8, which is 32px, we will show 7 items with one hidden at the end,
-    which is 14rem. Then we add 16px so that we have some text visible from the next item  -->
-    <div
-      ref="scrollableContainer"
-      class="min-w-0"
-      :class="{
-        'max-h-[calc(14rem+16px)] overflow-y-scroll no-scrollbar': isScrollable,
-      }"
-    >
-      <SidebarGroupLeaf
-        v-for="child in children"
-        v-show="isExpanded || activeChild?.name === child.name"
-        v-bind="child"
-        :key="child.name"
-        :active="activeChild?.name === child.name"
+  <li class="group/sidebar-section relative flex flex-col list-none min-w-0">
+    <template v-if="hasAccessibleItems">
+      <SidebarGroupSeparator
+        v-show="isExpanded"
+        :label
+        :icon
+        :collapsible
+        :is-expanded="isSubGroupExpanded"
+        :show-tree-line="showTreeLine"
+        :end-tree-line="endTreeLine"
+        :sort-options="sortOptions"
+        :active-sort="activeSort"
+        class="my-1"
+        @toggle="toggleSubGroup"
+        @update-sort="sortBy => emit('update-sort', sortBy)"
       />
-    </div>
-    <div
-      v-if="isScrollable && isExpanded"
-      v-show="!scrollEnd"
-      class="absolute bg-gradient-to-t from-n-background w-full h-12 to-transparent -bottom-1 pointer-events-none flex items-end justify-end px-2 animate-fade-in-up"
-    >
-      <svg
-        width="16"
-        height="24"
-        viewBox="0 0 16 24"
-        fill="none"
-        class="text-n-slate-9 opacity-50 group-hover:opacity-100"
-        xmlns="http://www.w3.org/2000/svg"
+      <ul
+        v-if="children.length"
+        class="m-0 list-none reset-base relative group min-w-0"
+        :class="[
+          { 'ms-5': collapsible },
+          showTreeLine && !endTreeLine && CHILDREN_TRUNK,
+        ]"
       >
-        <path
-          d="M4 4L8 8L12 4"
-          stroke="currentColor"
-          opacity="0.5"
-          stroke-width="1.33333"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-        />
-        <path
-          d="M4 10L8 14L12 10"
-          stroke="currentColor"
-          opacity="0.75"
-          stroke-width="1.33333"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-        />
-        <path
-          d="M4 16L8 20L12 16"
-          stroke="currentColor"
-          stroke-width="1.33333"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-        />
-      </svg>
-    </div>
-  </ul>
+        <div
+          ref="scrollableContainer"
+          class="min-w-0"
+          :class="{
+            'max-h-60 overflow-y-scroll no-scrollbar': isScrollable,
+          }"
+        >
+          <SidebarGroupLeaf
+            v-for="child in children"
+            v-show="shouldShowItem(child)"
+            v-bind="child"
+            :key="child.name"
+            :active="activeChild?.name === child.name"
+            :hide-tree-line="hideLeafTreeLine"
+            thin-tree-line
+          />
+        </div>
+        <div
+          v-if="isScrollable && isExpanded"
+          v-show="!scrollEnd"
+          class="absolute bg-gradient-to-t from-n-background w-full h-12 to-transparent -bottom-1 pointer-events-none flex items-end justify-end px-2 animate-fade-in-up"
+        >
+          <Icon
+            icon="i-woot-chevrons-down"
+            class="w-4 h-6 text-n-slate-9 opacity-50 group-hover:opacity-100"
+          />
+        </div>
+      </ul>
+    </template>
+  </li>
 </template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarUnreadBadge.vue b/app/javascript/dashboard/components-next/sidebar/SidebarUnreadBadge.vue
index 95d95236a..2a91bfcb4 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarUnreadBadge.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarUnreadBadge.vue
@@ -3,6 +3,7 @@ import { computed } from 'vue';
 
 const props = defineProps({
   count: { type: [Number, String], default: 0 },
+  tooltip: { type: String, default: '' },
 });
 
 const normalizedCount = computed(() => {
@@ -18,6 +19,7 @@ const displayCount = computed(() =>
 <template>
   <span
     v-if="normalizedCount > 0"
+    v-tooltip.top="tooltip || null"
     data-test-id="sidebar-unread-badge"
     class="inline-grid h-5 min-w-5 place-items-center rounded-full bg-n-slate-4 px-1 text-xxs font-medium leading-3 text-n-slate-12 dark:bg-n-slate-5 flex-shrink-0"
   >
diff --git a/app/javascript/dashboard/components-next/sidebar/specs/ChannelLeaf.spec.js b/app/javascript/dashboard/components-next/sidebar/specs/ChannelLeaf.spec.js
index 03d963134..c2ee5219f 100644
--- a/app/javascript/dashboard/components-next/sidebar/specs/ChannelLeaf.spec.js
+++ b/app/javascript/dashboard/components-next/sidebar/specs/ChannelLeaf.spec.js
@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
 import ChannelLeaf from '../ChannelLeaf.vue';
+import SidebarUnreadBadge from '../SidebarUnreadBadge.vue';
 
 const mountChannelLeaf = props =>
   mount(ChannelLeaf, {
@@ -28,6 +29,17 @@ describe('ChannelLeaf', () => {
     expect(badge.text()).toBe('3');
   });
 
+  it('passes tooltip copy to unread badge', () => {
+    const wrapper = mountChannelLeaf({
+      badgeCount: 3,
+      badgeTooltip: 'Total unread conversations in this inbox',
+    });
+
+    expect(wrapper.findComponent(SidebarUnreadBadge).props('tooltip')).toBe(
+      'Total unread conversations in this inbox'
+    );
+  });
+
   it('does not render unread badge when count is zero', () => {
     const wrapper = mountChannelLeaf({ badgeCount: 0 });
 
diff --git a/app/javascript/dashboard/components-next/sidebar/specs/SidebarGroupLeaf.spec.js b/app/javascript/dashboard/components-next/sidebar/specs/SidebarGroupLeaf.spec.js
index 79b62d191..b63ca901c 100644
--- a/app/javascript/dashboard/components-next/sidebar/specs/SidebarGroupLeaf.spec.js
+++ b/app/javascript/dashboard/components-next/sidebar/specs/SidebarGroupLeaf.spec.js
@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { h } from 'vue';
 import SidebarGroupLeaf from '../SidebarGroupLeaf.vue';
+import SidebarUnreadBadge from '../SidebarUnreadBadge.vue';
 
 vi.mock('../provider', () => ({
   useSidebarContext: () => ({
@@ -44,6 +45,17 @@ describe('SidebarGroupLeaf', () => {
     expect(badge.text()).toBe('7');
   });
 
+  it('passes tooltip copy to unread badge', () => {
+    const wrapper = mountLeaf({
+      badgeCount: 7,
+      badgeTooltip: 'Total unread conversations in this label',
+    });
+
+    expect(wrapper.findComponent(SidebarUnreadBadge).props('tooltip')).toBe(
+      'Total unread conversations in this label'
+    );
+  });
+
   it('does not render unread badge when count is zero', () => {
     const wrapper = mountLeaf({ badgeCount: 0 });
 
@@ -63,14 +75,17 @@ describe('SidebarGroupLeaf', () => {
   it('passes unread count to custom leaf components', () => {
     const wrapper = mountLeaf({
       badgeCount: 4,
+      badgeTooltip: 'Total unread conversations in this inbox',
       component: leafProps =>
         h(
           'span',
           { 'data-test-id': 'custom-leaf-count' },
-          leafProps.badgeCount
+          `${leafProps.badgeCount}:${leafProps.badgeTooltip}`
         ),
     });
 
-    expect(wrapper.find('[data-test-id="custom-leaf-count"]').text()).toBe('4');
+    expect(wrapper.find('[data-test-id="custom-leaf-count"]').text()).toBe(
+      '4:Total unread conversations in this inbox'
+    );
   });
 });
diff --git a/app/javascript/dashboard/components-next/sidebar/specs/SidebarSubGroup.spec.js b/app/javascript/dashboard/components-next/sidebar/specs/SidebarSubGroup.spec.js
new file mode 100644
index 000000000..ccede5d65
--- /dev/null
+++ b/app/javascript/dashboard/components-next/sidebar/specs/SidebarSubGroup.spec.js
@@ -0,0 +1,172 @@
+import { mount } from '@vue/test-utils';
+import { ref } from 'vue';
+import SidebarSubGroup from '../SidebarSubGroup.vue';
+import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
+import { provideSidebarContext } from '../provider';
+
+vi.mock('dashboard/composables/store', () => ({
+  useMapGetter: () => ref(1),
+}));
+
+vi.mock('dashboard/composables/usePolicy', () => ({
+  usePolicy: () => ({
+    shouldShow: () => true,
+  }),
+}));
+
+vi.mock('vue-router', () => ({
+  useRouter: () => ({
+    resolve: () => ({ path: '/' }),
+    getRoutes: () => [],
+  }),
+}));
+
+const children = [
+  {
+    name: 'Sales-1',
+    label: 'Sales',
+    to: { name: 'team_conversations' },
+  },
+];
+
+const mountSubGroup = props => {
+  return mount(
+    {
+      components: { SidebarSubGroup },
+      setup() {
+        provideSidebarContext({});
+      },
+      template: '<SidebarSubGroup v-bind="$attrs" />',
+    },
+    {
+      attrs: {
+        name: 'Conversation:Teams',
+        label: 'Teams',
+        icon: 'i-lucide-users',
+        children,
+        isExpanded: true,
+        collapsible: true,
+        ...props,
+      },
+      global: {
+        stubs: {
+          SidebarGroupLeaf: {
+            props: {
+              label: { type: String, required: true },
+              hideTreeLine: { type: Boolean, default: false },
+              thinTreeLine: { type: Boolean, default: false },
+            },
+            template:
+              '<li class="sidebar-leaf" :data-hide-tree-line="String(hideTreeLine)" :data-thin-tree-line="String(thinTreeLine)">{{ label }}</li>',
+          },
+        },
+      },
+    }
+  );
+};
+
+describe('SidebarSubGroup', () => {
+  let localStorageStore;
+
+  beforeEach(() => {
+    localStorageStore = {};
+    Object.defineProperty(window, 'localStorage', {
+      value: {
+        getItem: key => localStorageStore[key] || null,
+        setItem: (key, value) => {
+          localStorageStore[key] = String(value);
+        },
+        removeItem: key => {
+          delete localStorageStore[key];
+        },
+        clear: () => {
+          localStorageStore = {};
+        },
+      },
+      configurable: true,
+    });
+
+    window.localStorage.clear();
+  });
+
+  it('keeps collapsible sections expanded by default', () => {
+    const wrapper = mountSubGroup();
+
+    expect(wrapper.find('button').attributes('aria-expanded')).toBe('true');
+    expect(wrapper.find('.sidebar-leaf').isVisible()).toBe(true);
+  });
+
+  it('renders the tree line on the separator, positioned relative to it', () => {
+    const wrapper = mountSubGroup({ showTreeLine: true });
+    const button = wrapper.find('button');
+
+    expect(button.classes()).toContain('relative');
+    expect(button.classes()).toContain('before:bg-n-slate-4');
+    expect(button.classes()).toContain('before:-bottom-1');
+  });
+
+  it('renders the end curve on the last separator', () => {
+    const wrapper = mountSubGroup({ showTreeLine: true, endTreeLine: true });
+    const button = wrapper.find('button');
+
+    expect(button.classes()).toContain('before:h-3');
+    expect(button.classes()).toContain('after:border-b-2');
+  });
+
+  it('draws nested item tree lines via the leaf connectors', () => {
+    const wrapper = mountSubGroup({ showTreeLine: true });
+
+    expect(
+      wrapper.find('.sidebar-leaf').attributes('data-hide-tree-line')
+    ).toBe('false');
+  });
+
+  it('marks nested item connectors as thin', () => {
+    const wrapper = mountSubGroup({ showTreeLine: true });
+
+    expect(
+      wrapper.find('.sidebar-leaf').attributes('data-thin-tree-line')
+    ).toBe('true');
+  });
+
+  it('minimizes the section and stores it by account and section name', async () => {
+    const wrapper = mountSubGroup();
+
+    await wrapper.find('button').trigger('click');
+
+    const storedSections = JSON.parse(
+      window.localStorage.getItem(LOCAL_STORAGE_KEYS.SIDEBAR_MINIMIZED_SECTIONS)
+    );
+    expect(wrapper.find('button').attributes('aria-expanded')).toBe('false');
+    expect(wrapper.find('.sidebar-leaf').isVisible()).toBe(false);
+    expect(storedSections).toEqual({ '1:Conversation:Teams': true });
+  });
+
+  it('uses the stored minimized state when mounted again', () => {
+    window.localStorage.setItem(
+      LOCAL_STORAGE_KEYS.SIDEBAR_MINIMIZED_SECTIONS,
+      JSON.stringify({ '1:Conversation:Teams': true })
+    );
+
+    const wrapper = mountSubGroup();
+
+    expect(wrapper.find('button').attributes('aria-expanded')).toBe('false');
+    expect(wrapper.find('.sidebar-leaf').isVisible()).toBe(false);
+  });
+
+  it('expands a stored minimized section when one of its children is active', () => {
+    window.localStorage.setItem(
+      LOCAL_STORAGE_KEYS.SIDEBAR_MINIMIZED_SECTIONS,
+      JSON.stringify({ '1:Conversation:Teams': true })
+    );
+
+    const wrapper = mountSubGroup({ activeChild: children[0] });
+
+    const storedSections = JSON.parse(
+      window.localStorage.getItem(LOCAL_STORAGE_KEYS.SIDEBAR_MINIMIZED_SECTIONS)
+    );
+    expect(wrapper.find('button').attributes('aria-expanded')).toBe('true');
+    expect(wrapper.find('.sidebar-leaf').isVisible()).toBe(true);
+    expect(storedSections).toEqual({});
+  });
+});
diff --git a/app/javascript/dashboard/components-next/tabbar/TabBar.vue b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
index 6840bc9a9..301f51e07 100644
--- a/app/javascript/dashboard/components-next/tabbar/TabBar.vue
+++ b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
@@ -81,6 +81,7 @@ const showDivider = index => {
     <template v-for="(tab, index) in tabs" :key="index">
       <button
         :ref="el => (tabRefs[index] = el)"
+        type="button"
         class="relative z-10 px-4 truncate py-1.5 text-sm border-0 outline-1 outline-transparent rounded-lg transition-all duration-200 ease-out hover:text-n-brand active:scale-[1.02]"
         :class="[
           activeTab === index
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index c96716c5d..39fe35f3d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -308,6 +308,15 @@ function filterByAssigneeTab(conversations) {
   return [...conversations];
 }
 
+function sortByUnreadStatus(conversations) {
+  return [...conversations].sort((a, b) => {
+    const unreadCountDiff = (b.unread_count || 0) - (a.unread_count || 0);
+    if (unreadCountDiff !== 0) return unreadCountDiff;
+
+    return (b.last_activity_at || 0) - (a.last_activity_at || 0);
+  });
+}
+
 const conversationList = computed(() => {
   let localConversationList = [];
 
@@ -337,6 +346,13 @@ const conversationList = computed(() => {
     });
   }
 
+  if (
+    !hasAppliedFiltersOrActiveFolders.value &&
+    activeSortBy.value === wootConstants.SORT_BY_TYPE.UNREAD
+  ) {
+    localConversationList = sortByUnreadStatus(localConversationList);
+  }
+
   return localConversationList;
 });
 
diff --git a/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
new file mode 100644
index 000000000..a3eed7184
--- /dev/null
+++ b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
@@ -0,0 +1,141 @@
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { format, parseISO } from 'date-fns';
+
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  sessions: {
+    type: Array,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['revoke', 'revokeAll', 'cancel']);
+
+const { t } = useI18n();
+const revokingId = ref(null);
+const revokingAll = ref(false);
+
+const sortedSessions = computed(() =>
+  [...props.sessions].sort(
+    (a, b) => new Date(b.created_at) - new Date(a.created_at)
+  )
+);
+
+const formatDate = dateStr => {
+  if (!dateStr) return '';
+  return format(parseISO(dateStr), 'MMMM d, yyyy');
+};
+
+const formatTime = dateStr => {
+  if (!dateStr) return '';
+  return format(parseISO(dateStr), 'hh:mma');
+};
+
+const isUnknown = val => !val || val === 'Unknown' || val === 'Unknown Browser';
+
+const sessionLabel = session => {
+  const parts = [];
+  if (!isUnknown(session.browser_name)) parts.push(session.browser_name);
+  if (!isUnknown(session.platform_name)) parts.push(session.platform_name);
+  return parts.join(' on ') || t('SESSION_LIMIT.UNKNOWN_DEVICE');
+};
+
+watch(
+  () => props.sessions,
+  () => {
+    revokingId.value = null;
+    revokingAll.value = false;
+  }
+);
+
+const handleRevoke = session => {
+  revokingId.value = session.id;
+  emit('revoke', session.id);
+};
+
+const handleRevokeAll = () => {
+  revokingAll.value = true;
+  emit('revokeAll');
+};
+</script>
+
+<template>
+  <div class="w-full max-w-lg mx-auto">
+    <div
+      class="bg-white shadow dark:bg-n-solid-2 p-11 sm:shadow-lg sm:rounded-lg"
+    >
+      <!-- Header -->
+      <div class="flex items-start justify-between gap-4 mb-6">
+        <div>
+          <h2 class="text-2xl font-semibold text-n-slate-12">
+            {{ $t('SESSION_LIMIT.TITLE') }}
+          </h2>
+          <p class="text-sm text-n-slate-11 mt-2">
+            {{ $t('SESSION_LIMIT.DESCRIPTION') }}
+          </p>
+        </div>
+        <NextButton
+          type="button"
+          faded
+          sm
+          class="flex-shrink-0 whitespace-nowrap"
+          :label="$t('SESSION_LIMIT.END_ALL')"
+          :is-loading="revokingAll"
+          :disabled="revokingId !== null"
+          @click="handleRevokeAll"
+        />
+      </div>
+
+      <!-- Session List -->
+      <div class="flex flex-col gap-3 max-h-80 overflow-y-auto">
+        <div
+          v-for="session in sortedSessions"
+          :key="session.id"
+          class="flex items-center justify-between gap-4 rounded-xl border border-n-slate-4 bg-n-background px-4 py-3"
+        >
+          <div class="flex items-center gap-3 min-w-0">
+            <Icon
+              icon="i-lucide-monitor"
+              class="size-4 text-n-slate-10 flex-shrink-0"
+            />
+            <div class="flex flex-col gap-0.5 min-w-0">
+              <span class="text-sm font-medium text-n-slate-12">
+                {{ sessionLabel(session) }}
+              </span>
+              <span class="text-xs text-n-slate-10">
+                {{
+                  `${$t('SESSION_LIMIT.STARTED')} ${formatDate(session.created_at)}, ${formatTime(session.created_at)}`
+                }}
+              </span>
+            </div>
+          </div>
+          <button
+            type="button"
+            class="text-sm font-medium text-n-slate-11 hover:text-n-slate-12 flex-shrink-0 disabled:opacity-50"
+            :disabled="revokingId !== null || revokingAll"
+            @click="handleRevoke(session)"
+          >
+            {{ $t('SESSION_LIMIT.END') }}
+          </button>
+        </div>
+      </div>
+
+      <!-- Cancel -->
+      <div class="text-center pt-4">
+        <NextButton
+          sm
+          slate
+          link
+          type="button"
+          class="w-full hover:!no-underline"
+          :label="$t('SESSION_LIMIT.CANCEL')"
+          @click="() => emit('cancel')"
+        />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index fa1563ed8..38e85b485 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -78,6 +78,10 @@ const chatSortOptions = computed(() => [
     label: t('CHAT_LIST.SORT_ORDER_ITEMS.created_at_asc.TEXT'),
     value: 'created_at_asc',
   },
+  {
+    label: t('CHAT_LIST.SORT_ORDER_ITEMS.unread.TEXT'),
+    value: 'unread',
+  },
   {
     label: t('CHAT_LIST.SORT_ORDER_ITEMS.priority_desc.TEXT'),
     value: 'priority_desc',
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index fc93ff2c7..6af876cc6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -56,8 +56,9 @@ import { isFileTypeAllowedForChannel } from 'shared/helpers/FileHelper';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
 import { LocalStorage } from 'shared/helpers/localStorage';
 import { emitter } from 'shared/helpers/mitt';
-const EmojiInput = defineAsyncComponent(
-  () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+  () =>
+    import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
 );
 
 export default {
@@ -66,7 +67,7 @@ export default {
     AttachmentPreview,
     AudioRecorder,
     ReplyBoxBanner,
-    EmojiInput,
+    EmojiIconPicker,
     MessageSignatureMissingAlert,
     ReplyBottomPanel,
     ReplyEmailHead,
@@ -1284,13 +1285,15 @@ export default {
           :message="inReplyTo"
           @dismiss="resetReplyToMessage"
         />
-        <EmojiInput
+        <EmojiIconPicker
           v-if="showEmojiPicker"
           v-on-clickaway="hideEmojiPicker"
+          mode="emoji"
+          class="emoji-dialog"
           :class="{
             'emoji-dialog--expanded': isOnExpandedLayout,
           }"
-          :on-click="addIntoEditor"
+          @select="addIntoEditor($event.value)"
         />
         <ReplyEmailHead
           v-if="showReplyHead && isDefaultEditorMode"
diff --git a/app/javascript/dashboard/composables/spec/useFacebookPageConnect.spec.js b/app/javascript/dashboard/composables/spec/useFacebookPageConnect.spec.js
index 5d9edb993..4ec17e753 100644
--- a/app/javascript/dashboard/composables/spec/useFacebookPageConnect.spec.js
+++ b/app/javascript/dashboard/composables/spec/useFacebookPageConnect.spec.js
@@ -70,7 +70,8 @@ describe('useFacebookPageConnect', () => {
       ACCOUNT_ID
     );
     expect(window.FB.login).toHaveBeenCalledWith(expect.any(Function), {
-      scope: expect.stringContaining('pages_show_list'),
+      scope:
+        'pages_manage_metadata,business_management,pages_messaging,pages_show_list,pages_read_engagement',
     });
   });
 
diff --git a/app/javascript/dashboard/composables/useFacebookPageConnect.js b/app/javascript/dashboard/composables/useFacebookPageConnect.js
index 46a177d58..dbe06dd0d 100644
--- a/app/javascript/dashboard/composables/useFacebookPageConnect.js
+++ b/app/javascript/dashboard/composables/useFacebookPageConnect.js
@@ -1,13 +1,9 @@
 import { ref } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
 import ChannelApi from 'dashboard/api/channels';
+import { buildFacebookLoginScopes } from 'dashboard/helper/facebookScopes';
 import { setupFacebookSdk } from 'dashboard/routes/dashboard/settings/inbox/channels/whatsapp/utils';
 
-// Page-management + messaging scopes required to list pages and create a
-// Channel::FacebookPage inbox (mirrors the standalone settings flow).
-const FB_PAGE_SCOPES =
-  'pages_manage_metadata,business_management,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages';
-
 // Headless half of the Facebook Page connect flow: load the Meta SDK, run
 // FB.login for page scopes, and fetch the user's pages. The caller owns the
 // page-picker UI and the channel creation, because choosing a page is an
@@ -51,7 +47,7 @@ export function useFacebookPageConnect() {
               : null
           );
         },
-        { scope: FB_PAGE_SCOPES }
+        { scope: buildFacebookLoginScopes() }
       );
     });
 
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 889ece96a..24c0f07b1 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -27,6 +27,7 @@ export default {
     WAITING_SINCE_ASC: 'waiting_since_asc',
     WAITING_SINCE_DESC: 'waiting_since_desc',
     PRIORITY_DESC_CREATED_AT_ASC: 'priority_desc_created_at_asc',
+    UNREAD: 'unread',
   },
   ARTICLE_STATUS_TYPES: {
     DRAFT: 0,
diff --git a/app/javascript/dashboard/constants/localStorage.js b/app/javascript/dashboard/constants/localStorage.js
index 29aa4da77..ef1578af8 100644
--- a/app/javascript/dashboard/constants/localStorage.js
+++ b/app/javascript/dashboard/constants/localStorage.js
@@ -7,4 +7,5 @@ export const LOCAL_STORAGE_KEYS = {
   DISMISSED_LABEL_SUGGESTIONS: 'labelSuggestionsDismissed',
   MESSAGE_REPLY_TO: 'messageReplyTo',
   RECENT_SEARCHES: 'recentSearches',
+  SIDEBAR_MINIMIZED_SECTIONS: 'sidebarMinimizedSections',
 };
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 6dc47cfbf..58d2821ef 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -154,6 +154,11 @@ export const YEAR_IN_REVIEW_EVENTS = Object.freeze({
   SHARE_CLICKED: 'Year in Review: Share clicked',
 });
 
+export const SESSION_EVENTS = Object.freeze({
+  LIMIT_HIT: 'Session limit reached at login',
+  REVOKED_FROM_PROFILE: 'Revoked an active session',
+});
+
 export const ONBOARDING_EVENTS = Object.freeze({
   ACCOUNT_DETAILS_VISITED: 'Onboarding: Account details visited',
   ACCOUNT_DETAILS_COMPLETED: 'Onboarding: Account details completed',
diff --git a/app/javascript/dashboard/helper/facebookScopes.js b/app/javascript/dashboard/helper/facebookScopes.js
new file mode 100644
index 000000000..755b3f465
--- /dev/null
+++ b/app/javascript/dashboard/helper/facebookScopes.js
@@ -0,0 +1,22 @@
+export const FACEBOOK_PAGE_SCOPES = [
+  'pages_manage_metadata',
+  'business_management',
+  'pages_messaging',
+  'pages_show_list',
+  'pages_read_engagement',
+];
+
+export const INSTAGRAM_SCOPES = [
+  'instagram_basic',
+  'instagram_manage_messages',
+];
+
+export const buildFacebookLoginScopes = ({
+  includeInstagramScopes = false,
+} = {}) => {
+  const scopes = [...FACEBOOK_PAGE_SCOPES];
+  if (includeInstagramScopes) {
+    scopes.push(...INSTAGRAM_SCOPES);
+  }
+  return scopes.join(',');
+};
diff --git a/app/javascript/dashboard/helper/sidebarSort.js b/app/javascript/dashboard/helper/sidebarSort.js
new file mode 100644
index 000000000..801dd94e2
--- /dev/null
+++ b/app/javascript/dashboard/helper/sidebarSort.js
@@ -0,0 +1,181 @@
+export const SIDEBAR_SORT_KEYS = Object.freeze({
+  CREATED_DESC: 'created_at_desc',
+  CREATED_ASC: 'created_at_asc',
+  ALPHABETICAL_ASC: 'alphabetical_asc',
+  ALPHABETICAL_DESC: 'alphabetical_desc',
+  UNREAD_COUNT_DESC: 'unread_count_desc',
+  UNREAD_COUNT_ASC: 'unread_count_asc',
+});
+
+export const SIDEBAR_SORT_SECTIONS = Object.freeze({
+  FOLDERS: 'folders',
+  TEAMS: 'teams',
+  CHANNELS: 'channels',
+  LABELS: 'labels',
+});
+
+export const SIDEBAR_SORT_OPTIONS_BY_SECTION = Object.freeze({
+  [SIDEBAR_SORT_SECTIONS.FOLDERS]: [
+    SIDEBAR_SORT_KEYS.CREATED_DESC,
+    SIDEBAR_SORT_KEYS.CREATED_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+  ],
+  [SIDEBAR_SORT_SECTIONS.TEAMS]: [
+    SIDEBAR_SORT_KEYS.CREATED_DESC,
+    SIDEBAR_SORT_KEYS.CREATED_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+  ],
+  [SIDEBAR_SORT_SECTIONS.CHANNELS]: [
+    SIDEBAR_SORT_KEYS.CREATED_DESC,
+    SIDEBAR_SORT_KEYS.CREATED_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+  ],
+  [SIDEBAR_SORT_SECTIONS.LABELS]: [
+    SIDEBAR_SORT_KEYS.CREATED_DESC,
+    SIDEBAR_SORT_KEYS.CREATED_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+    SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+    SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+  ],
+});
+
+const UNREAD_COUNT_SORT_OPTIONS = [
+  SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+  SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+];
+
+export const DEFAULT_SIDEBAR_SORT_PREFERENCES = Object.freeze({
+  [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.CREATED_DESC,
+  [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+  [SIDEBAR_SORT_SECTIONS.CHANNELS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+  [SIDEBAR_SORT_SECTIONS.LABELS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+});
+
+export const isValidSidebarSort = (section, sortBy) => {
+  return SIDEBAR_SORT_OPTIONS_BY_SECTION[section]?.includes(sortBy);
+};
+
+const isUnreadCountSort = sortBy => UNREAD_COUNT_SORT_OPTIONS.includes(sortBy);
+
+export const getSidebarSortOptions = (
+  section,
+  { hasUnreadCounts = true } = {}
+) => {
+  const options = SIDEBAR_SORT_OPTIONS_BY_SECTION[section] || [];
+
+  if (hasUnreadCounts) return options;
+
+  return options.filter(option => !isUnreadCountSort(option));
+};
+
+export const resolveSidebarSort = (
+  section,
+  sortBy,
+  { hasUnreadCounts = true } = {}
+) => {
+  const options = getSidebarSortOptions(section, { hasUnreadCounts });
+
+  if (options.includes(sortBy)) return sortBy;
+  if (!hasUnreadCounts && isUnreadCountSort(sortBy)) {
+    return SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+  }
+
+  return options[0] || SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+};
+
+export const normalizeSidebarSortPreferences = (preferences = {}) => {
+  const savedPreferences = preferences || {};
+
+  return Object.keys(DEFAULT_SIDEBAR_SORT_PREFERENCES).reduce(
+    (result, section) => {
+      const sortBy = savedPreferences[section];
+      result[section] = isValidSidebarSort(section, sortBy)
+        ? sortBy
+        : DEFAULT_SIDEBAR_SORT_PREFERENCES[section];
+      return result;
+    },
+    {}
+  );
+};
+
+const normalizeUnreadCount = count => {
+  const unreadCount = Number(count);
+  return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0;
+};
+
+const getCreatedValue = item => {
+  const createdAt = item.created_at || item.createdAt;
+
+  if (typeof createdAt === 'number') return createdAt;
+
+  if (createdAt) {
+    const timestamp = Date.parse(createdAt);
+    if (Number.isFinite(timestamp)) return timestamp;
+  }
+
+  const id = Number(item.id);
+  return Number.isFinite(id) ? id : 0;
+};
+
+const getLabelValue = (item, labelKey) => {
+  return String(labelKey(item) || '');
+};
+
+const compareAlphabetically = (a, b, labelKey) => {
+  return getLabelValue(a, labelKey).localeCompare(
+    getLabelValue(b, labelKey),
+    undefined,
+    {
+      sensitivity: 'base',
+    }
+  );
+};
+
+export const sortSidebarItems = (
+  items,
+  { sortBy, labelKey, unreadCountKey = () => 0 }
+) => {
+  return (items || []).slice().sort((a, b) => {
+    if (sortBy === SIDEBAR_SORT_KEYS.CREATED_DESC) {
+      const createdDiff = getCreatedValue(b) - getCreatedValue(a);
+      if (createdDiff !== 0) return createdDiff;
+      return compareAlphabetically(a, b, labelKey);
+    }
+
+    if (sortBy === SIDEBAR_SORT_KEYS.CREATED_ASC) {
+      const createdDiff = getCreatedValue(a) - getCreatedValue(b);
+      if (createdDiff !== 0) return createdDiff;
+      return compareAlphabetically(a, b, labelKey);
+    }
+
+    if (sortBy === SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC) {
+      return compareAlphabetically(b, a, labelKey);
+    }
+
+    if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC) {
+      const unreadCountDiff =
+        normalizeUnreadCount(unreadCountKey(b)) -
+        normalizeUnreadCount(unreadCountKey(a));
+
+      if (unreadCountDiff !== 0) return unreadCountDiff;
+    }
+
+    if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC) {
+      const unreadCountDiff =
+        normalizeUnreadCount(unreadCountKey(a)) -
+        normalizeUnreadCount(unreadCountKey(b));
+
+      if (unreadCountDiff !== 0) return unreadCountDiff;
+    }
+
+    return compareAlphabetically(a, b, labelKey);
+  });
+};
diff --git a/app/javascript/dashboard/helper/specs/sidebarSort.spec.js b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
new file mode 100644
index 000000000..3919252c2
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
@@ -0,0 +1,205 @@
+import {
+  DEFAULT_SIDEBAR_SORT_PREFERENCES,
+  SIDEBAR_SORT_KEYS,
+  SIDEBAR_SORT_SECTIONS,
+  getSidebarSortOptions,
+  normalizeSidebarSortPreferences,
+  resolveSidebarSort,
+  sortSidebarItems,
+} from '../sidebarSort';
+
+const items = [
+  {
+    id: 1,
+    name: 'Billing',
+    created_at: '2024-01-01T00:00:00.000Z',
+  },
+  {
+    id: 3,
+    name: 'Accounts',
+    created_at: '2024-03-01T00:00:00.000Z',
+  },
+  {
+    id: 2,
+    name: 'Support',
+    created_at: '2024-02-01T00:00:00.000Z',
+  },
+];
+
+describe('#sortSidebarItems', () => {
+  it('sorts by created date descending', () => {
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+      labelKey: item => item.name,
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Accounts',
+      'Support',
+      'Billing',
+    ]);
+  });
+
+  it('sorts by created date ascending', () => {
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.CREATED_ASC,
+      labelKey: item => item.name,
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Billing',
+      'Support',
+      'Accounts',
+    ]);
+  });
+
+  it('falls back to id when created date is not present', () => {
+    const sortedItems = sortSidebarItems(
+      items.map(({ created_at: _createdAt, ...item }) => item),
+      {
+        sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+        labelKey: item => item.name,
+      }
+    );
+
+    expect(sortedItems.map(item => item.id)).toEqual([3, 2, 1]);
+  });
+
+  it('sorts alphabetically from A to Z', () => {
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+      labelKey: item => item.name,
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Accounts',
+      'Billing',
+      'Support',
+    ]);
+  });
+
+  it('sorts alphabetically from Z to A', () => {
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+      labelKey: item => item.name,
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Support',
+      'Billing',
+      'Accounts',
+    ]);
+  });
+
+  it('sorts by unread count descending and falls back to alphabetical order', () => {
+    const unreadCounts = {
+      1: 3,
+      2: 3,
+      3: 7,
+    };
+
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+      labelKey: item => item.name,
+      unreadCountKey: item => unreadCounts[item.id],
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Accounts',
+      'Billing',
+      'Support',
+    ]);
+  });
+
+  it('sorts by unread count ascending and falls back to alphabetical order', () => {
+    const unreadCounts = {
+      1: 3,
+      2: 3,
+      3: 7,
+    };
+
+    const sortedItems = sortSidebarItems(items, {
+      sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+      labelKey: item => item.name,
+      unreadCountKey: item => unreadCounts[item.id],
+    });
+
+    expect(sortedItems.map(item => item.name)).toEqual([
+      'Billing',
+      'Support',
+      'Accounts',
+    ]);
+  });
+});
+
+describe('#normalizeSidebarSortPreferences', () => {
+  it('keeps valid preferences', () => {
+    const preferences = normalizeSidebarSortPreferences({
+      [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+      [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+    });
+
+    expect(preferences).toEqual({
+      ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+      [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+      [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+    });
+  });
+
+  it('falls back to defaults for unsupported preferences', () => {
+    const preferences = normalizeSidebarSortPreferences({
+      [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+    });
+
+    expect(preferences).toEqual(DEFAULT_SIDEBAR_SORT_PREFERENCES);
+  });
+
+  it('falls back to defaults when stored preferences are null', () => {
+    expect(normalizeSidebarSortPreferences(null)).toEqual(
+      DEFAULT_SIDEBAR_SORT_PREFERENCES
+    );
+  });
+});
+
+describe('#getSidebarSortOptions', () => {
+  it('keeps unread count options when unread counts are enabled', () => {
+    const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+      hasUnreadCounts: true,
+    });
+
+    expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+    expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+  });
+
+  it('removes unread count options when unread counts are disabled', () => {
+    const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+      hasUnreadCounts: false,
+    });
+
+    expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+    expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+    expect(options).toContain(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+  });
+});
+
+describe('#resolveSidebarSort', () => {
+  it('keeps unread count sort when unread counts are enabled', () => {
+    const sortBy = resolveSidebarSort(
+      SIDEBAR_SORT_SECTIONS.TEAMS,
+      SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+      { hasUnreadCounts: true }
+    );
+
+    expect(sortBy).toBe(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+  });
+
+  it('falls back to alphabetical sort when unread counts are disabled', () => {
+    const sortBy = resolveSidebarSort(
+      SIDEBAR_SORT_SECTIONS.TEAMS,
+      SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+      { hasUnreadCounts: false }
+    );
+
+    expect(sortBy).toBe(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index 1384dae2b..45755892d 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -79,6 +79,9 @@
       },
       "priority_desc_created_at_asc": {
         "TEXT": "Priority: Highest first, Created: Oldest first"
+      },
+      "unread": {
+        "TEXT": "Unread Count: Highest first"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/en/companies.json b/app/javascript/dashboard/i18n/locale/en/companies.json
index 534205038..d4cd0b72f 100644
--- a/app/javascript/dashboard/i18n/locale/en/companies.json
+++ b/app/javascript/dashboard/i18n/locale/en/companies.json
@@ -25,6 +25,10 @@
     "ACTIONS": {
       "CREATE": "Add company"
     },
+    "SELECTOR": {
+      "PLACEHOLDER": "Select company",
+      "CREATE_OPTION": "Add \"{name}\""
+    },
     "CREATE": {
       "TITLE": "Add company details",
       "ACTIONS": {
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 8d0b73dfc..1a10b253f 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -511,6 +511,7 @@
         "ATTRIBUTES": "Attributes",
         "HISTORY": "History",
         "NOTES": "Notes",
+        "MEDIA": "Media",
         "MERGE": "Merge"
       },
       "HISTORY": {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 3eb83fd31..045b8d0d9 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -401,7 +401,8 @@
       "VIEW_ALL": "View all",
       "SHOW_LESS": "Show less",
       "MORE_COUNT": "+{count}",
-      "UNTITLED_FILE": "Untitled file"
+      "UNTITLED_FILE": "Untitled file",
+      "JUMP_TO_MESSAGE": "Jump to message"
     },
     "SHOPIFY": {
       "ORDER_ID": "Order #{id}",
diff --git a/app/javascript/dashboard/i18n/locale/en/emoji.json b/app/javascript/dashboard/i18n/locale/en/emoji.json
index d5b96f0f9..f5572d569 100644
--- a/app/javascript/dashboard/i18n/locale/en/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/en/emoji.json
@@ -3,5 +3,33 @@
     "PLACEHOLDER": "Search emojis",
     "NOT_FOUND": "No emoji match your search",
     "REMOVE": "Remove"
+  },
+  "EMOJI_ICON_PICKER": {
+    "TABS": {
+      "ICONS": "Icons",
+      "EMOJIS": "Emojis"
+    },
+    "SEARCH_EMOJI": "Search emoji…",
+    "SEARCH_ICON": "Search icons…",
+    "FREQUENTLY_USED": "Frequently used",
+    "NO_EMOJI": "No emoji match your search",
+    "NO_ICON": "No icons match your search",
+    "REMOVE": "Remove",
+    "STYLE": {
+      "OUTLINE": "Outline icons",
+      "FILLED": "Filled icons"
+    },
+    "COLORS": {
+      "SLATE": "Slate",
+      "RED": "Red",
+      "ORANGE": "Orange",
+      "AMBER": "Amber",
+      "GREEN": "Green",
+      "TEAL": "Teal",
+      "BLUE": "Blue",
+      "INDIGO": "Indigo",
+      "VIOLET": "Violet",
+      "PINK": "Pink"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index cd7e46330..574cf5b9b 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -653,6 +653,10 @@
       },
       "CREDENTIALS": {
         "DESCRIPTION": "Voice calling requires Twilio API Key credentials. These are used to generate tokens for agent voice connections."
+      },
+      "INBOUND": {
+        "LABEL": "Allow incoming calls",
+        "DESCRIPTION": "Let customers call this number. When turned off, incoming calls are declined automatically — agents aren't notified and no conversation is created. Agents can still place outgoing calls."
       }
     },
     "WHATSAPP_CALLING": {
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 31486a247..12db16ba7 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -40,6 +40,7 @@ import whatsappTemplates from './whatsappTemplates.json';
 import contentTemplates from './contentTemplates.json';
 import mfa from './mfa.json';
 import onboarding from './onboarding.json';
+import sessionLimit from './sessionLimit.json';
 import yearInReview from './yearInReview.json';
 
 export default {
@@ -85,5 +86,6 @@ export default {
   ...contentTemplates,
   ...mfa,
   ...onboarding,
+  ...sessionLimit,
   ...yearInReview,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/sessionLimit.json b/app/javascript/dashboard/i18n/locale/en/sessionLimit.json
new file mode 100644
index 000000000..926745c23
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/sessionLimit.json
@@ -0,0 +1,12 @@
+{
+  "SESSION_LIMIT": {
+    "TITLE": "Active session limit reached",
+    "DESCRIPTION": "You have reached your limit of active sessions. Please end a session before logging in.",
+    "END": "End",
+    "END_ALL": "End all sessions",
+    "LOG_IN": "Log in",
+    "CANCEL": "Back to login",
+    "UNKNOWN_DEVICE": "Unknown device",
+    "STARTED": "Started"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index bfbd920a7..9afe4f963 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -86,6 +86,17 @@
         "NOTE": "Manage additional security features for your account.",
         "MFA_BUTTON": "Manage Two-Factor Authentication"
       },
+      "SESSIONS_SECTION": {
+        "TITLE": "Active Sessions",
+        "NOTE": "These are the devices currently logged in to your account.",
+        "CURRENT": "Current session",
+        "REVOKE": "Revoke",
+        "REVOKE_SUCCESS": "Session revoked successfully",
+        "REVOKE_ERROR": "Unable to revoke session. Please try again.",
+        "FETCH_ERROR": "Unable to fetch sessions. Please try again.",
+        "LAST_ACTIVE": "Last active",
+        "UNKNOWN_DEVICE": "Unknown device"
+      },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
         "NOTE": "This token can be used if you are building an API based integration",
@@ -305,6 +316,16 @@
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
+    "UNREAD_COUNT_TOOLTIP": {
+      "ALL": "Total unread conversations",
+      "INBOX": "Total unread conversations in this inbox",
+      "LABEL": "Total unread conversations in this label",
+      "TEAM": "Total unread conversations in this team",
+      "FOLDER": "Total unread conversations in this folder",
+      "MENTIONS": "Unread conversations where you were mentioned",
+      "PARTICIPATING": "Unread conversations you're participating in",
+      "UNATTENDED": "Unread unattended conversations"
+    },
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
     "CONTACTS": "Contacts",
@@ -379,6 +400,21 @@
       "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard.",
       "INFO_SHORT": "Automatically mark offline when you aren't using the app."
     },
+    "SORT_TOOLTIP": "Sort",
+    "SORT_BY": "Sort by",
+    "SORT_GROUPS": {
+      "CREATED": "Sort by date of creation",
+      "ALPHABETICAL": "Sort in alphabetical order",
+      "UNREAD_COUNT": "Sort by unread count"
+    },
+    "SORT_OPTIONS": {
+      "CREATED_DESC": "Newest first",
+      "CREATED_ASC": "Oldest first",
+      "ALPHABETICAL_ASC": "Ascending (A - Z)",
+      "ALPHABETICAL_DESC": "Descending (Z - A)",
+      "UNREAD_COUNT_DESC": "Highest first",
+      "UNREAD_COUNT_ASC": "Lowest first"
+    },
     "DOCS": "Read docs",
     "SECURITY": "Security",
     "CAPTAIN_AI": "Captain",
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
index 8ec401376..24872ef95 100644
--- a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
@@ -126,7 +126,7 @@ const showCompany = companyId => {
 };
 
 const openCreateCompanyDialog = () => {
-  createCompanyDialogRef.value?.dialogRef.open();
+  createCompanyDialogRef.value?.open();
 };
 
 const createCompany = async company => {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index fe23e23d3..05142bb82 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -11,6 +11,7 @@ import ContactDetails from 'dashboard/components-next/Contacts/Pages/ContactDeta
 import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
 import ContactNotes from 'dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue';
 import ContactHistory from 'dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue';
+import ContactMedia from 'dashboard/components-next/Contacts/ContactsSidebar/ContactMedia.vue';
 import ContactMerge from 'dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue';
 import ContactCustomAttributes from 'dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue';
 
@@ -40,6 +41,7 @@ const CONTACT_TABS_OPTIONS = [
   { key: 'ATTRIBUTES', value: 'attributes' },
   { key: 'HISTORY', value: 'history' },
   { key: 'NOTES', value: 'notes' },
+  { key: 'MEDIA', value: 'media' },
   { key: 'MERGE', value: 'merge' },
 ];
 
@@ -149,8 +151,8 @@ onMounted(() => {
         :selected-contact="selectedContact"
         @go-to-contacts-list="goToContactsList"
       />
-      <template #sidebar>
-        <div class="px-6">
+      <template #sidebarHeader>
+        <div class="px-6 pt-6 pb-3">
           <TabBar
             :tabs="tabs"
             :initial-active-tab="activeTabIndex"
@@ -158,6 +160,8 @@ onMounted(() => {
             @tab-changed="handleTabChange"
           />
         </div>
+      </template>
+      <template #sidebar>
         <div
           v-if="isFetchingItem"
           class="flex items-center justify-center py-10 text-n-slate-11"
@@ -171,6 +175,7 @@ onMounted(() => {
           />
           <ContactNotes v-if="activeTab === 'notes'" />
           <ContactHistory v-if="activeTab === 'history'" />
+          <ContactMedia v-if="activeTab === 'media'" />
           <ContactMerge
             v-if="activeTab === 'merge'"
             ref="contactMergeRef"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/SharedFiles.vue b/app/javascript/dashboard/routes/dashboard/conversation/SharedFiles.vue
index 272407a53..500a9afae 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/SharedFiles.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/SharedFiles.vue
@@ -2,413 +2,70 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
-import { formatBytes } from 'shared/helpers/FileHelper';
 import {
-  dynamicTime,
-  formatDuration,
-  shortTimestamp,
-} from 'shared/helpers/timeHelper';
-import { downloadFile } from '@chatwoot/utils';
-import {
-  ATTACHMENT_TYPES,
   MEDIA_TYPES,
+  NON_FILE_TYPES,
 } from 'dashboard/components-next/message/constants';
 
 import GalleryView from 'dashboard/components/widgets/conversation/components/GalleryView.vue';
-import Icon from 'next/icon/Icon.vue';
-import FileIcon from 'next/icon/FileIcon.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
+import Media from 'dashboard/components-next/SharedAttachments/Media.vue';
+import Files from 'dashboard/components-next/SharedAttachments/Files.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
 const MEDIA_PEEK_LIMIT = 6;
 const FILES_PEEK_LIMIT = 3;
 
-const { t } = useI18n();
-
 const allAttachments = useMapGetter('getSelectedChatAttachments');
 const attachmentsLoaded = useMapGetter('getSelectedChatAttachmentsLoaded');
-
-const sortedAttachments = computed(() =>
-  [...allAttachments.value].sort(
-    (a, b) => (b.created_at || 0) - (a.created_at || 0)
-  )
-);
+const { t } = useI18n();
 
 const mediaAttachments = computed(() =>
-  sortedAttachments.value.filter(a => MEDIA_TYPES.includes(a.file_type))
+  allAttachments.value
+    .filter(a => MEDIA_TYPES.includes(a.file_type) && a.data_url)
+    .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
 );
 
-const fileAttachments = computed(() =>
-  sortedAttachments.value.filter(
-    a => !MEDIA_TYPES.includes(a.file_type) && a.data_url
+const hasContent = computed(() =>
+  allAttachments.value.some(
+    a => a.data_url && !NON_FILE_TYPES.includes(a.file_type)
   )
 );
 
-const showAllMedia = ref(false);
-const showAllFiles = ref(false);
-
-const visibleMedia = computed(() =>
-  showAllMedia.value
-    ? mediaAttachments.value
-    : mediaAttachments.value.slice(0, MEDIA_PEEK_LIMIT)
-);
-
-const visibleFiles = computed(() =>
-  showAllFiles.value
-    ? fileAttachments.value
-    : fileAttachments.value.slice(0, FILES_PEEK_LIMIT)
-);
-
-const mediaOverflow = computed(() => {
-  const total = mediaAttachments.value.length;
-  return total > MEDIA_PEEK_LIMIT ? total - (MEDIA_PEEK_LIMIT - 1) : 0;
-});
-
 const showGallery = ref(false);
 const selectedAttachment = ref(null);
-const downloadingId = ref(null);
 
-const fileNameFromUrl = url => {
-  if (!url) return '';
-  const name = url.split('/').pop();
-  return name ? decodeURIComponent(name) : '';
-};
-
-const onDownloadFile = async attachment => {
-  const { id, file_type: type, data_url: url, extension } = attachment;
-  try {
-    downloadingId.value = id;
-    await downloadFile({ url, type, extension });
-  } catch (error) {
-    useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
-  } finally {
-    downloadingId.value = null;
-  }
-};
-
-const isVideoType = type =>
-  [ATTACHMENT_TYPES.VIDEO, ATTACHMENT_TYPES.IG_REEL].includes(type);
-
-const isAudioType = type => type === ATTACHMENT_TYPES.AUDIO;
-const isPlayableType = type => isVideoType(type) || isAudioType(type);
-
-const durations = ref({});
-
-const onLoadedMetadata = (attachment, event) => {
-  const seconds = event.target?.duration;
-  if (Number.isFinite(seconds) && seconds > 0) {
-    durations.value[attachment.id] = seconds;
-  }
-};
-
-const displayDuration = attachment => {
-  const seconds = durations.value[attachment.id];
-  return seconds ? formatDuration(Math.round(seconds)) : '';
-};
-
-const isOverflowTile = index =>
-  !showAllMedia.value &&
-  mediaOverflow.value > 0 &&
-  index === MEDIA_PEEK_LIMIT - 1;
-
-const onTileActivate = (attachment, index) => {
-  if (isOverflowTile(index)) {
-    showAllMedia.value = true;
-    return;
-  }
+const onMediaSelect = attachment => {
   selectedAttachment.value = attachment;
   showGallery.value = true;
 };
 
-const failedThumbs = ref(new Set());
-const failedPreviews = ref(new Set());
-
-const imagePreviewSrc = ({
-  id,
-  file_type: type,
-  thumb_url: thumbUrl,
-  data_url: dataUrl,
-}) => {
-  const canUseThumb = thumbUrl && !failedThumbs.value.has(id);
-  if (type === ATTACHMENT_TYPES.IMAGE) return canUseThumb ? thumbUrl : dataUrl;
-  if (isVideoType(type)) return canUseThumb ? thumbUrl : null;
-  return null;
-};
-
-const onPreviewError = ({
-  id,
-  file_type: type,
-  thumb_url: thumbUrl,
-  data_url: dataUrl,
-}) => {
-  const canRetryWithFull = thumbUrl && !failedThumbs.value.has(id) && dataUrl;
-  if (
-    canRetryWithFull &&
-    (type === ATTACHMENT_TYPES.IMAGE || isVideoType(type))
-  ) {
-    failedThumbs.value.add(id);
-    return;
+const onFileSelect = attachment => {
+  if (attachment.data_url) {
+    window.open(attachment.data_url, '_blank', 'noopener,noreferrer');
   }
-  failedPreviews.value.add(id);
-};
-
-const hasPreview = attachment =>
-  !!imagePreviewSrc(attachment) && !failedPreviews.value.has(attachment.id);
-const hasVideoPreview = attachment =>
-  isVideoType(attachment.file_type) &&
-  attachment.data_url &&
-  !failedPreviews.value.has(attachment.id);
-
-const fallbackIcon = type => {
-  if (type === ATTACHMENT_TYPES.AUDIO) return 'i-lucide-music';
-  if (isVideoType(type)) return 'i-lucide-video';
-  return 'i-lucide-image';
-};
-
-const displayName = attachment =>
-  fileNameFromUrl(attachment.data_url) ||
-  t('CONVERSATION_SIDEBAR.SHARED_FILES.UNTITLED_FILE');
-
-const displaySize = attachment => {
-  if (attachment.file_size) return formatBytes(attachment.file_size);
-  if (attachment.extension) return attachment.extension.toUpperCase();
-  return '—';
-};
-
-const displayTime = attachment => {
-  if (!attachment.created_at) return '';
-  return shortTimestamp(dynamicTime(attachment.created_at), true);
 };
 </script>
 
 <template>
-  <div class="flex flex-col gap-5 p-2">
+  <div class="p-2">
     <div v-if="!attachmentsLoaded" class="flex justify-center p-3">
       <Spinner class="size-5" />
     </div>
-    <p
-      v-else-if="!mediaAttachments.length && !fileAttachments.length"
-      class="p-3 text-sm text-center text-n-slate-11"
-    >
+    <p v-else-if="!hasContent" class="p-3 text-sm text-center text-n-slate-11">
       {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.EMPTY') }}
     </p>
-
-    <section v-if="mediaAttachments.length" class="flex flex-col gap-2.5">
-      <header class="flex items-center justify-between px-0.5">
-        <h4
-          class="text-xs font-semibold tracking-wider uppercase text-n-slate-11"
-        >
-          {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }}
-          <span
-            class="ms-1 font-medium tracking-normal normal-case text-n-slate-10"
-          >
-            {{ mediaAttachments.length }}
-          </span>
-        </h4>
-        <NextButton
-          v-if="mediaOverflow > 0"
-          ghost
-          slate
-          xs
-          trailing-icon
-          :icon="
-            showAllMedia ? 'i-lucide-chevron-up' : 'i-lucide-chevron-right'
-          "
-          :label="
-            showAllMedia
-              ? t('CONVERSATION_SIDEBAR.SHARED_FILES.SHOW_LESS')
-              : t('CONVERSATION_SIDEBAR.SHARED_FILES.VIEW_ALL')
-          "
-          @click="showAllMedia = !showAllMedia"
-        />
-      </header>
-      <div class="grid grid-cols-3 gap-2">
-        <div
-          v-for="(attachment, index) in visibleMedia"
-          :key="attachment.id"
-          role="button"
-          tabindex="0"
-          class="relative w-full overflow-hidden transition-all duration-200 rounded-lg cursor-pointer aspect-square bg-n-slate-3 shadow-sm hover:shadow-md hover:-translate-y-px group focus:outline-none focus-visible:ring-2 focus-visible:ring-n-blue-9"
-          @click="onTileActivate(attachment, index)"
-          @keydown.enter="onTileActivate(attachment, index)"
-          @keydown.space.prevent="onTileActivate(attachment, index)"
-        >
-          <template v-if="!isOverflowTile(index)">
-            <img
-              v-if="hasPreview(attachment)"
-              :src="imagePreviewSrc(attachment)"
-              class="object-cover w-full h-full transition-transform duration-300 group-hover:scale-110"
-              loading="lazy"
-              :alt="fileNameFromUrl(attachment.data_url)"
-              @error="onPreviewError(attachment)"
-            />
-            <video
-              v-else-if="hasVideoPreview(attachment)"
-              :src="`${attachment.data_url}#t=0.1`"
-              preload="metadata"
-              muted
-              playsinline
-              class="object-cover w-full h-full transition-transform duration-300 group-hover:scale-110 pointer-events-none"
-              @loadedmetadata="onLoadedMetadata(attachment, $event)"
-              @error="onPreviewError(attachment)"
-            />
-            <div
-              v-else
-              class="flex items-center justify-center w-full h-full bg-gradient-to-br from-n-slate-3 to-n-slate-4"
-            >
-              <Icon
-                :icon="fallbackIcon(attachment.file_type)"
-                class="size-6 text-n-slate-11"
-              />
-            </div>
-
-            <audio
-              v-if="isAudioType(attachment.file_type) && attachment.data_url"
-              :src="attachment.data_url"
-              preload="metadata"
-              class="hidden"
-              @loadedmetadata="onLoadedMetadata(attachment, $event)"
-            />
-
-            <div
-              class="absolute inset-0 transition-opacity duration-200 opacity-0 pointer-events-none group-hover:opacity-100 bg-gradient-to-t from-black/40 via-transparent to-transparent"
-            />
-
-            <div
-              v-if="hasVideoPreview(attachment)"
-              class="absolute inset-0 flex items-center justify-center pointer-events-none bg-gradient-to-t from-black/30 via-transparent to-transparent"
-            >
-              <div
-                class="flex items-center justify-center rounded-full size-7 bg-white/95 shadow-md"
-              >
-                <Icon
-                  icon="i-lucide-play"
-                  class="ms-0.5 size-3.5 text-n-black"
-                />
-              </div>
-            </div>
-
-            <span
-              v-if="
-                isPlayableType(attachment.file_type) &&
-                displayDuration(attachment)
-              "
-              class="absolute text-xxs font-medium tabular-nums transition-opacity bottom-1.5 ltr:right-1.5 rtl:left-1.5 text-white [text-shadow:_0_1px_3px_rgba(0,0,0,0.95),_0_0_10px_rgba(0,0,0,0.7)] group-hover:opacity-0"
-            >
-              {{ displayDuration(attachment) }}
-            </span>
-
-            <span
-              v-if="displayTime(attachment)"
-              class="absolute text-xxs font-medium transition-opacity opacity-0 bottom-1.5 ltr:left-1.5 rtl:right-1.5 text-white [text-shadow:_0_1px_3px_rgba(0,0,0,0.95),_0_0_10px_rgba(0,0,0,0.7)] group-hover:opacity-100"
-            >
-              {{ displayTime(attachment) }}
-            </span>
-
-            <button
-              type="button"
-              class="absolute flex items-center justify-center !p-px transition-all rounded-full opacity-0 bottom-1.5 ltr:right-1.5 rtl:left-1.5 size-6 bg-white/95 shadow-md group-hover:opacity-100 hover:bg-white disabled:opacity-50"
-              :disabled="downloadingId === attachment.id"
-              :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD')"
-              @click.stop="onDownloadFile(attachment)"
-              @keydown.enter.stop
-              @keydown.space.stop
-            >
-              <Icon icon="i-lucide-download" class="size-3 text-n-black" />
-            </button>
-          </template>
-
-          <div
-            v-if="isOverflowTile(index)"
-            class="absolute inset-0 flex items-center justify-center bg-n-slate-5"
-          >
-            <span class="text-base font-semibold text-n-slate-12">
-              {{
-                t('CONVERSATION_SIDEBAR.SHARED_FILES.MORE_COUNT', {
-                  count: mediaOverflow,
-                })
-              }}
-            </span>
-          </div>
-        </div>
-      </div>
-    </section>
-
-    <section v-if="fileAttachments.length" class="flex flex-col gap-2.5">
-      <header class="flex items-center justify-between px-0.5">
-        <h4
-          class="text-xs font-semibold tracking-wider uppercase text-n-slate-11"
-        >
-          {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }}
-          <span
-            class="ms-1 font-medium tracking-normal normal-case text-n-slate-10"
-          >
-            {{ fileAttachments.length }}
-          </span>
-        </h4>
-        <NextButton
-          v-if="fileAttachments.length > FILES_PEEK_LIMIT"
-          ghost
-          slate
-          xs
-          trailing-icon
-          :icon="
-            showAllFiles ? 'i-lucide-chevron-up' : 'i-lucide-chevron-right'
-          "
-          :label="
-            showAllFiles
-              ? t('CONVERSATION_SIDEBAR.SHARED_FILES.SHOW_LESS')
-              : t('CONVERSATION_SIDEBAR.SHARED_FILES.VIEW_ALL')
-          "
-          @click="showAllFiles = !showAllFiles"
-        />
-      </header>
-      <ul class="flex flex-col gap-0.5">
-        <li
-          v-for="attachment in visibleFiles"
-          :key="attachment.id"
-          class="flex items-center gap-3 px-2 py-2 transition-colors rounded-lg hover:bg-n-slate-3 group"
-        >
-          <div
-            class="flex items-center justify-center rounded-lg size-9 shrink-0 bg-gradient-to-br from-n-slate-3 to-n-slate-4 ring-1 ring-inset ring-n-slate-4/40"
-          >
-            <FileIcon
-              :file-type="attachment.extension?.toLowerCase() || ''"
-              class="size-4 text-n-slate-11"
-            />
-          </div>
-          <a
-            :href="attachment.data_url"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="flex-1 min-w-0"
-            :title="displayName(attachment)"
-          >
-            <p class="text-sm font-medium truncate text-n-slate-12 mb-1">
-              {{ displayName(attachment) }}
-            </p>
-            <p class="text-xs text-n-slate-11">
-              {{ displaySize(attachment) }}
-              <template v-if="displayTime(attachment)">
-                · {{ displayTime(attachment) }}
-              </template>
-            </p>
-          </a>
-          <NextButton
-            ghost
-            slate
-            sm
-            icon="i-lucide-download"
-            class="opacity-0 group-hover:opacity-100"
-            :is-loading="downloadingId === attachment.id"
-            :aria-label="t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD')"
-            @click="onDownloadFile(attachment)"
-          />
-        </li>
-      </ul>
-    </section>
-
+    <div v-else class="flex flex-col gap-5">
+      <Media
+        :attachments="allAttachments"
+        :peek-limit="MEDIA_PEEK_LIMIT"
+        @select="onMediaSelect"
+      />
+      <Files
+        :attachments="allAttachments"
+        :peek-limit="FILES_PEEK_LIMIT"
+        @select="onFileSelect"
+      />
+    </div>
     <GalleryView
       v-if="showGallery && selectedAttachment"
       v-model:show="showGallery"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
index dd566f131..cf25177ea 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
@@ -4,6 +4,7 @@ import InboxReconnectionRequired from '../components/InboxReconnectionRequired.v
 import { useAlert } from 'dashboard/composables';
 
 import { loadScript } from 'dashboard/helper/DOMHelpers';
+import { buildFacebookLoginScopes } from 'dashboard/helper/facebookScopes';
 import * as Sentry from '@sentry/vue';
 
 export default {
@@ -20,6 +21,11 @@ export default {
     inboxId() {
       return this.inbox.id;
     },
+    facebookLoginScopes() {
+      return buildFacebookLoginScopes({
+        includeInstagramScopes: !!this.inbox.instagram_id,
+      });
+    },
   },
   mounted() {
     window.fbAsyncInit = this.runFBInit;
@@ -77,8 +83,7 @@ export default {
           }
         },
         {
-          scope:
-            'pages_manage_metadata,business_management,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages',
+          scope: this.facebookLoginScopes,
           auth_type: 'reauthorize',
         }
       );
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue
index b0fe858e5..b5f3183f1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue
@@ -1,9 +1,11 @@
 <script>
 import { useAlert } from 'dashboard/composables';
+import InboxesAPI from 'dashboard/api/inboxes';
 import SettingsFieldSection from 'dashboard/components-next/Settings/SettingsFieldSection.vue';
 import SettingsToggleSection from 'dashboard/components-next/Settings/SettingsToggleSection.vue';
 import NextInput from 'dashboard/components-next/input/Input.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
 export default {
   components: {
@@ -11,6 +13,7 @@ export default {
     SettingsToggleSection,
     NextInput,
     NextButton,
+    Spinner,
   },
   props: {
     inbox: {
@@ -21,9 +24,11 @@ export default {
   data() {
     return {
       voiceEnabled: this.inbox.voice_enabled || false,
+      inboundCallsEnabled: this.inbox.inbound_calls_enabled !== false,
       apiKeySid: this.inbox.api_key_sid || '',
       apiKeySecret: '',
       isUpdating: false,
+      isTogglingInbound: false,
     };
   },
   computed: {
@@ -62,8 +67,27 @@ export default {
     'inbox.api_key_sid'(val) {
       this.apiKeySid = val || '';
     },
+    'inbox.inbound_calls_enabled'(val) {
+      this.inboundCallsEnabled = val !== false;
+    },
   },
   methods: {
+    async handleInboundToggle(newValue) {
+      if (this.isTogglingInbound) return;
+      const previousValue = this.inboundCallsEnabled;
+      this.inboundCallsEnabled = newValue;
+      this.isTogglingInbound = true;
+      try {
+        await InboxesAPI.setInboundCalls(this.inbox.id, newValue);
+        await this.$store.dispatch('inboxes/get', this.inbox.id);
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (_) {
+        this.inboundCallsEnabled = previousValue;
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      } finally {
+        this.isTogglingInbound = false;
+      }
+    },
     async updateVoiceSettings() {
       this.isUpdating = true;
       try {
@@ -123,6 +147,24 @@ export default {
       />
     </div>
 
+    <div
+      v-if="inbox.voice_enabled"
+      class="relative"
+      :class="{ 'pointer-events-none opacity-60': isTogglingInbound }"
+    >
+      <SettingsToggleSection
+        :model-value="inboundCallsEnabled"
+        :header="$t('INBOX_MGMT.VOICE_CONFIGURATION.INBOUND.LABEL')"
+        :description="$t('INBOX_MGMT.VOICE_CONFIGURATION.INBOUND.DESCRIPTION')"
+        :hide-toggle="isTogglingInbound"
+        @update:model-value="handleInboundToggle"
+      >
+        <template v-if="isTogglingInbound" #hiddenToggle>
+          <Spinner class="size-4 text-n-slate-11" />
+        </template>
+      </SettingsToggleSection>
+    </div>
+
     <div v-if="inbox.voice_enabled && inbox.voice_call_webhook_url">
       <SettingsFieldSection
         :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_TITLE')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/WhatsappCallingPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/WhatsappCallingPage.vue
index 1fe082d09..b52cc6923 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/WhatsappCallingPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/WhatsappCallingPage.vue
@@ -24,10 +24,13 @@ export default {
   data() {
     return {
       callingEnabled: this.inbox.provider_config?.calling_enabled || false,
+      inboundCallsEnabled:
+        this.inbox.provider_config?.inbound_calls_enabled !== false,
       permissionRequestBody:
         this.inbox.provider_config?.call_permission_request_body || '',
       isUpdating: false,
       isTogglingCalling: false,
+      isTogglingInbound: false,
     };
   },
   computed: {
@@ -44,8 +47,27 @@ export default {
     'inbox.provider_config.call_permission_request_body'(val) {
       this.permissionRequestBody = val || '';
     },
+    'inbox.provider_config.inbound_calls_enabled'(val) {
+      this.inboundCallsEnabled = val !== false;
+    },
   },
   methods: {
+    async handleInboundToggle(newValue) {
+      if (this.isTogglingInbound) return;
+      const previousValue = this.inboundCallsEnabled;
+      this.inboundCallsEnabled = newValue;
+      this.isTogglingInbound = true;
+      try {
+        await InboxesAPI.setInboundCalls(this.inbox.id, newValue);
+        await this.$store.dispatch('inboxes/get', this.inbox.id);
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (_) {
+        this.inboundCallsEnabled = previousValue;
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      } finally {
+        this.isTogglingInbound = false;
+      }
+    },
     async handleCallingToggle(newValue) {
       if (this.isTogglingCalling) return;
       const previousValue = this.callingEnabled;
@@ -117,6 +139,25 @@ export default {
     </div>
 
     <template v-if="callingEnabled">
+      <div
+        class="relative"
+        :class="{ 'pointer-events-none opacity-60': isTogglingInbound }"
+      >
+        <SettingsToggleSection
+          :model-value="inboundCallsEnabled"
+          :header="$t('INBOX_MGMT.VOICE_CONFIGURATION.INBOUND.LABEL')"
+          :description="
+            $t('INBOX_MGMT.VOICE_CONFIGURATION.INBOUND.DESCRIPTION')
+          "
+          :hide-toggle="isTogglingInbound"
+          @update:model-value="handleInboundToggle"
+        >
+          <template v-if="isTogglingInbound" #hiddenToggle>
+            <Spinner class="size-4 text-n-slate-11" />
+          </template>
+        </SettingsToggleSection>
+      </div>
+
       <SettingsFieldSection
         v-if="phoneNumber"
         :label="$t('INBOX_MGMT.WHATSAPP_CALLING.PHONE_NUMBER.LABEL')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ActiveSessions.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ActiveSessions.vue
new file mode 100644
index 000000000..ed4868462
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ActiveSessions.vue
@@ -0,0 +1,137 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { formatDistanceToNow, parseISO } from 'date-fns';
+import { useAlert } from 'dashboard/composables';
+import authAPI from 'dashboard/api/auth';
+import AnalyticsHelper from 'dashboard/helper/AnalyticsHelper';
+import { SESSION_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const { t } = useI18n();
+const sessions = ref([]);
+const loading = ref(false);
+
+const relativeTime = dateStr => {
+  if (!dateStr) return '';
+  return formatDistanceToNow(parseISO(dateStr), { addSuffix: true });
+};
+
+const isUnknown = val => !val || val === 'Unknown' || val === 'Unknown Browser';
+
+const deviceIcon = session => {
+  const name = (session.device_name || '').toLowerCase();
+  if (
+    name.includes('iphone') ||
+    name.includes('android') ||
+    name.includes('mobile')
+  ) {
+    return 'i-lucide-smartphone';
+  }
+  if (name.includes('ipad') || name.includes('tablet')) {
+    return 'i-lucide-tablet';
+  }
+  return 'i-lucide-monitor';
+};
+
+const sessionLabel = session => {
+  const parts = [];
+  if (!isUnknown(session.browser_name)) {
+    parts.push(
+      session.browser_version
+        ? `${session.browser_name} ${session.browser_version}`
+        : session.browser_name
+    );
+  }
+  if (!isUnknown(session.platform_name)) parts.push(session.platform_name);
+  return (
+    parts.join(' on ') ||
+    t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.UNKNOWN_DEVICE')
+  );
+};
+
+const locationLabel = session => {
+  const parts = [];
+  if (session.city) parts.push(session.city);
+  if (session.country) parts.push(session.country);
+  return parts.join(', ');
+};
+
+const fetchSessions = async () => {
+  loading.value = true;
+  try {
+    const { data } = await authAPI.getSessions();
+    sessions.value = data;
+  } catch {
+    useAlert(t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.FETCH_ERROR'));
+  } finally {
+    loading.value = false;
+  }
+};
+
+const revokeSession = async session => {
+  try {
+    await authAPI.revokeSession(session.id);
+    sessions.value = sessions.value.filter(s => s.id !== session.id);
+    AnalyticsHelper.track(SESSION_EVENTS.REVOKED_FROM_PROFILE);
+    useAlert(t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.REVOKE_SUCCESS'));
+  } catch {
+    useAlert(t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.REVOKE_ERROR'));
+  }
+};
+
+onMounted(fetchSessions);
+</script>
+
+<template>
+  <div class="flex flex-col gap-3">
+    <div
+      v-for="session in sessions"
+      :key="session.id"
+      class="flex items-center justify-between gap-4 rounded-xl border border-n-slate-4 bg-n-background p-4"
+    >
+      <div class="flex items-start gap-3">
+        <Icon
+          :icon="deviceIcon(session)"
+          class="size-5 mt-0.5 text-n-slate-10 flex-shrink-0"
+        />
+        <div class="flex flex-col gap-1">
+          <div class="flex items-center gap-2">
+            <span class="text-heading-3 text-n-slate-12">
+              {{ sessionLabel(session) }}
+            </span>
+            <span
+              v-if="session.current"
+              class="rounded-full bg-n-teal-3 px-2 py-0.5 text-caption text-n-teal-11"
+            >
+              {{ $t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.CURRENT') }}
+            </span>
+          </div>
+          <span
+            v-if="locationLabel(session)"
+            class="text-body-b3 text-n-slate-11"
+          >
+            {{ locationLabel(session) }}
+          </span>
+          <span
+            v-if="session.last_activity_at"
+            class="text-body-b3 text-n-slate-10"
+          >
+            {{ $t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.LAST_ACTIVE') }}
+            {{ relativeTime(session.last_activity_at) }}
+          </span>
+        </div>
+      </div>
+      <Button
+        v-if="!session.current"
+        type="button"
+        faded
+        xs
+        :label="$t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.REVOKE')"
+        color="ruby"
+        @click="revokeSession(session)"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 75eb8a2f8..04de7bda2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -20,6 +20,7 @@ import SectionLayout from '../account/components/SectionLayout.vue';
 import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
 import AccessToken from './AccessToken.vue';
 import MfaSettingsCard from './MfaSettingsCard.vue';
+import ActiveSessions from './ActiveSessions.vue';
 import Policy from 'dashboard/components/policy.vue';
 import RadioCard from 'dashboard/components-next/radioCard/RadioCard.vue';
 import {
@@ -42,6 +43,7 @@ export default {
     AudioNotifications,
     AccessToken,
     MfaSettingsCard,
+    ActiveSessions,
     BaseSettingsHeader,
   },
   setup() {
@@ -307,6 +309,13 @@ export default {
     >
       <MfaSettingsCard />
     </SectionLayout>
+    <SectionLayout
+      with-border
+      :title="$t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.TITLE')"
+      :description="$t('PROFILE_SETTINGS.FORM.SESSIONS_SECTION.NOTE')"
+    >
+      <ActiveSessions />
+    </SectionLayout>
     <Policy :permissions="audioNotificationPermissions">
       <SectionLayout
         with-border
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 054a823c6..23685bfad 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -44,6 +44,7 @@ import portals from './modules/helpCenterPortals';
 import reports from './modules/reports';
 import sla from './modules/sla';
 import slaReports from './modules/SLAReports';
+import sidebarSortPreferences from './modules/sidebarSortPreferences';
 import summaryReports from './modules/summaryReports';
 import teamMembers from './modules/teamMembers';
 import teams from './modules/teams';
@@ -108,6 +109,7 @@ export default createStore({
     reports,
     sla,
     slaReports,
+    sidebarSortPreferences,
     summaryReports,
     teamMembers,
     teams,
diff --git a/app/javascript/dashboard/store/modules/contactConversations.js b/app/javascript/dashboard/store/modules/contactConversations.js
index 55dfcf441..0edced126 100644
--- a/app/javascript/dashboard/store/modules/contactConversations.js
+++ b/app/javascript/dashboard/store/modules/contactConversations.js
@@ -25,7 +25,9 @@ export const createConversationPayload = ({ params, contactId, files }) => {
   payload.append('inbox_id', inboxId);
   payload.append('contact_id', contactId);
   payload.append('source_id', sourceId);
-  payload.append('additional_attributes[mail_subject]', mailSubject);
+  if (mailSubject) {
+    payload.append('additional_attributes[mail_subject]', mailSubject);
+  }
   payload.append('assignee_id', assigneeId);
 
   return payload;
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 2aea4d4d5..48596c0be 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -2,19 +2,23 @@ import {
   DuplicateContactException,
   ExceptionWithMessage,
 } from 'shared/helpers/CustomErrors';
-import types from '../../mutation-types';
-import ContactAPI from '../../../api/contacts';
 import snakecaseKeys from 'snakecase-keys';
 import AccountActionsAPI from '../../../api/accountActions';
+import ContactAPI from '../../../api/contacts';
 import AnalyticsHelper from '../../../helper/AnalyticsHelper';
 import { CONTACTS_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import types from '../../mutation-types';
 
 const buildContactFormData = contactParams => {
   const formData = new FormData();
   const { additional_attributes = {}, ...contactProperties } = contactParams;
   Object.keys(contactProperties).forEach(key => {
-    if (contactProperties[key]) {
-      formData.append(key, contactProperties[key]);
+    const value = contactProperties[key];
+    const shouldAppendBlankCompanyId =
+      key === 'company_id' && value !== undefined;
+
+    if (value || shouldAppendBlankCompanyId) {
+      formData.append(key, value ?? '');
     }
   });
   const { social_profiles, ...additionalAttributesProperties } =
@@ -114,6 +118,19 @@ export const actions = {
     }
   },
 
+  fetchAttachments: async ({ commit }, id) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true });
+    try {
+      const response = await ContactAPI.getAttachments(id);
+      commit(types.SET_CONTACT_ATTACHMENTS, {
+        id,
+        data: response.data.payload,
+      });
+    } finally {
+      commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false });
+    }
+  },
+
   update: async ({ commit }, { id, isFormData = false, ...contactParams }) => {
     const { avatar, customAttributes, ...paramsToDecamelize } = contactParams;
     const decamelizedContactParams = {
diff --git a/app/javascript/dashboard/store/modules/contacts/getters.js b/app/javascript/dashboard/store/modules/contacts/getters.js
index 5a75ac091..425ba9449 100644
--- a/app/javascript/dashboard/store/modules/contacts/getters.js
+++ b/app/javascript/dashboard/store/modules/contacts/getters.js
@@ -24,6 +24,7 @@ export const getters = {
       stopPaths: ['custom_attributes'],
     });
   },
+  getContactAttachments: $state => id => $state.records[id]?.attachments || [],
   getMeta: $state => {
     return $state.meta;
   },
diff --git a/app/javascript/dashboard/store/modules/contacts/mutations.js b/app/javascript/dashboard/store/modules/contacts/mutations.js
index 5eef7e2b3..5fbd04ed1 100644
--- a/app/javascript/dashboard/store/modules/contacts/mutations.js
+++ b/app/javascript/dashboard/store/modules/contacts/mutations.js
@@ -58,7 +58,15 @@ export const mutations = {
   },
 
   [types.EDIT_CONTACT]: ($state, data) => {
-    $state.records[data.id] = data;
+    const existingAttachments = $state.records[data.id]?.attachments;
+    $state.records[data.id] = existingAttachments
+      ? { ...data, attachments: existingAttachments }
+      : data;
+  },
+
+  [types.SET_CONTACT_ATTACHMENTS]: ($state, { id, data }) => {
+    if (!$state.records[id]) $state.records[id] = {};
+    $state.records[id].attachments = data;
   },
 
   [types.DELETE_CONTACT]: ($state, id) => {
diff --git a/app/javascript/dashboard/store/modules/conversationUnreadCounts.js b/app/javascript/dashboard/store/modules/conversationUnreadCounts.js
index 0503c0806..03bbb31eb 100644
--- a/app/javascript/dashboard/store/modules/conversationUnreadCounts.js
+++ b/app/javascript/dashboard/store/modules/conversationUnreadCounts.js
@@ -2,15 +2,25 @@ import ConversationAPI from '../../api/conversations';
 import types from '../mutation-types';
 
 export const state = {
+  allCount: 0,
   inboxes: {},
   labels: {},
   teams: {},
+  mentionsCount: 0,
+  participatingCount: 0,
+  unattendedCount: 0,
+  folders: {},
+};
+
+const normalizeCount = count => {
+  const parsedCount = Number(count);
+  return Number.isFinite(parsedCount) && parsedCount > 0 ? parsedCount : 0;
 };
 
 const normalizeCounts = counts => {
   return Object.entries(counts || {}).reduce((result, [id, count]) => {
-    const parsedCount = Number(count);
-    if (Number.isFinite(parsedCount) && parsedCount > 0) {
+    const parsedCount = normalizeCount(count);
+    if (parsedCount > 0) {
       result[String(id)] = parsedCount;
     }
 
@@ -19,6 +29,9 @@ const normalizeCounts = counts => {
 };
 
 export const getters = {
+  getAllUnreadCount($state) {
+    return $state.allCount;
+  },
   getInboxUnreadCount: $state => inboxId => {
     return $state.inboxes[String(inboxId)] || 0;
   },
@@ -28,6 +41,18 @@ export const getters = {
   getTeamUnreadCount: $state => teamId => {
     return $state.teams[String(teamId)] || 0;
   },
+  getMentionsUnreadCount($state) {
+    return $state.mentionsCount;
+  },
+  getParticipatingUnreadCount($state) {
+    return $state.participatingCount;
+  },
+  getUnattendedUnreadCount($state) {
+    return $state.unattendedCount;
+  },
+  getFolderUnreadCount: $state => folderId => {
+    return $state.folders[String(folderId)] || 0;
+  },
   getInboxUnreadCounts($state) {
     return $state.inboxes;
   },
@@ -37,6 +62,9 @@ export const getters = {
   getTeamUnreadCounts($state) {
     return $state.teams;
   },
+  getFolderUnreadCounts($state) {
+    return $state.folders;
+  },
 };
 
 export const actions = {
@@ -55,9 +83,14 @@ export const actions = {
 
 export const mutations = {
   [types.SET_CONVERSATION_UNREAD_COUNTS]($state, payload = {}) {
+    $state.allCount = normalizeCount(payload.all_count);
     $state.inboxes = normalizeCounts(payload.inboxes);
     $state.labels = normalizeCounts(payload.labels);
     $state.teams = normalizeCounts(payload.teams);
+    $state.mentionsCount = normalizeCount(payload.mentions_count);
+    $state.participatingCount = normalizeCount(payload.participating_count);
+    $state.unattendedCount = normalizeCount(payload.unattended_count);
+    $state.folders = normalizeCounts(payload.folders);
   },
 };
 
diff --git a/app/javascript/dashboard/store/modules/sidebarSortPreferences.js b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
new file mode 100644
index 000000000..2973c80be
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
@@ -0,0 +1,82 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+  DEFAULT_SIDEBAR_SORT_PREFERENCES,
+  isValidSidebarSort,
+  normalizeSidebarSortPreferences,
+} from 'dashboard/helper/sidebarSort';
+
+const STORAGE_NAME = 'chatwoot_sidebar_sort_preferences';
+export const SET_SIDEBAR_SORT_PREFERENCES = 'SET_SIDEBAR_SORT_PREFERENCES';
+
+const getPreferenceScope = rootGetters => {
+  const currentUserId = rootGetters.getCurrentUserID;
+  const currentAccountId = rootGetters.getCurrentAccountId;
+
+  if (!currentUserId || !currentAccountId) return null;
+
+  return `${currentUserId}:${currentAccountId}`;
+};
+
+export const state = {
+  preferences: { ...DEFAULT_SIDEBAR_SORT_PREFERENCES },
+  storageKey: null,
+};
+
+export const getters = {
+  getSectionSort: $state => section => {
+    return (
+      $state.preferences[section] || DEFAULT_SIDEBAR_SORT_PREFERENCES[section]
+    );
+  },
+};
+
+export const actions = {
+  initialize({ commit, rootGetters }) {
+    const storageKey = getPreferenceScope(rootGetters);
+    const storedPreferences = storageKey
+      ? LocalStorage.getFromJsonStore(STORAGE_NAME, storageKey)
+      : {};
+
+    commit(SET_SIDEBAR_SORT_PREFERENCES, {
+      preferences: normalizeSidebarSortPreferences(storedPreferences),
+      storageKey,
+    });
+  },
+  setSectionSort({ commit, rootGetters, state: currentState }, payload = {}) {
+    const { section, sortBy } = payload;
+
+    if (!isValidSidebarSort(section, sortBy)) return;
+
+    const storageKey =
+      currentState.storageKey || getPreferenceScope(rootGetters);
+    const preferences = {
+      ...currentState.preferences,
+      [section]: sortBy,
+    };
+
+    commit(SET_SIDEBAR_SORT_PREFERENCES, {
+      preferences,
+      storageKey,
+    });
+
+    if (storageKey) {
+      LocalStorage.updateJsonStore(STORAGE_NAME, storageKey, preferences);
+    }
+  },
+};
+
+export const mutations = {
+  [SET_SIDEBAR_SORT_PREFERENCES]($state, payload = {}) {
+    const { preferences = {}, storageKey = null } = payload;
+    $state.preferences = normalizeSidebarSortPreferences(preferences);
+    $state.storageKey = storageKey;
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/contactConversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contactConversations/actions.spec.js
index b403c0d4a..dd3b52587 100644
--- a/app/javascript/dashboard/store/modules/specs/contactConversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contactConversations/actions.spec.js
@@ -282,6 +282,24 @@ describe('createConversationPayload', () => {
     expect(payload.get('assignee_id')).toBe(options.params.assigneeId);
     expect(payload.getAll('message[attachments][]')).toEqual([]);
   });
+
+  it('omits mail_subject when mailSubject is undefined', () => {
+    const options = {
+      params: {
+        inboxId: '1',
+        message: {
+          content: 'Test message content',
+        },
+        sourceId: '12',
+        assigneeId: '123',
+      },
+      contactId: '23',
+    };
+
+    const payload = createConversationPayload(options);
+
+    expect(payload.has('additional_attributes[mail_subject]')).toBe(false);
+  });
 });
 
 describe('createWhatsAppConversationPayload', () => {
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 00b7bb83b..9d9a6780b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -145,6 +145,33 @@ describe('#actions', () => {
         [types.SET_CONTACT_UI_FLAG, { isUpdating: false }],
       ]);
     });
+
+    it('preserves blank company_id when updating with form data', async () => {
+      axios.patch.mockResolvedValue({ data: { payload: contactList[0] } });
+
+      await actions.update(
+        { commit },
+        {
+          id: contactList[0].id,
+          isFormData: true,
+          name: contactList[0].name,
+          companyId: '',
+          avatar: 'avatar-file',
+          additionalAttributes: {
+            companyName: '',
+            socialProfiles: {},
+          },
+        }
+      );
+
+      const lastPatchCall =
+        axios.patch.mock.calls[axios.patch.mock.calls.length - 1];
+      const formData = lastPatchCall[1];
+
+      expect(formData).toBeInstanceOf(FormData);
+      expect(formData.has('company_id')).toBe(true);
+      expect(formData.get('company_id')).toBe('');
+    });
   });
 
   describe('#create', () => {
@@ -438,4 +465,48 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#fetchAttachments', () => {
+    const attachments = [
+      { id: 11, message_id: 21, file_type: 'image' },
+      { id: 12, message_id: 22, file_type: 'file' },
+    ];
+
+    it('fetches and stores attachments on the contact record', async () => {
+      axios.get.mockResolvedValue({ data: { payload: attachments } });
+      const state = { records: { 1: { id: 1 } } };
+      await actions.fetchAttachments({ commit, state }, 1);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+        [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+      ]);
+    });
+
+    it('refetches even when attachments are already cached', async () => {
+      axios.get.mockResolvedValue({ data: { payload: attachments } });
+      const state = {
+        records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+      };
+      await actions.fetchAttachments({ commit, state }, 1);
+      expect(axios.get).toHaveBeenCalled();
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+        [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+      ]);
+    });
+
+    it('clears the loading flag and rethrows when the API errors', async () => {
+      axios.get.mockRejectedValue(new Error('Network error'));
+      const state = { records: { 1: { id: 1 } } };
+      await expect(
+        actions.fetchAttachments({ commit, state }, 1)
+      ).rejects.toThrow('Network error');
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
index 38973ec9d..260ca8f2a 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
@@ -50,4 +50,22 @@ describe('#getters', () => {
     };
     expect(getters.getAppliedContactFilters(state)).toEqual(filters);
   });
+
+  describe('getContactAttachments', () => {
+    it('returns the attachments stored on the contact record', () => {
+      const data = [{ id: 11, file_type: 'image' }];
+      const state = { records: { 1: { id: 1, attachments: data } } };
+      expect(getters.getContactAttachments(state)(1)).toEqual(data);
+    });
+
+    it('returns an empty array when the contact has no cached attachments', () => {
+      const state = { records: { 1: { id: 1 } } };
+      expect(getters.getContactAttachments(state)(1)).toEqual([]);
+    });
+
+    it('returns an empty array when the contact is not in the store', () => {
+      const state = { records: {} };
+      expect(getters.getContactAttachments(state)(99)).toEqual([]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
index 4eb40ff61..962cc6ea4 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
@@ -63,6 +63,21 @@ describe('#mutations', () => {
         1: { id: 1, name: 'contact2', email: 'contact2@chatwoot.com' },
       });
     });
+
+    it('preserves a cached attachments list across edits', () => {
+      const attachments = [{ id: 11, file_type: 'image' }];
+      const state = {
+        records: {
+          1: { id: 1, name: 'contact1', attachments },
+        },
+      };
+      mutations[types.EDIT_CONTACT](state, { id: 1, name: 'contact2' });
+      expect(state.records[1]).toEqual({
+        id: 1,
+        name: 'contact2',
+        attachments,
+      });
+    });
   });
 
   describe('#SET_CONTACT_FILTERS', () => {
@@ -102,4 +117,33 @@ describe('#mutations', () => {
       expect(state.appliedFilters).toEqual([]);
     });
   });
+
+  describe('#SET_CONTACT_ATTACHMENTS', () => {
+    it('attaches the list to the existing contact record', () => {
+      const state = { records: { 1: { id: 1, name: 'Sivin' } } };
+      const data = [{ id: 11, file_type: 'image' }];
+      mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+      expect(state.records[1]).toEqual({
+        id: 1,
+        name: 'Sivin',
+        attachments: data,
+      });
+    });
+
+    it('creates a record shell when the contact is not yet loaded', () => {
+      const state = { records: {} };
+      const data = [{ id: 12, file_type: 'file' }];
+      mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 5, data });
+      expect(state.records[5]).toEqual({ attachments: data });
+    });
+
+    it('replaces an existing attachment list', () => {
+      const state = {
+        records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+      };
+      const data = [{ id: 11 }];
+      mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+      expect(state.records[1].attachments).toEqual(data);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/actions.spec.js
index 3100cdd10..29fadc897 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/actions.spec.js
@@ -15,6 +15,7 @@ describe('#actions', () => {
   describe('#get', () => {
     it('commits unread counts when API is successful', async () => {
       const payload = {
+        all_count: 2,
         inboxes: { 1: '2' },
         labels: { 3: 4 },
         teams: { 5: 6 },
diff --git a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/getters.spec.js
index a3e74fc37..311aed95e 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/getters.spec.js
@@ -3,6 +3,7 @@ import { getters } from '../../conversationUnreadCounts';
 describe('#getters', () => {
   it('returns inbox unread count by id', () => {
     const state = {
+      allCount: 0,
       inboxes: { 1: 2 },
       labels: {},
       teams: {},
@@ -15,6 +16,7 @@ describe('#getters', () => {
 
   it('returns label unread count by id', () => {
     const state = {
+      allCount: 0,
       inboxes: {},
       labels: { 3: 4 },
       teams: {},
@@ -27,6 +29,7 @@ describe('#getters', () => {
 
   it('returns team unread count by id', () => {
     const state = {
+      allCount: 0,
       inboxes: {},
       labels: {},
       teams: { 5: 6 },
@@ -37,15 +40,49 @@ describe('#getters', () => {
     expect(getters.getTeamUnreadCount(state)(6)).toBe(0);
   });
 
+  it('returns all unread count', () => {
+    const state = {
+      allCount: 7,
+      inboxes: {},
+      labels: {},
+      teams: {},
+    };
+
+    expect(getters.getAllUnreadCount(state)).toBe(7);
+  });
+
   it('returns unread count maps', () => {
     const state = {
+      allCount: 0,
       inboxes: { 1: 2 },
       labels: { 3: 4 },
       teams: { 5: 6 },
+      folders: { 8: 9 },
     };
 
     expect(getters.getInboxUnreadCounts(state)).toEqual({ 1: 2 });
     expect(getters.getLabelUnreadCounts(state)).toEqual({ 3: 4 });
     expect(getters.getTeamUnreadCounts(state)).toEqual({ 5: 6 });
+    expect(getters.getFolderUnreadCounts(state)).toEqual({ 8: 9 });
+  });
+
+  it('returns mentions, participating, unattended, and folder unread counts', () => {
+    const state = {
+      allCount: 0,
+      inboxes: {},
+      labels: {},
+      teams: {},
+      mentionsCount: 3,
+      participatingCount: 4,
+      unattendedCount: 5,
+      folders: { 7: 8 },
+    };
+
+    expect(getters.getMentionsUnreadCount(state)).toBe(3);
+    expect(getters.getParticipatingUnreadCount(state)).toBe(4);
+    expect(getters.getUnattendedUnreadCount(state)).toBe(5);
+    expect(getters.getFolderUnreadCount(state)(7)).toBe(8);
+    expect(getters.getFolderUnreadCount(state)('7')).toBe(8);
+    expect(getters.getFolderUnreadCount(state)(8)).toBe(0);
   });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/mutations.spec.js
index 3f7e2b1ec..aa36ed904 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationUnreadCounts/mutations.spec.js
@@ -4,9 +4,10 @@ import { mutations } from '../../conversationUnreadCounts';
 describe('#mutations', () => {
   describe('#SET_CONVERSATION_UNREAD_COUNTS', () => {
     it('normalizes unread count payload', () => {
-      const state = { inboxes: {}, labels: {}, teams: {} };
+      const state = { allCount: 0, inboxes: {}, labels: {}, teams: {} };
 
       mutations[types.SET_CONVERSATION_UNREAD_COUNTS](state, {
+        all_count: '3',
         inboxes: {
           1: '2',
           2: 0,
@@ -20,29 +21,61 @@ describe('#mutations', () => {
           6: '7',
           7: 0,
         },
+        mentions_count: '8',
+        participating_count: 9,
+        unattended_count: '10',
+        folders: {
+          11: '12',
+          12: 0,
+        },
       });
 
       expect(state).toEqual({
+        allCount: 3,
         inboxes: { 1: 2 },
         labels: { 4: 5 },
         teams: { 6: 7 },
+        mentionsCount: 8,
+        participatingCount: 9,
+        unattendedCount: 10,
+        folders: { 11: 12 },
       });
     });
 
     it('clears counts when payload is empty', () => {
       const state = {
+        allCount: 2,
         inboxes: { 1: 2 },
         labels: { 4: 5 },
         teams: { 6: 7 },
+        mentionsCount: 8,
+        participatingCount: 9,
+        unattendedCount: 10,
+        folders: { 10: 11 },
       };
 
       mutations[types.SET_CONVERSATION_UNREAD_COUNTS](state, {});
 
       expect(state).toEqual({
+        allCount: 0,
         inboxes: {},
         labels: {},
         teams: {},
+        mentionsCount: 0,
+        participatingCount: 0,
+        unattendedCount: 0,
+        folders: {},
       });
     });
+
+    it('normalizes invalid aggregate counts to zero', () => {
+      const state = { allCount: 2, inboxes: {}, labels: {}, teams: {} };
+
+      mutations[types.SET_CONVERSATION_UNREAD_COUNTS](state, {
+        all_count: 'invalid',
+      });
+
+      expect(state.allCount).toBe(0);
+    });
   });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
new file mode 100644
index 000000000..7fee1d018
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
@@ -0,0 +1,106 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+  DEFAULT_SIDEBAR_SORT_PREFERENCES,
+  SIDEBAR_SORT_KEYS,
+  SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+  SET_SIDEBAR_SORT_PREFERENCES,
+  actions,
+} from '../../sidebarSortPreferences';
+
+vi.mock('shared/helpers/localStorage', () => ({
+  LocalStorage: {
+    getFromJsonStore: vi.fn(),
+    updateJsonStore: vi.fn(),
+  },
+}));
+
+const rootGetters = {
+  getCurrentUserID: 1,
+  getCurrentAccountId: 2,
+};
+
+describe('#actions', () => {
+  const commit = vi.fn();
+
+  beforeEach(() => {
+    commit.mockClear();
+    LocalStorage.getFromJsonStore.mockReset();
+    LocalStorage.updateJsonStore.mockReset();
+  });
+
+  describe('#initialize', () => {
+    it('loads scoped preferences from local storage', () => {
+      LocalStorage.getFromJsonStore.mockReturnValue({
+        [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+      });
+
+      actions.initialize({ commit, rootGetters });
+
+      expect(LocalStorage.getFromJsonStore).toHaveBeenCalledWith(
+        'chatwoot_sidebar_sort_preferences',
+        '1:2'
+      );
+      expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+        preferences: {
+          ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+          [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+        },
+        storageKey: '1:2',
+      });
+    });
+  });
+
+  describe('#setSectionSort', () => {
+    it('persists valid preferences to local storage', () => {
+      const state = {
+        preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+        storageKey: '1:2',
+      };
+
+      actions.setSectionSort(
+        { commit, rootGetters, state },
+        {
+          section: SIDEBAR_SORT_SECTIONS.LABELS,
+          sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+        }
+      );
+
+      const preferences = {
+        ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+        [SIDEBAR_SORT_SECTIONS.LABELS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+      };
+
+      expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+        preferences,
+        storageKey: '1:2',
+      });
+      expect(LocalStorage.updateJsonStore).toHaveBeenCalledWith(
+        'chatwoot_sidebar_sort_preferences',
+        '1:2',
+        preferences
+      );
+    });
+
+    it('ignores invalid preferences', () => {
+      actions.setSectionSort(
+        {
+          commit,
+          rootGetters,
+          state: {
+            preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+            storageKey: '1:2',
+          },
+        },
+        {
+          section: SIDEBAR_SORT_SECTIONS.FOLDERS,
+          sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+        }
+      );
+
+      expect(commit).not.toHaveBeenCalled();
+      expect(LocalStorage.updateJsonStore).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
new file mode 100644
index 000000000..6c43e23bc
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
@@ -0,0 +1,31 @@
+import {
+  DEFAULT_SIDEBAR_SORT_PREFERENCES,
+  SIDEBAR_SORT_KEYS,
+  SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import { getters } from '../../sidebarSortPreferences';
+
+describe('#getters', () => {
+  it('returns section sort preference', () => {
+    const state = {
+      preferences: {
+        ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+        [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+      },
+    };
+
+    expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.TEAMS)).toBe(
+      SIDEBAR_SORT_KEYS.CREATED_ASC
+    );
+  });
+
+  it('falls back to default section sort preference', () => {
+    const state = {
+      preferences: {},
+    };
+
+    expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.LABELS)).toBe(
+      SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC
+    );
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
new file mode 100644
index 000000000..2f19c84bd
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
@@ -0,0 +1,34 @@
+import {
+  DEFAULT_SIDEBAR_SORT_PREFERENCES,
+  SIDEBAR_SORT_KEYS,
+  SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+  SET_SIDEBAR_SORT_PREFERENCES,
+  mutations,
+} from '../../sidebarSortPreferences';
+
+describe('#mutations', () => {
+  it('sets normalized preferences', () => {
+    const state = {
+      preferences: {},
+      storageKey: null,
+    };
+
+    mutations[SET_SIDEBAR_SORT_PREFERENCES](state, {
+      preferences: {
+        [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+        [SIDEBAR_SORT_SECTIONS.LABELS]: 'invalid',
+      },
+      storageKey: '1:2',
+    });
+
+    expect(state).toEqual({
+      preferences: {
+        ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+        [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+      },
+      storageKey: '1:2',
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 1597b7ea6..059d9636e 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -139,6 +139,7 @@ export default {
   SET_CONTACT_META: 'SET_CONTACT_META',
   SET_CONTACT_UI_FLAG: 'SET_CONTACT_UI_FLAG',
   SET_CONTACT_ITEM: 'SET_CONTACT_ITEM',
+  SET_CONTACT_ATTACHMENTS: 'SET_CONTACT_ATTACHMENTS',
   SET_CONTACTS: 'SET_CONTACTS',
   APPEND_CONTACTS: 'APPEND_CONTACTS',
   CLEAR_CONTACTS: 'CLEAR_CONTACTS',
diff --git a/app/javascript/shared/components/emoji/EmojiInput.vue b/app/javascript/shared/components/emoji/EmojiInput.vue
deleted file mode 100644
index 586496d8a..000000000
--- a/app/javascript/shared/components/emoji/EmojiInput.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<script>
-import emojis from './emojisGroup.json';
-import FluentIcon from 'shared/components/FluentIcon/Index.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-const SEARCH_KEY = 'Search';
-
-export default {
-  components: { FluentIcon, NextButton },
-  props: {
-    onClick: {
-      type: Function,
-      default: () => {},
-    },
-    showRemoveButton: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      selectedKey: 'Search',
-      emojis,
-      search: '',
-    };
-  },
-  computed: {
-    categories() {
-      return [...this.emojis];
-    },
-    filterEmojisByCategory() {
-      const selectedCategoryName = this.emojis.find(category =>
-        category.name === this.selectedKey ? category.name : null
-      );
-      return selectedCategoryName?.emojis;
-    },
-    filterAllEmojisBySearch() {
-      return this.emojis.map(category => {
-        const allEmojis = category.emojis.filter(emoji =>
-          emoji.slug.replaceAll('_', ' ').includes(this.search.toLowerCase())
-        );
-        return allEmojis.length > 0
-          ? { ...category, emojis: allEmojis }
-          : { ...category, emojis: [] };
-      });
-    },
-    hasNoSearch() {
-      return this.selectedKey !== SEARCH_KEY && this.search === '';
-    },
-    hasEmptySearchResult() {
-      return this.filterAllEmojisBySearch.every(
-        category => category.emojis.length === 0
-      );
-    },
-  },
-  watch: {
-    search() {
-      this.selectedKey = 'Search';
-    },
-    selectedKey() {
-      return this.selectedKey === 'Search' ? this.focusSearchInput() : null;
-    },
-  },
-  mounted() {
-    this.focusSearchInput();
-  },
-  methods: {
-    changeCategory(category) {
-      this.search = '';
-      this.$refs.emojiItem.scrollTo({ top: 0 });
-      this.selectedKey = category;
-    },
-    getFirstEmojiByCategoryName(categoryName) {
-      const categoryItem = this.emojis.find(category =>
-        category.name === categoryName ? category : null
-      );
-      return categoryItem ? categoryItem.emojis[0].emoji : '';
-    },
-    focusSearchInput() {
-      this.$nextTick(() => {
-        this.$refs.searchbar.focus();
-      });
-    },
-  },
-};
-</script>
-
-<template>
-  <div
-    role="dialog"
-    class="emoji-dialog bg-n-background shadow-lg rounded-md outline outline-1 outline-n-weak box-content h-[18.75rem] absolute right-0 -top-[95px] w-80 z-20"
-  >
-    <div class="flex flex-col">
-      <div class="flex gap-2 m-2 sticky top-2">
-        <input
-          ref="searchbar"
-          v-model="search"
-          type="text"
-          class="focus:box-shadow-blue dark:focus:box-shadow-dark !mb-0 !h-8 !text-sm"
-          :placeholder="$t('EMOJI.PLACEHOLDER')"
-        />
-        <NextButton
-          v-if="showRemoveButton"
-          faded
-          sm
-          slate
-          class="flex-shrink-0"
-          :label="$t('EMOJI.REMOVE')"
-          @click="onClick('')"
-        />
-      </div>
-      <div v-if="hasNoSearch" ref="emojiItem" class="emoji-item">
-        <h5
-          class="text-sm text-n-slate-12 font-medium leading-normal m-0 py-1 px-2 capitalize"
-        >
-          {{ selectedKey }}
-        </h5>
-        <div class="emoji--row">
-          <button
-            v-for="item in filterEmojisByCategory"
-            :key="item.slug"
-            v-dompurify-html="item.emoji"
-            class="emoji--item"
-            track-by="$index"
-            @click="onClick(item.emoji)"
-          />
-        </div>
-      </div>
-      <div v-else ref="emojiItem" class="emoji-item">
-        <div v-for="category in filterAllEmojisBySearch" :key="category.slug">
-          <h5
-            v-if="category.emojis.length > 0"
-            class="text-sm text-n-slate-12 font-medium leading-normal m-0 py-1 px-2 capitalize"
-          >
-            {{ category.name }}
-          </h5>
-          <div v-if="category.emojis.length > 0" class="emoji--row">
-            <button
-              v-for="item in category.emojis"
-              :key="item.slug"
-              v-dompurify-html="item.emoji"
-              class="emoji--item"
-              track-by="$index"
-              @click="onClick(item.emoji)"
-            />
-          </div>
-        </div>
-        <div
-          v-if="hasEmptySearchResult"
-          class="items-center flex flex-col h-[13.25rem] justify-center"
-        >
-          <div class="text-n-slate-11 mb-2">
-            <FluentIcon icon="emoji" size="48" />
-          </div>
-          <span class="text-n-slate-11 text-sm font-medium">
-            {{ $t('EMOJI.NOT_FOUND') }}
-          </span>
-        </div>
-      </div>
-
-      <div
-        class="emoji-dialog--footer relative w-full py-0 rounded-b-[0.34rem] px-1 bg-n-slate-3"
-        role="menu"
-      >
-        <ul
-          class="flex relative left-[2px] rtl:left-[unset] rtl:right-[2px] list-none m-0 overflow-auto py-1 px-0"
-        >
-          <li>
-            <button
-              class="emoji--item"
-              :class="{ active: selectedKey === 'Search' }"
-              @click="changeCategory('Search')"
-            >
-              <FluentIcon icon="search" size="16" class="text-n-slate-11" />
-            </button>
-          </li>
-          <li
-            v-for="category in categories"
-            :key="category.slug"
-            @click="changeCategory(category.name)"
-          >
-            <button
-              v-dompurify-html="getFirstEmojiByCategoryName(category.name)"
-              class="emoji--item"
-              :class="{ active: selectedKey === category.name }"
-              @click="changeCategory(category.name)"
-            />
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-@tailwind components;
-
-@layer components {
-  .box-shadow-blue {
-    box-shadow:
-      0 0 0 1px #1f93ff,
-      0 0 1px 2px #c7e3ff;
-  }
-
-  .box-shadow-dark {
-    box-shadow:
-      0 0 0 1px #212222,
-      0 0 1px 2px #4c5155;
-  }
-}
-</style>
-
-<style lang="scss">
-.emoji-dialog {
-  &::before {
-    @apply absolute -bottom-3 h-3 w-6 bg-n-slate-3 content-[""];
-    clip-path: polygon(50% 100%, 0% 0%, 100% 0%);
-  }
-}
-
-.emoji--item {
-  @apply bg-transparent border-0 rounded cursor-pointer text-lg h-6 m-0 py-0 px-1 hover:bg-n-slate-4;
-}
-
-.emoji--row {
-  @apply box-border p-1;
-
-  .emoji--item {
-    @apply h-[1.625rem] w-[1.625rem] leading-normal m-1;
-  }
-}
-
-.emoji-item {
-  @apply h-[13.25rem] overflow-y-auto;
-}
-
-.emoji-dialog--footer {
-  ul {
-    > li {
-      @apply items-center cursor-pointer flex justify-center p-1;
-    }
-
-    li .active {
-      @apply bg-n-background;
-    }
-
-    .emoji--item {
-      @apply items-center flex text-sm;
-
-      &:hover {
-        @apply bg-n-slate-2;
-      }
-    }
-  }
-}
-</style>
diff --git a/app/javascript/shared/components/emoji/EmojiPicker.vue b/app/javascript/shared/components/emoji/EmojiPicker.vue
new file mode 100644
index 000000000..a671a9cef
--- /dev/null
+++ b/app/javascript/shared/components/emoji/EmojiPicker.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { Virtualizer } from 'virtua/vue';
+
+import {
+  buildEmojiSections,
+  getEmojiTint,
+  getRecentEmojis,
+  addRecentEmoji,
+} from 'shared/components/emoji/pickerHelper';
+
+const emit = defineEmits(['select']);
+
+const { t } = useI18n();
+
+const emojiSearch = ref('');
+const recentEmojis = ref([]);
+const searchInput = ref(null);
+
+onMounted(() => {
+  recentEmojis.value = getRecentEmojis();
+  searchInput.value?.focus();
+});
+
+const emojiSections = computed(() =>
+  buildEmojiSections(
+    emojiSearch.value,
+    recentEmojis.value,
+    t('EMOJI_ICON_PICKER.FREQUENTLY_USED')
+  )
+);
+
+// Tints an emoji button with a light shade of the emoji's own color on hover.
+const applyEmojiTint = (event, emoji) => {
+  event.currentTarget.style.setProperty('--ep-tint', getEmojiTint(emoji));
+};
+
+const selectEmoji = emoji => {
+  recentEmojis.value = addRecentEmoji(emoji);
+  emit('select', { type: 'emoji', value: emoji.emoji, emoji: emoji.emoji });
+};
+</script>
+
+<template>
+  <div
+    role="dialog"
+    class="absolute z-20 flex flex-col overflow-hidden shadow-xl w-[22rem] bg-n-surface-2 backdrop-blur-[100px] rounded-2xl outline outline-1 outline-n-weak dark:outline-n-strong/50"
+  >
+    <div class="flex flex-col gap-1.5 pt-2">
+      <div class="relative px-2">
+        <span
+          class="absolute z-10 -translate-y-1/2 i-lucide-search size-4 text-n-slate-10 top-1/2 start-5"
+        />
+        <input
+          ref="searchInput"
+          v-model="emojiSearch"
+          type="text"
+          class="block w-full h-10 text-sm reset-base outline outline-1 outline-offset-[-1px] outline-n-weak focus:outline-n-brand border-none rounded-lg !ps-9 !pe-3 !py-2.5 bg-transparent text-n-slate-12 placeholder:text-n-slate-10"
+          :placeholder="t('EMOJI_ICON_PICKER.SEARCH_EMOJI')"
+        />
+      </div>
+      <div
+        v-if="emojiSections.length"
+        class="h-60 overflow-y-auto px-2 pb-2 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
+      >
+        <Virtualizer v-slot="{ item: section }" :data="emojiSections">
+          <h5
+            class="px-1 pt-2 pb-1 m-0 text-xs font-medium tracking-wide uppercase text-n-slate-10"
+          >
+            {{ section.name }}
+          </h5>
+          <div class="grid grid-cols-10 gap-0.5">
+            <button
+              v-for="emoji in section.emojis"
+              :key="`${section.name}-${emoji.slug}`"
+              type="button"
+              :title="emoji.name"
+              class="flex items-center justify-center !p-0 w-full max-w-[2rem] text-xl transition-colors rounded-lg aspect-square hover:bg-[var(--ep-tint)] active:enabled:scale-[0.97]"
+              @mouseenter="applyEmojiTint($event, emoji.emoji)"
+              @click="selectEmoji(emoji)"
+            >
+              {{ emoji.emoji }}
+            </button>
+          </div>
+        </Virtualizer>
+      </div>
+      <div
+        v-else
+        class="flex flex-col items-center justify-center gap-2 h-60 text-n-slate-10"
+      >
+        <span class="i-lucide-smile-plus size-7" />
+        <span class="text-sm font-medium">
+          {{ t('EMOJI_ICON_PICKER.NO_EMOJI') }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/shared/components/emoji/emojisGroup.json b/app/javascript/shared/components/emoji/emojisGroup.json
index ebb14ebce..090ea5762 100644
--- a/app/javascript/shared/components/emoji/emojisGroup.json
+++ b/app/javascript/shared/components/emoji/emojisGroup.json
@@ -3,11 +3,7 @@
     "name": "Smileys & Emotion",
     "slug": "smileys_emotion",
     "emojis": [
-      {
-        "emoji": "😀",
-        "name": "grinning face",
-        "slug": "grinning_face"
-      },
+      { "emoji": "😀", "name": "grinning face", "slug": "grinning_face" },
       {
         "emoji": "😃",
         "name": "grinning face with big eyes",
@@ -48,21 +44,13 @@
         "name": "slightly smiling face",
         "slug": "slightly_smiling_face_smile"
       },
-      {
-        "emoji": "🙃",
-        "name": "upside-down face",
-        "slug": "upside_down_face"
-      },
+      { "emoji": "🙃", "name": "upside-down face", "slug": "upside_down_face" },
       {
         "emoji": "🫠",
         "name": "melting face",
         "slug": "melting_face_disappear_dissolve_melt_liquid"
       },
-      {
-        "emoji": "😉",
-        "name": "winking face",
-        "slug": "winking_face"
-      },
+      { "emoji": "😉", "name": "winking face", "slug": "winking_face" },
       {
         "emoji": "😊",
         "name": "smiling face with smiling eyes",
@@ -93,11 +81,7 @@
         "name": "face blowing a kiss",
         "slug": "face_blowing_a_kiss"
       },
-      {
-        "emoji": "😗",
-        "name": "kissing face",
-        "slug": "kissing_face"
-      },
+      { "emoji": "😗", "name": "kissing face", "slug": "kissing_face" },
       {
         "emoji": "😚",
         "name": "kissing face with closed eyes",
@@ -118,11 +102,7 @@
         "name": "face savoring food",
         "slug": "face_savoring_food_delicious_yum_tongue_savouring"
       },
-      {
-        "emoji": "😛",
-        "name": "face with tongue",
-        "slug": "face_with_tongue"
-      },
+      { "emoji": "😛", "name": "face with tongue", "slug": "face_with_tongue" },
       {
         "emoji": "😜",
         "name": "winking face with tongue",
@@ -138,11 +118,7 @@
         "name": "squinting face with tongue",
         "slug": "squinting_face_with_tongue_eye_face_horrible_tongue"
       },
-      {
-        "emoji": "🤑",
-        "name": "money-mouth face",
-        "slug": "money_mouth_face"
-      },
+      { "emoji": "🤑", "name": "money-mouth face", "slug": "money_mouth_face" },
       {
         "emoji": "🤗",
         "name": "smiling face with open hands",
@@ -168,11 +144,7 @@
         "name": "shushing face",
         "slug": "shushing_face_quiet_silence"
       },
-      {
-        "emoji": "🤔",
-        "name": "thinking face",
-        "slug": "thinking_face"
-      },
+      { "emoji": "🤔", "name": "thinking face", "slug": "thinking_face" },
       {
         "emoji": "🫡",
         "name": "saluting face",
@@ -213,11 +185,7 @@
         "name": "face in clouds",
         "slug": "face_in_clouds_absentminded_fog"
       },
-      {
-        "emoji": "😏",
-        "name": "smirking face",
-        "slug": "smirking_face"
-      },
+      { "emoji": "😏", "name": "smirking face", "slug": "smirking_face" },
       {
         "emoji": "😒",
         "name": "unamused face",
@@ -228,11 +196,7 @@
         "name": "face with rolling eyes",
         "slug": "face_with_rolling_eyes_eyeroll"
       },
-      {
-        "emoji": "😬",
-        "name": "grimacing face",
-        "slug": "grimacing_face"
-      },
+      { "emoji": "😬", "name": "grimacing face", "slug": "grimacing_face" },
       {
         "emoji": "😮‍💨",
         "name": "face exhaling",
@@ -243,11 +207,7 @@
         "name": "lying face",
         "slug": "lying_face_lie_pinocchio"
       },
-      {
-        "emoji": "😌",
-        "name": "relieved face",
-        "slug": "relieved_face"
-      },
+      { "emoji": "😌", "name": "relieved face", "slug": "relieved_face" },
       {
         "emoji": "😔",
         "name": "pensive face",
@@ -258,11 +218,7 @@
         "name": "sleepy face",
         "slug": "sleepy_face_good_night"
       },
-      {
-        "emoji": "🤤",
-        "name": "drooling face",
-        "slug": "drooling_face"
-      },
+      { "emoji": "🤤", "name": "drooling face", "slug": "drooling_face" },
       {
         "emoji": "😴",
         "name": "sleeping face",
@@ -288,11 +244,7 @@
         "name": "nauseated face",
         "slug": "nauseated_face_vomit"
       },
-      {
-        "emoji": "🤮",
-        "name": "face vomiting",
-        "slug": "face_vomiting_puke"
-      },
+      { "emoji": "🤮", "name": "face vomiting", "slug": "face_vomiting_puke" },
       {
         "emoji": "🤧",
         "name": "sneezing face",
@@ -348,31 +300,19 @@
         "name": "smiling face with sunglasses",
         "slug": "smiling_face_with_sunglasses_bright_cool_shades"
       },
-      {
-        "emoji": "🤓",
-        "name": "nerd face",
-        "slug": "nerd_face_geek"
-      },
+      { "emoji": "🤓", "name": "nerd face", "slug": "nerd_face_geek" },
       {
         "emoji": "🧐",
         "name": "face with monocle",
         "slug": "face_with_monocle_stuffy_wealthy"
       },
-      {
-        "emoji": "😕",
-        "name": "confused face",
-        "slug": "confused_face_meh"
-      },
+      { "emoji": "😕", "name": "confused face", "slug": "confused_face_meh" },
       {
         "emoji": "🫤",
         "name": "face with diagonal mouth",
         "slug": "face_with_diagonal_mouth_disappointed_meh_skeptical_unsure"
       },
-      {
-        "emoji": "😟",
-        "name": "worried face",
-        "slug": "worried_face"
-      },
+      { "emoji": "😟", "name": "worried face", "slug": "worried_face" },
       {
         "emoji": "🙁",
         "name": "slightly frowning face",
@@ -393,11 +333,7 @@
         "name": "astonished face",
         "slug": "astonished_face_shocked_totally"
       },
-      {
-        "emoji": "😳",
-        "name": "flushed face",
-        "slug": "flushed_face_dazed"
-      },
+      { "emoji": "😳", "name": "flushed face", "slug": "flushed_face_dazed" },
       {
         "emoji": "🥺",
         "name": "pleading face",
@@ -413,16 +349,8 @@
         "name": "frowning face with open mouth",
         "slug": "frowning_face_with_open_mouth"
       },
-      {
-        "emoji": "😧",
-        "name": "anguished face",
-        "slug": "anguished_face"
-      },
-      {
-        "emoji": "😨",
-        "name": "fearful face",
-        "slug": "fearful_face_scared"
-      },
+      { "emoji": "😧", "name": "anguished face", "slug": "anguished_face" },
+      { "emoji": "😨", "name": "fearful face", "slug": "fearful_face_scared" },
       {
         "emoji": "😰",
         "name": "anxious face with sweat",
@@ -448,16 +376,8 @@
         "name": "face screaming in fear",
         "slug": "face_screaming_in_fear_munch_scared_scream"
       },
-      {
-        "emoji": "😖",
-        "name": "confounded face",
-        "slug": "confounded_face"
-      },
-      {
-        "emoji": "😣",
-        "name": "persevering face",
-        "slug": "persevering_face"
-      },
+      { "emoji": "😖", "name": "confounded face", "slug": "confounded_face" },
+      { "emoji": "😣", "name": "persevering face", "slug": "persevering_face" },
       {
         "emoji": "😞",
         "name": "disappointed face",
@@ -468,16 +388,8 @@
         "name": "downcast face with sweat",
         "slug": "downcast_face_with_sweat_cold"
       },
-      {
-        "emoji": "😩",
-        "name": "weary face",
-        "slug": "weary_face_tired"
-      },
-      {
-        "emoji": "😫",
-        "name": "tired face",
-        "slug": "tired_face"
-      },
+      { "emoji": "😩", "name": "weary face", "slug": "weary_face_tired" },
+      { "emoji": "😫", "name": "tired face", "slug": "tired_face" },
       {
         "emoji": "🥱",
         "name": "yawning face",
@@ -493,11 +405,7 @@
         "name": "enraged face",
         "slug": "enraged_face_angry_enraged_mad_red_face"
       },
-      {
-        "emoji": "😠",
-        "name": "angry face",
-        "slug": "angry_face_mad"
-      },
+      { "emoji": "😠", "name": "angry face", "slug": "angry_face_mad" },
       {
         "emoji": "🤬",
         "name": "face with symbols on mouth",
@@ -528,11 +436,7 @@
         "name": "pile of poo",
         "slug": "pile_of_poo_poop_dung_monster"
       },
-      {
-        "emoji": "🤡",
-        "name": "clown face",
-        "slug": "clown_face"
-      },
+      { "emoji": "🤡", "name": "clown face", "slug": "clown_face" },
       {
         "emoji": "👹",
         "name": "ogre",
@@ -543,11 +447,7 @@
         "name": "goblin",
         "slug": "goblin_creature_fantasy_goblin_monster_face"
       },
-      {
-        "emoji": "👻",
-        "name": "ghost",
-        "slug": "ghost_face_monster_fantasy"
-      },
+      { "emoji": "👻", "name": "ghost", "slug": "ghost_face_monster_fantasy" },
       {
         "emoji": "👽",
         "name": "alien",
@@ -558,11 +458,7 @@
         "name": "alien monster",
         "slug": "alien_monster_face_monster_creature_ufo"
       },
-      {
-        "emoji": "🤖",
-        "name": "robot",
-        "slug": "robot_face_monster_robot"
-      },
+      { "emoji": "🤖", "name": "robot", "slug": "robot_face_monster_robot" },
       {
         "emoji": "😺",
         "name": "grinning cat",
@@ -603,11 +499,7 @@
         "name": "crying cat",
         "slug": "crying_cat_cry_sad_tear"
       },
-      {
-        "emoji": "😾",
-        "name": "pouting cat",
-        "slug": "pouting_cat_face"
-      },
+      { "emoji": "😾", "name": "pouting cat", "slug": "pouting_cat_face" },
       {
         "emoji": "🙈",
         "name": "see-no-evil monkey",
@@ -623,11 +515,7 @@
         "name": "speak-no-evil monkey",
         "slug": "speak_no_evil_monkey_face_forbidden"
       },
-      {
-        "emoji": "💌",
-        "name": "love letter",
-        "slug": "love_letter_mail"
-      },
+      { "emoji": "💌", "name": "love letter", "slug": "love_letter_mail" },
       {
         "emoji": "💘",
         "name": "heart with arrow",
@@ -653,21 +541,9 @@
         "name": "beating heart",
         "slug": "beating_heart_heartbeat_pulsating"
       },
-      {
-        "emoji": "💞",
-        "name": "revolving hearts",
-        "slug": "revolving_hearts"
-      },
-      {
-        "emoji": "💕",
-        "name": "two hearts",
-        "slug": "two_hearts_love"
-      },
-      {
-        "emoji": "💟",
-        "name": "heart decoration",
-        "slug": "heart_decoration"
-      },
+      { "emoji": "💞", "name": "revolving hearts", "slug": "revolving_hearts" },
+      { "emoji": "💕", "name": "two hearts", "slug": "two_hearts_love" },
+      { "emoji": "💟", "name": "heart decoration", "slug": "heart_decoration" },
       {
         "emoji": "❣️",
         "name": "heart exclamation",
@@ -688,56 +564,16 @@
         "name": "mending heart",
         "slug": "mending_heart_healthier_improving_recovery_recuperating_well"
       },
-      {
-        "emoji": "❤️",
-        "name": "red heart",
-        "slug": "red_heart"
-      },
-      {
-        "emoji": "🧡",
-        "name": "orange heart",
-        "slug": "orange_heart"
-      },
-      {
-        "emoji": "💛",
-        "name": "yellow heart",
-        "slug": "yellow_heart"
-      },
-      {
-        "emoji": "💚",
-        "name": "green heart",
-        "slug": "green_heart"
-      },
-      {
-        "emoji": "💙",
-        "name": "blue heart",
-        "slug": "blue_heart"
-      },
-      {
-        "emoji": "💜",
-        "name": "purple heart",
-        "slug": "purple_heart"
-      },
-      {
-        "emoji": "🤎",
-        "name": "brown heart",
-        "slug": "brown_heart"
-      },
-      {
-        "emoji": "🖤",
-        "name": "black heart",
-        "slug": "black_heart"
-      },
-      {
-        "emoji": "🤍",
-        "name": "white heart",
-        "slug": "white_heart"
-      },
-      {
-        "emoji": "💋",
-        "name": "kiss mark",
-        "slug": "kiss_mark_lips"
-      },
+      { "emoji": "❤️", "name": "red heart", "slug": "red_heart" },
+      { "emoji": "🧡", "name": "orange heart", "slug": "orange_heart" },
+      { "emoji": "💛", "name": "yellow heart", "slug": "yellow_heart" },
+      { "emoji": "💚", "name": "green heart", "slug": "green_heart" },
+      { "emoji": "💙", "name": "blue heart", "slug": "blue_heart" },
+      { "emoji": "💜", "name": "purple heart", "slug": "purple_heart" },
+      { "emoji": "🤎", "name": "brown heart", "slug": "brown_heart" },
+      { "emoji": "🖤", "name": "black heart", "slug": "black_heart" },
+      { "emoji": "🤍", "name": "white heart", "slug": "white_heart" },
+      { "emoji": "💋", "name": "kiss mark", "slug": "kiss_mark_lips" },
       {
         "emoji": "💯",
         "name": "hundred points",
@@ -753,11 +589,7 @@
         "name": "collision",
         "slug": "collision_boom_comic_explode"
       },
-      {
-        "emoji": "💫",
-        "name": "dizzy",
-        "slug": "dizzy_star_comic"
-      },
+      { "emoji": "💫", "name": "dizzy", "slug": "dizzy_star_comic" },
       {
         "emoji": "💦",
         "name": "sweat droplets",
@@ -768,11 +600,7 @@
         "name": "dashing away",
         "slug": "dashing_away_running_comic"
       },
-      {
-        "emoji": "🕳️",
-        "name": "hole",
-        "slug": "hole"
-      },
+      { "emoji": "🕳️", "name": "hole", "slug": "hole" },
       {
         "emoji": "💬",
         "name": "speech balloon",
@@ -825,7 +653,7 @@
         "slug": "hand_with_fingers_splayed"
       },
       {
-        "emoji": "✋",
+        "emoji": "✋️",
         "name": "raised hand",
         "slug": "raised_hand_high_5_high_five"
       },
@@ -854,11 +682,7 @@
         "name": "palm up hand",
         "slug": "palm_up_hand_catch_beckon_come_offer"
       },
-      {
-        "emoji": "👌",
-        "name": "OK hand",
-        "slug": "ok_hand"
-      },
+      { "emoji": "👌", "name": "OK hand", "slug": "ok_hand" },
       {
         "emoji": "🤌",
         "name": "pinched fingers",
@@ -869,11 +693,7 @@
         "name": "pinching hand",
         "slug": "pinching_hand_small_amount"
       },
-      {
-        "emoji": "✌️",
-        "name": "victory hand",
-        "slug": "victory_hand_v"
-      },
+      { "emoji": "✌️", "name": "victory hand", "slug": "victory_hand_v" },
       {
         "emoji": "🤞",
         "name": "crossed fingers",
@@ -914,11 +734,7 @@
         "name": "backhand index pointing up",
         "slug": "backhand_index_pointing_up_hand_point_up_finger"
       },
-      {
-        "emoji": "🖕",
-        "name": "middle finger",
-        "slug": "middle_finger_hand"
-      },
+      { "emoji": "🖕", "name": "middle finger", "slug": "middle_finger_hand" },
       {
         "emoji": "👇",
         "name": "backhand index pointing down",
@@ -934,18 +750,10 @@
         "name": "index pointing at the viewer",
         "slug": "index_pointing_at_the_viewer_you_point"
       },
+      { "emoji": "👍", "name": "thumbs up", "slug": "thumbs_up_+1_hand" },
+      { "emoji": "👎", "name": "thumbs down", "slug": "thumbs_down_-1_hand" },
       {
-        "emoji": "👍",
-        "name": "thumbs up",
-        "slug": "thumbs_up_+1_hand"
-      },
-      {
-        "emoji": "👎",
-        "name": "thumbs down",
-        "slug": "thumbs_down_-1_hand"
-      },
-      {
-        "emoji": "✊",
+        "emoji": "✊️",
         "name": "raised fist",
         "slug": "raised_fist_hand_punch_clenched_fist"
       },
@@ -974,16 +782,8 @@
         "name": "raising hands",
         "slug": "raising_hands_celebration_gesture_hooray_raised_hands"
       },
-      {
-        "emoji": "🫶",
-        "name": "heart hands",
-        "slug": "heart_hands_love"
-      },
-      {
-        "emoji": "👐",
-        "name": "open hands",
-        "slug": "open_hands"
-      },
+      { "emoji": "🫶", "name": "heart hands", "slug": "heart_hands_love" },
+      { "emoji": "👐", "name": "open hands", "slug": "open_hands" },
       {
         "emoji": "🤲",
         "name": "palms up together",
@@ -999,46 +799,26 @@
         "name": "folded hands",
         "slug": "folded_hands_ask_hand_high_5_high_five_please_pray_thanks"
       },
-      {
-        "emoji": "✍️",
-        "name": "writing hand",
-        "slug": "writing_hand_write"
-      },
+      { "emoji": "✍️", "name": "writing hand", "slug": "writing_hand_write" },
       {
         "emoji": "💅",
         "name": "nail polish",
         "slug": "nail_polish_care_manicure_cosmetics"
       },
-      {
-        "emoji": "🤳",
-        "name": "selfie",
-        "slug": "selfie_camera_phone_selfie"
-      },
+      { "emoji": "🤳", "name": "selfie", "slug": "selfie_camera_phone_selfie" },
       {
         "emoji": "💪",
         "name": "flexed biceps",
         "slug": "flexed_biceps_comic_flex_muscle_strength"
       },
-      {
-        "emoji": "🦾",
-        "name": "mechanical arm",
-        "slug": "mechanical_arm"
-      },
+      { "emoji": "🦾", "name": "mechanical arm", "slug": "mechanical_arm" },
       {
         "emoji": "🦿",
         "name": "mechanical leg",
         "slug": "mechanical_leg_kick"
       },
-      {
-        "emoji": "🦵",
-        "name": "leg",
-        "slug": "leg_kick_limb"
-      },
-      {
-        "emoji": "🦶",
-        "name": "foot",
-        "slug": "foot_kick_stomp"
-      },
+      { "emoji": "🦵", "name": "leg", "slug": "leg_kick_limb" },
+      { "emoji": "🦶", "name": "foot", "slug": "foot_kick_stomp" },
       {
         "emoji": "👂",
         "name": "ear",
@@ -1049,16 +829,8 @@
         "name": "ear with hearing aid",
         "slug": "ear_with_hearing_aid_accessibility"
       },
-      {
-        "emoji": "👃",
-        "name": "nose",
-        "slug": "nose_body"
-      },
-      {
-        "emoji": "🧠",
-        "name": "brain",
-        "slug": "brain_intelligent"
-      },
+      { "emoji": "👃", "name": "nose", "slug": "nose_body" },
+      { "emoji": "🧠", "name": "brain", "slug": "brain_intelligent" },
       {
         "emoji": "🫀",
         "name": "anatomical heart",
@@ -1069,61 +841,25 @@
         "name": "lungs",
         "slug": "lungs_organ_exhalation_inhalation_respiration"
       },
-      {
-        "emoji": "🦷",
-        "name": "tooth",
-        "slug": "tooth_dentist"
-      },
-      {
-        "emoji": "🦴",
-        "name": "bone",
-        "slug": "bone_skeleton"
-      },
-      {
-        "emoji": "👀",
-        "name": "eyes",
-        "slug": "eyes_face_eye"
-      },
-      {
-        "emoji": "👁️",
-        "name": "eye",
-        "slug": "eye_body"
-      },
-      {
-        "emoji": "👅",
-        "name": "tongue",
-        "slug": "tongue_body"
-      },
-      {
-        "emoji": "👄",
-        "name": "mouth",
-        "slug": "mouth_lips"
-      },
+      { "emoji": "🦷", "name": "tooth", "slug": "tooth_dentist" },
+      { "emoji": "🦴", "name": "bone", "slug": "bone_skeleton" },
+      { "emoji": "👀", "name": "eyes", "slug": "eyes_face_eye" },
+      { "emoji": "👁️", "name": "eye", "slug": "eye_body" },
+      { "emoji": "👅", "name": "tongue", "slug": "tongue_body" },
+      { "emoji": "👄", "name": "mouth", "slug": "mouth_lips" },
       {
         "emoji": "🫦",
         "name": "biting lip",
         "slug": "biting_lip_anxious_fear_flirting_nervous_uncomfortable_worried"
       },
-      {
-        "emoji": "👶",
-        "name": "baby",
-        "slug": "baby_young"
-      },
+      { "emoji": "👶", "name": "baby", "slug": "baby_young" },
       {
         "emoji": "🧒",
         "name": "child",
         "slug": "child_gender_neutral_young_unspecified_gender"
       },
-      {
-        "emoji": "👦",
-        "name": "boy",
-        "slug": "boy_young"
-      },
-      {
-        "emoji": "👧",
-        "name": "girl",
-        "slug": "girl_Virgo_young_zodiac"
-      },
+      { "emoji": "👦", "name": "boy", "slug": "boy_young" },
+      { "emoji": "👧", "name": "girl", "slug": "girl_Virgo_young_zodiac" },
       {
         "emoji": "🧑",
         "name": "person",
@@ -1134,66 +870,26 @@
         "name": "person blond hair",
         "slug": "person_blond_hair"
       },
-      {
-        "emoji": "👨",
-        "name": "man",
-        "slug": "man_adult_man"
-      },
+      { "emoji": "👨", "name": "man", "slug": "man_adult_man" },
       {
         "emoji": "🧔",
         "name": "person beard",
         "slug": "person_beard_bewhiskered"
       },
-      {
-        "emoji": "🧔‍♂️",
-        "name": "man beard",
-        "slug": "man_beard"
-      },
-      {
-        "emoji": "🧔‍♀️",
-        "name": "woman beard",
-        "slug": "woman_beard"
-      },
-      {
-        "emoji": "👨‍🦰",
-        "name": "man red hair",
-        "slug": "man_red_hair"
-      },
-      {
-        "emoji": "👨‍🦱",
-        "name": "man curly hair",
-        "slug": "man_curly_hair"
-      },
-      {
-        "emoji": "👨‍🦳",
-        "name": "man white hair",
-        "slug": "man_white_hair"
-      },
-      {
-        "emoji": "👨‍🦲",
-        "name": "man bald",
-        "slug": "man_bald"
-      },
-      {
-        "emoji": "👩",
-        "name": "woman",
-        "slug": "woman_adult"
-      },
-      {
-        "emoji": "👩‍🦰",
-        "name": "woman red hair",
-        "slug": "woman_red_hair"
-      },
+      { "emoji": "🧔‍♂️", "name": "man beard", "slug": "man_beard" },
+      { "emoji": "🧔‍♀️", "name": "woman beard", "slug": "woman_beard" },
+      { "emoji": "👨‍🦰", "name": "man red hair", "slug": "man_red_hair" },
+      { "emoji": "👨‍🦱", "name": "man curly hair", "slug": "man_curly_hair" },
+      { "emoji": "👨‍🦳", "name": "man white hair", "slug": "man_white_hair" },
+      { "emoji": "👨‍🦲", "name": "man bald", "slug": "man_bald" },
+      { "emoji": "👩", "name": "woman", "slug": "woman_adult" },
+      { "emoji": "👩‍🦰", "name": "woman red hair", "slug": "woman_red_hair" },
       {
         "emoji": "🧑‍🦰",
         "name": "person red hair",
         "slug": "person_red_hair_unspecified_gender"
       },
-      {
-        "emoji": "👩‍🦱",
-        "name": "woman curly hair",
-        "slug": "woman_curly_hair"
-      },
+      { "emoji": "👩‍🦱", "name": "woman curly hair", "slug": "woman_curly_hair" },
       {
         "emoji": "🧑‍🦱",
         "name": "person curly hair",
@@ -1209,51 +905,19 @@
         "name": "person white hair",
         "slug": "person_white_hair"
       },
-      {
-        "emoji": "👩‍🦲",
-        "name": "woman bald",
-        "slug": "woman_bald"
-      },
-      {
-        "emoji": "🧑‍🦲",
-        "name": "person bald",
-        "slug": "person_bald"
-      },
-      {
-        "emoji": "👱‍♀️",
-        "name": "woman blond hair",
-        "slug": "woman_blond_hair"
-      },
-      {
-        "emoji": "👱‍♂️",
-        "name": "man blond hair",
-        "slug": "man_blond_hair"
-      },
-      {
-        "emoji": "🧓",
-        "name": "older person",
-        "slug": "older_person"
-      },
-      {
-        "emoji": "👴",
-        "name": "old man",
-        "slug": "old_man"
-      },
-      {
-        "emoji": "👵",
-        "name": "old woman",
-        "slug": "old_woman"
-      },
+      { "emoji": "👩‍🦲", "name": "woman bald", "slug": "woman_bald" },
+      { "emoji": "🧑‍🦲", "name": "person bald", "slug": "person_bald" },
+      { "emoji": "👱‍♀️", "name": "woman blond hair", "slug": "woman_blond_hair" },
+      { "emoji": "👱‍♂️", "name": "man blond hair", "slug": "man_blond_hair" },
+      { "emoji": "🧓", "name": "older person", "slug": "older_person" },
+      { "emoji": "👴", "name": "old man", "slug": "old_man" },
+      { "emoji": "👵", "name": "old woman", "slug": "old_woman" },
       {
         "emoji": "🙍",
         "name": "person frowning",
         "slug": "person_frowning_gesture"
       },
-      {
-        "emoji": "🙍‍♂️",
-        "name": "man frowning",
-        "slug": "man_frowning_gesture"
-      },
+      { "emoji": "🙍‍♂️", "name": "man frowning", "slug": "man_frowning_gesture" },
       {
         "emoji": "🙍‍♀️",
         "name": "woman frowning",
@@ -1264,11 +928,7 @@
         "name": "person pouting",
         "slug": "person_pouting_gesture"
       },
-      {
-        "emoji": "🙎‍♂️",
-        "name": "man pouting",
-        "slug": "man_pouting_gesture"
-      },
+      { "emoji": "🙎‍♂️", "name": "man pouting", "slug": "man_pouting_gesture" },
       {
         "emoji": "🙎‍♀️",
         "name": "woman pouting",
@@ -1339,16 +999,8 @@
         "name": "deaf person",
         "slug": "deaf_person_ear_deafness_accessibility"
       },
-      {
-        "emoji": "🧏‍♂️",
-        "name": "deaf man",
-        "slug": "deaf_man"
-      },
-      {
-        "emoji": "🧏‍♀️",
-        "name": "deaf woman",
-        "slug": "deaf_woman"
-      },
+      { "emoji": "🧏‍♂️", "name": "deaf man", "slug": "deaf_man" },
+      { "emoji": "🧏‍♀️", "name": "deaf woman", "slug": "deaf_woman" },
       {
         "emoji": "🙇",
         "name": "person bowing",
@@ -1409,16 +1061,8 @@
         "name": "woman health worker",
         "slug": "woman_health_worker_doctor_nurse_therapist"
       },
-      {
-        "emoji": "🧑‍🎓",
-        "name": "student",
-        "slug": "student_graduate"
-      },
-      {
-        "emoji": "👨‍🎓",
-        "name": "man student",
-        "slug": "man_student_graduate"
-      },
+      { "emoji": "🧑‍🎓", "name": "student", "slug": "student_graduate" },
+      { "emoji": "👨‍🎓", "name": "man student", "slug": "man_student_graduate" },
       {
         "emoji": "👩‍🎓",
         "name": "woman student",
@@ -1439,11 +1083,7 @@
         "name": "woman teacher",
         "slug": "woman_teacher_instructor_professor"
       },
-      {
-        "emoji": "🧑‍⚖️",
-        "name": "judge",
-        "slug": "judge_scales_justice"
-      },
+      { "emoji": "🧑‍⚖️", "name": "judge", "slug": "judge_scales_justice" },
       {
         "emoji": "👨‍⚖️",
         "name": "man judge",
@@ -1454,11 +1094,7 @@
         "name": "woman judge",
         "slug": "woman_judge_scales_justice"
       },
-      {
-        "emoji": "🧑‍🌾",
-        "name": "farmer",
-        "slug": "farmer_gardener_rancher"
-      },
+      { "emoji": "🧑‍🌾", "name": "farmer", "slug": "farmer_gardener_rancher" },
       {
         "emoji": "👨‍🌾",
         "name": "man farmer",
@@ -1469,21 +1105,9 @@
         "name": "woman farmer",
         "slug": "woman_farmer_gardener_rancher"
       },
-      {
-        "emoji": "🧑‍🍳",
-        "name": "cook",
-        "slug": "cook_chef"
-      },
-      {
-        "emoji": "👨‍🍳",
-        "name": "man cook",
-        "slug": "man_cook"
-      },
-      {
-        "emoji": "👩‍🍳",
-        "name": "woman cook",
-        "slug": "woman_cook"
-      },
+      { "emoji": "🧑‍🍳", "name": "cook", "slug": "cook_chef" },
+      { "emoji": "👨‍🍳", "name": "man cook", "slug": "man_cook" },
+      { "emoji": "👩‍🍳", "name": "woman cook", "slug": "woman_cook" },
       {
         "emoji": "🧑‍🔧",
         "name": "mechanic",
@@ -1574,71 +1198,23 @@
         "name": "woman singer",
         "slug": "woman_singer_actress_entertainer_rock_star"
       },
-      {
-        "emoji": "🧑‍🎨",
-        "name": "artist",
-        "slug": "artist"
-      },
-      {
-        "emoji": "👨‍🎨",
-        "name": "man artist",
-        "slug": "man_artist"
-      },
-      {
-        "emoji": "👩‍🎨",
-        "name": "woman artist",
-        "slug": "woman_artist"
-      },
-      {
-        "emoji": "🧑‍✈️",
-        "name": "pilot",
-        "slug": "pilot_plane"
-      },
-      {
-        "emoji": "👨‍✈️",
-        "name": "man pilot",
-        "slug": "man_pilot"
-      },
-      {
-        "emoji": "👩‍✈️",
-        "name": "woman pilot",
-        "slug": "woman_pilot"
-      },
-      {
-        "emoji": "🧑‍🚀",
-        "name": "astronaut",
-        "slug": "astronaut"
-      },
-      {
-        "emoji": "👨‍🚀",
-        "name": "man astronaut",
-        "slug": "man_astronaut"
-      },
-      {
-        "emoji": "👩‍🚀",
-        "name": "woman astronaut",
-        "slug": "woman_astronaut"
-      },
-      {
-        "emoji": "🧑‍🚒",
-        "name": "firefighter",
-        "slug": "firefighter"
-      },
-      {
-        "emoji": "👨‍🚒",
-        "name": "man firefighter",
-        "slug": "man_firefighter"
-      },
+      { "emoji": "🧑‍🎨", "name": "artist", "slug": "artist" },
+      { "emoji": "👨‍🎨", "name": "man artist", "slug": "man_artist" },
+      { "emoji": "👩‍🎨", "name": "woman artist", "slug": "woman_artist" },
+      { "emoji": "🧑‍✈️", "name": "pilot", "slug": "pilot_plane" },
+      { "emoji": "👨‍✈️", "name": "man pilot", "slug": "man_pilot" },
+      { "emoji": "👩‍✈️", "name": "woman pilot", "slug": "woman_pilot" },
+      { "emoji": "🧑‍🚀", "name": "astronaut", "slug": "astronaut" },
+      { "emoji": "👨‍🚀", "name": "man astronaut", "slug": "man_astronaut" },
+      { "emoji": "👩‍🚀", "name": "woman astronaut", "slug": "woman_astronaut" },
+      { "emoji": "🧑‍🚒", "name": "firefighter", "slug": "firefighter" },
+      { "emoji": "👨‍🚒", "name": "man firefighter", "slug": "man_firefighter" },
       {
         "emoji": "👩‍🚒",
         "name": "woman firefighter",
         "slug": "woman_firefighter"
       },
-      {
-        "emoji": "👮",
-        "name": "police officer",
-        "slug": "police_officer_cop"
-      },
+      { "emoji": "👮", "name": "police officer", "slug": "police_officer_cop" },
       {
         "emoji": "👮‍♂️",
         "name": "man police officer",
@@ -1649,11 +1225,7 @@
         "name": "woman police officer",
         "slug": "woman_police_officer_cop"
       },
-      {
-        "emoji": "🕵️",
-        "name": "detective",
-        "slug": "detective_spy_sleuth"
-      },
+      { "emoji": "🕵️", "name": "detective", "slug": "detective_spy_sleuth" },
       {
         "emoji": "🕵️‍♂️",
         "name": "man detective",
@@ -1664,26 +1236,10 @@
         "name": "woman detective",
         "slug": "woman_detective_spy_sleuth"
       },
-      {
-        "emoji": "💂",
-        "name": "guard",
-        "slug": "guard"
-      },
-      {
-        "emoji": "💂‍♂️",
-        "name": "man guard",
-        "slug": "man_guard"
-      },
-      {
-        "emoji": "💂‍♀️",
-        "name": "woman guard",
-        "slug": "woman_guard"
-      },
-      {
-        "emoji": "🥷",
-        "name": "ninja_fighter_stealth",
-        "slug": "ninja"
-      },
+      { "emoji": "💂", "name": "guard", "slug": "guard" },
+      { "emoji": "💂‍♂️", "name": "man guard", "slug": "man_guard" },
+      { "emoji": "💂‍♀️", "name": "woman guard", "slug": "woman_guard" },
+      { "emoji": "🥷", "name": "ninja_fighter_stealth", "slug": "ninja" },
       {
         "emoji": "👷",
         "name": "construction worker",
@@ -1704,16 +1260,8 @@
         "name": "person with crown",
         "slug": "person_with_crown"
       },
-      {
-        "emoji": "🤴",
-        "name": "prince",
-        "slug": "prince"
-      },
-      {
-        "emoji": "👸",
-        "name": "princess",
-        "slug": "princess"
-      },
+      { "emoji": "🤴", "name": "prince", "slug": "prince" },
+      { "emoji": "👸", "name": "princess", "slug": "princess" },
       {
         "emoji": "👳",
         "name": "person wearing turban",
@@ -1739,76 +1287,28 @@
         "name": "woman with headscarf",
         "slug": "woman_with_headscarf_hijab"
       },
-      {
-        "emoji": "🤵",
-        "name": "person in tuxedo",
-        "slug": "person_in_tuxedo"
-      },
-      {
-        "emoji": "🤵‍♂️",
-        "name": "man in tuxedo",
-        "slug": "man_in_tuxedo"
-      },
-      {
-        "emoji": "🤵‍♀️",
-        "name": "woman in tuxedo",
-        "slug": "woman_in_tuxedo"
-      },
-      {
-        "emoji": "👰",
-        "name": "person with veil",
-        "slug": "person_with_veil"
-      },
-      {
-        "emoji": "👰‍♂️",
-        "name": "man with veil",
-        "slug": "man_with_veil"
-      },
-      {
-        "emoji": "👰‍♀️",
-        "name": "woman with veil",
-        "slug": "woman_with_veil"
-      },
-      {
-        "emoji": "🤰",
-        "name": "pregnant woman",
-        "slug": "pregnant_woman"
-      },
-      {
-        "emoji": "🫃",
-        "name": "pregnant man",
-        "slug": "pregnant_man"
-      },
-      {
-        "emoji": "🫄",
-        "name": "pregnant person",
-        "slug": "pregnant_person"
-      },
-      {
-        "emoji": "🤱",
-        "name": "breast-feeding",
-        "slug": "breast_feeding"
-      },
+      { "emoji": "🤵", "name": "person in tuxedo", "slug": "person_in_tuxedo" },
+      { "emoji": "🤵‍♂️", "name": "man in tuxedo", "slug": "man_in_tuxedo" },
+      { "emoji": "🤵‍♀️", "name": "woman in tuxedo", "slug": "woman_in_tuxedo" },
+      { "emoji": "👰", "name": "person with veil", "slug": "person_with_veil" },
+      { "emoji": "👰‍♂️", "name": "man with veil", "slug": "man_with_veil" },
+      { "emoji": "👰‍♀️", "name": "woman with veil", "slug": "woman_with_veil" },
+      { "emoji": "🤰", "name": "pregnant woman", "slug": "pregnant_woman" },
+      { "emoji": "🫃", "name": "pregnant man", "slug": "pregnant_man" },
+      { "emoji": "🫄", "name": "pregnant person", "slug": "pregnant_person" },
+      { "emoji": "🤱", "name": "breast-feeding", "slug": "breast_feeding" },
       {
         "emoji": "👩‍🍼",
         "name": "woman feeding baby",
         "slug": "woman_feeding_baby"
       },
-      {
-        "emoji": "👨‍🍼",
-        "name": "man feeding baby",
-        "slug": "man_feeding_baby"
-      },
+      { "emoji": "👨‍🍼", "name": "man feeding baby", "slug": "man_feeding_baby" },
       {
         "emoji": "🧑‍🍼",
         "name": "person feeding baby",
         "slug": "person_feeding_baby"
       },
-      {
-        "emoji": "👼",
-        "name": "baby angel",
-        "slug": "baby_angel"
-      },
+      { "emoji": "👼", "name": "baby angel", "slug": "baby_angel" },
       {
         "emoji": "🎅",
         "name": "Santa Claus",
@@ -1819,26 +1319,10 @@
         "name": "Mrs. Claus",
         "slug": "mrs_claus_christmas_mother_santa_claus"
       },
-      {
-        "emoji": "🧑‍🎄",
-        "name": "mx claus",
-        "slug": "mx_claus"
-      },
-      {
-        "emoji": "🦸",
-        "name": "superhero",
-        "slug": "superhero"
-      },
-      {
-        "emoji": "🦸‍♂️",
-        "name": "man superhero",
-        "slug": "man_superhero"
-      },
-      {
-        "emoji": "🦸‍♀️",
-        "name": "woman superhero",
-        "slug": "woman_superhero"
-      },
+      { "emoji": "🧑‍🎄", "name": "mx claus", "slug": "mx_claus" },
+      { "emoji": "🦸", "name": "superhero", "slug": "superhero" },
+      { "emoji": "🦸‍♂️", "name": "man superhero", "slug": "man_superhero" },
+      { "emoji": "🦸‍♀️", "name": "woman superhero", "slug": "woman_superhero" },
       {
         "emoji": "🦹",
         "name": "supervillain",
@@ -1854,116 +1338,32 @@
         "name": "woman supervillain",
         "slug": "woman_supervillain_criminal_evil"
       },
-      {
-        "emoji": "🧙",
-        "name": "mage",
-        "slug": "mage_sorceress_wizard"
-      },
+      { "emoji": "🧙", "name": "mage", "slug": "mage_sorceress_wizard" },
       {
         "emoji": "🧙‍♂️",
         "name": "man mage",
         "slug": "man_mage_sorceress_wizard"
       },
-      {
-        "emoji": "🧙‍♀️",
-        "name": "woman mage",
-        "slug": "witch"
-      },
-      {
-        "emoji": "🧚",
-        "name": "fairy",
-        "slug": "fairy"
-      },
-      {
-        "emoji": "🧚‍♂️",
-        "name": "man fairy",
-        "slug": "man_fairy"
-      },
-      {
-        "emoji": "🧚‍♀️",
-        "name": "woman fairy",
-        "slug": "woman_fairy"
-      },
-      {
-        "emoji": "🧛",
-        "name": "vampire",
-        "slug": "vampire"
-      },
-      {
-        "emoji": "🧛‍♂️",
-        "name": "man vampire",
-        "slug": "man_vampire"
-      },
-      {
-        "emoji": "🧛‍♀️",
-        "name": "woman vampire",
-        "slug": "woman_vampire"
-      },
-      {
-        "emoji": "🧜",
-        "name": "merperson",
-        "slug": "merperson"
-      },
-      {
-        "emoji": "🧜‍♂️",
-        "name": "merman",
-        "slug": "merman"
-      },
-      {
-        "emoji": "🧜‍♀️",
-        "name": "mermaid",
-        "slug": "mermaid"
-      },
-      {
-        "emoji": "🧝",
-        "name": "elf",
-        "slug": "elf"
-      },
-      {
-        "emoji": "🧝‍♂️",
-        "name": "man elf",
-        "slug": "man_elf"
-      },
-      {
-        "emoji": "🧝‍♀️",
-        "name": "woman elf",
-        "slug": "woman_elf"
-      },
-      {
-        "emoji": "🧞",
-        "name": "genie",
-        "slug": "genie"
-      },
-      {
-        "emoji": "🧞‍♂️",
-        "name": "man genie",
-        "slug": "man_genie"
-      },
-      {
-        "emoji": "🧞‍♀️",
-        "name": "woman genie",
-        "slug": "woman_genie"
-      },
-      {
-        "emoji": "🧟",
-        "name": "zombie",
-        "slug": "zombie"
-      },
-      {
-        "emoji": "🧟‍♂️",
-        "name": "man zombie",
-        "slug": "man_zombie"
-      },
-      {
-        "emoji": "🧟‍♀️",
-        "name": "woman zombie",
-        "slug": "woman_zombie"
-      },
-      {
-        "emoji": "🧌",
-        "name": "troll",
-        "slug": "troll"
-      },
+      { "emoji": "🧙‍♀️", "name": "woman mage", "slug": "witch" },
+      { "emoji": "🧚", "name": "fairy", "slug": "fairy" },
+      { "emoji": "🧚‍♂️", "name": "man fairy", "slug": "man_fairy" },
+      { "emoji": "🧚‍♀️", "name": "woman fairy", "slug": "woman_fairy" },
+      { "emoji": "🧛", "name": "vampire", "slug": "vampire" },
+      { "emoji": "🧛‍♂️", "name": "man vampire", "slug": "man_vampire" },
+      { "emoji": "🧛‍♀️", "name": "woman vampire", "slug": "woman_vampire" },
+      { "emoji": "🧜", "name": "merperson", "slug": "merperson" },
+      { "emoji": "🧜‍♂️", "name": "merman", "slug": "merman" },
+      { "emoji": "🧜‍♀️", "name": "mermaid", "slug": "mermaid" },
+      { "emoji": "🧝", "name": "elf", "slug": "elf" },
+      { "emoji": "🧝‍♂️", "name": "man elf", "slug": "man_elf" },
+      { "emoji": "🧝‍♀️", "name": "woman elf", "slug": "woman_elf" },
+      { "emoji": "🧞", "name": "genie", "slug": "genie" },
+      { "emoji": "🧞‍♂️", "name": "man genie", "slug": "man_genie" },
+      { "emoji": "🧞‍♀️", "name": "woman genie", "slug": "woman_genie" },
+      { "emoji": "🧟", "name": "zombie", "slug": "zombie" },
+      { "emoji": "🧟‍♂️", "name": "man zombie", "slug": "man_zombie" },
+      { "emoji": "🧟‍♀️", "name": "woman zombie", "slug": "woman_zombie" },
+      { "emoji": "🧌", "name": "troll", "slug": "troll" },
       {
         "emoji": "💆",
         "name": "person getting massage",
@@ -1999,46 +1399,14 @@
         "name": "person walking",
         "slug": "person_walking_hike"
       },
-      {
-        "emoji": "🚶‍♂️",
-        "name": "man walking",
-        "slug": "man_walking_hike"
-      },
-      {
-        "emoji": "🚶‍♀️",
-        "name": "woman walking",
-        "slug": "woman_walking_hike"
-      },
-      {
-        "emoji": "🧍",
-        "name": "person standing",
-        "slug": "person_standing"
-      },
-      {
-        "emoji": "🧍‍♂️",
-        "name": "man standing",
-        "slug": "man_standing"
-      },
-      {
-        "emoji": "🧍‍♀️",
-        "name": "woman standing",
-        "slug": "woman_standing"
-      },
-      {
-        "emoji": "🧎",
-        "name": "person kneeling",
-        "slug": "person_kneeling"
-      },
-      {
-        "emoji": "🧎‍♂️",
-        "name": "man kneeling",
-        "slug": "man_kneeling"
-      },
-      {
-        "emoji": "🧎‍♀️",
-        "name": "woman kneeling",
-        "slug": "woman_kneeling"
-      },
+      { "emoji": "🚶‍♂️", "name": "man walking", "slug": "man_walking_hike" },
+      { "emoji": "🚶‍♀️", "name": "woman walking", "slug": "woman_walking_hike" },
+      { "emoji": "🧍", "name": "person standing", "slug": "person_standing" },
+      { "emoji": "🧍‍♂️", "name": "man standing", "slug": "man_standing" },
+      { "emoji": "🧍‍♀️", "name": "woman standing", "slug": "woman_standing" },
+      { "emoji": "🧎", "name": "person kneeling", "slug": "person_kneeling" },
+      { "emoji": "🧎‍♂️", "name": "man kneeling", "slug": "man_kneeling" },
+      { "emoji": "🧎‍♀️", "name": "woman kneeling", "slug": "woman_kneeling" },
       {
         "emoji": "🧑‍🦯",
         "name": "person with white cane",
@@ -2084,31 +1452,11 @@
         "name": "woman in manual wheelchair",
         "slug": "woman_in_manual_wheelchair_accessibility"
       },
-      {
-        "emoji": "🏃",
-        "name": "person running",
-        "slug": "person_running"
-      },
-      {
-        "emoji": "🏃‍♂️",
-        "name": "man running",
-        "slug": "man_running"
-      },
-      {
-        "emoji": "🏃‍♀️",
-        "name": "woman running",
-        "slug": "woman_running"
-      },
-      {
-        "emoji": "💃",
-        "name": "woman dancing",
-        "slug": "woman_dancing"
-      },
-      {
-        "emoji": "🕺",
-        "name": "man dancing",
-        "slug": "man_dancing"
-      },
+      { "emoji": "🏃", "name": "person running", "slug": "person_running" },
+      { "emoji": "🏃‍♂️", "name": "man running", "slug": "man_running" },
+      { "emoji": "🏃‍♀️", "name": "woman running", "slug": "woman_running" },
+      { "emoji": "💃", "name": "woman dancing", "slug": "woman_dancing" },
+      { "emoji": "🕺", "name": "man dancing", "slug": "man_dancing" },
       {
         "emoji": "🕴️",
         "name": "person in suit levitating",
@@ -2144,101 +1492,33 @@
         "name": "woman in steamy room",
         "slug": "woman_in_steamy_room"
       },
-      {
-        "emoji": "🧗",
-        "name": "person climbing",
-        "slug": "person_climbing"
-      },
-      {
-        "emoji": "🧗‍♂️",
-        "name": "man climbing",
-        "slug": "man_climbing"
-      },
-      {
-        "emoji": "🧗‍♀️",
-        "name": "woman climbing",
-        "slug": "woman_climbing"
-      },
-      {
-        "emoji": "🤺",
-        "name": "person fencing",
-        "slug": "person_fencing"
-      },
-      {
-        "emoji": "🏇",
-        "name": "horse racing",
-        "slug": "horse_racing"
-      },
-      {
-        "emoji": "⛷️",
-        "name": "skier",
-        "slug": "skier"
-      },
-      {
-        "emoji": "🏂",
-        "name": "snowboarder",
-        "slug": "snowboarder"
-      },
-      {
-        "emoji": "🏌️",
-        "name": "person golfing",
-        "slug": "person_golfing"
-      },
-      {
-        "emoji": "🏌️‍♂️",
-        "name": "man golfing",
-        "slug": "man_golfing"
-      },
-      {
-        "emoji": "🏌️‍♀️",
-        "name": "woman golfing",
-        "slug": "woman_golfing"
-      },
-      {
-        "emoji": "🏄",
-        "name": "person surfing",
-        "slug": "person_surfing"
-      },
-      {
-        "emoji": "🏄‍♂️",
-        "name": "man surfing",
-        "slug": "man_surfing"
-      },
-      {
-        "emoji": "🏄‍♀️",
-        "name": "woman surfing",
-        "slug": "woman_surfing"
-      },
+      { "emoji": "🧗", "name": "person climbing", "slug": "person_climbing" },
+      { "emoji": "🧗‍♂️", "name": "man climbing", "slug": "man_climbing" },
+      { "emoji": "🧗‍♀️", "name": "woman climbing", "slug": "woman_climbing" },
+      { "emoji": "🤺", "name": "person fencing", "slug": "person_fencing" },
+      { "emoji": "🏇", "name": "horse racing", "slug": "horse_racing" },
+      { "emoji": "⛷️", "name": "skier", "slug": "skier" },
+      { "emoji": "🏂", "name": "snowboarder", "slug": "snowboarder" },
+      { "emoji": "🏌️", "name": "person golfing", "slug": "person_golfing" },
+      { "emoji": "🏌️‍♂️", "name": "man golfing", "slug": "man_golfing" },
+      { "emoji": "🏌️‍♀️", "name": "woman golfing", "slug": "woman_golfing" },
+      { "emoji": "🏄", "name": "person surfing", "slug": "person_surfing" },
+      { "emoji": "🏄‍♂️", "name": "man surfing", "slug": "man_surfing" },
+      { "emoji": "🏄‍♀️", "name": "woman surfing", "slug": "woman_surfing" },
       {
         "emoji": "🚣",
         "name": "person rowing boat",
         "slug": "person_rowing_boat"
       },
-      {
-        "emoji": "🚣‍♂️",
-        "name": "man rowing boat",
-        "slug": "man_rowing_boat"
-      },
+      { "emoji": "🚣‍♂️", "name": "man rowing boat", "slug": "man_rowing_boat" },
       {
         "emoji": "🚣‍♀️",
         "name": "woman rowing boat",
         "slug": "woman_rowing_boat"
       },
-      {
-        "emoji": "🏊",
-        "name": "person swimming",
-        "slug": "person_swimming"
-      },
-      {
-        "emoji": "🏊‍♂️",
-        "name": "man swimming",
-        "slug": "man_swimming"
-      },
-      {
-        "emoji": "🏊‍♀️",
-        "name": "woman swimming",
-        "slug": "woman_swimming"
-      },
+      { "emoji": "🏊", "name": "person swimming", "slug": "person_swimming" },
+      { "emoji": "🏊‍♂️", "name": "man swimming", "slug": "man_swimming" },
+      { "emoji": "🏊‍♀️", "name": "woman swimming", "slug": "woman_swimming" },
       {
         "emoji": "⛹️",
         "name": "person bouncing ball",
@@ -2269,21 +1549,9 @@
         "name": "woman lifting weights",
         "slug": "woman_lifting_weights"
       },
-      {
-        "emoji": "🚴",
-        "name": "person biking",
-        "slug": "person_biking"
-      },
-      {
-        "emoji": "🚴‍♂️",
-        "name": "man biking",
-        "slug": "man_biking"
-      },
-      {
-        "emoji": "🚴‍♀️",
-        "name": "woman biking",
-        "slug": "woman_biking"
-      },
+      { "emoji": "🚴", "name": "person biking", "slug": "person_biking" },
+      { "emoji": "🚴‍♂️", "name": "man biking", "slug": "man_biking" },
+      { "emoji": "🚴‍♀️", "name": "woman biking", "slug": "woman_biking" },
       {
         "emoji": "🚵",
         "name": "person mountain biking",
@@ -2304,31 +1572,15 @@
         "name": "person cartwheeling",
         "slug": "person_cartwheeling"
       },
-      {
-        "emoji": "🤸‍♂️",
-        "name": "man cartwheeling",
-        "slug": "man_cartwheeling"
-      },
+      { "emoji": "🤸‍♂️", "name": "man cartwheeling", "slug": "man_cartwheeling" },
       {
         "emoji": "🤸‍♀️",
         "name": "woman cartwheeling",
         "slug": "woman_cartwheeling"
       },
-      {
-        "emoji": "🤼",
-        "name": "people wrestling",
-        "slug": "people_wrestling"
-      },
-      {
-        "emoji": "🤼‍♂️",
-        "name": "men wrestling",
-        "slug": "men_wrestling"
-      },
-      {
-        "emoji": "🤼‍♀️",
-        "name": "women wrestling",
-        "slug": "women_wrestling"
-      },
+      { "emoji": "🤼", "name": "people wrestling", "slug": "people_wrestling" },
+      { "emoji": "🤼‍♂️", "name": "men wrestling", "slug": "men_wrestling" },
+      { "emoji": "🤼‍♀️", "name": "women wrestling", "slug": "women_wrestling" },
       {
         "emoji": "🤽",
         "name": "person playing water polo",
@@ -2359,21 +1611,9 @@
         "name": "woman playing handball",
         "slug": "woman_playing_handball"
       },
-      {
-        "emoji": "🤹",
-        "name": "person juggling",
-        "slug": "person_juggling"
-      },
-      {
-        "emoji": "🤹‍♂️",
-        "name": "man juggling",
-        "slug": "man_juggling"
-      },
-      {
-        "emoji": "🤹‍♀️",
-        "name": "woman juggling",
-        "slug": "woman_juggling"
-      },
+      { "emoji": "🤹", "name": "person juggling", "slug": "person_juggling" },
+      { "emoji": "🤹‍♂️", "name": "man juggling", "slug": "man_juggling" },
+      { "emoji": "🤹‍♀️", "name": "woman juggling", "slug": "woman_juggling" },
       {
         "emoji": "🧘",
         "name": "person in lotus position",
@@ -2394,11 +1634,7 @@
         "name": "person taking bath",
         "slug": "person_taking_bath"
       },
-      {
-        "emoji": "🛌",
-        "name": "person in bed",
-        "slug": "person_in_bed"
-      },
+      { "emoji": "🛌", "name": "person in bed", "slug": "person_in_bed" },
       {
         "emoji": "🧑‍🤝‍🧑",
         "name": "people holding hands",
@@ -2419,21 +1655,9 @@
         "name": "men holding hands",
         "slug": "men_holding_hands"
       },
-      {
-        "emoji": "💏",
-        "name": "kiss",
-        "slug": "kiss"
-      },
-      {
-        "emoji": "👩‍❤️‍💋‍👨",
-        "name": "kiss woman, man",
-        "slug": "kiss_woman_man"
-      },
-      {
-        "emoji": "👨‍❤️‍💋‍👨",
-        "name": "kiss man, man",
-        "slug": "kiss_man_man"
-      },
+      { "emoji": "💏", "name": "kiss", "slug": "kiss" },
+      { "emoji": "👩‍❤️‍💋‍👨", "name": "kiss woman, man", "slug": "kiss_woman_man" },
+      { "emoji": "👨‍❤️‍💋‍👨", "name": "kiss man, man", "slug": "kiss_man_man" },
       {
         "emoji": "👩‍❤️‍💋‍👩",
         "name": "kiss woman, woman",
@@ -2459,11 +1683,7 @@
         "name": "couple with heart woman, woman",
         "slug": "couple_with_heart_woman_woman"
       },
-      {
-        "emoji": "👪",
-        "name": "family",
-        "slug": "family"
-      },
+      { "emoji": "👪", "name": "family", "slug": "family" },
       {
         "emoji": "👨‍👩‍👦",
         "name": "family man, woman, boy",
@@ -2539,21 +1759,13 @@
         "name": "family woman, woman, girl, girl",
         "slug": "family_woman_woman_girl_girl"
       },
-      {
-        "emoji": "👨‍👦",
-        "name": "family man, boy",
-        "slug": "family_man_boy"
-      },
+      { "emoji": "👨‍👦", "name": "family man, boy", "slug": "family_man_boy" },
       {
         "emoji": "👨‍👦‍👦",
         "name": "family man, boy, boy",
         "slug": "family_man_boy_boy"
       },
-      {
-        "emoji": "👨‍👧",
-        "name": "family man, girl",
-        "slug": "family_man_girl"
-      },
+      { "emoji": "👨‍👧", "name": "family man, girl", "slug": "family_man_girl" },
       {
         "emoji": "👨‍👧‍👦",
         "name": "family man, girl, boy",
@@ -2589,11 +1801,7 @@
         "name": "family woman, girl, girl",
         "slug": "family_woman_girl_girl"
       },
-      {
-        "emoji": "🗣️",
-        "name": "speaking head",
-        "slug": "speaking_head"
-      },
+      { "emoji": "🗣️", "name": "speaking head", "slug": "speaking_head" },
       {
         "emoji": "👤",
         "name": "bust in silhouette",
@@ -2604,1408 +1812,336 @@
         "name": "busts in silhouette",
         "slug": "busts_in_silhouette"
       },
-      {
-        "emoji": "🫂",
-        "name": "people hugging",
-        "slug": "people_hugging"
-      },
-      {
-        "emoji": "👣",
-        "name": "footprints",
-        "slug": "footprints"
-      }
+      { "emoji": "🫂", "name": "people hugging", "slug": "people_hugging" },
+      { "emoji": "👣", "name": "footprints", "slug": "footprints" }
     ]
   },
   {
     "name": "Animals & Nature",
     "slug": "animals_nature",
     "emojis": [
-      {
-        "emoji": "🐵",
-        "name": "monkey face",
-        "slug": "monkey_face"
-      },
-      {
-        "emoji": "🐒",
-        "name": "monkey",
-        "slug": "monkey"
-      },
-      {
-        "emoji": "🦍",
-        "name": "gorilla",
-        "slug": "gorilla"
-      },
-      {
-        "emoji": "🦧",
-        "name": "orangutan",
-        "slug": "orangutan"
-      },
-      {
-        "emoji": "🐶",
-        "name": "dog face",
-        "slug": "dog_face"
-      },
-      {
-        "emoji": "🐕",
-        "name": "dog",
-        "slug": "dog"
-      },
-      {
-        "emoji": "🦮",
-        "name": "guide dog",
-        "slug": "guide_dog"
-      },
-      {
-        "emoji": "🐕‍🦺",
-        "name": "service dog",
-        "slug": "service_dog"
-      },
-      {
-        "emoji": "🐩",
-        "name": "poodle",
-        "slug": "poodle"
-      },
-      {
-        "emoji": "🐺",
-        "name": "wolf",
-        "slug": "wolf"
-      },
-      {
-        "emoji": "🦊",
-        "name": "fox",
-        "slug": "fox"
-      },
-      {
-        "emoji": "🦝",
-        "name": "raccoon",
-        "slug": "raccoon"
-      },
-      {
-        "emoji": "🐱",
-        "name": "cat face",
-        "slug": "cat_face"
-      },
-      {
-        "emoji": "🐈",
-        "name": "cat",
-        "slug": "cat"
-      },
-      {
-        "emoji": "🐈‍⬛",
-        "name": "black cat",
-        "slug": "black_cat"
-      },
-      {
-        "emoji": "🦁",
-        "name": "lion",
-        "slug": "lion"
-      },
-      {
-        "emoji": "🐯",
-        "name": "tiger face",
-        "slug": "tiger_face"
-      },
-      {
-        "emoji": "🐅",
-        "name": "tiger",
-        "slug": "tiger"
-      },
-      {
-        "emoji": "🐆",
-        "name": "leopard",
-        "slug": "leopard"
-      },
-      {
-        "emoji": "🐴",
-        "name": "horse face",
-        "slug": "horse_face"
-      },
-      {
-        "emoji": "🐎",
-        "name": "horse",
-        "slug": "horse"
-      },
-      {
-        "emoji": "🦄",
-        "name": "unicorn",
-        "slug": "unicorn"
-      },
-      {
-        "emoji": "🦓",
-        "name": "zebra",
-        "slug": "zebra"
-      },
-      {
-        "emoji": "🦌",
-        "name": "deer",
-        "slug": "deer"
-      },
-      {
-        "emoji": "🦬",
-        "name": "bison",
-        "slug": "bison"
-      },
-      {
-        "emoji": "🐮",
-        "name": "cow face",
-        "slug": "cow_face"
-      },
-      {
-        "emoji": "🐂",
-        "name": "ox",
-        "slug": "ox"
-      },
-      {
-        "emoji": "🐃",
-        "name": "water buffalo",
-        "slug": "water_buffalo"
-      },
-      {
-        "emoji": "🐄",
-        "name": "cow",
-        "slug": "cow"
-      },
-      {
-        "emoji": "🐷",
-        "name": "pig face",
-        "slug": "pig_face"
-      },
-      {
-        "emoji": "🐖",
-        "name": "pig",
-        "slug": "pig"
-      },
-      {
-        "emoji": "🐗",
-        "name": "boar",
-        "slug": "boar"
-      },
-      {
-        "emoji": "🐽",
-        "name": "pig nose",
-        "slug": "pig_nose"
-      },
-      {
-        "emoji": "🐏",
-        "name": "ram",
-        "slug": "ram"
-      },
-      {
-        "emoji": "🐑",
-        "name": "ewe",
-        "slug": "ewe"
-      },
-      {
-        "emoji": "🐐",
-        "name": "goat",
-        "slug": "goat"
-      },
-      {
-        "emoji": "🐪",
-        "name": "camel",
-        "slug": "camel"
-      },
-      {
-        "emoji": "🐫",
-        "name": "two-hump camel",
-        "slug": "two_hump_camel"
-      },
-      {
-        "emoji": "🦙",
-        "name": "llama",
-        "slug": "llama"
-      },
-      {
-        "emoji": "🦒",
-        "name": "giraffe",
-        "slug": "giraffe"
-      },
-      {
-        "emoji": "🐘",
-        "name": "elephant",
-        "slug": "elephant"
-      },
-      {
-        "emoji": "🦣",
-        "name": "mammoth",
-        "slug": "mammoth"
-      },
-      {
-        "emoji": "🦏",
-        "name": "rhinoceros",
-        "slug": "rhinoceros"
-      },
-      {
-        "emoji": "🦛",
-        "name": "hippopotamus",
-        "slug": "hippopotamus"
-      },
-      {
-        "emoji": "🐭",
-        "name": "mouse face",
-        "slug": "mouse_face"
-      },
-      {
-        "emoji": "🐁",
-        "name": "mouse",
-        "slug": "mouse"
-      },
-      {
-        "emoji": "🐀",
-        "name": "rat",
-        "slug": "rat"
-      },
-      {
-        "emoji": "🐹",
-        "name": "hamster",
-        "slug": "hamster"
-      },
-      {
-        "emoji": "🐰",
-        "name": "rabbit face",
-        "slug": "rabbit_face"
-      },
-      {
-        "emoji": "🐇",
-        "name": "rabbit",
-        "slug": "rabbit"
-      },
-      {
-        "emoji": "🐿️",
-        "name": "chipmunk",
-        "slug": "chipmunk"
-      },
-      {
-        "emoji": "🦫",
-        "name": "beaver",
-        "slug": "beaver"
-      },
-      {
-        "emoji": "🦔",
-        "name": "hedgehog",
-        "slug": "hedgehog"
-      },
-      {
-        "emoji": "🦇",
-        "name": "bat",
-        "slug": "bat"
-      },
-      {
-        "emoji": "🐻",
-        "name": "bear",
-        "slug": "bear"
-      },
-      {
-        "emoji": "🐻‍❄️",
-        "name": "polar bear",
-        "slug": "polar_bear"
-      },
-      {
-        "emoji": "🐨",
-        "name": "koala",
-        "slug": "koala"
-      },
-      {
-        "emoji": "🐼",
-        "name": "panda",
-        "slug": "panda"
-      },
-      {
-        "emoji": "🦥",
-        "name": "sloth",
-        "slug": "sloth"
-      },
-      {
-        "emoji": "🦦",
-        "name": "otter",
-        "slug": "otter"
-      },
-      {
-        "emoji": "🦨",
-        "name": "skunk",
-        "slug": "skunk"
-      },
-      {
-        "emoji": "🦘",
-        "name": "kangaroo",
-        "slug": "kangaroo"
-      },
-      {
-        "emoji": "🦡",
-        "name": "badger",
-        "slug": "badger"
-      },
-      {
-        "emoji": "🐾",
-        "name": "paw prints",
-        "slug": "paw_prints"
-      },
-      {
-        "emoji": "🦃",
-        "name": "turkey",
-        "slug": "turkey"
-      },
-      {
-        "emoji": "🐔",
-        "name": "chicken",
-        "slug": "chicken"
-      },
-      {
-        "emoji": "🐓",
-        "name": "rooster",
-        "slug": "rooster"
-      },
-      {
-        "emoji": "🐣",
-        "name": "hatching chick",
-        "slug": "hatching_chick"
-      },
-      {
-        "emoji": "🐤",
-        "name": "baby chick",
-        "slug": "baby_chick"
-      },
+      { "emoji": "🐵", "name": "monkey face", "slug": "monkey_face" },
+      { "emoji": "🐒", "name": "monkey", "slug": "monkey" },
+      { "emoji": "🦍", "name": "gorilla", "slug": "gorilla" },
+      { "emoji": "🦧", "name": "orangutan", "slug": "orangutan" },
+      { "emoji": "🐶", "name": "dog face", "slug": "dog_face" },
+      { "emoji": "🐕", "name": "dog", "slug": "dog" },
+      { "emoji": "🦮", "name": "guide dog", "slug": "guide_dog" },
+      { "emoji": "🐕‍🦺", "name": "service dog", "slug": "service_dog" },
+      { "emoji": "🐩", "name": "poodle", "slug": "poodle" },
+      { "emoji": "🐺", "name": "wolf", "slug": "wolf" },
+      { "emoji": "🦊", "name": "fox", "slug": "fox" },
+      { "emoji": "🦝", "name": "raccoon", "slug": "raccoon" },
+      { "emoji": "🐱", "name": "cat face", "slug": "cat_face" },
+      { "emoji": "🐈", "name": "cat", "slug": "cat" },
+      { "emoji": "🐈‍⬛", "name": "black cat", "slug": "black_cat" },
+      { "emoji": "🦁", "name": "lion", "slug": "lion" },
+      { "emoji": "🐯", "name": "tiger face", "slug": "tiger_face" },
+      { "emoji": "🐅", "name": "tiger", "slug": "tiger" },
+      { "emoji": "🐆", "name": "leopard", "slug": "leopard" },
+      { "emoji": "🐴", "name": "horse face", "slug": "horse_face" },
+      { "emoji": "🐎", "name": "horse", "slug": "horse" },
+      { "emoji": "🦄", "name": "unicorn", "slug": "unicorn" },
+      { "emoji": "🦓", "name": "zebra", "slug": "zebra" },
+      { "emoji": "🦌", "name": "deer", "slug": "deer" },
+      { "emoji": "🦬", "name": "bison", "slug": "bison" },
+      { "emoji": "🐮", "name": "cow face", "slug": "cow_face" },
+      { "emoji": "🐂", "name": "ox", "slug": "ox" },
+      { "emoji": "🐃", "name": "water buffalo", "slug": "water_buffalo" },
+      { "emoji": "🐄", "name": "cow", "slug": "cow" },
+      { "emoji": "🐷", "name": "pig face", "slug": "pig_face" },
+      { "emoji": "🐖", "name": "pig", "slug": "pig" },
+      { "emoji": "🐗", "name": "boar", "slug": "boar" },
+      { "emoji": "🐽", "name": "pig nose", "slug": "pig_nose" },
+      { "emoji": "🐏", "name": "ram", "slug": "ram" },
+      { "emoji": "🐑", "name": "ewe", "slug": "ewe" },
+      { "emoji": "🐐", "name": "goat", "slug": "goat" },
+      { "emoji": "🐪", "name": "camel", "slug": "camel" },
+      { "emoji": "🐫", "name": "two-hump camel", "slug": "two_hump_camel" },
+      { "emoji": "🦙", "name": "llama", "slug": "llama" },
+      { "emoji": "🦒", "name": "giraffe", "slug": "giraffe" },
+      { "emoji": "🐘", "name": "elephant", "slug": "elephant" },
+      { "emoji": "🦣", "name": "mammoth", "slug": "mammoth" },
+      { "emoji": "🦏", "name": "rhinoceros", "slug": "rhinoceros" },
+      { "emoji": "🦛", "name": "hippopotamus", "slug": "hippopotamus" },
+      { "emoji": "🐭", "name": "mouse face", "slug": "mouse_face" },
+      { "emoji": "🐁", "name": "mouse", "slug": "mouse" },
+      { "emoji": "🐀", "name": "rat", "slug": "rat" },
+      { "emoji": "🐹", "name": "hamster", "slug": "hamster" },
+      { "emoji": "🐰", "name": "rabbit face", "slug": "rabbit_face" },
+      { "emoji": "🐇", "name": "rabbit", "slug": "rabbit" },
+      { "emoji": "🐿️", "name": "chipmunk", "slug": "chipmunk" },
+      { "emoji": "🦫", "name": "beaver", "slug": "beaver" },
+      { "emoji": "🦔", "name": "hedgehog", "slug": "hedgehog" },
+      { "emoji": "🦇", "name": "bat", "slug": "bat" },
+      { "emoji": "🐻", "name": "bear", "slug": "bear" },
+      { "emoji": "🐻‍❄️", "name": "polar bear", "slug": "polar_bear" },
+      { "emoji": "🐨", "name": "koala", "slug": "koala" },
+      { "emoji": "🐼", "name": "panda", "slug": "panda" },
+      { "emoji": "🦥", "name": "sloth", "slug": "sloth" },
+      { "emoji": "🦦", "name": "otter", "slug": "otter" },
+      { "emoji": "🦨", "name": "skunk", "slug": "skunk" },
+      { "emoji": "🦘", "name": "kangaroo", "slug": "kangaroo" },
+      { "emoji": "🦡", "name": "badger", "slug": "badger" },
+      { "emoji": "🐾", "name": "paw prints", "slug": "paw_prints" },
+      { "emoji": "🦃", "name": "turkey", "slug": "turkey" },
+      { "emoji": "🐔", "name": "chicken", "slug": "chicken" },
+      { "emoji": "🐓", "name": "rooster", "slug": "rooster" },
+      { "emoji": "🐣", "name": "hatching chick", "slug": "hatching_chick" },
+      { "emoji": "🐤", "name": "baby chick", "slug": "baby_chick" },
       {
         "emoji": "🐥",
         "name": "front-facing baby chick",
         "slug": "front_facing_baby_chick"
       },
-      {
-        "emoji": "🐦",
-        "name": "bird",
-        "slug": "bird"
-      },
-      {
-        "emoji": "🐧",
-        "name": "penguin",
-        "slug": "penguin"
-      },
-      {
-        "emoji": "🕊️",
-        "name": "dove",
-        "slug": "dove"
-      },
-      {
-        "emoji": "🦅",
-        "name": "eagle",
-        "slug": "eagle"
-      },
-      {
-        "emoji": "🦆",
-        "name": "duck",
-        "slug": "duck"
-      },
-      {
-        "emoji": "🦢",
-        "name": "swan",
-        "slug": "swan"
-      },
-      {
-        "emoji": "🦉",
-        "name": "owl",
-        "slug": "owl"
-      },
-      {
-        "emoji": "🦤",
-        "name": "dodo",
-        "slug": "dodo"
-      },
-      {
-        "emoji": "🪶",
-        "name": "feather",
-        "slug": "feather"
-      },
-      {
-        "emoji": "🦩",
-        "name": "flamingo",
-        "slug": "flamingo"
-      },
-      {
-        "emoji": "🦚",
-        "name": "peacock",
-        "slug": "peacock"
-      },
-      {
-        "emoji": "🦜",
-        "name": "parrot",
-        "slug": "parrot"
-      },
-      {
-        "emoji": "🐸",
-        "name": "frog",
-        "slug": "frog"
-      },
-      {
-        "emoji": "🐊",
-        "name": "crocodile",
-        "slug": "crocodile"
-      },
-      {
-        "emoji": "🐢",
-        "name": "turtle",
-        "slug": "turtle"
-      },
-      {
-        "emoji": "🦎",
-        "name": "lizard",
-        "slug": "lizard"
-      },
-      {
-        "emoji": "🐍",
-        "name": "snake",
-        "slug": "snake"
-      },
-      {
-        "emoji": "🐲",
-        "name": "dragon face",
-        "slug": "dragon_face"
-      },
-      {
-        "emoji": "🐉",
-        "name": "dragon",
-        "slug": "dragon"
-      },
-      {
-        "emoji": "🦕",
-        "name": "sauropod",
-        "slug": "sauropod"
-      },
-      {
-        "emoji": "🦖",
-        "name": "T-Rex",
-        "slug": "t_rex"
-      },
-      {
-        "emoji": "🐳",
-        "name": "spouting whale",
-        "slug": "spouting_whale"
-      },
-      {
-        "emoji": "🐋",
-        "name": "whale",
-        "slug": "whale"
-      },
-      {
-        "emoji": "🐬",
-        "name": "dolphin",
-        "slug": "dolphin"
-      },
-      {
-        "emoji": "🦭",
-        "name": "seal",
-        "slug": "seal"
-      },
-      {
-        "emoji": "🐟",
-        "name": "fish",
-        "slug": "fish"
-      },
-      {
-        "emoji": "🐠",
-        "name": "tropical fish",
-        "slug": "tropical_fish"
-      },
-      {
-        "emoji": "🐡",
-        "name": "blowfish",
-        "slug": "blowfish"
-      },
-      {
-        "emoji": "🦈",
-        "name": "shark",
-        "slug": "shark"
-      },
-      {
-        "emoji": "🐙",
-        "name": "octopus",
-        "slug": "octopus"
-      },
-      {
-        "emoji": "🐚",
-        "name": "spiral shell",
-        "slug": "spiral_shell"
-      },
-      {
-        "emoji": "🪸",
-        "name": "coral",
-        "slug": "coral"
-      },
-      {
-        "emoji": "🐌",
-        "name": "snail",
-        "slug": "snail"
-      },
-      {
-        "emoji": "🦋",
-        "name": "butterfly",
-        "slug": "butterfly"
-      },
-      {
-        "emoji": "🐛",
-        "name": "bug",
-        "slug": "bug"
-      },
-      {
-        "emoji": "🐜",
-        "name": "ant",
-        "slug": "ant"
-      },
-      {
-        "emoji": "🐝",
-        "name": "honeybee",
-        "slug": "honeybee"
-      },
-      {
-        "emoji": "🪲",
-        "name": "beetle",
-        "slug": "beetle"
-      },
-      {
-        "emoji": "🐞",
-        "name": "lady beetle",
-        "slug": "lady_beetle"
-      },
-      {
-        "emoji": "🦗",
-        "name": "cricket",
-        "slug": "cricket"
-      },
-      {
-        "emoji": "🪳",
-        "name": "cockroach",
-        "slug": "cockroach"
-      },
-      {
-        "emoji": "🕷️",
-        "name": "spider",
-        "slug": "spider"
-      },
-      {
-        "emoji": "🕸️",
-        "name": "spider web",
-        "slug": "spider_web"
-      },
-      {
-        "emoji": "🦂",
-        "name": "scorpion",
-        "slug": "scorpion"
-      },
-      {
-        "emoji": "🦟",
-        "name": "mosquito",
-        "slug": "mosquito"
-      },
-      {
-        "emoji": "🪰",
-        "name": "fly",
-        "slug": "fly"
-      },
-      {
-        "emoji": "🪱",
-        "name": "worm",
-        "slug": "worm"
-      },
-      {
-        "emoji": "🦠",
-        "name": "microbe",
-        "slug": "microbe"
-      },
-      {
-        "emoji": "💐",
-        "name": "bouquet",
-        "slug": "bouquet"
-      },
-      {
-        "emoji": "🌸",
-        "name": "cherry blossom",
-        "slug": "cherry_blossom"
-      },
-      {
-        "emoji": "💮",
-        "name": "white flower",
-        "slug": "white_flower"
-      },
-      {
-        "emoji": "🪷",
-        "name": "lotus",
-        "slug": "lotus"
-      },
-      {
-        "emoji": "🏵️",
-        "name": "rosette",
-        "slug": "rosette"
-      },
-      {
-        "emoji": "🌹",
-        "name": "rose",
-        "slug": "rose"
-      },
-      {
-        "emoji": "🥀",
-        "name": "wilted flower",
-        "slug": "wilted_flower"
-      },
-      {
-        "emoji": "🌺",
-        "name": "hibiscus",
-        "slug": "hibiscus"
-      },
-      {
-        "emoji": "🌻",
-        "name": "sunflower",
-        "slug": "sunflower"
-      },
-      {
-        "emoji": "🌼",
-        "name": "blossom",
-        "slug": "blossom"
-      },
-      {
-        "emoji": "🌷",
-        "name": "tulip",
-        "slug": "tulip"
-      },
-      {
-        "emoji": "🌱",
-        "name": "seedling",
-        "slug": "seedling"
-      },
-      {
-        "emoji": "🪴",
-        "name": "potted plant",
-        "slug": "potted_plant"
-      },
-      {
-        "emoji": "🌲",
-        "name": "evergreen tree",
-        "slug": "evergreen_tree"
-      },
-      {
-        "emoji": "🌳",
-        "name": "deciduous tree",
-        "slug": "deciduous_tree"
-      },
-      {
-        "emoji": "🌴",
-        "name": "palm tree",
-        "slug": "palm_tree"
-      },
-      {
-        "emoji": "🌵",
-        "name": "cactus",
-        "slug": "cactus"
-      },
-      {
-        "emoji": "🌾",
-        "name": "sheaf of rice",
-        "slug": "sheaf_of_rice"
-      },
-      {
-        "emoji": "🌿",
-        "name": "herb",
-        "slug": "herb"
-      },
-      {
-        "emoji": "☘️",
-        "name": "shamrock",
-        "slug": "shamrock"
-      },
-      {
-        "emoji": "🍀",
-        "name": "four leaf clover",
-        "slug": "four_leaf_clover"
-      },
-      {
-        "emoji": "🍁",
-        "name": "maple leaf",
-        "slug": "maple_leaf"
-      },
-      {
-        "emoji": "🍂",
-        "name": "fallen leaf",
-        "slug": "fallen_leaf"
-      },
+      { "emoji": "🐦", "name": "bird", "slug": "bird" },
+      { "emoji": "🐧", "name": "penguin", "slug": "penguin" },
+      { "emoji": "🕊️", "name": "dove", "slug": "dove" },
+      { "emoji": "🦅", "name": "eagle", "slug": "eagle" },
+      { "emoji": "🦆", "name": "duck", "slug": "duck" },
+      { "emoji": "🦢", "name": "swan", "slug": "swan" },
+      { "emoji": "🦉", "name": "owl", "slug": "owl" },
+      { "emoji": "🦤", "name": "dodo", "slug": "dodo" },
+      { "emoji": "🪶", "name": "feather", "slug": "feather" },
+      { "emoji": "🦩", "name": "flamingo", "slug": "flamingo" },
+      { "emoji": "🦚", "name": "peacock", "slug": "peacock" },
+      { "emoji": "🦜", "name": "parrot", "slug": "parrot" },
+      { "emoji": "🐸", "name": "frog", "slug": "frog" },
+      { "emoji": "🐊", "name": "crocodile", "slug": "crocodile" },
+      { "emoji": "🐢", "name": "turtle", "slug": "turtle" },
+      { "emoji": "🦎", "name": "lizard", "slug": "lizard" },
+      { "emoji": "🐍", "name": "snake", "slug": "snake" },
+      { "emoji": "🐲", "name": "dragon face", "slug": "dragon_face" },
+      { "emoji": "🐉", "name": "dragon", "slug": "dragon" },
+      { "emoji": "🦕", "name": "sauropod", "slug": "sauropod" },
+      { "emoji": "🦖", "name": "T-Rex", "slug": "t_rex" },
+      { "emoji": "🐳", "name": "spouting whale", "slug": "spouting_whale" },
+      { "emoji": "🐋", "name": "whale", "slug": "whale" },
+      { "emoji": "🐬", "name": "dolphin", "slug": "dolphin" },
+      { "emoji": "🦭", "name": "seal", "slug": "seal" },
+      { "emoji": "🐟", "name": "fish", "slug": "fish" },
+      { "emoji": "🐠", "name": "tropical fish", "slug": "tropical_fish" },
+      { "emoji": "🐡", "name": "blowfish", "slug": "blowfish" },
+      { "emoji": "🦈", "name": "shark", "slug": "shark" },
+      { "emoji": "🐙", "name": "octopus", "slug": "octopus" },
+      { "emoji": "🐚", "name": "spiral shell", "slug": "spiral_shell" },
+      { "emoji": "🪸", "name": "coral", "slug": "coral" },
+      { "emoji": "🐌", "name": "snail", "slug": "snail" },
+      { "emoji": "🦋", "name": "butterfly", "slug": "butterfly" },
+      { "emoji": "🐛", "name": "bug", "slug": "bug" },
+      { "emoji": "🐜", "name": "ant", "slug": "ant" },
+      { "emoji": "🐝", "name": "honeybee", "slug": "honeybee" },
+      { "emoji": "🪲", "name": "beetle", "slug": "beetle" },
+      { "emoji": "🐞", "name": "lady beetle", "slug": "lady_beetle" },
+      { "emoji": "🦗", "name": "cricket", "slug": "cricket" },
+      { "emoji": "🪳", "name": "cockroach", "slug": "cockroach" },
+      { "emoji": "🕷️", "name": "spider", "slug": "spider" },
+      { "emoji": "🕸️", "name": "spider web", "slug": "spider_web" },
+      { "emoji": "🦂", "name": "scorpion", "slug": "scorpion" },
+      { "emoji": "🦟", "name": "mosquito", "slug": "mosquito" },
+      { "emoji": "🪰", "name": "fly", "slug": "fly" },
+      { "emoji": "🪱", "name": "worm", "slug": "worm" },
+      { "emoji": "🦠", "name": "microbe", "slug": "microbe" },
+      { "emoji": "💐", "name": "bouquet", "slug": "bouquet" },
+      { "emoji": "🌸", "name": "cherry blossom", "slug": "cherry_blossom" },
+      { "emoji": "💮", "name": "white flower", "slug": "white_flower" },
+      { "emoji": "🪷", "name": "lotus", "slug": "lotus" },
+      { "emoji": "🏵️", "name": "rosette", "slug": "rosette" },
+      { "emoji": "🌹", "name": "rose", "slug": "rose" },
+      { "emoji": "🥀", "name": "wilted flower", "slug": "wilted_flower" },
+      { "emoji": "🌺", "name": "hibiscus", "slug": "hibiscus" },
+      { "emoji": "🌻", "name": "sunflower", "slug": "sunflower" },
+      { "emoji": "🌼", "name": "blossom", "slug": "blossom" },
+      { "emoji": "🌷", "name": "tulip", "slug": "tulip" },
+      { "emoji": "🌱", "name": "seedling", "slug": "seedling" },
+      { "emoji": "🪴", "name": "potted plant", "slug": "potted_plant" },
+      { "emoji": "🌲", "name": "evergreen tree", "slug": "evergreen_tree" },
+      { "emoji": "🌳", "name": "deciduous tree", "slug": "deciduous_tree" },
+      { "emoji": "🌴", "name": "palm tree", "slug": "palm_tree" },
+      { "emoji": "🌵", "name": "cactus", "slug": "cactus" },
+      { "emoji": "🌾", "name": "sheaf of rice", "slug": "sheaf_of_rice" },
+      { "emoji": "🌿", "name": "herb", "slug": "herb" },
+      { "emoji": "☘️", "name": "shamrock", "slug": "shamrock" },
+      { "emoji": "🍀", "name": "four leaf clover", "slug": "four_leaf_clover" },
+      { "emoji": "🍁", "name": "maple leaf", "slug": "maple_leaf" },
+      { "emoji": "🍂", "name": "fallen leaf", "slug": "fallen_leaf" },
       {
         "emoji": "🍃",
         "name": "leaf fluttering in wind",
         "slug": "leaf_fluttering_in_wind"
       },
-      {
-        "emoji": "🪹",
-        "name": "empty nest",
-        "slug": "empty_nest"
-      },
-      {
-        "emoji": "🪺",
-        "name": "nest with eggs",
-        "slug": "nest_with_eggs"
-      },
-      {
-        "emoji": "🍄",
-        "name": "mushroom",
-        "slug": "mushroom"
-      }
+      { "emoji": "🪹", "name": "empty nest", "slug": "empty_nest" },
+      { "emoji": "🪺", "name": "nest with eggs", "slug": "nest_with_eggs" },
+      { "emoji": "🍄", "name": "mushroom", "slug": "mushroom" }
     ]
   },
   {
     "name": "Food & Drink",
     "slug": "food_drink",
     "emojis": [
-      {
-        "emoji": "🍇",
-        "name": "grapes",
-        "slug": "grapes_fruit"
-      },
-      {
-        "emoji": "🍈",
-        "name": "melon",
-        "slug": "melon_fruit"
-      },
-      {
-        "emoji": "🍉",
-        "name": "watermelon",
-        "slug": "watermelon_fruit"
-      },
-      {
-        "emoji": "🍊",
-        "name": "tangerine",
-        "slug": "tangerine_fruit"
-      },
-      {
-        "emoji": "🍋",
-        "name": "lemon",
-        "slug": "lemon_fruit"
-      },
-      {
-        "emoji": "🍌",
-        "name": "banana",
-        "slug": "banana_fruit"
-      },
-      {
-        "emoji": "🍍",
-        "name": "pineapple",
-        "slug": "pineapple_fruit"
-      },
-      {
-        "emoji": "🥭",
-        "name": "mango",
-        "slug": "mango_fruit"
-      },
-      {
-        "emoji": "🍎",
-        "name": "red apple",
-        "slug": "red_apple"
-      },
-      {
-        "emoji": "🍏",
-        "name": "green apple",
-        "slug": "green_apple"
-      },
-      {
-        "emoji": "🍐",
-        "name": "pear",
-        "slug": "pear_fruit"
-      },
-      {
-        "emoji": "🍑",
-        "name": "peach",
-        "slug": "peach_fruit"
-      },
-      {
-        "emoji": "🍒",
-        "name": "cherries",
-        "slug": "cherries_fruit"
-      },
-      {
-        "emoji": "🍓",
-        "name": "strawberry",
-        "slug": "strawberry_fruit"
-      },
-      {
-        "emoji": "🫐",
-        "name": "blueberries",
-        "slug": "blueberries_blue"
-      },
-      {
-        "emoji": "🥝",
-        "name": "kiwi fruit",
-        "slug": "kiwi_fruit_fruit"
-      },
-      {
-        "emoji": "🍅",
-        "name": "tomato",
-        "slug": "tomato_fruit"
-      },
-      {
-        "emoji": "🫒",
-        "name": "olive",
-        "slug": "olive"
-      },
-      {
-        "emoji": "🥥",
-        "name": "coconut",
-        "slug": "coconut_palm"
-      },
-      {
-        "emoji": "🥑",
-        "name": "avocado",
-        "slug": "avocado_fruit"
-      },
-      {
-        "emoji": "🍆",
-        "name": "eggplant",
-        "slug": "eggplant"
-      },
-      {
-        "emoji": "🥔",
-        "name": "potato",
-        "slug": "potato"
-      },
-      {
-        "emoji": "🥕",
-        "name": "carrot",
-        "slug": "carrot"
-      },
-      {
-        "emoji": "🌽",
-        "name": "ear of corn",
-        "slug": "ear_of_corn"
-      },
-      {
-        "emoji": "🌶️",
-        "name": "hot pepper",
-        "slug": "hot_pepper"
-      },
-      {
-        "emoji": "🫑",
-        "name": "bell pepper",
-        "slug": "bell_pepper"
-      },
-      {
-        "emoji": "🥒",
-        "name": "cucumber",
-        "slug": "cucumber"
-      },
-      {
-        "emoji": "🥬",
-        "name": "leafy green",
-        "slug": "leafy_green"
-      },
-      {
-        "emoji": "🥦",
-        "name": "broccoli",
-        "slug": "broccoli"
-      },
-      {
-        "emoji": "🧄",
-        "name": "garlic",
-        "slug": "garlic"
-      },
-      {
-        "emoji": "🧅",
-        "name": "onion",
-        "slug": "onion"
-      },
-      {
-        "emoji": "🥜",
-        "name": "peanuts",
-        "slug": "peanuts"
-      },
-      {
-        "emoji": "🫘",
-        "name": "beans",
-        "slug": "beans"
-      },
-      {
-        "emoji": "🌰",
-        "name": "chestnut",
-        "slug": "chestnut"
-      },
-      {
-        "emoji": "🍞",
-        "name": "bread",
-        "slug": "bread_loaf"
-      },
-      {
-        "emoji": "🥐",
-        "name": "croissant",
-        "slug": "croissant_breakfast"
-      },
-      {
-        "emoji": "🥖",
-        "name": "baguette bread",
-        "slug": "baguette_bread"
-      },
-      {
-        "emoji": "🫓",
-        "name": "flatbread",
-        "slug": "flatbread"
-      },
-      {
-        "emoji": "🥨",
-        "name": "pretzel",
-        "slug": "pretzel"
-      },
-      {
-        "emoji": "🥯",
-        "name": "bagel",
-        "slug": "bagel"
-      },
-      {
-        "emoji": "🥞",
-        "name": "pancakes",
-        "slug": "pancakes"
-      },
-      {
-        "emoji": "🧇",
-        "name": "waffle",
-        "slug": "waffle"
-      },
-      {
-        "emoji": "🧀",
-        "name": "cheese wedge",
-        "slug": "cheese_wedge"
-      },
-      {
-        "emoji": "🍖",
-        "name": "meat on bone",
-        "slug": "meat_on_bone"
-      },
-      {
-        "emoji": "🍗",
-        "name": "poultry leg",
-        "slug": "poultry_leg_chicken"
-      },
-      {
-        "emoji": "🥩",
-        "name": "cut of meat",
-        "slug": "cut_of_meat"
-      },
-      {
-        "emoji": "🥓",
-        "name": "bacon",
-        "slug": "bacon"
-      },
-      {
-        "emoji": "🍔",
-        "name": "hamburger",
-        "slug": "hamburger"
-      },
-      {
-        "emoji": "🍟",
-        "name": "french fries",
-        "slug": "french_fries"
-      },
-      {
-        "emoji": "🍕",
-        "name": "pizza",
-        "slug": "pizza"
-      },
-      {
-        "emoji": "🌭",
-        "name": "hot dog",
-        "slug": "hot_dog"
-      },
-      {
-        "emoji": "🥪",
-        "name": "sandwich",
-        "slug": "sandwich"
-      },
-      {
-        "emoji": "🌮",
-        "name": "taco",
-        "slug": "taco"
-      },
-      {
-        "emoji": "🌯",
-        "name": "burrito",
-        "slug": "burrito"
-      },
-      {
-        "emoji": "🫔",
-        "name": "tamale",
-        "slug": "tamale"
-      },
+      { "emoji": "🍇", "name": "grapes", "slug": "grapes_fruit" },
+      { "emoji": "🍈", "name": "melon", "slug": "melon_fruit" },
+      { "emoji": "🍉", "name": "watermelon", "slug": "watermelon_fruit" },
+      { "emoji": "🍊", "name": "tangerine", "slug": "tangerine_fruit" },
+      { "emoji": "🍋", "name": "lemon", "slug": "lemon_fruit" },
+      { "emoji": "🍌", "name": "banana", "slug": "banana_fruit" },
+      { "emoji": "🍍", "name": "pineapple", "slug": "pineapple_fruit" },
+      { "emoji": "🥭", "name": "mango", "slug": "mango_fruit" },
+      { "emoji": "🍎", "name": "red apple", "slug": "red_apple" },
+      { "emoji": "🍏", "name": "green apple", "slug": "green_apple" },
+      { "emoji": "🍐", "name": "pear", "slug": "pear_fruit" },
+      { "emoji": "🍑", "name": "peach", "slug": "peach_fruit" },
+      { "emoji": "🍒", "name": "cherries", "slug": "cherries_fruit" },
+      { "emoji": "🍓", "name": "strawberry", "slug": "strawberry_fruit" },
+      { "emoji": "🫐", "name": "blueberries", "slug": "blueberries_blue" },
+      { "emoji": "🥝", "name": "kiwi fruit", "slug": "kiwi_fruit_fruit" },
+      { "emoji": "🍅", "name": "tomato", "slug": "tomato_fruit" },
+      { "emoji": "🫒", "name": "olive", "slug": "olive" },
+      { "emoji": "🥥", "name": "coconut", "slug": "coconut_palm" },
+      { "emoji": "🥑", "name": "avocado", "slug": "avocado_fruit" },
+      { "emoji": "🍆", "name": "eggplant", "slug": "eggplant" },
+      { "emoji": "🥔", "name": "potato", "slug": "potato" },
+      { "emoji": "🥕", "name": "carrot", "slug": "carrot" },
+      { "emoji": "🌽", "name": "ear of corn", "slug": "ear_of_corn" },
+      { "emoji": "🌶️", "name": "hot pepper", "slug": "hot_pepper" },
+      { "emoji": "🫑", "name": "bell pepper", "slug": "bell_pepper" },
+      { "emoji": "🥒", "name": "cucumber", "slug": "cucumber" },
+      { "emoji": "🥬", "name": "leafy green", "slug": "leafy_green" },
+      { "emoji": "🥦", "name": "broccoli", "slug": "broccoli" },
+      { "emoji": "🧄", "name": "garlic", "slug": "garlic" },
+      { "emoji": "🧅", "name": "onion", "slug": "onion" },
+      { "emoji": "🥜", "name": "peanuts", "slug": "peanuts" },
+      { "emoji": "🫘", "name": "beans", "slug": "beans" },
+      { "emoji": "🌰", "name": "chestnut", "slug": "chestnut" },
+      { "emoji": "🍞", "name": "bread", "slug": "bread_loaf" },
+      { "emoji": "🥐", "name": "croissant", "slug": "croissant_breakfast" },
+      { "emoji": "🥖", "name": "baguette bread", "slug": "baguette_bread" },
+      { "emoji": "🫓", "name": "flatbread", "slug": "flatbread" },
+      { "emoji": "🥨", "name": "pretzel", "slug": "pretzel" },
+      { "emoji": "🥯", "name": "bagel", "slug": "bagel" },
+      { "emoji": "🥞", "name": "pancakes", "slug": "pancakes" },
+      { "emoji": "🧇", "name": "waffle", "slug": "waffle" },
+      { "emoji": "🧀", "name": "cheese wedge", "slug": "cheese_wedge" },
+      { "emoji": "🍖", "name": "meat on bone", "slug": "meat_on_bone" },
+      { "emoji": "🍗", "name": "poultry leg", "slug": "poultry_leg_chicken" },
+      { "emoji": "🥩", "name": "cut of meat", "slug": "cut_of_meat" },
+      { "emoji": "🥓", "name": "bacon", "slug": "bacon" },
+      { "emoji": "🍔", "name": "hamburger", "slug": "hamburger" },
+      { "emoji": "🍟", "name": "french fries", "slug": "french_fries" },
+      { "emoji": "🍕", "name": "pizza", "slug": "pizza" },
+      { "emoji": "🌭", "name": "hot dog", "slug": "hot_dog" },
+      { "emoji": "🥪", "name": "sandwich", "slug": "sandwich" },
+      { "emoji": "🌮", "name": "taco", "slug": "taco" },
+      { "emoji": "🌯", "name": "burrito", "slug": "burrito" },
+      { "emoji": "🫔", "name": "tamale", "slug": "tamale" },
       {
         "emoji": "🥙",
         "name": "stuffed flatbread",
         "slug": "stuffed_flatbread"
       },
-      {
-        "emoji": "🧆",
-        "name": "falafel",
-        "slug": "falafel"
-      },
-      {
-        "emoji": "🥚",
-        "name": "egg",
-        "slug": "egg"
-      },
-      {
-        "emoji": "🍳",
-        "name": "cooking",
-        "slug": "cooking"
-      },
+      { "emoji": "🧆", "name": "falafel", "slug": "falafel" },
+      { "emoji": "🥚", "name": "egg", "slug": "egg" },
+      { "emoji": "🍳", "name": "cooking", "slug": "cooking" },
       {
         "emoji": "🥘",
         "name": "shallow pan of food",
         "slug": "shallow_pan_of_food"
       },
-      {
-        "emoji": "🍲",
-        "name": "pot of food",
-        "slug": "pot_of_food"
-      },
-      {
-        "emoji": "🫕",
-        "name": "fondue",
-        "slug": "fondue"
-      },
-      {
-        "emoji": "🥣",
-        "name": "bowl with spoon",
-        "slug": "bowl_with_spoon"
-      },
-      {
-        "emoji": "🥗",
-        "name": "green salad",
-        "slug": "green_salad"
-      },
-      {
-        "emoji": "🍿",
-        "name": "popcorn",
-        "slug": "popcorn"
-      },
-      {
-        "emoji": "🧈",
-        "name": "butter",
-        "slug": "butter"
-      },
-      {
-        "emoji": "🧂",
-        "name": "salt",
-        "slug": "salt"
-      },
-      {
-        "emoji": "🥫",
-        "name": "canned food",
-        "slug": "canned_food"
-      },
-      {
-        "emoji": "🍱",
-        "name": "bento box",
-        "slug": "bento_box"
-      },
-      {
-        "emoji": "🍘",
-        "name": "rice cracker",
-        "slug": "rice_cracker"
-      },
-      {
-        "emoji": "🍙",
-        "name": "rice ball",
-        "slug": "rice_ball"
-      },
-      {
-        "emoji": "🍚",
-        "name": "cooked rice",
-        "slug": "cooked_rice"
-      },
-      {
-        "emoji": "🍛",
-        "name": "curry rice",
-        "slug": "curry_rice"
-      },
-      {
-        "emoji": "🍜",
-        "name": "steaming bowl",
-        "slug": "steaming_bowl"
-      },
-      {
-        "emoji": "🍝",
-        "name": "spaghetti",
-        "slug": "spaghetti"
-      },
+      { "emoji": "🍲", "name": "pot of food", "slug": "pot_of_food" },
+      { "emoji": "🫕", "name": "fondue", "slug": "fondue" },
+      { "emoji": "🥣", "name": "bowl with spoon", "slug": "bowl_with_spoon" },
+      { "emoji": "🥗", "name": "green salad", "slug": "green_salad" },
+      { "emoji": "🍿", "name": "popcorn", "slug": "popcorn" },
+      { "emoji": "🧈", "name": "butter", "slug": "butter" },
+      { "emoji": "🧂", "name": "salt", "slug": "salt" },
+      { "emoji": "🥫", "name": "canned food", "slug": "canned_food" },
+      { "emoji": "🍱", "name": "bento box", "slug": "bento_box" },
+      { "emoji": "🍘", "name": "rice cracker", "slug": "rice_cracker" },
+      { "emoji": "🍙", "name": "rice ball", "slug": "rice_ball" },
+      { "emoji": "🍚", "name": "cooked rice", "slug": "cooked_rice" },
+      { "emoji": "🍛", "name": "curry rice", "slug": "curry_rice" },
+      { "emoji": "🍜", "name": "steaming bowl", "slug": "steaming_bowl" },
+      { "emoji": "🍝", "name": "spaghetti", "slug": "spaghetti" },
       {
         "emoji": "🍠",
         "name": "roasted sweet potato",
         "slug": "roasted_sweet_potato"
       },
-      {
-        "emoji": "🍢",
-        "name": "oden",
-        "slug": "oden"
-      },
-      {
-        "emoji": "🍣",
-        "name": "sushi",
-        "slug": "sushi"
-      },
-      {
-        "emoji": "🍤",
-        "name": "fried shrimp",
-        "slug": "fried_shrimp"
-      },
+      { "emoji": "🍢", "name": "oden", "slug": "oden" },
+      { "emoji": "🍣", "name": "sushi", "slug": "sushi" },
+      { "emoji": "🍤", "name": "fried shrimp", "slug": "fried_shrimp" },
       {
         "emoji": "🍥",
         "name": "fish cake with swirl",
         "slug": "fish_cake_with_swirl"
       },
-      {
-        "emoji": "🥮",
-        "name": "moon cake",
-        "slug": "moon_cake"
-      },
-      {
-        "emoji": "🍡",
-        "name": "dango",
-        "slug": "dango"
-      },
-      {
-        "emoji": "🥟",
-        "name": "dumpling",
-        "slug": "dumpling"
-      },
-      {
-        "emoji": "🥠",
-        "name": "fortune cookie",
-        "slug": "fortune_cookie"
-      },
-      {
-        "emoji": "🥡",
-        "name": "takeout box",
-        "slug": "takeout_box"
-      },
-      {
-        "emoji": "🦀",
-        "name": "crab",
-        "slug": "crab"
-      },
-      {
-        "emoji": "🦞",
-        "name": "lobster",
-        "slug": "lobster"
-      },
-      {
-        "emoji": "🦐",
-        "name": "shrimp",
-        "slug": "shrimp"
-      },
-      {
-        "emoji": "🦑",
-        "name": "squid",
-        "slug": "squid"
-      },
-      {
-        "emoji": "🦪",
-        "name": "oyster",
-        "slug": "oyster"
-      },
-      {
-        "emoji": "🍦",
-        "name": "soft ice cream",
-        "slug": "soft_ice_cream"
-      },
-      {
-        "emoji": "🍧",
-        "name": "shaved ice",
-        "slug": "shaved_ice"
-      },
-      {
-        "emoji": "🍨",
-        "name": "ice cream",
-        "slug": "ice_cream"
-      },
-      {
-        "emoji": "🍩",
-        "name": "doughnut",
-        "slug": "doughnut"
-      },
-      {
-        "emoji": "🍪",
-        "name": "cookie",
-        "slug": "cookie"
-      },
-      {
-        "emoji": "🎂",
-        "name": "birthday cake",
-        "slug": "birthday_cake"
-      },
-      {
-        "emoji": "🍰",
-        "name": "shortcake",
-        "slug": "shortcake"
-      },
-      {
-        "emoji": "🧁",
-        "name": "cupcake",
-        "slug": "cupcake"
-      },
-      {
-        "emoji": "🥧",
-        "name": "pie",
-        "slug": "pie"
-      },
-      {
-        "emoji": "🍫",
-        "name": "chocolate bar",
-        "slug": "chocolate_bar"
-      },
-      {
-        "emoji": "🍬",
-        "name": "candy",
-        "slug": "candy"
-      },
-      {
-        "emoji": "🍭",
-        "name": "lollipop",
-        "slug": "lollipop"
-      },
-      {
-        "emoji": "🍮",
-        "name": "custard",
-        "slug": "custard"
-      },
-      {
-        "emoji": "🍯",
-        "name": "honey pot",
-        "slug": "honey_pot"
-      },
-      {
-        "emoji": "🍼",
-        "name": "baby bottle",
-        "slug": "baby_bottle"
-      },
-      {
-        "emoji": "🥛",
-        "name": "glass of milk",
-        "slug": "glass_of_milk"
-      },
-      {
-        "emoji": "☕",
-        "name": "hot beverage",
-        "slug": "hot_beverage"
-      },
-      {
-        "emoji": "🫖",
-        "name": "teapot",
-        "slug": "teapot"
-      },
+      { "emoji": "🥮", "name": "moon cake", "slug": "moon_cake" },
+      { "emoji": "🍡", "name": "dango", "slug": "dango" },
+      { "emoji": "🥟", "name": "dumpling", "slug": "dumpling" },
+      { "emoji": "🥠", "name": "fortune cookie", "slug": "fortune_cookie" },
+      { "emoji": "🥡", "name": "takeout box", "slug": "takeout_box" },
+      { "emoji": "🦀", "name": "crab", "slug": "crab" },
+      { "emoji": "🦞", "name": "lobster", "slug": "lobster" },
+      { "emoji": "🦐", "name": "shrimp", "slug": "shrimp" },
+      { "emoji": "🦑", "name": "squid", "slug": "squid" },
+      { "emoji": "🦪", "name": "oyster", "slug": "oyster" },
+      { "emoji": "🍦", "name": "soft ice cream", "slug": "soft_ice_cream" },
+      { "emoji": "🍧", "name": "shaved ice", "slug": "shaved_ice" },
+      { "emoji": "🍨", "name": "ice cream", "slug": "ice_cream" },
+      { "emoji": "🍩", "name": "doughnut", "slug": "doughnut" },
+      { "emoji": "🍪", "name": "cookie", "slug": "cookie" },
+      { "emoji": "🎂", "name": "birthday cake", "slug": "birthday_cake" },
+      { "emoji": "🍰", "name": "shortcake", "slug": "shortcake" },
+      { "emoji": "🧁", "name": "cupcake", "slug": "cupcake" },
+      { "emoji": "🥧", "name": "pie", "slug": "pie" },
+      { "emoji": "🍫", "name": "chocolate bar", "slug": "chocolate_bar" },
+      { "emoji": "🍬", "name": "candy", "slug": "candy" },
+      { "emoji": "🍭", "name": "lollipop", "slug": "lollipop" },
+      { "emoji": "🍮", "name": "custard", "slug": "custard" },
+      { "emoji": "🍯", "name": "honey pot", "slug": "honey_pot" },
+      { "emoji": "🍼", "name": "baby bottle", "slug": "baby_bottle" },
+      { "emoji": "🥛", "name": "glass of milk", "slug": "glass_of_milk" },
+      { "emoji": "☕️", "name": "hot beverage", "slug": "hot_beverage" },
+      { "emoji": "🫖", "name": "teapot", "slug": "teapot" },
       {
         "emoji": "🍵",
         "name": "teacup without handle",
         "slug": "teacup_without_handle"
       },
-      {
-        "emoji": "🍶",
-        "name": "sake",
-        "slug": "sake"
-      },
+      { "emoji": "🍶", "name": "sake", "slug": "sake" },
       {
         "emoji": "🍾",
         "name": "bottle with popping cork",
         "slug": "bottle_with_popping_cork"
       },
-      {
-        "emoji": "🍷",
-        "name": "wine glass",
-        "slug": "wine_glass"
-      },
-      {
-        "emoji": "🍸",
-        "name": "cocktail glass",
-        "slug": "cocktail_glass"
-      },
-      {
-        "emoji": "🍹",
-        "name": "tropical drink",
-        "slug": "tropical_drink"
-      },
-      {
-        "emoji": "🍺",
-        "name": "beer mug",
-        "slug": "beer_mug"
-      },
+      { "emoji": "🍷", "name": "wine glass", "slug": "wine_glass" },
+      { "emoji": "🍸", "name": "cocktail glass", "slug": "cocktail_glass" },
+      { "emoji": "🍹", "name": "tropical drink", "slug": "tropical_drink" },
+      { "emoji": "🍺", "name": "beer mug", "slug": "beer_mug" },
       {
         "emoji": "🍻",
         "name": "clinking beer mugs",
         "slug": "clinking_beer_mugs"
       },
-      {
-        "emoji": "🥂",
-        "name": "clinking glasses",
-        "slug": "clinking_glasses"
-      },
-      {
-        "emoji": "🥃",
-        "name": "tumbler glass",
-        "slug": "tumbler_glass"
-      },
-      {
-        "emoji": "🫗",
-        "name": "pouring liquid",
-        "slug": "pouring_liquid"
-      },
-      {
-        "emoji": "🥤",
-        "name": "cup with straw",
-        "slug": "cup_with_straw"
-      },
-      {
-        "emoji": "🧋",
-        "name": "bubble tea",
-        "slug": "bubble_tea"
-      },
-      {
-        "emoji": "🧃",
-        "name": "beverage box",
-        "slug": "beverage_box"
-      },
-      {
-        "emoji": "🧉",
-        "name": "mate",
-        "slug": "mate"
-      },
-      {
-        "emoji": "🧊",
-        "name": "ice",
-        "slug": "ice"
-      },
-      {
-        "emoji": "🥢",
-        "name": "chopsticks",
-        "slug": "chopsticks"
-      },
+      { "emoji": "🥂", "name": "clinking glasses", "slug": "clinking_glasses" },
+      { "emoji": "🥃", "name": "tumbler glass", "slug": "tumbler_glass" },
+      { "emoji": "🫗", "name": "pouring liquid", "slug": "pouring_liquid" },
+      { "emoji": "🥤", "name": "cup with straw", "slug": "cup_with_straw" },
+      { "emoji": "🧋", "name": "bubble tea", "slug": "bubble_tea" },
+      { "emoji": "🧃", "name": "beverage box", "slug": "beverage_box" },
+      { "emoji": "🧉", "name": "mate", "slug": "mate" },
+      { "emoji": "🧊", "name": "ice", "slug": "ice" },
+      { "emoji": "🥢", "name": "chopsticks", "slug": "chopsticks" },
       {
         "emoji": "🍽️",
         "name": "fork and knife with plate",
         "slug": "fork_and_knife_with_plate"
       },
-      {
-        "emoji": "🍴",
-        "name": "fork and knife",
-        "slug": "fork_and_knife"
-      },
-      {
-        "emoji": "🥄",
-        "name": "spoon",
-        "slug": "spoon"
-      },
-      {
-        "emoji": "🔪",
-        "name": "kitchen knife",
-        "slug": "kitchen_knife"
-      },
-      {
-        "emoji": "🫙",
-        "name": "jar",
-        "slug": "jar"
-      },
-      {
-        "emoji": "🏺",
-        "name": "amphora",
-        "slug": "amphora"
-      }
+      { "emoji": "🍴", "name": "fork and knife", "slug": "fork_and_knife" },
+      { "emoji": "🥄", "name": "spoon", "slug": "spoon" },
+      { "emoji": "🔪", "name": "kitchen knife", "slug": "kitchen_knife" },
+      { "emoji": "🫙", "name": "jar", "slug": "jar" },
+      { "emoji": "🏺", "name": "amphora", "slug": "amphora" }
     ]
   },
   {
@@ -4032,16 +2168,8 @@
         "name": "globe with meridians",
         "slug": "globe_with_meridians_world_earth"
       },
-      {
-        "emoji": "🗺️",
-        "name": "world map",
-        "slug": "world_map"
-      },
-      {
-        "emoji": "🗾",
-        "name": "map of Japan",
-        "slug": "map_of_japan"
-      },
+      { "emoji": "🗺️", "name": "world map", "slug": "world_map" },
+      { "emoji": "🗾", "name": "map of Japan", "slug": "map_of_japan" },
       {
         "emoji": "🧭",
         "name": "compass",
@@ -4052,51 +2180,19 @@
         "name": "snow-capped mountain",
         "slug": "snow_capped_mountain"
       },
-      {
-        "emoji": "⛰️",
-        "name": "mountain",
-        "slug": "mountain"
-      },
-      {
-        "emoji": "🌋",
-        "name": "volcano",
-        "slug": "volcano"
-      },
-      {
-        "emoji": "🗻",
-        "name": "mount fuji",
-        "slug": "mount_fuji"
-      },
-      {
-        "emoji": "🏕️",
-        "name": "camping",
-        "slug": "camping"
-      },
+      { "emoji": "⛰️", "name": "mountain", "slug": "mountain" },
+      { "emoji": "🌋", "name": "volcano", "slug": "volcano" },
+      { "emoji": "🗻", "name": "mount fuji", "slug": "mount_fuji" },
+      { "emoji": "🏕️", "name": "camping", "slug": "camping" },
       {
         "emoji": "🏖️",
         "name": "beach with umbrella",
         "slug": "beach_with_umbrella"
       },
-      {
-        "emoji": "🏜️",
-        "name": "desert",
-        "slug": "desert"
-      },
-      {
-        "emoji": "🏝️",
-        "name": "desert island",
-        "slug": "desert_island"
-      },
-      {
-        "emoji": "🏞️",
-        "name": "national park",
-        "slug": "national_park"
-      },
-      {
-        "emoji": "🏟️",
-        "name": "stadium",
-        "slug": "stadium"
-      },
+      { "emoji": "🏜️", "name": "desert", "slug": "desert" },
+      { "emoji": "🏝️", "name": "desert island", "slug": "desert_island" },
+      { "emoji": "🏞️", "name": "national park", "slug": "national_park" },
+      { "emoji": "🏟️", "name": "stadium", "slug": "stadium" },
       {
         "emoji": "🏛️",
         "name": "classical building",
@@ -4107,356 +2203,104 @@
         "name": "building construction",
         "slug": "building_construction"
       },
-      {
-        "emoji": "🧱",
-        "name": "brick",
-        "slug": "brick"
-      },
-      {
-        "emoji": "🪨",
-        "name": "rock",
-        "slug": "rock"
-      },
-      {
-        "emoji": "🪵",
-        "name": "wood",
-        "slug": "wood"
-      },
-      {
-        "emoji": "🛖",
-        "name": "hut",
-        "slug": "hut"
-      },
-      {
-        "emoji": "🏘️",
-        "name": "houses",
-        "slug": "houses"
-      },
-      {
-        "emoji": "🏚️",
-        "name": "derelict house",
-        "slug": "derelict_house"
-      },
-      {
-        "emoji": "🏠",
-        "name": "house",
-        "slug": "house"
-      },
+      { "emoji": "🧱", "name": "brick", "slug": "brick" },
+      { "emoji": "🪨", "name": "rock", "slug": "rock" },
+      { "emoji": "🪵", "name": "wood", "slug": "wood" },
+      { "emoji": "🛖", "name": "hut", "slug": "hut" },
+      { "emoji": "🏘️", "name": "houses", "slug": "houses" },
+      { "emoji": "🏚️", "name": "derelict house", "slug": "derelict_house" },
+      { "emoji": "🏠", "name": "house", "slug": "house" },
       {
         "emoji": "🏡",
         "name": "house with garden",
         "slug": "house_with_garden"
       },
-      {
-        "emoji": "🏢",
-        "name": "office building",
-        "slug": "office_building"
-      },
+      { "emoji": "🏢", "name": "office building", "slug": "office_building" },
       {
         "emoji": "🏣",
         "name": "Japanese post office",
         "slug": "japanese_post_office"
       },
-      {
-        "emoji": "🏤",
-        "name": "post office",
-        "slug": "post_office"
-      },
-      {
-        "emoji": "🏥",
-        "name": "hospital",
-        "slug": "hospital"
-      },
-      {
-        "emoji": "🏦",
-        "name": "bank",
-        "slug": "bank"
-      },
-      {
-        "emoji": "🏨",
-        "name": "hotel",
-        "slug": "hotel"
-      },
-      {
-        "emoji": "🏩",
-        "name": "love hotel",
-        "slug": "love_hotel"
-      },
+      { "emoji": "🏤", "name": "post office", "slug": "post_office" },
+      { "emoji": "🏥", "name": "hospital", "slug": "hospital" },
+      { "emoji": "🏦", "name": "bank", "slug": "bank" },
+      { "emoji": "🏨", "name": "hotel", "slug": "hotel" },
+      { "emoji": "🏩", "name": "love hotel", "slug": "love_hotel" },
       {
         "emoji": "🏪",
         "name": "convenience store",
         "slug": "convenience_store"
       },
-      {
-        "emoji": "🏫",
-        "name": "school",
-        "slug": "school"
-      },
-      {
-        "emoji": "🏬",
-        "name": "department store",
-        "slug": "department_store"
-      },
-      {
-        "emoji": "🏭",
-        "name": "factory",
-        "slug": "factory"
-      },
-      {
-        "emoji": "🏯",
-        "name": "Japanese castle",
-        "slug": "japanese_castle"
-      },
-      {
-        "emoji": "🏰",
-        "name": "castle",
-        "slug": "castle"
-      },
-      {
-        "emoji": "💒",
-        "name": "wedding",
-        "slug": "wedding"
-      },
-      {
-        "emoji": "🗼",
-        "name": "Tokyo tower",
-        "slug": "tokyo_tower"
-      },
+      { "emoji": "🏫", "name": "school", "slug": "school" },
+      { "emoji": "🏬", "name": "department store", "slug": "department_store" },
+      { "emoji": "🏭", "name": "factory", "slug": "factory" },
+      { "emoji": "🏯", "name": "Japanese castle", "slug": "japanese_castle" },
+      { "emoji": "🏰", "name": "castle", "slug": "castle" },
+      { "emoji": "💒", "name": "wedding", "slug": "wedding" },
+      { "emoji": "🗼", "name": "Tokyo tower", "slug": "tokyo_tower" },
       {
         "emoji": "🗽",
         "name": "Statue of Liberty",
         "slug": "statue_of_liberty"
       },
-      {
-        "emoji": "⛪",
-        "name": "church",
-        "slug": "church"
-      },
-      {
-        "emoji": "🕌",
-        "name": "mosque",
-        "slug": "mosque"
-      },
-      {
-        "emoji": "🛕",
-        "name": "hindu temple",
-        "slug": "hindu_temple"
-      },
-      {
-        "emoji": "🕍",
-        "name": "synagogue",
-        "slug": "synagogue"
-      },
-      {
-        "emoji": "⛩️",
-        "name": "shinto shrine",
-        "slug": "shinto_shrine"
-      },
-      {
-        "emoji": "🕋",
-        "name": "kaaba",
-        "slug": "kaaba"
-      },
-      {
-        "emoji": "⛲",
-        "name": "fountain",
-        "slug": "fountain"
-      },
-      {
-        "emoji": "⛺",
-        "name": "tent",
-        "slug": "tent"
-      },
-      {
-        "emoji": "🌁",
-        "name": "foggy",
-        "slug": "foggy"
-      },
-      {
-        "emoji": "🌃",
-        "name": "night with stars",
-        "slug": "night_with_stars"
-      },
-      {
-        "emoji": "🏙️",
-        "name": "cityscape",
-        "slug": "cityscape"
-      },
+      { "emoji": "⛪️", "name": "church", "slug": "church" },
+      { "emoji": "🕌", "name": "mosque", "slug": "mosque" },
+      { "emoji": "🛕", "name": "hindu temple", "slug": "hindu_temple" },
+      { "emoji": "🕍", "name": "synagogue", "slug": "synagogue" },
+      { "emoji": "⛩️", "name": "shinto shrine", "slug": "shinto_shrine" },
+      { "emoji": "🕋", "name": "kaaba", "slug": "kaaba" },
+      { "emoji": "⛲️", "name": "fountain", "slug": "fountain" },
+      { "emoji": "⛺️", "name": "tent", "slug": "tent" },
+      { "emoji": "🌁", "name": "foggy", "slug": "foggy" },
+      { "emoji": "🌃", "name": "night with stars", "slug": "night_with_stars" },
+      { "emoji": "🏙️", "name": "cityscape", "slug": "cityscape" },
       {
         "emoji": "🌄",
         "name": "sunrise over mountains",
         "slug": "sunrise_over_mountains"
       },
-      {
-        "emoji": "🌅",
-        "name": "sunrise",
-        "slug": "sunrise"
-      },
+      { "emoji": "🌅", "name": "sunrise", "slug": "sunrise" },
       {
         "emoji": "🌆",
         "name": "cityscape at dusk",
         "slug": "cityscape_at_dusk"
       },
-      {
-        "emoji": "🌇",
-        "name": "sunset",
-        "slug": "sunset"
-      },
-      {
-        "emoji": "🌉",
-        "name": "bridge at night",
-        "slug": "bridge_at_night"
-      },
-      {
-        "emoji": "♨️",
-        "name": "hot springs",
-        "slug": "hot_springs"
-      },
-      {
-        "emoji": "🎠",
-        "name": "carousel horse",
-        "slug": "carousel_horse"
-      },
-      {
-        "emoji": "🛝",
-        "name": "playground slide",
-        "slug": "playground_slide"
-      },
-      {
-        "emoji": "🎡",
-        "name": "ferris wheel",
-        "slug": "ferris_wheel"
-      },
-      {
-        "emoji": "🎢",
-        "name": "roller coaster",
-        "slug": "roller_coaster"
-      },
-      {
-        "emoji": "💈",
-        "name": "barber pole",
-        "slug": "barber_pole"
-      },
-      {
-        "emoji": "🎪",
-        "name": "circus tent",
-        "slug": "circus_tent"
-      },
-      {
-        "emoji": "🚂",
-        "name": "locomotive",
-        "slug": "locomotive"
-      },
-      {
-        "emoji": "🚃",
-        "name": "railway car",
-        "slug": "railway_car"
-      },
-      {
-        "emoji": "🚄",
-        "name": "high-speed train",
-        "slug": "high_speed_train"
-      },
-      {
-        "emoji": "🚅",
-        "name": "bullet train",
-        "slug": "bullet_train"
-      },
-      {
-        "emoji": "🚆",
-        "name": "train",
-        "slug": "train"
-      },
-      {
-        "emoji": "🚇",
-        "name": "metro",
-        "slug": "metro"
-      },
-      {
-        "emoji": "🚈",
-        "name": "light rail",
-        "slug": "light_rail"
-      },
-      {
-        "emoji": "🚉",
-        "name": "station",
-        "slug": "station"
-      },
-      {
-        "emoji": "🚊",
-        "name": "tram",
-        "slug": "tram"
-      },
-      {
-        "emoji": "🚝",
-        "name": "monorail",
-        "slug": "monorail"
-      },
-      {
-        "emoji": "🚞",
-        "name": "mountain railway",
-        "slug": "mountain_railway"
-      },
-      {
-        "emoji": "🚋",
-        "name": "tram car",
-        "slug": "tram_car"
-      },
-      {
-        "emoji": "🚌",
-        "name": "bus",
-        "slug": "bus"
-      },
-      {
-        "emoji": "🚍",
-        "name": "oncoming bus",
-        "slug": "oncoming_bus"
-      },
-      {
-        "emoji": "🚎",
-        "name": "trolleybus",
-        "slug": "trolleybus"
-      },
-      {
-        "emoji": "🚐",
-        "name": "minibus",
-        "slug": "minibus"
-      },
-      {
-        "emoji": "🚑",
-        "name": "ambulance",
-        "slug": "ambulance"
-      },
-      {
-        "emoji": "🚒",
-        "name": "fire engine",
-        "slug": "fire_engine"
-      },
-      {
-        "emoji": "🚓",
-        "name": "police car",
-        "slug": "police_car"
-      },
+      { "emoji": "🌇", "name": "sunset", "slug": "sunset" },
+      { "emoji": "🌉", "name": "bridge at night", "slug": "bridge_at_night" },
+      { "emoji": "♨️", "name": "hot springs", "slug": "hot_springs" },
+      { "emoji": "🎠", "name": "carousel horse", "slug": "carousel_horse" },
+      { "emoji": "🛝", "name": "playground slide", "slug": "playground_slide" },
+      { "emoji": "🎡", "name": "ferris wheel", "slug": "ferris_wheel" },
+      { "emoji": "🎢", "name": "roller coaster", "slug": "roller_coaster" },
+      { "emoji": "💈", "name": "barber pole", "slug": "barber_pole" },
+      { "emoji": "🎪", "name": "circus tent", "slug": "circus_tent" },
+      { "emoji": "🚂", "name": "locomotive", "slug": "locomotive" },
+      { "emoji": "🚃", "name": "railway car", "slug": "railway_car" },
+      { "emoji": "🚄", "name": "high-speed train", "slug": "high_speed_train" },
+      { "emoji": "🚅", "name": "bullet train", "slug": "bullet_train" },
+      { "emoji": "🚆", "name": "train", "slug": "train" },
+      { "emoji": "🚇", "name": "metro", "slug": "metro" },
+      { "emoji": "🚈", "name": "light rail", "slug": "light_rail" },
+      { "emoji": "🚉", "name": "station", "slug": "station" },
+      { "emoji": "🚊", "name": "tram", "slug": "tram" },
+      { "emoji": "🚝", "name": "monorail", "slug": "monorail" },
+      { "emoji": "🚞", "name": "mountain railway", "slug": "mountain_railway" },
+      { "emoji": "🚋", "name": "tram car", "slug": "tram_car" },
+      { "emoji": "🚌", "name": "bus", "slug": "bus" },
+      { "emoji": "🚍", "name": "oncoming bus", "slug": "oncoming_bus" },
+      { "emoji": "🚎", "name": "trolleybus", "slug": "trolleybus" },
+      { "emoji": "🚐", "name": "minibus", "slug": "minibus" },
+      { "emoji": "🚑", "name": "ambulance", "slug": "ambulance" },
+      { "emoji": "🚒", "name": "fire engine", "slug": "fire_engine" },
+      { "emoji": "🚓", "name": "police car", "slug": "police_car" },
       {
         "emoji": "🚔",
         "name": "oncoming police car",
         "slug": "oncoming_police_car"
       },
-      {
-        "emoji": "🚕",
-        "name": "taxi",
-        "slug": "taxi"
-      },
-      {
-        "emoji": "🚖",
-        "name": "oncoming taxi",
-        "slug": "oncoming_taxi"
-      },
-      {
-        "emoji": "🚗",
-        "name": "automobile",
-        "slug": "automobile"
-      },
+      { "emoji": "🚕", "name": "taxi", "slug": "taxi" },
+      { "emoji": "🚖", "name": "oncoming taxi", "slug": "oncoming_taxi" },
+      { "emoji": "🚗", "name": "automobile", "slug": "automobile" },
       {
         "emoji": "🚘",
         "name": "oncoming automobile",
@@ -4467,41 +2311,17 @@
         "name": "sport utility vehicle",
         "slug": "sport_utility_vehicle"
       },
-      {
-        "emoji": "🛻",
-        "name": "pickup truck",
-        "slug": "pickup_truck"
-      },
-      {
-        "emoji": "🚚",
-        "name": "delivery truck",
-        "slug": "delivery_truck"
-      },
+      { "emoji": "🛻", "name": "pickup truck", "slug": "pickup_truck" },
+      { "emoji": "🚚", "name": "delivery truck", "slug": "delivery_truck" },
       {
         "emoji": "🚛",
         "name": "articulated lorry",
         "slug": "articulated_lorry"
       },
-      {
-        "emoji": "🚜",
-        "name": "tractor",
-        "slug": "tractor"
-      },
-      {
-        "emoji": "🏎️",
-        "name": "racing car",
-        "slug": "racing_car"
-      },
-      {
-        "emoji": "🏍️",
-        "name": "motorcycle",
-        "slug": "motorcycle"
-      },
-      {
-        "emoji": "🛵",
-        "name": "motor scooter",
-        "slug": "motor_scooter"
-      },
+      { "emoji": "🚜", "name": "tractor", "slug": "tractor" },
+      { "emoji": "🏎️", "name": "racing car", "slug": "racing_car" },
+      { "emoji": "🏍️", "name": "motorcycle", "slug": "motorcycle" },
+      { "emoji": "🛵", "name": "motor scooter", "slug": "motor_scooter" },
       {
         "emoji": "🦽",
         "name": "manual wheelchair",
@@ -4512,66 +2332,18 @@
         "name": "motorized wheelchair",
         "slug": "motorized_wheelchair"
       },
-      {
-        "emoji": "🛺",
-        "name": "auto rickshaw",
-        "slug": "auto_rickshaw"
-      },
-      {
-        "emoji": "🚲",
-        "name": "bicycle",
-        "slug": "bicycle"
-      },
-      {
-        "emoji": "🛴",
-        "name": "kick scooter",
-        "slug": "kick_scooter"
-      },
-      {
-        "emoji": "🛹",
-        "name": "skateboard",
-        "slug": "skateboard"
-      },
-      {
-        "emoji": "🛼",
-        "name": "roller skate",
-        "slug": "roller_skate"
-      },
-      {
-        "emoji": "🚏",
-        "name": "bus stop",
-        "slug": "bus_stop"
-      },
-      {
-        "emoji": "🛣️",
-        "name": "motorway",
-        "slug": "motorway"
-      },
-      {
-        "emoji": "🛤️",
-        "name": "railway track",
-        "slug": "railway_track"
-      },
-      {
-        "emoji": "🛢️",
-        "name": "oil drum",
-        "slug": "oil_drum"
-      },
-      {
-        "emoji": "⛽",
-        "name": "fuel pump",
-        "slug": "fuel_pump"
-      },
-      {
-        "emoji": "🛞",
-        "name": "wheel",
-        "slug": "wheel"
-      },
-      {
-        "emoji": "🚨",
-        "name": "police car light",
-        "slug": "police_car_light"
-      },
+      { "emoji": "🛺", "name": "auto rickshaw", "slug": "auto_rickshaw" },
+      { "emoji": "🚲", "name": "bicycle", "slug": "bicycle" },
+      { "emoji": "🛴", "name": "kick scooter", "slug": "kick_scooter" },
+      { "emoji": "🛹", "name": "skateboard", "slug": "skateboard" },
+      { "emoji": "🛼", "name": "roller skate", "slug": "roller_skate" },
+      { "emoji": "🚏", "name": "bus stop", "slug": "bus_stop" },
+      { "emoji": "🛣️", "name": "motorway", "slug": "motorway" },
+      { "emoji": "🛤️", "name": "railway track", "slug": "railway_track" },
+      { "emoji": "🛢️", "name": "oil drum", "slug": "oil_drum" },
+      { "emoji": "⛽️", "name": "fuel pump", "slug": "fuel_pump" },
+      { "emoji": "🛞", "name": "wheel", "slug": "wheel" },
+      { "emoji": "🚨", "name": "police car light", "slug": "police_car_light" },
       {
         "emoji": "🚥",
         "name": "horizontal traffic light",
@@ -4582,96 +2354,28 @@
         "name": "vertical traffic light",
         "slug": "vertical_traffic_light"
       },
-      {
-        "emoji": "🛑",
-        "name": "stop sign",
-        "slug": "stop_sign"
-      },
-      {
-        "emoji": "🚧",
-        "name": "construction",
-        "slug": "construction"
-      },
-      {
-        "emoji": "⚓",
-        "name": "anchor",
-        "slug": "anchor"
-      },
-      {
-        "emoji": "🛟",
-        "name": "ring buoy",
-        "slug": "ring_buoy"
-      },
-      {
-        "emoji": "⛵",
-        "name": "sailboat",
-        "slug": "sailboat"
-      },
-      {
-        "emoji": "🛶",
-        "name": "canoe",
-        "slug": "canoe"
-      },
-      {
-        "emoji": "🚤",
-        "name": "speedboat",
-        "slug": "speedboat"
-      },
-      {
-        "emoji": "🛳️",
-        "name": "passenger ship",
-        "slug": "passenger_ship"
-      },
-      {
-        "emoji": "⛴️",
-        "name": "ferry",
-        "slug": "ferry"
-      },
-      {
-        "emoji": "🛥️",
-        "name": "motor boat",
-        "slug": "motor_boat"
-      },
-      {
-        "emoji": "🚢",
-        "name": "ship",
-        "slug": "ship"
-      },
-      {
-        "emoji": "✈️",
-        "name": "airplane",
-        "slug": "airplane"
-      },
-      {
-        "emoji": "🛩️",
-        "name": "small airplane",
-        "slug": "small_airplane"
-      },
+      { "emoji": "🛑", "name": "stop sign", "slug": "stop_sign" },
+      { "emoji": "🚧", "name": "construction", "slug": "construction" },
+      { "emoji": "⚓️", "name": "anchor", "slug": "anchor" },
+      { "emoji": "🛟", "name": "ring buoy", "slug": "ring_buoy" },
+      { "emoji": "⛵️", "name": "sailboat", "slug": "sailboat" },
+      { "emoji": "🛶", "name": "canoe", "slug": "canoe" },
+      { "emoji": "🚤", "name": "speedboat", "slug": "speedboat" },
+      { "emoji": "🛳️", "name": "passenger ship", "slug": "passenger_ship" },
+      { "emoji": "⛴️", "name": "ferry", "slug": "ferry" },
+      { "emoji": "🛥️", "name": "motor boat", "slug": "motor_boat" },
+      { "emoji": "🚢", "name": "ship", "slug": "ship" },
+      { "emoji": "✈️", "name": "airplane", "slug": "airplane" },
+      { "emoji": "🛩️", "name": "small airplane", "slug": "small_airplane" },
       {
         "emoji": "🛫",
         "name": "airplane departure",
         "slug": "airplane_departure"
       },
-      {
-        "emoji": "🛬",
-        "name": "airplane arrival",
-        "slug": "airplane_arrival"
-      },
-      {
-        "emoji": "🪂",
-        "name": "parachute",
-        "slug": "parachute"
-      },
-      {
-        "emoji": "💺",
-        "name": "seat",
-        "slug": "seat"
-      },
-      {
-        "emoji": "🚁",
-        "name": "helicopter",
-        "slug": "helicopter"
-      },
+      { "emoji": "🛬", "name": "airplane arrival", "slug": "airplane_arrival" },
+      { "emoji": "🪂", "name": "parachute", "slug": "parachute" },
+      { "emoji": "💺", "name": "seat", "slug": "seat" },
+      { "emoji": "🚁", "name": "helicopter", "slug": "helicopter" },
       {
         "emoji": "🚟",
         "name": "suspension railway",
@@ -4682,66 +2386,22 @@
         "name": "mountain cableway",
         "slug": "mountain_cableway"
       },
+      { "emoji": "🚡", "name": "aerial tramway", "slug": "aerial_tramway" },
+      { "emoji": "🛰️", "name": "satellite", "slug": "satellite" },
+      { "emoji": "🚀", "name": "rocket", "slug": "rocket" },
+      { "emoji": "🛸", "name": "flying saucer", "slug": "flying_saucer" },
+      { "emoji": "🛎️", "name": "bellhop bell", "slug": "bellhop_bell" },
+      { "emoji": "🧳", "name": "luggage", "slug": "luggage" },
+      { "emoji": "⌛️", "name": "hourglass done", "slug": "hourglass_done" },
       {
-        "emoji": "🚡",
-        "name": "aerial tramway",
-        "slug": "aerial_tramway"
-      },
-      {
-        "emoji": "🛰️",
-        "name": "satellite",
-        "slug": "satellite"
-      },
-      {
-        "emoji": "🚀",
-        "name": "rocket",
-        "slug": "rocket"
-      },
-      {
-        "emoji": "🛸",
-        "name": "flying saucer",
-        "slug": "flying_saucer"
-      },
-      {
-        "emoji": "🛎️",
-        "name": "bellhop bell",
-        "slug": "bellhop_bell"
-      },
-      {
-        "emoji": "🧳",
-        "name": "luggage",
-        "slug": "luggage"
-      },
-      {
-        "emoji": "⌛",
-        "name": "hourglass done",
-        "slug": "hourglass_done"
-      },
-      {
-        "emoji": "⏳",
+        "emoji": "⏳️",
         "name": "hourglass not done",
         "slug": "hourglass_not_done"
       },
-      {
-        "emoji": "⌚",
-        "name": "watch",
-        "slug": "watch_clock"
-      },
-      {
-        "emoji": "⏰",
-        "name": "alarm clock",
-        "slug": "alarm_clock"
-      },
-      {
-        "emoji": "⏱️",
-        "name": "stopwatch",
-        "slug": "stopwatch"
-      },
-      {
-        "emoji": "⏲️",
-        "name": "timer clock",
-        "slug": "timer_clock"
-      },
+      { "emoji": "⌚️", "name": "watch", "slug": "watch_clock" },
+      { "emoji": "⏰️", "name": "alarm clock", "slug": "alarm_clock" },
+      { "emoji": "⏱️", "name": "stopwatch", "slug": "stopwatch" },
+      { "emoji": "⏲️", "name": "timer clock", "slug": "timer_clock" },
       {
         "emoji": "🕰️",
         "name": "mantelpiece clock",
@@ -4757,106 +2417,54 @@
         "name": "twelve-thirty",
         "slug": "twelve_thirty_12_12:30"
       },
-      {
-        "emoji": "🕐",
-        "name": "one o’clock",
-        "slug": "one_o_clock_00_1_1:00"
-      },
-      {
-        "emoji": "🕜",
-        "name": "one-thirty",
-        "slug": "one_thirty_1_1:30"
-      },
-      {
-        "emoji": "🕑",
-        "name": "two o’clock",
-        "slug": "two_o_clock_00_2_2:00"
-      },
-      {
-        "emoji": "🕝",
-        "name": "two-thirty",
-        "slug": "two_thirty_2_2:30"
-      },
+      { "emoji": "🕐", "name": "one o’clock", "slug": "one_o_clock_00_1_1:00" },
+      { "emoji": "🕜", "name": "one-thirty", "slug": "one_thirty_1_1:30" },
+      { "emoji": "🕑", "name": "two o’clock", "slug": "two_o_clock_00_2_2:00" },
+      { "emoji": "🕝", "name": "two-thirty", "slug": "two_thirty_2_2:30" },
       {
         "emoji": "🕒",
         "name": "three o’clock",
         "slug": "three_o_clock_00_3_3:00"
       },
-      {
-        "emoji": "🕞",
-        "name": "three-thirty",
-        "slug": "three_thirty_3_3:30"
-      },
+      { "emoji": "🕞", "name": "three-thirty", "slug": "three_thirty_3_3:30" },
       {
         "emoji": "🕓",
         "name": "four o’clock",
         "slug": "four_o_clock_00_4_4:00"
       },
-      {
-        "emoji": "🕟",
-        "name": "four-thirty",
-        "slug": "four_thirty_4_4:30"
-      },
+      { "emoji": "🕟", "name": "four-thirty", "slug": "four_thirty_4_4:30" },
       {
         "emoji": "🕔",
         "name": "five o’clock",
         "slug": "five_o_clock_00_5_5:00"
       },
-      {
-        "emoji": "🕠",
-        "name": "five-thirty",
-        "slug": "five_thirty_5_5:30"
-      },
-      {
-        "emoji": "🕕",
-        "name": "six o’clock",
-        "slug": "six_o_clock_00_6_6:00"
-      },
-      {
-        "emoji": "🕡",
-        "name": "six-thirty",
-        "slug": "six_thirty_6_6:30"
-      },
+      { "emoji": "🕠", "name": "five-thirty", "slug": "five_thirty_5_5:30" },
+      { "emoji": "🕕", "name": "six o’clock", "slug": "six_o_clock_00_6_6:00" },
+      { "emoji": "🕡", "name": "six-thirty", "slug": "six_thirty_6_6:30" },
       {
         "emoji": "🕖",
         "name": "seven o’clock",
         "slug": "seven_o_clock_00_7_7:00"
       },
-      {
-        "emoji": "🕢",
-        "name": "seven-thirty",
-        "slug": "seven_thirty_7_7:30"
-      },
+      { "emoji": "🕢", "name": "seven-thirty", "slug": "seven_thirty_7_7:30" },
       {
         "emoji": "🕗",
         "name": "eight o’clock",
         "slug": "eight_o_clock_00_8_8:00"
       },
-      {
-        "emoji": "🕣",
-        "name": "eight-thirty",
-        "slug": "eight_thirty_8_8:30"
-      },
+      { "emoji": "🕣", "name": "eight-thirty", "slug": "eight_thirty_8_8:30" },
       {
         "emoji": "🕘",
         "name": "nine o’clock",
         "slug": "nine_o_clock_00_9_9:00"
       },
-      {
-        "emoji": "🕤",
-        "name": "nine-thirty",
-        "slug": "nine_thirty_9_9:30"
-      },
+      { "emoji": "🕤", "name": "nine-thirty", "slug": "nine_thirty_9_9:30" },
       {
         "emoji": "🕙",
         "name": "ten o’clock",
         "slug": "ten_o_clock_00_10_10:00"
       },
-      {
-        "emoji": "🕥",
-        "name": "ten-thirty",
-        "slug": "ten_thirty_10_10:30"
-      },
+      { "emoji": "🕥", "name": "ten-thirty", "slug": "ten_thirty_10_10:30" },
       {
         "emoji": "🕚",
         "name": "eleven o’clock",
@@ -4867,11 +2475,7 @@
         "name": "eleven-thirty",
         "slug": "eleven_thirty_11_11:30"
       },
-      {
-        "emoji": "🌑",
-        "name": "new moon",
-        "slug": "new_moon_dark"
-      },
+      { "emoji": "🌑", "name": "new moon", "slug": "new_moon_dark" },
       {
         "emoji": "🌒",
         "name": "waxing crescent moon",
@@ -4887,11 +2491,7 @@
         "name": "waxing gibbous moon",
         "slug": "waxing_gibbous_moon"
       },
-      {
-        "emoji": "🌕",
-        "name": "full moon",
-        "slug": "full_moon"
-      },
+      { "emoji": "🌕", "name": "full moon", "slug": "full_moon" },
       {
         "emoji": "🌖",
         "name": "waning gibbous moon",
@@ -4907,16 +2507,8 @@
         "name": "waning crescent moon",
         "slug": "waning_crescent_moon"
       },
-      {
-        "emoji": "🌙",
-        "name": "crescent moon",
-        "slug": "crescent_moon"
-      },
-      {
-        "emoji": "🌚",
-        "name": "new moon face",
-        "slug": "new_moon_face"
-      },
+      { "emoji": "🌙", "name": "crescent moon", "slug": "crescent_moon" },
+      { "emoji": "🌚", "name": "new moon face", "slug": "new_moon_face" },
       {
         "emoji": "🌛",
         "name": "first quarter moon face",
@@ -4927,58 +2519,18 @@
         "name": "last quarter moon face",
         "slug": "last_quarter_moon_face"
       },
+      { "emoji": "🌡️", "name": "thermometer", "slug": "thermometer" },
+      { "emoji": "☀️", "name": "sun", "slug": "sun" },
+      { "emoji": "🌝", "name": "full moon face", "slug": "full_moon_face" },
+      { "emoji": "🌞", "name": "sun with face", "slug": "sun_with_face" },
+      { "emoji": "🪐", "name": "ringed planet", "slug": "ringed_planet" },
+      { "emoji": "⭐️", "name": "star", "slug": "star" },
+      { "emoji": "🌟", "name": "glowing star", "slug": "glowing_star" },
+      { "emoji": "🌠", "name": "shooting star", "slug": "shooting_star" },
+      { "emoji": "🌌", "name": "milky way", "slug": "milky_way" },
+      { "emoji": "☁️", "name": "cloud", "slug": "cloud" },
       {
-        "emoji": "🌡️",
-        "name": "thermometer",
-        "slug": "thermometer"
-      },
-      {
-        "emoji": "☀️",
-        "name": "sun",
-        "slug": "sun"
-      },
-      {
-        "emoji": "🌝",
-        "name": "full moon face",
-        "slug": "full_moon_face"
-      },
-      {
-        "emoji": "🌞",
-        "name": "sun with face",
-        "slug": "sun_with_face"
-      },
-      {
-        "emoji": "🪐",
-        "name": "ringed planet",
-        "slug": "ringed_planet"
-      },
-      {
-        "emoji": "⭐",
-        "name": "star",
-        "slug": "star"
-      },
-      {
-        "emoji": "🌟",
-        "name": "glowing star",
-        "slug": "glowing_star"
-      },
-      {
-        "emoji": "🌠",
-        "name": "shooting star",
-        "slug": "shooting_star"
-      },
-      {
-        "emoji": "🌌",
-        "name": "milky way",
-        "slug": "milky_way"
-      },
-      {
-        "emoji": "☁️",
-        "name": "cloud",
-        "slug": "cloud"
-      },
-      {
-        "emoji": "⛅",
+        "emoji": "⛅️",
         "name": "sun behind cloud",
         "slug": "sun_behind_cloud"
       },
@@ -5002,58 +2554,22 @@
         "name": "sun behind rain cloud",
         "slug": "sun_behind_rain_cloud"
       },
-      {
-        "emoji": "🌧️",
-        "name": "cloud with rain",
-        "slug": "cloud_with_rain"
-      },
-      {
-        "emoji": "🌨️",
-        "name": "cloud with snow",
-        "slug": "cloud_with_snow"
-      },
+      { "emoji": "🌧️", "name": "cloud with rain", "slug": "cloud_with_rain" },
+      { "emoji": "🌨️", "name": "cloud with snow", "slug": "cloud_with_snow" },
       {
         "emoji": "🌩️",
         "name": "cloud with lightning",
         "slug": "cloud_with_lightning"
       },
+      { "emoji": "🌪️", "name": "tornado", "slug": "tornado" },
+      { "emoji": "🌫️", "name": "fog", "slug": "fog" },
+      { "emoji": "🌬️", "name": "wind face", "slug": "wind_face" },
+      { "emoji": "🌀", "name": "cyclone", "slug": "cyclone" },
+      { "emoji": "🌈", "name": "rainbow", "slug": "rainbow" },
+      { "emoji": "🌂", "name": "closed umbrella", "slug": "closed_umbrella" },
+      { "emoji": "☂️", "name": "umbrella", "slug": "umbrella" },
       {
-        "emoji": "🌪️",
-        "name": "tornado",
-        "slug": "tornado"
-      },
-      {
-        "emoji": "🌫️",
-        "name": "fog",
-        "slug": "fog"
-      },
-      {
-        "emoji": "🌬️",
-        "name": "wind face",
-        "slug": "wind_face"
-      },
-      {
-        "emoji": "🌀",
-        "name": "cyclone",
-        "slug": "cyclone"
-      },
-      {
-        "emoji": "🌈",
-        "name": "rainbow",
-        "slug": "rainbow"
-      },
-      {
-        "emoji": "🌂",
-        "name": "closed umbrella",
-        "slug": "closed_umbrella"
-      },
-      {
-        "emoji": "☂️",
-        "name": "umbrella",
-        "slug": "umbrella"
-      },
-      {
-        "emoji": "☔",
+        "emoji": "☔️",
         "name": "umbrella with rain drops",
         "slug": "umbrella_with_rain_drops"
       },
@@ -5062,46 +2578,18 @@
         "name": "umbrella on ground",
         "slug": "umbrella_on_ground"
       },
+      { "emoji": "⚡️", "name": "high voltage", "slug": "high_voltage" },
+      { "emoji": "❄️", "name": "snowflake", "slug": "snowflake" },
+      { "emoji": "☃️", "name": "snowman", "slug": "snowman" },
       {
-        "emoji": "⚡",
-        "name": "high voltage",
-        "slug": "high_voltage"
-      },
-      {
-        "emoji": "❄️",
-        "name": "snowflake",
-        "slug": "snowflake"
-      },
-      {
-        "emoji": "☃️",
-        "name": "snowman",
-        "slug": "snowman"
-      },
-      {
-        "emoji": "⛄",
+        "emoji": "⛄️",
         "name": "snowman without snow",
         "slug": "snowman_without_snow"
       },
-      {
-        "emoji": "☄️",
-        "name": "comet",
-        "slug": "comet"
-      },
-      {
-        "emoji": "🔥",
-        "name": "fire",
-        "slug": "fire"
-      },
-      {
-        "emoji": "💧",
-        "name": "droplet",
-        "slug": "droplet"
-      },
-      {
-        "emoji": "🌊",
-        "name": "water wave",
-        "slug": "water_wave"
-      }
+      { "emoji": "☄️", "name": "comet", "slug": "comet" },
+      { "emoji": "🔥", "name": "fire", "slug": "fire" },
+      { "emoji": "💧", "name": "droplet", "slug": "droplet" },
+      { "emoji": "🌊", "name": "water wave", "slug": "water_wave" }
     ]
   },
   {
@@ -5113,36 +2601,12 @@
         "name": "jack-o-lantern",
         "slug": "jack_o_lantern_halloween_jack"
       },
-      {
-        "emoji": "🎄",
-        "name": "Christmas tree",
-        "slug": "christmas_tree"
-      },
-      {
-        "emoji": "🎆",
-        "name": "fireworks",
-        "slug": "fireworks_celebration"
-      },
-      {
-        "emoji": "🎇",
-        "name": "sparkler",
-        "slug": "sparkler_celebration"
-      },
-      {
-        "emoji": "🧨",
-        "name": "firecracker",
-        "slug": "firecracker_explosive"
-      },
-      {
-        "emoji": "✨",
-        "name": "sparkles",
-        "slug": "sparkles_star"
-      },
-      {
-        "emoji": "🎈",
-        "name": "balloon",
-        "slug": "balloon"
-      },
+      { "emoji": "🎄", "name": "Christmas tree", "slug": "christmas_tree" },
+      { "emoji": "🎆", "name": "fireworks", "slug": "fireworks_celebration" },
+      { "emoji": "🎇", "name": "sparkler", "slug": "sparkler_celebration" },
+      { "emoji": "🧨", "name": "firecracker", "slug": "firecracker_explosive" },
+      { "emoji": "✨️", "name": "sparkles", "slug": "sparkles_star" },
+      { "emoji": "🎈", "name": "balloon", "slug": "balloon" },
       {
         "emoji": "🎉",
         "name": "party popper",
@@ -5153,341 +2617,89 @@
         "name": "confetti ball",
         "slug": "confetti_ball_celebration"
       },
-      {
-        "emoji": "🎋",
-        "name": "tanabata tree",
-        "slug": "tanabata_tree"
-      },
-      {
-        "emoji": "🎍",
-        "name": "pine decoration",
-        "slug": "pine_decoration"
-      },
-      {
-        "emoji": "🎎",
-        "name": "Japanese dolls",
-        "slug": "japanese_dolls"
-      },
-      {
-        "emoji": "🎏",
-        "name": "carp streamer",
-        "slug": "carp_streamer"
-      },
-      {
-        "emoji": "🎐",
-        "name": "wind chime",
-        "slug": "wind_chime"
-      },
+      { "emoji": "🎋", "name": "tanabata tree", "slug": "tanabata_tree" },
+      { "emoji": "🎍", "name": "pine decoration", "slug": "pine_decoration" },
+      { "emoji": "🎎", "name": "Japanese dolls", "slug": "japanese_dolls" },
+      { "emoji": "🎏", "name": "carp streamer", "slug": "carp_streamer" },
+      { "emoji": "🎐", "name": "wind chime", "slug": "wind_chime" },
       {
         "emoji": "🎑",
         "name": "moon viewing ceremony",
         "slug": "moon_viewing_ceremony"
       },
-      {
-        "emoji": "🧧",
-        "name": "red envelope",
-        "slug": "red_envelope"
-      },
-      {
-        "emoji": "🎀",
-        "name": "ribbon",
-        "slug": "ribbon_celebration"
-      },
-      {
-        "emoji": "🎁",
-        "name": "wrapped gift",
-        "slug": "wrapped_gift"
-      },
-      {
-        "emoji": "🎗️",
-        "name": "reminder ribbon",
-        "slug": "reminder_ribbon"
-      },
+      { "emoji": "🧧", "name": "red envelope", "slug": "red_envelope" },
+      { "emoji": "🎀", "name": "ribbon", "slug": "ribbon_celebration" },
+      { "emoji": "🎁", "name": "wrapped gift", "slug": "wrapped_gift" },
+      { "emoji": "🎗️", "name": "reminder ribbon", "slug": "reminder_ribbon" },
       {
         "emoji": "🎟️",
         "name": "admission tickets",
         "slug": "admission_tickets"
       },
-      {
-        "emoji": "🎫",
-        "name": "ticket",
-        "slug": "ticket"
-      },
-      {
-        "emoji": "🎖️",
-        "name": "military medal",
-        "slug": "military_medal"
-      },
-      {
-        "emoji": "🏆",
-        "name": "trophy",
-        "slug": "trophy"
-      },
-      {
-        "emoji": "🏅",
-        "name": "sports medal",
-        "slug": "sports_medal"
-      },
-      {
-        "emoji": "🥇",
-        "name": "1st place medal",
-        "slug": "1st_place_medal"
-      },
-      {
-        "emoji": "🥈",
-        "name": "2nd place medal",
-        "slug": "2nd_place_medal"
-      },
-      {
-        "emoji": "🥉",
-        "name": "3rd place medal",
-        "slug": "3rd_place_medal"
-      },
-      {
-        "emoji": "⚽",
-        "name": "soccer ball",
-        "slug": "soccer_ball"
-      },
-      {
-        "emoji": "⚾",
-        "name": "baseball",
-        "slug": "baseball"
-      },
-      {
-        "emoji": "🥎",
-        "name": "softball",
-        "slug": "softball"
-      },
-      {
-        "emoji": "🏀",
-        "name": "basketball",
-        "slug": "basketball"
-      },
-      {
-        "emoji": "🏐",
-        "name": "volleyball",
-        "slug": "volleyball"
-      },
+      { "emoji": "🎫", "name": "ticket", "slug": "ticket" },
+      { "emoji": "🎖️", "name": "military medal", "slug": "military_medal" },
+      { "emoji": "🏆", "name": "trophy", "slug": "trophy" },
+      { "emoji": "🏅", "name": "sports medal", "slug": "sports_medal" },
+      { "emoji": "🥇", "name": "1st place medal", "slug": "1st_place_medal" },
+      { "emoji": "🥈", "name": "2nd place medal", "slug": "2nd_place_medal" },
+      { "emoji": "🥉", "name": "3rd place medal", "slug": "3rd_place_medal" },
+      { "emoji": "⚽️", "name": "soccer ball", "slug": "soccer_ball" },
+      { "emoji": "⚾️", "name": "baseball", "slug": "baseball" },
+      { "emoji": "🥎", "name": "softball", "slug": "softball" },
+      { "emoji": "🏀", "name": "basketball", "slug": "basketball" },
+      { "emoji": "🏐", "name": "volleyball", "slug": "volleyball" },
       {
         "emoji": "🏈",
         "name": "american football",
         "slug": "american_football"
       },
-      {
-        "emoji": "🏉",
-        "name": "rugby football",
-        "slug": "rugby_football"
-      },
-      {
-        "emoji": "🎾",
-        "name": "tennis",
-        "slug": "tennis"
-      },
-      {
-        "emoji": "🥏",
-        "name": "flying disc",
-        "slug": "flying_disc"
-      },
-      {
-        "emoji": "🎳",
-        "name": "bowling",
-        "slug": "bowling"
-      },
-      {
-        "emoji": "🏏",
-        "name": "cricket game",
-        "slug": "cricket_game"
-      },
-      {
-        "emoji": "🏑",
-        "name": "field hockey",
-        "slug": "field_hockey"
-      },
-      {
-        "emoji": "🏒",
-        "name": "ice hockey",
-        "slug": "ice_hockey"
-      },
-      {
-        "emoji": "🥍",
-        "name": "lacrosse",
-        "slug": "lacrosse"
-      },
-      {
-        "emoji": "🏓",
-        "name": "ping pong",
-        "slug": "ping_pong"
-      },
-      {
-        "emoji": "🏸",
-        "name": "badminton",
-        "slug": "badminton"
-      },
-      {
-        "emoji": "🥊",
-        "name": "boxing glove",
-        "slug": "boxing_glove"
-      },
+      { "emoji": "🏉", "name": "rugby football", "slug": "rugby_football" },
+      { "emoji": "🎾", "name": "tennis", "slug": "tennis" },
+      { "emoji": "🥏", "name": "flying disc", "slug": "flying_disc" },
+      { "emoji": "🎳", "name": "bowling", "slug": "bowling" },
+      { "emoji": "🏏", "name": "cricket game", "slug": "cricket_game" },
+      { "emoji": "🏑", "name": "field hockey", "slug": "field_hockey" },
+      { "emoji": "🏒", "name": "ice hockey", "slug": "ice_hockey" },
+      { "emoji": "🥍", "name": "lacrosse", "slug": "lacrosse" },
+      { "emoji": "🏓", "name": "ping pong", "slug": "ping_pong" },
+      { "emoji": "🏸", "name": "badminton", "slug": "badminton" },
+      { "emoji": "🥊", "name": "boxing glove", "slug": "boxing_glove" },
       {
         "emoji": "🥋",
         "name": "martial arts uniform",
         "slug": "martial_arts_uniform"
       },
-      {
-        "emoji": "🥅",
-        "name": "goal net",
-        "slug": "goal_net"
-      },
-      {
-        "emoji": "⛳",
-        "name": "flag in hole",
-        "slug": "flag_in_hole"
-      },
-      {
-        "emoji": "⛸️",
-        "name": "ice skate",
-        "slug": "ice_skate"
-      },
-      {
-        "emoji": "🎣",
-        "name": "fishing pole",
-        "slug": "fishing_pole"
-      },
-      {
-        "emoji": "🤿",
-        "name": "diving mask",
-        "slug": "diving_mask"
-      },
-      {
-        "emoji": "🎽",
-        "name": "running shirt",
-        "slug": "running_shirt"
-      },
-      {
-        "emoji": "🎿",
-        "name": "skis",
-        "slug": "skis"
-      },
-      {
-        "emoji": "🛷",
-        "name": "sled",
-        "slug": "sled"
-      },
-      {
-        "emoji": "🥌",
-        "name": "curling stone",
-        "slug": "curling_stone"
-      },
-      {
-        "emoji": "🎯",
-        "name": "bullseye",
-        "slug": "bullseye"
-      },
-      {
-        "emoji": "🪀",
-        "name": "yo-yo",
-        "slug": "yo_yo"
-      },
-      {
-        "emoji": "🪁",
-        "name": "kite",
-        "slug": "kite"
-      },
-      {
-        "emoji": "🔫",
-        "name": "water pistol",
-        "slug": "water_pistol"
-      },
-      {
-        "emoji": "🎱",
-        "name": "pool 8 ball",
-        "slug": "pool_8_ball"
-      },
-      {
-        "emoji": "🔮",
-        "name": "crystal ball",
-        "slug": "crystal_ball"
-      },
-      {
-        "emoji": "🪄",
-        "name": "magic wand",
-        "slug": "magic_wand"
-      },
-      {
-        "emoji": "🎮",
-        "name": "video game",
-        "slug": "video_game"
-      },
-      {
-        "emoji": "🕹️",
-        "name": "joystick",
-        "slug": "joystick"
-      },
-      {
-        "emoji": "🎰",
-        "name": "slot machine",
-        "slug": "slot_machine"
-      },
-      {
-        "emoji": "🎲",
-        "name": "game die",
-        "slug": "game_die"
-      },
-      {
-        "emoji": "🧩",
-        "name": "puzzle piece",
-        "slug": "puzzle_piece"
-      },
-      {
-        "emoji": "🧸",
-        "name": "teddy bear",
-        "slug": "teddy_bear"
-      },
-      {
-        "emoji": "🪅",
-        "name": "piñata",
-        "slug": "pinata"
-      },
-      {
-        "emoji": "🪩",
-        "name": "mirror ball",
-        "slug": "mirror_ball"
-      },
-      {
-        "emoji": "🪆",
-        "name": "nesting dolls",
-        "slug": "nesting_dolls"
-      },
-      {
-        "emoji": "♠️",
-        "name": "spade suit",
-        "slug": "spade_suit"
-      },
-      {
-        "emoji": "♥️",
-        "name": "heart suit",
-        "slug": "heart_suit"
-      },
-      {
-        "emoji": "♦️",
-        "name": "diamond suit",
-        "slug": "diamond_suit"
-      },
-      {
-        "emoji": "♣️",
-        "name": "club suit",
-        "slug": "club_suit"
-      },
-      {
-        "emoji": "♟️",
-        "name": "chess pawn",
-        "slug": "chess_pawn"
-      },
-      {
-        "emoji": "🃏",
-        "name": "joker",
-        "slug": "joker"
-      },
+      { "emoji": "🥅", "name": "goal net", "slug": "goal_net" },
+      { "emoji": "⛳️", "name": "flag in hole", "slug": "flag_in_hole" },
+      { "emoji": "⛸️", "name": "ice skate", "slug": "ice_skate" },
+      { "emoji": "🎣", "name": "fishing pole", "slug": "fishing_pole" },
+      { "emoji": "🤿", "name": "diving mask", "slug": "diving_mask" },
+      { "emoji": "🎽", "name": "running shirt", "slug": "running_shirt" },
+      { "emoji": "🎿", "name": "skis", "slug": "skis" },
+      { "emoji": "🛷", "name": "sled", "slug": "sled" },
+      { "emoji": "🥌", "name": "curling stone", "slug": "curling_stone" },
+      { "emoji": "🎯", "name": "bullseye", "slug": "bullseye" },
+      { "emoji": "🪀", "name": "yo-yo", "slug": "yo_yo" },
+      { "emoji": "🪁", "name": "kite", "slug": "kite" },
+      { "emoji": "🔫", "name": "water pistol", "slug": "water_pistol" },
+      { "emoji": "🎱", "name": "pool 8 ball", "slug": "pool_8_ball" },
+      { "emoji": "🔮", "name": "crystal ball", "slug": "crystal_ball" },
+      { "emoji": "🪄", "name": "magic wand", "slug": "magic_wand" },
+      { "emoji": "🎮", "name": "video game", "slug": "video_game" },
+      { "emoji": "🕹️", "name": "joystick", "slug": "joystick" },
+      { "emoji": "🎰", "name": "slot machine", "slug": "slot_machine" },
+      { "emoji": "🎲", "name": "game die", "slug": "game_die" },
+      { "emoji": "🧩", "name": "puzzle piece", "slug": "puzzle_piece" },
+      { "emoji": "🧸", "name": "teddy bear", "slug": "teddy_bear" },
+      { "emoji": "🪅", "name": "piñata", "slug": "pinata" },
+      { "emoji": "🪩", "name": "mirror ball", "slug": "mirror_ball" },
+      { "emoji": "🪆", "name": "nesting dolls", "slug": "nesting_dolls" },
+      { "emoji": "♠️", "name": "spade suit", "slug": "spade_suit" },
+      { "emoji": "♥️", "name": "heart suit", "slug": "heart_suit" },
+      { "emoji": "♦️", "name": "diamond suit", "slug": "diamond_suit" },
+      { "emoji": "♣️", "name": "club suit", "slug": "club_suit" },
+      { "emoji": "♟️", "name": "chess pawn", "slug": "chess_pawn" },
+      { "emoji": "🃏", "name": "joker", "slug": "joker" },
       {
         "emoji": "🀄",
         "name": "mahjong red dragon",
@@ -5498,277 +2710,73 @@
         "name": "flower playing cards",
         "slug": "flower_playing_cards"
       },
-      {
-        "emoji": "🎭",
-        "name": "performing arts",
-        "slug": "performing_arts"
-      },
-      {
-        "emoji": "🖼️",
-        "name": "framed picture",
-        "slug": "framed_picture"
-      },
-      {
-        "emoji": "🎨",
-        "name": "artist palette",
-        "slug": "artist_palette"
-      },
-      {
-        "emoji": "🧵",
-        "name": "thread",
-        "slug": "thread"
-      },
-      {
-        "emoji": "🪡",
-        "name": "sewing needle",
-        "slug": "sewing_needle"
-      },
-      {
-        "emoji": "🧶",
-        "name": "yarn",
-        "slug": "yarn"
-      },
-      {
-        "emoji": "🪢",
-        "name": "knot",
-        "slug": "knot"
-      }
+      { "emoji": "🎭", "name": "performing arts", "slug": "performing_arts" },
+      { "emoji": "🖼️", "name": "framed picture", "slug": "framed_picture" },
+      { "emoji": "🎨", "name": "artist palette", "slug": "artist_palette" },
+      { "emoji": "🧵", "name": "thread", "slug": "thread" },
+      { "emoji": "🪡", "name": "sewing needle", "slug": "sewing_needle" },
+      { "emoji": "🧶", "name": "yarn", "slug": "yarn" },
+      { "emoji": "🪢", "name": "knot", "slug": "knot" }
     ]
   },
   {
     "name": "Objects",
     "slug": "objects",
     "emojis": [
-      {
-        "emoji": "👓",
-        "name": "glasses",
-        "slug": "glasses"
-      },
-      {
-        "emoji": "🕶️",
-        "name": "sunglasses",
-        "slug": "sunglasses"
-      },
-      {
-        "emoji": "🥽",
-        "name": "goggles",
-        "slug": "goggles"
-      },
-      {
-        "emoji": "🥼",
-        "name": "lab coat",
-        "slug": "lab_coat"
-      },
-      {
-        "emoji": "🦺",
-        "name": "safety vest",
-        "slug": "safety_vest"
-      },
-      {
-        "emoji": "👔",
-        "name": "necktie",
-        "slug": "necktie"
-      },
-      {
-        "emoji": "👕",
-        "name": "t-shirt",
-        "slug": "t_shirt"
-      },
-      {
-        "emoji": "👖",
-        "name": "jeans",
-        "slug": "jeans"
-      },
-      {
-        "emoji": "🧣",
-        "name": "scarf",
-        "slug": "scarf"
-      },
-      {
-        "emoji": "🧤",
-        "name": "gloves",
-        "slug": "gloves"
-      },
-      {
-        "emoji": "🧥",
-        "name": "coat",
-        "slug": "coat"
-      },
-      {
-        "emoji": "🧦",
-        "name": "socks",
-        "slug": "socks"
-      },
-      {
-        "emoji": "👗",
-        "name": "dress",
-        "slug": "dress"
-      },
-      {
-        "emoji": "👘",
-        "name": "kimono",
-        "slug": "kimono"
-      },
-      {
-        "emoji": "🥻",
-        "name": "sari",
-        "slug": "sari"
-      },
+      { "emoji": "👓", "name": "glasses", "slug": "glasses" },
+      { "emoji": "🕶️", "name": "sunglasses", "slug": "sunglasses" },
+      { "emoji": "🥽", "name": "goggles", "slug": "goggles" },
+      { "emoji": "🥼", "name": "lab coat", "slug": "lab_coat" },
+      { "emoji": "🦺", "name": "safety vest", "slug": "safety_vest" },
+      { "emoji": "👔", "name": "necktie", "slug": "necktie" },
+      { "emoji": "👕", "name": "t-shirt", "slug": "t_shirt" },
+      { "emoji": "👖", "name": "jeans", "slug": "jeans" },
+      { "emoji": "🧣", "name": "scarf", "slug": "scarf" },
+      { "emoji": "🧤", "name": "gloves", "slug": "gloves" },
+      { "emoji": "🧥", "name": "coat", "slug": "coat" },
+      { "emoji": "🧦", "name": "socks", "slug": "socks" },
+      { "emoji": "👗", "name": "dress", "slug": "dress" },
+      { "emoji": "👘", "name": "kimono", "slug": "kimono" },
+      { "emoji": "🥻", "name": "sari", "slug": "sari" },
       {
         "emoji": "🩱",
         "name": "one-piece swimsuit",
         "slug": "one_piece_swimsuit"
       },
-      {
-        "emoji": "🩲",
-        "name": "briefs",
-        "slug": "briefs"
-      },
-      {
-        "emoji": "🩳",
-        "name": "shorts",
-        "slug": "shorts"
-      },
-      {
-        "emoji": "👙",
-        "name": "bikini",
-        "slug": "bikini"
-      },
-      {
-        "emoji": "👚",
-        "name": "woman’s clothes",
-        "slug": "woman_s_clothes"
-      },
-      {
-        "emoji": "👛",
-        "name": "purse",
-        "slug": "purse"
-      },
-      {
-        "emoji": "👜",
-        "name": "handbag",
-        "slug": "handbag"
-      },
-      {
-        "emoji": "👝",
-        "name": "clutch bag",
-        "slug": "clutch_bag"
-      },
-      {
-        "emoji": "🛍️",
-        "name": "shopping bags",
-        "slug": "shopping_bags"
-      },
-      {
-        "emoji": "🎒",
-        "name": "backpack",
-        "slug": "backpack"
-      },
-      {
-        "emoji": "🩴",
-        "name": "thong sandal",
-        "slug": "thong_sandal"
-      },
-      {
-        "emoji": "👞",
-        "name": "man’s shoe",
-        "slug": "man_s_shoe"
-      },
-      {
-        "emoji": "👟",
-        "name": "running shoe",
-        "slug": "running_shoe"
-      },
-      {
-        "emoji": "🥾",
-        "name": "hiking boot",
-        "slug": "hiking_boot"
-      },
-      {
-        "emoji": "🥿",
-        "name": "flat shoe",
-        "slug": "flat_shoe"
-      },
-      {
-        "emoji": "👠",
-        "name": "high-heeled shoe",
-        "slug": "high_heeled_shoe"
-      },
-      {
-        "emoji": "👡",
-        "name": "woman’s sandal",
-        "slug": "woman_s_sandal"
-      },
-      {
-        "emoji": "🩰",
-        "name": "ballet shoes",
-        "slug": "ballet_shoes"
-      },
-      {
-        "emoji": "👢",
-        "name": "woman’s boot",
-        "slug": "woman_s_boot"
-      },
-      {
-        "emoji": "👑",
-        "name": "crown",
-        "slug": "crown"
-      },
-      {
-        "emoji": "👒",
-        "name": "woman’s hat",
-        "slug": "woman_s_hat"
-      },
-      {
-        "emoji": "🎩",
-        "name": "top hat",
-        "slug": "top_hat"
-      },
-      {
-        "emoji": "🎓",
-        "name": "graduation cap",
-        "slug": "graduation_cap"
-      },
-      {
-        "emoji": "🧢",
-        "name": "billed cap",
-        "slug": "billed_cap"
-      },
-      {
-        "emoji": "🪖",
-        "name": "military helmet",
-        "slug": "military_helmet"
-      },
+      { "emoji": "🩲", "name": "briefs", "slug": "briefs" },
+      { "emoji": "🩳", "name": "shorts", "slug": "shorts" },
+      { "emoji": "👙", "name": "bikini", "slug": "bikini" },
+      { "emoji": "👚", "name": "woman’s clothes", "slug": "woman_s_clothes" },
+      { "emoji": "👛", "name": "purse", "slug": "purse" },
+      { "emoji": "👜", "name": "handbag", "slug": "handbag" },
+      { "emoji": "👝", "name": "clutch bag", "slug": "clutch_bag" },
+      { "emoji": "🛍️", "name": "shopping bags", "slug": "shopping_bags" },
+      { "emoji": "🎒", "name": "backpack", "slug": "backpack" },
+      { "emoji": "🩴", "name": "thong sandal", "slug": "thong_sandal" },
+      { "emoji": "👞", "name": "man’s shoe", "slug": "man_s_shoe" },
+      { "emoji": "👟", "name": "running shoe", "slug": "running_shoe" },
+      { "emoji": "🥾", "name": "hiking boot", "slug": "hiking_boot" },
+      { "emoji": "🥿", "name": "flat shoe", "slug": "flat_shoe" },
+      { "emoji": "👠", "name": "high-heeled shoe", "slug": "high_heeled_shoe" },
+      { "emoji": "👡", "name": "woman’s sandal", "slug": "woman_s_sandal" },
+      { "emoji": "🩰", "name": "ballet shoes", "slug": "ballet_shoes" },
+      { "emoji": "👢", "name": "woman’s boot", "slug": "woman_s_boot" },
+      { "emoji": "👑", "name": "crown", "slug": "crown" },
+      { "emoji": "👒", "name": "woman’s hat", "slug": "woman_s_hat" },
+      { "emoji": "🎩", "name": "top hat", "slug": "top_hat" },
+      { "emoji": "🎓", "name": "graduation cap", "slug": "graduation_cap" },
+      { "emoji": "🧢", "name": "billed cap", "slug": "billed_cap" },
+      { "emoji": "🪖", "name": "military helmet", "slug": "military_helmet" },
       {
         "emoji": "⛑️",
         "name": "rescue worker’s helmet",
         "slug": "rescue_worker_s_helmet"
       },
-      {
-        "emoji": "📿",
-        "name": "prayer beads",
-        "slug": "prayer_beads"
-      },
-      {
-        "emoji": "💄",
-        "name": "lipstick",
-        "slug": "lipstick"
-      },
-      {
-        "emoji": "💍",
-        "name": "ring",
-        "slug": "ring"
-      },
-      {
-        "emoji": "💎",
-        "name": "gem stone",
-        "slug": "gem_stone"
-      },
-      {
-        "emoji": "🔇",
-        "name": "muted speaker",
-        "slug": "muted_speaker"
-      },
+      { "emoji": "📿", "name": "prayer beads", "slug": "prayer_beads" },
+      { "emoji": "💄", "name": "lipstick", "slug": "lipstick" },
+      { "emoji": "💍", "name": "ring", "slug": "ring" },
+      { "emoji": "💎", "name": "gem stone", "slug": "gem_stone" },
+      { "emoji": "🔇", "name": "muted speaker", "slug": "muted_speaker" },
       {
         "emoji": "🔈",
         "name": "speaker low volume",
@@ -5784,266 +2792,74 @@
         "name": "speaker high volume",
         "slug": "speaker_high_volume"
       },
-      {
-        "emoji": "📢",
-        "name": "loudspeaker",
-        "slug": "loudspeaker"
-      },
-      {
-        "emoji": "📣",
-        "name": "megaphone",
-        "slug": "megaphone"
-      },
-      {
-        "emoji": "📯",
-        "name": "postal horn",
-        "slug": "postal_horn"
-      },
-      {
-        "emoji": "🔔",
-        "name": "bell",
-        "slug": "bell"
-      },
-      {
-        "emoji": "🔕",
-        "name": "bell with slash",
-        "slug": "bell_with_slash"
-      },
-      {
-        "emoji": "🎼",
-        "name": "musical score",
-        "slug": "musical_score"
-      },
-      {
-        "emoji": "🎵",
-        "name": "musical note",
-        "slug": "musical_note"
-      },
-      {
-        "emoji": "🎶",
-        "name": "musical notes",
-        "slug": "musical_notes"
-      },
+      { "emoji": "📢", "name": "loudspeaker", "slug": "loudspeaker" },
+      { "emoji": "📣", "name": "megaphone", "slug": "megaphone" },
+      { "emoji": "📯", "name": "postal horn", "slug": "postal_horn" },
+      { "emoji": "🔔", "name": "bell", "slug": "bell" },
+      { "emoji": "🔕", "name": "bell with slash", "slug": "bell_with_slash" },
+      { "emoji": "🎼", "name": "musical score", "slug": "musical_score" },
+      { "emoji": "🎵", "name": "musical note", "slug": "musical_note" },
+      { "emoji": "🎶", "name": "musical notes", "slug": "musical_notes" },
       {
         "emoji": "🎙️",
         "name": "studio microphone",
         "slug": "studio_microphone"
       },
-      {
-        "emoji": "🎚️",
-        "name": "level slider",
-        "slug": "level_slider"
-      },
-      {
-        "emoji": "🎛️",
-        "name": "control knobs",
-        "slug": "control_knobs"
-      },
-      {
-        "emoji": "🎤",
-        "name": "microphone",
-        "slug": "microphone"
-      },
-      {
-        "emoji": "🎧",
-        "name": "headphone",
-        "slug": "headphone"
-      },
-      {
-        "emoji": "📻",
-        "name": "radio",
-        "slug": "radio"
-      },
-      {
-        "emoji": "🎷",
-        "name": "saxophone",
-        "slug": "saxophone"
-      },
-      {
-        "emoji": "🪗",
-        "name": "accordion",
-        "slug": "accordion"
-      },
-      {
-        "emoji": "🎸",
-        "name": "guitar",
-        "slug": "guitar"
-      },
-      {
-        "emoji": "🎹",
-        "name": "musical keyboard",
-        "slug": "musical_keyboard"
-      },
-      {
-        "emoji": "🎺",
-        "name": "trumpet",
-        "slug": "trumpet"
-      },
-      {
-        "emoji": "🎻",
-        "name": "violin",
-        "slug": "violin"
-      },
-      {
-        "emoji": "🪕",
-        "name": "banjo",
-        "slug": "banjo"
-      },
-      {
-        "emoji": "🥁",
-        "name": "drum",
-        "slug": "drum"
-      },
-      {
-        "emoji": "🪘",
-        "name": "long drum",
-        "slug": "long_drum"
-      },
-      {
-        "emoji": "📱",
-        "name": "mobile phone",
-        "slug": "mobile_phone"
-      },
+      { "emoji": "🎚️", "name": "level slider", "slug": "level_slider" },
+      { "emoji": "🎛️", "name": "control knobs", "slug": "control_knobs" },
+      { "emoji": "🎤", "name": "microphone", "slug": "microphone" },
+      { "emoji": "🎧", "name": "headphone", "slug": "headphone" },
+      { "emoji": "📻", "name": "radio", "slug": "radio" },
+      { "emoji": "🎷", "name": "saxophone", "slug": "saxophone" },
+      { "emoji": "🪗", "name": "accordion", "slug": "accordion" },
+      { "emoji": "🎸", "name": "guitar", "slug": "guitar" },
+      { "emoji": "🎹", "name": "musical keyboard", "slug": "musical_keyboard" },
+      { "emoji": "🎺", "name": "trumpet", "slug": "trumpet" },
+      { "emoji": "🎻", "name": "violin", "slug": "violin" },
+      { "emoji": "🪕", "name": "banjo", "slug": "banjo" },
+      { "emoji": "🥁", "name": "drum", "slug": "drum" },
+      { "emoji": "🪘", "name": "long drum", "slug": "long_drum" },
+      { "emoji": "📱", "name": "mobile phone", "slug": "mobile_phone" },
       {
         "emoji": "📲",
         "name": "mobile phone with arrow",
         "slug": "mobile_phone_with_arrow"
       },
-      {
-        "emoji": "☎️",
-        "name": "telephone",
-        "slug": "telephone"
-      },
+      { "emoji": "☎️", "name": "telephone", "slug": "telephone" },
       {
         "emoji": "📞",
         "name": "telephone receiver",
         "slug": "telephone_receiver"
       },
-      {
-        "emoji": "📟",
-        "name": "pager",
-        "slug": "pager"
-      },
-      {
-        "emoji": "📠",
-        "name": "fax machine",
-        "slug": "fax_machine"
-      },
-      {
-        "emoji": "🔋",
-        "name": "battery",
-        "slug": "battery"
-      },
-      {
-        "emoji": "🪫",
-        "name": "low battery",
-        "slug": "low_battery"
-      },
-      {
-        "emoji": "🔌",
-        "name": "electric plug",
-        "slug": "electric_plug"
-      },
-      {
-        "emoji": "💻",
-        "name": "laptop",
-        "slug": "laptop"
-      },
-      {
-        "emoji": "🖥️",
-        "name": "desktop computer",
-        "slug": "desktop_computer"
-      },
-      {
-        "emoji": "🖨️",
-        "name": "printer",
-        "slug": "printer"
-      },
-      {
-        "emoji": "⌨️",
-        "name": "keyboard",
-        "slug": "keyboard"
-      },
-      {
-        "emoji": "🖱️",
-        "name": "computer mouse",
-        "slug": "computer_mouse"
-      },
-      {
-        "emoji": "🖲️",
-        "name": "trackball",
-        "slug": "trackball"
-      },
-      {
-        "emoji": "💽",
-        "name": "computer disk",
-        "slug": "computer_disk"
-      },
-      {
-        "emoji": "💾",
-        "name": "floppy disk",
-        "slug": "floppy_disk"
-      },
-      {
-        "emoji": "💿",
-        "name": "optical disk",
-        "slug": "optical_disk"
-      },
-      {
-        "emoji": "📀",
-        "name": "dvd",
-        "slug": "dvd"
-      },
-      {
-        "emoji": "🧮",
-        "name": "abacus",
-        "slug": "abacus"
-      },
-      {
-        "emoji": "🎥",
-        "name": "movie camera",
-        "slug": "movie_camera"
-      },
-      {
-        "emoji": "🎞️",
-        "name": "film frames",
-        "slug": "film_frames"
-      },
-      {
-        "emoji": "📽️",
-        "name": "film projector",
-        "slug": "film_projector"
-      },
-      {
-        "emoji": "🎬",
-        "name": "clapper board",
-        "slug": "clapper_board"
-      },
-      {
-        "emoji": "📺",
-        "name": "television",
-        "slug": "television"
-      },
-      {
-        "emoji": "📷",
-        "name": "camera",
-        "slug": "camera"
-      },
+      { "emoji": "📟", "name": "pager", "slug": "pager" },
+      { "emoji": "📠", "name": "fax machine", "slug": "fax_machine" },
+      { "emoji": "🔋", "name": "battery", "slug": "battery" },
+      { "emoji": "🪫", "name": "low battery", "slug": "low_battery" },
+      { "emoji": "🔌", "name": "electric plug", "slug": "electric_plug" },
+      { "emoji": "💻", "name": "laptop", "slug": "laptop" },
+      { "emoji": "🖥️", "name": "desktop computer", "slug": "desktop_computer" },
+      { "emoji": "🖨️", "name": "printer", "slug": "printer" },
+      { "emoji": "⌨️", "name": "keyboard", "slug": "keyboard" },
+      { "emoji": "🖱️", "name": "computer mouse", "slug": "computer_mouse" },
+      { "emoji": "🖲️", "name": "trackball", "slug": "trackball" },
+      { "emoji": "💽", "name": "computer disk", "slug": "computer_disk" },
+      { "emoji": "💾", "name": "floppy disk", "slug": "floppy_disk" },
+      { "emoji": "💿", "name": "optical disk", "slug": "optical_disk" },
+      { "emoji": "📀", "name": "dvd", "slug": "dvd" },
+      { "emoji": "🧮", "name": "abacus", "slug": "abacus" },
+      { "emoji": "🎥", "name": "movie camera", "slug": "movie_camera" },
+      { "emoji": "🎞️", "name": "film frames", "slug": "film_frames" },
+      { "emoji": "📽️", "name": "film projector", "slug": "film_projector" },
+      { "emoji": "🎬", "name": "clapper board", "slug": "clapper_board" },
+      { "emoji": "📺", "name": "television", "slug": "television" },
+      { "emoji": "📷", "name": "camera", "slug": "camera" },
       {
         "emoji": "📸",
         "name": "camera with flash",
         "slug": "camera_with_flash"
       },
-      {
-        "emoji": "📹",
-        "name": "video camera",
-        "slug": "video_camera"
-      },
-      {
-        "emoji": "📼",
-        "name": "videocassette",
-        "slug": "videocassette"
-      },
+      { "emoji": "📹", "name": "video camera", "slug": "video_camera" },
+      { "emoji": "📼", "name": "videocassette", "slug": "videocassette" },
       {
         "emoji": "🔍",
         "name": "magnifying glass tilted left",
@@ -6054,176 +2870,56 @@
         "name": "magnifying glass tilted right",
         "slug": "magnifying_glass_tilted_right"
       },
-      {
-        "emoji": "🕯️",
-        "name": "candle",
-        "slug": "candle"
-      },
-      {
-        "emoji": "💡",
-        "name": "light bulb",
-        "slug": "light_bulb"
-      },
-      {
-        "emoji": "🔦",
-        "name": "flashlight",
-        "slug": "flashlight"
-      },
+      { "emoji": "🕯️", "name": "candle", "slug": "candle" },
+      { "emoji": "💡", "name": "light bulb", "slug": "light_bulb" },
+      { "emoji": "🔦", "name": "flashlight", "slug": "flashlight" },
       {
         "emoji": "🏮",
         "name": "red paper lantern",
         "slug": "red_paper_lantern"
       },
-      {
-        "emoji": "🪔",
-        "name": "diya lamp",
-        "slug": "diya_lamp"
-      },
+      { "emoji": "🪔", "name": "diya lamp", "slug": "diya_lamp" },
       {
         "emoji": "📔",
         "name": "notebook with decorative cover",
         "slug": "notebook_with_decorative_cover"
       },
-      {
-        "emoji": "📕",
-        "name": "closed book",
-        "slug": "closed_book"
-      },
-      {
-        "emoji": "📖",
-        "name": "open book",
-        "slug": "open_book"
-      },
-      {
-        "emoji": "📗",
-        "name": "green book",
-        "slug": "green_book"
-      },
-      {
-        "emoji": "📘",
-        "name": "blue book",
-        "slug": "blue_book"
-      },
-      {
-        "emoji": "📙",
-        "name": "orange book",
-        "slug": "orange_book"
-      },
-      {
-        "emoji": "📚",
-        "name": "books",
-        "slug": "books"
-      },
-      {
-        "emoji": "📓",
-        "name": "notebook",
-        "slug": "notebook"
-      },
-      {
-        "emoji": "📒",
-        "name": "ledger",
-        "slug": "ledger"
-      },
-      {
-        "emoji": "📃",
-        "name": "page with curl",
-        "slug": "page_with_curl"
-      },
-      {
-        "emoji": "📜",
-        "name": "scroll",
-        "slug": "scroll"
-      },
-      {
-        "emoji": "📄",
-        "name": "page facing up",
-        "slug": "page_facing_up"
-      },
-      {
-        "emoji": "📰",
-        "name": "newspaper",
-        "slug": "newspaper"
-      },
+      { "emoji": "📕", "name": "closed book", "slug": "closed_book" },
+      { "emoji": "📖", "name": "open book", "slug": "open_book" },
+      { "emoji": "📗", "name": "green book", "slug": "green_book" },
+      { "emoji": "📘", "name": "blue book", "slug": "blue_book" },
+      { "emoji": "📙", "name": "orange book", "slug": "orange_book" },
+      { "emoji": "📚", "name": "books", "slug": "books" },
+      { "emoji": "📓", "name": "notebook", "slug": "notebook" },
+      { "emoji": "📒", "name": "ledger", "slug": "ledger" },
+      { "emoji": "📃", "name": "page with curl", "slug": "page_with_curl" },
+      { "emoji": "📜", "name": "scroll", "slug": "scroll" },
+      { "emoji": "📄", "name": "page facing up", "slug": "page_facing_up" },
+      { "emoji": "📰", "name": "newspaper", "slug": "newspaper" },
       {
         "emoji": "🗞️",
         "name": "rolled-up newspaper",
         "slug": "rolled_up_newspaper"
       },
-      {
-        "emoji": "📑",
-        "name": "bookmark tabs",
-        "slug": "bookmark_tabs"
-      },
-      {
-        "emoji": "🔖",
-        "name": "bookmark",
-        "slug": "bookmark"
-      },
-      {
-        "emoji": "🏷️",
-        "name": "label",
-        "slug": "label"
-      },
-      {
-        "emoji": "💰",
-        "name": "money bag",
-        "slug": "money_bag"
-      },
-      {
-        "emoji": "🪙",
-        "name": "coin",
-        "slug": "coin"
-      },
-      {
-        "emoji": "💴",
-        "name": "yen banknote",
-        "slug": "yen_banknote"
-      },
-      {
-        "emoji": "💵",
-        "name": "dollar banknote",
-        "slug": "dollar_banknote"
-      },
-      {
-        "emoji": "💶",
-        "name": "euro banknote",
-        "slug": "euro_banknote"
-      },
-      {
-        "emoji": "💷",
-        "name": "pound banknote",
-        "slug": "pound_banknote"
-      },
-      {
-        "emoji": "💸",
-        "name": "money with wings",
-        "slug": "money_with_wings"
-      },
-      {
-        "emoji": "💳",
-        "name": "credit card",
-        "slug": "credit_card"
-      },
-      {
-        "emoji": "🧾",
-        "name": "receipt",
-        "slug": "receipt"
-      },
+      { "emoji": "📑", "name": "bookmark tabs", "slug": "bookmark_tabs" },
+      { "emoji": "🔖", "name": "bookmark", "slug": "bookmark" },
+      { "emoji": "🏷️", "name": "label", "slug": "label" },
+      { "emoji": "💰", "name": "money bag", "slug": "money_bag" },
+      { "emoji": "🪙", "name": "coin", "slug": "coin" },
+      { "emoji": "💴", "name": "yen banknote", "slug": "yen_banknote" },
+      { "emoji": "💵", "name": "dollar banknote", "slug": "dollar_banknote" },
+      { "emoji": "💶", "name": "euro banknote", "slug": "euro_banknote" },
+      { "emoji": "💷", "name": "pound banknote", "slug": "pound_banknote" },
+      { "emoji": "💸", "name": "money with wings", "slug": "money_with_wings" },
+      { "emoji": "💳", "name": "credit card", "slug": "credit_card" },
+      { "emoji": "🧾", "name": "receipt", "slug": "receipt" },
       {
         "emoji": "💹",
         "name": "chart increasing with yen",
         "slug": "chart_increasing_with_yen"
       },
-      {
-        "emoji": "✉️",
-        "name": "envelope",
-        "slug": "envelope_email_letter"
-      },
-      {
-        "emoji": "📧",
-        "name": "e-mail",
-        "slug": "e_mail_email"
-      },
+      { "emoji": "✉️", "name": "envelope", "slug": "envelope_email_letter" },
+      { "emoji": "📧", "name": "e-mail", "slug": "e_mail_email" },
       {
         "emoji": "📨",
         "name": "incoming envelope",
@@ -6234,21 +2930,9 @@
         "name": "envelope with arrow",
         "slug": "envelope_with_arrow_email_letter"
       },
-      {
-        "emoji": "📤",
-        "name": "outbox tray",
-        "slug": "outbox_tray_sent"
-      },
-      {
-        "emoji": "📥",
-        "name": "inbox tray",
-        "slug": "inbox_tray_receive"
-      },
-      {
-        "emoji": "📦",
-        "name": "package",
-        "slug": "package_parcel_box"
-      },
+      { "emoji": "📤", "name": "outbox tray", "slug": "outbox_tray_sent" },
+      { "emoji": "📥", "name": "inbox tray", "slug": "inbox_tray_receive" },
+      { "emoji": "📦", "name": "package", "slug": "package_parcel_box" },
       {
         "emoji": "📫",
         "name": "closed mailbox with raised flag",
@@ -6269,211 +2953,63 @@
         "name": "open mailbox with lowered flag",
         "slug": "open_mailbox_with_lowered_flag"
       },
-      {
-        "emoji": "📮",
-        "name": "postbox",
-        "slug": "postbox"
-      },
+      { "emoji": "📮", "name": "postbox", "slug": "postbox" },
       {
         "emoji": "🗳️",
         "name": "ballot box with ballot",
         "slug": "ballot_box_with_ballot"
       },
-      {
-        "emoji": "✏️",
-        "name": "pencil",
-        "slug": "pencil"
-      },
-      {
-        "emoji": "✒️",
-        "name": "black nib",
-        "slug": "black_nib"
-      },
-      {
-        "emoji": "🖋️",
-        "name": "fountain pen",
-        "slug": "fountain_pen"
-      },
-      {
-        "emoji": "🖊️",
-        "name": "pen",
-        "slug": "pen"
-      },
-      {
-        "emoji": "🖌️",
-        "name": "paintbrush",
-        "slug": "paintbrush"
-      },
-      {
-        "emoji": "🖍️",
-        "name": "crayon",
-        "slug": "crayon"
-      },
-      {
-        "emoji": "📝",
-        "name": "memo",
-        "slug": "memo"
-      },
-      {
-        "emoji": "💼",
-        "name": "briefcase",
-        "slug": "briefcase"
-      },
-      {
-        "emoji": "📁",
-        "name": "file folder",
-        "slug": "file_folder"
-      },
-      {
-        "emoji": "📂",
-        "name": "open file folder",
-        "slug": "open_file_folder"
-      },
+      { "emoji": "✏️", "name": "pencil", "slug": "pencil" },
+      { "emoji": "✒️", "name": "black nib", "slug": "black_nib" },
+      { "emoji": "🖋️", "name": "fountain pen", "slug": "fountain_pen" },
+      { "emoji": "🖊️", "name": "pen", "slug": "pen" },
+      { "emoji": "🖌️", "name": "paintbrush", "slug": "paintbrush" },
+      { "emoji": "🖍️", "name": "crayon", "slug": "crayon" },
+      { "emoji": "📝", "name": "memo", "slug": "memo" },
+      { "emoji": "💼", "name": "briefcase", "slug": "briefcase" },
+      { "emoji": "📁", "name": "file folder", "slug": "file_folder" },
+      { "emoji": "📂", "name": "open file folder", "slug": "open_file_folder" },
       {
         "emoji": "🗂️",
         "name": "card index dividers",
         "slug": "card_index_dividers"
       },
-      {
-        "emoji": "📅",
-        "name": "calendar",
-        "slug": "calendar"
-      },
+      { "emoji": "📅", "name": "calendar", "slug": "calendar" },
       {
         "emoji": "📆",
         "name": "tear-off calendar",
         "slug": "tear_off_calendar"
       },
-      {
-        "emoji": "🗒️",
-        "name": "spiral notepad",
-        "slug": "spiral_notepad"
-      },
-      {
-        "emoji": "🗓️",
-        "name": "spiral calendar",
-        "slug": "spiral_calendar"
-      },
-      {
-        "emoji": "📇",
-        "name": "card index",
-        "slug": "card_index"
-      },
-      {
-        "emoji": "📈",
-        "name": "chart increasing",
-        "slug": "chart_increasing"
-      },
-      {
-        "emoji": "📉",
-        "name": "chart decreasing",
-        "slug": "chart_decreasing"
-      },
-      {
-        "emoji": "📊",
-        "name": "bar chart",
-        "slug": "bar_chart"
-      },
-      {
-        "emoji": "📋",
-        "name": "clipboard",
-        "slug": "clipboard"
-      },
-      {
-        "emoji": "📌",
-        "name": "pushpin",
-        "slug": "pushpin"
-      },
-      {
-        "emoji": "📍",
-        "name": "round pushpin",
-        "slug": "round_pushpin"
-      },
-      {
-        "emoji": "📎",
-        "name": "paperclip",
-        "slug": "paperclip"
-      },
+      { "emoji": "🗒️", "name": "spiral notepad", "slug": "spiral_notepad" },
+      { "emoji": "🗓️", "name": "spiral calendar", "slug": "spiral_calendar" },
+      { "emoji": "📇", "name": "card index", "slug": "card_index" },
+      { "emoji": "📈", "name": "chart increasing", "slug": "chart_increasing" },
+      { "emoji": "📉", "name": "chart decreasing", "slug": "chart_decreasing" },
+      { "emoji": "📊", "name": "bar chart", "slug": "bar_chart" },
+      { "emoji": "📋", "name": "clipboard", "slug": "clipboard" },
+      { "emoji": "📌", "name": "pushpin", "slug": "pushpin" },
+      { "emoji": "📍", "name": "round pushpin", "slug": "round_pushpin" },
+      { "emoji": "📎", "name": "paperclip", "slug": "paperclip" },
       {
         "emoji": "🖇️",
         "name": "linked paperclips",
         "slug": "linked_paperclips"
       },
-      {
-        "emoji": "📏",
-        "name": "straight ruler",
-        "slug": "straight_ruler"
-      },
-      {
-        "emoji": "📐",
-        "name": "triangular ruler",
-        "slug": "triangular_ruler"
-      },
-      {
-        "emoji": "✂️",
-        "name": "scissors",
-        "slug": "scissors"
-      },
-      {
-        "emoji": "🗃️",
-        "name": "card file box",
-        "slug": "card_file_box"
-      },
-      {
-        "emoji": "🗄️",
-        "name": "file cabinet",
-        "slug": "file_cabinet"
-      },
-      {
-        "emoji": "🗑️",
-        "name": "wastebasket",
-        "slug": "wastebasket"
-      },
-      {
-        "emoji": "🔒",
-        "name": "locked",
-        "slug": "locked"
-      },
-      {
-        "emoji": "🔓",
-        "name": "unlocked",
-        "slug": "unlocked"
-      },
-      {
-        "emoji": "🔏",
-        "name": "locked with pen",
-        "slug": "locked_with_pen"
-      },
-      {
-        "emoji": "🔐",
-        "name": "locked with key",
-        "slug": "locked_with_key"
-      },
-      {
-        "emoji": "🔑",
-        "name": "key",
-        "slug": "key"
-      },
-      {
-        "emoji": "🗝️",
-        "name": "old key",
-        "slug": "old_key"
-      },
-      {
-        "emoji": "🔨",
-        "name": "hammer",
-        "slug": "hammer_tool"
-      },
-      {
-        "emoji": "🪓",
-        "name": "axe",
-        "slug": "axe"
-      },
-      {
-        "emoji": "⛏️",
-        "name": "pick",
-        "slug": "pick_tool"
-      },
+      { "emoji": "📏", "name": "straight ruler", "slug": "straight_ruler" },
+      { "emoji": "📐", "name": "triangular ruler", "slug": "triangular_ruler" },
+      { "emoji": "✂️", "name": "scissors", "slug": "scissors" },
+      { "emoji": "🗃️", "name": "card file box", "slug": "card_file_box" },
+      { "emoji": "🗄️", "name": "file cabinet", "slug": "file_cabinet" },
+      { "emoji": "🗑️", "name": "wastebasket", "slug": "wastebasket" },
+      { "emoji": "🔒", "name": "locked", "slug": "locked" },
+      { "emoji": "🔓", "name": "unlocked", "slug": "unlocked" },
+      { "emoji": "🔏", "name": "locked with pen", "slug": "locked_with_pen" },
+      { "emoji": "🔐", "name": "locked with key", "slug": "locked_with_key" },
+      { "emoji": "🔑", "name": "key", "slug": "key" },
+      { "emoji": "🗝️", "name": "old key", "slug": "old_key" },
+      { "emoji": "🔨", "name": "hammer", "slug": "hammer_tool" },
+      { "emoji": "🪓", "name": "axe", "slug": "axe" },
+      { "emoji": "⛏️", "name": "pick", "slug": "pick_tool" },
       {
         "emoji": "⚒️",
         "name": "hammer and pick",
@@ -6484,341 +3020,89 @@
         "name": "hammer and wrench",
         "slug": "hammer_and_wrench_tool"
       },
-      {
-        "emoji": "🗡️",
-        "name": "dagger",
-        "slug": "dagger_knife_weapon"
-      },
+      { "emoji": "🗡️", "name": "dagger", "slug": "dagger_knife_weapon" },
       {
         "emoji": "⚔️",
         "name": "crossed swords",
         "slug": "crossed_swords_weapon"
       },
-      {
-        "emoji": "💣",
-        "name": "bomb",
-        "slug": "bomb_comic"
-      },
-      {
-        "emoji": "🪃",
-        "name": "boomerang",
-        "slug": "boomerang"
-      },
-      {
-        "emoji": "🏹",
-        "name": "bow and arrow",
-        "slug": "bow_and_arrow"
-      },
-      {
-        "emoji": "🛡️",
-        "name": "shield",
-        "slug": "shield"
-      },
-      {
-        "emoji": "🪚",
-        "name": "carpentry saw",
-        "slug": "carpentry_saw"
-      },
-      {
-        "emoji": "🔧",
-        "name": "wrench",
-        "slug": "wrench_tool"
-      },
-      {
-        "emoji": "🪛",
-        "name": "screwdriver",
-        "slug": "screwdriver_tool"
-      },
-      {
-        "emoji": "🔩",
-        "name": "nut and bolt",
-        "slug": "nut_and_bolt_tool"
-      },
-      {
-        "emoji": "⚙️",
-        "name": "gear",
-        "slug": "gear_tool"
-      },
-      {
-        "emoji": "🗜️",
-        "name": "clamp",
-        "slug": "clamp_tool"
-      },
+      { "emoji": "💣", "name": "bomb", "slug": "bomb_comic" },
+      { "emoji": "🪃", "name": "boomerang", "slug": "boomerang" },
+      { "emoji": "🏹", "name": "bow and arrow", "slug": "bow_and_arrow" },
+      { "emoji": "🛡️", "name": "shield", "slug": "shield" },
+      { "emoji": "🪚", "name": "carpentry saw", "slug": "carpentry_saw" },
+      { "emoji": "🔧", "name": "wrench", "slug": "wrench_tool" },
+      { "emoji": "🪛", "name": "screwdriver", "slug": "screwdriver_tool" },
+      { "emoji": "🔩", "name": "nut and bolt", "slug": "nut_and_bolt_tool" },
+      { "emoji": "⚙️", "name": "gear", "slug": "gear_tool" },
+      { "emoji": "🗜️", "name": "clamp", "slug": "clamp_tool" },
       {
         "emoji": "⚖️",
         "name": "balance scale",
         "slug": "balance_scale_justice"
       },
-      {
-        "emoji": "🦯",
-        "name": "white cane",
-        "slug": "white_cane"
-      },
-      {
-        "emoji": "🔗",
-        "name": "link",
-        "slug": "link"
-      },
-      {
-        "emoji": "⛓️",
-        "name": "chains",
-        "slug": "chains"
-      },
-      {
-        "emoji": "🪝",
-        "name": "hook",
-        "slug": "hook"
-      },
-      {
-        "emoji": "🧰",
-        "name": "toolbox",
-        "slug": "toolbox"
-      },
-      {
-        "emoji": "🧲",
-        "name": "magnet",
-        "slug": "magnet"
-      },
-      {
-        "emoji": "🪜",
-        "name": "ladder",
-        "slug": "ladder"
-      },
-      {
-        "emoji": "⚗️",
-        "name": "alembic",
-        "slug": "alembic"
-      },
-      {
-        "emoji": "🧪",
-        "name": "test tube",
-        "slug": "test_tube"
-      },
-      {
-        "emoji": "🧫",
-        "name": "petri dish",
-        "slug": "petri_dish"
-      },
-      {
-        "emoji": "🧬",
-        "name": "dna",
-        "slug": "dna"
-      },
-      {
-        "emoji": "🔬",
-        "name": "microscope",
-        "slug": "microscope"
-      },
-      {
-        "emoji": "🔭",
-        "name": "telescope",
-        "slug": "telescope"
-      },
+      { "emoji": "🦯", "name": "white cane", "slug": "white_cane" },
+      { "emoji": "🔗", "name": "link", "slug": "link" },
+      { "emoji": "⛓️", "name": "chains", "slug": "chains" },
+      { "emoji": "🪝", "name": "hook", "slug": "hook" },
+      { "emoji": "🧰", "name": "toolbox", "slug": "toolbox" },
+      { "emoji": "🧲", "name": "magnet", "slug": "magnet" },
+      { "emoji": "🪜", "name": "ladder", "slug": "ladder" },
+      { "emoji": "⚗️", "name": "alembic", "slug": "alembic" },
+      { "emoji": "🧪", "name": "test tube", "slug": "test_tube" },
+      { "emoji": "🧫", "name": "petri dish", "slug": "petri_dish" },
+      { "emoji": "🧬", "name": "dna", "slug": "dna" },
+      { "emoji": "🔬", "name": "microscope", "slug": "microscope" },
+      { "emoji": "🔭", "name": "telescope", "slug": "telescope" },
       {
         "emoji": "📡",
         "name": "satellite antenna",
         "slug": "satellite_antenna"
       },
-      {
-        "emoji": "💉",
-        "name": "syringe",
-        "slug": "syringe"
-      },
-      {
-        "emoji": "🩸",
-        "name": "drop of blood",
-        "slug": "drop_of_blood"
-      },
-      {
-        "emoji": "💊",
-        "name": "pill",
-        "slug": "pill_medical_medicine_sick"
-      },
-      {
-        "emoji": "🩹",
-        "name": "adhesive bandage",
-        "slug": "adhesive_bandage"
-      },
-      {
-        "emoji": "🩼",
-        "name": "crutch",
-        "slug": "crutch"
-      },
-      {
-        "emoji": "🩺",
-        "name": "stethoscope",
-        "slug": "stethoscope"
-      },
-      {
-        "emoji": "🩻",
-        "name": "x-ray",
-        "slug": "x_ray"
-      },
-      {
-        "emoji": "🚪",
-        "name": "door",
-        "slug": "door"
-      },
-      {
-        "emoji": "🛗",
-        "name": "elevator",
-        "slug": "elevator"
-      },
-      {
-        "emoji": "🪞",
-        "name": "mirror",
-        "slug": "mirror"
-      },
-      {
-        "emoji": "🪟",
-        "name": "window",
-        "slug": "window"
-      },
-      {
-        "emoji": "🛏️",
-        "name": "bed",
-        "slug": "bed"
-      },
-      {
-        "emoji": "🛋️",
-        "name": "couch and lamp",
-        "slug": "couch_and_lamp"
-      },
-      {
-        "emoji": "🪑",
-        "name": "chair",
-        "slug": "chair"
-      },
-      {
-        "emoji": "🚽",
-        "name": "toilet",
-        "slug": "toilet"
-      },
-      {
-        "emoji": "🪠",
-        "name": "plunger",
-        "slug": "plunger"
-      },
-      {
-        "emoji": "🚿",
-        "name": "shower",
-        "slug": "shower"
-      },
-      {
-        "emoji": "🛁",
-        "name": "bathtub",
-        "slug": "bathtub"
-      },
-      {
-        "emoji": "🪤",
-        "name": "mouse trap",
-        "slug": "mouse_trap"
-      },
-      {
-        "emoji": "🪒",
-        "name": "razor",
-        "slug": "razor"
-      },
-      {
-        "emoji": "🧴",
-        "name": "lotion bottle",
-        "slug": "lotion_bottle"
-      },
-      {
-        "emoji": "🧷",
-        "name": "safety pin",
-        "slug": "safety_pin"
-      },
-      {
-        "emoji": "🧹",
-        "name": "broom",
-        "slug": "broom"
-      },
-      {
-        "emoji": "🧺",
-        "name": "basket",
-        "slug": "basket"
-      },
-      {
-        "emoji": "🧻",
-        "name": "roll of paper",
-        "slug": "roll_of_paper"
-      },
-      {
-        "emoji": "🪣",
-        "name": "bucket",
-        "slug": "bucket"
-      },
-      {
-        "emoji": "🧼",
-        "name": "soap",
-        "slug": "soap"
-      },
-      {
-        "emoji": "🫧",
-        "name": "bubbles",
-        "slug": "bubbles"
-      },
-      {
-        "emoji": "🪥",
-        "name": "toothbrush",
-        "slug": "toothbrush"
-      },
-      {
-        "emoji": "🧽",
-        "name": "sponge",
-        "slug": "sponge"
-      },
+      { "emoji": "💉", "name": "syringe", "slug": "syringe" },
+      { "emoji": "🩸", "name": "drop of blood", "slug": "drop_of_blood" },
+      { "emoji": "💊", "name": "pill", "slug": "pill_medical_medicine_sick" },
+      { "emoji": "🩹", "name": "adhesive bandage", "slug": "adhesive_bandage" },
+      { "emoji": "🩼", "name": "crutch", "slug": "crutch" },
+      { "emoji": "🩺", "name": "stethoscope", "slug": "stethoscope" },
+      { "emoji": "🩻", "name": "x-ray", "slug": "x_ray" },
+      { "emoji": "🚪", "name": "door", "slug": "door" },
+      { "emoji": "🛗", "name": "elevator", "slug": "elevator" },
+      { "emoji": "🪞", "name": "mirror", "slug": "mirror" },
+      { "emoji": "🪟", "name": "window", "slug": "window" },
+      { "emoji": "🛏️", "name": "bed", "slug": "bed" },
+      { "emoji": "🛋️", "name": "couch and lamp", "slug": "couch_and_lamp" },
+      { "emoji": "🪑", "name": "chair", "slug": "chair" },
+      { "emoji": "🚽", "name": "toilet", "slug": "toilet" },
+      { "emoji": "🪠", "name": "plunger", "slug": "plunger" },
+      { "emoji": "🚿", "name": "shower", "slug": "shower" },
+      { "emoji": "🛁", "name": "bathtub", "slug": "bathtub" },
+      { "emoji": "🪤", "name": "mouse trap", "slug": "mouse_trap" },
+      { "emoji": "🪒", "name": "razor", "slug": "razor" },
+      { "emoji": "🧴", "name": "lotion bottle", "slug": "lotion_bottle" },
+      { "emoji": "🧷", "name": "safety pin", "slug": "safety_pin" },
+      { "emoji": "🧹", "name": "broom", "slug": "broom" },
+      { "emoji": "🧺", "name": "basket", "slug": "basket" },
+      { "emoji": "🧻", "name": "roll of paper", "slug": "roll_of_paper" },
+      { "emoji": "🪣", "name": "bucket", "slug": "bucket" },
+      { "emoji": "🧼", "name": "soap", "slug": "soap" },
+      { "emoji": "🫧", "name": "bubbles", "slug": "bubbles" },
+      { "emoji": "🪥", "name": "toothbrush", "slug": "toothbrush" },
+      { "emoji": "🧽", "name": "sponge", "slug": "sponge" },
       {
         "emoji": "🧯",
         "name": "fire extinguisher",
         "slug": "fire_extinguisher"
       },
-      {
-        "emoji": "🛒",
-        "name": "shopping cart",
-        "slug": "shopping_cart"
-      },
-      {
-        "emoji": "🚬",
-        "name": "cigarette",
-        "slug": "cigarette"
-      },
-      {
-        "emoji": "⚰️",
-        "name": "coffin",
-        "slug": "coffin"
-      },
-      {
-        "emoji": "🪦",
-        "name": "headstone",
-        "slug": "headstone"
-      },
-      {
-        "emoji": "⚱️",
-        "name": "funeral urn",
-        "slug": "funeral_urn"
-      },
-      {
-        "emoji": "🧿",
-        "name": "nazar amulet",
-        "slug": "nazar_amulet"
-      },
-      {
-        "emoji": "🪬",
-        "name": "hamsa",
-        "slug": "hamsa"
-      },
-      {
-        "emoji": "🗿",
-        "name": "moai",
-        "slug": "moai"
-      },
-      {
-        "emoji": "🪧",
-        "name": "placard",
-        "slug": "placard"
-      },
+      { "emoji": "🛒", "name": "shopping cart", "slug": "shopping_cart" },
+      { "emoji": "🚬", "name": "cigarette", "slug": "cigarette" },
+      { "emoji": "⚰️", "name": "coffin", "slug": "coffin" },
+      { "emoji": "🪦", "name": "headstone", "slug": "headstone" },
+      { "emoji": "⚱️", "name": "funeral urn", "slug": "funeral_urn" },
+      { "emoji": "🧿", "name": "nazar amulet", "slug": "nazar_amulet" },
+      { "emoji": "🪬", "name": "hamsa", "slug": "hamsa" },
+      { "emoji": "🗿", "name": "moai", "slug": "moai" },
+      { "emoji": "🪧", "name": "placard", "slug": "placard" },
       {
         "emoji": "🪪",
         "name": "identification card",
@@ -6840,176 +3124,60 @@
         "name": "litter in bin sign",
         "slug": "litter_in_bin_sign"
       },
+      { "emoji": "🚰", "name": "potable water", "slug": "potable_water" },
       {
-        "emoji": "🚰",
-        "name": "potable water",
-        "slug": "potable_water"
-      },
-      {
-        "emoji": "♿",
+        "emoji": "♿️",
         "name": "wheelchair symbol",
         "slug": "wheelchair_symbol"
       },
-      {
-        "emoji": "🚹",
-        "name": "men’s room",
-        "slug": "men_s_room_bathroom"
-      },
+      { "emoji": "🚹", "name": "men’s room", "slug": "men_s_room_bathroom" },
       {
         "emoji": "🚺",
         "name": "women’s room",
         "slug": "women_s_room_bathroom"
       },
-      {
-        "emoji": "🚻",
-        "name": "restroom",
-        "slug": "restroom"
-      },
-      {
-        "emoji": "🚼",
-        "name": "baby symbol",
-        "slug": "baby_symbol"
-      },
-      {
-        "emoji": "🚾",
-        "name": "water closet",
-        "slug": "water_closet"
-      },
-      {
-        "emoji": "🛂",
-        "name": "passport control",
-        "slug": "passport_control"
-      },
-      {
-        "emoji": "🛃",
-        "name": "customs",
-        "slug": "customs"
-      },
-      {
-        "emoji": "🛄",
-        "name": "baggage claim",
-        "slug": "baggage_claim"
-      },
-      {
-        "emoji": "🛅",
-        "name": "left luggage",
-        "slug": "left_luggage"
-      },
-      {
-        "emoji": "⚠️",
-        "name": "warning",
-        "slug": "warning"
-      },
+      { "emoji": "🚻", "name": "restroom", "slug": "restroom" },
+      { "emoji": "🚼", "name": "baby symbol", "slug": "baby_symbol" },
+      { "emoji": "🚾", "name": "water closet", "slug": "water_closet" },
+      { "emoji": "🛂", "name": "passport control", "slug": "passport_control" },
+      { "emoji": "🛃", "name": "customs", "slug": "customs" },
+      { "emoji": "🛄", "name": "baggage claim", "slug": "baggage_claim" },
+      { "emoji": "🛅", "name": "left luggage", "slug": "left_luggage" },
+      { "emoji": "⚠️", "name": "warning", "slug": "warning" },
       {
         "emoji": "🚸",
         "name": "children crossing",
         "slug": "children_crossing"
       },
-      {
-        "emoji": "⛔",
-        "name": "no entry",
-        "slug": "no_entry"
-      },
-      {
-        "emoji": "🚫",
-        "name": "prohibited",
-        "slug": "prohibited"
-      },
-      {
-        "emoji": "🚳",
-        "name": "no bicycles",
-        "slug": "no_bicycles"
-      },
-      {
-        "emoji": "🚭",
-        "name": "no smoking",
-        "slug": "no_smoking"
-      },
-      {
-        "emoji": "🚯",
-        "name": "no littering",
-        "slug": "no_littering"
-      },
+      { "emoji": "⛔️", "name": "no entry", "slug": "no_entry" },
+      { "emoji": "🚫", "name": "prohibited", "slug": "prohibited" },
+      { "emoji": "🚳", "name": "no bicycles", "slug": "no_bicycles" },
+      { "emoji": "🚭", "name": "no smoking", "slug": "no_smoking" },
+      { "emoji": "🚯", "name": "no littering", "slug": "no_littering" },
       {
         "emoji": "🚱",
         "name": "non-potable water",
         "slug": "non_potable_water"
       },
-      {
-        "emoji": "🚷",
-        "name": "no pedestrians",
-        "slug": "no_pedestrians"
-      },
-      {
-        "emoji": "📵",
-        "name": "no mobile phones",
-        "slug": "no_mobile_phones"
-      },
+      { "emoji": "🚷", "name": "no pedestrians", "slug": "no_pedestrians" },
+      { "emoji": "📵", "name": "no mobile phones", "slug": "no_mobile_phones" },
       {
         "emoji": "🔞",
         "name": "no one under eighteen",
         "slug": "no_one_under_eighteen_18_age_limit_prohibited"
       },
-      {
-        "emoji": "☢️",
-        "name": "radioactive",
-        "slug": "radioactive"
-      },
-      {
-        "emoji": "☣️",
-        "name": "biohazard",
-        "slug": "biohazard"
-      },
-      {
-        "emoji": "⬆️",
-        "name": "up arrow",
-        "slug": "up_arrow"
-      },
-      {
-        "emoji": "↗️",
-        "name": "up-right arrow",
-        "slug": "up_right_arrow"
-      },
-      {
-        "emoji": "➡️",
-        "name": "right arrow",
-        "slug": "right_arrow"
-      },
-      {
-        "emoji": "↘️",
-        "name": "down-right arrow",
-        "slug": "down_right_arrow"
-      },
-      {
-        "emoji": "⬇️",
-        "name": "down arrow",
-        "slug": "down_arrow"
-      },
-      {
-        "emoji": "↙️",
-        "name": "down-left arrow",
-        "slug": "down_left_arrow"
-      },
-      {
-        "emoji": "⬅️",
-        "name": "left arrow",
-        "slug": "left_arrow"
-      },
-      {
-        "emoji": "↖️",
-        "name": "up-left arrow",
-        "slug": "up_left_arrow"
-      },
-      {
-        "emoji": "↕️",
-        "name": "up-down arrow",
-        "slug": "up_down_arrow"
-      },
-      {
-        "emoji": "↔️",
-        "name": "left-right arrow",
-        "slug": "left_right_arrow"
-      },
+      { "emoji": "☢️", "name": "radioactive", "slug": "radioactive" },
+      { "emoji": "☣️", "name": "biohazard", "slug": "biohazard" },
+      { "emoji": "⬆️", "name": "up arrow", "slug": "up_arrow" },
+      { "emoji": "↗️", "name": "up-right arrow", "slug": "up_right_arrow" },
+      { "emoji": "➡️", "name": "right arrow", "slug": "right_arrow" },
+      { "emoji": "↘️", "name": "down-right arrow", "slug": "down_right_arrow" },
+      { "emoji": "⬇️", "name": "down arrow", "slug": "down_arrow" },
+      { "emoji": "↙️", "name": "down-left arrow", "slug": "down_left_arrow" },
+      { "emoji": "⬅️", "name": "left arrow", "slug": "left_arrow" },
+      { "emoji": "↖️", "name": "up-left arrow", "slug": "up_left_arrow" },
+      { "emoji": "↕️", "name": "up-down arrow", "slug": "up_down_arrow" },
+      { "emoji": "↔️", "name": "left-right arrow", "slug": "left_right_arrow" },
       {
         "emoji": "↩️",
         "name": "right arrow curving left",
@@ -7040,178 +3208,58 @@
         "name": "counterclockwise arrows button",
         "slug": "counterclockwise_arrows_button"
       },
-      {
-        "emoji": "🔙",
-        "name": "BACK arrow",
-        "slug": "back_arrow"
-      },
-      {
-        "emoji": "🔚",
-        "name": "END arrow",
-        "slug": "end_arrow"
-      },
-      {
-        "emoji": "🔛",
-        "name": "ON! arrow",
-        "slug": "on_arrow"
-      },
-      {
-        "emoji": "🔜",
-        "name": "SOON arrow",
-        "slug": "soon_arrow"
-      },
-      {
-        "emoji": "🔝",
-        "name": "TOP arrow",
-        "slug": "top_arrow"
-      },
-      {
-        "emoji": "🛐",
-        "name": "place of worship",
-        "slug": "place_of_worship"
-      },
-      {
-        "emoji": "⚛️",
-        "name": "atom symbol",
-        "slug": "atom_symbol"
-      },
-      {
-        "emoji": "🕉️",
-        "name": "om",
-        "slug": "om"
-      },
-      {
-        "emoji": "✡️",
-        "name": "star of David",
-        "slug": "star_of_david"
-      },
-      {
-        "emoji": "☸️",
-        "name": "wheel of dharma",
-        "slug": "wheel_of_dharma"
-      },
-      {
-        "emoji": "☯️",
-        "name": "yin yang",
-        "slug": "yin_yang"
-      },
-      {
-        "emoji": "✝️",
-        "name": "latin cross",
-        "slug": "latin_cross"
-      },
-      {
-        "emoji": "☦️",
-        "name": "orthodox cross",
-        "slug": "orthodox_cross"
-      },
+      { "emoji": "🔙", "name": "BACK arrow", "slug": "back_arrow" },
+      { "emoji": "🔚", "name": "END arrow", "slug": "end_arrow" },
+      { "emoji": "🔛", "name": "ON! arrow", "slug": "on_arrow" },
+      { "emoji": "🔜", "name": "SOON arrow", "slug": "soon_arrow" },
+      { "emoji": "🔝", "name": "TOP arrow", "slug": "top_arrow" },
+      { "emoji": "🛐", "name": "place of worship", "slug": "place_of_worship" },
+      { "emoji": "⚛️", "name": "atom symbol", "slug": "atom_symbol" },
+      { "emoji": "🕉️", "name": "om", "slug": "om" },
+      { "emoji": "✡️", "name": "star of David", "slug": "star_of_david" },
+      { "emoji": "☸️", "name": "wheel of dharma", "slug": "wheel_of_dharma" },
+      { "emoji": "☯️", "name": "yin yang", "slug": "yin_yang" },
+      { "emoji": "✝️", "name": "latin cross", "slug": "latin_cross" },
+      { "emoji": "☦️", "name": "orthodox cross", "slug": "orthodox_cross" },
       {
         "emoji": "☪️",
         "name": "star and crescent",
         "slug": "star_and_crescent"
       },
-      {
-        "emoji": "☮️",
-        "name": "peace symbol",
-        "slug": "peace_symbol"
-      },
-      {
-        "emoji": "🕎",
-        "name": "menorah",
-        "slug": "menorah"
-      },
+      { "emoji": "☮️", "name": "peace symbol", "slug": "peace_symbol" },
+      { "emoji": "🕎", "name": "menorah", "slug": "menorah" },
       {
         "emoji": "🔯",
         "name": "dotted six-pointed star",
         "slug": "dotted_six_pointed_star"
       },
-      {
-        "emoji": "♈",
-        "name": "Aries",
-        "slug": "aries"
-      },
-      {
-        "emoji": "♉",
-        "name": "Taurus",
-        "slug": "taurus"
-      },
-      {
-        "emoji": "♊",
-        "name": "Gemini",
-        "slug": "gemini"
-      },
-      {
-        "emoji": "♋",
-        "name": "Cancer",
-        "slug": "cancer"
-      },
-      {
-        "emoji": "♌",
-        "name": "Leo",
-        "slug": "leo"
-      },
-      {
-        "emoji": "♍",
-        "name": "Virgo",
-        "slug": "virgo"
-      },
-      {
-        "emoji": "♎",
-        "name": "Libra",
-        "slug": "libra"
-      },
-      {
-        "emoji": "♏",
-        "name": "Scorpio",
-        "slug": "scorpio"
-      },
-      {
-        "emoji": "♐",
-        "name": "Sagittarius",
-        "slug": "sagittarius"
-      },
-      {
-        "emoji": "♑",
-        "name": "Capricorn",
-        "slug": "capricorn"
-      },
-      {
-        "emoji": "♒",
-        "name": "Aquarius",
-        "slug": "aquarius"
-      },
-      {
-        "emoji": "♓",
-        "name": "Pisces",
-        "slug": "pisces"
-      },
-      {
-        "emoji": "⛎",
-        "name": "Ophiuchus",
-        "slug": "ophiuchus"
-      },
+      { "emoji": "♈️", "name": "Aries", "slug": "aries" },
+      { "emoji": "♉️", "name": "Taurus", "slug": "taurus" },
+      { "emoji": "♊️", "name": "Gemini", "slug": "gemini" },
+      { "emoji": "♋️", "name": "Cancer", "slug": "cancer" },
+      { "emoji": "♌️", "name": "Leo", "slug": "leo" },
+      { "emoji": "♍️", "name": "Virgo", "slug": "virgo" },
+      { "emoji": "♎️", "name": "Libra", "slug": "libra" },
+      { "emoji": "♏️", "name": "Scorpio", "slug": "scorpio" },
+      { "emoji": "♐️", "name": "Sagittarius", "slug": "sagittarius" },
+      { "emoji": "♑️", "name": "Capricorn", "slug": "capricorn" },
+      { "emoji": "♒️", "name": "Aquarius", "slug": "aquarius" },
+      { "emoji": "♓️", "name": "Pisces", "slug": "pisces" },
+      { "emoji": "⛎️", "name": "Ophiuchus", "slug": "ophiuchus" },
       {
         "emoji": "🔀",
         "name": "shuffle tracks button",
         "slug": "shuffle_tracks_button"
       },
-      {
-        "emoji": "🔁",
-        "name": "repeat button",
-        "slug": "repeat_button"
-      },
+      { "emoji": "🔁", "name": "repeat button", "slug": "repeat_button" },
       {
         "emoji": "🔂",
         "name": "repeat single button",
         "slug": "repeat_single_button"
       },
+      { "emoji": "▶️", "name": "play button", "slug": "play_button" },
       {
-        "emoji": "▶️",
-        "name": "play button",
-        "slug": "play_button"
-      },
-      {
-        "emoji": "⏩",
+        "emoji": "⏩️",
         "name": "fast-forward button",
         "slug": "fast_forward_button"
       },
@@ -7225,13 +3273,9 @@
         "name": "play or pause button",
         "slug": "play_or_pause_button"
       },
+      { "emoji": "◀️", "name": "reverse button", "slug": "reverse_button" },
       {
-        "emoji": "◀️",
-        "name": "reverse button",
-        "slug": "reverse_button"
-      },
-      {
-        "emoji": "⏪",
+        "emoji": "⏪️",
         "name": "fast reverse button",
         "slug": "fast_reverse_button"
       },
@@ -7240,121 +3284,41 @@
         "name": "last track button",
         "slug": "last_track_button"
       },
+      { "emoji": "🔼", "name": "upwards button", "slug": "upwards_button" },
+      { "emoji": "⏫️", "name": "fast up button", "slug": "fast_up_button" },
+      { "emoji": "🔽", "name": "downwards button", "slug": "downwards_button" },
       {
-        "emoji": "🔼",
-        "name": "upwards button",
-        "slug": "upwards_button"
-      },
-      {
-        "emoji": "⏫",
-        "name": "fast up button",
-        "slug": "fast_up_button"
-      },
-      {
-        "emoji": "🔽",
-        "name": "downwards button",
-        "slug": "downwards_button"
-      },
-      {
-        "emoji": "⏬",
+        "emoji": "⏬️",
         "name": "fast down button",
         "slug": "fast_down_button"
       },
-      {
-        "emoji": "⏸️",
-        "name": "pause button",
-        "slug": "pause_button"
-      },
-      {
-        "emoji": "⏹️",
-        "name": "stop button",
-        "slug": "stop_button"
-      },
-      {
-        "emoji": "⏺️",
-        "name": "record button",
-        "slug": "record_button"
-      },
-      {
-        "emoji": "⏏️",
-        "name": "eject button",
-        "slug": "eject_button"
-      },
-      {
-        "emoji": "🎦",
-        "name": "cinema",
-        "slug": "cinema"
-      },
-      {
-        "emoji": "🔅",
-        "name": "dim button",
-        "slug": "dim_button"
-      },
-      {
-        "emoji": "🔆",
-        "name": "bright button",
-        "slug": "bright_button"
-      },
-      {
-        "emoji": "📶",
-        "name": "antenna bars",
-        "slug": "antenna_bars"
-      },
-      {
-        "emoji": "📳",
-        "name": "vibration mode",
-        "slug": "vibration_mode"
-      },
-      {
-        "emoji": "📴",
-        "name": "mobile phone off",
-        "slug": "mobile_phone_off"
-      },
-      {
-        "emoji": "♀️",
-        "name": "female sign",
-        "slug": "female_sign"
-      },
-      {
-        "emoji": "♂️",
-        "name": "male sign",
-        "slug": "male_sign"
-      },
+      { "emoji": "⏸️", "name": "pause button", "slug": "pause_button" },
+      { "emoji": "⏹️", "name": "stop button", "slug": "stop_button" },
+      { "emoji": "⏺️", "name": "record button", "slug": "record_button" },
+      { "emoji": "⏏️", "name": "eject button", "slug": "eject_button" },
+      { "emoji": "🎦", "name": "cinema", "slug": "cinema" },
+      { "emoji": "🔅", "name": "dim button", "slug": "dim_button" },
+      { "emoji": "🔆", "name": "bright button", "slug": "bright_button" },
+      { "emoji": "📶", "name": "antenna bars", "slug": "antenna_bars" },
+      { "emoji": "📳", "name": "vibration mode", "slug": "vibration_mode" },
+      { "emoji": "📴", "name": "mobile phone off", "slug": "mobile_phone_off" },
+      { "emoji": "♀️", "name": "female sign", "slug": "female_sign" },
+      { "emoji": "♂️", "name": "male sign", "slug": "male_sign" },
       {
         "emoji": "⚧️",
         "name": "transgender symbol",
         "slug": "transgender_symbol"
       },
-      {
-        "emoji": "✖️",
-        "name": "multiply",
-        "slug": "multiply"
-      },
-      {
-        "emoji": "➕",
-        "name": "plus",
-        "slug": "plus"
-      },
-      {
-        "emoji": "➖",
-        "name": "minus",
-        "slug": "minus"
-      },
-      {
-        "emoji": "➗",
-        "name": "divide",
-        "slug": "divide"
-      },
+      { "emoji": "✖️", "name": "multiply", "slug": "multiply" },
+      { "emoji": "➕️", "name": "plus", "slug": "plus" },
+      { "emoji": "➖️", "name": "minus", "slug": "minus" },
+      { "emoji": "➗️", "name": "divide", "slug": "divide" },
       {
         "emoji": "🟰",
         "name": "heavy equals sign",
         "slug": "heavy_equals_sign"
       },
-      {
-        "emoji": "♾️",
-        "name": "infinity",
-        "slug": "infinity"
-      },
+      { "emoji": "♾️", "name": "infinity", "slug": "infinity" },
       {
         "emoji": "‼️",
         "name": "double exclamation mark",
@@ -7366,30 +3330,26 @@
         "slug": "exclamation_question_mark"
       },
       {
-        "emoji": "❓",
+        "emoji": "❓️",
         "name": "red question mark",
         "slug": "red_question_mark"
       },
       {
-        "emoji": "❔",
+        "emoji": "❔️",
         "name": "white question mark",
         "slug": "white_question_mark"
       },
       {
-        "emoji": "❕",
+        "emoji": "❕️",
         "name": "white exclamation mark",
         "slug": "white_exclamation_mark"
       },
       {
-        "emoji": "❗",
+        "emoji": "❗️",
         "name": "red exclamation mark",
         "slug": "red_exclamation_mark"
       },
-      {
-        "emoji": "〰️",
-        "name": "wavy dash",
-        "slug": "wavy_dash"
-      },
+      { "emoji": "〰️", "name": "wavy dash", "slug": "wavy_dash" },
       {
         "emoji": "💱",
         "name": "currency exchange",
@@ -7400,43 +3360,23 @@
         "name": "heavy dollar sign",
         "slug": "heavy_dollar_sign"
       },
-      {
-        "emoji": "⚕️",
-        "name": "medical symbol",
-        "slug": "medical_symbol"
-      },
-      {
-        "emoji": "♻️",
-        "name": "recycling symbol",
-        "slug": "recycling_symbol"
-      },
-      {
-        "emoji": "⚜️",
-        "name": "fleur-de-lis",
-        "slug": "fleur_de_lis"
-      },
-      {
-        "emoji": "🔱",
-        "name": "trident emblem",
-        "slug": "trident_emblem"
-      },
-      {
-        "emoji": "📛",
-        "name": "name badge",
-        "slug": "name_badge"
-      },
+      { "emoji": "⚕️", "name": "medical symbol", "slug": "medical_symbol" },
+      { "emoji": "♻️", "name": "recycling symbol", "slug": "recycling_symbol" },
+      { "emoji": "⚜️", "name": "fleur-de-lis", "slug": "fleur_de_lis" },
+      { "emoji": "🔱", "name": "trident emblem", "slug": "trident_emblem" },
+      { "emoji": "📛", "name": "name badge", "slug": "name_badge" },
       {
         "emoji": "🔰",
         "name": "Japanese symbol for beginner",
         "slug": "japanese_symbol_for_beginner"
       },
       {
-        "emoji": "⭕",
+        "emoji": "⭕️",
         "name": "hollow red circle",
         "slug": "hollow_red_circle"
       },
       {
-        "emoji": "✅",
+        "emoji": "✅️",
         "name": "check mark button",
         "slug": "check_mark_button"
       },
@@ -7445,28 +3385,16 @@
         "name": "check box with check",
         "slug": "check_box_with_check"
       },
+      { "emoji": "✔️", "name": "check mark", "slug": "check_mark" },
+      { "emoji": "❌️", "name": "cross mark", "slug": "cross_mark" },
       {
-        "emoji": "✔️",
-        "name": "check mark",
-        "slug": "check_mark"
-      },
-      {
-        "emoji": "❌",
-        "name": "cross mark",
-        "slug": "cross_mark"
-      },
-      {
-        "emoji": "❎",
+        "emoji": "❎️",
         "name": "cross mark button",
         "slug": "cross_mark_button"
       },
+      { "emoji": "➰️", "name": "curly loop", "slug": "curly_loop" },
       {
-        "emoji": "➰",
-        "name": "curly loop",
-        "slug": "curly_loop"
-      },
-      {
-        "emoji": "➿",
+        "emoji": "➿️",
         "name": "double curly loop",
         "slug": "double_curly_loop"
       },
@@ -7485,91 +3413,23 @@
         "name": "eight-pointed star",
         "slug": "eight_pointed_star"
       },
-      {
-        "emoji": "❇️",
-        "name": "sparkle",
-        "slug": "sparkle"
-      },
-      {
-        "emoji": "©️",
-        "name": "copyright",
-        "slug": "copyright"
-      },
-      {
-        "emoji": "®️",
-        "name": "registered",
-        "slug": "registered"
-      },
-      {
-        "emoji": "™️",
-        "name": "trade mark",
-        "slug": "trade_mark"
-      },
-      {
-        "emoji": "#️⃣",
-        "name": "keycap #",
-        "slug": "keycap_number_sign"
-      },
-      {
-        "emoji": "*️⃣",
-        "name": "keycap *",
-        "slug": "keycap_asterisk"
-      },
-      {
-        "emoji": "0️⃣",
-        "name": "keycap 0",
-        "slug": "keycap_0"
-      },
-      {
-        "emoji": "1️⃣",
-        "name": "keycap 1",
-        "slug": "keycap_1"
-      },
-      {
-        "emoji": "2️⃣",
-        "name": "keycap 2",
-        "slug": "keycap_2"
-      },
-      {
-        "emoji": "3️⃣",
-        "name": "keycap 3",
-        "slug": "keycap_3"
-      },
-      {
-        "emoji": "4️⃣",
-        "name": "keycap 4",
-        "slug": "keycap_4"
-      },
-      {
-        "emoji": "5️⃣",
-        "name": "keycap 5",
-        "slug": "keycap_5"
-      },
-      {
-        "emoji": "6️⃣",
-        "name": "keycap 6",
-        "slug": "keycap_6"
-      },
-      {
-        "emoji": "7️⃣",
-        "name": "keycap 7",
-        "slug": "keycap_7"
-      },
-      {
-        "emoji": "8️⃣",
-        "name": "keycap 8",
-        "slug": "keycap_8"
-      },
-      {
-        "emoji": "9️⃣",
-        "name": "keycap 9",
-        "slug": "keycap_9"
-      },
-      {
-        "emoji": "🔟",
-        "name": "keycap 10",
-        "slug": "keycap_10"
-      },
+      { "emoji": "❇️", "name": "sparkle", "slug": "sparkle" },
+      { "emoji": "©️", "name": "copyright", "slug": "copyright" },
+      { "emoji": "®️", "name": "registered", "slug": "registered" },
+      { "emoji": "™️", "name": "trade mark", "slug": "trade_mark" },
+      { "emoji": "#️⃣", "name": "keycap #", "slug": "keycap_number_sign" },
+      { "emoji": "*️⃣", "name": "keycap *", "slug": "keycap_asterisk" },
+      { "emoji": "0️⃣", "name": "keycap 0", "slug": "keycap_0" },
+      { "emoji": "1️⃣", "name": "keycap 1", "slug": "keycap_1" },
+      { "emoji": "2️⃣", "name": "keycap 2", "slug": "keycap_2" },
+      { "emoji": "3️⃣", "name": "keycap 3", "slug": "keycap_3" },
+      { "emoji": "4️⃣", "name": "keycap 4", "slug": "keycap_4" },
+      { "emoji": "5️⃣", "name": "keycap 5", "slug": "keycap_5" },
+      { "emoji": "6️⃣", "name": "keycap 6", "slug": "keycap_6" },
+      { "emoji": "7️⃣", "name": "keycap 7", "slug": "keycap_7" },
+      { "emoji": "8️⃣", "name": "keycap 8", "slug": "keycap_8" },
+      { "emoji": "9️⃣", "name": "keycap 9", "slug": "keycap_9" },
+      { "emoji": "🔟", "name": "keycap 10", "slug": "keycap_10" },
       {
         "emoji": "🔠",
         "name": "input latin uppercase",
@@ -7580,106 +3440,30 @@
         "name": "input latin lowercase",
         "slug": "input_latin_lowercase"
       },
-      {
-        "emoji": "🔢",
-        "name": "input numbers",
-        "slug": "input_numbers"
-      },
-      {
-        "emoji": "🔣",
-        "name": "input symbols",
-        "slug": "input_symbols"
-      },
+      { "emoji": "🔢", "name": "input numbers", "slug": "input_numbers" },
+      { "emoji": "🔣", "name": "input symbols", "slug": "input_symbols" },
       {
         "emoji": "🔤",
         "name": "input latin letters",
         "slug": "input_latin_letters"
       },
-      {
-        "emoji": "🅰️",
-        "name": "A button (blood type)",
-        "slug": "a_button"
-      },
-      {
-        "emoji": "🆎",
-        "name": "AB button (blood type)",
-        "slug": "ab_button"
-      },
-      {
-        "emoji": "🅱️",
-        "name": "B button (blood type)",
-        "slug": "b_button"
-      },
-      {
-        "emoji": "🆑",
-        "name": "CL button",
-        "slug": "cl_button"
-      },
-      {
-        "emoji": "🆒",
-        "name": "COOL button",
-        "slug": "cool_button"
-      },
-      {
-        "emoji": "🆓",
-        "name": "FREE button",
-        "slug": "free_button"
-      },
-      {
-        "emoji": "ℹ️",
-        "name": "information",
-        "slug": "information"
-      },
-      {
-        "emoji": "🆔",
-        "name": "ID button",
-        "slug": "id_button"
-      },
-      {
-        "emoji": "Ⓜ️",
-        "name": "circled M",
-        "slug": "circled_m"
-      },
-      {
-        "emoji": "🆕",
-        "name": "NEW button",
-        "slug": "new_button"
-      },
-      {
-        "emoji": "🆖",
-        "name": "NG button",
-        "slug": "ng_button"
-      },
-      {
-        "emoji": "🅾️",
-        "name": "O button (blood type)",
-        "slug": "o_button"
-      },
-      {
-        "emoji": "🆗",
-        "name": "OK button",
-        "slug": "ok_button"
-      },
-      {
-        "emoji": "🅿️",
-        "name": "P button",
-        "slug": "p_button"
-      },
-      {
-        "emoji": "🆘",
-        "name": "SOS button",
-        "slug": "sos_button"
-      },
-      {
-        "emoji": "🆙",
-        "name": "UP! button",
-        "slug": "up_button"
-      },
-      {
-        "emoji": "🆚",
-        "name": "VS button",
-        "slug": "vs_button"
-      },
+      { "emoji": "🅰️", "name": "A button (blood type)", "slug": "a_button" },
+      { "emoji": "🆎", "name": "AB button (blood type)", "slug": "ab_button" },
+      { "emoji": "🅱️", "name": "B button (blood type)", "slug": "b_button" },
+      { "emoji": "🆑", "name": "CL button", "slug": "cl_button" },
+      { "emoji": "🆒", "name": "COOL button", "slug": "cool_button" },
+      { "emoji": "🆓", "name": "FREE button", "slug": "free_button" },
+      { "emoji": "ℹ️", "name": "information", "slug": "information" },
+      { "emoji": "🆔", "name": "ID button", "slug": "id_button" },
+      { "emoji": "Ⓜ️", "name": "circled M", "slug": "circled_m" },
+      { "emoji": "🆕", "name": "NEW button", "slug": "new_button" },
+      { "emoji": "🆖", "name": "NG button", "slug": "ng_button" },
+      { "emoji": "🅾️", "name": "O button (blood type)", "slug": "o_button" },
+      { "emoji": "🆗", "name": "OK button", "slug": "ok_button" },
+      { "emoji": "🅿️", "name": "P button", "slug": "p_button" },
+      { "emoji": "🆘", "name": "SOS button", "slug": "sos_button" },
+      { "emoji": "🆙", "name": "UP! button", "slug": "up_button" },
+      { "emoji": "🆚", "name": "VS button", "slug": "vs_button" },
       {
         "emoji": "🈁",
         "name": "Japanese “here” button",
@@ -7765,93 +3549,29 @@
         "name": "Japanese “no vacancy” button",
         "slug": "japanese_no_vacancy_button"
       },
+      { "emoji": "🔴", "name": "red circle", "slug": "red_circle" },
+      { "emoji": "🟠", "name": "orange circle", "slug": "orange_circle" },
+      { "emoji": "🟡", "name": "yellow circle", "slug": "yellow_circle" },
+      { "emoji": "🟢", "name": "green circle", "slug": "green_circle" },
+      { "emoji": "🔵", "name": "blue circle", "slug": "blue_circle" },
+      { "emoji": "🟣", "name": "purple circle", "slug": "purple_circle" },
+      { "emoji": "🟤", "name": "brown circle", "slug": "brown_circle" },
+      { "emoji": "⚫️", "name": "black circle", "slug": "black_circle" },
+      { "emoji": "⚪️", "name": "white circle", "slug": "white_circle" },
+      { "emoji": "🟥", "name": "red square", "slug": "red_square" },
+      { "emoji": "🟧", "name": "orange square", "slug": "orange_square" },
+      { "emoji": "🟨", "name": "yellow square", "slug": "yellow_square" },
+      { "emoji": "🟩", "name": "green square", "slug": "green_square" },
+      { "emoji": "🟦", "name": "blue square", "slug": "blue_square" },
+      { "emoji": "🟪", "name": "purple square", "slug": "purple_square" },
+      { "emoji": "🟫", "name": "brown square", "slug": "brown_square" },
       {
-        "emoji": "🔴",
-        "name": "red circle",
-        "slug": "red_circle"
-      },
-      {
-        "emoji": "🟠",
-        "name": "orange circle",
-        "slug": "orange_circle"
-      },
-      {
-        "emoji": "🟡",
-        "name": "yellow circle",
-        "slug": "yellow_circle"
-      },
-      {
-        "emoji": "🟢",
-        "name": "green circle",
-        "slug": "green_circle"
-      },
-      {
-        "emoji": "🔵",
-        "name": "blue circle",
-        "slug": "blue_circle"
-      },
-      {
-        "emoji": "🟣",
-        "name": "purple circle",
-        "slug": "purple_circle"
-      },
-      {
-        "emoji": "🟤",
-        "name": "brown circle",
-        "slug": "brown_circle"
-      },
-      {
-        "emoji": "⚫",
-        "name": "black circle",
-        "slug": "black_circle"
-      },
-      {
-        "emoji": "⚪",
-        "name": "white circle",
-        "slug": "white_circle"
-      },
-      {
-        "emoji": "🟥",
-        "name": "red square",
-        "slug": "red_square"
-      },
-      {
-        "emoji": "🟧",
-        "name": "orange square",
-        "slug": "orange_square"
-      },
-      {
-        "emoji": "🟨",
-        "name": "yellow square",
-        "slug": "yellow_square"
-      },
-      {
-        "emoji": "🟩",
-        "name": "green square",
-        "slug": "green_square"
-      },
-      {
-        "emoji": "🟦",
-        "name": "blue square",
-        "slug": "blue_square"
-      },
-      {
-        "emoji": "🟪",
-        "name": "purple square",
-        "slug": "purple_square"
-      },
-      {
-        "emoji": "🟫",
-        "name": "brown square",
-        "slug": "brown_square"
-      },
-      {
-        "emoji": "⬛",
+        "emoji": "⬛️",
         "name": "black large square",
         "slug": "black_large_square"
       },
       {
-        "emoji": "⬜",
+        "emoji": "⬜️",
         "name": "white large square",
         "slug": "white_large_square"
       },
@@ -7866,12 +3586,12 @@
         "slug": "white_medium_square"
       },
       {
-        "emoji": "◾",
+        "emoji": "◾️",
         "name": "black medium-small square",
         "slug": "black_medium_small_square"
       },
       {
-        "emoji": "◽",
+        "emoji": "◽️",
         "name": "white medium-small square",
         "slug": "white_medium_small_square"
       },
@@ -7920,11 +3640,7 @@
         "name": "diamond with a dot",
         "slug": "diamond_with_a_dot"
       },
-      {
-        "emoji": "🔘",
-        "name": "radio button",
-        "slug": "radio_button"
-      },
+      { "emoji": "🔘", "name": "radio button", "slug": "radio_button" },
       {
         "emoji": "🔳",
         "name": "white square button",
@@ -7956,226 +3672,94 @@
         "name": "crossed flags",
         "slug": "crossed_flags_celebration"
       },
-      {
-        "emoji": "🏴",
-        "name": "black flag",
-        "slug": "black_flag_waving"
-      },
-      {
-        "emoji": "🏳️",
-        "name": "white flag",
-        "slug": "white_flag_waving"
-      },
-      {
-        "emoji": "🏳️‍🌈",
-        "name": "rainbow flag",
-        "slug": "rainbow_flag_pride"
-      },
+      { "emoji": "🏴", "name": "black flag", "slug": "black_flag_waving" },
+      { "emoji": "🏳️", "name": "white flag", "slug": "white_flag_waving" },
+      { "emoji": "🏳️‍🌈", "name": "rainbow flag", "slug": "rainbow_flag_pride" },
       {
         "emoji": "🏳️‍⚧️",
         "name": "transgender flag",
         "slug": "transgender_flag_pink_white"
       },
-      {
-        "emoji": "🏴‍☠️",
-        "name": "pirate flag",
-        "slug": "pirate_flag_treasure"
-      },
+      { "emoji": "🏴‍☠️", "name": "pirate flag", "slug": "pirate_flag_treasure" },
       {
         "emoji": "🇦🇨",
         "name": "flag Ascension Island",
         "slug": "flag_ascension_island"
       },
-      {
-        "emoji": "🇦🇩",
-        "name": "flag Andorra",
-        "slug": "flag_andorra"
-      },
+      { "emoji": "🇦🇩", "name": "flag Andorra", "slug": "flag_andorra" },
       {
         "emoji": "🇦🇪",
         "name": "flag United Arab Emirates",
         "slug": "flag_united_arab_emirates"
       },
-      {
-        "emoji": "🇦🇫",
-        "name": "flag Afghanistan",
-        "slug": "flag_afghanistan"
-      },
+      { "emoji": "🇦🇫", "name": "flag Afghanistan", "slug": "flag_afghanistan" },
       {
         "emoji": "🇦🇬",
         "name": "flag Antigua & Barbuda",
         "slug": "flag_antigua_barbuda"
       },
-      {
-        "emoji": "🇦🇮",
-        "name": "flag Anguilla",
-        "slug": "flag_anguilla"
-      },
-      {
-        "emoji": "🇦🇱",
-        "name": "flag Albania",
-        "slug": "flag_albania"
-      },
-      {
-        "emoji": "🇦🇲",
-        "name": "flag Armenia",
-        "slug": "flag_armenia"
-      },
-      {
-        "emoji": "🇦🇴",
-        "name": "flag Angola",
-        "slug": "flag_angola"
-      },
-      {
-        "emoji": "🇦🇶",
-        "name": "flag Antarctica",
-        "slug": "flag_antarctica"
-      },
-      {
-        "emoji": "🇦🇷",
-        "name": "flag Argentina",
-        "slug": "flag_argentina"
-      },
+      { "emoji": "🇦🇮", "name": "flag Anguilla", "slug": "flag_anguilla" },
+      { "emoji": "🇦🇱", "name": "flag Albania", "slug": "flag_albania" },
+      { "emoji": "🇦🇲", "name": "flag Armenia", "slug": "flag_armenia" },
+      { "emoji": "🇦🇴", "name": "flag Angola", "slug": "flag_angola" },
+      { "emoji": "🇦🇶", "name": "flag Antarctica", "slug": "flag_antarctica" },
+      { "emoji": "🇦🇷", "name": "flag Argentina", "slug": "flag_argentina" },
       {
         "emoji": "🇦🇸",
         "name": "flag American Samoa",
         "slug": "flag_american_samoa"
       },
-      {
-        "emoji": "🇦🇹",
-        "name": "flag Austria",
-        "slug": "flag_austria"
-      },
-      {
-        "emoji": "🇦🇺",
-        "name": "flag Australia",
-        "slug": "flag_australia"
-      },
-      {
-        "emoji": "🇦🇼",
-        "name": "flag Aruba",
-        "slug": "flag_aruba"
-      },
+      { "emoji": "🇦🇹", "name": "flag Austria", "slug": "flag_austria" },
+      { "emoji": "🇦🇺", "name": "flag Australia", "slug": "flag_australia" },
+      { "emoji": "🇦🇼", "name": "flag Aruba", "slug": "flag_aruba" },
       {
         "emoji": "🇦🇽",
         "name": "flag Åland Islands",
         "slug": "flag_aland_islands"
       },
-      {
-        "emoji": "🇦🇿",
-        "name": "flag Azerbaijan",
-        "slug": "flag_azerbaijan"
-      },
+      { "emoji": "🇦🇿", "name": "flag Azerbaijan", "slug": "flag_azerbaijan" },
       {
         "emoji": "🇧🇦",
         "name": "flag Bosnia & Herzegovina",
         "slug": "flag_bosnia_herzegovina"
       },
-      {
-        "emoji": "🇧🇧",
-        "name": "flag Barbados",
-        "slug": "flag_barbados"
-      },
-      {
-        "emoji": "🇧🇩",
-        "name": "flag Bangladesh",
-        "slug": "flag_bangladesh"
-      },
-      {
-        "emoji": "🇧🇪",
-        "name": "flag Belgium",
-        "slug": "flag_belgium"
-      },
+      { "emoji": "🇧🇧", "name": "flag Barbados", "slug": "flag_barbados" },
+      { "emoji": "🇧🇩", "name": "flag Bangladesh", "slug": "flag_bangladesh" },
+      { "emoji": "🇧🇪", "name": "flag Belgium", "slug": "flag_belgium" },
       {
         "emoji": "🇧🇫",
         "name": "flag Burkina Faso",
         "slug": "flag_burkina_faso"
       },
-      {
-        "emoji": "🇧🇬",
-        "name": "flag Bulgaria",
-        "slug": "flag_bulgaria"
-      },
-      {
-        "emoji": "🇧🇭",
-        "name": "flag Bahrain",
-        "slug": "flag_bahrain"
-      },
-      {
-        "emoji": "🇧🇮",
-        "name": "flag Burundi",
-        "slug": "flag_burundi"
-      },
-      {
-        "emoji": "🇧🇯",
-        "name": "flag Benin",
-        "slug": "flag_benin"
-      },
+      { "emoji": "🇧🇬", "name": "flag Bulgaria", "slug": "flag_bulgaria" },
+      { "emoji": "🇧🇭", "name": "flag Bahrain", "slug": "flag_bahrain" },
+      { "emoji": "🇧🇮", "name": "flag Burundi", "slug": "flag_burundi" },
+      { "emoji": "🇧🇯", "name": "flag Benin", "slug": "flag_benin" },
       {
         "emoji": "🇧🇱",
         "name": "flag St. Barthélemy",
         "slug": "flag_st_barthelemy"
       },
-      {
-        "emoji": "🇧🇲",
-        "name": "flag Bermuda",
-        "slug": "flag_bermuda"
-      },
-      {
-        "emoji": "🇧🇳",
-        "name": "flag Brunei",
-        "slug": "flag_brunei"
-      },
-      {
-        "emoji": "🇧🇴",
-        "name": "flag Bolivia",
-        "slug": "flag_bolivia"
-      },
+      { "emoji": "🇧🇲", "name": "flag Bermuda", "slug": "flag_bermuda" },
+      { "emoji": "🇧🇳", "name": "flag Brunei", "slug": "flag_brunei" },
+      { "emoji": "🇧🇴", "name": "flag Bolivia", "slug": "flag_bolivia" },
       {
         "emoji": "🇧🇶",
         "name": "flag Caribbean Netherlands",
         "slug": "flag_caribbean_netherlands"
       },
-      {
-        "emoji": "🇧🇷",
-        "name": "flag Brazil",
-        "slug": "flag_brazil"
-      },
-      {
-        "emoji": "🇧🇸",
-        "name": "flag Bahamas",
-        "slug": "flag_bahamas"
-      },
-      {
-        "emoji": "🇧🇹",
-        "name": "flag Bhutan",
-        "slug": "flag_bhutan"
-      },
+      { "emoji": "🇧🇷", "name": "flag Brazil", "slug": "flag_brazil" },
+      { "emoji": "🇧🇸", "name": "flag Bahamas", "slug": "flag_bahamas" },
+      { "emoji": "🇧🇹", "name": "flag Bhutan", "slug": "flag_bhutan" },
       {
         "emoji": "🇧🇻",
         "name": "flag Bouvet Island",
         "slug": "flag_bouvet_island"
       },
-      {
-        "emoji": "🇧🇼",
-        "name": "flag Botswana",
-        "slug": "flag_botswana"
-      },
-      {
-        "emoji": "🇧🇾",
-        "name": "flag Belarus",
-        "slug": "flag_belarus"
-      },
-      {
-        "emoji": "🇧🇿",
-        "name": "flag Belize",
-        "slug": "flag_belize"
-      },
-      {
-        "emoji": "🇨🇦",
-        "name": "flag Canada",
-        "slug": "flag_canada"
-      },
+      { "emoji": "🇧🇼", "name": "flag Botswana", "slug": "flag_botswana" },
+      { "emoji": "🇧🇾", "name": "flag Belarus", "slug": "flag_belarus" },
+      { "emoji": "🇧🇿", "name": "flag Belize", "slug": "flag_belize" },
+      { "emoji": "🇨🇦", "name": "flag Canada", "slug": "flag_canada" },
       {
         "emoji": "🇨🇨",
         "name": "flag Cocos (Keeling) Islands",
@@ -8196,11 +3780,7 @@
         "name": "flag Congo - Brazzaville",
         "slug": "flag_congo_brazzaville"
       },
-      {
-        "emoji": "🇨🇭",
-        "name": "flag Switzerland",
-        "slug": "flag_switzerland"
-      },
+      { "emoji": "🇨🇭", "name": "flag Switzerland", "slug": "flag_switzerland" },
       {
         "emoji": "🇨🇮",
         "name": "flag Côte d’Ivoire",
@@ -8211,271 +3791,115 @@
         "name": "flag Cook Islands",
         "slug": "flag_cook_islands"
       },
-      {
-        "emoji": "🇨🇱",
-        "name": "flag Chile",
-        "slug": "flag_chile"
-      },
-      {
-        "emoji": "🇨🇲",
-        "name": "flag Cameroon",
-        "slug": "flag_cameroon"
-      },
-      {
-        "emoji": "🇨🇳",
-        "name": "flag China",
-        "slug": "flag_china"
-      },
-      {
-        "emoji": "🇨🇴",
-        "name": "flag Colombia",
-        "slug": "flag_colombia"
-      },
+      { "emoji": "🇨🇱", "name": "flag Chile", "slug": "flag_chile" },
+      { "emoji": "🇨🇲", "name": "flag Cameroon", "slug": "flag_cameroon" },
+      { "emoji": "🇨🇳", "name": "flag China", "slug": "flag_china" },
+      { "emoji": "🇨🇴", "name": "flag Colombia", "slug": "flag_colombia" },
       {
         "emoji": "🇨🇵",
         "name": "flag Clipperton Island",
         "slug": "flag_clipperton_island"
       },
-      {
-        "emoji": "🇨🇷",
-        "name": "flag Costa Rica",
-        "slug": "flag_costa_rica"
-      },
-      {
-        "emoji": "🇨🇺",
-        "name": "flag Cuba",
-        "slug": "flag_cuba"
-      },
-      {
-        "emoji": "🇨🇻",
-        "name": "flag Cape Verde",
-        "slug": "flag_cape_verde"
-      },
-      {
-        "emoji": "🇨🇼",
-        "name": "flag Curaçao",
-        "slug": "flag_curacao"
-      },
+      { "emoji": "🇨🇷", "name": "flag Costa Rica", "slug": "flag_costa_rica" },
+      { "emoji": "🇨🇺", "name": "flag Cuba", "slug": "flag_cuba" },
+      { "emoji": "🇨🇻", "name": "flag Cape Verde", "slug": "flag_cape_verde" },
+      { "emoji": "🇨🇼", "name": "flag Curaçao", "slug": "flag_curacao" },
       {
         "emoji": "🇨🇽",
         "name": "flag Christmas Island",
         "slug": "flag_christmas_island"
       },
-      {
-        "emoji": "🇨🇾",
-        "name": "flag Cyprus",
-        "slug": "flag_cyprus"
-      },
-      {
-        "emoji": "🇨🇿",
-        "name": "flag Czechia",
-        "slug": "flag_czechia"
-      },
-      {
-        "emoji": "🇩🇪",
-        "name": "flag Germany",
-        "slug": "flag_germany"
-      },
+      { "emoji": "🇨🇾", "name": "flag Cyprus", "slug": "flag_cyprus" },
+      { "emoji": "🇨🇿", "name": "flag Czechia", "slug": "flag_czechia" },
+      { "emoji": "🇩🇪", "name": "flag Germany", "slug": "flag_germany" },
       {
         "emoji": "🇩🇬",
         "name": "flag Diego Garcia",
         "slug": "flag_diego_garcia"
       },
-      {
-        "emoji": "🇩🇯",
-        "name": "flag Djibouti",
-        "slug": "flag_djibouti"
-      },
-      {
-        "emoji": "🇩🇰",
-        "name": "flag Denmark",
-        "slug": "flag_denmark"
-      },
-      {
-        "emoji": "🇩🇲",
-        "name": "flag Dominica",
-        "slug": "flag_dominica"
-      },
+      { "emoji": "🇩🇯", "name": "flag Djibouti", "slug": "flag_djibouti" },
+      { "emoji": "🇩🇰", "name": "flag Denmark", "slug": "flag_denmark" },
+      { "emoji": "🇩🇲", "name": "flag Dominica", "slug": "flag_dominica" },
       {
         "emoji": "🇩🇴",
         "name": "flag Dominican Republic",
         "slug": "flag_dominican_republic"
       },
-      {
-        "emoji": "🇩🇿",
-        "name": "flag Algeria",
-        "slug": "flag_algeria"
-      },
+      { "emoji": "🇩🇿", "name": "flag Algeria", "slug": "flag_algeria" },
       {
         "emoji": "🇪🇦",
         "name": "flag Ceuta & Melilla",
         "slug": "flag_ceuta_melilla"
       },
-      {
-        "emoji": "🇪🇨",
-        "name": "flag Ecuador",
-        "slug": "flag_ecuador"
-      },
-      {
-        "emoji": "🇪🇪",
-        "name": "flag Estonia",
-        "slug": "flag_estonia"
-      },
-      {
-        "emoji": "🇪🇬",
-        "name": "flag Egypt",
-        "slug": "flag_egypt"
-      },
+      { "emoji": "🇪🇨", "name": "flag Ecuador", "slug": "flag_ecuador" },
+      { "emoji": "🇪🇪", "name": "flag Estonia", "slug": "flag_estonia" },
+      { "emoji": "🇪🇬", "name": "flag Egypt", "slug": "flag_egypt" },
       {
         "emoji": "🇪🇭",
         "name": "flag Western Sahara",
         "slug": "flag_western_sahara"
       },
-      {
-        "emoji": "🇪🇷",
-        "name": "flag Eritrea",
-        "slug": "flag_eritrea"
-      },
-      {
-        "emoji": "🇪🇸",
-        "name": "flag Spain",
-        "slug": "flag_spain"
-      },
-      {
-        "emoji": "🇪🇹",
-        "name": "flag Ethiopia",
-        "slug": "flag_ethiopia"
-      },
+      { "emoji": "🇪🇷", "name": "flag Eritrea", "slug": "flag_eritrea" },
+      { "emoji": "🇪🇸", "name": "flag Spain", "slug": "flag_spain" },
+      { "emoji": "🇪🇹", "name": "flag Ethiopia", "slug": "flag_ethiopia" },
       {
         "emoji": "🇪🇺",
         "name": "flag European Union",
         "slug": "flag_european_union"
       },
-      {
-        "emoji": "🇫🇮",
-        "name": "flag Finland",
-        "slug": "flag_finland"
-      },
-      {
-        "emoji": "🇫🇯",
-        "name": "flag Fiji",
-        "slug": "flag_fiji"
-      },
+      { "emoji": "🇫🇮", "name": "flag Finland", "slug": "flag_finland" },
+      { "emoji": "🇫🇯", "name": "flag Fiji", "slug": "flag_fiji" },
       {
         "emoji": "🇫🇰",
         "name": "flag Falkland Islands",
         "slug": "flag_falkland_islands"
       },
-      {
-        "emoji": "🇫🇲",
-        "name": "flag Micronesia",
-        "slug": "flag_micronesia"
-      },
+      { "emoji": "🇫🇲", "name": "flag Micronesia", "slug": "flag_micronesia" },
       {
         "emoji": "🇫🇴",
         "name": "flag Faroe Islands",
         "slug": "flag_faroe_islands"
       },
-      {
-        "emoji": "🇫🇷",
-        "name": "flag France",
-        "slug": "flag_france"
-      },
-      {
-        "emoji": "🇬🇦",
-        "name": "flag Gabon",
-        "slug": "flag_gabon"
-      },
+      { "emoji": "🇫🇷", "name": "flag France", "slug": "flag_france" },
+      { "emoji": "🇬🇦", "name": "flag Gabon", "slug": "flag_gabon" },
       {
         "emoji": "🇬🇧",
         "name": "flag United Kingdom",
         "slug": "flag_united_kingdom"
       },
-      {
-        "emoji": "🇬🇩",
-        "name": "flag Grenada",
-        "slug": "flag_grenada"
-      },
-      {
-        "emoji": "🇬🇪",
-        "name": "flag Georgia",
-        "slug": "flag_georgia"
-      },
+      { "emoji": "🇬🇩", "name": "flag Grenada", "slug": "flag_grenada" },
+      { "emoji": "🇬🇪", "name": "flag Georgia", "slug": "flag_georgia" },
       {
         "emoji": "🇬🇫",
         "name": "flag French Guiana",
         "slug": "flag_french_guiana"
       },
-      {
-        "emoji": "🇬🇬",
-        "name": "flag Guernsey",
-        "slug": "flag_guernsey"
-      },
-      {
-        "emoji": "🇬🇭",
-        "name": "flag Ghana",
-        "slug": "flag_ghana"
-      },
-      {
-        "emoji": "🇬🇮",
-        "name": "flag Gibraltar",
-        "slug": "flag_gibraltar"
-      },
-      {
-        "emoji": "🇬🇱",
-        "name": "flag Greenland",
-        "slug": "flag_greenland"
-      },
-      {
-        "emoji": "🇬🇲",
-        "name": "flag Gambia",
-        "slug": "flag_gambia"
-      },
-      {
-        "emoji": "🇬🇳",
-        "name": "flag Guinea",
-        "slug": "flag_guinea"
-      },
-      {
-        "emoji": "🇬🇵",
-        "name": "flag Guadeloupe",
-        "slug": "flag_guadeloupe"
-      },
+      { "emoji": "🇬🇬", "name": "flag Guernsey", "slug": "flag_guernsey" },
+      { "emoji": "🇬🇭", "name": "flag Ghana", "slug": "flag_ghana" },
+      { "emoji": "🇬🇮", "name": "flag Gibraltar", "slug": "flag_gibraltar" },
+      { "emoji": "🇬🇱", "name": "flag Greenland", "slug": "flag_greenland" },
+      { "emoji": "🇬🇲", "name": "flag Gambia", "slug": "flag_gambia" },
+      { "emoji": "🇬🇳", "name": "flag Guinea", "slug": "flag_guinea" },
+      { "emoji": "🇬🇵", "name": "flag Guadeloupe", "slug": "flag_guadeloupe" },
       {
         "emoji": "🇬🇶",
         "name": "flag Equatorial Guinea",
         "slug": "flag_equatorial_guinea"
       },
-      {
-        "emoji": "🇬🇷",
-        "name": "flag Greece",
-        "slug": "flag_greece"
-      },
+      { "emoji": "🇬🇷", "name": "flag Greece", "slug": "flag_greece" },
       {
         "emoji": "🇬🇸",
         "name": "flag South Georgia & South Sandwich Islands",
         "slug": "flag_south_georgia_south_sandwich_islands"
       },
-      {
-        "emoji": "🇬🇹",
-        "name": "flag Guatemala",
-        "slug": "flag_guatemala"
-      },
-      {
-        "emoji": "🇬🇺",
-        "name": "flag Guam",
-        "slug": "flag_guam"
-      },
+      { "emoji": "🇬🇹", "name": "flag Guatemala", "slug": "flag_guatemala" },
+      { "emoji": "🇬🇺", "name": "flag Guam", "slug": "flag_guam" },
       {
         "emoji": "🇬🇼",
         "name": "flag Guinea-Bissau",
         "slug": "flag_guinea_bissau"
       },
-      {
-        "emoji": "🇬🇾",
-        "name": "flag Guyana",
-        "slug": "flag_guyana"
-      },
+      { "emoji": "🇬🇾", "name": "flag Guyana", "slug": "flag_guyana" },
       {
         "emoji": "🇭🇰",
         "name": "flag Hong Kong SAR China",
@@ -8486,241 +3910,73 @@
         "name": "flag Heard & McDonald Islands",
         "slug": "flag_heard_mcdonald_islands"
       },
-      {
-        "emoji": "🇭🇳",
-        "name": "flag Honduras",
-        "slug": "flag_honduras"
-      },
-      {
-        "emoji": "🇭🇷",
-        "name": "flag Croatia",
-        "slug": "flag_croatia"
-      },
-      {
-        "emoji": "🇭🇹",
-        "name": "flag Haiti",
-        "slug": "flag_haiti"
-      },
-      {
-        "emoji": "🇭🇺",
-        "name": "flag Hungary",
-        "slug": "flag_hungary"
-      },
+      { "emoji": "🇭🇳", "name": "flag Honduras", "slug": "flag_honduras" },
+      { "emoji": "🇭🇷", "name": "flag Croatia", "slug": "flag_croatia" },
+      { "emoji": "🇭🇹", "name": "flag Haiti", "slug": "flag_haiti" },
+      { "emoji": "🇭🇺", "name": "flag Hungary", "slug": "flag_hungary" },
       {
         "emoji": "🇮🇨",
         "name": "flag Canary Islands",
         "slug": "flag_canary_islands"
       },
-      {
-        "emoji": "🇮🇩",
-        "name": "flag Indonesia",
-        "slug": "flag_indonesia"
-      },
-      {
-        "emoji": "🇮🇪",
-        "name": "flag Ireland",
-        "slug": "flag_ireland"
-      },
-      {
-        "emoji": "🇮🇱",
-        "name": "flag Israel",
-        "slug": "flag_israel"
-      },
-      {
-        "emoji": "🇮🇲",
-        "name": "flag Isle of Man",
-        "slug": "flag_isle_of_man"
-      },
-      {
-        "emoji": "🇮🇳",
-        "name": "flag India",
-        "slug": "flag_india"
-      },
+      { "emoji": "🇮🇩", "name": "flag Indonesia", "slug": "flag_indonesia" },
+      { "emoji": "🇮🇪", "name": "flag Ireland", "slug": "flag_ireland" },
+      { "emoji": "🇮🇱", "name": "flag Israel", "slug": "flag_israel" },
+      { "emoji": "🇮🇲", "name": "flag Isle of Man", "slug": "flag_isle_of_man" },
+      { "emoji": "🇮🇳", "name": "flag India", "slug": "flag_india" },
       {
         "emoji": "🇮🇴",
         "name": "flag British Indian Ocean Territory",
         "slug": "flag_british_indian_ocean_territory"
       },
-      {
-        "emoji": "🇮🇶",
-        "name": "flag Iraq",
-        "slug": "flag_iraq"
-      },
-      {
-        "emoji": "🇮🇷",
-        "name": "flag Iran",
-        "slug": "flag_iran"
-      },
-      {
-        "emoji": "🇮🇸",
-        "name": "flag Iceland",
-        "slug": "flag_iceland"
-      },
-      {
-        "emoji": "🇮🇹",
-        "name": "flag Italy",
-        "slug": "flag_italy"
-      },
-      {
-        "emoji": "🇯🇪",
-        "name": "flag Jersey",
-        "slug": "flag_jersey"
-      },
-      {
-        "emoji": "🇯🇲",
-        "name": "flag Jamaica",
-        "slug": "flag_jamaica"
-      },
-      {
-        "emoji": "🇯🇴",
-        "name": "flag Jordan",
-        "slug": "flag_jordan"
-      },
-      {
-        "emoji": "🇯🇵",
-        "name": "flag Japan",
-        "slug": "flag_japan"
-      },
-      {
-        "emoji": "🇰🇪",
-        "name": "flag Kenya",
-        "slug": "flag_kenya"
-      },
-      {
-        "emoji": "🇰🇬",
-        "name": "flag Kyrgyzstan",
-        "slug": "flag_kyrgyzstan"
-      },
-      {
-        "emoji": "🇰🇭",
-        "name": "flag Cambodia",
-        "slug": "flag_cambodia"
-      },
-      {
-        "emoji": "🇰🇮",
-        "name": "flag Kiribati",
-        "slug": "flag_kiribati"
-      },
-      {
-        "emoji": "🇰🇲",
-        "name": "flag Comoros",
-        "slug": "flag_comoros"
-      },
+      { "emoji": "🇮🇶", "name": "flag Iraq", "slug": "flag_iraq" },
+      { "emoji": "🇮🇷", "name": "flag Iran", "slug": "flag_iran" },
+      { "emoji": "🇮🇸", "name": "flag Iceland", "slug": "flag_iceland" },
+      { "emoji": "🇮🇹", "name": "flag Italy", "slug": "flag_italy" },
+      { "emoji": "🇯🇪", "name": "flag Jersey", "slug": "flag_jersey" },
+      { "emoji": "🇯🇲", "name": "flag Jamaica", "slug": "flag_jamaica" },
+      { "emoji": "🇯🇴", "name": "flag Jordan", "slug": "flag_jordan" },
+      { "emoji": "🇯🇵", "name": "flag Japan", "slug": "flag_japan" },
+      { "emoji": "🇰🇪", "name": "flag Kenya", "slug": "flag_kenya" },
+      { "emoji": "🇰🇬", "name": "flag Kyrgyzstan", "slug": "flag_kyrgyzstan" },
+      { "emoji": "🇰🇭", "name": "flag Cambodia", "slug": "flag_cambodia" },
+      { "emoji": "🇰🇮", "name": "flag Kiribati", "slug": "flag_kiribati" },
+      { "emoji": "🇰🇲", "name": "flag Comoros", "slug": "flag_comoros" },
       {
         "emoji": "🇰🇳",
         "name": "flag St. Kitts & Nevis",
         "slug": "flag_st_kitts_nevis"
       },
-      {
-        "emoji": "🇰🇵",
-        "name": "flag North Korea",
-        "slug": "flag_north_korea"
-      },
-      {
-        "emoji": "🇰🇷",
-        "name": "flag South Korea",
-        "slug": "flag_south_korea"
-      },
-      {
-        "emoji": "🇰🇼",
-        "name": "flag Kuwait",
-        "slug": "flag_kuwait"
-      },
+      { "emoji": "🇰🇵", "name": "flag North Korea", "slug": "flag_north_korea" },
+      { "emoji": "🇰🇷", "name": "flag South Korea", "slug": "flag_south_korea" },
+      { "emoji": "🇰🇼", "name": "flag Kuwait", "slug": "flag_kuwait" },
       {
         "emoji": "🇰🇾",
         "name": "flag Cayman Islands",
         "slug": "flag_cayman_islands"
       },
-      {
-        "emoji": "🇰🇿",
-        "name": "flag Kazakhstan",
-        "slug": "flag_kazakhstan"
-      },
-      {
-        "emoji": "🇱🇦",
-        "name": "flag Laos",
-        "slug": "flag_laos"
-      },
-      {
-        "emoji": "🇱🇧",
-        "name": "flag Lebanon",
-        "slug": "flag_lebanon"
-      },
-      {
-        "emoji": "🇱🇨",
-        "name": "flag St. Lucia",
-        "slug": "flag_st_lucia"
-      },
+      { "emoji": "🇰🇿", "name": "flag Kazakhstan", "slug": "flag_kazakhstan" },
+      { "emoji": "🇱🇦", "name": "flag Laos", "slug": "flag_laos" },
+      { "emoji": "🇱🇧", "name": "flag Lebanon", "slug": "flag_lebanon" },
+      { "emoji": "🇱🇨", "name": "flag St. Lucia", "slug": "flag_st_lucia" },
       {
         "emoji": "🇱🇮",
         "name": "flag Liechtenstein",
         "slug": "flag_liechtenstein"
       },
-      {
-        "emoji": "🇱🇰",
-        "name": "flag Sri Lanka",
-        "slug": "flag_sri_lanka"
-      },
-      {
-        "emoji": "🇱🇷",
-        "name": "flag Liberia",
-        "slug": "flag_liberia"
-      },
-      {
-        "emoji": "🇱🇸",
-        "name": "flag Lesotho",
-        "slug": "flag_lesotho"
-      },
-      {
-        "emoji": "🇱🇹",
-        "name": "flag Lithuania",
-        "slug": "flag_lithuania"
-      },
-      {
-        "emoji": "🇱🇺",
-        "name": "flag Luxembourg",
-        "slug": "flag_luxembourg"
-      },
-      {
-        "emoji": "🇱🇻",
-        "name": "flag Latvia",
-        "slug": "flag_latvia"
-      },
-      {
-        "emoji": "🇱🇾",
-        "name": "flag Libya",
-        "slug": "flag_libya"
-      },
-      {
-        "emoji": "🇲🇦",
-        "name": "flag Morocco",
-        "slug": "flag_morocco"
-      },
-      {
-        "emoji": "🇲🇨",
-        "name": "flag Monaco",
-        "slug": "flag_monaco"
-      },
-      {
-        "emoji": "🇲🇩",
-        "name": "flag Moldova",
-        "slug": "flag_moldova"
-      },
-      {
-        "emoji": "🇲🇪",
-        "name": "flag Montenegro",
-        "slug": "flag_montenegro"
-      },
-      {
-        "emoji": "🇲🇫",
-        "name": "flag St. Martin",
-        "slug": "flag_st_martin"
-      },
-      {
-        "emoji": "🇲🇬",
-        "name": "flag Madagascar",
-        "slug": "flag_madagascar"
-      },
+      { "emoji": "🇱🇰", "name": "flag Sri Lanka", "slug": "flag_sri_lanka" },
+      { "emoji": "🇱🇷", "name": "flag Liberia", "slug": "flag_liberia" },
+      { "emoji": "🇱🇸", "name": "flag Lesotho", "slug": "flag_lesotho" },
+      { "emoji": "🇱🇹", "name": "flag Lithuania", "slug": "flag_lithuania" },
+      { "emoji": "🇱🇺", "name": "flag Luxembourg", "slug": "flag_luxembourg" },
+      { "emoji": "🇱🇻", "name": "flag Latvia", "slug": "flag_latvia" },
+      { "emoji": "🇱🇾", "name": "flag Libya", "slug": "flag_libya" },
+      { "emoji": "🇲🇦", "name": "flag Morocco", "slug": "flag_morocco" },
+      { "emoji": "🇲🇨", "name": "flag Monaco", "slug": "flag_monaco" },
+      { "emoji": "🇲🇩", "name": "flag Moldova", "slug": "flag_moldova" },
+      { "emoji": "🇲🇪", "name": "flag Montenegro", "slug": "flag_montenegro" },
+      { "emoji": "🇲🇫", "name": "flag St. Martin", "slug": "flag_st_martin" },
+      { "emoji": "🇲🇬", "name": "flag Madagascar", "slug": "flag_madagascar" },
       {
         "emoji": "🇲🇭",
         "name": "flag Marshall Islands",
@@ -8731,21 +3987,9 @@
         "name": "flag North Macedonia",
         "slug": "flag_north_macedonia"
       },
-      {
-        "emoji": "🇲🇱",
-        "name": "flag Mali",
-        "slug": "flag_mali"
-      },
-      {
-        "emoji": "🇲🇲",
-        "name": "flag Myanmar (Burma)",
-        "slug": "flag_myanmar"
-      },
-      {
-        "emoji": "🇲🇳",
-        "name": "flag Mongolia",
-        "slug": "flag_mongolia"
-      },
+      { "emoji": "🇲🇱", "name": "flag Mali", "slug": "flag_mali" },
+      { "emoji": "🇲🇲", "name": "flag Myanmar (Burma)", "slug": "flag_myanmar" },
+      { "emoji": "🇲🇳", "name": "flag Mongolia", "slug": "flag_mongolia" },
       {
         "emoji": "🇲🇴",
         "name": "flag Macao SAR China",
@@ -8756,131 +4000,39 @@
         "name": "flag Northern Mariana Islands",
         "slug": "flag_northern_mariana_islands"
       },
-      {
-        "emoji": "🇲🇶",
-        "name": "flag Martinique",
-        "slug": "flag_martinique"
-      },
-      {
-        "emoji": "🇲🇷",
-        "name": "flag Mauritania",
-        "slug": "flag_mauritania"
-      },
-      {
-        "emoji": "🇲🇸",
-        "name": "flag Montserrat",
-        "slug": "flag_montserrat"
-      },
-      {
-        "emoji": "🇲🇹",
-        "name": "flag Malta",
-        "slug": "flag_malta"
-      },
-      {
-        "emoji": "🇲🇺",
-        "name": "flag Mauritius",
-        "slug": "flag_mauritius"
-      },
-      {
-        "emoji": "🇲🇻",
-        "name": "flag Maldives",
-        "slug": "flag_maldives"
-      },
-      {
-        "emoji": "🇲🇼",
-        "name": "flag Malawi",
-        "slug": "flag_malawi"
-      },
-      {
-        "emoji": "🇲🇽",
-        "name": "flag Mexico",
-        "slug": "flag_mexico"
-      },
-      {
-        "emoji": "🇲🇾",
-        "name": "flag Malaysia",
-        "slug": "flag_malaysia"
-      },
-      {
-        "emoji": "🇲🇿",
-        "name": "flag Mozambique",
-        "slug": "flag_mozambique"
-      },
-      {
-        "emoji": "🇳🇦",
-        "name": "flag Namibia",
-        "slug": "flag_namibia"
-      },
+      { "emoji": "🇲🇶", "name": "flag Martinique", "slug": "flag_martinique" },
+      { "emoji": "🇲🇷", "name": "flag Mauritania", "slug": "flag_mauritania" },
+      { "emoji": "🇲🇸", "name": "flag Montserrat", "slug": "flag_montserrat" },
+      { "emoji": "🇲🇹", "name": "flag Malta", "slug": "flag_malta" },
+      { "emoji": "🇲🇺", "name": "flag Mauritius", "slug": "flag_mauritius" },
+      { "emoji": "🇲🇻", "name": "flag Maldives", "slug": "flag_maldives" },
+      { "emoji": "🇲🇼", "name": "flag Malawi", "slug": "flag_malawi" },
+      { "emoji": "🇲🇽", "name": "flag Mexico", "slug": "flag_mexico" },
+      { "emoji": "🇲🇾", "name": "flag Malaysia", "slug": "flag_malaysia" },
+      { "emoji": "🇲🇿", "name": "flag Mozambique", "slug": "flag_mozambique" },
+      { "emoji": "🇳🇦", "name": "flag Namibia", "slug": "flag_namibia" },
       {
         "emoji": "🇳🇨",
         "name": "flag New Caledonia",
         "slug": "flag_new_caledonia"
       },
-      {
-        "emoji": "🇳🇪",
-        "name": "flag Niger",
-        "slug": "flag_niger"
-      },
+      { "emoji": "🇳🇪", "name": "flag Niger", "slug": "flag_niger" },
       {
         "emoji": "🇳🇫",
         "name": "flag Norfolk Island",
         "slug": "flag_norfolk_island"
       },
-      {
-        "emoji": "🇳🇬",
-        "name": "flag Nigeria",
-        "slug": "flag_nigeria"
-      },
-      {
-        "emoji": "🇳🇮",
-        "name": "flag Nicaragua",
-        "slug": "flag_nicaragua"
-      },
-      {
-        "emoji": "🇳🇱",
-        "name": "flag Netherlands",
-        "slug": "flag_netherlands"
-      },
-      {
-        "emoji": "🇳🇴",
-        "name": "flag Norway",
-        "slug": "flag_norway"
-      },
-      {
-        "emoji": "🇳🇵",
-        "name": "flag Nepal",
-        "slug": "flag_nepal"
-      },
-      {
-        "emoji": "🇳🇷",
-        "name": "flag Nauru",
-        "slug": "flag_nauru"
-      },
-      {
-        "emoji": "🇳🇺",
-        "name": "flag Niue",
-        "slug": "flag_niue"
-      },
-      {
-        "emoji": "🇳🇿",
-        "name": "flag New Zealand",
-        "slug": "flag_new_zealand"
-      },
-      {
-        "emoji": "🇴🇲",
-        "name": "flag Oman",
-        "slug": "flag_oman"
-      },
-      {
-        "emoji": "🇵🇦",
-        "name": "flag Panama",
-        "slug": "flag_panama"
-      },
-      {
-        "emoji": "🇵🇪",
-        "name": "flag Peru",
-        "slug": "flag_peru"
-      },
+      { "emoji": "🇳🇬", "name": "flag Nigeria", "slug": "flag_nigeria" },
+      { "emoji": "🇳🇮", "name": "flag Nicaragua", "slug": "flag_nicaragua" },
+      { "emoji": "🇳🇱", "name": "flag Netherlands", "slug": "flag_netherlands" },
+      { "emoji": "🇳🇴", "name": "flag Norway", "slug": "flag_norway" },
+      { "emoji": "🇳🇵", "name": "flag Nepal", "slug": "flag_nepal" },
+      { "emoji": "🇳🇷", "name": "flag Nauru", "slug": "flag_nauru" },
+      { "emoji": "🇳🇺", "name": "flag Niue", "slug": "flag_niue" },
+      { "emoji": "🇳🇿", "name": "flag New Zealand", "slug": "flag_new_zealand" },
+      { "emoji": "🇴🇲", "name": "flag Oman", "slug": "flag_oman" },
+      { "emoji": "🇵🇦", "name": "flag Panama", "slug": "flag_panama" },
+      { "emoji": "🇵🇪", "name": "flag Peru", "slug": "flag_peru" },
       {
         "emoji": "🇵🇫",
         "name": "flag French Polynesia",
@@ -8891,21 +4043,9 @@
         "name": "flag Papua New Guinea",
         "slug": "flag_papua_new_guinea"
       },
-      {
-        "emoji": "🇵🇭",
-        "name": "flag Philippines",
-        "slug": "flag_philippines"
-      },
-      {
-        "emoji": "🇵🇰",
-        "name": "flag Pakistan",
-        "slug": "flag_pakistan"
-      },
-      {
-        "emoji": "🇵🇱",
-        "name": "flag Poland",
-        "slug": "flag_poland"
-      },
+      { "emoji": "🇵🇭", "name": "flag Philippines", "slug": "flag_philippines" },
+      { "emoji": "🇵🇰", "name": "flag Pakistan", "slug": "flag_pakistan" },
+      { "emoji": "🇵🇱", "name": "flag Poland", "slug": "flag_poland" },
       {
         "emoji": "🇵🇲",
         "name": "flag St. Pierre & Miquelon",
@@ -8916,61 +4056,21 @@
         "name": "flag Pitcairn Islands",
         "slug": "flag_pitcairn_islands"
       },
-      {
-        "emoji": "🇵🇷",
-        "name": "flag Puerto Rico",
-        "slug": "flag_puerto_rico"
-      },
+      { "emoji": "🇵🇷", "name": "flag Puerto Rico", "slug": "flag_puerto_rico" },
       {
         "emoji": "🇵🇸",
         "name": "flag Palestinian Territories",
         "slug": "flag_palestinian_territories"
       },
-      {
-        "emoji": "🇵🇹",
-        "name": "flag Portugal",
-        "slug": "flag_portugal"
-      },
-      {
-        "emoji": "🇵🇼",
-        "name": "flag Palau",
-        "slug": "flag_palau"
-      },
-      {
-        "emoji": "🇵🇾",
-        "name": "flag Paraguay",
-        "slug": "flag_paraguay"
-      },
-      {
-        "emoji": "🇶🇦",
-        "name": "flag Qatar",
-        "slug": "flag_qatar"
-      },
-      {
-        "emoji": "🇷🇪",
-        "name": "flag Réunion",
-        "slug": "flag_reunion"
-      },
-      {
-        "emoji": "🇷🇴",
-        "name": "flag Romania",
-        "slug": "flag_romania"
-      },
-      {
-        "emoji": "🇷🇸",
-        "name": "flag Serbia",
-        "slug": "flag_serbia"
-      },
-      {
-        "emoji": "🇷🇺",
-        "name": "flag Russia",
-        "slug": "flag_russia"
-      },
-      {
-        "emoji": "🇷🇼",
-        "name": "flag Rwanda",
-        "slug": "flag_rwanda"
-      },
+      { "emoji": "🇵🇹", "name": "flag Portugal", "slug": "flag_portugal" },
+      { "emoji": "🇵🇼", "name": "flag Palau", "slug": "flag_palau" },
+      { "emoji": "🇵🇾", "name": "flag Paraguay", "slug": "flag_paraguay" },
+      { "emoji": "🇶🇦", "name": "flag Qatar", "slug": "flag_qatar" },
+      { "emoji": "🇷🇪", "name": "flag Réunion", "slug": "flag_reunion" },
+      { "emoji": "🇷🇴", "name": "flag Romania", "slug": "flag_romania" },
+      { "emoji": "🇷🇸", "name": "flag Serbia", "slug": "flag_serbia" },
+      { "emoji": "🇷🇺", "name": "flag Russia", "slug": "flag_russia" },
+      { "emoji": "🇷🇼", "name": "flag Rwanda", "slug": "flag_rwanda" },
       {
         "emoji": "🇸🇦",
         "name": "flag Saudi Arabia",
@@ -8981,101 +4081,41 @@
         "name": "flag Solomon Islands",
         "slug": "flag_solomon_islands"
       },
-      {
-        "emoji": "🇸🇨",
-        "name": "flag Seychelles",
-        "slug": "flag_seychelles"
-      },
-      {
-        "emoji": "🇸🇩",
-        "name": "flag Sudan",
-        "slug": "flag_sudan"
-      },
-      {
-        "emoji": "🇸🇪",
-        "name": "flag Sweden",
-        "slug": "flag_sweden"
-      },
-      {
-        "emoji": "🇸🇬",
-        "name": "flag Singapore",
-        "slug": "flag_singapore"
-      },
-      {
-        "emoji": "🇸🇭",
-        "name": "flag St. Helena",
-        "slug": "flag_st_helena"
-      },
-      {
-        "emoji": "🇸🇮",
-        "name": "flag Slovenia",
-        "slug": "flag_slovenia"
-      },
+      { "emoji": "🇸🇨", "name": "flag Seychelles", "slug": "flag_seychelles" },
+      { "emoji": "🇸🇩", "name": "flag Sudan", "slug": "flag_sudan" },
+      { "emoji": "🇸🇪", "name": "flag Sweden", "slug": "flag_sweden" },
+      { "emoji": "🇸🇬", "name": "flag Singapore", "slug": "flag_singapore" },
+      { "emoji": "🇸🇭", "name": "flag St. Helena", "slug": "flag_st_helena" },
+      { "emoji": "🇸🇮", "name": "flag Slovenia", "slug": "flag_slovenia" },
       {
         "emoji": "🇸🇯",
         "name": "flag Svalbard & Jan Mayen",
         "slug": "flag_svalbard_jan_mayen"
       },
-      {
-        "emoji": "🇸🇰",
-        "name": "flag Slovakia",
-        "slug": "flag_slovakia"
-      },
+      { "emoji": "🇸🇰", "name": "flag Slovakia", "slug": "flag_slovakia" },
       {
         "emoji": "🇸🇱",
         "name": "flag Sierra Leone",
         "slug": "flag_sierra_leone"
       },
-      {
-        "emoji": "🇸🇲",
-        "name": "flag San Marino",
-        "slug": "flag_san_marino"
-      },
-      {
-        "emoji": "🇸🇳",
-        "name": "flag Senegal",
-        "slug": "flag_senegal"
-      },
-      {
-        "emoji": "🇸🇴",
-        "name": "flag Somalia",
-        "slug": "flag_somalia"
-      },
-      {
-        "emoji": "🇸🇷",
-        "name": "flag Suriname",
-        "slug": "flag_suriname"
-      },
-      {
-        "emoji": "🇸🇸",
-        "name": "flag South Sudan",
-        "slug": "flag_south_sudan"
-      },
+      { "emoji": "🇸🇲", "name": "flag San Marino", "slug": "flag_san_marino" },
+      { "emoji": "🇸🇳", "name": "flag Senegal", "slug": "flag_senegal" },
+      { "emoji": "🇸🇴", "name": "flag Somalia", "slug": "flag_somalia" },
+      { "emoji": "🇸🇷", "name": "flag Suriname", "slug": "flag_suriname" },
+      { "emoji": "🇸🇸", "name": "flag South Sudan", "slug": "flag_south_sudan" },
       {
         "emoji": "🇸🇹",
         "name": "flag São Tomé & Príncipe",
         "slug": "flag_sao_tome_principe"
       },
-      {
-        "emoji": "🇸🇻",
-        "name": "flag El Salvador",
-        "slug": "flag_el_salvador"
-      },
+      { "emoji": "🇸🇻", "name": "flag El Salvador", "slug": "flag_el_salvador" },
       {
         "emoji": "🇸🇽",
         "name": "flag Sint Maarten",
         "slug": "flag_sint_maarten"
       },
-      {
-        "emoji": "🇸🇾",
-        "name": "flag Syria",
-        "slug": "flag_syria"
-      },
-      {
-        "emoji": "🇸🇿",
-        "name": "flag Eswatini",
-        "slug": "flag_eswatini"
-      },
+      { "emoji": "🇸🇾", "name": "flag Syria", "slug": "flag_syria" },
+      { "emoji": "🇸🇿", "name": "flag Eswatini", "slug": "flag_eswatini" },
       {
         "emoji": "🇹🇦",
         "name": "flag Tristan da Cunha",
@@ -9086,91 +4126,35 @@
         "name": "flag Turks & Caicos Islands",
         "slug": "flag_turks_caicos_islands"
       },
-      {
-        "emoji": "🇹🇩",
-        "name": "flag Chad",
-        "slug": "flag_chad"
-      },
+      { "emoji": "🇹🇩", "name": "flag Chad", "slug": "flag_chad" },
       {
         "emoji": "🇹🇫",
         "name": "flag French Southern Territories",
         "slug": "flag_french_southern_territories"
       },
-      {
-        "emoji": "🇹🇬",
-        "name": "flag Togo",
-        "slug": "flag_togo"
-      },
-      {
-        "emoji": "🇹🇭",
-        "name": "flag Thailand",
-        "slug": "flag_thailand"
-      },
-      {
-        "emoji": "🇹🇯",
-        "name": "flag Tajikistan",
-        "slug": "flag_tajikistan"
-      },
-      {
-        "emoji": "🇹🇰",
-        "name": "flag Tokelau",
-        "slug": "flag_tokelau"
-      },
-      {
-        "emoji": "🇹🇱",
-        "name": "flag Timor-Leste",
-        "slug": "flag_timor_leste"
-      },
+      { "emoji": "🇹🇬", "name": "flag Togo", "slug": "flag_togo" },
+      { "emoji": "🇹🇭", "name": "flag Thailand", "slug": "flag_thailand" },
+      { "emoji": "🇹🇯", "name": "flag Tajikistan", "slug": "flag_tajikistan" },
+      { "emoji": "🇹🇰", "name": "flag Tokelau", "slug": "flag_tokelau" },
+      { "emoji": "🇹🇱", "name": "flag Timor-Leste", "slug": "flag_timor_leste" },
       {
         "emoji": "🇹🇲",
         "name": "flag Turkmenistan",
         "slug": "flag_turkmenistan"
       },
-      {
-        "emoji": "🇹🇳",
-        "name": "flag Tunisia",
-        "slug": "flag_tunisia"
-      },
-      {
-        "emoji": "🇹🇴",
-        "name": "flag Tonga",
-        "slug": "flag_tonga"
-      },
-      {
-        "emoji": "🇹🇷",
-        "name": "flag Turkey",
-        "slug": "flag_turkey"
-      },
+      { "emoji": "🇹🇳", "name": "flag Tunisia", "slug": "flag_tunisia" },
+      { "emoji": "🇹🇴", "name": "flag Tonga", "slug": "flag_tonga" },
+      { "emoji": "🇹🇷", "name": "flag Turkey", "slug": "flag_turkey" },
       {
         "emoji": "🇹🇹",
         "name": "flag Trinidad & Tobago",
         "slug": "flag_trinidad_tobago"
       },
-      {
-        "emoji": "🇹🇻",
-        "name": "flag Tuvalu",
-        "slug": "flag_tuvalu"
-      },
-      {
-        "emoji": "🇹🇼",
-        "name": "flag Taiwan",
-        "slug": "flag_taiwan"
-      },
-      {
-        "emoji": "🇹🇿",
-        "name": "flag Tanzania",
-        "slug": "flag_tanzania"
-      },
-      {
-        "emoji": "🇺🇦",
-        "name": "flag Ukraine",
-        "slug": "flag_ukraine"
-      },
-      {
-        "emoji": "🇺🇬",
-        "name": "flag Uganda",
-        "slug": "flag_uganda"
-      },
+      { "emoji": "🇹🇻", "name": "flag Tuvalu", "slug": "flag_tuvalu" },
+      { "emoji": "🇹🇼", "name": "flag Taiwan", "slug": "flag_taiwan" },
+      { "emoji": "🇹🇿", "name": "flag Tanzania", "slug": "flag_tanzania" },
+      { "emoji": "🇺🇦", "name": "flag Ukraine", "slug": "flag_ukraine" },
+      { "emoji": "🇺🇬", "name": "flag Uganda", "slug": "flag_uganda" },
       {
         "emoji": "🇺🇲",
         "name": "flag U.S. Outlying Islands",
@@ -9186,16 +4170,8 @@
         "name": "flag United States",
         "slug": "flag_united_states"
       },
-      {
-        "emoji": "🇺🇾",
-        "name": "flag Uruguay",
-        "slug": "flag_uruguay"
-      },
-      {
-        "emoji": "🇺🇿",
-        "name": "flag Uzbekistan",
-        "slug": "flag_uzbekistan"
-      },
+      { "emoji": "🇺🇾", "name": "flag Uruguay", "slug": "flag_uruguay" },
+      { "emoji": "🇺🇿", "name": "flag Uzbekistan", "slug": "flag_uzbekistan" },
       {
         "emoji": "🇻🇦",
         "name": "flag Vatican City",
@@ -9206,11 +4182,7 @@
         "name": "flag St. Vincent & Grenadines",
         "slug": "flag_st_vincent_grenadines"
       },
-      {
-        "emoji": "🇻🇪",
-        "name": "flag Venezuela",
-        "slug": "flag_venezuela"
-      },
+      { "emoji": "🇻🇪", "name": "flag Venezuela", "slug": "flag_venezuela" },
       {
         "emoji": "🇻🇬",
         "name": "flag British Virgin Islands",
@@ -9221,71 +4193,27 @@
         "name": "flag U.S. Virgin Islands",
         "slug": "flag_u_s_virgin_islands"
       },
-      {
-        "emoji": "🇻🇳",
-        "name": "flag Vietnam",
-        "slug": "flag_vietnam"
-      },
-      {
-        "emoji": "🇻🇺",
-        "name": "flag Vanuatu",
-        "slug": "flag_vanuatu"
-      },
+      { "emoji": "🇻🇳", "name": "flag Vietnam", "slug": "flag_vietnam" },
+      { "emoji": "🇻🇺", "name": "flag Vanuatu", "slug": "flag_vanuatu" },
       {
         "emoji": "🇼🇫",
         "name": "flag Wallis & Futuna",
         "slug": "flag_wallis_futuna"
       },
-      {
-        "emoji": "🇼🇸",
-        "name": "flag Samoa",
-        "slug": "flag_samoa"
-      },
-      {
-        "emoji": "🇽🇰",
-        "name": "flag Kosovo",
-        "slug": "flag_kosovo"
-      },
-      {
-        "emoji": "🇾🇪",
-        "name": "flag Yemen",
-        "slug": "flag_yemen"
-      },
-      {
-        "emoji": "🇾🇹",
-        "name": "flag Mayotte",
-        "slug": "flag_mayotte"
-      },
+      { "emoji": "🇼🇸", "name": "flag Samoa", "slug": "flag_samoa" },
+      { "emoji": "🇽🇰", "name": "flag Kosovo", "slug": "flag_kosovo" },
+      { "emoji": "🇾🇪", "name": "flag Yemen", "slug": "flag_yemen" },
+      { "emoji": "🇾🇹", "name": "flag Mayotte", "slug": "flag_mayotte" },
       {
         "emoji": "🇿🇦",
         "name": "flag South Africa",
         "slug": "flag_south_africa"
       },
-      {
-        "emoji": "🇿🇲",
-        "name": "flag Zambia",
-        "slug": "flag_zambia"
-      },
-      {
-        "emoji": "🇿🇼",
-        "name": "flag Zimbabwe",
-        "slug": "flag_zimbabwe"
-      },
-      {
-        "emoji": "🏴󠁧󠁢󠁥󠁮󠁧󠁿",
-        "name": "flag England",
-        "slug": "flag_england"
-      },
-      {
-        "emoji": "🏴󠁧󠁢󠁳󠁣󠁴󠁿",
-        "name": "flag Scotland",
-        "slug": "flag_scotland"
-      },
-      {
-        "emoji": "🏴󠁧󠁢󠁷󠁬󠁳󠁿",
-        "name": "flag Wales",
-        "slug": "flag_wales"
-      }
+      { "emoji": "🇿🇲", "name": "flag Zambia", "slug": "flag_zambia" },
+      { "emoji": "🇿🇼", "name": "flag Zimbabwe", "slug": "flag_zimbabwe" },
+      { "emoji": "🏴󠁧󠁢󠁥󠁮󠁧󠁿", "name": "flag England", "slug": "flag_england" },
+      { "emoji": "🏴󠁧󠁢󠁳󠁣󠁴󠁿", "name": "flag Scotland", "slug": "flag_scotland" },
+      { "emoji": "🏴󠁧󠁢󠁷󠁬󠁳󠁿", "name": "flag Wales", "slug": "flag_wales" }
     ]
   }
 ]
diff --git a/app/javascript/shared/components/emoji/pickerHelper.js b/app/javascript/shared/components/emoji/pickerHelper.js
new file mode 100644
index 000000000..c77f102f2
--- /dev/null
+++ b/app/javascript/shared/components/emoji/pickerHelper.js
@@ -0,0 +1,93 @@
+import emojiGroups from 'shared/components/emoji/emojisGroup.json';
+
+// Recently used emojis persisted in localStorage.
+const RECENT_EMOJI_KEY = 'emoji-icon-picker.recent-emojis';
+const MAX_RECENT_EMOJIS = 16;
+
+const matchesSearch = (emoji, term) =>
+  emoji.slug.replaceAll('_', ' ').includes(term) ||
+  emoji.name.toLowerCase().includes(term);
+
+// Emoji sections for the search term; prepends "Frequently used" when idle.
+export const buildEmojiSections = (search, recentEmojis, frequentLabel) => {
+  const term = search.trim().toLowerCase();
+  if (term) {
+    return emojiGroups
+      .map(({ name, emojis }) => ({
+        name,
+        emojis: emojis.filter(e => matchesSearch(e, term)),
+      }))
+      .filter(group => group.emojis.length);
+  }
+  return [
+    ...(recentEmojis.length
+      ? [{ name: frequentLabel, emojis: recentEmojis }]
+      : []),
+    ...emojiGroups,
+  ];
+};
+
+// Samples an emoji's average color (via canvas) as a translucent hover tint. Cached per emoji.
+const emojiTintCache = new Map();
+const NEUTRAL_TINT = 'rgb(var(--slate-9) / 0.12)';
+
+const sampleEmojiTint = emoji => {
+  const canvas = Object.assign(document.createElement('canvas'), {
+    width: 16,
+    height: 16,
+  });
+  const ctx = canvas.getContext('2d', { willReadFrequently: true });
+  ctx.font = '14px serif';
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'middle';
+  ctx.fillText(emoji, 8, 9);
+
+  const { data } = ctx.getImageData(0, 0, 16, 16);
+  const pixels = Array.from(
+    { length: data.length / 4 },
+    (_, i) => i * 4
+  ).filter(i => data[i + 3] > 16);
+  if (!pixels.length) return NEUTRAL_TINT;
+
+  const avg = offset =>
+    Math.round(
+      pixels.reduce((sum, i) => sum + data[i + offset], 0) / pixels.length
+    );
+
+  return `rgba(${avg(0)}, ${avg(1)}, ${avg(2)}, 0.16)`;
+};
+
+export const getEmojiTint = emoji => {
+  if (!emojiTintCache.has(emoji)) {
+    let tint = NEUTRAL_TINT;
+    try {
+      tint = sampleEmojiTint(emoji);
+    } catch {
+      /* canvas unavailable */
+    }
+    emojiTintCache.set(emoji, tint);
+  }
+  return emojiTintCache.get(emoji);
+};
+
+export const getRecentEmojis = () => {
+  try {
+    const stored = JSON.parse(localStorage.getItem(RECENT_EMOJI_KEY) ?? '[]');
+    return Array.isArray(stored) ? stored : [];
+  } catch {
+    return [];
+  }
+};
+
+export const addRecentEmoji = emoji => {
+  const updated = [
+    emoji,
+    ...getRecentEmojis().filter(item => item.slug !== emoji.slug),
+  ].slice(0, MAX_RECENT_EMOJIS);
+  try {
+    localStorage.setItem(RECENT_EMOJI_KEY, JSON.stringify(updated));
+  } catch {
+    /* private mode; recents are best-effort */
+  }
+  return updated;
+};
diff --git a/app/javascript/v3/api/auth.js b/app/javascript/v3/api/auth.js
index 4c4ffb13e..e7f87824a 100644
--- a/app/javascript/v3/api/auth.js
+++ b/app/javascript/v3/api/auth.js
@@ -43,6 +43,15 @@ export const login = async ({
         mfaToken: error.response.data.mfa_token,
       };
     }
+    if (
+      error.response?.status === 409 &&
+      error.response?.data?.sessions_limit_reached
+    ) {
+      return {
+        sessionsLimitReached: true,
+        sessions: error.response.data.sessions,
+      };
+    }
     const loginError = new Error(parseAPIErrorResponse(error));
     loginError.errorCode = error.response?.data?.error_code;
     throw loginError;
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 2f8cf70ef..54f6996a0 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -8,6 +8,8 @@ import { useVuelidate } from '@vuelidate/core';
 import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
 import SessionStorage from 'shared/helpers/sessionStorage';
 import { useBranding } from 'shared/composables/useBranding';
+import AnalyticsHelper from 'dashboard/helper/AnalyticsHelper';
+import { SESSION_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
 // components
 import SimpleDivider from '../../components/Divider/SimpleDivider.vue';
@@ -17,6 +19,7 @@ import Spinner from 'shared/components/Spinner.vue';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import MfaVerification from 'dashboard/components/auth/MfaVerification.vue';
+import SessionLimitOverlay from 'dashboard/components/auth/SessionLimitOverlay.vue';
 
 const ERROR_MESSAGES = {
   'no-account-found': 'LOGIN.OAUTH.NO_ACCOUNT_FOUND',
@@ -36,6 +39,7 @@ export default {
     NextButton,
     SimpleDivider,
     MfaVerification,
+    SessionLimitOverlay,
     Icon,
   },
   props: {
@@ -68,6 +72,8 @@ export default {
       error: '',
       mfaRequired: false,
       mfaToken: null,
+      sessionsLimitReached: false,
+      limitedSessions: [],
     };
   },
   validations() {
@@ -182,6 +188,15 @@ export default {
             return;
           }
 
+          // Check if sessions limit reached
+          if (result?.sessionsLimitReached) {
+            this.loginApi.showLoading = false;
+            this.sessionsLimitReached = true;
+            this.limitedSessions = result.sessions;
+            AnalyticsHelper.track(SESSION_EVENTS.LIMIT_HIT);
+            return;
+          }
+
           this.handleImpersonation();
           this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
         })
@@ -224,6 +239,51 @@ export default {
       this.mfaToken = null;
       this.credentials.password = '';
     },
+    retryLoginWithParams(extraParams) {
+      const credentials = {
+        email: this.email
+          ? decodeURIComponent(this.email)
+          : this.credentials.email,
+        password: this.credentials.password,
+        sso_auth_token: this.ssoAuthToken,
+        ssoAccountId: this.ssoAccountId,
+        ssoConversationId: this.ssoConversationId,
+        ...extraParams,
+      };
+
+      this.sessionsLimitReached = false;
+      this.limitedSessions = [];
+      this.loginApi.showLoading = true;
+      login(credentials)
+        .then(result => {
+          if (result?.sessionsLimitReached) {
+            this.loginApi.showLoading = false;
+            this.sessionsLimitReached = true;
+            this.limitedSessions = result.sessions;
+            AnalyticsHelper.track(SESSION_EVENTS.LIMIT_HIT);
+            return;
+          }
+          this.handleImpersonation();
+          this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
+        })
+        .catch(response => {
+          this.loginApi.hasErrored = true;
+          this.showAlertMessage(
+            response?.message || this.$t('LOGIN.API.UNAUTH')
+          );
+        });
+    },
+    handleSessionRevoke(sessionId) {
+      this.retryLoginWithParams({ revoke_session_id: sessionId });
+    },
+    handleSessionRevokeAll() {
+      this.retryLoginWithParams({ revoke_all_sessions: true });
+    },
+    handleSessionLimitCancel() {
+      this.sessionsLimitReached = false;
+      this.limitedSessions = [];
+      this.credentials.password = '';
+    },
   },
 };
 </script>
@@ -255,8 +315,18 @@ export default {
       </p>
     </section>
 
+    <!-- Session Limit Section -->
+    <section v-if="sessionsLimitReached" class="mt-11">
+      <SessionLimitOverlay
+        :sessions="limitedSessions"
+        @revoke="handleSessionRevoke"
+        @revoke-all="handleSessionRevokeAll"
+        @cancel="handleSessionLimitCancel"
+      />
+    </section>
+
     <!-- MFA Verification Section -->
-    <section v-if="mfaRequired" class="mt-11">
+    <section v-else-if="mfaRequired" class="mt-11">
       <MfaVerification
         :mfa-token="mfaToken"
         @verified="handleMfaVerified"
diff --git a/app/javascript/widget/assets/scss/woot.scss b/app/javascript/widget/assets/scss/woot.scss
index c42273215..6d2ee7976 100755
--- a/app/javascript/widget/assets/scss/woot.scss
+++ b/app/javascript/widget/assets/scss/woot.scss
@@ -272,6 +272,9 @@ blockquote {
     --gray-12: 32 32 32;
 
     --background-color: 253 253 253;
+    --surface-1: 254 254 254;
+    --surface-2: 255 255 255;
+    --surface-active: 255 255 255;
     --text-blue: 8 109 224;
     --border-container: 236 236 236;
     --border-strong: 235 235 235;
@@ -379,6 +382,9 @@ blockquote {
     --gray-12: 238 238 238;
 
     --background-color: 18 18 19;
+    --surface-1: 20 21 23;
+    --surface-2: 22 23 26;
+    --surface-active: 53 57 66;
     --border-strong: 52 52 52;
     --border-weak: 38 38 42;
     --solid-1: 23 23 26;
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index a298237f3..b95a8c990 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -1,4 +1,5 @@
 <script>
+import { defineAsyncComponent } from 'vue';
 import { mapGetters } from 'vuex';
 
 import ChatAttachmentButton from 'widget/components/ChatAttachment.vue';
@@ -7,14 +8,16 @@ import { useAttachments } from '../composables/useAttachments';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import ResizableTextArea from 'shared/components/ResizableTextArea.vue';
 
-import EmojiInput from 'shared/components/emoji/EmojiInput.vue';
+const EmojiPicker = defineAsyncComponent(
+  () => import('shared/components/emoji/EmojiPicker.vue')
+);
 
 export default {
   name: 'ChatInputWrap',
   components: {
     ChatAttachmentButton,
     ChatSendButton,
-    EmojiInput,
+    EmojiPicker,
     FluentIcon,
     ResizableTextArea,
   },
@@ -110,6 +113,9 @@ export default {
     emojiOnClick(emoji) {
       this.userInput = `${this.userInput}${emoji} `;
     },
+    onSelectEmoji({ value }) {
+      this.emojiOnClick(value);
+    },
     onTypingOff() {
       this.toggleTyping('off');
     },
@@ -148,7 +154,7 @@ export default {
       @focus="onFocus"
       @blur="onBlur"
     />
-    <div class="flex items-center ltr:pl-2 rtl:pr-2">
+    <div class="relative flex items-center ltr:pl-2 rtl:pr-2">
       <ChatAttachmentButton
         v-if="showAttachment"
         class="text-n-slate-12"
@@ -169,10 +175,11 @@ export default {
           }"
         />
       </button>
-      <EmojiInput
+      <EmojiPicker
         v-if="shouldShowEmojiPicker && showEmojiPicker"
         v-on-clickaway="hideEmojiPicker"
-        :on-click="emojiOnClick"
+        class="!bottom-full end-0 mb-2 max-w-[calc(100vw-3rem)]"
+        @select="onSelectEmoji"
         @keydown.esc="hideEmojiPicker"
       />
       <ChatSendButton
@@ -185,10 +192,6 @@ export default {
 </template>
 
 <style scoped lang="scss">
-.emoji-dialog {
-  @apply max-w-full ltr:right-5 rtl:right-[unset] rtl:left-5 -top-[302px] before:ltr:right-2.5 before:rtl:right-[unset] before:rtl:left-2.5;
-}
-
 .user-message-input {
   @apply border-none outline-none w-full placeholder:text-n-slate-10 resize-none h-8 min-h-8 max-h-60 py-1 px-0 my-2 bg-n-background text-n-slate-12 transition-all duration-200;
 }
diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index 60c379ed8..546317018 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -36,6 +36,9 @@ class ActionCableConnector extends BaseActionCableConnector {
 
   onReconnect = () => {
     this.syncLatestMessages();
+    // Re-fetch conversation attributes so a status change (e.g. auto-resolve)
+    // that happened while disconnected is reflected, keeping the reply box state correct.
+    this.app.$store.dispatch('conversationAttributes/getAttributes');
   };
 
   setLastMessageId = () => {
diff --git a/app/javascript/widget/helpers/specs/actionCable.spec.js b/app/javascript/widget/helpers/specs/actionCable.spec.js
new file mode 100644
index 000000000..6aa3872bf
--- /dev/null
+++ b/app/javascript/widget/helpers/specs/actionCable.spec.js
@@ -0,0 +1,53 @@
+import { describe, it, beforeEach, afterEach, expect, vi } from 'vitest';
+import ActionCableConnector from '../actionCable';
+
+vi.mock('@rails/actioncable', () => ({
+  createConsumer: () => ({
+    subscriptions: { create: () => ({}) },
+    disconnect: vi.fn(),
+  }),
+}));
+
+describe('Widget ActionCableConnector', () => {
+  let app;
+  let mockDispatch;
+  let connector;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    mockDispatch = vi.fn();
+    app = {
+      $store: {
+        dispatch: mockDispatch,
+        getters: {
+          getCurrentAccountId: 1,
+          getCurrentUserID: 1,
+        },
+      },
+    };
+    connector = new ActionCableConnector(app, 'test-token');
+    mockDispatch.mockClear();
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+    vi.useRealTimers();
+  });
+
+  it('registers the conversation.status_changed event handler', () => {
+    expect(connector.events['conversation.status_changed']).toBe(
+      connector.onStatusChange
+    );
+  });
+
+  it('re-fetches conversation attributes on reconnect so a status change missed while disconnected is reflected', () => {
+    connector.onReconnect();
+
+    expect(mockDispatch).toHaveBeenCalledWith(
+      'conversation/syncLatestMessages'
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      'conversationAttributes/getAttributes'
+    );
+  });
+});
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index c3d6ddfc1..82271f4de 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -106,6 +106,11 @@
     "NOT_FOUND": "No emoji match your search",
     "ARIA_LABEL": "Emoji picker"
   },
+  "EMOJI_ICON_PICKER": {
+    "SEARCH_EMOJI": "Search emoji…",
+    "FREQUENTLY_USED": "Frequently used",
+    "NO_EMOJI": "No emoji match your search"
+  },
   "CSAT": {
     "TITLE": "Rate your conversation",
     "SUBMITTED_TITLE": "Thank you for submitting the rating",
diff --git a/app/jobs/user_session_ip_lookup_job.rb b/app/jobs/user_session_ip_lookup_job.rb
new file mode 100644
index 000000000..4e22c89b8
--- /dev/null
+++ b/app/jobs/user_session_ip_lookup_job.rb
@@ -0,0 +1,18 @@
+class UserSessionIpLookupJob < ApplicationJob
+  queue_as :low
+
+  def perform(session)
+    return if session.ip_address.blank?
+
+    result = IpLookupService.new.perform(session.ip_address)
+    return unless result
+
+    session.update_columns( # rubocop:disable Rails/SkipsModelValidations
+      city: result.city,
+      country: result.country,
+      country_code: result.country_code
+    )
+  rescue StandardError => e
+    Rails.logger.warn "UserSessionIpLookupJob failed: #{e.message}"
+  end
+end
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 3bc221504..12b0a9017 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -91,10 +91,10 @@ class ActionCableListener < BaseListener
   end
 
   def conversation_unread_count_changed(event)
-    account, inbox_members = ::Conversations::UnreadCounts::BroadcastScope.new(event).perform
+    account, inbox_members, include_admins = ::Conversations::UnreadCounts::BroadcastScope.new(event).perform
     return if account.blank? || !account.feature_enabled?('conversation_unread_counts')
 
-    tokens = user_tokens(account, inbox_members)
+    tokens = include_admins ? user_tokens(account, inbox_members) : inbox_members.pluck(:pubsub_token)
 
     broadcast(account, tokens, CONVERSATION_UNREAD_COUNT_CHANGED, {})
   end
diff --git a/app/models/account.rb b/app/models/account.rb
index 667058a2f..98da91b67 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -181,7 +181,7 @@ class Account < ApplicationRecord
   end
 
   def clear_unread_conversation_counts_cache
-    ::Conversations::UnreadCounts::Store.clear_account!(id)
+    ::Conversations::UnreadCounts::Store.clear_all_account!(id)
   end
 
   trigger.after(:insert).for_each(:row) do
diff --git a/app/models/account_user.rb b/app/models/account_user.rb
index bbcb0e010..4f135f508 100644
--- a/app/models/account_user.rb
+++ b/app/models/account_user.rb
@@ -39,6 +39,7 @@ class AccountUser < ApplicationRecord
   after_create_commit :notify_creation, :create_notification_setting
   after_destroy :notify_deletion, :remove_user_from_account
   after_save :update_presence_in_redis, if: :saved_change_to_availability?
+  after_commit :notify_unread_filter_counts_changed, on: [:update, :destroy], if: :unread_filter_access_changed?
 
   validates :user_id, uniqueness: { scope: :account_id }
 
@@ -79,6 +80,14 @@ class AccountUser < ApplicationRecord
   def update_presence_in_redis
     OnlineStatusTracker.set_status(account.id, user.id, availability)
   end
+
+  def unread_filter_access_changed?
+    destroyed? || previous_changes.key?('role') || previous_changes.key?('custom_role_id')
+  end
+
+  def notify_unread_filter_counts_changed
+    ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: user).perform
+  end
 end
 
 AccountUser.prepend_mod_with('AccountUser')
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index c6877c883..0cb3f7de2 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,4 +1,7 @@
 class ApplicationRecord < ActiveRecord::Base
+  MAX_STRING_COLUMN_LENGTH = 255
+  MAX_TEXT_COLUMN_LENGTH = 20_000
+
   include Events::Types
   self.abstract_class = true
 
@@ -37,7 +40,7 @@ class ApplicationRecord < ActiveRecord::Base
   end
 
   def validate_content_length(column)
-    max_length = column.type == :text ? 20_000 : 255
+    max_length = column.type == :text ? MAX_TEXT_COLUMN_LENGTH : MAX_STRING_COLUMN_LENGTH
     return if self[column.name].nil? || self[column.name].length <= max_length
 
     errors.add(column.name.to_sym, "is too long (maximum is #{max_length} characters)")
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index e288361ea..072857b5a 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -12,6 +12,7 @@
 #  medium                         :integer          default("sms")
 #  messaging_service_sid          :string
 #  phone_number                   :string
+#  provider_config                :jsonb
 #  twiml_app_sid                  :string
 #  voice_enabled                  :boolean          default(FALSE), not null
 #  created_at                     :datetime         not null
@@ -54,6 +55,11 @@ class Channel::TwilioSms < ApplicationRecord
     medium == 'sms' ? 'Twilio SMS' : 'Whatsapp'
   end
 
+  # Mutes only the incoming side of calling; default on, so only an explicit false disables inbound.
+  def inbound_calls_enabled?
+    provider_config['inbound_calls_enabled'] != false
+  end
+
   def send_message(to:, body:, media_url: nil)
     params = send_message_from.merge(to: to, body: body)
     params[:media_url] = media_url if media_url.present?
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 00d3277c9..2a558cd13 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -49,6 +49,11 @@ class Channel::Whatsapp < ApplicationRecord
       account.feature_enabled?('channel_voice')
   end
 
+  # Mutes only the incoming side of calling; default on, so only an explicit false disables inbound.
+  def inbound_calls_enabled?
+    provider_config['inbound_calls_enabled'] != false
+  end
+
   # Whether this inbox can do WhatsApp calling at all. Meta's Calling API is
   # reachable by any whatsapp_cloud inbox, so 360dialog inboxes can't be toggled
   # on even though calling_enabled would persist.
@@ -64,8 +69,10 @@ class Channel::Whatsapp < ApplicationRecord
     end
   end
 
-  # Enables voice: turns calling on at Meta (idempotent), subscribes the `calls`
-  # webhook field, and sets calling_enabled. Raises on Meta failure.
+  # Enables voice: turns calling on at Meta (idempotent), then re-registers webhooks
+  # with the in-memory calling_enabled flag so the `calls` field is subscribed. The
+  # flag is persisted only after registration succeeds, so a webhook failure can't
+  # leave the inbox reporting voice_enabled? while the WABA isn't subscribed to calls.
   # Saved with validate: false to skip validate_provider_config's remote credential
   # re-check, which could spuriously fail and desync the flag from Meta.
   def enable_voice_calling!
@@ -73,21 +80,21 @@ class Channel::Whatsapp < ApplicationRecord
     raise 'WhatsApp calling requires the channel_voice feature' unless account.feature_enabled?('channel_voice')
 
     provider_service.update_calling_status('ENABLED')
-    webhook_setup_service.register_callback
     self.provider_config = provider_config.merge('calling_enabled' => true)
+    webhook_setup_service.register_callback
     save!(validate: false)
   end
 
-  # Disables voice: unsets calling_enabled (gates the call subsystem) and drops
-  # `calls` from the webhook subscription (best-effort, so a Meta outage can't
-  # trap admins). Leaves Meta's WABA calling.status untouched.
+  # Disables voice: unsets calling_enabled (gates the call subsystem) and re-registers
+  # webhooks, which drops `calls` from the subscription (best-effort, so a Meta outage
+  # can't trap admins). Leaves Meta's WABA calling.status untouched.
   def disable_voice_calling!
     raise 'WhatsApp calling requires a whatsapp_cloud inbox' unless voice_calling_supported?
 
     self.provider_config = provider_config.merge('calling_enabled' => false)
     save!(validate: false)
     begin
-      webhook_setup_service.register_callback(subscribed_fields: %w[messages smb_message_echoes])
+      webhook_setup_service.register_callback
     rescue StandardError => e
       Rails.logger.warn "[WHATSAPP CALL] disable webhook re-subscribe failed: #{e.message}"
     end
diff --git a/app/models/concerns/cache_keys.rb b/app/models/concerns/cache_keys.rb
index b37d7faa6..3ad9bbadc 100644
--- a/app/models/concerns/cache_keys.rb
+++ b/app/models/concerns/cache_keys.rb
@@ -30,7 +30,6 @@ module CacheKeys
       update_cache_key_for_account(id, model.name.underscore)
     end
 
-    ::Conversations::UnreadCounts::Store.clear_account!(id)
     dispatch_cache_update_event
   end
 
diff --git a/app/models/concerns/sso_authenticatable.rb b/app/models/concerns/sso_authenticatable.rb
index 98b50f336..633e71ee3 100644
--- a/app/models/concerns/sso_authenticatable.rb
+++ b/app/models/concerns/sso_authenticatable.rb
@@ -1,9 +1,9 @@
 module SsoAuthenticatable
   extend ActiveSupport::Concern
 
-  def generate_sso_auth_token
+  def generate_sso_auth_token(impersonation: false)
     token = SecureRandom.hex(32)
-    ::Redis::Alfred.setex(sso_token_key(token), true, 5.minutes)
+    ::Redis::Alfred.setex(sso_token_key(token), impersonation ? 'impersonation' : 'normal', 5.minutes)
     token
   end
 
@@ -20,8 +20,14 @@ module SsoAuthenticatable
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token}"
   end
 
+  def sso_auth_token_impersonation?(token)
+    ::Redis::Alfred.get(sso_token_key(token)) == 'impersonation'
+  end
+
   def generate_sso_link_with_impersonation
-    "#{generate_sso_link}&impersonation=true"
+    encoded_email = ERB::Util.url_encode(email)
+    "#{ENV.fetch('FRONTEND_URL',
+                 nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token(impersonation: true)}&impersonation=true"
   end
 
   private
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 3badf478d..3b04e6bc1 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -148,7 +148,7 @@ class Contact < ApplicationRecord
   end
 
   def push_event_data
-    {
+    data = {
       additional_attributes: additional_attributes,
       custom_attributes: custom_attributes,
       email: email,
@@ -160,6 +160,8 @@ class Contact < ApplicationRecord
       blocked: blocked,
       type: 'contact'
     }
+    data[:company_id] = company_id if account.feature_enabled?('companies')
+    data
   end
 
   def webhook_data
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 0005ae4a4..d9c06c4d8 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -78,6 +78,9 @@ class Conversation < ApplicationRecord
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
+  scope :sort_on_unread, lambda { |_direction|
+    order(unread_messages_count_arel.desc).sort_on_last_activity_at('desc')
+  }
   scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
   scope :resolvable_not_waiting, lambda { |auto_resolve_after|
     return none if auto_resolve_after.to_i.zero?
@@ -206,6 +209,26 @@ class Conversation < ApplicationRecord
     inbox.inbox_type == 'Twitter' && additional_attributes['type'] == 'tweet'
   end
 
+  def self.unread_messages_count_arel
+    messages = Message.arel_table
+    conversations = arel_table
+    unread_messages = messages
+                      .project(messages[:id].count)
+                      .where(unread_messages_condition(messages, conversations))
+
+    Arel::Nodes::Grouping.new(unread_messages.ast)
+  end
+
+  def self.unread_messages_condition(messages, conversations)
+    messages[:conversation_id].eq(conversations[:id])
+                              .and(messages[:account_id].eq(conversations[:account_id]))
+                              .and(messages[:message_type].eq(Message.message_types[:incoming]))
+                              .and(
+                                conversations[:agent_last_seen_at].eq(nil)
+                                  .or(messages[:created_at].gt(conversations[:agent_last_seen_at]))
+                              )
+  end
+
   def recent_messages
     messages.chat.last(5)
   end
diff --git a/app/models/conversation_participant.rb b/app/models/conversation_participant.rb
index 830eb7baa..d45719378 100644
--- a/app/models/conversation_participant.rb
+++ b/app/models/conversation_participant.rb
@@ -28,6 +28,7 @@ class ConversationParticipant < ApplicationRecord
   belongs_to :user
 
   before_validation :ensure_account_id
+  after_commit :notify_unread_filter_counts_changed, on: [:create, :destroy]
 
   private
 
@@ -38,4 +39,8 @@ class ConversationParticipant < ApplicationRecord
   def ensure_inbox_access
     errors.add(:user, 'must have inbox access') if conversation && conversation.inbox.assignable_agents.exclude?(user)
   end
+
+  def notify_unread_filter_counts_changed
+    ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: user).perform
+  end
 end
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 6d64c0447..9234f9600 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -22,10 +22,19 @@ class CustomFilter < ApplicationRecord
 
   enum filter_type: { conversation: 0, contact: 1, report: 2 }
   validate :validate_number_of_filters
+  after_commit :notify_unread_filter_counts_changed, on: [:create, :update, :destroy]
 
   def validate_number_of_filters
     return true if account.custom_filters.where(user_id: user_id).size < Limits::MAX_CUSTOM_FILTERS_PER_USER
 
     errors.add :account_id, I18n.t('errors.custom_filters.number_of_records')
   end
+
+  private
+
+  def notify_unread_filter_counts_changed
+    return unless conversation?
+
+    ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: user).perform
+  end
 end
diff --git a/app/models/inbox_member.rb b/app/models/inbox_member.rb
index d4a36ccc8..d0f553a98 100644
--- a/app/models/inbox_member.rb
+++ b/app/models/inbox_member.rb
@@ -23,7 +23,9 @@ class InboxMember < ApplicationRecord
   belongs_to :inbox
 
   after_create :add_agent_to_round_robin
+  before_destroy :cache_unread_filter_notification_context
   after_destroy :remove_agent_from_round_robin
+  after_commit :notify_unread_filter_counts_changed, on: [:create, :destroy]
 
   private
 
@@ -34,6 +36,16 @@ class InboxMember < ApplicationRecord
   def remove_agent_from_round_robin
     ::AutoAssignment::InboxRoundRobinService.new(inbox: inbox).remove_agent_from_queue(user_id) if inbox.present?
   end
+
+  def cache_unread_filter_notification_context
+    @unread_filter_account = inbox&.account
+    @unread_filter_user = user
+  end
+
+  def notify_unread_filter_counts_changed
+    account = @unread_filter_account || inbox&.account
+    ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: @unread_filter_user || user).perform
+  end
 end
 
 InboxMember.include_mod_with('Audit::InboxMember')
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
index 5e4d28c06..b5b0123a2 100644
--- a/app/models/integrations/app.rb
+++ b/app/models/integrations/app.rb
@@ -30,6 +30,10 @@ class Integrations::App
     params[:fields]
   end
 
+  def visible_properties
+    Array(params[:visible_properties]).map(&:to_s)
+  end
+
   # There is no way to get the account_id from the linear callback
   # so we are using the generate_linear_token method to generate a token and encode it in the state parameter
   def encode_state
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 0e0fe762a..5d3539078 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -32,6 +32,7 @@ class Mention < ApplicationRecord
   belongs_to :user
 
   after_commit :notify_mentioned_user
+  after_commit :notify_unread_filter_counts_changed, on: [:create, :destroy]
 
   scope :latest, -> { order(mentioned_at: :desc) }
 
@@ -55,4 +56,8 @@ class Mention < ApplicationRecord
   def notify_mentioned_user
     Rails.configuration.dispatcher.dispatch(CONVERSATION_MENTIONED, Time.zone.now, user: user, conversation: conversation)
   end
+
+  def notify_unread_filter_counts_changed
+    ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: user).perform
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4aa38bbcd..729f674d3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -101,6 +101,7 @@ class User < ApplicationRecord
   has_many :messages, as: :sender, dependent: :nullify
   has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', source: :inviter, dependent: :nullify
 
+  has_many :user_sessions, dependent: :destroy
   has_many :custom_filters, dependent: :destroy_async
   has_many :dashboard_apps, dependent: :nullify
   has_many :mentions, dependent: :destroy_async
@@ -118,6 +119,7 @@ class User < ApplicationRecord
 
   before_validation :set_password_and_uid, on: :create
   after_destroy :remove_macros
+  after_save :sync_user_sessions, if: :saved_change_to_tokens?
 
   scope :order_by_full_name, -> { order('lower(name) ASC') }
 
@@ -214,6 +216,11 @@ class User < ApplicationRecord
 
   private
 
+  def sync_user_sessions
+    active_client_ids = (tokens || {}).keys
+    user_sessions.where.not(client_id: active_client_ids).destroy_all
+  end
+
   def remove_macros
     macros.personal.destroy_all
   end
diff --git a/app/models/user_session.rb b/app/models/user_session.rb
new file mode 100644
index 000000000..0f2503382
--- /dev/null
+++ b/app/models/user_session.rb
@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: user_sessions
+#
+#  id               :bigint           not null, primary key
+#  browser_name     :string
+#  browser_version  :string
+#  city             :string
+#  country          :string
+#  country_code     :string
+#  device_name      :string
+#  ip_address       :string
+#  last_activity_at :datetime
+#  platform_name    :string
+#  platform_version :string
+#  user_agent       :string
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  client_id        :string           not null
+#  user_id          :bigint           not null
+#
+# Indexes
+#
+#  index_user_sessions_on_user_id                (user_id)
+#  index_user_sessions_on_user_id_and_client_id  (user_id,client_id) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (user_id => users.id)
+#
+
+class UserSession < ApplicationRecord
+  ACTIVITY_THROTTLE = 5.minutes
+
+  belongs_to :user
+
+  validates :client_id, presence: true, uniqueness: { scope: :user_id }
+
+  def current?(active_client_id)
+    client_id == active_client_id
+  end
+
+  def should_update_activity?
+    last_activity_at.nil? || last_activity_at < ACTIVITY_THROTTLE.ago
+  end
+end
diff --git a/app/policies/inbox_policy.rb b/app/policies/inbox_policy.rb
index e516a498e..9c74c35e7 100644
--- a/app/policies/inbox_policy.rb
+++ b/app/policies/inbox_policy.rb
@@ -77,4 +77,8 @@ class InboxPolicy < ApplicationPolicy
   def disable_whatsapp_calling?
     @account_user.administrator?
   end
+
+  def set_inbound_calls?
+    @account_user.administrator?
+  end
 end
diff --git a/app/services/conversations/delete_service.rb b/app/services/conversations/delete_service.rb
new file mode 100644
index 000000000..6608cfdcd
--- /dev/null
+++ b/app/services/conversations/delete_service.rb
@@ -0,0 +1,16 @@
+class Conversations::DeleteService
+  pattr_initialize [:conversation!, :user, :ip]
+
+  def perform
+    track_deleted_email_messages
+    ::DeleteObjectJob.perform_later(conversation, user, ip)
+  end
+
+  private
+
+  def track_deleted_email_messages
+    return unless conversation.inbox.email?
+
+    Imap::DeletedMessageTracker.new(inbox: conversation.inbox).record(conversation.messages.incoming.pluck(:source_id))
+  end
+end
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index db2892c31..79527ac2f 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -7,8 +7,7 @@ class Conversations::FilterService < FilterService
   end
 
   def perform
-    validate_query_operator
-    @conversations = query_builder(@filters['conversations'])
+    @conversations = filtered_relation
     mine_count, unassigned_count, all_count, = set_count_for_all_conversations
     assigned_count = all_count - unassigned_count
 
@@ -23,6 +22,13 @@ class Conversations::FilterService < FilterService
     }
   end
 
+  def filtered_relation
+    validate_query_operator
+    return base_relation if @params[:payload].blank?
+
+    query_builder(@filters['conversations'])
+  end
+
   def base_relation
     conversations = @account.conversations.includes(
       :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :messages, :contact_inbox
diff --git a/app/services/conversations/unread_counts/broadcast_scope.rb b/app/services/conversations/unread_counts/broadcast_scope.rb
index 8e47050e3..ea43c1e8e 100644
--- a/app/services/conversations/unread_counts/broadcast_scope.rb
+++ b/app/services/conversations/unread_counts/broadcast_scope.rb
@@ -6,13 +6,23 @@ class Conversations::UnreadCounts::BroadcastScope
   end
 
   def perform
-    return [conversation.account, conversation.inbox.members] if conversation.present?
+    return user_scope if user.present?
+    return [conversation.account, conversation.inbox.members, true] if conversation.present?
 
     deleted_conversation_scope
   end
 
   private
 
+  def user
+    event.data[:user]
+  end
+
+  def user_scope
+    account = event.data[:account] || user.account
+    [account, [user], false]
+  end
+
   def conversation
     event.data[:conversation]
   end
@@ -24,7 +34,7 @@ class Conversations::UnreadCounts::BroadcastScope
     account = Account.find_by(id: conversation_data[:account_id])
     return if account.blank?
 
-    [account, inbox_members_for(account, conversation_data[:inbox_id])]
+    [account, inbox_members_for(account, conversation_data[:inbox_id]), true]
   end
 
   def inbox_members_for(account, inbox_id)
diff --git a/app/services/conversations/unread_counts/build_lock_keys.rb b/app/services/conversations/unread_counts/build_lock_keys.rb
new file mode 100644
index 000000000..06b922c88
--- /dev/null
+++ b/app/services/conversations/unread_counts/build_lock_keys.rb
@@ -0,0 +1,15 @@
+module Conversations::UnreadCounts::BuildLockKeys
+  private
+
+  def base_build_lock_key
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_BASE_BUILD_LOCK, account_id: account.id)
+  end
+
+  def assignment_build_lock_key
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK, account_id: account.id)
+  end
+
+  def filters_build_lock_key
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account.id, user_id: user.id)
+  end
+end
diff --git a/app/services/conversations/unread_counts/builder.rb b/app/services/conversations/unread_counts/builder.rb
index 54e466dbd..e35d14b7c 100644
--- a/app/services/conversations/unread_counts/builder.rb
+++ b/app/services/conversations/unread_counts/builder.rb
@@ -1,5 +1,14 @@
 class Conversations::UnreadCounts::Builder
+  PARTICIPATING_PERMISSION = 'conversation_participating_manage'.freeze
+  RELATIVE_DATE_FILTER_OPERATOR = 'days_before'.freeze
   BATCH_SIZE = 1000
+  FILTER_ERRORS = [
+    ActiveRecord::StatementInvalid,
+    CustomExceptions::CustomFilter::InvalidAttribute,
+    CustomExceptions::CustomFilter::InvalidOperator,
+    CustomExceptions::CustomFilter::InvalidQueryOperator,
+    CustomExceptions::CustomFilter::InvalidValue
+  ].freeze
 
   attr_reader :account
 
@@ -24,10 +33,37 @@ class Conversations::UnreadCounts::Builder
     build_assignment!
   end
 
+  def build_filters_for!(user)
+    store.clear_user_filters!(account.id, user.id)
+    version_snapshot = store.filter_version_snapshot(account.id, user.id)
+    custom_filters = conversation_custom_filters(user).to_a
+
+    store.add_filter_memberships(
+      account_id: account.id,
+      user_id: user.id,
+      filters: {
+        mentions: mentioned_unread_conversation_ids(user),
+        participating: participating_unread_conversation_ids(user),
+        unattended: unattended_unread_conversation_ids(user)
+      },
+      folders: folder_unread_conversation_ids(custom_filters, user)
+    )
+    mark_filters_ready_if_current(user, custom_filters, version_snapshot)
+  end
+
   private
 
+  def mark_filters_ready_if_current(user, custom_filters, version_snapshot)
+    store.mark_filters_ready_if_current!(
+      account.id,
+      user.id,
+      version_snapshot: version_snapshot,
+      expires_in: filters_ready_ttl(custom_filters)
+    )
+  end
+
   def write_memberships(assignment:)
-    unread_conversations.in_batches(of: BATCH_SIZE) do |relation|
+    unread_conversations(open_only: true).in_batches(of: BATCH_SIZE) do |relation|
       columns = %i[id inbox_id assignee_id cached_label_list team_id]
       memberships = relation.pluck(*columns).map do |id, inbox_id, assignee_id, cached_label_list, team_id|
         {
@@ -43,14 +79,99 @@ class Conversations::UnreadCounts::Builder
     end
   end
 
-  def unread_conversations
-    account.conversations
-           .open
-           .joins(:messages)
-           .merge(Message.incoming.reorder(nil))
-           .where(messages: { account_id: account.id })
-           .where(unread_since_last_seen_condition)
-           .distinct
+  def mentioned_unread_conversation_ids(user)
+    visible_unread_conversations(user, open_only: true)
+      .joins(:mentions)
+      .where(mentions: { account_id: account.id, user_id: user.id })
+      .pluck(:id)
+  end
+
+  def participating_unread_conversation_ids(user)
+    participating_visible_unread_conversations(user, open_only: true)
+      .where(id: user.participating_conversations.where(account_id: account.id).select(:id))
+      .pluck(:id)
+  end
+
+  def unattended_unread_conversation_ids(user)
+    visible_unread_conversations(user, open_only: true)
+      .unattended
+      .pluck(:id)
+  end
+
+  def folder_unread_conversation_ids(custom_filters, user)
+    custom_filters.each_with_object({}) do |custom_filter, result|
+      result[custom_filter.id] = unread_ids_for_filter(custom_filter, user)
+    rescue *FILTER_ERRORS
+      next
+    end
+  end
+
+  def conversation_custom_filters(user)
+    account.custom_filters.where(user: user, filter_type: :conversation)
+  end
+
+  def filters_ready_ttl(custom_filters)
+    return Conversations::UnreadCounts::READY_TTL unless relative_date_filter?(custom_filters)
+
+    seconds_until_next_day
+  end
+
+  def relative_date_filter?(custom_filters)
+    custom_filters.any? do |custom_filter|
+      Array(custom_filter.query.with_indifferent_access[:payload]).any? do |condition|
+        condition[:filter_operator] == RELATIVE_DATE_FILTER_OPERATOR
+      end
+    end
+  end
+
+  def seconds_until_next_day
+    [(Time.zone.tomorrow.beginning_of_day - Time.current).ceil, 1].max
+  end
+
+  def unread_ids_for_filter(custom_filter, user)
+    filter_relation = ::Conversations::FilterService.new(custom_filter.query.with_indifferent_access, user, account).filtered_relation
+    filter_relation
+      .where(id: unread_conversations(open_only: false).select(:id))
+      .reorder(nil)
+      .distinct
+      .pluck(:id)
+  end
+
+  def unread_conversations(open_only:)
+    conversations = account.conversations
+    conversations = conversations.open if open_only
+
+    conversations.joins(:messages)
+                 .merge(Message.incoming.reorder(nil))
+                 .where(messages: { account_id: account.id })
+                 .where(unread_since_last_seen_condition)
+                 .distinct
+  end
+
+  def visible_unread_conversations(user, open_only:)
+    ::Conversations::PermissionFilterService.new(unread_conversations(open_only: open_only), user, account).perform
+  end
+
+  def participating_visible_unread_conversations(user, open_only:)
+    return inbox_visible_unread_conversations(user, open_only: open_only) if custom_role_participating_permission?(user)
+
+    visible_unread_conversations(user, open_only: open_only)
+  end
+
+  def inbox_visible_unread_conversations(user, open_only:)
+    conversations = unread_conversations(open_only: open_only)
+    return conversations if account_user_for(user)&.administrator?
+
+    conversations.where(inbox: user.inboxes.where(account_id: account.id))
+  end
+
+  def custom_role_participating_permission?(user)
+    account_user = account_user_for(user)
+    account_user&.agent? && account_user.custom_role_id.present? && account_user.permissions.include?(PARTICIPATING_PERMISSION)
+  end
+
+  def account_user_for(user)
+    account.account_users.find_by(user_id: user.id)
   end
 
   def unread_since_last_seen_condition
diff --git a/app/services/conversations/unread_counts/counter.rb b/app/services/conversations/unread_counts/counter.rb
index f4126b61f..08a6c1072 100644
--- a/app/services/conversations/unread_counts/counter.rb
+++ b/app/services/conversations/unread_counts/counter.rb
@@ -1,4 +1,7 @@
 class Conversations::UnreadCounts::Counter
+  include ::Conversations::UnreadCounts::BuildLockKeys
+  include ::Conversations::UnreadCounts::FilterCounter
+
   MANAGE_ALL_PERMISSION = 'conversation_manage'.freeze
   UNASSIGNED_PERMISSION = 'conversation_unassigned_manage'.freeze
   PARTICIPATING_PERMISSION = 'conversation_participating_manage'.freeze
@@ -18,28 +21,38 @@ class Conversations::UnreadCounts::Counter
 
     ensure_base_cache!
     ensure_assignment_cache! if assignment_mode?
+    ensure_filters_cache!
+
+    inbox_counts = unread_inbox_counts
+    filter_counts = unread_filter_counts
 
     {
-      inboxes: unread_inbox_counts,
+      all_count: inbox_counts.values.sum,
+      inboxes: inbox_counts,
       labels: unread_label_counts,
-      teams: unread_team_counts
+      teams: unread_team_counts,
+      mentions_count: filter_counts[:mentions_count],
+      participating_count: filter_counts[:participating_count],
+      unattended_count: filter_counts[:unattended_count],
+      folders: filter_counts[:folders]
     }
   end
 
   private
 
   def ensure_base_cache!
-    ensure_cache_ready!(
-      ready: -> { store.base_ready?(account.id) },
-      lock_key: base_build_lock_key
-    ) { ::Conversations::UnreadCounts::Builder.new(account).build_base! }
+    ensure_cache_ready!(ready: -> { store.base_ready?(account.id) }, lock_key: base_build_lock_key) { builder.build_base! }
   end
 
   def ensure_assignment_cache!
+    ensure_cache_ready!(ready: -> { store.assignment_ready?(account.id) }, lock_key: assignment_build_lock_key) { builder.build_assignment! }
+  end
+
+  def ensure_filters_cache!
     ensure_cache_ready!(
-      ready: -> { store.assignment_ready?(account.id) },
-      lock_key: assignment_build_lock_key
-    ) { ::Conversations::UnreadCounts::Builder.new(account).build_assignment! }
+      ready: -> { store.filters_ready?(account.id, user.id) },
+      lock_key: filters_build_lock_key
+    ) { builder.build_filters_for!(user) }
   end
 
   def ensure_cache_ready!(ready:, lock_key:)
@@ -48,9 +61,10 @@ class Conversations::UnreadCounts::Counter
     loop do
       return if ready.call
 
-      return if lock_manager.with_lock(lock_key, BUILD_LOCK_TTL) { yield unless ready.call }
+      lock_acquired = lock_manager.with_lock(lock_key, BUILD_LOCK_TTL) { yield unless ready.call }
+      return if ready.call
 
-      wait_for_cache_ready(ready)
+      wait_for_cache_ready(ready) unless lock_acquired
     end
   end
 
@@ -59,14 +73,6 @@ class Conversations::UnreadCounts::Counter
     sleep BUILD_WAIT_INTERVAL until ready.call || Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
   end
 
-  def base_build_lock_key
-    format(Redis::Alfred::UNREAD_CONVERSATIONS_BASE_BUILD_LOCK, account_id: account.id)
-  end
-
-  def assignment_build_lock_key
-    format(Redis::Alfred::UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK, account_id: account.id)
-  end
-
   def unread_inbox_counts
     counts_for_grouped_keys(visible_inbox_ids.index_with { |inbox_id| inbox_keys_for_mode(inbox_id) })
   end
@@ -191,10 +197,14 @@ class Conversations::UnreadCounts::Counter
   end
 
   def empty_counts
-    { inboxes: {}, labels: {}, teams: {} }
+    { all_count: 0, inboxes: {}, labels: {}, teams: {}, mentions_count: 0, participating_count: 0, unattended_count: 0, folders: {} }
   end
 
   def store
     ::Conversations::UnreadCounts::Store
   end
+
+  def builder
+    @builder ||= ::Conversations::UnreadCounts::Builder.new(account)
+  end
 end
diff --git a/app/services/conversations/unread_counts/filter_counter.rb b/app/services/conversations/unread_counts/filter_counter.rb
new file mode 100644
index 000000000..79f376d87
--- /dev/null
+++ b/app/services/conversations/unread_counts/filter_counter.rb
@@ -0,0 +1,40 @@
+module Conversations::UnreadCounts::FilterCounter
+  private
+
+  def unread_filter_counts
+    keys = user_filter_keys
+    counts_by_key = store.counts_for_keys(keys.values + folder_keys.values)
+
+    {
+      mentions_count: counts_by_key[keys[:mentions]].to_i,
+      participating_count: counts_by_key[keys[:participating]].to_i,
+      unattended_count: counts_by_key[keys[:unattended]].to_i,
+      folders: folder_counts(counts_by_key)
+    }
+  end
+
+  def user_filter_keys
+    {
+      mentions: store.user_mentions_key(account.id, user.id),
+      participating: store.user_participating_key(account.id, user.id),
+      unattended: store.user_unattended_key(account.id, user.id)
+    }
+  end
+
+  def conversation_folder_ids
+    @conversation_folder_ids ||= account.custom_filters.where(user: user, filter_type: :conversation).pluck(:id)
+  end
+
+  def folder_keys
+    @folder_keys ||= conversation_folder_ids.index_with do |custom_filter_id|
+      store.user_folder_key(account.id, user.id, custom_filter_id)
+    end
+  end
+
+  def folder_counts(counts_by_key)
+    folder_keys.each_with_object({}) do |(custom_filter_id, key), result|
+      count = counts_by_key[key].to_i
+      result[custom_filter_id.to_s] = count if count.positive?
+    end
+  end
+end
diff --git a/app/services/conversations/unread_counts/listener.rb b/app/services/conversations/unread_counts/listener.rb
index 28792d884..28bbf2ac3 100644
--- a/app/services/conversations/unread_counts/listener.rb
+++ b/app/services/conversations/unread_counts/listener.rb
@@ -3,10 +3,13 @@ class Conversations::UnreadCounts::Listener < BaseListener
 
   def message_created(event)
     message, = extract_message_and_account(event)
-    return unless message.incoming?
     return unless message.account.feature_enabled?('conversation_unread_counts')
 
-    refresh(message.conversation)
+    if message.incoming?
+      refresh(message.conversation)
+    else
+      notify_filter_counts_changed(message.conversation)
+    end
   end
 
   def conversation_status_changed(event)
@@ -15,10 +18,21 @@ class Conversations::UnreadCounts::Listener < BaseListener
   end
 
   def conversation_updated(event)
-    return unless label_changed?(event.data[:changed_attributes])
-
     conversation, = extract_conversation_and_account(event)
-    refresh(conversation, event.data[:changed_attributes])
+    return unless conversation.account.feature_enabled?('conversation_unread_counts')
+
+    if label_changed?(event.data[:changed_attributes])
+      refresh(conversation, event.data[:changed_attributes])
+    elsif folder_filter_changed?(event.data[:changed_attributes])
+      notify_filter_counts_changed(conversation)
+    end
+  end
+
+  def conversation_contact_changed(event)
+    conversation, = extract_conversation_and_account(event)
+    return unless conversation.account.feature_enabled?('conversation_unread_counts')
+
+    notify_filter_counts_changed(conversation)
   end
 
   def assignee_changed(event)
@@ -37,7 +51,10 @@ class Conversations::UnreadCounts::Listener < BaseListener
 
     account = Account.find_by(id: conversation_data[:account_id])
     return unless account&.feature_enabled?('conversation_unread_counts')
-    return unless remove_deleted_conversation(account, conversation_data)
+
+    filters_cleared = store.clear_filter_caches!(account.id)
+    memberships_removed = remove_deleted_conversation(account, conversation_data)
+    return unless memberships_removed || filters_cleared
 
     Rails.configuration.dispatcher.dispatch(CONVERSATION_UNREAD_COUNT_CHANGED, Time.zone.now, conversation_data: conversation_data.to_h)
   end
@@ -90,6 +107,16 @@ class Conversations::UnreadCounts::Listener < BaseListener
       changed_attributes.key?('cached_label_list') || changed_attributes.key?(:cached_label_list)
   end
 
+  def folder_filter_changed?(changed_attributes)
+    changed_attributes.present?
+  end
+
+  def notify_filter_counts_changed(conversation)
+    return unless store.clear_filter_caches!(conversation.account_id)
+
+    Rails.configuration.dispatcher.dispatch(CONVERSATION_UNREAD_COUNT_CHANGED, Time.zone.now, conversation: conversation)
+  end
+
   def store
     ::Conversations::UnreadCounts::Store
   end
diff --git a/app/services/conversations/unread_counts/notifier.rb b/app/services/conversations/unread_counts/notifier.rb
index 652fbde3a..aac4af7c0 100644
--- a/app/services/conversations/unread_counts/notifier.rb
+++ b/app/services/conversations/unread_counts/notifier.rb
@@ -11,7 +11,9 @@ class Conversations::UnreadCounts::Notifier
   def perform
     return false unless conversation.account.feature_enabled?('conversation_unread_counts')
 
-    return false unless ::Conversations::UnreadCounts::Refresher.new(conversation, changed_attributes: changed_attributes).perform
+    filters_cleared = ::Conversations::UnreadCounts::Store.clear_filter_caches!(conversation.account_id)
+    memberships_refreshed = ::Conversations::UnreadCounts::Refresher.new(conversation, changed_attributes: changed_attributes).perform
+    return false unless memberships_refreshed || filters_cleared
 
     Rails.configuration.dispatcher.dispatch(CONVERSATION_UNREAD_COUNT_CHANGED, Time.zone.now, conversation: conversation)
     true
diff --git a/app/services/conversations/unread_counts/store.rb b/app/services/conversations/unread_counts/store.rb
index e51fc5c09..6aa9cef05 100644
--- a/app/services/conversations/unread_counts/store.rb
+++ b/app/services/conversations/unread_counts/store.rb
@@ -1,5 +1,6 @@
 class Conversations::UnreadCounts::Store
   extend ::Conversations::UnreadCounts::StoreKeys
+  extend ::Conversations::UnreadCounts::UserFilterStore
 
   class << self
     def base_ready?(account_id)
@@ -19,6 +20,10 @@ class Conversations::UnreadCounts::Store
     end
 
     def clear_account!(account_id)
+      account_key_patterns(account_id).each { |pattern| delete_matching(pattern) }
+    end
+
+    def clear_all_account!(account_id)
       delete_matching("#{account_prefix(account_id)}::*")
     end
 
@@ -178,9 +183,11 @@ class Conversations::UnreadCounts::Store
     end
 
     def delete_matching(pattern)
+      deleted = 0
       Redis::Alfred.scan_each(match: pattern, count: 1000) do |key|
-        Redis::Alfred.delete(key)
+        deleted += 1 if Redis::Alfred.delete(key)
       end
+      deleted.positive?
     end
 
     def assignment_key_patterns(account_id)
@@ -195,5 +202,16 @@ class Conversations::UnreadCounts::Store
         "#{prefix}::TEAM::*::INBOX::*::ASSIGNEE::*"
       ]
     end
+
+    def account_key_patterns(account_id)
+      prefix = account_prefix(account_id)
+      [
+        base_ready_key(account_id),
+        assignment_ready_key(account_id),
+        "#{prefix}::INBOX::*",
+        "#{prefix}::LABEL::*::INBOX::*",
+        "#{prefix}::TEAM::*::INBOX::*"
+      ]
+    end
   end
 end
diff --git a/app/services/conversations/unread_counts/store_keys.rb b/app/services/conversations/unread_counts/store_keys.rb
index bbb6d101a..a5b8c43ec 100644
--- a/app/services/conversations/unread_counts/store_keys.rb
+++ b/app/services/conversations/unread_counts/store_keys.rb
@@ -40,4 +40,20 @@ module Conversations::UnreadCounts::StoreKeys
   def team_inbox_assignee_key(account_id, team_id, inbox_id, user_id)
     format(Redis::Alfred::UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE, account_id: account_id, team_id: team_id, inbox_id: inbox_id, user_id: user_id)
   end
+
+  def user_mentions_key(account_id, user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_MENTIONS, account_id: account_id, user_id: user_id)
+  end
+
+  def user_participating_key(account_id, user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_PARTICIPATING, account_id: account_id, user_id: user_id)
+  end
+
+  def user_unattended_key(account_id, user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_UNATTENDED, account_id: account_id, user_id: user_id)
+  end
+
+  def user_folder_key(account_id, user_id, custom_filter_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FOLDER, account_id: account_id, user_id: user_id, custom_filter_id: custom_filter_id)
+  end
 end
diff --git a/app/services/conversations/unread_counts/user_filter_notifier.rb b/app/services/conversations/unread_counts/user_filter_notifier.rb
new file mode 100644
index 000000000..94dd95a0f
--- /dev/null
+++ b/app/services/conversations/unread_counts/user_filter_notifier.rb
@@ -0,0 +1,19 @@
+class Conversations::UnreadCounts::UserFilterNotifier
+  include Events::Types
+
+  attr_reader :account, :user
+
+  def initialize(account:, user:)
+    @account = account
+    @user = user
+  end
+
+  def perform
+    return false if account.blank? || user.blank?
+    return false unless account.feature_enabled?('conversation_unread_counts')
+
+    ::Conversations::UnreadCounts::Store.clear_user_filters!(account.id, user.id)
+    Rails.configuration.dispatcher.dispatch(CONVERSATION_UNREAD_COUNT_CHANGED, Time.zone.now, account: account, user: user)
+    true
+  end
+end
diff --git a/app/services/conversations/unread_counts/user_filter_store.rb b/app/services/conversations/unread_counts/user_filter_store.rb
new file mode 100644
index 000000000..3533acb56
--- /dev/null
+++ b/app/services/conversations/unread_counts/user_filter_store.rb
@@ -0,0 +1,100 @@
+module Conversations::UnreadCounts::UserFilterStore
+  USER_FILTER_KEY_SUFFIXES = [
+    'READY::FILTERS',
+    'MENTIONS',
+    'PARTICIPATING',
+    'UNATTENDED',
+    'FOLDER::*'
+  ].freeze
+
+  def filters_ready?(account_id, user_id)
+    Redis::Alfred.exists?(filters_ready_key(account_id, user_id))
+  end
+
+  def mark_filters_ready!(account_id, user_id, expires_in: Conversations::UnreadCounts::READY_TTL)
+    Redis::Alfred.set(filters_ready_key(account_id, user_id), Time.current.to_i, ex: expires_in)
+  end
+
+  def mark_filters_ready_if_current!(account_id, user_id, version_snapshot:, expires_in: Conversations::UnreadCounts::READY_TTL)
+    return false unless filter_version_snapshot(account_id, user_id) == version_snapshot
+
+    mark_filters_ready!(account_id, user_id, expires_in: expires_in)
+  end
+
+  def filter_version_snapshot(account_id, user_id)
+    {
+      account: filter_version(account_filter_version_key(account_id)),
+      user: filter_version(user_filter_version_key(account_id, user_id))
+    }
+  end
+
+  def clear_filter_caches!(account_id)
+    bump_filter_version(account_filter_version_key(account_id))
+    delete_user_filter_patterns("#{account_prefix(account_id)}::USER::*")
+  end
+
+  def clear_user_filters!(account_id, user_id)
+    bump_filter_version(user_filter_version_key(account_id, user_id))
+    delete_user_filter_patterns(user_filter_prefix(account_id, user_id))
+  end
+
+  def add_filter_memberships(account_id:, user_id:, filters:, folders:)
+    memberships = {
+      user_mentions_key(account_id, user_id) => filters[:mentions],
+      user_participating_key(account_id, user_id) => filters[:participating],
+      user_unattended_key(account_id, user_id) => filters[:unattended]
+    }
+    folders.each do |custom_filter_id, conversation_ids|
+      memberships[user_folder_key(account_id, user_id, custom_filter_id)] = conversation_ids
+    end
+
+    write_membership_sets(memberships)
+  end
+
+  private
+
+  def filters_ready_key(account_id, user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_READY, account_id: account_id, user_id: user_id)
+  end
+
+  def account_filter_version_key(account_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
+  end
+
+  def user_filter_version_key(account_id, user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: user_id)
+  end
+
+  def user_filter_prefix(account_id, user_id)
+    "#{account_prefix(account_id)}::USER::#{user_id}"
+  end
+
+  def filter_version(key)
+    Redis::Alfred.get(key).to_i
+  end
+
+  def bump_filter_version(key)
+    Redis::Alfred.incr(key).tap { Redis::Alfred.expire(key, Conversations::UnreadCounts::SET_TTL) }
+  end
+
+  def delete_user_filter_patterns(prefix)
+    deleted = false
+    USER_FILTER_KEY_SUFFIXES.each do |suffix|
+      deleted = delete_matching("#{prefix}::#{suffix}") || deleted
+    end
+    deleted
+  end
+
+  def write_membership_sets(memberships)
+    memberships = memberships.transform_values { |conversation_ids| Array(conversation_ids).compact_blank }
+    memberships = memberships.select { |_key, conversation_ids| conversation_ids.present? }
+    return if memberships.blank?
+
+    Redis::Alfred.pipelined do |pipeline|
+      memberships.each do |key, conversation_ids|
+        conversation_ids.each { |conversation_id| pipeline.sadd(key, conversation_id) }
+        pipeline.expire(key, Conversations::UnreadCounts::SET_TTL)
+      end
+    end
+  end
+end
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index 25f118d48..33ca04680 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -11,7 +11,7 @@ class FilterService
   }.with_indifferent_access
 
   def initialize(params, user)
-    @params = params
+    @params = normalize_params(params)
     @user = user
     file = File.read('./lib/filters/filter_keys.yml')
     @filters = YAML.safe_load(file)
@@ -140,6 +140,16 @@ class FilterService
 
   private
 
+  def normalize_params(params)
+    return params unless params.respond_to?(:with_indifferent_access)
+
+    normalized_params = params.with_indifferent_access
+    normalized_params[:payload] = Array(normalized_params[:payload]).map do |condition|
+      condition.respond_to?(:with_indifferent_access) ? condition.with_indifferent_access : condition
+    end
+    normalized_params
+  end
+
   def standard_attribute_data_type(attribute_key)
     @filters.each_value do |section|
       return section.dig(attribute_key, 'data_type') if section.is_a?(Hash) && section.key?(attribute_key)
diff --git a/app/services/imap/base_fetch_email_service.rb b/app/services/imap/base_fetch_email_service.rb
index 24dd22589..e55355f3a 100644
--- a/app/services/imap/base_fetch_email_service.rb
+++ b/app/services/imap/base_fetch_email_service.rb
@@ -38,7 +38,11 @@ class Imap::BaseFetchEmailService
   end
 
   def email_already_present?(channel, message_id)
-    channel.inbox.messages.find_by(source_id: message_id).present?
+    channel.inbox.messages.find_by(source_id: message_id).present? || deleted_message_tracker.deleted?(message_id)
+  end
+
+  def deleted_message_tracker
+    @deleted_message_tracker ||= Imap::DeletedMessageTracker.new(inbox: channel.inbox)
   end
 
   def fetch_mail_for_channel
diff --git a/app/services/imap/deleted_message_tracker.rb b/app/services/imap/deleted_message_tracker.rb
new file mode 100644
index 000000000..7892f258b
--- /dev/null
+++ b/app/services/imap/deleted_message_tracker.rb
@@ -0,0 +1,28 @@
+require 'digest'
+
+class Imap::DeletedMessageTracker
+  TTL = 2.days.to_i
+
+  pattr_initialize [:inbox!]
+
+  def record(source_ids)
+    return unless inbox.email?
+
+    keys = source_ids.compact_blank.map { |source_id| redis_key(source_id) }
+    return if keys.blank?
+
+    Redis::Alfred.pipelined do |pipeline|
+      keys.each { |key| pipeline.set(key, true, ex: TTL) }
+    end
+  end
+
+  def deleted?(source_id)
+    Redis::Alfred.exists?(redis_key(source_id))
+  end
+
+  private
+
+  def redis_key(source_id)
+    format(Redis::RedisKeys::IMAP_DELETED_MESSAGE, inbox_id: inbox.id, message_id_digest: Digest::SHA256.hexdigest(source_id))
+  end
+end
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index dab55e521..02a1636ed 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -1,6 +1,7 @@
 class Twilio::IncomingMessageService
   include ::FileTypeHelper
   include ::Twilio::WhatsappIdentifierHelper
+  include ::Twilio::ReferralParamsHelper
 
   pattr_initialize [:params!]
 
@@ -15,7 +16,8 @@ class Twilio::IncomingMessageService
       inbox_id: @inbox.id,
       message_type: :incoming,
       sender: @contact,
-      source_id: params[:SmsSid]
+      source_id: params[:SmsSid],
+      content_attributes: message_content_attributes
     )
     attach_files
     attach_location if location_message?
diff --git a/app/services/twilio/referral_params_helper.rb b/app/services/twilio/referral_params_helper.rb
new file mode 100644
index 000000000..0bc032dbb
--- /dev/null
+++ b/app/services/twilio/referral_params_helper.rb
@@ -0,0 +1,28 @@
+module Twilio::ReferralParamsHelper
+  REFERRAL_PARAM_MAPPING = {
+    source_id: :ReferralSourceId,
+    source_type: :ReferralSourceType,
+    source_url: :ReferralSourceUrl,
+    headline: :ReferralHeadline,
+    body: :ReferralBody,
+    media_id: :ReferralMediaId,
+    media_content_type: :ReferralMediaContentType,
+    media_url: :ReferralMediaUrl,
+    num_media: :ReferralNumMedia,
+    ctwa_clid: :ReferralCtwaClid
+  }.freeze
+
+  def message_content_attributes
+    referral_attributes.present? ? { referral: referral_attributes } : {}
+  end
+
+  def referral_attributes
+    return {} unless twilio_channel.whatsapp?
+    return {} if params[:ReferralSourceId].blank?
+
+    REFERRAL_PARAM_MAPPING.each_with_object({}) do |(attribute, param_key), result|
+      value = params[param_key]
+      result[attribute] = value if value.present?
+    end
+  end
+end
diff --git a/app/services/user_session_tracking_service.rb b/app/services/user_session_tracking_service.rb
new file mode 100644
index 000000000..d7e6f6efb
--- /dev/null
+++ b/app/services/user_session_tracking_service.rb
@@ -0,0 +1,63 @@
+class UserSessionTrackingService
+  # CFNetwork UAs cannot distinguish iPhone from iPad; both get labelled iPhone here.
+  LEGACY_MOBILE_UAS = [
+    { match: %r{\Aokhttp/}, platform: 'Android', device: 'Android' },
+    { match: %r{\AChatwoot/.*CFNetwork.*Darwin}, platform: 'iPhone', device: 'iPhone' }
+  ].freeze
+  private_constant :LEGACY_MOBILE_UAS
+
+  def initialize(user:, request:, client_id:)
+    @user = user
+    @request = request
+    @client_id = client_id
+  end
+
+  def create_or_update!
+    session = @user.user_sessions.find_or_initialize_by(client_id: @client_id)
+    session.assign_attributes(session_attributes)
+    session.last_activity_at = Time.current
+    session.save!
+    UserSessionIpLookupJob.perform_later(session) if session.ip_address.present?
+    session
+  end
+
+  def update_activity!
+    session = @user.user_sessions.find_by(client_id: @client_id)
+    return unless session&.should_update_activity?
+
+    session.update_columns(last_activity_at: Time.current) # rubocop:disable Rails/SkipsModelValidations
+  end
+
+  private
+
+  def session_attributes
+    browser = Browser.new(@request.user_agent)
+
+    attrs = {
+      ip_address: @request.remote_ip,
+      user_agent: @request.user_agent,
+      browser_name: browser.name,
+      browser_version: browser.full_version,
+      device_name: browser.device.name,
+      platform_name: browser.platform.name,
+      platform_version: browser.platform.version
+    }
+
+    patch_for_legacy_mobile(attrs)
+  end
+
+  def patch_for_legacy_mobile(attrs)
+    return attrs unless attrs[:browser_name] == 'Unknown Browser'
+
+    hit = LEGACY_MOBILE_UAS.find { |m| @request.user_agent.to_s.match?(m[:match]) }
+    return attrs unless hit
+
+    attrs.merge(
+      browser_name: 'Chatwoot Mobile',
+      browser_version: nil,
+      platform_name: hit[:platform],
+      platform_version: nil,
+      device_name: hit[:device]
+    )
+  end
+end
diff --git a/app/services/whatsapp/facebook_api_client.rb b/app/services/whatsapp/facebook_api_client.rb
index eef84b022..22e75aac0 100644
--- a/app/services/whatsapp/facebook_api_client.rb
+++ b/app/services/whatsapp/facebook_api_client.rb
@@ -60,7 +60,7 @@ class Whatsapp::FacebookApiClient
     data['code_verification_status'] == 'VERIFIED'
   end
 
-  WEBHOOK_DEFAULT_FIELDS = %w[messages smb_message_echoes calls].freeze
+  WEBHOOK_DEFAULT_FIELDS = %w[messages smb_message_echoes].freeze
 
   def subscribe_waba_webhook(waba_id, callback_url, verify_token, subscribed_fields: WEBHOOK_DEFAULT_FIELDS)
     # Step 1: Subscribe app to WABA first (required before override)
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 9e0720f74..00936ff15 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -91,7 +91,7 @@ class Whatsapp::IncomingMessageBaseService
   def create_contact_messages(message)
     message['contacts'].each do |contact|
       # Pass source_id from parent message since contact objects don't have :id
-      create_message(contact, source_id: message[:id])
+      create_message(contact, source_id: message[:id], content_attributes_source: message)
       attach_contact(contact)
       @message.save!
     end
@@ -158,10 +158,7 @@ class Whatsapp::IncomingMessageBaseService
     )
   end
 
-  def create_message(message, source_id: nil)
-    content_attrs = outgoing_echo ? { external_echo: true } : {}
-    content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
-
+  def create_message(message, source_id: nil, content_attributes_source: message)
     @message = @conversation.messages.build(
       content: message_content(message),
       account_id: @inbox.account_id,
@@ -171,10 +168,18 @@ class Whatsapp::IncomingMessageBaseService
       status: outgoing_echo ? :delivered : :sent,
       sender: outgoing_echo ? nil : @contact,
       source_id: (source_id || message[:id]).to_s,
-      content_attributes: content_attrs
+      content_attributes: message_content_attributes(content_attributes_source)
     )
   end
 
+  def message_content_attributes(message)
+    content_attrs = outgoing_echo ? { external_echo: true } : {}
+    content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
+    referral_content_attrs = referral_attributes(message)
+    content_attrs[:referral] = referral_content_attrs if referral_content_attrs.present?
+    content_attrs
+  end
+
   def attach_contact(contact)
     phones = contact[:phones]
     phones = [{ phone: 'Phone number is not available' }] if phones.blank?
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 27a854479..fd0d44cbe 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -71,6 +71,12 @@ module Whatsapp::IncomingMessageServiceHelpers
     @in_reply_to_external_id = message['context']&.[]('id')
   end
 
+  def referral_attributes(message)
+    return {} if outgoing_echo
+
+    message[:referral]&.to_h&.deep_stringify_keys || {}
+  end
+
   def find_message_by_source_id(source_id)
     return unless source_id
 
diff --git a/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb b/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb
index 164c3ac12..f836a63c3 100644
--- a/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb
@@ -13,8 +13,17 @@ class Whatsapp::IncomingMessageWhatsappCloudService < Whatsapp::IncomingMessageB
       inbox.channel.media_url(attachment_payload[:id]),
       headers: inbox.channel.api_headers
     )
+
     # This url response will be failure if the access token has expired.
     inbox.channel.authorization_error! if url_response.unauthorized?
-    Down.download(url_response.parsed_response['url'], headers: inbox.channel.api_headers) if url_response.success?
+
+    return unless url_response.success?
+
+    downloaded_file = Down.download(url_response.parsed_response['url'], headers: inbox.channel.api_headers)
+    # WhatsApp Cloud sends the original filename in the payload; preserve it so accented
+    # names keep their correct extension instead of relying on the mangled remote metadata.
+    filename = attachment_payload[:filename]
+    downloaded_file.define_singleton_method(:original_filename) { filename } if filename.present?
+    downloaded_file
   end
 end
diff --git a/app/services/whatsapp/webhook_setup_service.rb b/app/services/whatsapp/webhook_setup_service.rb
index a287b4977..2abf113da 100644
--- a/app/services/whatsapp/webhook_setup_service.rb
+++ b/app/services/whatsapp/webhook_setup_service.rb
@@ -17,9 +17,9 @@ class Whatsapp::WebhookSetupService
     setup_webhook
   end
 
-  def register_callback(subscribed_fields: nil)
+  def register_callback
     validate_parameters!
-    setup_webhook(subscribed_fields: subscribed_fields)
+    setup_webhook
   end
 
   private
@@ -55,21 +55,23 @@ class Whatsapp::WebhookSetupService
     @channel.save!
   end
 
-  def setup_webhook(subscribed_fields: nil)
+  def setup_webhook
     callback_url = build_callback_url
     verify_token = @channel.provider_config['webhook_verify_token']
 
-    args = [@waba_id, callback_url, verify_token]
-    if subscribed_fields
-      @api_client.subscribe_waba_webhook(*args, subscribed_fields: subscribed_fields)
-    else
-      @api_client.subscribe_waba_webhook(*args)
-    end
+    @api_client.subscribe_waba_webhook(@waba_id, callback_url, verify_token, subscribed_fields: subscribed_fields)
   rescue StandardError => e
     Rails.logger.error("[WHATSAPP] Webhook setup failed: #{e.message}")
     raise "Webhook setup failed: #{e.message}"
   end
 
+  # Subscribe to `calls` only when voice calling is enabled on the inbox
+  def subscribed_fields
+    fields = %w[messages smb_message_echoes]
+    fields << 'calls' if @channel.provider_config['calling_enabled']
+    fields
+  end
+
   def build_callback_url
     frontend_url = ENV.fetch('FRONTEND_URL', nil)
     phone_number = @channel.phone_number
diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
index 8c03f8f7b..a6eb7a551 100644
--- a/app/views/api/v1/accounts/articles/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -14,6 +14,8 @@ json.category do
   json.name article.category&.name
   json.slug article.category&.slug
   json.locale article.category&.locale
+  json.icon article.category&.icon
+  json.icon_color article.category&.icon_color
 end
 
 json.views article.views
diff --git a/app/views/api/v1/accounts/categories/_category.json.jbuilder b/app/views/api/v1/accounts/categories/_category.json.jbuilder
index c3674b7fa..e34bdc466 100644
--- a/app/views/api/v1/accounts/categories/_category.json.jbuilder
+++ b/app/views/api/v1/accounts/categories/_category.json.jbuilder
@@ -6,6 +6,7 @@ json.description category.description
 json.position category.position
 json.account_id category.account_id
 json.icon category.icon
+json.icon_color category.icon_color
 
 json.related_categories do
   if category.related_categories.any?
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 4e998ddf1..a76166a57 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -6,6 +6,7 @@ json.name resource.name
 json.phone_number resource.phone_number
 json.blocked resource.blocked
 json.identifier resource.identifier
+json.company_id resource.company_id if Current.account&.feature_enabled?('companies')
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
 json.last_activity_at resource.last_activity_at.to_i if resource[:last_activity_at].present?
diff --git a/app/views/api/v1/models/_hook.json.jbuilder b/app/views/api/v1/models/_hook.json.jbuilder
index 5df214ac8..3b9b14029 100644
--- a/app/views/api/v1/models/_hook.json.jbuilder
+++ b/app/views/api/v1/models/_hook.json.jbuilder
@@ -5,5 +5,10 @@ json.inbox resource.inbox&.slice(:id, :name)
 json.account_id resource.account_id
 json.hook_type resource.hook_type
 
-json.settings resource.settings if Current.account_user&.administrator?
-json.reference_id resource.reference_id if Current.account_user&.administrator?
+if Current.account_user&.administrator?
+  visible_properties = resource.app&.visible_properties || []
+  settings = (resource.settings || {}).select { |key, _| visible_properties.include?(key.to_s) }
+
+  json.settings settings
+  json.reference_id resource.reference_id
+end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index b34bbe95b..677e4fe9e 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -140,6 +140,7 @@ end
 ## Voice attributes for TwilioSms
 if resource.twilio? && resource.channel.respond_to?(:voice_enabled?)
   json.voice_enabled resource.channel.voice_enabled?
+  json.inbound_calls_enabled resource.channel.inbound_calls_enabled?
   json.voice_configured resource.channel.try(:twiml_app_sid).present?
   json.has_api_key_secret resource.channel.try(:api_key_secret).present?
   if resource.channel.try(:twiml_app_sid).present?
@@ -149,4 +150,7 @@ if resource.twilio? && resource.channel.respond_to?(:voice_enabled?)
 end
 
 ## Voice attribute for WhatsApp Cloud (only embedded-signup channels surface true)
-json.voice_enabled resource.channel.voice_enabled? if resource.channel_type == 'Channel::Whatsapp' && resource.channel.respond_to?(:voice_enabled?)
+if resource.channel_type == 'Channel::Whatsapp' && resource.channel.respond_to?(:voice_enabled?)
+  json.voice_enabled resource.channel.voice_enabled?
+  json.inbound_calls_enabled resource.channel.inbound_calls_enabled?
+end
diff --git a/app/views/api/v1/profile/sessions/index.json.jbuilder b/app/views/api/v1/profile/sessions/index.json.jbuilder
new file mode 100644
index 000000000..b009271e0
--- /dev/null
+++ b/app/views/api/v1/profile/sessions/index.json.jbuilder
@@ -0,0 +1,15 @@
+json.array! @sessions do |session|
+  json.id session.id
+  json.browser_name session.browser_name
+  json.browser_version session.browser_version
+  json.device_name session.device_name
+  json.platform_name session.platform_name
+  json.platform_version session.platform_version
+  json.ip_address session.ip_address
+  json.city session.city
+  json.country session.country
+  json.country_code session.country_code
+  json.last_activity_at session.last_activity_at
+  json.created_at session.created_at
+  json.current session.current?(@current_client_id)
+end
diff --git a/app/views/layouts/portal.html+documentation.erb b/app/views/layouts/portal.html+documentation.erb
index 50374917f..aa26fce7e 100644
--- a/app/views/layouts/portal.html+documentation.erb
+++ b/app/views/layouts/portal.html+documentation.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= I18n.locale %>">
+<html lang="<%= html_lang_attribute(I18n.locale) %>">
   <head>
     <%= render 'layouts/portal_head' %>
   </head>
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index a2b9033bf..ac3f7e574 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= I18n.locale %>">
+<html lang="<%= html_lang_attribute(I18n.locale) %>">
   <head>
     <%= render 'layouts/portal_head' %>
   </head>
diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index 069aa9d9c..715b20672 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -13,7 +13,7 @@
          <div class="flex flex-col items-start gap-1">
             <div class="flex flex-row items-center gap-2 <%= !@is_plain_layout_enabled && 'px-1' %>">
                <% if category.icon.present? %>
-               <span class="text-lg rounded-md cursor-pointer <%= !@is_plain_layout_enabled && 'pl-1' %>"><%= category.icon %></span>
+               <span class="text-lg rounded-md cursor-pointer inline-flex <%= !@is_plain_layout_enabled && 'pl-1' %>"><%= render_emoji_or_icon(category.icon, category.icon_color) %></span>
                <% end %>
                <h3 id="<%= !@is_plain_layout_enabled ? 'category-name' : '' %>" class="text-xl text-slate-800 dark:text-slate-50 font-semibold leading-relaxed hover:cursor-pointer <%= @is_plain_layout_enabled ? 'hover:underline' : '' %> <%= category.icon.blank? && !@is_plain_layout_enabled ? 'pl-1' : '' %>">
                   <a href="<%= generate_category_link(category_link_params) %>">
diff --git a/app/views/public/api/v1/portals/categories/_category-hero.html.erb b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
index c0b87d82c..9b5a0d8ef 100644
--- a/app/views/public/api/v1/portals/categories/_category-hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
@@ -12,7 +12,7 @@
   <div class="flex justify-start flex-col items-start w-full gap-2">
     <div class="flex flex-col gap-2">
       <% if category.icon.present? %>
-      <span class="text-4xl"><%= category.icon %></span>
+      <span class="text-4xl"><%= render_emoji_or_icon(category.icon, category.icon_color) %></span>
       <% end %>
       <h1 class="text-3xl font-bold tracking-wide leading-[52.5px] text-slate-900 dark:text-white">
         <%= category.name %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_article_card.html.erb b/app/views/public/api/v1/portals/documentation_layout/_article_card.html.erb
index 6f66e7675..247b4e3d8 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_article_card.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_article_card.html.erb
@@ -3,7 +3,7 @@
    class="group flex flex-col p-5 rounded-xl border border-solid border-n-weak hover:border-n-portal hover:shadow-md hover:-translate-y-0.5 transition-all duration-200">
   <% if show_category && article.category %>
     <span class="inline-flex items-center gap-1 self-start text-xs font-medium text-n-slate-11 mb-3">
-      <% if article.category.icon.present? %><span><%= article.category.icon %></span><% end %>
+      <% if article.category.icon.present? %><span><%= render_emoji_or_icon(article.category.icon, article.category.icon_color) %></span><% end %>
       <%= article.category.name %>
     </span>
   <% end %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_breadcrumb.html.erb b/app/views/public/api/v1/portals/documentation_layout/_breadcrumb.html.erb
index 3831e5dfe..c3cf5e846 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_breadcrumb.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_breadcrumb.html.erb
@@ -14,12 +14,12 @@
         href="<%= public_portal_category_path(portal.slug, category.locale, category.slug) %>"
         class="inline-flex items-center gap-1.5 hover:text-n-slate-12 transition"
       >
-        <% if category.icon.present? %><span><%= category.icon %></span><% end %>
+        <% if category.icon.present? %><span><%= render_emoji_or_icon(category.icon, category.icon_color) %></span><% end %>
         <%= category.name %>
       </a>
     <% else %>
       <span class="inline-flex items-center gap-1.5 text-n-slate-12 font-medium truncate">
-        <% if category.icon.present? %><span><%= category.icon %></span><% end %>
+        <% if category.icon.present? %><span class="inline-flex flex-shrink-0"><%= render_emoji_or_icon(category.icon, category.icon_color) %></span><% end %>
         <%= category.name %>
       </span>
     <% end %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_category_card.html.erb b/app/views/public/api/v1/portals/documentation_layout/_category_card.html.erb
index fa4ffc024..9e489e2eb 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_category_card.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_category_card.html.erb
@@ -3,7 +3,7 @@
 <a href="<%= public_portal_category_path(portal.slug, category.locale, category.slug) %>"
    class="group relative flex flex-col p-5 rounded-xl border border-solid border-n-weak hover:border-n-portal hover:shadow-md hover:-translate-y-0.5 transition-all duration-200">
   <span class="flex-shrink-0 w-11 h-11 flex items-center justify-center text-2xl rounded-xl bg-n-slate-2 border border-solid border-n-weak">
-    <%= category.icon.presence || '📁' %>
+    <% if category.icon.present? %><%= render_emoji_or_icon(category.icon, category.icon_color) %><% else %>📁<% end %>
   </span>
   <h3 class="mt-4 text-lg font-620 tracking-tight text-n-slate-12 group-hover:text-n-portal transition"><%= category.name %></h3>
   <% if category.description.present? %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb b/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
index af80d46ac..7beae0c9e 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_hero.html.erb
@@ -21,7 +21,7 @@
           <% popular_topics.each do |category| %>
             <a href="<%= public_portal_category_path(portal.slug, category.locale, category.slug) %>"
                class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full bg-white/60 dark:bg-n-slate-1/60 backdrop-blur border border-solid border-n-weak text-n-slate-11 hover:text-n-portal hover:border-n-portal transition">
-              <% if category.icon.present? %><span class="text-xs"><%= category.icon %></span><% end %>
+              <% if category.icon.present? %><span class="inline-flex items-center text-xs leading-none"><%= render_emoji_or_icon(category.icon, category.icon_color) %></span><% end %>
               <%= category.name %>
             </a>
           <% end %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/_sidebar.html.erb b/app/views/public/api/v1/portals/documentation_layout/_sidebar.html.erb
index 1898bbd46..7d4c3b68c 100644
--- a/app/views/public/api/v1/portals/documentation_layout/_sidebar.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/_sidebar.html.erb
@@ -39,7 +39,7 @@
       <% end %>
         <summary class="flex items-center gap-2 px-3 py-2 text-sm rounded-md cursor-pointer list-none select-none <%= is_active ? 'text-n-portal font-semibold' : 'text-n-slate-12 font-medium' %> hover:bg-n-alpha-2 transition">
           <% if sidebar_category.icon.present? %>
-            <span class="text-base leading-none w-4 flex items-center justify-center"><%= sidebar_category.icon %></span>
+            <span class="text-base leading-none w-4 flex items-center justify-center"><%= render_emoji_or_icon(sidebar_category.icon, sidebar_category.icon_color) %></span>
           <% else %>
             <span class="i-lucide-folder size-4 text-n-slate-10" aria-hidden="true"></span>
           <% end %>
diff --git a/app/views/public/api/v1/portals/documentation_layout/categories/_header.html.erb b/app/views/public/api/v1/portals/documentation_layout/categories/_header.html.erb
index 471facc06..1826c154a 100644
--- a/app/views/public/api/v1/portals/documentation_layout/categories/_header.html.erb
+++ b/app/views/public/api/v1/portals/documentation_layout/categories/_header.html.erb
@@ -15,7 +15,7 @@
 <header class="mb-8">
   <div class="flex items-center gap-4">
     <% if category.icon.present? %>
-      <span class="shrink-0 flex items-center justify-center w-14 h-14 text-3xl rounded-2xl bg-n-slate-1 border border-solid border-n-weak shadow-sm"><%= category.icon %></span>
+      <span class="shrink-0 flex items-center justify-center w-14 h-14 text-3xl rounded-2xl bg-n-slate-1 border border-solid border-n-weak shadow-sm"><%= render_emoji_or_icon(category.icon, category.icon_color) %></span>
     <% end %>
     <div class="min-w-0">
       <h1 class="text-3xl leading-snug font-620 tracking-tight text-n-slate-12 text-balance"><%= category.name %></h1>
diff --git a/config/app.yml b/config/app.yml
index c2494befa..c2c192018 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.14.2'
+  version: '4.15.0'
 
 development:
   <<: *shared
diff --git a/config/features.yml b/config/features.yml
index 03105588b..c5bc8f608 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -200,7 +200,6 @@
   display_name: Advanced Search
   enabled: false
   premium: true
-  chatwoot_internal: true
 - name: saml
   display_name: SAML
   enabled: false
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 15e78af9b..0158e3284 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -19,7 +19,7 @@ class Rack::Attack
   Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(redis: $velma, pool: false)
 
   class Request < ::Rack::Request
-    # You many need to specify a method to fetch the correct remote IP address
+    # You may need to specify a method to fetch the correct remote IP address
     # if the web server is behind a load balancer.
     def remote_ip
       @remote_ip ||= (env['action_dispatch.remote_ip'] || ip).to_s
@@ -31,9 +31,9 @@ class Rack::Attack
       (default_allowed_ips + env_allowed_ips).include?(remote_ip)
     end
 
-    # Rails would allow requests to paths with extentions, so lets compare against the path with extention stripped
+    # Rails would allow requests to paths with extensions, so lets compare against the path with extension stripped
     # example /auth & /auth.json would both work
-    def path_without_extentions
+    def path_without_extensions
       path[/^[^.]+/]
     end
   end
@@ -75,11 +75,11 @@ class Rack::Attack
 
   ### Prevent Brute-Force Super Admin Login Attacks ###
   throttle('super_admin_login/ip', limit: 5, period: 5.minutes) do |req|
-    req.ip if req.path_without_extentions == '/super_admin/sign_in' && req.post?
+    req.ip if req.path_without_extensions == '/super_admin/sign_in' && req.post?
   end
 
   throttle('super_admin_login/email', limit: 5, period: 15.minutes) do |req|
-    if req.path_without_extentions == '/super_admin/sign_in' && req.post?
+    if req.path_without_extensions == '/super_admin/sign_in' && req.post?
       # NOTE: This line used to throw ArgumentError /rails/action_mailbox/sendgrid/inbound_emails : invalid byte sequence in UTF-8
       # Hence placed in the if block
       # ref: https://github.com/rack/rack-attack/issues/399
@@ -91,7 +91,7 @@ class Rack::Attack
   # ### Prevent Brute-Force Login Attacks ###
   # Exclude MFA verification attempts from regular login throttling
   throttle('login/ip', limit: 5, period: 5.minutes) do |req|
-    if req.path_without_extentions == '/auth/sign_in' && req.post? && req.params['mfa_token'].blank?
+    if req.path_without_extensions == '/auth/sign_in' && req.post? && req.params['mfa_token'].blank?
       # Skip if this is an MFA verification request
       req.ip
     end
@@ -99,7 +99,7 @@ class Rack::Attack
 
   throttle('login/email', limit: 10, period: 15.minutes) do |req|
     # Skip if this is an MFA verification request
-    if req.path_without_extentions == '/auth/sign_in' && req.post? && req.params['mfa_token'].blank?
+    if req.path_without_extensions == '/auth/sign_in' && req.post? && req.params['mfa_token'].blank?
       # ref: https://github.com/rack/rack-attack/issues/399
       # NOTE: This line used to throw ArgumentError /rails/action_mailbox/sendgrid/inbound_emails : invalid byte sequence in UTF-8
       # Hence placed in the if block
@@ -110,11 +110,11 @@ class Rack::Attack
 
   ## Reset password throttling
   throttle('reset_password/ip', limit: 5, period: 30.minutes) do |req|
-    req.ip if req.path_without_extentions == '/auth/password' && req.post?
+    req.ip if req.path_without_extensions == '/auth/password' && req.post?
   end
 
   throttle('reset_password/email', limit: 5, period: 1.hour) do |req|
-    if req.path_without_extentions == '/auth/password' && req.post?
+    if req.path_without_extensions == '/auth/password' && req.post?
       email = req.params['email'].presence || ActionDispatch::Request.new(req.env).params['email'].presence
       email.to_s.downcase.gsub(/\s+/, '')
     end
@@ -122,11 +122,11 @@ class Rack::Attack
 
   ## Resend confirmation throttling (unauthenticated)
   throttle('resend_confirmation/ip', limit: 5, period: 30.minutes) do |req|
-    req.ip if req.path_without_extentions == '/resend_confirmation' && req.post?
+    req.ip if req.path_without_extensions == '/resend_confirmation' && req.post?
   end
 
   throttle('resend_confirmation/email', limit: 5, period: 1.hour) do |req|
-    if req.path_without_extentions == '/resend_confirmation' && req.post?
+    if req.path_without_extensions == '/resend_confirmation' && req.post?
       email = req.params['email'].presence || ActionDispatch::Request.new(req.env).params['email'].presence
       email.to_s.downcase.gsub(/\s+/, '')
     end
@@ -134,25 +134,25 @@ class Rack::Attack
 
   ## Resend confirmation throttling (authenticated)
   throttle('resend_confirmation_auth/ip', limit: 5, period: 30.minutes) do |req|
-    req.ip if req.path_without_extentions == '/api/v1/profile/resend_confirmation' && req.post?
+    req.ip if req.path_without_extensions == '/api/v1/profile/resend_confirmation' && req.post?
   end
 
   ## MFA throttling - prevent brute force attacks
   throttle('mfa_verification/ip', limit: 5, period: 1.minute) do |req|
-    if req.path_without_extentions == '/api/v1/profile/mfa'
+    if req.path_without_extensions == '/api/v1/profile/mfa'
       req.ip if req.delete? # Throttle disable attempts
-    elsif req.path_without_extentions.match?(%r{/api/v1/profile/mfa/(verify|backup_codes)})
+    elsif req.path_without_extensions.match?(%r{/api/v1/profile/mfa/(verify|backup_codes)})
       req.ip if req.post? # Throttle verify and backup_codes attempts
     end
   end
 
   # Separate rate limiting for MFA verification attempts
   throttle('mfa_login/ip', limit: 10, period: 1.minute) do |req|
-    req.ip if req.path_without_extentions == '/auth/sign_in' && req.post? && req.params['mfa_token'].present?
+    req.ip if req.path_without_extensions == '/auth/sign_in' && req.post? && req.params['mfa_token'].present?
   end
 
   throttle('mfa_login/token', limit: 10, period: 1.minute) do |req|
-    if req.path_without_extentions == '/auth/sign_in' && req.post?
+    if req.path_without_extensions == '/auth/sign_in' && req.post?
       # Track by MFA token to prevent brute force on a specific token
       mfa_token = req.params['mfa_token'].presence
       (mfa_token.presence)
@@ -161,7 +161,7 @@ class Rack::Attack
 
   ## Prevent Brute-Force Signup Attacks ###
   throttle('accounts/ip', limit: 5, period: 30.minutes) do |req|
-    req.ip if req.path_without_extentions == '/api/v1/accounts' && req.post?
+    req.ip if req.path_without_extensions == '/api/v1/accounts' && req.post?
   end
 
   ##-----------------------------------------------##
@@ -176,17 +176,17 @@ class Rack::Attack
   if ActiveModel::Type::Boolean.new.cast(ENV.fetch('ENABLE_RACK_ATTACK_WIDGET_API', true))
     ## Prevent Conversation Bombing on Widget APIs ###
     throttle('api/v1/widget/conversations', limit: 6, period: 12.hours) do |req|
-      req.ip if req.path_without_extentions == '/api/v1/widget/conversations' && req.post?
+      req.ip if req.path_without_extensions == '/api/v1/widget/conversations' && req.post?
     end
 
     ## Prevent Contact update Bombing in Widget API ###
     throttle('api/v1/widget/contacts', limit: 60, period: 1.hour) do |req|
-      req.ip if req.path_without_extentions == '/api/v1/widget/contacts' && (req.patch? || req.put?)
+      req.ip if req.path_without_extensions == '/api/v1/widget/contacts' && (req.patch? || req.put?)
     end
 
     ## Prevent Conversation Bombing through multiple sessions
     throttle('widget?website_token={website_token}&cw_conversation={x-auth-token}', limit: 5, period: 1.hour) do |req|
-      req.ip if req.path_without_extentions == '/widget' && ActionDispatch::Request.new(req.env).params['cw_conversation'].blank?
+      req.ip if req.path_without_extensions == '/widget' && ActionDispatch::Request.new(req.env).params['cw_conversation'].blank?
     end
   end
 
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 9d0d1f35b..6e6ce8134 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,10 @@
 # Be sure to restart your server when you modify this file.
+# Sessions are used only for the super_admin dashboard (flash/CSRF), not for API auth.
 
-Rails.application.config.session_store :cookie_store, key: '_chatwoot_session', same_site: :lax
+secure_cookies = ActiveModel::Type::Boolean.new.cast(ENV.fetch('FORCE_SSL', false))
+
+Rails.application.config.session_store :cookie_store,
+                                       key: '_chatwoot_session',
+                                       same_site: :lax,
+                                       secure: secure_cookies,
+                                       httponly: true
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index 1a45cc098..9ef01ed30 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -6,6 +6,7 @@
 # hook_type: ( account / inbox )
 # feature_flag: (string) feature flag to enable/disable the integration
 # allow_multiple_hooks: whether multiple hooks can be created for the integration
+# visible_properties: hook setting keys safe to return in API responses and show in the UI
 # settings_json_schema: the json schema used to validate the settings hash (https://json-schema.org/)
 # settings_form_schema: the formulate schema used in frontend to render settings form (https://vueformulate.com/)
 ########################################################
@@ -55,7 +56,7 @@ openai:
         'validation': '',
       },
     ]
-  visible_properties: ['api_key', 'label_suggestion']
+  visible_properties: ['label_suggestion']
 linear:
   id: linear
   logo: linear.png
@@ -63,12 +64,14 @@ linear:
   action: https://linear.app/oauth/authorize
   hook_type: account
   allow_multiple_hooks: false
+  visible_properties: []
 notion:
   id: notion
   logo: notion.png
   i18n_key: notion
   hook_type: account
   allow_multiple_hooks: false
+  visible_properties: []
 slack:
   id: slack
   logo: slack.png
@@ -76,6 +79,7 @@ slack:
   action: https://slack.com/oauth/v2/authorize?scope=commands,chat:write,channels:read,channels:manage,channels:join,groups:read,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history,files:read,files:write
   hook_type: account
   allow_multiple_hooks: false
+  visible_properties: ['channel_name']
 dialogflow:
   id: dialogflow
   logo: dialogflow.png
@@ -240,6 +244,7 @@ shopify:
   i18n_key: shopify
   hook_type: account
   allow_multiple_hooks: false
+  visible_properties: []
 
 leadsquared:
   id: leadsquared
@@ -310,7 +315,6 @@ leadsquared:
     ]
   visible_properties:
     [
-      'access_key',
       'endpoint_url',
       'enable_conversation_activity',
       'enable_transcript_activity',
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8b8202f1c..826894466 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -47,6 +47,10 @@ en:
     saml_not_available: SAML authentication is not available in this installation.
     inbox_deletetion_response: Your inbox deletion request will be processed in some time.
 
+  profile_settings:
+    sessions:
+      cannot_revoke_current: You cannot revoke the current session.
+
   errors:
     account:
       reporting_timezone:
diff --git a/config/routes.rb b/config/routes.rb
index d78831343..f86e3f2cb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -267,6 +267,7 @@ Rails.application.routes.draw do
               end
               post :enable_whatsapp_calling, on: :member
               post :disable_whatsapp_calling, on: :member
+              post :set_inbound_calls, on: :member
             end
 
             resource :csat_template, only: [:show, :create], controller: 'inbox_csat_templates' do
@@ -436,6 +437,7 @@ Rails.application.routes.draw do
             post :verify
             post :backup_codes
           end
+          resources :sessions, only: [:index, :destroy]
         end
       end
 
diff --git a/db/migrate/20260604000000_add_provider_config_to_channel_twilio_sms.rb b/db/migrate/20260604000000_add_provider_config_to_channel_twilio_sms.rb
new file mode 100644
index 000000000..6d28aa5dd
--- /dev/null
+++ b/db/migrate/20260604000000_add_provider_config_to_channel_twilio_sms.rb
@@ -0,0 +1,5 @@
+class AddProviderConfigToChannelTwilioSms < ActiveRecord::Migration[7.1]
+  def change
+    add_column :channel_twilio_sms, :provider_config, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20260610000000_add_icon_color_to_categories.rb b/db/migrate/20260610000000_add_icon_color_to_categories.rb
new file mode 100644
index 000000000..c618b3a41
--- /dev/null
+++ b/db/migrate/20260610000000_add_icon_color_to_categories.rb
@@ -0,0 +1,5 @@
+class AddIconColorToCategories < ActiveRecord::Migration[7.1]
+  def change
+    add_column :categories, :icon_color, :string, default: ''
+  end
+end
diff --git a/db/migrate/20260611184600_create_user_sessions.rb b/db/migrate/20260611184600_create_user_sessions.rb
new file mode 100644
index 000000000..96ad2821e
--- /dev/null
+++ b/db/migrate/20260611184600_create_user_sessions.rb
@@ -0,0 +1,23 @@
+class CreateUserSessions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :user_sessions do |t|
+      t.references :user, null: false, foreign_key: true
+      t.string :client_id, null: false
+      t.string :ip_address
+      t.string :user_agent
+      t.string :browser_name
+      t.string :browser_version
+      t.string :device_name
+      t.string :platform_name
+      t.string :platform_version
+      t.string :city
+      t.string :country
+      t.string :country_code
+      t.datetime :last_activity_at
+
+      t.timestamps
+    end
+
+    add_index :user_sessions, [:user_id, :client_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f2c479571..cbddbcce2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2026_05_25_093000) do
+ActiveRecord::Schema[7.1].define(version: 2026_06_11_184600) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -428,6 +428,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_05_25_093000) do
     t.bigint "parent_category_id"
     t.bigint "associated_category_id"
     t.string "icon", default: ""
+    t.string "icon_color", default: ""
     t.index ["associated_category_id"], name: "index_categories_on_associated_category_id"
     t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
     t.index ["locale"], name: "index_categories_on_locale"
@@ -557,6 +558,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_05_25_093000) do
     t.boolean "voice_enabled", default: false, null: false
     t.string "twiml_app_sid"
     t.string "api_key_secret"
+    t.jsonb "provider_config", default: {}
     t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
     t.index ["messaging_service_sid"], name: "index_channel_twilio_sms_on_messaging_service_sid", unique: true
     t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
@@ -1252,6 +1254,26 @@ ActiveRecord::Schema[7.1].define(version: 2026_05_25_093000) do
     t.index ["name", "account_id"], name: "index_teams_on_name_and_account_id", unique: true
   end
 
+  create_table "user_sessions", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.string "client_id", null: false
+    t.string "ip_address"
+    t.string "user_agent"
+    t.string "browser_name"
+    t.string "browser_version"
+    t.string "device_name"
+    t.string "platform_name"
+    t.string "platform_version"
+    t.string "city"
+    t.string "country"
+    t.string "country_code"
+    t.datetime "last_activity_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id", "client_id"], name: "index_user_sessions_on_user_id_and_client_id", unique: true
+    t.index ["user_id"], name: "index_user_sessions_on_user_id"
+  end
+
   create_table "users", id: :serial, force: :cascade do |t|
     t.string "provider", default: "email", null: false
     t.string "uid", default: "", null: false
@@ -1324,6 +1346,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_05_25_093000) do
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "inboxes", "portals"
+  add_foreign_key "user_sessions", "users"
   create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1).
       on("accounts").
       after(:insert).
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
new file mode 100644
index 000000000..42ddbf6a2
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
@@ -0,0 +1,17 @@
+module Enterprise::Api::V1::Accounts::ContactsController
+  private
+
+  def permitted_params
+    params_with_company_id = super
+    return params_with_company_id unless Current.account.feature_enabled?('companies')
+    return params_with_company_id unless params.key?(:company_id)
+
+    params_with_company_id.merge(company_id: permitted_company_id)
+  end
+
+  def permitted_company_id
+    return nil if params[:company_id].blank?
+
+    Current.account.companies.find(params[:company_id]).id
+  end
+end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
index 76f578bf1..cdeeda74e 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
@@ -1,4 +1,6 @@
 module Enterprise::Api::V1::Accounts::InboxesController
+  extend ActiveSupport::Concern
+
   def inbox_attributes
     super + ee_inbox_attributes
   end
@@ -21,6 +23,24 @@ module Enterprise::Api::V1::Accounts::InboxesController
     render_could_not_create_error(e.message)
   end
 
+  # Toggles only the inbound-calls flag in provider_config. Saved with validate: false
+  # so WhatsApp's remote credential re-check (validate_provider_config) can't reject a
+  # simple toggle, mirroring enable_voice_calling!. Voice support (WhatsApp calling or
+  # Twilio voice) is guarded inline by ensure_inbound_calls_supported.
+  def set_inbound_calls
+    return unless ensure_inbound_calls_supported
+
+    channel = @inbox.channel
+    channel.provider_config = (channel.provider_config || {}).merge(
+      'inbound_calls_enabled' => ActiveModel::Type::Boolean.new.cast(params[:inbound_calls_enabled])
+    )
+    channel.save!(validate: false)
+    @inbox.update_account_cache # bump inbox cache key so the cached inbox list refetches the new flag
+    head :ok
+  rescue StandardError => e
+    render_could_not_create_error(e.message)
+  end
+
   def ee_inbox_attributes
     [auto_assignment_config: [:max_assignment_limit]]
   end
@@ -35,6 +55,14 @@ module Enterprise::Api::V1::Accounts::InboxesController
     false
   end
 
+  # Inbound calls can be toggled on any voice-enabled inbox (WhatsApp calling or Twilio voice).
+  def ensure_inbound_calls_supported
+    return true if @inbox.channel.try(:voice_enabled?)
+
+    render_could_not_create_error('Inbox does not support calling')
+    false
+  end
+
   def allowed_channel_types
     super + ['voice']
   end
diff --git a/enterprise/app/controllers/twilio/voice_controller.rb b/enterprise/app/controllers/twilio/voice_controller.rb
index eb29c00bd..66fef9583 100644
--- a/enterprise/app/controllers/twilio/voice_controller.rb
+++ b/enterprise/app/controllers/twilio/voice_controller.rb
@@ -24,6 +24,8 @@ class Twilio::VoiceController < ApplicationController
       "TWILIO_VOICE_TWIML account=#{current_account.id} call_sid=#{twilio_call_sid} from=#{twilio_from} direction=#{twilio_direction}"
     )
 
+    return render xml: reject_twiml if reject_inbound?
+
     call = resolve_call
     render xml: conference_twiml(call)
   end
@@ -88,6 +90,16 @@ class Twilio::VoiceController < ApplicationController
     from_number.start_with?('client:')
   end
 
+  # A fresh contact-initiated leg on an inbox with inbound calls turned off.
+  # Reject it so no conference, conversation, or Call row is created.
+  def reject_inbound?
+    twilio_direction == 'inbound' && !agent_leg?(twilio_from) && !inbox.channel.inbound_calls_enabled?
+  end
+
+  def reject_twiml
+    Twilio::TwiML::VoiceResponse.new(&:reject).to_s
+  end
+
   def resolve_call
     return find_call_for_agent if agent_leg?(twilio_from)
 
diff --git a/enterprise/app/finders/enterprise/conversation_finder.rb b/enterprise/app/finders/enterprise/conversation_finder.rb
index 24e6b493d..f1f2e5514 100644
--- a/enterprise/app/finders/enterprise/conversation_finder.rb
+++ b/enterprise/app/finders/enterprise/conversation_finder.rb
@@ -1,5 +1,31 @@
 module Enterprise::ConversationFinder
+  def filter_by_conversation_type
+    return super unless params[:conversation_type] == 'participating' && custom_role_participating_permission?
+
+    @conversations = participating_visible_conversations.where(
+      id: current_user.participating_conversations.where(account_id: current_account.id).select(:id)
+    )
+  end
+
   def conversations_base_query
     current_account.feature_enabled?('sla') ? super.includes(:applied_sla, :sla_events) : super
   end
+
+  private
+
+  def participating_visible_conversations
+    conversations = current_account.conversations
+    conversations = conversations.where(inbox_id: @inbox_ids) if params[:inbox_id]
+    return conversations if account_user&.administrator?
+
+    conversations.where(inbox: current_user.inboxes.where(account_id: current_account.id))
+  end
+
+  def custom_role_participating_permission?
+    account_user&.agent? && account_user.custom_role_id.present? && account_user.permissions.include?('conversation_participating_manage')
+  end
+
+  def account_user
+    @account_user ||= current_account.account_users.find_by(user_id: current_user.id)
+  end
 end
diff --git a/enterprise/app/models/custom_role.rb b/enterprise/app/models/custom_role.rb
index 666f91378..4085000b1 100644
--- a/enterprise/app/models/custom_role.rb
+++ b/enterprise/app/models/custom_role.rb
@@ -28,6 +28,9 @@ class CustomRole < ApplicationRecord
   belongs_to :account
   has_many :account_users, dependent: :nullify
 
+  before_destroy :cache_users_for_unread_filter_notification, prepend: true
+  after_commit :notify_unread_filter_counts_changed, on: [:update, :destroy], if: :unread_filter_access_changed?
+
   PERMISSIONS = %w[
     conversation_manage
     conversation_unassigned_manage
@@ -39,4 +42,24 @@ class CustomRole < ApplicationRecord
 
   validates :name, presence: true
   validates :permissions, inclusion: { in: PERMISSIONS }
+
+  private
+
+  def unread_filter_access_changed?
+    destroyed? || previous_changes.key?('permissions')
+  end
+
+  def cache_users_for_unread_filter_notification
+    @users_for_unread_filter_notification = account_users.includes(:user).map(&:user)
+  end
+
+  def users_for_unread_filter_notification
+    @users_for_unread_filter_notification || account_users.includes(:user).map(&:user)
+  end
+
+  def notify_unread_filter_counts_changed
+    users_for_unread_filter_notification.each do |user|
+      ::Conversations::UnreadCounts::UserFilterNotifier.new(account: account, user: user).perform
+    end
+  end
 end
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index 0937c7b82..9b5093507 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -75,6 +75,14 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
   end
 
   def plan_email_limit
+    base_limit = plan_base_email_limit
+    return nil if base_limit.nil?
+    return base_limit if free_plan?
+
+    base_limit * [agent_limits.to_i, 1].max
+  end
+
+  def plan_base_email_limit
     config = InstallationConfig.find_by(name: 'ACCOUNT_EMAILS_PLAN_LIMITS')&.value
     return nil if config.blank? || plan_name.blank?
 
@@ -84,6 +92,11 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
     nil
   end
 
+  def free_plan?
+    default_plan = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')&.value&.first
+    default_plan.present? && plan_name&.downcase == default_plan['name']&.downcase
+  end
+
   def default_captain_limits
     max_limits = { documents: ChatwootApp.max_limit, responses: ChatwootApp.max_limit }.with_indifferent_access
     zero_limits = { documents: 0, responses: 0 }.with_indifferent_access
diff --git a/enterprise/app/models/enterprise/concerns/contact.rb b/enterprise/app/models/enterprise/concerns/contact.rb
index 84661c991..4362a915d 100644
--- a/enterprise/app/models/enterprise/concerns/contact.rb
+++ b/enterprise/app/models/enterprise/concerns/contact.rb
@@ -6,6 +6,7 @@ module Enterprise::Concerns::Contact
     after_commit :associate_company_from_email,
                  on: [:create, :update],
                  if: :should_associate_company?
+    before_save :sync_company_name_from_company, if: :will_save_change_to_company_id?
     after_update_commit :record_company_activity, if: :saved_change_to_last_activity_at?
   end
 
@@ -33,4 +34,14 @@ module Enterprise::Concerns::Contact
   def record_company_activity
     company&.record_activity_at!(last_activity_at) if last_activity_at.present?
   end
+
+  def sync_company_name_from_company
+    self.additional_attributes ||= {}
+
+    if company_id.present?
+      additional_attributes['company_name'] = company&.name
+    else
+      additional_attributes.delete('company_name')
+    end
+  end
 end
diff --git a/enterprise/app/services/contacts/company_association_service.rb b/enterprise/app/services/contacts/company_association_service.rb
index 9039e2a31..20c5ec4e4 100644
--- a/enterprise/app/services/contacts/company_association_service.rb
+++ b/enterprise/app/services/contacts/company_association_service.rb
@@ -6,7 +6,7 @@ class Contacts::CompanyAssociationService
     if company
       # rubocop:disable Rails/SkipsModelValidations
       # Using update_column and increment_counter to avoid triggering callbacks while maintaining counter cache
-      contact.update_column(:company_id, company.id)
+      contact.update_columns(company_id: company.id, additional_attributes: contact_attributes_with_company_name(contact, company))
       Company.increment_counter(:contacts_count, company.id)
       # rubocop:enable Rails/SkipsModelValidations
       company.record_activity_at!(contact.last_activity_at) if contact.last_activity_at.present?
@@ -45,4 +45,8 @@ class Contacts::CompanyAssociationService
   def derive_company_name(contact, domain)
     contact.additional_attributes&.dig('company_name') || domain.split('.').first.tr('-_', ' ').titleize
   end
+
+  def contact_attributes_with_company_name(contact, company)
+    (contact.additional_attributes || {}).merge('company_name' => company.name)
+  end
 end
diff --git a/enterprise/app/services/whatsapp/call_service.rb b/enterprise/app/services/whatsapp/call_service.rb
index 93eba957c..743409839 100644
--- a/enterprise/app/services/whatsapp/call_service.rb
+++ b/enterprise/app/services/whatsapp/call_service.rb
@@ -9,7 +9,7 @@ class Whatsapp::CallService
     call.with_lock do
       transition_to_in_progress!
       update_message_status('in_progress')
-      update_conversation_call_status(call.display_status)
+      claim_conversation_and_set_call_status
       broadcast(:accepted, accepted_by_agent_id: agent.id)
     end
     call
@@ -56,7 +56,6 @@ class Whatsapp::CallService
     forward_answer_to_meta!
     call.update!(status: 'in_progress', accepted_by_agent_id: agent.id, started_at: Time.current,
                  meta: (call.meta || {}).merge('sdp_answer' => sdp_answer))
-    claim_conversation_for_agent
   end
 
   def forward_answer_to_meta!
@@ -64,9 +63,13 @@ class Whatsapp::CallService
     invoke_provider!(:accept_call, sdp_answer)
   end
 
-  # Take ownership of the conversation if no one holds it; leave assignee alone otherwise (transfer via UI).
-  def claim_conversation_for_agent
-    call.conversation.update!(assignee: agent) if call.conversation.assignee_id.blank?
+  # Claim an unheld conversation and set call_status in one save so previous_changes carries both the
+  # assignee change (activity message + ASSIGNEE_CHANGED) and the call_status change (conversation.updated webhook).
+  def claim_conversation_and_set_call_status
+    conversation = call.conversation
+    attrs = { additional_attributes: (conversation.additional_attributes || {}).merge('call_status' => call.display_status) }
+    attrs[:assignee] = agent if conversation.assignee_id.blank?
+    conversation.update!(attrs)
   end
 
   # Raise on Meta failure (bool false or transport error) so callers bail before
diff --git a/enterprise/app/services/whatsapp/incoming_call_service.rb b/enterprise/app/services/whatsapp/incoming_call_service.rb
index afca508a8..f6185050d 100644
--- a/enterprise/app/services/whatsapp/incoming_call_service.rb
+++ b/enterprise/app/services/whatsapp/incoming_call_service.rb
@@ -72,6 +72,12 @@ class Whatsapp::IncomingCallService
   end
 
   def create_inbound_call(payload)
+    unless inbox.channel.inbound_calls_enabled?
+      Rails.logger.info "[WHATSAPP CALL] Inbound calls disabled for inbox #{inbox.id}; rejecting call #{payload[:id]}"
+      inbox.channel.provider_service.reject_call(payload[:id])
+      return
+    end
+
     sdp_offer = payload.dig(:session, :sdp)
     extra_meta = { 'sdp_offer' => sdp_offer, 'ice_servers' => Call.default_ice_servers }
     name = caller_profile_name(payload)
diff --git a/lib/active_storage/migrator.rb b/lib/active_storage/migrator.rb
new file mode 100644
index 000000000..0fdf1669d
--- /dev/null
+++ b/lib/active_storage/migrator.rb
@@ -0,0 +1,52 @@
+require 'yaml'
+require 'erb'
+
+class ActiveStorage::Migrator
+  def self.migrate(from_service_name, to_service_name, should_update_service_name: true)
+    configs = load_storage_config
+    # Check if services are configured correctly
+    if configs[from_service_name.to_s].nil? || configs[to_service_name.to_s].nil?
+      raise "Error: The services '#{from_service_name}' or '#{to_service_name}' are not configured correctly."
+    end
+
+    from_service = configure_service(from_service_name, configs)
+
+    configure_blob_service(from_service)
+
+    migrate_blobs(from_service_name, to_service_name, should_update_service_name: should_update_service_name)
+  end
+
+  def self.load_storage_config
+    yaml_with_env = ERB.new(File.read('config/storage.yml')).result
+    YAML.load(yaml_with_env)
+  end
+
+  def self.configure_blob_service(service)
+    ActiveStorage::Blob.service = service
+  end
+
+  def self.configure_service(service_name, configs = load_storage_config)
+    service_config = configs[service_name.to_s]
+    ActiveStorage::Service.configure(service_name, { service_name.to_sym => service_config })
+  end
+
+  def self.migrate_blobs(from_service_name, to_service_name, should_update_service_name: true)
+    to_service = configure_service(to_service_name)
+    blobs = ActiveStorage::Blob.where(service_name: from_service_name.to_s)
+    Rails.logger.debug { "#{blobs.count} Blobs to migrate from #{from_service_name} to #{to_service_name}" }
+
+    blobs.find_each do |blob|
+      Rails.logger.debug { '.' }
+
+      blob.open do |io|
+        checksum = blob.checksum
+        to_service.upload(blob.key, io, checksum: checksum)
+      end
+
+      blob.update!(service_name: to_service_name.to_s) if should_update_service_name
+    rescue ActiveStorage::FileNotFoundError => e
+      Rails.logger.warn { "Skipping missing blob #{blob.id} (#{blob.key}): #{e.message}" }
+    end
+    Rails.logger.debug { 'Successful migration' }
+  end
+end
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index fff60c342..381cafb98 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -2,6 +2,8 @@ module Redis::RedisKeys
   ## Inbox Keys
   # Array storing the ordered ids for agent round robin assignment
   ROUND_ROBIN_AGENTS = 'ROUND_ROBIN_AGENTS:%<inbox_id>d'.freeze
+  # Track recently deleted IMAP messages to prevent them from being synced again
+  IMAP_DELETED_MESSAGE = 'IMAP_DELETED_MESSAGE::%<inbox_id>d::%<message_id_digest>s'.freeze
 
   ## Conversation keys
   # Detect whether to send an email reply to the conversation
@@ -12,8 +14,15 @@ module Redis::RedisKeys
   UNREAD_CONVERSATIONS_ACCOUNT_PREFIX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d'.freeze
   UNREAD_CONVERSATIONS_BASE_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::READY::BASE'.freeze
   UNREAD_CONVERSATIONS_ASSIGNMENT_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::READY::ASSIGNMENT'.freeze
+  UNREAD_CONVERSATIONS_USER_FILTERS_READY =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::READY::FILTERS'.freeze
+  UNREAD_CONVERSATIONS_FILTERS_VERSION = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::VERSION::FILTERS'.freeze
+  UNREAD_CONVERSATIONS_USER_FILTERS_VERSION =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::VERSION::FILTERS'.freeze
   UNREAD_CONVERSATIONS_BASE_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::BUILD_LOCK::BASE'.freeze
   UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::BUILD_LOCK::ASSIGNMENT'.freeze
+  UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::BUILD_LOCK::FILTERS'.freeze
   UNREAD_CONVERSATIONS_INBOX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::INBOX::%<inbox_id>d'.freeze
   UNREAD_CONVERSATIONS_LABEL_INBOX =
     'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::LABEL::%<label_id>d::INBOX::%<inbox_id>d'.freeze
@@ -31,6 +40,14 @@ module Redis::RedisKeys
     'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::TEAM::%<team_id>d::INBOX::%<inbox_id>d::UNASSIGNED'.freeze
   UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE =
     'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::TEAM::%<team_id>d::INBOX::%<inbox_id>d::ASSIGNEE::%<user_id>d'.freeze
+  UNREAD_CONVERSATIONS_USER_MENTIONS =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::MENTIONS'.freeze
+  UNREAD_CONVERSATIONS_USER_PARTICIPATING =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::PARTICIPATING'.freeze
+  UNREAD_CONVERSATIONS_USER_UNATTENDED =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::UNATTENDED'.freeze
+  UNREAD_CONVERSATIONS_USER_FOLDER =
+    'UNREAD_CONVERSATIONS::V1::ACCOUNT::%<account_id>d::USER::%<user_id>d::FOLDER::%<custom_filter_id>d'.freeze
 
   ## User Keys
   # SSO Auth Tokens
diff --git a/lib/tasks/storage_migrations.rake b/lib/tasks/storage_migrations.rake
new file mode 100644
index 000000000..9a864db4e
--- /dev/null
+++ b/lib/tasks/storage_migrations.rake
@@ -0,0 +1,13 @@
+namespace :storage do
+  desc 'Migrate blobs from one storage service to another'
+  # Example: FROM=local TO=amazon UPDATE_BLOB_SERVICE_NAME=true bundle exec rake storage:migrate
+  task migrate: :environment do
+    from_service = ENV.fetch('FROM', nil)
+    to_service = ENV.fetch('TO', nil)
+    should_update_service_name = ActiveModel::Type::Boolean.new.cast(ENV.fetch('UPDATE_BLOB_SERVICE_NAME', true))
+
+    raise 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate' if from_service.nil? || to_service.nil?
+
+    ActiveStorage::Migrator.migrate(from_service.to_sym, to_service.to_sym, should_update_service_name: should_update_service_name)
+  end
+end
diff --git a/package.json b/package.json
index bc51bbd85..b8ab60839 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.14.2",
+  "version": "4.15.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
@@ -34,7 +34,7 @@
     "@amplitude/analytics-browser": "^2.11.10",
     "@breezystack/lamejs": "^1.2.7",
     "@chatwoot/ninja-keys": "1.2.3",
-    "@chatwoot/prosemirror-schema": "1.3.19",
+    "@chatwoot/prosemirror-schema": "1.3.22",
     "@chatwoot/utils": "^0.0.55",
     "@formkit/core": "^1.7.2",
     "@formkit/vue": "^1.7.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 68e667953..6c7bebb79 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,8 +25,8 @@ importers:
         specifier: 1.2.3
         version: 1.2.3
       '@chatwoot/prosemirror-schema':
-        specifier: 1.3.19
-        version: 1.3.19
+        specifier: 1.3.22
+        version: 1.3.22
       '@chatwoot/utils':
         specifier: ^0.0.55
         version: 0.0.55
@@ -458,8 +458,8 @@ packages:
   '@chatwoot/ninja-keys@1.2.3':
     resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==}
 
-  '@chatwoot/prosemirror-schema@1.3.19':
-    resolution: {integrity: sha512-LbATIAeTzclvbIK6WjtrGUO37AtMWkzCJi+s/KpUIp81TORhc0fHnclGT3353AbxeH6dF51/4hFTTsmF+ziqGA==}
+  '@chatwoot/prosemirror-schema@1.3.22':
+    resolution: {integrity: sha512-0r+PT8xhQLCKCpoV9k9XVTTRECs/0Nr37wbcLsRS7yvc7WkF9FY05z2hGCRJReWmTOcmmshHtb042LVP+MyB/w==}
 
   '@chatwoot/utils@0.0.55':
     resolution: {integrity: sha512-8G6HYQe1ZEYfJEsSYfDVvE+uhf98JDRjtGlpB+bzMko+yltbrk4yACSo/ImC3jSaJ6K8yPTSjJToSRmsQbL2iQ==}
@@ -5128,7 +5128,7 @@ snapshots:
       hotkeys-js: 3.8.7
       lit: 2.2.6
 
-  '@chatwoot/prosemirror-schema@1.3.19':
+  '@chatwoot/prosemirror-schema@1.3.22':
     dependencies:
       markdown-it-sup: 2.0.0
       prosemirror-commands: 1.7.1
diff --git a/spec/builders/contact_inbox_with_contact_builder_spec.rb b/spec/builders/contact_inbox_with_contact_builder_spec.rb
index 60f0834af..58502539f 100644
--- a/spec/builders/contact_inbox_with_contact_builder_spec.rb
+++ b/spec/builders/contact_inbox_with_contact_builder_spec.rb
@@ -39,6 +39,21 @@ describe ContactInboxWithContactBuilder do
       expect(contact_inbox.inbox_id).to eq(inbox.id)
     end
 
+    it 'truncates long contact names before creating the contact' do
+      long_name = 'a' * 300
+
+      contact_inbox = described_class.new(
+        source_id: '123456',
+        inbox: inbox,
+        contact_attributes: {
+          name: long_name,
+          email: 'testemail@example.com'
+        }
+      ).perform
+
+      expect(contact_inbox.contact.name).to eq(long_name.first(ApplicationRecord::MAX_STRING_COLUMN_LENGTH))
+    end
+
     it 'doesnot create contact if it already exist with identifier' do
       contact_inbox = described_class.new(
         source_id: '123456',
diff --git a/spec/config/session_store_spec.rb b/spec/config/session_store_spec.rb
new file mode 100644
index 000000000..a4f74af52
--- /dev/null
+++ b/spec/config/session_store_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+# rubocop:disable RSpec/DescribeClass
+describe 'Session Store Configuration' do
+  # rubocop:enable RSpec/DescribeClass
+
+  let(:session_options) { Rails.application.config.session_options }
+
+  it 'uses cookie_store as the session store' do
+    expect(Rails.application.config.session_store).to eq(ActionDispatch::Session::CookieStore)
+  end
+
+  it 'sets the session key' do
+    expect(session_options[:key]).to eq('_chatwoot_session')
+  end
+
+  it 'sets same_site to lax' do
+    expect(session_options[:same_site]).to eq(:lax)
+  end
+
+  it 'sets httponly to true' do
+    expect(session_options[:httponly]).to be(true)
+  end
+
+  it 'sets secure flag based on FORCE_SSL' do
+    expected_secure = ActiveModel::Type::Boolean.new.cast(ENV.fetch('FORCE_SSL', false))
+    expect(session_options[:secure]).to eq(expected_secure)
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 2255a1215..9468b273c 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -112,15 +112,15 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'returns all contacts with company name asc order with null values at last' do
+        contact_3
         get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company_name",
             headers: admin.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
         response_body = response.parsed_body
-        expect(response_body['payload'].first['email']).to eq(contact_1.email)
-        expect(response_body['payload'].first['id']).to eq(contact_1.id)
-        expect(response_body['payload'].last['email']).to eq(contact_4.email)
+        expect(response_body['payload'].first(2).pluck('id')).to contain_exactly(contact.id, contact_1.id)
+        expect(response_body['payload'].last(2).pluck('id')).to contain_exactly(contact_3.id, contact_4.id)
       end
 
       it 'returns all contacts with country name desc order with null values at last' do
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index f8fd446d2..de3cc4a3c 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe 'Conversations API', type: :request do
       end
 
       after do
-        Conversations::UnreadCounts::Store.clear_account!(account.id)
+        Conversations::UnreadCounts::Store.clear_all_account!(account.id)
       end
 
       context 'when conversation unread counts feature is enabled' do
@@ -141,9 +141,45 @@ RSpec.describe 'Conversations API', type: :request do
 
           expect(response).to have_http_status(:success)
           expect(response.parsed_body['payload']).to eq(
+            'all_count' => 1,
             'inboxes' => { visible_inbox.id.to_s => 1 },
             'labels' => { label.id.to_s => 1 },
-            'teams' => {}
+            'teams' => {},
+            'mentions_count' => 0,
+            'participating_count' => 0,
+            'unattended_count' => 1,
+            'folders' => {}
+          )
+        end
+
+        it 'returns unread counts for mentions, participating conversations, unattended conversations, and folders' do
+          mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+          participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+          resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+          resolved_conversation.update!(status: :resolved)
+          custom_filter = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: {
+                                   payload: [{
+                                     attribute_key: 'status',
+                                     filter_operator: 'equal_to',
+                                     values: ['resolved'],
+                                     query_operator: nil,
+                                     custom_attribute_type: ''
+                                   }]
+                                 })
+
+          create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+          create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+          get "/api/v1/accounts/#{account.id}/conversations/unread_counts",
+              headers: agent.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          expect(response.parsed_body['payload']).to include(
+            'mentions_count' => 1,
+            'participating_count' => 1,
+            'unattended_count' => 2,
+            'folders' => { custom_filter.id.to_s => 1 }
           )
         end
 
@@ -861,7 +897,7 @@ RSpec.describe 'Conversations API', type: :request do
         expect(response).to have_http_status(:success)
         expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
       ensure
-        Conversations::UnreadCounts::Store.clear_account!(account.id)
+        Conversations::UnreadCounts::Store.clear_all_account!(account.id)
       end
 
       it 'updates both if one timestamp is old even when the other is recent' do
@@ -948,7 +984,7 @@ RSpec.describe 'Conversations API', type: :request do
         expect(response).to have_http_status(:success)
         expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 1)
       ensure
-        Conversations::UnreadCounts::Store.clear_account!(account.id)
+        Conversations::UnreadCounts::Store.clear_all_account!(account.id)
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index bf95c9826..db8cd12f1 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe 'Integration Apps API', type: :request do
         expect(app['hooks'].first['settings']).to be_nil
       end
 
-      it 'returns all active apps with sensitive information if user is an admin' do
+      it 'returns all active apps with admin metadata if user is an admin' do
         first_app = Integrations::App.all.find { |app| app.active?(account) }
         get api_v1_account_integrations_apps_url(account),
             headers: admin.create_new_auth_token,
@@ -56,19 +56,21 @@ RSpec.describe 'Integration Apps API', type: :request do
       end
 
       it 'returns slack app with appropriate redirect url when configured' do
-        with_modified_env SLACK_CLIENT_ID: 'client_id', SLACK_CLIENT_SECRET: 'client_secret' do
-          get api_v1_account_integrations_apps_url(account),
-              headers: admin.create_new_auth_token,
-              as: :json
+        allow(GlobalConfigService).to receive(:load).and_call_original
+        allow(GlobalConfigService).to receive(:load).with('SLACK_CLIENT_ID', nil).and_return('client_id')
+        allow(GlobalConfigService).to receive(:load).with('SLACK_CLIENT_SECRET', nil).and_return('client_secret')
 
-          expect(response).to have_http_status(:success)
-          apps = response.parsed_body['payload']
-          slack_app = apps.find { |app| app['id'] == 'slack' }
-          expect(slack_app['action']).to include('client_id=client_id')
-        end
+        get api_v1_account_integrations_apps_url(account),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        apps = response.parsed_body['payload']
+        slack_app = apps.find { |app| app['id'] == 'slack' }
+        expect(slack_app['action']).to include('client_id=client_id')
       end
 
-      it 'will return sensitive information for openai app for admins' do
+      it 'returns visible hook settings for openai app for admins' do
         openai = create(:integrations_hook, :openai, account: account)
         get api_v1_account_integrations_apps_url(account),
             headers: admin.create_new_auth_token,
@@ -79,6 +81,34 @@ RSpec.describe 'Integration Apps API', type: :request do
         app = response.parsed_body['payload'].find { |int_app| int_app['id'] == openai.app.id }
         expect(app['hooks'].first['settings']).not_to be_nil
       end
+
+      it 'redacts secrets and only returns visible settings for openai hooks' do
+        openai = create(
+          :integrations_hook,
+          :openai,
+          account: account,
+          settings: { api_key: 'sk-secret', label_suggestion: true }
+        )
+        get api_v1_account_integrations_apps_url(account),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        app = response.parsed_body['payload'].find { |int_app| int_app['id'] == openai.app.id }
+        expect(app['hooks'].first['settings']).to eq('label_suggestion' => true)
+      end
+
+      it 'keeps slack channel display settings while redacting unspecified settings' do
+        create(:integrations_hook, account: account, settings: { channel_name: 'support', signing_secret: 'secret' })
+        allow(GlobalConfigService).to receive(:load).and_call_original
+        allow(GlobalConfigService).to receive(:load).with('SLACK_CLIENT_SECRET', nil).and_return('client_secret')
+
+        get api_v1_account_integrations_apps_url(account),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        app = response.parsed_body['payload'].find { |int_app| int_app['id'] == 'slack' }
+        expect(app['hooks'].first['settings']).to eq('channel_name' => 'support')
+      end
     end
   end
 
@@ -117,7 +147,7 @@ RSpec.describe 'Integration Apps API', type: :request do
         expect(app['hooks'].first['settings']).to be_nil
       end
 
-      it 'will return sensitive information for openai app for admins' do
+      it 'returns visible hook settings for openai app for admins' do
         openai = create(:integrations_hook, :openai, account: account)
         get api_v1_account_integrations_app_url(account_id: account.id, id: openai.app.id),
             headers: admin.create_new_auth_token,
@@ -128,6 +158,53 @@ RSpec.describe 'Integration Apps API', type: :request do
         app = response.parsed_body
         expect(app['hooks'].first['settings']).not_to be_nil
       end
+
+      it 'hides credentials and keeps visible settings for google credential integrations' do
+        hook = create(:integrations_hook, :google_translate, account: account,
+                                                             settings: { project_id: 'project-1',
+                                                                         credentials: { private_key: 'secret' } })
+        get api_v1_account_integrations_app_url(account_id: account.id, id: hook.app.id),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        app = response.parsed_body
+        expect(app['hooks'].first['settings']).to eq('project_id' => 'project-1')
+      end
+
+      it 'returns empty settings for oauth integrations with no visible properties' do
+        hook = create(
+          :integrations_hook,
+          :linear,
+          account: account,
+          settings: { token_type: 'Bearer', refresh_token: 'refresh-secret', expires_in: 7200 }
+        )
+        get api_v1_account_integrations_app_url(account_id: account.id, id: hook.app.id),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        app = response.parsed_body
+        expect(app['hooks'].first['settings']).to eq({})
+      end
+
+      it 'does not expose leadsquared credential keys in visible settings' do
+        account.enable_features('crm_integration')
+        hook = create(:integrations_hook, :leadsquared, account: account,
+                                                        settings: {
+                                                          'access_key' => 'access-secret',
+                                                          'secret_key' => 'secret',
+                                                          'endpoint_url' => 'https://api.leadsquared.com/',
+                                                          'enable_conversation_activity' => true
+                                                        })
+        get api_v1_account_integrations_app_url(account_id: account.id, id: hook.app.id),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        settings = response.parsed_body['hooks'].first['settings']
+        expect(settings).to eq(
+          'endpoint_url' => 'https://api.leadsquared.com/',
+          'enable_conversation_activity' => true
+        )
+      end
     end
   end
 end
diff --git a/spec/controllers/devise_overrides/sessions_controller_spec.rb b/spec/controllers/devise_overrides/sessions_controller_spec.rb
index 8ee012670..68d668d45 100644
--- a/spec/controllers/devise_overrides/sessions_controller_spec.rb
+++ b/spec/controllers/devise_overrides/sessions_controller_spec.rb
@@ -163,4 +163,221 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
       expect(response).to redirect_to('/frontend/app/login?error=access-denied')
     end
   end
+
+  describe 'session limit enforcement' do
+    before { stub_const('DeviseOverrides::SessionsController::MAX_SESSIONS', 5) }
+
+    let(:user) { create(:user, password: 'Test@123456') }
+    let(:browser_ua) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15' }
+    let(:mobile_ua) { 'okhttp/4.9.3' }
+
+    def seed_token(client_id, expiry_offset_days: 30, with_session: true)
+      user.tokens = user.tokens.merge(
+        client_id => { 'token' => 'x', 'expiry' => (Time.current + expiry_offset_days.days).to_i }
+      )
+      user.save!
+      user.user_sessions.create!(client_id: client_id, last_activity_at: Time.current) if with_session
+    end
+
+    def login_params
+      { email: user.email, password: 'Test@123456' }
+    end
+
+    context 'when under the limit' do
+      it 'allows login without intervention' do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        3.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'does not count expired tokens toward the cap' do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        # 3 expired + 2 active = 5 raw entries, but only 2 active
+        3.times { |i| seed_token("expired#{i}", expiry_offset_days: -1, with_session: false) }
+        2.times { |i| seed_token("active#{i}", expiry_offset_days: 30) }
+
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+
+    context 'when at the limit from a browser with full tracking' do
+      before do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+      end
+
+      it 'returns 409 with the session list (picker)' do
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:conflict)
+        body = response.parsed_body
+        expect(body['sessions_limit_reached']).to be true
+        expect(body['sessions'].size).to eq(5)
+      end
+
+      it 'does not create a new session row' do
+        expect { post :create, params: login_params }.not_to change(user.user_sessions, :count)
+      end
+    end
+
+    context 'when at the limit from a non-browser client' do
+      before do
+        request.env['HTTP_USER_AGENT'] = mobile_ua
+        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30 + i, with_session: false) }
+      end
+
+      it 'silently evicts the oldest token and lets login proceed' do
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:success)
+        expect(user.reload.tokens.keys).not_to include('c0')
+      end
+    end
+
+    context 'when at the limit but tracking is partial (legacy tokens present)' do
+      before do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        # one tracked, four legacy (no user_session rows)
+        seed_token('tracked', expiry_offset_days: 60, with_session: true)
+        4.times { |i| seed_token("legacy#{i}", expiry_offset_days: 10 + i, with_session: false) }
+      end
+
+      it 'silent-evicts instead of showing a partial picker' do
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'drops an untracked token first, keeping the tracked session alive' do
+        post :create, params: login_params
+
+        tokens = user.reload.tokens.keys
+        expect(tokens).to include('tracked')
+        # legacy0 expires soonest -> evict_oldest_token picks it
+        expect(tokens).not_to include('legacy0')
+      end
+    end
+
+    context 'when at the limit with full tracking (no legacy gap)' do
+      before do
+        request.env['HTTP_USER_AGENT'] = mobile_ua
+        # Five tracked sessions, varying activity timestamps
+        5.times do |i|
+          seed_token("tracked#{i}", expiry_offset_days: 30)
+          user.user_sessions.find_by(client_id: "tracked#{i}").update!(last_activity_at: (5 - i).days.ago)
+        end
+      end
+
+      it 'evicts the oldest tracked session by last_activity_at' do
+        post :create, params: login_params
+
+        expect(response).to have_http_status(:success)
+        # tracked0 had the oldest last_activity_at (5 days ago)
+        expect(user.reload.tokens.keys).not_to include('tracked0')
+        expect(user.user_sessions.exists?(client_id: 'tracked0')).to be false
+      end
+    end
+
+    context 'with revoke_session_id during login' do
+      before do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+      end
+
+      it 'revokes the chosen session and proceeds with login' do
+        target = user.user_sessions.find_by(client_id: 'c2')
+
+        post :create, params: login_params.merge(revoke_session_id: target.id)
+
+        expect(response).to have_http_status(:success)
+        expect(user.reload.tokens.keys).not_to include('c2')
+        expect(user.user_sessions.exists?(id: target.id)).to be false
+      end
+    end
+
+    context 'with revoke_all_sessions during login' do
+      before do
+        request.env['HTTP_USER_AGENT'] = browser_ua
+        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+      end
+
+      it 'wipes all sessions and tokens, then proceeds with login' do
+        post :create, params: login_params.merge(revoke_all_sessions: true)
+
+        expect(response).to have_http_status(:success)
+        expect(user.reload.tokens.keys).not_to include('c0', 'c1', 'c2', 'c3', 'c4')
+        # the new login adds one fresh token
+        expect(user.tokens.keys.size).to eq(1)
+      end
+    end
+
+    context 'with a successful login' do
+      before { request.env['HTTP_USER_AGENT'] = browser_ua }
+
+      it 'creates a UserSession row for the new client_id' do
+        expect { post :create, params: login_params }.to change(user.user_sessions, :count).by(1)
+
+        session = user.user_sessions.last
+        expect(session.browser_name).to eq('Safari')
+        expect(session.platform_name).to eq('macOS')
+      end
+    end
+  end
+
+  describe 'impersonation SSO login' do
+    let(:user) { create(:user, password: 'Test@123456') }
+    let(:browser_ua) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15' }
+
+    before { request.env['HTTP_USER_AGENT'] = browser_ua }
+
+    it 'does not create a UserSession row for impersonation login' do
+      sso_token = user.generate_sso_auth_token(impersonation: true)
+
+      expect do
+        post :create, params: { email: user.email, sso_auth_token: sso_token }
+      end.not_to change(user.user_sessions, :count)
+
+      expect(response).to have_http_status(:success)
+    end
+
+    it 'creates a short-lived token for impersonation login' do
+      sso_token = user.generate_sso_auth_token(impersonation: true)
+
+      post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+      expect(response).to have_http_status(:success)
+      token_entry = user.reload.tokens.values.last
+      # 2-day lifespan: expiry should be within ~3 days from now (token creation + lifespan)
+      expect(token_entry['expiry']).to be < (3.days.from_now).to_i
+    end
+
+    it 'creates a normal UserSession row for regular SSO login' do
+      sso_token = user.generate_sso_auth_token
+
+      expect do
+        post :create, params: { email: user.email, sso_auth_token: sso_token }
+      end.to change(user.user_sessions, :count).by(1)
+    end
+
+    it 'preserves the impersonation token when target user is at the device cap' do
+      allow(DeviseTokenAuth).to receive(:max_number_of_devices).and_return(5)
+      5.times do |i|
+        user.tokens["existing#{i}"] = { 'token' => 'x', 'expiry' => (Time.current + (30 + i).days).to_i }
+      end
+      user.save!
+      sso_token = user.generate_sso_auth_token(impersonation: true)
+
+      post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+      expect(response).to have_http_status(:success)
+      new_client_id = response.headers['client']
+      expect(user.reload.tokens.keys).to include(new_client_id)
+      expect(user.tokens.size).to eq(5)
+    end
+  end
 end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index e4ff81a08..917499cd5 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
     end
 
     after do
-      Conversations::UnreadCounts::Store.clear_account!(account.id)
+      Conversations::UnreadCounts::Store.clear_all_account!(account.id)
     end
 
     context 'when it is an unauthenticated user' do
diff --git a/spec/controllers/twilio/callbacks_controller_spec.rb b/spec/controllers/twilio/callbacks_controller_spec.rb
index 1dc2991ae..3a4ef16c1 100644
--- a/spec/controllers/twilio/callbacks_controller_spec.rb
+++ b/spec/controllers/twilio/callbacks_controller_spec.rb
@@ -13,7 +13,15 @@ RSpec.describe 'Twilio::CallbacksController', type: :request do
         'SmsSid' => 'SM123',
         'ExternalUserId' => 'IN.2081978709342942',
         'ParentExternalUserId' => 'IN.ENT.9081726354',
-        'ProfileUsername' => 'muhsin'
+        'ProfileUsername' => 'muhsin',
+        'ReferralCtwaClid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+        'ReferralSourceId' => '120237244350960485',
+        'ReferralSourceUrl' => 'https://fb.me/4tBfhWhjr',
+        'ReferralSourceType' => 'ad',
+        'ReferralHeadline' => 'German citizenship lawyer',
+        'ReferralBody' => 'Fast-track your German citizenship',
+        'ReferralMediaId' => '',
+        'ReferralNumMedia' => '0'
       }
     end
 
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
index dbcb7211f..36852c259 100644
--- a/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
@@ -3,7 +3,10 @@ require 'rails_helper'
 RSpec.describe 'Company contacts API', type: :request do
   let(:account) { create(:account) }
   let(:admin) { create(:user, account: account, role: :administrator) }
-  let(:company) { create(:company, name: 'Acme', account: account) }
+  let(:company) do
+    create(:company, name: 'Acme', domain: 'acme.com', description: 'Primary account', account: account,
+                     custom_attributes: { 'industry' => 'Manufacturing' })
+  end
 
   before { account.enable_features!(:companies) }
 
@@ -19,8 +22,16 @@ RSpec.describe 'Company contacts API', type: :request do
       expect(response).to have_http_status(:success)
       response_body = response.parsed_body
       expect(response_body['payload'].pluck('id')).to eq([linked_contact.id])
-      expect(response_body['payload'].first['company_id']).to eq(company.id)
-      expect(response_body['payload'].first['linked_to_current_company']).to be true
+      contact_payload = response_body['payload'].first
+      expect(contact_payload['company_id']).to eq(company.id)
+      expect(contact_payload['linked_to_current_company']).to be true
+      expect(contact_payload['company']).to include(
+        'id' => company.id,
+        'name' => 'Acme',
+        'domain' => 'acme.com',
+        'description' => 'Primary account',
+        'custom_attributes' => { 'industry' => 'Manufacturing' }
+      )
       expect(response_body['meta']['total_count']).to eq(1)
     end
   end
@@ -38,9 +49,14 @@ RSpec.describe 'Company contacts API', type: :request do
           as: :json
 
       expect(response).to have_http_status(:success)
-      contact_ids = response.parsed_body['payload'].pluck('id')
+      response_payload = response.parsed_body['payload']
+      contact_ids = response_payload.pluck('id')
       expect(contact_ids).to contain_exactly(available_contact.id, assigned_contact.id)
       expect(contact_ids).not_to include(linked_contact.id)
+      expect(response_payload.find { |contact| contact['id'] == assigned_contact.id }['company']).to include(
+        'id' => other_company.id,
+        'name' => 'Other Company'
+      )
     end
   end
 
@@ -56,7 +72,7 @@ RSpec.describe 'Company contacts API', type: :request do
 
       expect(response).to have_http_status(:success)
       expect(contact.reload.company_id).to eq(company.id)
-      expect(contact.additional_attributes).to eq('city' => 'Berlin')
+      expect(contact.additional_attributes).to eq('city' => 'Berlin', 'company_name' => 'Acme')
       expect(response.parsed_body['payload']['company_id']).to eq(company.id)
       expect(response.parsed_body['payload']['linked_to_current_company']).to be true
       expect(company.reload.last_activity_at).to be_within(1.second).of(contact.last_activity_at)
@@ -74,7 +90,7 @@ RSpec.describe 'Company contacts API', type: :request do
 
       expect(response).to have_http_status(:ok)
       expect(contact.reload.company_id).to be_nil
-      expect(contact.additional_attributes).to eq('company_name' => 'Acme', 'city' => 'Berlin')
+      expect(contact.additional_attributes).to eq('city' => 'Berlin')
     end
   end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
new file mode 100644
index 000000000..70d2d4f58
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Contacts API', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  before { account.enable_features!(:companies) }
+
+  describe 'PATCH /api/v1/accounts/{account.id}/contacts/:id' do
+    it 'updates company association' do
+      company = create(:company, account: account, name: 'Acme')
+      contact = create(:contact, account: account)
+
+      patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
+            headers: admin.create_new_auth_token,
+            params: { company_id: company.id },
+            as: :json
+
+      expect(response).to have_http_status(:success)
+      expect(contact.reload.company).to eq(company)
+      expect(contact.additional_attributes['company_name']).to eq('Acme')
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
index 709a8da22..ead387995 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
@@ -49,6 +49,59 @@ RSpec.describe 'Enterprise Inboxes API', type: :request do
     end
   end
 
+  describe 'POST /api/v1/accounts/{account.id}/inboxes/:id/set_inbound_calls' do
+    before do
+      allow(Twilio::VoiceWebhookSetupService).to receive(:new)
+        .and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: "AP#{SecureRandom.hex(16)}"))
+    end
+
+    context 'when administrator' do
+      it 'disables inbound calls on a Twilio voice inbox' do
+        channel = create(:channel_twilio_sms, :with_voice, account: account)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{channel.inbox.id}/set_inbound_calls",
+             headers: admin.create_new_auth_token,
+             params: { inbound_calls_enabled: false },
+             as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(channel.reload.inbound_calls_enabled?).to be false
+      end
+
+      it 'enables inbound calls on a WhatsApp inbox without re-validating provider config' do
+        account.enable_features('channel_voice')
+        account.save!
+        channel = create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud',
+                                            validate_provider_config: false, sync_templates: false)
+        channel.update!(provider_config: channel.provider_config.merge('calling_enabled' => true, 'inbound_calls_enabled' => false))
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{channel.inbox.id}/set_inbound_calls",
+             headers: admin.create_new_auth_token,
+             params: { inbound_calls_enabled: true },
+             as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(channel.reload.inbound_calls_enabled?).to be true
+      end
+    end
+
+    context 'when agent' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'is forbidden' do
+        channel = create(:channel_twilio_sms, :with_voice, account: account)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{channel.inbox.id}/set_inbound_calls",
+             headers: agent.create_new_auth_token,
+             params: { inbound_calls_enabled: false },
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+        expect(channel.reload.inbound_calls_enabled?).to be true
+      end
+    end
+  end
+
   describe 'PATCH /api/v1/accounts/{account.id}/inboxes/:id' do
     let(:inbox) { create(:inbox, account: account, auto_assignment_config: { max_assignment_limit: 5 }) }
 
diff --git a/spec/enterprise/controllers/twilio/voice_controller_spec.rb b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
index cde513c86..79fdd67a8 100644
--- a/spec/enterprise/controllers/twilio/voice_controller_spec.rb
+++ b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
@@ -112,6 +112,23 @@ RSpec.describe 'Twilio::VoiceController', type: :request do
       }
       expect(response).to have_http_status(:not_found)
     end
+
+    it 'rejects the inbound contact leg without building a call when inbound calls are disabled' do
+      channel.update!(provider_config: { 'inbound_calls_enabled' => false })
+      expect(Voice::InboundCallBuilder).not_to receive(:perform!)
+
+      expect do
+        post "/twilio/voice/call/#{digits}", params: {
+          'CallSid' => call_sid,
+          'From' => from_number,
+          'To' => to_number,
+          'Direction' => 'inbound'
+        }
+      end.not_to change(Call, :count)
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include('<Reject')
+    end
   end
 
   describe 'POST /twilio/voice/status/:phone' do
diff --git a/spec/enterprise/finders/conversation_finder_spec.rb b/spec/enterprise/finders/conversation_finder_spec.rb
new file mode 100644
index 000000000..f8b9fce58
--- /dev/null
+++ b/spec/enterprise/finders/conversation_finder_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe ConversationFinder do
+  describe '#perform' do
+    it 'returns participant-only conversations for custom roles with participating permission' do
+      account = create(:account)
+      agent = create(:user, account: account, role: :agent)
+      other_agent = create(:user, account: account, role: :agent)
+      inbox = create(:inbox, account: account, enable_auto_assignment: false)
+      custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+      participating_conversation = create(:conversation, account: account, inbox: inbox, assignee: other_agent)
+
+      create(:inbox_member, user: agent, inbox: inbox)
+      create(:inbox_member, user: other_agent, inbox: inbox)
+      create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+      account.account_users.find_by!(user_id: agent.id).update!(custom_role: custom_role)
+      Current.account = account
+
+      result = described_class.new(agent, { status: 'open', conversation_type: 'participating' }).perform
+
+      expect(result[:conversations].map(&:id)).to include(participating_conversation.id)
+    end
+  end
+end
diff --git a/spec/enterprise/models/account_user_spec.rb b/spec/enterprise/models/account_user_spec.rb
index fb572e86a..e157d9acd 100644
--- a/spec/enterprise/models/account_user_spec.rb
+++ b/spec/enterprise/models/account_user_spec.rb
@@ -29,6 +29,24 @@ RSpec.describe AccountUser, type: :model do
     end
   end
 
+  describe 'unread filter count invalidation' do
+    it 'notifies when the assigned custom role changes' do
+      account = create(:account)
+      custom_role = create(:custom_role, account: account)
+      account_user = create(:account_user, account: account)
+      notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+      account_user.update!(custom_role: custom_role)
+
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+        account: account,
+        user: account_user.user
+      )
+      expect(notifier).to have_received(:perform)
+    end
+  end
+
   describe 'audit log' do
     context 'when account user is created' do
       it 'has associated audit log created' do
diff --git a/spec/enterprise/models/channel/twilio_sms_voice_spec.rb b/spec/enterprise/models/channel/twilio_sms_voice_spec.rb
index b2d5dba48..fb768f01b 100644
--- a/spec/enterprise/models/channel/twilio_sms_voice_spec.rb
+++ b/spec/enterprise/models/channel/twilio_sms_voice_spec.rb
@@ -38,6 +38,19 @@ RSpec.describe Channel::TwilioSms do
     end
   end
 
+  describe '#inbound_calls_enabled?' do
+    it 'returns true by default when nothing has been toggled' do
+      channel = create(:channel_twilio_sms, :with_voice, account: account)
+      expect(channel.inbound_calls_enabled?).to be true
+    end
+
+    it 'returns false only when explicitly disabled in provider_config' do
+      channel = create(:channel_twilio_sms, :with_voice, account: account,
+                                                         provider_config: { 'inbound_calls_enabled' => false })
+      expect(channel.inbound_calls_enabled?).to be false
+    end
+  end
+
   describe '#voice_call_webhook_url' do
     it 'returns the webhook URL based on phone number' do
       channel = create(:channel_twilio_sms, :with_voice)
diff --git a/spec/enterprise/models/contact_company_association_spec.rb b/spec/enterprise/models/contact_company_association_spec.rb
index 709893a40..6ed8af4f6 100644
--- a/spec/enterprise/models/contact_company_association_spec.rb
+++ b/spec/enterprise/models/contact_company_association_spec.rb
@@ -67,4 +67,20 @@ RSpec.describe Contact, type: :model do
       end
     end
   end
+
+  describe '#push_event_data' do
+    let(:account) { create(:account) }
+    let(:company) { create(:company, account: account) }
+    let(:contact) { create(:contact, account: account, company: company) }
+
+    it 'includes company_id when companies feature is enabled' do
+      account.enable_features!(:companies)
+
+      expect(contact.push_event_data[:company_id]).to eq(company.id)
+    end
+
+    it 'does not include company_id when companies feature is disabled' do
+      expect(contact.push_event_data).not_to have_key(:company_id)
+    end
+  end
 end
diff --git a/spec/enterprise/models/custom_role_spec.rb b/spec/enterprise/models/custom_role_spec.rb
index f63f3c2dd..553a5a33a 100644
--- a/spec/enterprise/models/custom_role_spec.rb
+++ b/spec/enterprise/models/custom_role_spec.rb
@@ -9,4 +9,38 @@ RSpec.describe CustomRole, type: :model do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:name) }
   end
+
+  describe 'unread filter count invalidation' do
+    it 'notifies assigned users when permissions change' do
+      account = create(:account)
+      custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+      account_user = create(:account_user, account: account, custom_role: custom_role)
+      notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+      custom_role.update!(permissions: ['conversation_manage'])
+
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+        account: account,
+        user: account_user.user
+      )
+      expect(notifier).to have_received(:perform)
+    end
+
+    it 'notifies assigned users when the custom role is destroyed' do
+      account = create(:account)
+      custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+      account_user = create(:account_user, account: account, custom_role: custom_role)
+      notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+      custom_role.destroy!
+
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+        account: account,
+        user: account_user.user
+      )
+      expect(notifier).to have_received(:perform)
+    end
+  end
 end
diff --git a/spec/enterprise/services/contacts/company_association_service_spec.rb b/spec/enterprise/services/contacts/company_association_service_spec.rb
index 78ee739c8..c8c6f6525 100644
--- a/spec/enterprise/services/contacts/company_association_service_spec.rb
+++ b/spec/enterprise/services/contacts/company_association_service_spec.rb
@@ -25,6 +25,7 @@ RSpec.describe Contacts::CompanyAssociationService, type: :service do
         expect(contact.company).to be_present
         expect(contact.company.domain).to eq('acme.com')
         expect(contact.company.name).to eq('Acme')
+        expect(contact.additional_attributes['company_name']).to eq('Acme')
       end
 
       it 'reuses existing company with same domain' do
diff --git a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
index cbb2d6c98..86a93bd8c 100644
--- a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
   end
 
   after do
-    store.clear_account!(account.id)
+    store.clear_all_account!(account.id)
   end
 
   it 'uses base counts for custom roles with conversation_manage permission' do
@@ -26,9 +26,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
 
     result = described_class.new(account: account, user: agent).perform
 
-    expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
-    expect(result[:labels]).to eq(label.id.to_s => 2)
-    expect(result[:teams]).to eq(team.id.to_s => 2)
+    expect(result).to eq(
+      all_count: 2,
+      inboxes: { inbox.id.to_s => 2 },
+      labels: { label.id.to_s => 2 },
+      teams: { team.id.to_s => 2 },
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 2,
+      folders: {}
+    )
     expect(store.assignment_ready?(account.id)).to be(false)
   end
 
@@ -36,13 +43,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']))
     create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
     create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
-    create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+    other_assigned_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+    create(:conversation_participant, account: account, conversation: other_assigned_conversation, user: agent)
 
     result = described_class.new(account: account, user: agent).perform
 
-    expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
-    expect(result[:labels]).to eq(label.id.to_s => 2)
-    expect(result[:teams]).to eq(team.id.to_s => 2)
+    expect(result).to eq(
+      all_count: 2,
+      inboxes: { inbox.id.to_s => 2 },
+      labels: { label.id.to_s => 2 },
+      teams: { team.id.to_s => 2 },
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 2,
+      folders: {}
+    )
     expect(store.assignment_ready?(account.id)).to be(true)
   end
 
@@ -50,12 +65,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_participating_manage']))
     create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
     create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+    participating_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+    create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
 
     result = described_class.new(account: account, user: agent).perform
 
-    expect(result[:inboxes]).to eq(inbox.id.to_s => 1)
-    expect(result[:labels]).to eq(label.id.to_s => 1)
-    expect(result[:teams]).to eq(team.id.to_s => 1)
+    expect(result).to eq(
+      all_count: 1,
+      inboxes: { inbox.id.to_s => 1 },
+      labels: { label.id.to_s => 1 },
+      teams: { team.id.to_s => 1 },
+      mentions_count: 0,
+      participating_count: 1,
+      unattended_count: 1,
+      folders: {}
+    )
     expect(store.assignment_ready?(account.id)).to be(true)
   end
 
@@ -65,7 +89,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
 
     result = described_class.new(account: account, user: agent).perform
 
-    expect(result).to eq(inboxes: {}, labels: {}, teams: {})
+    expect(result).to eq(
+      all_count: 0,
+      inboxes: {},
+      labels: {},
+      teams: {},
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 0,
+      folders: {}
+    )
     expect(store.base_ready?(account.id)).to be(false)
     expect(store.assignment_ready?(account.id)).to be(false)
   end
diff --git a/spec/enterprise/services/onboarding/help_center_article_builder_spec.rb b/spec/enterprise/services/onboarding/help_center_article_builder_spec.rb
index a0aba2f91..c731f9624 100644
--- a/spec/enterprise/services/onboarding/help_center_article_builder_spec.rb
+++ b/spec/enterprise/services/onboarding/help_center_article_builder_spec.rb
@@ -12,7 +12,10 @@ RSpec.describe Onboarding::HelpCenterArticleBuilder do
 
       expect(Firecrawl::Configuration).not_to receive(:client)
       expect { builder.perform }
-        .to raise_error(Onboarding::HelpCenterErrors::ArticleBuildFailed, /no source urls/)
+        .to raise_error(StandardError) { |error|
+          expect(error.class.name).to eq('Onboarding::HelpCenterErrors::ArticleBuildFailed')
+          expect(error.message).to include('no source urls')
+        }
     end
   end
 end
diff --git a/spec/enterprise/services/whatsapp/incoming_call_service_spec.rb b/spec/enterprise/services/whatsapp/incoming_call_service_spec.rb
index 53b8ec52f..4651b5f13 100644
--- a/spec/enterprise/services/whatsapp/incoming_call_service_spec.rb
+++ b/spec/enterprise/services/whatsapp/incoming_call_service_spec.rb
@@ -30,6 +30,20 @@ describe Whatsapp::IncomingCallService do
     end
   end
 
+  context 'when inbound calls are disabled on the channel' do
+    it 'rejects the call with Meta without creating a Call or Conversation' do
+      channel.provider_config = channel.provider_config.merge('inbound_calls_enabled' => false)
+      channel.save!
+      provider_service = instance_double(Whatsapp::Providers::WhatsappCloudService, reject_call: true)
+      allow(inbox.channel).to receive(:provider_service).and_return(provider_service)
+
+      params = call_payload(event: 'connect', session: { sdp: "v=0\r\n...sdp...", sdp_type: 'offer' })
+      expect { described_class.new(inbox: inbox, params: params).perform }
+        .to not_change(Call, :count).and not_change(Conversation, :count)
+      expect(provider_service).to have_received(:reject_call).with(provider_call_id)
+    end
+  end
+
   describe 'inbound connect' do
     let(:sdp_offer) { "v=0\r\n...sdp..." }
     let!(:agent) { create(:user, account: account) }
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 9427e8157..31cbceb6a 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -96,6 +96,67 @@ describe ConversationFinder do
       end
     end
 
+    context 'with unread sort' do
+      let(:params) { { status: 'open', sort_by: 'unread' } }
+
+      it 'returns all conversations matching the selected status with the highest unread count first' do
+        most_unread_conversation = create(:conversation, account: account, inbox: inbox,
+                                                         agent_last_seen_at: 1.hour.ago)
+        unread_conversation = create(:conversation, account: account, inbox: inbox,
+                                                    agent_last_seen_at: 1.hour.ago)
+        read_conversation = create(:conversation, account: account, inbox: inbox,
+                                                  agent_last_seen_at: 1.minute.from_now)
+        resolved_unread_conversation = create(:conversation, account: account, inbox: inbox, status: 'resolved',
+                                                             agent_last_seen_at: 1.hour.ago)
+
+        [most_unread_conversation, unread_conversation, read_conversation, resolved_unread_conversation].each do |conversation|
+          create(:message, account: account, inbox: inbox, conversation: conversation,
+                           message_type: :incoming, created_at: 5.minutes.ago)
+        end
+        create(:message, account: account, inbox: inbox, conversation: most_unread_conversation,
+                         message_type: :incoming, created_at: 4.minutes.ago)
+        resolved_unread_conversation.update!(status: 'resolved')
+        read_conversation.update!(last_activity_at: 1.minute.from_now)
+        unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+
+        result = conversation_finder.perform
+        conversation_ids = result[:conversations].map(&:id)
+
+        expect(conversation_ids).to include(most_unread_conversation.id, unread_conversation.id, read_conversation.id)
+        expect(conversation_ids).not_to include(resolved_unread_conversation.id)
+        expect(conversation_ids.index(most_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+        expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+      end
+
+      it 'includes private incoming messages in unread counts used for ordering' do
+        private_unread_conversation = create(:conversation, account: account, inbox: inbox,
+                                                            agent_last_seen_at: 1.hour.ago)
+        unread_conversation = create(:conversation, account: account, inbox: inbox,
+                                                    agent_last_seen_at: 1.hour.ago)
+        read_conversation = create(:conversation, account: account, inbox: inbox,
+                                                  agent_last_seen_at: 1.minute.from_now)
+
+        2.times do
+          create(:message, account: account, inbox: inbox, conversation: private_unread_conversation,
+                           message_type: :incoming, private: true, created_at: 5.minutes.ago)
+        end
+        create(:message, account: account, inbox: inbox, conversation: unread_conversation,
+                         message_type: :incoming, created_at: 5.minutes.ago)
+        create(:message, account: account, inbox: inbox, conversation: read_conversation,
+                         message_type: :incoming, created_at: 5.minutes.ago)
+        private_unread_conversation.update!(last_activity_at: 10.minutes.ago)
+        unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+        read_conversation.update!(last_activity_at: 1.minute.from_now)
+
+        result = conversation_finder.perform
+        conversation_ids = result[:conversations].map(&:id)
+
+        expect(private_unread_conversation.unread_incoming_messages.count).to eq 2
+        expect(conversation_ids.index(private_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+        expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+      end
+    end
+
     context 'with assignee_type assigned' do
       let(:params) { { assignee_type: 'assigned' } }
 
@@ -147,6 +208,25 @@ describe ConversationFinder do
       end
     end
 
+    context 'with participating conversation type' do
+      let(:params) { { status: 'open', conversation_type: 'participating' } }
+
+      it 'does not return participating conversations from inboxes where the agent is no longer a member' do
+        visible_conversation = create(:conversation, account: account, inbox: inbox)
+        inaccessible_conversation = create(:conversation, account: account, inbox: restricted_inbox)
+        create(:inbox_member, user: user_1, inbox: restricted_inbox)
+        create(:conversation_participant, account: account, conversation: visible_conversation, user: user_1)
+        create(:conversation_participant, account: account, conversation: inaccessible_conversation, user: user_1)
+        InboxMember.find_by!(user: user_1, inbox: restricted_inbox).destroy!
+
+        result = conversation_finder.perform
+        conversation_ids = result[:conversations].map(&:id)
+
+        expect(conversation_ids).to include(visible_conversation.id)
+        expect(conversation_ids).not_to include(inaccessible_conversation.id)
+      end
+    end
+
     context 'without source' do
       let(:params) { {} }
 
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 993399e74..96df64a05 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -1,31 +1,24 @@
 require 'rails_helper'
 
 describe PortalHelper do
-  describe '#generate_portal_bg_color' do
-    context 'when theme is dark' do
-      it 'returns the correct color mix with black' do
-        expect(helper.generate_portal_bg_color('#ff0000', 'dark')).to eq(
-          'color-mix(in srgb, #ff0000 20%, black)'
-        )
-      end
+  describe '#html_lang_attribute' do
+    it 'returns the locale unchanged when it has no region suffix' do
+      expect(helper.html_lang_attribute('en')).to eq('en')
+      expect(helper.html_lang_attribute(:fr)).to eq('fr')
     end
 
-    context 'when theme is not dark' do
-      it 'returns the correct color mix with white' do
-        expect(helper.generate_portal_bg_color('#ff0000', 'light')).to eq(
-          'color-mix(in srgb, #ff0000 20%, white)'
-        )
-      end
+    it 'converts underscores to hyphens for BCP 47 compliance' do
+      expect(helper.html_lang_attribute('pt_BR')).to eq('pt-BR')
+      expect(helper.html_lang_attribute(:zh_CN)).to eq('zh-CN')
+      expect(helper.html_lang_attribute('zh_TW')).to eq('zh-TW')
     end
 
-    context 'when provided with various colors' do
-      it 'adjusts the color mix appropriately' do
-        expect(helper.generate_portal_bg_color('#00ff00', 'dark')).to eq(
-          'color-mix(in srgb, #00ff00 20%, black)'
-        )
-        expect(helper.generate_portal_bg_color('#0000ff', 'light')).to eq(
-          'color-mix(in srgb, #0000ff 20%, white)'
-        )
+    it 'produces a valid BCP 47 lang attribute for every language shown in the UI' do
+      bcp47 = /\A[a-z]{2,3}(-[A-Z]{2})?\z/
+
+      LANGUAGES_CONFIG.each_value do |lang|
+        locale = lang[:iso_639_1_code]
+        expect(helper.html_lang_attribute(locale)).to match(bcp47)
       end
     end
   end
diff --git a/spec/jobs/slack_unfurl_job_spec.rb b/spec/jobs/slack_unfurl_job_spec.rb
index b9be64461..f40efc41d 100644
--- a/spec/jobs/slack_unfurl_job_spec.rb
+++ b/spec/jobs/slack_unfurl_job_spec.rb
@@ -74,8 +74,10 @@ RSpec.describe SlackUnfurlJob do
     end
 
     context 'when another account URL is shared' do
+      let(:another_account) { create(:account) }
+
       before do
-        link_shared[:event][:links][0][:url] = 'https://qa.chatwoot.com/app/accounts/123/conversations/123'
+        link_shared[:event][:links][0][:url] = "https://qa.chatwoot.com/app/accounts/#{another_account.id}/conversations/123"
       end
 
       it 'does not unfurl' do
diff --git a/spec/jobs/user_session_ip_lookup_job_spec.rb b/spec/jobs/user_session_ip_lookup_job_spec.rb
new file mode 100644
index 000000000..8d7d08a33
--- /dev/null
+++ b/spec/jobs/user_session_ip_lookup_job_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+RSpec.describe UserSessionIpLookupJob do
+  let(:user) { create(:user) }
+  let(:session) { user.user_sessions.create!(client_id: 'c', ip_address: '8.8.8.8', last_activity_at: Time.current) }
+  let(:geo_result) { OpenStruct.new(city: 'Mountain View', country: 'United States', country_code: 'US') }
+  let(:ip_lookup) { instance_double(IpLookupService) }
+
+  before { allow(IpLookupService).to receive(:new).and_return(ip_lookup) }
+
+  it 'backfills geo data on the session' do
+    allow(ip_lookup).to receive(:perform).with('8.8.8.8').and_return(geo_result)
+
+    described_class.perform_now(session)
+
+    session.reload
+    expect(session.city).to eq('Mountain View')
+    expect(session.country).to eq('United States')
+    expect(session.country_code).to eq('US')
+  end
+
+  it 'is a no-op when ip_address is blank' do
+    session.update_columns(ip_address: nil) # rubocop:disable Rails/SkipsModelValidations
+
+    described_class.perform_now(session)
+
+    expect(IpLookupService).not_to have_received(:new)
+  end
+
+  it 'leaves the session untouched when lookup returns nil' do
+    allow(ip_lookup).to receive(:perform).and_return(nil)
+
+    described_class.perform_now(session)
+
+    session.reload
+    expect(session.city).to be_nil
+    expect(session.country).to be_nil
+  end
+
+  it 'swallows lookup errors so a flaky geocoder does not poison the queue' do
+    allow(ip_lookup).to receive(:perform).and_raise(StandardError.new('boom'))
+
+    expect { described_class.perform_now(session) }.not_to raise_error
+  end
+end
diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb
new file mode 100644
index 000000000..748e18174
--- /dev/null
+++ b/spec/lib/active_storage/migrator_spec.rb
@@ -0,0 +1,175 @@
+require 'rails_helper'
+require 'fileutils'
+require 'stringio'
+require 'tmpdir'
+
+RSpec.describe ActiveStorage::Migrator do
+  around do |example|
+    original_services = ActiveStorage::Blob.services
+    original_service = ActiveStorage::Blob.service
+
+    example.run
+  ensure
+    ActiveStorage::Blob.services = original_services
+    ActiveStorage::Blob.service = original_service
+  end
+
+  describe '.migrate' do
+    let(:from_service_stub) { instance_double(ActiveStorage::Service, name: 'local') }
+    let(:to_service_stub) { instance_double(ActiveStorage::Service, name: 'amazon') }
+
+    before do
+      allow(ActiveStorage::Service).to receive(:configure).with('local', any_args).and_return(from_service_stub)
+      allow(ActiveStorage::Service).to receive(:configure).with('amazon', any_args).and_return(to_service_stub)
+    end
+
+    context 'when services are configured correctly' do
+      it 'migrates blobs from one service to another' do
+        expect(ActiveStorage::Service).to receive(:configure).with('local', any_args)
+        expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: true)
+        expect { described_class.migrate('local', 'amazon') }.not_to raise_error
+      end
+
+      it 'passes the service-name update flag to blob migration' do
+        expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: false)
+
+        described_class.migrate('local', 'amazon', should_update_service_name: false)
+      end
+
+      it 'does not override the application logger' do
+        allow(described_class).to receive(:migrate_blobs)
+
+        expect(Rails).not_to receive(:logger=)
+
+        described_class.migrate('local', 'amazon')
+      end
+    end
+
+    context 'when services are not configured correctly' do
+      it 'prints an error message' do
+        allow(ActiveStorage::Service).to receive(:configure).and_return(nil)
+        expect do
+          described_class.migrate('random', 'random')
+        end.to raise_error(RuntimeError, "Error: The services 'random' or 'random' are not configured correctly.")
+      end
+    end
+  end
+
+  describe '.migrate_blobs' do
+    let(:from_root) { Dir.mktmpdir('active-storage-local') }
+    let(:to_root) { Dir.mktmpdir('active-storage-amazon') }
+    let(:other_root) { Dir.mktmpdir('active-storage-other') }
+    let(:from_service) { build_disk_service('local', from_root) }
+    let(:to_service) { build_disk_service('amazon', to_root) }
+    let(:other_service) { build_disk_service('other', other_root) }
+
+    before do
+      allow(described_class).to receive(:configure_service).with(:amazon).and_return(to_service)
+    end
+
+    around do |example|
+      original_services = ActiveStorage::Blob.services
+      original_service = ActiveStorage::Blob.service
+
+      ActiveStorage::Blob.services = {
+        'local' => from_service,
+        'amazon' => to_service,
+        'other' => other_service
+      }
+      ActiveStorage::Blob.service = from_service
+
+      example.run
+    ensure
+      ActiveStorage::Blob.services = original_services
+      ActiveStorage::Blob.service = original_service
+      FileUtils.rm_rf([from_root, to_root, other_root])
+    end
+
+    it 'uploads non-image blobs and updates their service name' do
+      blob = create_blob(service_name: 'local', filename: 'invoice.pdf', content_type: 'application/pdf', content: 'pdf-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+      expect(blob).not_to be_image
+      expect(blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(blob.key)).to eq('pdf-content')
+    end
+
+    it 'only migrates blobs from the source service' do
+      local_blob = create_blob(service_name: 'local', filename: 'audio.mp3', content_type: 'audio/mpeg', content: 'audio-content')
+      other_blob = create_blob(service_name: 'other', filename: 'other.pdf', content_type: 'application/pdf', content: 'other-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+      expect(local_blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(local_blob.key)).to eq('audio-content')
+      expect(other_blob.reload.service_name).to eq('other')
+      expect(to_service.exist?(other_blob.key)).to be(false)
+      expect(other_service.download(other_blob.key)).to eq('other-content')
+    end
+
+    it 'skips missing source files and continues migration' do
+      missing_blob = create_blob(service_name: 'local', filename: 'missing.pdf', content_type: 'application/pdf', content: 'missing-content')
+      existing_blob = create_blob(service_name: 'local', filename: 'existing.pdf', content_type: 'application/pdf', content: 'existing-content')
+
+      from_service.delete(missing_blob.key)
+
+      expect do
+        described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+      end.not_to raise_error
+
+      expect(missing_blob.reload.service_name).to eq('local')
+      expect(to_service.exist?(missing_blob.key)).to be(false)
+      expect(existing_blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(existing_blob.key)).to eq('existing-content')
+    end
+
+    it 'does not update the blob service when upload fails' do
+      blob = create_blob(service_name: 'local', filename: 'report.pdf', content_type: 'application/pdf', content: 'report-content')
+
+      allow(to_service).to receive(:upload).and_raise(ActiveStorage::IntegrityError)
+
+      expect do
+        described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+      end.to raise_error(ActiveStorage::IntegrityError)
+
+      expect(blob.reload.service_name).to eq('local')
+      expect(to_service.exist?(blob.key)).to be(false)
+    end
+
+    it 'skips the blob service update when the flag is disabled' do
+      blob = create_blob(service_name: 'local', filename: 'manual.pdf', content_type: 'application/pdf', content: 'manual-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: false)
+
+      expect(blob.reload.service_name).to eq('local')
+      expect(to_service.download(blob.key)).to eq('manual-content')
+    end
+
+    it 'does not rewrite blobs that were already migrated' do
+      blob = create_blob(service_name: 'local', filename: 'archive.pdf', content_type: 'application/pdf', content: 'archive-content')
+
+      allow(to_service).to receive(:upload).and_call_original
+
+      2.times { described_class.migrate_blobs(:local, :amazon, should_update_service_name: true) }
+
+      expect(to_service).to have_received(:upload).with(blob.key, an_instance_of(Tempfile), checksum: blob.checksum).once
+      expect(blob.reload.service_name).to eq('amazon')
+      expect(ActiveStorage::Blob.where(id: blob.id, service_name: 'local')).to be_empty
+    end
+
+    def build_disk_service(service_name, root)
+      ActiveStorage::Service.configure(service_name, { service_name => { service: 'Disk', root: root } })
+    end
+
+    def create_blob(service_name:, filename:, content_type:, content:)
+      ActiveStorage::Blob.create_and_upload!(
+        io: StringIO.new(content),
+        filename: filename,
+        content_type: content_type,
+        service_name: service_name,
+        identify: false
+      )
+    end
+  end
+end
diff --git a/spec/lib/tasks/rake/task_storage_migrations_spec.rb b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
new file mode 100644
index 000000000..552c814b3
--- /dev/null
+++ b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
@@ -0,0 +1,64 @@
+require 'rake'
+require 'rails_helper'
+
+RSpec.describe Rake::Task do
+  describe 'storage_migrations' do
+    describe 'rake task' do
+      subject(:task) { described_class['storage:migrate'] }
+
+      before do
+        task.reenable
+      end
+
+      context 'when FROM argument is missing' do
+        it 'raises an error' do
+          with_modified_env FROM: nil, TO: 'amazon' do
+            expect do
+              task.invoke
+            end.to raise_error(RuntimeError,
+                               'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+          end
+        end
+      end
+
+      context 'when TO argument is missing' do
+        it 'raises an error' do
+          with_modified_env FROM: 'service_name', TO: nil do
+            expect do
+              task.invoke
+            end.to raise_error(RuntimeError,
+                               'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+          end
+        end
+      end
+
+      context 'when required arguments are present' do
+        it 'updates blob service names by default' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: true)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+            task.invoke
+          end
+        end
+
+        it 'skips updating blob service names when disabled' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: false)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: 'false' do
+            task.invoke
+          end
+        end
+
+        it 'can be invoked again after the task is re-enabled' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).twice.with(:local, :amazon, should_update_service_name: true)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+            task.invoke
+            task.reenable
+            task.invoke
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index cdb9a93cb..7a774dbd5 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -294,5 +294,19 @@ describe ActionCableListener do
 
       listener.conversation_unread_count_changed(event)
     end
+
+    it 'supports user-scoped unread count refresh events' do
+      event = Events::Base.new(event_name, Time.zone.now, account: account, user: agent)
+
+      expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+        a_collection_containing_exactly(agent.pubsub_token),
+        'conversation.unread_count_changed',
+        {
+          account_id: account.id
+        }
+      )
+
+      listener.conversation_unread_count_changed(event)
+    end
   end
 end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 38ca9694a..d77a16fdb 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -53,38 +53,79 @@ RSpec.describe Account do
   describe 'conversation unread counts feature flag' do
     let(:account) { create(:account) }
     let(:inbox) { create(:inbox, account: account) }
+    let(:user) { create(:user) }
     let(:store) { Conversations::UnreadCounts::Store }
     let(:inbox_key) { store.inbox_key(account.id, inbox.id) }
-
-    after do
-      store.clear_account!(account.id)
+    let(:filter_keys) do
+      [
+        store.user_mentions_key(account.id, user.id),
+        store.user_participating_key(account.id, user.id),
+        store.user_unattended_key(account.id, user.id),
+        store.user_folder_key(account.id, user.id, 1)
+      ]
     end
 
-    it 'clears unread count cache when the feature is enabled' do
+    after do
+      store.clear_all_account!(account.id)
+    end
+
+    it 'clears all unread count cache when the feature is enabled' do
       build_unread_count_cache
 
       account.enable_features!(:conversation_unread_counts)
 
-      expect(store.base_ready?(account.id)).to be(false)
-      expect(store.assignment_ready?(account.id)).to be(false)
-      expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+      expect_unread_count_cache_cleared
     end
 
-    it 'clears unread count cache when the feature is disabled' do
+    it 'clears all unread count cache when the feature is disabled' do
       account.enable_features!(:conversation_unread_counts)
       build_unread_count_cache
 
       account.disable_features!(:conversation_unread_counts)
 
-      expect(store.base_ready?(account.id)).to be(false)
-      expect(store.assignment_ready?(account.id)).to be(false)
-      expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+      expect_unread_count_cache_cleared
+    end
+
+    it 'clears all unread count cache when account cache keys are reset' do
+      build_unread_count_cache
+
+      account.reset_cache_keys
+
+      expect_unread_count_cache_cleared
+    end
+
+    def expect_unread_count_cache_cleared
+      expect(unread_count_ready_markers).to all(be(false))
+      expect(store.counts_for_keys(unread_count_keys).values).to all(eq(0))
+    end
+
+    def unread_count_ready_markers
+      [
+        store.base_ready?(account.id),
+        store.assignment_ready?(account.id),
+        store.filters_ready?(account.id, user.id)
+      ]
+    end
+
+    def unread_count_keys
+      [inbox_key] + filter_keys
     end
 
     def build_unread_count_cache
       store.mark_base_ready!(account.id)
       store.mark_assignment_ready!(account.id)
+      store.mark_filters_ready!(account.id, user.id)
       store.add_base_membership(account_id: account.id, inbox_id: inbox.id, label_ids: [], conversation_id: 1)
+      store.add_filter_memberships(
+        account_id: account.id,
+        user_id: user.id,
+        filters: {
+          mentions: [1],
+          participating: [2],
+          unattended: [3]
+        },
+        folders: { 1 => [4] }
+      )
     end
   end
 
diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb
index e5a560fe9..7acfc19cd 100644
--- a/spec/models/account_user_spec.rb
+++ b/spec/models/account_user_spec.rb
@@ -42,4 +42,32 @@ RSpec.describe AccountUser do
       expect(user.assigned_conversations.count).to eq(0)
     end
   end
+
+  describe 'unread filter count invalidation' do
+    let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+    before do
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+    end
+
+    it 'notifies when the account role changes' do
+      account_user.update!(role: :administrator)
+
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+        account: account_user.account,
+        user: account_user.user
+      )
+      expect(notifier).to have_received(:perform)
+    end
+
+    it 'notifies when account access is removed' do
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(
+        account: account_user.account,
+        user: account_user.user
+      ).and_return(notifier)
+      expect(notifier).to receive(:perform)
+
+      account_user.destroy!
+    end
+  end
 end
diff --git a/spec/models/channel/whatsapp_spec.rb b/spec/models/channel/whatsapp_spec.rb
index 95bc83932..cd4fa3a21 100644
--- a/spec/models/channel/whatsapp_spec.rb
+++ b/spec/models/channel/whatsapp_spec.rb
@@ -248,4 +248,22 @@ RSpec.describe Channel::Whatsapp do
       expect(channel.voice_enabled?).to be false
     end
   end
+
+  describe '#inbound_calls_enabled?' do
+    let(:account) { create(:account) }
+
+    it 'returns true by default when nothing has been toggled' do
+      channel = create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud',
+                                          validate_provider_config: false, sync_templates: false)
+      expect(channel.inbound_calls_enabled?).to be true
+    end
+
+    it 'returns false only when explicitly disabled in provider_config' do
+      channel = create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud',
+                                          validate_provider_config: false, sync_templates: false)
+      channel.update!(provider_config: channel.provider_config.merge('inbound_calls_enabled' => false))
+
+      expect(channel.inbound_calls_enabled?).to be false
+    end
+  end
 end
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index b081c546c..df569c695 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -18,4 +18,30 @@ RSpec.describe InboxMember do
       end
     end
   end
+
+  describe 'unread filter count invalidation' do
+    let(:account) { create(:account) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:user) { create(:user, account: account, role: :agent) }
+    let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+    before do
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+    end
+
+    it 'notifies when inbox access is added' do
+      create(:inbox_member, inbox: inbox, user: user)
+
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(account: account, user: user)
+      expect(notifier).to have_received(:perform)
+    end
+
+    it 'notifies when inbox access is removed' do
+      inbox_member = create(:inbox_member, inbox: inbox, user: user)
+      expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(account: account, user: user).and_return(notifier)
+      expect(notifier).to receive(:perform)
+
+      inbox_member.destroy!
+    end
+  end
 end
diff --git a/spec/models/integrations/app_spec.rb b/spec/models/integrations/app_spec.rb
index f9e7c7532..46ae56632 100644
--- a/spec/models/integrations/app_spec.rb
+++ b/spec/models/integrations/app_spec.rb
@@ -23,6 +23,24 @@ RSpec.describe Integrations::App do
     end
   end
 
+  describe '#visible_properties' do
+    context 'when the app has visible properties' do
+      let(:app_name) { 'dialogflow' }
+
+      it 'returns the configured property names as strings' do
+        expect(app.visible_properties).to contain_exactly('project_id', 'region', 'language_code')
+      end
+    end
+
+    context 'when the app has no visible properties configured' do
+      let(:app_name) { 'webhook' }
+
+      it 'defaults to an empty list' do
+        expect(app.visible_properties).to eq([])
+      end
+    end
+  end
+
   describe '#action' do
     let(:app_name) { 'slack' }
 
@@ -32,12 +50,13 @@ RSpec.describe Integrations::App do
 
     context 'when the app is slack' do
       it 'returns the action URL with client_id and redirect_uri' do
-        with_modified_env SLACK_CLIENT_ID: 'dummy_client_id' do
-          expect(app.action).to include('client_id=dummy_client_id')
-          expect(app.action).to include(
-            "/app/accounts/#{account.id}/settings/integrations/slack"
-          )
-        end
+        allow(GlobalConfigService).to receive(:load).and_call_original
+        allow(GlobalConfigService).to receive(:load).with('SLACK_CLIENT_ID', nil).and_return('dummy_client_id')
+
+        expect(app.action).to include('client_id=dummy_client_id')
+        expect(app.action).to include(
+          "/app/accounts/#{account.id}/settings/integrations/slack"
+        )
       end
     end
   end
@@ -47,9 +66,9 @@ RSpec.describe Integrations::App do
 
     context 'when the app is slack' do
       it 'returns true if SLACK_CLIENT_SECRET is present' do
-        with_modified_env SLACK_CLIENT_SECRET: 'random_secret' do
-          expect(app.active?(account)).to be true
-        end
+        allow(GlobalConfigService).to receive(:load).with('SLACK_CLIENT_SECRET', nil).and_return('random_secret')
+
+        expect(app.active?(account)).to be true
       end
     end
 
diff --git a/spec/models/user_session_spec.rb b/spec/models/user_session_spec.rb
new file mode 100644
index 000000000..0c8fa6cf1
--- /dev/null
+++ b/spec/models/user_session_spec.rb
@@ -0,0 +1,61 @@
+require 'rails_helper'
+
+RSpec.describe UserSession do
+  let(:user) { create(:user) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe 'validations' do
+    subject { described_class.new(user: user, client_id: 'abc') }
+
+    it { is_expected.to validate_presence_of(:client_id) }
+
+    it 'validates uniqueness of client_id scoped to user_id' do
+      described_class.create!(user: user, client_id: 'abc', last_activity_at: Time.current)
+
+      duplicate = described_class.new(user: user, client_id: 'abc')
+      expect(duplicate).not_to be_valid
+      expect(duplicate.errors[:client_id]).to be_present
+    end
+
+    it 'allows the same client_id for different users' do
+      other = create(:user)
+      described_class.create!(user: user, client_id: 'abc', last_activity_at: Time.current)
+
+      expect(described_class.new(user: other, client_id: 'abc', last_activity_at: Time.current)).to be_valid
+    end
+  end
+
+  describe '#current?' do
+    let(:session) { described_class.create!(user: user, client_id: 'abc', last_activity_at: Time.current) }
+
+    it 'returns true when client_id matches' do
+      expect(session.current?('abc')).to be true
+    end
+
+    it 'returns false when client_id differs' do
+      expect(session.current?('xyz')).to be false
+    end
+  end
+
+  describe '#should_update_activity?' do
+    let(:session) { described_class.new(user: user, client_id: 'abc') }
+
+    it 'returns true when last_activity_at is nil' do
+      session.last_activity_at = nil
+      expect(session.should_update_activity?).to be true
+    end
+
+    it 'returns true when last_activity_at is older than the throttle window' do
+      session.last_activity_at = 10.minutes.ago
+      expect(session.should_update_activity?).to be true
+    end
+
+    it 'returns false when last_activity_at is within the throttle window' do
+      session.last_activity_at = 1.minute.ago
+      expect(session.should_update_activity?).to be false
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d263708af..fc7a8953b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -254,4 +254,37 @@ RSpec.describe User do
       end
     end
   end
+
+  describe 'sync_user_sessions callback' do
+    let(:user_with_tokens) do
+      u = create(:user)
+      u.tokens = {
+        'client-a' => { 'token' => 'x', 'expiry' => 1.month.from_now.to_i },
+        'client-b' => { 'token' => 'x', 'expiry' => 1.month.from_now.to_i }
+      }
+      u.save!
+      u.user_sessions.create!(client_id: 'client-a', last_activity_at: Time.current)
+      u.user_sessions.create!(client_id: 'client-b', last_activity_at: Time.current)
+      u
+    end
+
+    it 'destroys user_sessions whose client_id is no longer in tokens' do
+      user_with_tokens.tokens = user_with_tokens.tokens.except('client-a')
+
+      expect { user_with_tokens.save! }.to change(user_with_tokens.user_sessions, :count).by(-1)
+      expect(user_with_tokens.user_sessions.pluck(:client_id)).to eq(['client-b'])
+    end
+
+    it 'leaves user_sessions alone when tokens did not change' do
+      user_with_tokens.update!(name: 'New Name')
+
+      expect(user_with_tokens.user_sessions.count).to eq(2)
+    end
+
+    it 'destroys all user_sessions when tokens is cleared' do
+      user_with_tokens.tokens = {}
+
+      expect { user_with_tokens.save! }.to change(user_with_tokens.user_sessions, :count).by(-2)
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e83db4046..984cd045f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -7,6 +7,10 @@ require 'rspec/rails'
 require 'pundit/rspec'
 require 'sidekiq/testing'
 
+# Load Rake tasks
+require 'rake'
+Rails.application.load_tasks
+
 # test-prof helpers for tests optimization
 require 'test_prof/recipes/rspec/before_all'
 require 'test_prof/recipes/rspec/let_it_be'
diff --git a/spec/requests/api/v1/profile/sessions_controller_spec.rb b/spec/requests/api/v1/profile/sessions_controller_spec.rb
new file mode 100644
index 000000000..239fa8e83
--- /dev/null
+++ b/spec/requests/api/v1/profile/sessions_controller_spec.rb
@@ -0,0 +1,101 @@
+require 'rails_helper'
+
+RSpec.describe 'Profile Sessions API', type: :request do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:auth_headers) { user.create_new_auth_token }
+  let(:current_client_id) { auth_headers['client'] }
+
+  describe 'GET /api/v1/profile/sessions' do
+    it 'returns 401 without auth' do
+      get '/api/v1/profile/sessions', as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'returns the current user sessions ordered by last_activity_at desc' do
+      older = user.user_sessions.create!(client_id: current_client_id, browser_name: 'Chrome', last_activity_at: 2.days.ago)
+      newer = user.user_sessions.create!(client_id: 'other-client', browser_name: 'Firefox', last_activity_at: 1.hour.ago)
+      user.update!(tokens: user.tokens.merge('other-client' => { 'token' => 'x', 'expiry' => 1.month.from_now.to_i }))
+
+      get '/api/v1/profile/sessions', headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:success)
+      sessions = response.parsed_body
+      expect(sessions.map { |s| s['id'] }).to eq([newer.id, older.id])
+      expect(sessions.find { |s| s['id'] == older.id }['current']).to be true
+      expect(sessions.find { |s| s['id'] == newer.id }['current']).to be false
+    end
+
+    it 'excludes sessions whose token has expired' do
+      live = user.user_sessions.create!(client_id: current_client_id, last_activity_at: 1.hour.ago)
+      expired = user.user_sessions.create!(client_id: 'expired-client', last_activity_at: 1.day.ago)
+      user.update!(tokens: user.tokens.merge('expired-client' => { 'token' => 'x', 'expiry' => 1.day.ago.to_i }))
+
+      get '/api/v1/profile/sessions', headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:success)
+      ids = response.parsed_body.map { |s| s['id'] }
+      expect(ids).to include(live.id)
+      expect(ids).not_to include(expired.id)
+    end
+
+    it 'returns an empty array when no sessions exist' do
+      get '/api/v1/profile/sessions', headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:success)
+      expect(response.parsed_body).to eq([])
+    end
+  end
+
+  describe 'DELETE /api/v1/profile/sessions/:id' do
+    let!(:other_session) { user.user_sessions.create!(client_id: 'other-client', last_activity_at: 1.hour.ago) }
+
+    before do
+      # Seed tokens hash so revoke can clean it up
+      user.tokens = user.tokens.merge('other-client' => { 'token' => 'x', 'expiry' => 1.month.from_now.to_i })
+      user.save!
+    end
+
+    it 'destroys the session and removes its token entry' do
+      expect do
+        delete "/api/v1/profile/sessions/#{other_session.id}", headers: auth_headers, as: :json
+      end.to change(user.user_sessions, :count).by(-1)
+
+      expect(response).to have_http_status(:ok)
+      expect(user.reload.tokens.keys).not_to include('other-client')
+    end
+
+    it 'returns 422 when trying to revoke the current session' do
+      current = user.user_sessions.create!(client_id: current_client_id, last_activity_at: Time.current)
+
+      delete "/api/v1/profile/sessions/#{current.id}", headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.parsed_body['error']).to be_present
+      expect(user.user_sessions.exists?(id: current.id)).to be true
+    end
+
+    it 'returns 404 for a nonexistent session id' do
+      delete '/api/v1/profile/sessions/9999999', headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it 'does not allow revoking another user' do
+      other_user = create(:user, account: account)
+      foreign = other_user.user_sessions.create!(client_id: 'foreign', last_activity_at: 1.hour.ago)
+
+      delete "/api/v1/profile/sessions/#{foreign.id}", headers: auth_headers, as: :json
+
+      expect(response).to have_http_status(:not_found)
+      expect(other_user.user_sessions.exists?(id: foreign.id)).to be true
+    end
+
+    it 'returns 401 without auth' do
+      delete "/api/v1/profile/sessions/#{other_session.id}", as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+  end
+end
diff --git a/spec/services/conversations/delete_service_spec.rb b/spec/services/conversations/delete_service_spec.rb
new file mode 100644
index 000000000..2ff14db49
--- /dev/null
+++ b/spec/services/conversations/delete_service_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::DeleteService do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:ip) { '127.0.0.1' }
+  let(:service) { described_class.new(conversation: conversation, user: user, ip: ip) }
+
+  context 'when deleting an email conversation' do
+    let(:inbox) { create(:channel_email, :imap_email, account: account).inbox }
+    let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+    let!(:incoming_message) { create(:message, account: account, inbox: inbox, conversation: conversation, source_id: 'incoming@example.com') }
+    let(:deleted_message_tracker) { instance_double(Imap::DeletedMessageTracker, record: true) }
+
+    before do
+      allow(Imap::DeletedMessageTracker).to receive(:new).with(inbox: inbox).and_return(deleted_message_tracker)
+    end
+
+    it 'records incoming message source ids and enqueues the deletion job' do
+      expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+
+      expect(deleted_message_tracker).to have_received(:record).with([incoming_message.source_id])
+    end
+  end
+
+  context 'when deleting a non-email conversation' do
+    let(:conversation) { create(:conversation, account: account) }
+
+    it 'enqueues the deletion job without recording message source ids' do
+      expect(Imap::DeletedMessageTracker).not_to receive(:new)
+
+      expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+    end
+  end
+end
diff --git a/spec/services/conversations/unread_counts/builder_spec.rb b/spec/services/conversations/unread_counts/builder_spec.rb
index 4b3aec230..fe1bdb6fa 100644
--- a/spec/services/conversations/unread_counts/builder_spec.rb
+++ b/spec/services/conversations/unread_counts/builder_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::UnreadCounts::Builder do
   let(:store) { Conversations::UnreadCounts::Store }
 
   after do
-    store.clear_account!(account.id)
+    store.clear_all_account!(account.id)
   end
 
   describe '#build_base!' do
@@ -75,6 +75,173 @@ RSpec.describe Conversations::UnreadCounts::Builder do
     end
   end
 
+  describe '#build_filters_for!' do
+    before do
+      create(:inbox_member, user: assignee, inbox: inbox)
+    end
+
+    it 'stores unread open conversations by mentions and participating dimensions' do
+      mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+      participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+      resolved_mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+      inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+      resolved_mentioned_conversation.update!(status: :resolved)
+
+      create(:mention, account: account, conversation: mentioned_conversation, user: assignee)
+      create(:mention, account: account, conversation: resolved_mentioned_conversation, user: assignee)
+      create(:mention, account: account, conversation: inaccessible_conversation, user: assignee)
+      create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+      expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to contain_exactly(mentioned_conversation.id.to_s)
+      expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to contain_exactly(participating_conversation.id.to_s)
+    end
+
+    it 'excludes participating conversations that are no longer visible to the user' do
+      participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+      create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+      InboxMember.find_by!(user: assignee, inbox: inbox).destroy!
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to be_empty
+    end
+
+    it 'stores visible unread open unattended conversations' do
+      no_first_reply_conversation = create_unread_conversation(account: account, inbox: inbox)
+      waiting_conversation = create_unread_conversation(account: account, inbox: inbox)
+      attended_conversation = create_unread_conversation(account: account, inbox: inbox)
+      inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+      resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+      create_read_conversation
+
+      waiting_conversation.update!(first_reply_created_at: 5.minutes.ago)
+      attended_conversation.update!(first_reply_created_at: 5.minutes.ago, waiting_since: nil)
+      inaccessible_conversation.update!(first_reply_created_at: nil)
+      resolved_conversation.update!(status: :resolved)
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(redis_set_members(store.user_unattended_key(account.id, assignee.id))).to contain_exactly(
+        no_first_reply_conversation.id.to_s,
+        waiting_conversation.id.to_s
+      )
+    end
+
+    it 'stores folder memberships using the saved filter status conditions' do
+      resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+      resolved_conversation.update!(status: :resolved)
+      create_unread_conversation(account: account, inbox: inbox, assignee: assignee)
+      custom_filter = create(
+        :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['resolved'])
+      )
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+    end
+
+    it 'loads folder filters after taking the invalidation version snapshot' do
+      create_unread_conversation(account: account, inbox: inbox)
+      resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+      resolved_conversation.update!(status: :resolved)
+      custom_filter = create(
+        :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['open'])
+      )
+      notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+      allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+      filter_updated = false
+      allow(store).to receive(:filter_version_snapshot).and_wrap_original do |method, *args|
+        method.call(*args).tap do
+          next if filter_updated
+
+          filter_updated = true
+          custom_filter.update!(query: filter_query('status', ['resolved']))
+        end
+      end
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+    end
+
+    it 'expires relative-date folder caches at the next date boundary' do
+      create(
+        :custom_filter,
+        account: account,
+        user: assignee,
+        filter_type: :conversation,
+        query: filter_query('created_at', [7], filter_operator: 'days_before')
+      )
+      allow(store).to receive(:mark_filters_ready_if_current!).and_call_original
+      expected_ttl = nil
+
+      travel_to Time.zone.local(2026, 1, 1, 9, 30, 0) do
+        expected_ttl = (Time.zone.tomorrow.beginning_of_day - Time.current).ceil
+        described_class.new(account).build_filters_for!(assignee)
+      end
+
+      expect(store).to have_received(:mark_filters_ready_if_current!).with(
+        account.id,
+        assignee.id,
+        version_snapshot: kind_of(Hash),
+        expires_in: expected_ttl
+      )
+    end
+
+    it 'does not mark filters ready when user filters are invalidated during the build' do
+      conversation = create_unread_conversation(account: account, inbox: inbox)
+      create(:mention, account: account, conversation: conversation, user: assignee)
+      clear_user_filters_after_membership_write
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+      expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+    end
+
+    it 'does not mark filters ready when account filters are invalidated during the build' do
+      conversation = create_unread_conversation(account: account, inbox: inbox)
+      create(:mention, account: account, conversation: conversation, user: assignee)
+      clear_filter_caches_after_membership_write
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+      expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+    end
+
+    it 'skips invalid folder filters and still marks the user filter cache ready' do
+      create_unread_conversation(account: account, inbox: inbox)
+      invalid_filter = create(
+        :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('missing_attribute', ['open'])
+      )
+
+      described_class.new(account).build_filters_for!(assignee)
+
+      expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+      expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+    end
+
+    it 'skips folder filters that fail when the SQL query is executed' do
+      conversation = create_unread_conversation(account: account, inbox: inbox)
+      invalid_filter = create(
+        :custom_filter,
+        account: account,
+        user: assignee,
+        filter_type: :conversation,
+        query: filter_query('display_id', [conversation.display_id.to_s], filter_operator: 'contains')
+      )
+
+      expect { described_class.new(account).build_filters_for!(assignee) }.not_to raise_error
+
+      expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+      expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+    end
+  end
+
   def create_read_conversation
     conversation = create(:conversation, account: account, inbox: inbox, agent_last_seen_at: 1.minute.from_now)
     create(:message, account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
@@ -90,4 +257,32 @@ RSpec.describe Conversations::UnreadCounts::Builder do
   def redis_set_members(key)
     Redis::Alfred.pipelined { |pipeline| pipeline.smembers(key) }.first
   end
+
+  def clear_user_filters_after_membership_write
+    allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+      method.call(*args, **kwargs)
+      store.clear_user_filters!(account.id, assignee.id)
+    end
+  end
+
+  def clear_filter_caches_after_membership_write
+    allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+      method.call(*args, **kwargs)
+      store.clear_filter_caches!(account.id)
+    end
+  end
+
+  def filter_query(attribute_key, values, filter_operator: 'equal_to')
+    {
+      payload: [
+        {
+          attribute_key: attribute_key,
+          filter_operator: filter_operator,
+          values: values,
+          query_operator: nil,
+          custom_attribute_type: ''
+        }
+      ]
+    }
+  end
 end
diff --git a/spec/services/conversations/unread_counts/counter_spec.rb b/spec/services/conversations/unread_counts/counter_spec.rb
index bfd10436e..c3c338355 100644
--- a/spec/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/services/conversations/unread_counts/counter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
   end
 
   after do
-    store.clear_account!(account.id)
+    store.clear_all_account!(account.id)
   end
 
   it 'builds the base cache on demand' do
@@ -32,6 +32,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     lock_key = "UNREAD_CONVERSATIONS::V1::ACCOUNT::#{account.id}::BUILD_LOCK::BASE"
     lock_manager = instance_double(Redis::LockManager)
     allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
+    allow(lock_manager).to receive(:with_lock).and_yield.and_return(true)
     allow(lock_manager).to receive(:with_lock).with(lock_key, described_class::BUILD_LOCK_TTL).and_yield.and_return(true)
 
     create_unread_conversation(account: account, inbox: visible_inbox, labels: [label.title], team: visible_team)
@@ -46,13 +47,33 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     counter = described_class.new(account: account, user: agent)
 
     allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
-    allow(counter).to receive(:wait_for_cache_ready) { store.mark_base_ready!(account.id) }
+    allow(counter).to receive(:wait_for_cache_ready) do
+      store.mark_base_ready!(account.id)
+      store.mark_filters_ready!(account.id, agent.id)
+    end
     expect(Conversations::UnreadCounts::Builder).not_to receive(:new)
 
     counter.perform
 
     expect(counter).to have_received(:wait_for_cache_ready)
     expect(store.base_ready?(account.id)).to be(true)
+    expect(store.filters_ready?(account.id, agent.id)).to be(true)
+  end
+
+  it 'retries when a build finishes without marking the cache ready' do
+    builder = instance_double(Conversations::UnreadCounts::Builder)
+    attempts = 0
+    allow(Conversations::UnreadCounts::Builder).to receive(:new).and_return(builder)
+    allow(builder).to receive(:build_base!) do
+      attempts += 1
+      store.mark_base_ready!(account.id) if attempts == 2
+    end
+    allow(builder).to receive(:build_filters_for!) { store.mark_filters_ready!(account.id, agent.id) }
+
+    described_class.new(account: account, user: agent).perform
+
+    expect(builder).to have_received(:build_base!).twice
+    expect(store.base_ready?(account.id)).to be(true)
   end
 
   it 'counts unread conversations only across inboxes visible to a normal agent' do
@@ -62,9 +83,14 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     result = described_class.new(account: account, user: agent).perform
 
     expect(result).to eq(
+      all_count: 1,
       inboxes: { visible_inbox.id.to_s => 1 },
       labels: { label.id.to_s => 1 },
-      teams: { visible_team.id.to_s => 1 }
+      teams: { visible_team.id.to_s => 1 },
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 1,
+      folders: {}
     )
   end
 
@@ -75,9 +101,14 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     result = described_class.new(account: account, user: admin).perform
 
     expect(result).to eq(
+      all_count: 2,
       inboxes: { visible_inbox.id.to_s => 1, hidden_inbox.id.to_s => 1 },
       labels: { label.id.to_s => 2 },
-      teams: { visible_team.id.to_s => 2 }
+      teams: { visible_team.id.to_s => 2 },
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 2,
+      folders: {}
     )
   end
 
@@ -87,9 +118,49 @@ RSpec.describe Conversations::UnreadCounts::Counter do
     result = described_class.new(account: account, user: agent).perform
 
     expect(result).to eq(
+      all_count: 1,
       inboxes: { visible_inbox.id.to_s => 1 },
       labels: {},
-      teams: { visible_team.id.to_s => 1 }
+      teams: { visible_team.id.to_s => 1 },
+      mentions_count: 0,
+      participating_count: 0,
+      unattended_count: 1,
+      folders: {}
     )
   end
+
+  it 'returns mention, participating, unattended, and valid folder unread counts for the user' do
+    mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+    participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+    resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+    resolved_conversation.update!(status: :resolved)
+    valid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('status', ['resolved']))
+    invalid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('unknown', ['open']))
+
+    create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+    create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+    result = described_class.new(account: account, user: agent).perform
+
+    expect(result[:mentions_count]).to eq(1)
+    expect(result[:participating_count]).to eq(1)
+    expect(result[:unattended_count]).to eq(2)
+    expect(result[:folders]).to eq(valid_folder.id.to_s => 1)
+    expect(result[:folders]).not_to have_key(invalid_folder.id.to_s)
+    expect(store.filters_ready?(account.id, agent.id)).to be(true)
+  end
+
+  def filter_query(attribute_key, values)
+    {
+      payload: [
+        {
+          attribute_key: attribute_key,
+          filter_operator: 'equal_to',
+          values: values,
+          query_operator: nil,
+          custom_attribute_type: ''
+        }
+      ]
+    }
+  end
 end
diff --git a/spec/services/conversations/unread_counts/listener_spec.rb b/spec/services/conversations/unread_counts/listener_spec.rb
index fbb0a0835..0cf31bd3c 100644
--- a/spec/services/conversations/unread_counts/listener_spec.rb
+++ b/spec/services/conversations/unread_counts/listener_spec.rb
@@ -21,13 +21,22 @@ RSpec.describe Conversations::UnreadCounts::Listener do
     expect(notifier).to have_received(:perform)
   end
 
-  it 'ignores outgoing message creation' do
+  it 'clears user filter counts when a non-incoming message updates last activity' do
+    account.enable_features!(:conversation_unread_counts)
     message = create(:message, account: account, inbox: conversation.inbox, conversation: conversation, message_type: :outgoing)
     event = Events::Base.new('message.created', Time.zone.now, message: message)
+    allow(store).to receive(:clear_filter_caches!).and_return(true)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
 
     listener.message_created(event)
 
     expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+    expect(store).to have_received(:clear_filter_caches!).with(account.id)
+    expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+      'conversation.unread_count_changed',
+      kind_of(Time),
+      conversation: conversation
+    )
   end
 
   it 'ignores incoming message creation when conversation unread counts are disabled' do
@@ -52,6 +61,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
   end
 
   it 'refreshes unread counts when labels change' do
+    account.enable_features!(:conversation_unread_counts)
     changed_attributes = { label_list: [%w[old], %w[new]] }
     event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: changed_attributes)
 
@@ -61,8 +71,43 @@ RSpec.describe Conversations::UnreadCounts::Listener do
     expect(notifier).to have_received(:perform)
   end
 
-  it 'ignores conversation updates unrelated to unread count dimensions' do
+  it 'clears user filter counts when a folder filter dimension changes' do
+    account.enable_features!(:conversation_unread_counts)
     event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: { priority: [nil, 'high'] })
+    allow(store).to receive(:clear_filter_caches!).and_return(true)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+    listener.conversation_updated(event)
+
+    expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+    expect(store).to have_received(:clear_filter_caches!).with(account.id)
+    expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+      'conversation.unread_count_changed',
+      kind_of(Time),
+      conversation: conversation
+    )
+  end
+
+  it 'clears user filter counts when the conversation contact changes' do
+    account.enable_features!(:conversation_unread_counts)
+    event = Events::Base.new('conversation.contact_changed', Time.zone.now, conversation: conversation)
+    allow(store).to receive(:clear_filter_caches!).and_return(true)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+    listener.conversation_contact_changed(event)
+
+    expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+    expect(store).to have_received(:clear_filter_caches!).with(account.id)
+    expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+      'conversation.unread_count_changed',
+      kind_of(Time),
+      conversation: conversation
+    )
+  end
+
+  it 'ignores conversation updates without changed attributes' do
+    account.enable_features!(:conversation_unread_counts)
+    event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: {})
 
     listener.conversation_updated(event)
 
@@ -128,7 +173,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
       conversation_data: conversation_data.stringify_keys
     )
   ensure
-    store.clear_account!(account.id)
+    store.clear_all_account!(account.id)
   end
 
   def deleted_conversation_data(conversation)
diff --git a/spec/services/conversations/unread_counts/notifier_spec.rb b/spec/services/conversations/unread_counts/notifier_spec.rb
index 1b35d37f6..645c2bc17 100644
--- a/spec/services/conversations/unread_counts/notifier_spec.rb
+++ b/spec/services/conversations/unread_counts/notifier_spec.rb
@@ -29,6 +29,18 @@ RSpec.describe Conversations::UnreadCounts::Notifier do
 
       expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
     end
+
+    it 'dispatches unread count changed event when user filter caches were cleared' do
+      allow(Conversations::UnreadCounts::Store).to receive(:clear_filter_caches!).and_return(true)
+
+      described_class.new(conversation).perform
+
+      expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+        'conversation.unread_count_changed',
+        kind_of(Time),
+        conversation: conversation
+      )
+    end
   end
 
   context 'when conversation unread counts feature is disabled' do
diff --git a/spec/services/conversations/unread_counts/refresher_spec.rb b/spec/services/conversations/unread_counts/refresher_spec.rb
index 5f361e7aa..e961c21c3 100644
--- a/spec/services/conversations/unread_counts/refresher_spec.rb
+++ b/spec/services/conversations/unread_counts/refresher_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Conversations::UnreadCounts::Refresher do
   let(:store) { Conversations::UnreadCounts::Store }
 
   after do
-    store.clear_account!(account.id)
+    store.clear_all_account!(account.id)
   end
 
   it 'does not update redis when unread caches are not ready' do
diff --git a/spec/services/conversations/unread_counts/store_spec.rb b/spec/services/conversations/unread_counts/store_spec.rb
index fcf21c985..9e1311727 100644
--- a/spec/services/conversations/unread_counts/store_spec.rb
+++ b/spec/services/conversations/unread_counts/store_spec.rb
@@ -7,9 +7,10 @@ RSpec.describe Conversations::UnreadCounts::Store do
   let(:user_id) { 4 }
   let(:conversation_id) { 5 }
   let(:team_id) { 6 }
+  let(:other_user_id) { 8 }
 
   after do
-    described_class.clear_account!(account_id)
+    described_class.clear_all_account!(account_id)
   end
 
   describe 'key builders' do
@@ -45,20 +46,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
         'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::TEAM::6::INBOX::2::ASSIGNEE::4'
       )
     end
+
+    it 'builds user filter keys using the Redis key naming convention' do
+      expect(described_class.user_mentions_key(account_id, user_id)).to eq(
+        'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::MENTIONS'
+      )
+      expect(described_class.user_participating_key(account_id, user_id)).to eq(
+        'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::PARTICIPATING'
+      )
+      expect(described_class.user_unattended_key(account_id, user_id)).to eq(
+        'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::UNATTENDED'
+      )
+      expect(described_class.user_folder_key(account_id, user_id, 7)).to eq(
+        'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::FOLDER::7'
+      )
+    end
   end
 
   describe 'ready markers' do
-    it 'tracks base and assignment readiness independently' do
+    it 'starts with all ready markers missing' do
       expect(described_class.base_ready?(account_id)).to be(false)
       expect(described_class.assignment_ready?(account_id)).to be(false)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+    end
 
+    it 'tracks base, assignment, and user filter readiness independently' do
       described_class.mark_base_ready!(account_id)
       described_class.mark_assignment_ready!(account_id)
+      described_class.mark_filters_ready!(account_id, user_id)
 
       expect(described_class.base_ready?(account_id)).to be(true)
       expect(described_class.assignment_ready?(account_id)).to be(true)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(true)
       expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::BASE')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
       expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::ASSIGNMENT')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
+      expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::READY::FILTERS')).to be_within(5).of(
+        Conversations::UnreadCounts::READY_TTL
+      )
+    end
+
+    it 'tracks filter invalidation versions independently' do
+      expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 0)
+
+      expect(described_class.clear_user_filters!(account_id, user_id)).to be(false)
+
+      expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 1)
+      expect(ttl_for(user_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+
+      expect(described_class.clear_filter_caches!(account_id)).to be(false)
+
+      expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 1, user: 1)
+      expect(ttl_for(account_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+    end
+
+    it 'marks filter caches ready only when the invalidation version is current' do
+      version_snapshot = described_class.filter_version_snapshot(account_id, user_id)
+
+      expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be_truthy
+      expect(described_class.filters_ready?(account_id, user_id)).to be(true)
+
+      described_class.clear_user_filters!(account_id, user_id)
+
+      expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be(false)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
     end
   end
 
@@ -150,9 +200,94 @@ RSpec.describe Conversations::UnreadCounts::Store do
       expect(base_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
     end
 
-    it 'clears all account memberships' do
+    it 'adds, counts, and clears user filter memberships' do
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [conversation_id],
+          unattended: [conversation_id]
+        },
+        folders: { 7 => [conversation_id] }
+      )
+      described_class.mark_filters_ready!(account_id, user_id)
+
+      expect(described_class.counts_for_keys(user_filter_keys)).to eq(
+        described_class.user_mentions_key(account_id, user_id) => 1,
+        described_class.user_participating_key(account_id, user_id) => 1,
+        described_class.user_unattended_key(account_id, user_id) => 1,
+        described_class.user_folder_key(account_id, user_id, 7) => 1
+      )
+      expect(user_filter_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
+
+      expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+      expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+    end
+
+    it 'preserves the user filter build lock when clearing one user filter cache' do
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [conversation_id],
+          unattended: [conversation_id]
+        },
+        folders: { 7 => [conversation_id] }
+      )
+      described_class.mark_filters_ready!(account_id, user_id)
+      Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+      expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+      expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+      expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+    end
+
+    it 'preserves user filter build locks when clearing all account filter caches' do
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [],
+          unattended: []
+        },
+        folders: {}
+      )
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: other_user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [],
+          unattended: []
+        },
+        folders: {}
+      )
+      described_class.mark_filters_ready!(account_id, user_id)
+      described_class.mark_filters_ready!(account_id, other_user_id)
+      Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+      Redis::Alfred.set(user_filter_build_lock_key(other_user_id), 'locked')
+
+      expect(described_class.clear_filter_caches!(account_id)).to be(true)
+
+      expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+      expect(Redis::Alfred.exists?(user_filter_build_lock_key(other_user_id))).to be(true)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+      expect(described_class.filters_ready?(account_id, other_user_id)).to be(false)
+      expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+      expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, other_user_id)]).values).to all(eq(0))
+    end
+
+    it 'clears account memberships without clearing user filter memberships' do
       described_class.mark_base_ready!(account_id)
       described_class.mark_assignment_ready!(account_id)
+      described_class.mark_filters_ready!(account_id, user_id)
       described_class.add_base_membership(
         account_id: account_id,
         inbox_id: inbox_id,
@@ -168,13 +303,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
         team_id: team_id,
         conversation_id: conversation_id
       )
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [],
+          unattended: []
+        },
+        folders: {}
+      )
+      Redis::Alfred.set(user_filter_build_lock_key, 'locked')
 
       described_class.clear_account!(account_id)
 
       expect(described_class.base_ready?(account_id)).to be(false)
       expect(described_class.assignment_ready?(account_id)).to be(false)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(true)
       expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
       expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+      expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(1))
+      expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+    end
+
+    it 'clears all account unread count keys' do
+      described_class.mark_base_ready!(account_id)
+      described_class.mark_assignment_ready!(account_id)
+      described_class.mark_filters_ready!(account_id, user_id)
+      described_class.add_base_membership(
+        account_id: account_id,
+        inbox_id: inbox_id,
+        label_ids: [label_id],
+        team_id: team_id,
+        conversation_id: conversation_id
+      )
+      described_class.add_assignment_membership(
+        account_id: account_id,
+        inbox_id: inbox_id,
+        label_ids: [label_id],
+        assignee_id: user_id,
+        team_id: team_id,
+        conversation_id: conversation_id
+      )
+      described_class.add_filter_memberships(
+        account_id: account_id,
+        user_id: user_id,
+        filters: {
+          mentions: [conversation_id],
+          participating: [],
+          unattended: []
+        },
+        folders: {}
+      )
+      Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+      described_class.clear_all_account!(account_id)
+
+      expect(described_class.base_ready?(account_id)).to be(false)
+      expect(described_class.assignment_ready?(account_id)).to be(false)
+      expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+      expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
+      expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+      expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+      expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(false)
     end
   end
 
@@ -194,6 +385,27 @@ RSpec.describe Conversations::UnreadCounts::Store do
     ]
   end
 
+  def user_filter_keys(filter_user_id = user_id)
+    [
+      described_class.user_mentions_key(account_id, filter_user_id),
+      described_class.user_participating_key(account_id, filter_user_id),
+      described_class.user_unattended_key(account_id, filter_user_id),
+      described_class.user_folder_key(account_id, filter_user_id, 7)
+    ]
+  end
+
+  def user_filter_build_lock_key(filter_user_id = user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account_id, user_id: filter_user_id)
+  end
+
+  def account_filter_version_key
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
+  end
+
+  def user_filter_version_key(filter_user_id = user_id)
+    format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: filter_user_id)
+  end
+
   def ttl_for(key)
     Redis::Alfred.ttl(key)
   end
diff --git a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
new file mode 100644
index 000000000..1d898b103
--- /dev/null
+++ b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::UnreadCounts::UserFilterNotifier do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account) }
+  let(:store) { Conversations::UnreadCounts::Store }
+
+  after do
+    store.clear_all_account!(account.id)
+  end
+
+  it 'clears the user filter cache and dispatches an unread count refresh event' do
+    account.enable_features!(:conversation_unread_counts)
+    store.mark_filters_ready!(account.id, user.id)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+    described_class.new(account: account, user: user).perform
+
+    expect(store.filters_ready?(account.id, user.id)).to be(false)
+    expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+      'conversation.unread_count_changed',
+      kind_of(Time),
+      account: account,
+      user: user
+    )
+  end
+
+  it 'does nothing when conversation unread counts are disabled' do
+    store.mark_filters_ready!(account.id, user.id)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+    described_class.new(account: account, user: user).perform
+
+    expect(store.filters_ready?(account.id, user.id)).to be(true)
+    expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
+  end
+end
diff --git a/spec/services/imap/fetch_email_service_spec.rb b/spec/services/imap/fetch_email_service_spec.rb
index 1f74cf0b7..b88e548d9 100644
--- a/spec/services/imap/fetch_email_service_spec.rb
+++ b/spec/services/imap/fetch_email_service_spec.rb
@@ -119,6 +119,28 @@ RSpec.describe Imap::FetchEmailService do
         end
       end
 
+      it 'does not return recently deleted emails' do
+        travel_to '26.10.2020 10:00'.to_datetime do
+          email_object = create_inbound_email_from_fixture('only_text.eml')
+          email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
+          redis_key = format(Redis::RedisKeys::IMAP_DELETED_MESSAGE,
+                             inbox_id: imap_email_channel.inbox.id,
+                             message_id_digest: Digest::SHA256.hexdigest(email_object.message_id))
+
+          Imap::DeletedMessageTracker.new(inbox: imap_email_channel.inbox).record([email_object.message_id])
+          allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return([1])
+          allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
+          allow(imap).to receive(:logout)
+
+          result = described_class.new(channel: imap_email_channel).perform
+
+          expect(result).to be_empty
+          expect(imap).not_to have_received(:fetch).with(1, 'RFC822')
+        ensure
+          Redis::Alfred.delete(redis_key) if redis_key
+        end
+      end
+
       it 'does not count emails without message ids toward the sync limit' do
         travel_to '26.10.2020 10:00'.to_datetime do
           email_object = create_inbound_email_from_fixture('only_text.eml')
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index d50a0113d..dc30f6e62 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -511,6 +511,60 @@ describe Twilio::IncomingMessageService do
         end
       end
 
+      describe 'When the incoming WhatsApp message has CTWA referral parameters' do
+        let!(:whatsapp_twilio_channel) do
+          create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
+                                                 inbox: create(:inbox, account: account, greeting_enabled: false))
+        end
+
+        it 'stores normalized referral attributes on the message' do
+          params = {
+            SmsSid: 'SMxx',
+            From: 'whatsapp:+491741763110',
+            AccountSid: 'ACxxx',
+            MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+            Body: 'Hallo! Kann ich hierzu mehr Informationen erhalten?',
+            ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG',
+            ReferralSourceId: '120237244350960485',
+            ReferralSourceUrl: 'https://fb.me/4tBfhWhjr',
+            ReferralSourceType: 'ad',
+            ReferralHeadline: 'German citizenship lawyer',
+            ReferralBody: 'Fast-track your German citizenship',
+            ReferralMediaId: '',
+            ReferralNumMedia: '0'
+          }
+
+          described_class.new(params: params).perform
+
+          message = whatsapp_twilio_channel.inbox.messages.last
+          expect(message.content_attributes['referral']).to eq(
+            'ctwa_clid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+            'source_id' => '120237244350960485',
+            'source_url' => 'https://fb.me/4tBfhWhjr',
+            'source_type' => 'ad',
+            'headline' => 'German citizenship lawyer',
+            'body' => 'Fast-track your German citizenship',
+            'num_media' => '0'
+          )
+        end
+
+        it 'does not add referral attributes when ReferralSourceId is absent' do
+          params = {
+            SmsSid: 'SMxx',
+            From: 'whatsapp:+491741763110',
+            AccountSid: 'ACxxx',
+            MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+            Body: 'Regular WhatsApp message',
+            ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG'
+          }
+
+          described_class.new(params: params).perform
+
+          message = whatsapp_twilio_channel.inbox.messages.last
+          expect(message.content_attributes).not_to have_key('referral')
+        end
+      end
+
       describe 'When the incoming number is a Brazilian number in new format with 9 included' do
         let!(:whatsapp_twilio_channel) do
           create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
diff --git a/spec/services/user_session_tracking_service_spec.rb b/spec/services/user_session_tracking_service_spec.rb
new file mode 100644
index 000000000..2b98b95bf
--- /dev/null
+++ b/spec/services/user_session_tracking_service_spec.rb
@@ -0,0 +1,151 @@
+require 'rails_helper'
+
+RSpec.describe UserSessionTrackingService do
+  let(:user) { create(:user) }
+  let(:client_id) { 'client-abc' }
+  let(:request) do
+    instance_double(
+      ActionDispatch::Request,
+      user_agent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15',
+      remote_ip: '8.8.8.8'
+    )
+  end
+  let(:service) { described_class.new(user: user, request: request, client_id: client_id) }
+
+  describe '#create_or_update!' do
+    it 'creates a new UserSession with the right client_id and timestamps' do
+      expect { service.create_or_update! }.to change(user.user_sessions, :count).by(1)
+
+      session = user.user_sessions.last
+      expect(session.client_id).to eq(client_id)
+      expect(session.last_activity_at).to be_within(1.second).of(Time.current)
+    end
+
+    it 'populates request and browser metadata synchronously', :aggregate_failures do
+      service.create_or_update!
+
+      session = user.user_sessions.last
+      expect(session.ip_address).to eq('8.8.8.8')
+      expect(session.browser_name).to eq('Safari')
+      expect(session.platform_name).to eq('macOS')
+    end
+
+    it 'does not call IpLookupService synchronously' do
+      expect(IpLookupService).not_to receive(:new)
+
+      service.create_or_update!
+    end
+
+    it 'enqueues UserSessionIpLookupJob to backfill geo data' do
+      expect { service.create_or_update! }.to have_enqueued_job(UserSessionIpLookupJob)
+    end
+
+    it 'updates an existing session when client_id matches' do
+      existing = user.user_sessions.create!(client_id: client_id, ip_address: '1.1.1.1', last_activity_at: 1.day.ago)
+
+      expect { service.create_or_update! }.not_to change(user.user_sessions, :count)
+      expect(existing.reload.ip_address).to eq('8.8.8.8')
+      expect(existing.last_activity_at).to be_within(1.second).of(Time.current)
+    end
+
+    context 'with a Chatwoot Mobile legacy User-Agent' do
+      let(:request) do
+        instance_double(
+          ActionDispatch::Request,
+          user_agent: ua,
+          remote_ip: '8.8.8.8'
+        )
+      end
+
+      context 'when the UA is okhttp (Android Chatwoot Mobile)' do
+        let(:ua) { 'okhttp/4.9.2' }
+
+        it 'labels the session as Chatwoot Mobile on Android', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Chatwoot Mobile')
+          expect(session.browser_version).to be_nil
+          expect(session.platform_name).to eq('Android')
+          expect(session.platform_version).to be_nil
+          expect(session.device_name).to eq('Android')
+          expect(session.user_agent).to eq(ua)
+        end
+      end
+
+      context 'when the UA is CFNetwork (iOS Chatwoot Mobile)' do
+        let(:ua) { 'Chatwoot/3759 CFNetwork/3886.100.1 Darwin/27.0.0' }
+
+        it 'labels the session as Chatwoot Mobile on iPhone', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Chatwoot Mobile')
+          expect(session.browser_version).to be_nil
+          expect(session.platform_name).to eq('iPhone')
+          expect(session.platform_version).to be_nil
+          expect(session.device_name).to eq('iPhone')
+          expect(session.user_agent).to eq(ua)
+        end
+      end
+
+      context 'when the UA is a real browser (Firefox on Linux)' do
+        let(:ua) { 'Mozilla/5.0 (X11; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0' }
+
+        it 'does not override the Browser-derived metadata', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Firefox')
+          expect(session.platform_name).to eq('Generic Linux')
+          expect(session.device_name).not_to eq('Android')
+          expect(session.device_name).not_to eq('iPhone')
+        end
+      end
+
+      context 'when the UA is unknown but does not match any mobile pattern' do
+        let(:ua) { 'curl/8.4.0' }
+
+        it 'leaves the Unknown labels untouched', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Unknown Browser')
+          expect(session.platform_name).to eq('Unknown')
+          expect(session.device_name).to eq('Unknown')
+        end
+      end
+    end
+  end
+
+  describe '#update_activity!' do
+    it 'does nothing when no session exists for the client_id' do
+      expect { service.update_activity! }.not_to change(user.user_sessions, :count)
+    end
+
+    it 'does nothing when the session was recently active' do
+      session = user.user_sessions.create!(client_id: client_id, last_activity_at: 1.minute.ago)
+      before_ts = session.last_activity_at
+
+      service.update_activity!
+
+      expect(session.reload.last_activity_at).to be_within(1.second).of(before_ts)
+    end
+
+    it 'bumps last_activity_at when the session is stale' do
+      session = user.user_sessions.create!(client_id: client_id, last_activity_at: 10.minutes.ago)
+
+      service.update_activity!
+
+      expect(session.reload.last_activity_at).to be_within(1.second).of(Time.current)
+    end
+
+    it 'bumps last_activity_at when last_activity_at is nil' do
+      session = user.user_sessions.create!(client_id: client_id, last_activity_at: nil)
+
+      service.update_activity!
+
+      expect(session.reload.last_activity_at).to be_within(1.second).of(Time.current)
+    end
+  end
+end
diff --git a/spec/services/whatsapp/facebook_api_client_spec.rb b/spec/services/whatsapp/facebook_api_client_spec.rb
index a33999bee..74fb2f6e2 100644
--- a/spec/services/whatsapp/facebook_api_client_spec.rb
+++ b/spec/services/whatsapp/facebook_api_client_spec.rb
@@ -177,7 +177,7 @@ describe Whatsapp::FacebookApiClient do
           .with(
             headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
             body: { override_callback_uri: callback_url, verify_token: verify_token,
-                    subscribed_fields: %w[messages smb_message_echoes calls] }.to_json
+                    subscribed_fields: %w[messages smb_message_echoes] }.to_json
           )
           .to_return(
             status: 200,
@@ -224,7 +224,7 @@ describe Whatsapp::FacebookApiClient do
           .with(
             headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
             body: { override_callback_uri: callback_url, verify_token: verify_token,
-                    subscribed_fields: %w[messages smb_message_echoes calls] }.to_json
+                    subscribed_fields: %w[messages smb_message_echoes] }.to_json
           )
           .to_return(status: 400, body: { error: 'Webhook callback override failed' }.to_json)
       end
diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
index 70c29c092..60b153775 100644
--- a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
@@ -59,6 +59,41 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
       end
     end
 
+    context 'when document attachment includes an accented filename' do
+      let(:document_params) do
+        {
+          phone_number: whatsapp_channel.phone_number,
+          object: 'whatsapp_business_account',
+          entry: [{
+            changes: [{
+              value: {
+                contacts: [{ profile: { name: 'Sojan Jose' }, wa_id: '2423423243' }],
+                messages: [{
+                  from: '2423423243',
+                  document: {
+                    id: 'b1c68f38-8734-4ad3-b4a1-ef0c10d683',
+                    mime_type: 'application/pdf',
+                    filename: 'Currículum café.pdf',
+                    caption: 'My résumé'
+                  },
+                  timestamp: '1664799904', type: 'document'
+                }]
+              }
+            }]
+          }]
+        }.with_indifferent_access
+      end
+
+      it 'preserves the original filename from the payload' do
+        stub_media_url_request
+        stub_sample_png_request
+        described_class.new(inbox: whatsapp_channel.inbox, params: document_params).perform
+
+        attachment = whatsapp_channel.inbox.messages.first.attachments.first
+        expect(attachment.file.filename.to_s).to eq('Currículum café.pdf')
+      end
+    end
+
     context 'when invalid attachment message params' do
       let(:error_params) do
         {
@@ -199,6 +234,88 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
       end
     end
 
+    context 'when message contains referral data' do
+      let(:referral_params) do
+        {
+          phone_number: whatsapp_channel.phone_number,
+          object: 'whatsapp_business_account',
+          entry: [{
+            changes: [{
+              value: {
+                contacts: [{ profile: { name: 'Mom' }, wa_id: '255718573302', user_id: 'TZ.1040042605869930' }],
+                messages: [{
+                  referral: {
+                    source_url: 'https://fb.me/3TYpooaRT',
+                    source_id: '52558118838064',
+                    source_type: 'ad',
+                    body: 'washa data tu',
+                    headline: 'Diana Digital',
+                    media_type: 'video',
+                    video_url: 'https://www.facebook.com/reel/1438165771395493/',
+                    thumbnail_url: 'https://scontent.xx.fbcdn.net/sample.jpg',
+                    ctwa_clid: 'AfhcQdP2E4A8wWpeb1FqUzUi',
+                    welcome_message: {
+                      text: 'Hi! Please let us know how we can help you.'
+                    }
+                  },
+                  from: '255718573302',
+                  from_user_id: 'TZ.1040042605869930',
+                  id: 'wamid.CTWA_REFERRAL_MESSAGE',
+                  timestamp: '1780649766',
+                  text: { body: 'Hello nielekeze' },
+                  type: 'text'
+                }]
+              }
+            }]
+          }]
+        }.with_indifferent_access
+      end
+
+      it 'stores the referral payload in message content attributes' do
+        described_class.new(inbox: whatsapp_channel.inbox, params: referral_params).perform
+
+        message = whatsapp_channel.inbox.messages.last
+        expect(message.content).to eq('Hello nielekeze')
+        expect(message.content_attributes['referral']).to include(
+          'source_url' => 'https://fb.me/3TYpooaRT',
+          'source_id' => '52558118838064',
+          'source_type' => 'ad',
+          'body' => 'washa data tu',
+          'headline' => 'Diana Digital',
+          'media_type' => 'video',
+          'video_url' => 'https://www.facebook.com/reel/1438165771395493/',
+          'thumbnail_url' => 'https://scontent.xx.fbcdn.net/sample.jpg',
+          'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi',
+          'welcome_message' => { 'text' => 'Hi! Please let us know how we can help you.' }
+        )
+      end
+
+      it 'preserves the referral payload when the message contains contacts' do
+        contacts_referral_params = referral_params.deep_dup
+        parent_message = contacts_referral_params.dig(:entry, 0, :changes, 0, :value, :messages, 0)
+        parent_message[:type] = 'contacts'
+        parent_message.delete(:text)
+        parent_message[:contacts] = [{
+          name: {
+            formatted_name: 'Diana Digital',
+            first_name: 'Diana',
+            last_name: 'Digital'
+          },
+          phones: [{ phone: '+255718573302' }]
+        }]
+
+        described_class.new(inbox: whatsapp_channel.inbox, params: contacts_referral_params).perform
+
+        message = whatsapp_channel.inbox.messages.last
+        expect(message.content).to eq('Diana Digital')
+        expect(message.content_attributes['referral']).to include(
+          'source_id' => '52558118838064',
+          'headline' => 'Diana Digital',
+          'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi'
+        )
+      end
+    end
+
     context 'when message is a reply (has context)' do
       let(:reply_params) do
         {
diff --git a/spec/services/whatsapp/webhook_setup_service_spec.rb b/spec/services/whatsapp/webhook_setup_service_spec.rb
index d35d14cb9..e80036f32 100644
--- a/spec/services/whatsapp/webhook_setup_service_spec.rb
+++ b/spec/services/whatsapp/webhook_setup_service_spec.rb
@@ -43,7 +43,7 @@ describe Whatsapp::WebhookSetupService do
         allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
         allow(api_client).to receive(:register_phone_number).with('123456789', 223_456)
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'test_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'test_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
         allow(channel).to receive(:save!)
       end
 
@@ -51,7 +51,8 @@ describe Whatsapp::WebhookSetupService do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).to receive(:register_phone_number).with('123456789', 223_456)
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token')
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token', subscribed_fields: %w[messages
+                                                                                                                                smb_message_echoes])
           service.perform
         end
       end
@@ -65,14 +66,15 @@ describe Whatsapp::WebhookSetupService do
                                                                             throughput: { level: 'APPLICABLE' }
                                                                           })
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'test_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'test_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
       end
 
       it 'does NOT register phone, but sets up webhook' do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).not_to receive(:register_phone_number)
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token')
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token', subscribed_fields: %w[messages
+                                                                                                                                smb_message_echoes])
           service.perform
         end
       end
@@ -88,7 +90,7 @@ describe Whatsapp::WebhookSetupService do
         allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
         allow(api_client).to receive(:register_phone_number).with('123456789', 223_456)
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'test_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'test_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
         allow(channel).to receive(:save!)
       end
 
@@ -96,7 +98,8 @@ describe Whatsapp::WebhookSetupService do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).to receive(:register_phone_number).with('123456789', 223_456)
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token')
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token', subscribed_fields: %w[messages
+                                                                                                                                smb_message_echoes])
           service.perform
         end
       end
@@ -112,7 +115,7 @@ describe Whatsapp::WebhookSetupService do
         allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
         allow(api_client).to receive(:register_phone_number).with('123456789', 223_456)
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'test_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'test_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
         allow(channel).to receive(:save!)
       end
 
@@ -120,7 +123,8 @@ describe Whatsapp::WebhookSetupService do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).to receive(:register_phone_number).with('123456789', 223_456)
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token')
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token', subscribed_fields: %w[messages
+                                                                                                                                smb_message_echoes])
           service.perform
         end
       end
@@ -279,14 +283,15 @@ describe Whatsapp::WebhookSetupService do
                                                                             throughput: { level: 'APPLICABLE' }
                                                                           })
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'existing_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'existing_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
       end
 
       it 'successfully reauthorizes with new access token' do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).not_to receive(:register_phone_number)
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'existing_verify_token')
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'existing_verify_token',
+                  subscribed_fields: %w[messages smb_message_echoes])
           service_reauth.perform
         end
       end
@@ -294,7 +299,7 @@ describe Whatsapp::WebhookSetupService do
       it 'uses the existing webhook verify token during reauthorization' do
         with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
           expect(api_client).to receive(:subscribe_waba_webhook)
-            .with(waba_id, anything, 'existing_verify_token')
+            .with(waba_id, anything, 'existing_verify_token', subscribed_fields: %w[messages smb_message_echoes])
           service_reauth.perform
         end
       end
@@ -308,7 +313,7 @@ describe Whatsapp::WebhookSetupService do
                                                                             throughput: { level: 'APPLICABLE' }
                                                                           })
         allow(api_client).to receive(:subscribe_waba_webhook)
-          .with(waba_id, anything, 'test_verify_token').and_return({ 'success' => true })
+          .with(waba_id, anything, 'test_verify_token', subscribed_fields: %w[messages smb_message_echoes]).and_return({ 'success' => true })
       end
 
       it 'completes successfully without errors' do
diff --git a/theme/colors.js b/theme/colors.js
index 0f4d2af10..9dcfbeb8c 100644
--- a/theme/colors.js
+++ b/theme/colors.js
@@ -258,6 +258,11 @@ export const colors = {
       black2: 'rgba(var(--black-alpha-2))',
       white: 'rgba(var(--white-alpha))',
     },
+    // Voice call widget
+    'call-widget': 'rgba(var(--call-widget))',
+    'call-widget-border': 'rgba(var(--call-widget-border))',
+    'call-widget-text': 'rgba(var(--call-widget-text))',
+    'call-widget-sub-text': 'rgba(var(--call-widget-sub-text))',
     // Border colors
     weak: 'rgb(var(--border-weak) / <alpha-value>)',
     container: 'rgba(var(--border-container))',
diff --git a/theme/icons.js b/theme/icons.js
index 2bd218cb0..265bd4e16 100644
--- a/theme/icons.js
+++ b/theme/icons.js
@@ -181,6 +181,11 @@ export const icons = {
     width: 16,
     height: 16,
   },
+  'chevrons-down': {
+    body: `<g fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4L8 8L12 4" opacity="0.5"/><path d="M4 10L8 14L12 10" opacity="0.75"/><path d="M4 16L8 20L12 16"/></g>`,
+    width: 16,
+    height: 24,
+  },
   hash: {
     body: `<g fill="currentColor" stroke="none"><path d="M11.8125 8.3125H9.1875V5.6875H11.8125C11.9285 5.6875 12.0398 5.64141 12.1219 5.55936C12.2039 5.47731 12.25 5.36603 12.25 5.25C12.25 5.13397 12.2039 5.02269 12.1219 4.94064C12.0398 4.85859 11.9285 4.8125 11.8125 4.8125H9.1875V2.1875C9.1875 2.07147 9.14141 1.96019 9.05936 1.87814C8.97731 1.79609 8.86603 1.75 8.75 1.75C8.63397 1.75 8.52269 1.79609 8.44064 1.87814C8.35859 1.96019 8.3125 2.07147 8.3125 2.1875V4.8125H5.6875V2.1875C5.6875 2.07147 5.64141 1.96019 5.55936 1.87814C5.47731 1.79609 5.36603 1.75 5.25 1.75C5.13397 1.75 5.02269 1.79609 4.94064 1.87814C4.85859 1.96019 4.8125 2.07147 4.8125 2.1875V4.8125H2.1875C2.07147 4.8125 1.96019 4.85859 1.87814 4.94064C1.79609 5.02269 1.75 5.13397 1.75 5.25C1.75 5.36603 1.79609 5.47731 1.87814 5.55936C1.96019 5.64141 2.07147 5.6875 2.1875 5.6875H4.8125V8.3125H2.1875C2.07147 8.3125 1.96019 8.35859 1.87814 8.44064C1.79609 8.52269 1.75 8.63397 1.75 8.75C1.75 8.86603 1.79609 8.97731 1.87814 9.05936C1.96019 9.14141 2.07147 9.1875 2.1875 9.1875H4.8125V11.8125C4.8125 11.9285 4.85859 12.0398 4.94064 12.1219C5.02269 12.2039 5.13397 12.25 5.25 12.25C5.36603 12.25 5.47731 12.2039 5.55936 12.1219C5.64141 12.0398 5.6875 11.9285 5.6875 11.8125V9.1875H8.3125V11.8125C8.3125 11.9285 8.35859 12.0398 8.44064 12.1219C8.52269 12.2039 8.63397 12.25 8.75 12.25C8.86603 12.25 8.97731 12.2039 9.05936 12.1219C9.14141 12.0398 9.1875 11.9285 9.1875 11.8125V9.1875H11.8125C11.9285 9.1875 12.0398 9.14141 12.1219 9.05936C12.2039 8.97731 12.25 8.86603 12.25 8.75C12.25 8.63397 12.2039 8.52269 12.1219 8.44064C12.0398 8.35859 11.9285 8.3125 11.8125 8.3125ZM5.6875 8.3125V5.6875H8.3125V8.3125H5.6875Z" fill="currentColor"/></g>`,
     width: 14,