diff --git a/.codeclimate.yml b/.codeclimate.yml
index 916b98510..974681a09 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -53,3 +53,4 @@ exclude_patterns:
   - 'app/javascript/dashboard/i18n/index.js'
   - 'app/javascript/widget/i18n/index.js'
   - 'app/javascript/survey/i18n/index.js'
+  - 'app/javascript/shared/constants/locales.js'
diff --git a/.env.example b/.env.example
index d46acac9f..81a65810c 100644
--- a/.env.example
+++ b/.env.example
@@ -38,6 +38,9 @@ REDIS_SENTINEL_MASTER_NAME=
 # REDIS_OPENSSL_VERIFY_MODE=none
 
 # Postgres Database config variables
+# You can leave POSTGRES_DATABASE blank. The default name of 
+# the database in the production environment is chatwoot_production
+POSTGRES_DATABASE=
 POSTGRES_HOST=postgres
 POSTGRES_USERNAME=postgres
 POSTGRES_PASSWORD=
@@ -48,7 +51,6 @@ RAILS_MAX_THREADS=5
 # could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
 MAILER_SENDER_EMAIL="Chatwoot <accounts@chatwoot.com>"
 
-
 #SMTP domain key is set up for HELO checking
 SMTP_DOMAIN=chatwoot.com
 # the default value is set "mailhog" and is used by docker-compose for development environments,
@@ -93,7 +95,6 @@ AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
-
 # Log settings
 # Disable if you want to write logs to a file
 RAILS_LOG_TO_STDOUT=true
@@ -130,7 +131,6 @@ ANDROID_BUNDLE_ID=com.chatwoot.app
 # https://developers.google.com/android/guides/client-auth (use keytool to print the fingerprint in the first section)
 ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:D4:5D:D4:53:F8:3B:FB:D3:C6:28:64:1D:AA:08:1E:D8
 
-
 ### Smart App Banner
 # https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/PromotingAppswithAppBanners/PromotingAppswithAppBanners.html
 # You can find your app-id in https://itunesconnect.apple.com
@@ -147,8 +147,12 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Bot Customizations
 USE_INBOX_AVATAR_FOR_BOT=true
 
-
 ### APM and Error Monitoring configurations
+## Elastic APM
+## https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
+# ELASTIC_APM_SERVER_URL=
+# ELASTIC_APM_SECRET_TOKEN=
+
 ## Sentry
 # SENTRY_DSN=
 
@@ -169,7 +173,6 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
 # DD_TRACE_AGENT_URL=
 
-
 ## IP look up configuration
 ## ref https://github.com/alexreisner/geocoder/blob/master/README_API_GUIDE.md
 ## works only on accounts with ip look up feature enabled
@@ -181,7 +184,6 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## To prevent and throttle abusive requests
 # ENABLE_RACK_ATTACK=true
 
-
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false
@@ -195,3 +197,11 @@ USE_INBOX_AVATAR_FOR_BOT=true
 # If you want to use official mobile app,
 # the notifications would be relayed via a Chatwoot server
 ENABLE_PUSH_RELAY_SERVER=true
+
+# Stripe API key
+STRIPE_SECRET_KEY=
+STRIPE_WEBHOOK_SECRET=
+
+# Set to true if you want to upload files to cloud storage using the signed url
+# Make sure to follow https://edgeguides.rubyonrails.org/active_storage_overview.html#cross-origin-resource-sharing-cors-configuration on the cloud storage after setting this to true.
+DIRECT_UPLOADS_ENABLED=
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
new file mode 100644
index 000000000..790a322fd
--- /dev/null
+++ b/.github/workflows/lock.yml
@@ -0,0 +1,36 @@
+# We often have cases where users would comment over stale closed Github Issues.
+# This creates unnecessary noise for the original reporter and makes it harder for triaging.
+# This action locks the closed threads once it is inactive for over a month.
+
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '0 * * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v3
+        with: 
+          issue-inactive-days: '30'
+          issue-lock-reason: 'resolved'
+          issue-comment: >
+            This issue has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
+          pr-inactive-days: '30'
+          pr-lock-reason: 'resolved'
+          pr-comment: >
+            This pull request has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
diff --git a/.github/workflows/nightly_installer.yml b/.github/workflows/nightly_installer.yml
new file mode 100644
index 000000000..623f34592
--- /dev/null
+++ b/.github/workflows/nightly_installer.yml
@@ -0,0 +1,58 @@
+# #
+# #
+# # Linux nightly installer action
+# # This action will try to install and setup
+# # chatwoot on an Ubuntu 20.04 machine using
+# # the linux installer script.
+# # 
+# # This is set to run daily at midnight.
+# #
+
+name: Run Linux nightly installer
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  nightly:
+    runs-on: ubuntu-20.04
+    steps:
+
+    - name: get installer
+      run: |
+        wget https://get.chatwoot.app/linux/install.sh
+        chmod +x install.sh
+
+    - name: create input file
+      run: |
+        echo "no" > input
+        echo "yes" >> input
+
+    - name: Run the installer
+      run: |
+        sudo ./install.sh --install < input
+
+    # temp fix for postgresql not starting 
+    # automatically in gh action env
+    - name: start postgresql service
+      if: always()
+      run: |
+        sudo service postgresql start
+
+    #re-running the installer again
+    - name: Run the installer again
+      if: always()
+      run: |
+        sudo ./install.sh --install < input
+
+
+        #  disabling http verify for now as http 
+        #  access to port 3000 fails in gh action env
+        #    - name: Verify
+        #      if: always()
+        #      run: |
+        #        sudo netstat -ntlp | grep 3000
+        #        sudo systemctl restart chatwoot.target
+        #        curl http://localhost:3000/api
+
diff --git a/.rubocop.yml b/.rubocop.yml
index 898f1ff24..d63f0418d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -183,3 +183,4 @@ AllCops:
     - db/migrate/20200503151130_add_account_feature_flag.rb
     - db/migrate/20200927135222_add_last_activity_at_to_conversation.rb
     - db/migrate/20210306170117_add_last_activity_at_to_contacts.rb
+    - db/migrate/20220809104508_revert_cascading_indexes.rb
diff --git a/Gemfile b/Gemfile
index 270e6527c..ba83ce964 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,6 +91,7 @@ gem 'google-cloud-dialogflow'
 
 ##-- apm and error monitoring ---#
 gem 'ddtrace'
+gem 'elastic-apm'
 gem 'newrelic_rpm'
 gem 'scout_apm'
 gem 'sentry-rails', '~> 5.3'
@@ -127,6 +128,9 @@ gem 'working_hours'
 # full text search for articles
 gem 'pg_search'
 
+# Subscriptions, Billing
+gem 'stripe'
+
 group :production, :staging do
   # we dont want request timing out in development while using byebug
   gem 'rack-timeout'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e0583757..8cf640103 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,6 +182,9 @@ GEM
       addressable (~> 2.8)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
+    elastic-apm (4.5.1)
+      concurrent-ruby (~> 1.0)
+      http (>= 3.0)
     email_reply_trimmer (0.1.13)
     erubi (1.10.0)
     et-orbi (1.2.7)
@@ -226,6 +229,9 @@ GEM
       faraday (>= 1.0.0, < 3.0)
       googleauth (~> 1)
     ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     flag_shih_tzu (0.3.23)
     foreman (0.87.2)
     fugit (1.5.3)
@@ -318,9 +324,15 @@ GEM
     hkdf (0.3.0)
     html2text (0.2.1)
       nokogiri (~> 1.6)
+    http (5.1.0)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
+    http-form_data (2.3.0)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -383,6 +395,9 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -616,6 +631,7 @@ GEM
       sprockets (>= 3.0.0)
     squasher (0.6.2)
     statsd-ruby (1.5.0)
+    stripe (6.5.0)
     telephone_number (1.4.16)
     thor (1.2.1)
     tilt (2.0.10)
@@ -708,6 +724,7 @@ DEPENDENCIES
   devise_token_auth
   dotenv-rails
   down (~> 5.0)
+  elastic-apm
   email_reply_trimmer
   facebook-messenger
   factory_bot_rails
@@ -769,6 +786,7 @@ DEPENDENCIES
   spring
   spring-watcher-listen
   squasher
+  stripe
   telephone_number
   time_diff
   twilio-ruby (~> 5.66)
@@ -787,4 +805,4 @@ RUBY VERSION
    ruby 3.0.4p208
 
 BUNDLED WITH
-   2.3.16
+   2.3.17
diff --git a/app/actions/contact_identify_action.rb b/app/actions/contact_identify_action.rb
index f19caac77..a1c39e2a0 100644
--- a/app/actions/contact_identify_action.rb
+++ b/app/actions/contact_identify_action.rb
@@ -104,7 +104,7 @@ class ContactIdentifyAction
     # TODO: replace reject { |_k, v| v.blank? } with compact_blank when rails is upgraded
     @contact.discard_invalid_attrs if discard_invalid_attrs
     @contact.save!
-    ContactAvatarJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
+    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
   end
 
   def merge_contact(base_contact, merge_contact)
diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index 575f14aaa..3e2ac9d6e 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin]
+  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin, :locale]
 
   def perform
     if @user.nil?
diff --git a/app/builders/contact_builder.rb b/app/builders/contact_builder.rb
index 10ce8ee26..938072643 100644
--- a/app/builders/contact_builder.rb
+++ b/app/builders/contact_builder.rb
@@ -23,7 +23,7 @@ class ContactBuilder
   end
 
   def update_contact_avatar(contact)
-    ::ContactAvatarJob.perform_later(contact, contact_attributes[:avatar_url]) if contact_attributes[:avatar_url]
+    ::Avatar::AvatarFromUrlJob.perform_later(contact, contact_attributes[:avatar_url]) if contact_attributes[:avatar_url]
   end
 
   def create_contact
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index f19d3c8b7..9f670602a 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -58,7 +58,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     return if contact_params[:remote_avatar_url].blank?
     return if @contact.avatar.attached?
 
-    ContactAvatarJob.perform_later(@contact, contact_params[:remote_avatar_url])
+    Avatar::AvatarFromUrlJob.perform_later(@contact, contact_params[:remote_avatar_url])
   end
 
   def conversation
diff --git a/app/builders/notification_builder.rb b/app/builders/notification_builder.rb
index d41debe0c..6d2096233 100644
--- a/app/builders/notification_builder.rb
+++ b/app/builders/notification_builder.rb
@@ -15,6 +15,9 @@ class NotificationBuilder
 
   def user_subscribed_to_notification?
     notification_setting = user.notification_settings.find_by(account_id: account.id)
+    # added for the case where an assignee might be removed from the account but remains in conversation
+    return if notification_setting.blank?
+
     return true if notification_setting.public_send("email_#{notification_type}?")
     return true if notification_setting.public_send("push_#{notification_type}?")
 
diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 09b648a6f..6b2f9ea75 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -72,6 +72,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   end
 
   def validate_limit
-    render_payment_required('Account limit exceeded. Upgrade to a higher plan') if agents.count >= Current.account.usage_limits[:agents]
+    render_payment_required('Account limit exceeded. Please purchase more licenses') if agents.count >= Current.account.usage_limits[:agents]
   end
 end
diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index 77a1fdf65..ccaa33a42 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -2,10 +2,12 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   before_action :portal
   before_action :check_authorization
   before_action :fetch_article, except: [:index, :create]
+  before_action :set_current_page, only: [:index]
 
   def index
+    @articles_count = @portal.articles.count
     @articles = @portal.articles
-    @articles = @articles.search(list_params) if params[:payload].present?
+    @articles = @articles.search(list_params) if list_params.present?
   end
 
   def create
@@ -45,8 +47,10 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   end
 
   def list_params
-    params.require(:payload).permit(
-      :category_slug, :locale, :query
-    )
+    params.permit(:locale, :query, :page, :category_slug, :status, :author_id)
+  end
+
+  def set_current_page
+    @current_page = params[:page] || 1
   end
 end
diff --git a/app/controllers/api/v1/accounts/callbacks_controller.rb b/app/controllers/api/v1/accounts/callbacks_controller.rb
index 8a163f011..3575e28e6 100644
--- a/app/controllers/api/v1/accounts/callbacks_controller.rb
+++ b/app/controllers/api/v1/accounts/callbacks_controller.rb
@@ -90,9 +90,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
   end
 
   def set_avatar(facebook_inbox, page_id)
-    avatar_file = Down.download(
-      "http://graph.facebook.com/#{page_id}/picture?type=large"
-    )
-    facebook_inbox.avatar.attach(io: avatar_file, filename: avatar_file.original_filename, content_type: avatar_file.content_type)
+    avatar_url = "https://graph.facebook.com/#{page_id}/picture?type=large"
+    Avatar::AvatarFromUrlJob.perform_later(facebook_inbox, avatar_url)
   end
 end
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index c4491b2e2..bc18b61b8 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -2,6 +2,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
   before_action :portal
   before_action :check_authorization
   before_action :fetch_category, except: [:index, :create]
+  before_action :set_current_page, only: [:index]
 
   def index
     @categories = @portal.categories.search(params)
@@ -49,4 +50,8 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
       :name, :description, :position, :slug, :locale, :parent_category_id, :associated_category_id
     )
   end
+
+  def set_current_page
+    @current_page = params[:page] || 1
+  end
 end
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 44b1280ee..7ef3c0d87 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
     contacts = resolved_contacts.where(
       'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search',
-      search: "%#{params[:q]}%"
+      search: "%#{params[:q].strip}%"
     )
     @contacts_count = contacts.count
     @contacts = fetch_contacts_with_conversation_count(contacts)
@@ -166,13 +166,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   end
 
   def process_avatar
-    if permitted_params[:avatar].blank? && permitted_params[:avatar_url].present?
-      ::ContactAvatarJob.perform_later(@contact, params[:avatar_url])
-    elsif permitted_params[:avatar].blank? && permitted_params[:email].present?
-      hash = Digest::MD5.hexdigest(params[:email])
-      gravatar_url = "https://www.gravatar.com/avatar/#{hash}?d=404"
-      ::ContactAvatarJob.perform_later(@contact, gravatar_url)
-    end
+    ::Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
   end
 
   def render_error(error, error_status)
diff --git a/app/controllers/api/v1/accounts/macros_controller.rb b/app/controllers/api/v1/accounts/macros_controller.rb
new file mode 100644
index 000000000..60e1b62c2
--- /dev/null
+++ b/app/controllers/api/v1/accounts/macros_controller.rb
@@ -0,0 +1,57 @@
+class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
+  before_action :check_authorization
+  before_action :fetch_macro, only: [:show, :update, :destroy, :execute]
+
+  def index
+    @macros = Macro.with_visibility(current_user, params)
+  end
+
+  def create
+    @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
+    @macro.set_visibility(current_user, permitted_params)
+    @macro.actions = params[:actions]
+
+    render json: { error: @macro.errors.messages }, status: :unprocessable_entity and return unless @macro.valid?
+
+    @macro.save!
+  end
+
+  def show; end
+
+  def destroy
+    @macro.destroy!
+    head :ok
+  end
+
+  def update
+    ActiveRecord::Base.transaction do
+      @macro.update!(macros_with_user)
+      @macro.set_visibility(current_user, permitted_params)
+      @macro.save!
+    rescue StandardError => e
+      Rails.logger.error e
+      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
+    end
+  end
+
+  def execute
+    ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)
+
+    head :ok
+  end
+
+  def permitted_params
+    params.permit(
+      :name, :account_id, :visibility,
+      actions: [:action_name, { action_params: [] }]
+    )
+  end
+
+  def macros_with_user
+    permitted_params.merge(updated_by_id: current_user.id)
+  end
+
+  def fetch_macro
+    @macro = Current.account.macros.find_by(id: params[:id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
index b081978b9..c3d8ad024 100644
--- a/app/controllers/api/v1/accounts/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -3,6 +3,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
 
   before_action :fetch_portal, except: [:index, :create]
   before_action :check_authorization
+  before_action :set_current_page, only: [:index]
 
   def index
     @portals = Current.account.portals
@@ -17,8 +18,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
 
   def create
     @portal = Current.account.portals.build(portal_params)
-    render json: { error: @portal.errors.messages }, status: :unprocessable_entity and return unless @portal.valid?
-
     @portal.save!
     process_attached_logo
   end
@@ -66,4 +65,8 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   def portal_member_params
     params.require(:portal).permit(:account_id, member_ids: [])
   end
+
+  def set_current_page
+    @current_page = params[:page] || 1
+  end
 end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index e75d3f852..2f18fbac2 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -19,6 +19,7 @@ class Api::V1::AccountsController < Api::BaseController
       user_full_name: account_params[:user_full_name],
       email: account_params[:email],
       user_password: account_params[:password],
+      locale: account_params[:locale],
       user: current_user
     ).perform
     if @user
diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index d854114c4..9ec702e6c 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -36,9 +36,10 @@ class Api::V1::Widget::BaseController < ApplicationController
       contact_id: @contact.id,
       contact_inbox_id: @contact_inbox.id,
       additional_attributes: {
+        browser_language: browser.accept_language&.first&.code,
         browser: browser_params,
-        referer: permitted_params[:message][:referer_url],
-        initiated_at: timestamp_params
+        initiated_at: timestamp_params,
+        referer: permitted_params[:message][:referer_url]
       },
       custom_attributes: permitted_params[:custom_attributes].presence || {}
     }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0762c3d91..d2960a699 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,10 +17,6 @@ class ApplicationController < ActionController::Base
     Current.user = @user
   end
 
-  def current_subscription
-    @subscription ||= Current.account.subscription
-  end
-
   def pundit_user
     {
       user: Current.user,
diff --git a/app/controllers/concerns/ensure_current_account_helper.rb b/app/controllers/concerns/ensure_current_account_helper.rb
index dccc64350..eb781dbfe 100644
--- a/app/controllers/concerns/ensure_current_account_helper.rb
+++ b/app/controllers/concerns/ensure_current_account_helper.rb
@@ -8,6 +8,8 @@ module EnsureCurrentAccountHelper
 
   def ensure_current_account
     account = Account.find(params[:account_id])
+    ensure_account_is_active?(account)
+
     if current_user
       account_accessible_for_user?(account)
     elsif @resource.is_a?(AgentBot)
@@ -25,4 +27,8 @@ module EnsureCurrentAccountHelper
   def account_accessible_for_bot?(account)
     render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
   end
+
+  def ensure_account_is_active?(account)
+    render_unauthorized('Account is suspended') unless account.active?
+  end
 end
diff --git a/app/controllers/concerns/website_token_helper.rb b/app/controllers/concerns/website_token_helper.rb
index 0158a4107..ea53a26ad 100644
--- a/app/controllers/concerns/website_token_helper.rb
+++ b/app/controllers/concerns/website_token_helper.rb
@@ -5,7 +5,9 @@ module WebsiteTokenHelper
 
   def set_web_widget
     @web_widget = ::Channel::WebWidget.find_by!(website_token: permitted_params[:website_token])
-    @current_account = @web_widget.account
+    @current_account = @web_widget.inbox.account
+
+    render json: { error: 'Account is suspended' }, status: :unauthorized unless @current_account.active?
   end
 
   def set_contact
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 36c789b52..bd144b0df 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -13,8 +13,7 @@ class DashboardController < ActionController::Base
 
   def set_global_config
     @global_config = GlobalConfig.get(
-      'LOGO',
-      'LOGO_THUMBNAIL',
+      'LOGO', 'LOGO_THUMBNAIL',
       'INSTALLATION_NAME',
       'WIDGET_BRAND_URL',
       'TERMS_URL',
@@ -29,7 +28,8 @@ class DashboardController < ActionController::Base
       'DIRECT_UPLOADS_ENABLED',
       'HCAPTCHA_SITE_KEY',
       'LOGOUT_REDIRECT_LINK',
-      'DISABLE_USER_PROFILE_UPDATE'
+      'DISABLE_USER_PROFILE_UPDATE',
+      'DEPLOYMENT_ENV'
     ).merge(app_config)
   end
 
diff --git a/app/controllers/platform/api/v1/accounts_controller.rb b/app/controllers/platform/api/v1/accounts_controller.rb
index a037f4e2f..9c8f60f38 100644
--- a/app/controllers/platform/api/v1/accounts_controller.rb
+++ b/app/controllers/platform/api/v1/accounts_controller.rb
@@ -27,6 +27,6 @@ class Platform::Api::V1::AccountsController < PlatformController
   end
 
   def account_params
-    params.permit(:name)
+    params.permit(:name, :locale)
   end
 end
diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index 2a961b7a9..e861d30ed 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -4,7 +4,7 @@ class Public::Api::V1::Portals::ArticlesController < ApplicationController
 
   def index
     @articles = @portal.articles
-    @articles = @articles.search(list_params) if params[:payload].present?
+    @articles = @articles.search(list_params) if list_params.present?
   end
 
   def show; end
@@ -20,6 +20,6 @@ class Public::Api::V1::Portals::ArticlesController < ApplicationController
   end
 
   def list_params
-    params.require(:payload).permit(:query)
+    params.permit(:query)
   end
 end
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 653d3360f..9639b28b2 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -4,6 +4,7 @@ class WidgetsController < ActionController::Base
 
   before_action :set_global_config
   before_action :set_web_widget
+  before_action :ensure_account_is_active
   before_action :set_token
   before_action :set_contact
   before_action :build_contact
@@ -46,6 +47,10 @@ class WidgetsController < ActionController::Base
     @contact = @contact_inbox.contact
   end
 
+  def ensure_account_is_active
+    render json: { error: 'Account is suspended' }, status: :unauthorized unless @web_widget.inbox.account.active?
+  end
+
   def additional_attributes
     if @web_widget.inbox.account.feature_enabled?('ip_lookup')
       { created_at_ip: request.remote_ip }
diff --git a/app/dashboards/account_dashboard.rb b/app/dashboards/account_dashboard.rb
index 408589597..0dfe7bbcd 100644
--- a/app/dashboards/account_dashboard.rb
+++ b/app/dashboards/account_dashboard.rb
@@ -17,6 +17,7 @@ class AccountDashboard < Administrate::BaseDashboard
     users: CountField,
     conversations: CountField,
     locale: Field::Select.with_options(collection: LANGUAGES_CONFIG.map { |_x, y| y[:iso_639_1_code] }),
+    status: Field::Select.with_options(collection: [%w[Active active], %w[Suspended suspended]]),
     account_users: Field::HasMany
   }.merge(enterprise_attribute_types).freeze
 
@@ -31,6 +32,7 @@ class AccountDashboard < Administrate::BaseDashboard
     locale
     users
     conversations
+    status
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
@@ -42,6 +44,7 @@ class AccountDashboard < Administrate::BaseDashboard
     created_at
     updated_at
     locale
+    status
     conversations
     account_users
   ] + enterprise_show_page_attributes).freeze
@@ -53,6 +56,7 @@ class AccountDashboard < Administrate::BaseDashboard
   FORM_ATTRIBUTES = (%i[
     name
     locale
+    status
   ] + enterprise_form_attributes).freeze
 
   # COLLECTION_FILTERS
diff --git a/app/drops/conversation_drop.rb b/app/drops/conversation_drop.rb
index ffd664659..d77e150c2 100644
--- a/app/drops/conversation_drop.rb
+++ b/app/drops/conversation_drop.rb
@@ -6,7 +6,7 @@ class ConversationDrop < BaseDrop
   end
 
   def contact_name
-    @obj.try(:contact).name.capitalize || 'Customer'
+    @obj.try(:contact).name.try(:capitalize) || 'Customer'
   end
 
   def recent_messages
diff --git a/app/javascript/dashboard/api/ApiClient.js b/app/javascript/dashboard/api/ApiClient.js
index 097caa906..25083dc99 100644
--- a/app/javascript/dashboard/api/ApiClient.js
+++ b/app/javascript/dashboard/api/ApiClient.js
@@ -15,6 +15,11 @@ class ApiClient {
 
   baseUrl() {
     let url = this.apiVersion;
+
+    if (this.options.enterprise) {
+      url = `/enterprise${url}`;
+    }
+
     if (this.options.accountScoped) {
       const isInsideAccountScopedURLs = window.location.pathname.includes(
         '/app/accounts'
diff --git a/app/javascript/dashboard/api/enterprise/account.js b/app/javascript/dashboard/api/enterprise/account.js
new file mode 100644
index 000000000..bc0d51dfc
--- /dev/null
+++ b/app/javascript/dashboard/api/enterprise/account.js
@@ -0,0 +1,18 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class EnterpriseAccountAPI extends ApiClient {
+  constructor() {
+    super('', { accountScoped: true, enterprise: true });
+  }
+
+  checkout() {
+    return axios.post(`${this.url}checkout`);
+  }
+
+  subscription() {
+    return axios.post(`${this.url}subscription`);
+  }
+}
+
+export default new EnterpriseAccountAPI();
diff --git a/app/javascript/dashboard/api/enterprise/specs/account.spec.js b/app/javascript/dashboard/api/enterprise/specs/account.spec.js
new file mode 100644
index 000000000..28fd83cd1
--- /dev/null
+++ b/app/javascript/dashboard/api/enterprise/specs/account.spec.js
@@ -0,0 +1,31 @@
+import accountAPI from '../account';
+import ApiClient from '../../ApiClient';
+import describeWithAPIMock from '../../specs/apiSpecHelper';
+
+describe('#enterpriseAccountAPI', () => {
+  it('creates correct instance', () => {
+    expect(accountAPI).toBeInstanceOf(ApiClient);
+    expect(accountAPI).toHaveProperty('get');
+    expect(accountAPI).toHaveProperty('show');
+    expect(accountAPI).toHaveProperty('create');
+    expect(accountAPI).toHaveProperty('update');
+    expect(accountAPI).toHaveProperty('delete');
+    expect(accountAPI).toHaveProperty('checkout');
+  });
+
+  describeWithAPIMock('API calls', context => {
+    it('#checkout', () => {
+      accountAPI.checkout();
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/enterprise/api/v1/checkout'
+      );
+    });
+
+    it('#subscription', () => {
+      accountAPI.subscription();
+      expect(context.axiosMock.post).toHaveBeenCalledWith(
+        '/enterprise/api/v1/subscription'
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/helpCenter/articles.js b/app/javascript/dashboard/api/helpCenter/articles.js
new file mode 100644
index 000000000..7430d65a4
--- /dev/null
+++ b/app/javascript/dashboard/api/helpCenter/articles.js
@@ -0,0 +1,26 @@
+/* global axios */
+
+import PortalsAPI from './portals';
+
+class ArticlesAPI extends PortalsAPI {
+  constructor() {
+    super('articles', { accountScoped: true });
+  }
+
+  getArticles({
+    pageNumber,
+    portalSlug,
+    locale,
+    status,
+    author_id,
+    category_slug,
+  }) {
+    let baseUrl = `${this.url}/${portalSlug}/articles?page=${pageNumber}&locale=${locale}`;
+    if (status !== undefined) baseUrl += `&status=${status}`;
+    if (author_id) baseUrl += `&author_id=${author_id}`;
+    if (category_slug) baseUrl += `&category_slug=${category_slug}`;
+    return axios.get(baseUrl);
+  }
+}
+
+export default new ArticlesAPI();
diff --git a/app/javascript/dashboard/api/helpCenter/categories.js b/app/javascript/dashboard/api/helpCenter/categories.js
new file mode 100644
index 000000000..c5cb40cd4
--- /dev/null
+++ b/app/javascript/dashboard/api/helpCenter/categories.js
@@ -0,0 +1,27 @@
+/* global axios */
+
+import PortalsAPI from './portals';
+
+class CategoriesAPI extends PortalsAPI {
+  constructor() {
+    super('categories', { accountScoped: true });
+  }
+
+  get({ portalSlug }) {
+    return axios.get(`${this.url}/${portalSlug}/categories`);
+  }
+
+  create({ portalSlug, categoryObj }) {
+    return axios.post(`${this.url}/${portalSlug}/categories`, categoryObj);
+  }
+
+  update({ portalSlug, categoryObj }) {
+    return axios.patch(`${this.url}/${portalSlug}/categories`, categoryObj);
+  }
+
+  delete({ portalSlug, categoryId }) {
+    return axios.delete(`${this.url}/${portalSlug}/categories/${categoryId}`);
+  }
+}
+
+export default new CategoriesAPI();
diff --git a/app/javascript/dashboard/api/helpCenter/portals.js b/app/javascript/dashboard/api/helpCenter/portals.js
new file mode 100644
index 000000000..594050cdf
--- /dev/null
+++ b/app/javascript/dashboard/api/helpCenter/portals.js
@@ -0,0 +1,9 @@
+import ApiClient from '../ApiClient';
+
+class PortalsAPI extends ApiClient {
+  constructor() {
+    super('portals', { accountScoped: true });
+  }
+}
+
+export default PortalsAPI;
diff --git a/app/javascript/dashboard/api/specs/article.spec.js b/app/javascript/dashboard/api/specs/article.spec.js
new file mode 100644
index 000000000..a60a784c0
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/article.spec.js
@@ -0,0 +1,29 @@
+import articlesAPI from '../helpCenter/articles';
+import ApiClient from 'dashboard/api/helpCenter/portals';
+import describeWithAPIMock from './apiSpecHelper';
+
+describe('#PortalAPI', () => {
+  it('creates correct instance', () => {
+    expect(articlesAPI).toBeInstanceOf(ApiClient);
+    expect(articlesAPI).toHaveProperty('get');
+    expect(articlesAPI).toHaveProperty('show');
+    expect(articlesAPI).toHaveProperty('create');
+    expect(articlesAPI).toHaveProperty('update');
+    expect(articlesAPI).toHaveProperty('delete');
+    expect(articlesAPI).toHaveProperty('getArticles');
+  });
+  describeWithAPIMock('API calls', context => {
+    it('#getArticles', () => {
+      articlesAPI.getArticles({
+        pageNumber: 1,
+        portalSlug: 'room-rental',
+        locale: 'en-US',
+        status: 'published',
+        author_id: '1',
+      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/portals/room-rental/articles?page=1&locale=en-US&status=published&author_id=1'
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/helpCenter/categories.spec.js b/app/javascript/dashboard/api/specs/helpCenter/categories.spec.js
new file mode 100644
index 000000000..2c56f4e00
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/helpCenter/categories.spec.js
@@ -0,0 +1,12 @@
+import categoriesAPI from '../../helpCenter/categories';
+import ApiClient from '../../ApiClient';
+
+describe('#BulkActionsAPI', () => {
+  it('creates correct instance', () => {
+    expect(categoriesAPI).toBeInstanceOf(ApiClient);
+    expect(categoriesAPI).toHaveProperty('get');
+    expect(categoriesAPI).toHaveProperty('create');
+    expect(categoriesAPI).toHaveProperty('update');
+    expect(categoriesAPI).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/portals.spec.js b/app/javascript/dashboard/api/specs/portals.spec.js
new file mode 100644
index 000000000..8d6968cb7
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/portals.spec.js
@@ -0,0 +1,13 @@
+import PortalsAPI from '../helpCenter/portals';
+import ApiClient from '../ApiClient';
+const portalAPI = new PortalsAPI();
+describe('#PortalAPI', () => {
+  it('creates correct instance', () => {
+    expect(portalAPI).toBeInstanceOf(ApiClient);
+    expect(portalAPI).toHaveProperty('get');
+    expect(portalAPI).toHaveProperty('show');
+    expect(portalAPI).toHaveProperty('create');
+    expect(portalAPI).toHaveProperty('update');
+    expect(portalAPI).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/assets/images/bubble-logo.svg b/app/javascript/dashboard/assets/images/bubble-logo.svg
new file mode 100644
index 000000000..1eb8c620e
--- /dev/null
+++ b/app/javascript/dashboard/assets/images/bubble-logo.svg
@@ -0,0 +1,3 @@
+<svg width="66" height="66" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M63 63H32.9976C16.4591 63 2.99996 49.5399 2.99996 32.9973C2.99996 16.4601 16.4591 3 32.9979 3C49.5408 3 63 16.4601 63 32.9973V63Z" fill="white" stroke="white" stroke-width="6"/>
+</svg>
\ No newline at end of file
diff --git a/app/javascript/dashboard/assets/scss/_animations.scss b/app/javascript/dashboard/assets/scss/_animations.scss
index 4f5a2d43f..bb01c369f 100644
--- a/app/javascript/dashboard/assets/scss/_animations.scss
+++ b/app/javascript/dashboard/assets/scss/_animations.scss
@@ -1,11 +1,9 @@
-/* Enter and leave animations can use different */
-/* durations and timing functions.              */
 .slide-fade-enter-active {
-  transition: all .3s $ease-in-cubic;
+  transition: all 0.3s var(--ease-in-cubic);
 }
 
 .slide-fade-leave-active {
-  transition: all .3s $ease-out-cubic;
+  transition: all 0.3s var(--ease-out-cubic);
 }
 
 .slide-fade-enter,
@@ -24,7 +22,7 @@
 
 .conversations-list-enter-active,
 .conversations-list-leave-active {
-  transition: all .25s $ease-out-cubic;
+  transition: all 0.25s var(--ease-out-cubic);
 }
 
 .conversations-list-enter,
@@ -35,11 +33,10 @@
 
 .menu-list-enter-active,
 .menu-list-leave-active {
-  transition: opacity .3s $ease-out-cubic,
-    transform .2s $ease-out-cubic;
+  transition: opacity 0.3s var(--ease-out-cubic),
+    transform 0.2s var(--ease-out-cubic);
 }
 
-
 .menu-list-leave-to {
   opacity: 0;
   position: absolute;
@@ -52,23 +49,24 @@
 }
 
 .slide-up-enter-active {
-  transition: all .3s $ease-in-cubic;
+  transition: all 0.3s var(--ease-in-cubic);
 }
 
 .slide-up-leave-active {
-  transition: all .3s $ease-out-cubic;
+  transition: all 0.3s var(--ease-out-cubic);
 }
 
 .slide-up-enter,
 .slide-up-leave-to {
-  transform: translateY(-$space-medium);
   opacity: 0;
+  transform: translateY(-$space-medium);
 }
 
 .menu-slide-enter-active,
 .menu-slide-leave-active {
   transform: translateY(0);
-  transition: transform 0.25s $ease-in-cubic, opacity 0.15s $ease-in-cubic;
+  transition: transform 0.25s var(--ease-in-cubic),
+    opacity 0.15s var(--ease-in-cubic);
 }
 
 .menu-slide-enter,
@@ -77,13 +75,12 @@
   transform: translateY($space-small);
 }
 
-
 .toast-fade-enter-active {
-  transition: all .3s $ease-in-sine;
+  transition: all 0.3s var(--ease-in-sine);
 }
 
 .toast-fade-leave-active {
-  transition: all .1s $ease-out-sine;
+  transition: all 0.1s var(--ease-out-sine);
 }
 
 .toast-fade-enter,
@@ -93,11 +90,11 @@
 }
 
 .modal-fade-enter-active {
-  transition: all .3s $ease-in-sine;
+  transition: all 0.3s var(--ease-in-sine);
 }
 
 .modal-fade-leave-active {
-  transition: all .1s $ease-out-sine;
+  transition: all 0.1s var(--ease-out-sine);
 }
 
 .modal-fade-enter,
@@ -106,15 +103,15 @@
 }
 
 .network-notification-fade-enter-active {
-  transition: all .1s $ease-in-sine;
+  transition: all 0.1s var(--ease-in-sine);
 }
 
 .network-notification-fade-leave-active {
-  transition: all .1s $ease-out-sine;
+  transition: all 0.1s var(--ease-out-sine);
 }
 
 .network-notification-fade-enter,
 .network-notification-fade-leave-to {
-  transform: translateY(-$space-small);
   opacity: 0;
+  transform: translateY(-$space-small);
 }
diff --git a/app/javascript/dashboard/assets/scss/_layout.scss b/app/javascript/dashboard/assets/scss/_layout.scss
index 198bb75e5..682ca7670 100644
--- a/app/javascript/dashboard/assets/scss/_layout.scss
+++ b/app/javascript/dashboard/assets/scss/_layout.scss
@@ -41,24 +41,22 @@ is-closed .app-root {
 
 .view-box {
   @include full-height;
-  @include margin(0);
   @include space-between-column;
 
   height: 100vh;
+  margin: 0;
 }
 
 .view-panel {
-  @include margin($zero);
-  @include padding($space-normal);
-
   flex-direction: column;
+  margin: 0;
   overflow-y: auto;
+  padding: $space-normal;
 }
 
 .content-box {
-  @include padding($space-normal);
-
   overflow: auto;
+  padding: $space-normal;
 }
 
 .back-button {
@@ -91,8 +89,7 @@ is-closed .app-root {
   justify-content: center;
 
   img {
-    @include padding($space-one);
-
     max-width: $space-mega;
+    padding: $space-one;
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index e709327dc..416aa808b 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -1,4 +1,5 @@
 @import 'shared/assets/fonts/inter';
+@import 'shared/assets/stylesheets/animations';
 @import 'shared/assets/stylesheets/colors';
 @import 'shared/assets/stylesheets/spacing';
 @import 'shared/assets/stylesheets/font-size';
@@ -16,7 +17,6 @@
 @import 'date-picker';
 
 @import 'foundation-sites/scss/foundation';
-@import '~bourbon/core/bourbon';
 
 @include foundation-everything($flex: true);
 
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index deba11150..525697d91 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -16,11 +16,11 @@
   margin-bottom: var(--space-normal);
 
   &.multiselect--disabled {
-    opacity: .8;
+    opacity: 0.8;
   }
 
   .multiselect--active {
-    >.multiselect__tags {
+    > .multiselect__tags {
       border-color: $color-woot;
     }
   }
@@ -96,9 +96,9 @@
   }
 
   .multiselect__tags {
-    @include margin(0);
     border: 1px solid $color-border;
     border-color: $color-border;
+    margin: 0;
     min-height: 4.4rem;
     padding-top: $zero;
   }
@@ -130,10 +130,10 @@
 
   .multiselect__input {
     @include ghost-input;
-    @include padding($zero);
     font-size: $font-size-small;
     height: 4.4rem;
     margin-bottom: $zero;
+    padding: 0;
   }
 
   .multiselect__single {
@@ -145,7 +145,6 @@
 }
 
 .sidebar-labels-wrap {
-
   &.has-edited,
   &:hover {
     .multiselect {
@@ -154,15 +153,15 @@
   }
 
   .multiselect {
-    >.multiselect__select {
+    > .multiselect__select {
       visibility: hidden;
     }
 
-    >.multiselect__tags {
+    > .multiselect__tags {
       border-color: transparent;
     }
 
-    &.multiselect--active>.multiselect__tags {
+    &.multiselect--active > .multiselect__tags {
       border-color: $color-woot;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/storybook.scss b/app/javascript/dashboard/assets/scss/storybook.scss
index 2364c3d5b..e9973b150 100644
--- a/app/javascript/dashboard/assets/scss/storybook.scss
+++ b/app/javascript/dashboard/assets/scss/storybook.scss
@@ -1,4 +1,5 @@
 @import 'shared/assets/fonts/inter';
+@import 'shared/assets/stylesheets/animations';
 @import 'shared/assets/stylesheets/colors';
 @import 'shared/assets/stylesheets/spacing';
 @import 'shared/assets/stylesheets/font-size';
@@ -17,8 +18,6 @@
 @import 'foundation-sites/scss/foundation';
 
 @include foundation-prototype-spacing;
-@import '~bourbon/core/bourbon';
-
 @include foundation-everything($flex: true);
 
 @import 'typography';
diff --git a/app/javascript/dashboard/assets/scss/views/settings/channel.scss b/app/javascript/dashboard/assets/scss/views/settings/channel.scss
index c22888ba5..5782744d3 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/channel.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/channel.scss
@@ -1,3 +1,5 @@
+$channel-hover-color: rgba(0, 0, 0, 0.1);
+
 .channels {
   margin-top: $space-medium;
 
@@ -7,14 +9,14 @@
 
   .channel {
     @include flex;
-    @include padding($space-normal $zero);
     @include background-white;
     @include border-light;
 
     cursor: pointer;
     flex-direction: column;
     margin: -1px;
-    transition: all 0.200s ease-in;
+    padding: $space-normal $zero;
+    transition: all 0.2s ease-in;
 
     &:last-child {
       @include border-light;
@@ -22,16 +24,16 @@
 
     &:hover {
       border: 1px solid $primary-color;
-      box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
+      box-shadow: 0 2px 8px $channel-hover-color;
       z-index: 999;
     }
 
     &.disabled {
-      opacity: .6;
+      opacity: 0.6;
     }
 
     img {
-      @include margin($space-normal auto);
+      margin: $space-normal auto;
       width: 50%;
     }
 
@@ -43,8 +45,8 @@
     }
 
     p {
-      width: 100%;
       color: $medium-gray;
+      width: 100%;
     }
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
index d2b145286..15edb4e76 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
@@ -4,33 +4,33 @@
 
 // Conversation header - Light BG
 .settings-header {
-  @include padding($space-small $space-normal);
   @include background-white;
   @include flex;
   @include flex-align($x: justify, $y: middle);
   border-bottom: 1px solid var(--s-50);
   height: $header-height;
   min-height: $header-height;
+  padding: $space-small $space-normal;
 
   // Resolve Button
   .button {
-    @include margin(0);
+    margin: 0;
   }
 
   // User thumbnail and text
   .page-title {
     @include flex;
     @include flex-align($x: center, $y: middle);
-    @include margin($zero);
+    margin: 0;
   }
 }
 
 .wizard-box {
   .item {
-    @include padding($space-normal $space-normal $space-normal $space-medium);
     @include background-light;
 
     cursor: pointer;
+    padding: $space-normal $space-normal $space-normal $space-medium;
     position: relative;
 
     &::before,
@@ -128,89 +128,27 @@
 
 .wizard-body {
   @include background-white;
-  @include padding($space-medium);
   @include border-light;
   @include full-height();
+  padding: $space-medium;
 
   &.height-auto {
     height: auto;
   }
 }
 
-.inoboxes-list {
-  .inbox-item {
-    @include margin($space-normal);
-    @include flex;
-    @include flex-shrink;
-    @include padding($space-normal $space-normal);
-    @include border-light-bottom();
-
-    background: $color-white;
-    cursor: pointer;
-    flex-direction: column;
-    float: left;
-    min-height: 10rem;
-    width: 20%;
-
-    &:last-child {
-      @include border-nil;
-
-      margin-bottom: $zero;
-    }
-
-    &:hover {
-      @include background-gray;
-
-      .arrow {
-        opacity: 1;
-        transform: translateX($space-small);
-      }
-    }
-
-    .switch {
-      align-self: center;
-      margin-bottom: $zero;
-      margin-right: $space-normal;
-    }
-
-    .item--details {
-      @include padding($space-normal $zero);
-
-      .item--name {
-        font-size: $font-size-large;
-        line-height: 1;
-      }
-
-      .item--sub {
-        font-size: $font-size-small;
-        margin-bottom: 0;
-      }
-    }
-
-    .arrow {
-      align-self: center;
-      color: $medium-gray;
-      font-size: $font-size-small;
-      opacity: 0.7;
-      transform: translateX(0);
-      transition: opacity 0.1s ease-in 0s, transform 0.2s ease-in 0.03s;
-    }
-  }
-}
-
 .settings--content {
-  @include margin($space-small $space-large);
+  margin: $space-small $space-large;
 
   .title {
     font-weight: $font-weight-medium;
   }
 
   .code {
-    @include padding($space-one);
-
     background: $color-background;
     max-height: $space-mega;
     overflow: auto;
+    padding: $space-one;
     white-space: nowrap;
 
     code {
@@ -225,7 +163,7 @@
   text-align: center;
 
   p {
-    @include padding($space-medium);
+    padding: $space-medium;
   }
 
   > a > img {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 0ad6dff38..52a50afb6 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -1,5 +1,4 @@
 @keyframes left-shift-animation {
-
   0%,
   100% {
     transform: translateX(0);
@@ -13,15 +12,15 @@
 .conversation {
   @include flex;
   @include flex-shrink;
-  @include padding(0 0 0 $space-normal);
   border-bottom: 1px solid transparent;
   border-left: $space-micro solid transparent;
   border-top: 1px solid transparent;
   cursor: pointer;
+  padding: 0 0 0 $space-normal;
   position: relative;
 
   &.active {
-    animation: left-shift-animation .25s $swift-ease-out-function;
+    animation: left-shift-animation 0.25s $swift-ease-out-function;
     background: $color-background;
     border-bottom-color: $color-border-light;
     border-left-color: $color-woot;
@@ -31,7 +30,7 @@
       border-top-color: transparent;
     }
 
-    +.conversation .conversation--details {
+    + .conversation .conversation--details {
       border-top-color: transparent;
     }
   }
@@ -48,13 +47,12 @@
     }
   }
 
-
   .conversation--details {
-    @include margin(0 0 0 $space-one);
     @include border-light-bottom;
     @include border-light-top;
-    @include padding($space-slab 0);
     border-bottom-color: transparent;
+    margin: 0 0 0 $space-one;
+    padding: $space-slab 0;
   }
 
   .conversation--user {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 3066d0e43..b67932e6d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -1,6 +1,8 @@
+// scss-lint:disable MergeableSelector
+
 @mixin bubble-with-types {
-  @include padding($space-small $space-normal);
-  @include margin($zero);
+  padding: $space-small $space-normal;
+  margin: 0;
   background: $color-woot;
   border-radius: $space-one;
   color: var(--white);
@@ -37,7 +39,11 @@
     }
 
     &::before {
-      background-image: linear-gradient(-180deg, transparent 3%, $color-heading 130%);
+      background-image: linear-gradient(
+        -180deg,
+        transparent 3%,
+        $color-heading 130%
+      );
       bottom: 0;
       content: '';
       height: 20%;
@@ -75,16 +81,15 @@
   }
 
   .conversations-list {
-    @include flex-weight(1);
     @include scroll-on-hover;
+    flex: 1 1;
   }
 
   .chat-list__top {
     @include flex;
-    @include padding($zero $zero $space-micro $zero);
-
     align-items: center;
     justify-content: space-between;
+    padding: $zero $zero $space-micro;
 
     .page-title {
       margin-bottom: $zero;
@@ -92,13 +97,13 @@
     }
 
     .status--filter {
-      @include padding($zero null $zero $space-normal);
-      @include margin($zero);
       background-color: $color-background-light;
       border: 1px solid $color-border;
       float: right;
       font-size: $font-size-mini;
       height: $space-medium;
+      margin: 0;
+      padding: $zero $space-medium $zero $space-normal;
       width: auto;
     }
   }
@@ -110,19 +115,19 @@
 
 .conversation-panel {
   @include flex;
-  @include flex-weight(1 1 1px);
-  @include margin($zero);
+  flex: 1 1 1px;
   flex-direction: column;
   height: 100%;
+  margin: 0;
   overflow-y: auto;
   padding-bottom: var(--space-normal);
   position: relative;
 }
 
-.conversation-panel>li {
+.conversation-panel > li {
   @include flex;
   @include flex-shrink;
-  @include margin($zero $zero $space-micro);
+  margin: $zero $zero $space-micro;
   position: relative;
 
   &:first-child {
@@ -134,11 +139,11 @@
   }
 
   &.unread--toast {
-    +.right {
+    + .right {
       margin-bottom: var(--space-micro);
     }
 
-    +.left {
+    + .left {
       margin-bottom: 0;
     }
 
@@ -165,9 +170,7 @@
     }
   }
 
-
   &.left {
-
     .bubble {
       @include border-normal;
       background: $white;
@@ -198,10 +201,9 @@
           color: $color-primary-dark;
         }
       }
-
     }
 
-    +.right {
+    + .right {
       margin-top: $space-one;
 
       .bubble {
@@ -209,8 +211,8 @@
       }
     }
 
-    +.unread--toast {
-      +.right {
+    + .unread--toast {
+      + .right {
         margin-top: $space-one;
 
         .bubble {
@@ -218,7 +220,7 @@
         }
       }
 
-      +.left {
+      + .left {
         margin-top: 0;
       }
     }
@@ -264,7 +266,7 @@
       }
     }
 
-    +.left {
+    + .left {
       margin-top: $space-one;
 
       .bubble {
@@ -272,8 +274,8 @@
       }
     }
 
-    +.unread--toast {
-      +.left {
+    + .unread--toast {
+      + .left {
         margin-top: $space-one;
 
         .bubble {
@@ -281,11 +283,10 @@
         }
       }
 
-      +.right {
+      + .right {
         margin-top: 0;
       }
     }
-
   }
 
   &.center {
@@ -293,10 +294,9 @@
   }
 
   .wrap {
-    @include margin($zero $space-normal);
-
     --bubble-max-width: 49.6rem;
-    max-width: Min(var(--bubble-max-width), 85%);
+    margin: $zero $space-normal;
+    max-width: Min(var(--bubble-max-width), 84%);
 
     .sender--name {
       font-size: $font-size-mini;
@@ -320,7 +320,8 @@
     font-size: var(--font-size-small);
     justify-content: center;
     margin: var(--space-smaller) 0;
-    padding: var(--space-smaller) var(--space-micro) var(--space-smaller) var(--space-one);
+    padding: var(--space-smaller) var(--space-micro) var(--space-smaller)
+      var(--space-one);
 
     .is-text {
       display: inline-flex;
@@ -371,7 +372,6 @@
 }
 
 .left .bubble .text-content {
-
   h1,
   h2,
   h3,
@@ -400,7 +400,6 @@
 }
 
 .right .bubble .text-content {
-
   h1,
   h2,
   h3,
diff --git a/app/javascript/dashboard/assets/scss/widgets/_forms.scss b/app/javascript/dashboard/assets/scss/widgets/_forms.scss
index 13548db5f..17c0dc859 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_forms.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_forms.scss
@@ -1,5 +1,22 @@
+// scss-lint:disable QualifyingElement
+
 .error {
-  #{$all-text-inputs},
+  input[type='color'],
+  input[type='date'],
+  input[type='datetime'],
+  input[type='datetime-local'],
+  input[type='email'],
+  input[type='month'],
+  input[type='number'],
+  input[type='password'],
+  input[type='search'],
+  input[type='tel'],
+  input[type='text'],
+  input[type='time'],
+  input[type='url'],
+  input[type='week'],
+  input:not([type]),
+  textarea,
   select,
   .multiselect > .multiselect__tags {
     @include thin-border(var(--r-400));
diff --git a/app/javascript/dashboard/assets/scss/widgets/_login.scss b/app/javascript/dashboard/assets/scss/widgets/_login.scss
index 8deaef1f8..a5b140ede 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_login.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_login.scss
@@ -30,11 +30,9 @@
   .login-box {
     @include background-white;
     @include border-normal;
-    @include border-top-radius($space-smaller);
-    @include border-right-radius($space-smaller);
-    @include border-bottom-radius($space-smaller);
-    @include border-left-radius($space-smaller);
     @include elegant-card;
+
+    border-radius: $space-smaller;
     padding: $space-large;
 
     label {
@@ -61,7 +59,7 @@
     font-size: $font-size-default;
     padding: $space-medium;
 
-    >a {
+    > a {
       font-weight: $font-weight-bold;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
index cf48bcd6e..68ea09589 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
@@ -30,7 +30,7 @@
 }
 
 .page-top-bar {
-  @include padding($space-large $space-large $zero);
+  padding: $space-large $space-large $zero;
 
   img {
     max-height: 6rem;
@@ -53,8 +53,8 @@
   }
 
   .content-box {
-    @include padding($zero);
     height: auto;
+    padding: 0;
   }
 
   h2 {
@@ -64,29 +64,29 @@
   }
 
   p {
-    @include margin($zero);
-    @include padding($zero);
     font-size: $font-size-small;
+    margin: 0;
+    padding: 0;
   }
 
   .content {
-    @include padding($space-large);
+    padding: $space-large;
   }
 
   form,
   .modal-content {
-    @include padding($space-large);
     align-self: center;
+    padding: $space-large;
 
     a {
-      @include padding($space-normal);
+      padding: $space-normal;
     }
   }
 
   .modal-footer {
     @include flex;
     @include flex-align($x: flex-start, $y: middle);
-    @include padding($space-small $zero);
+    padding: $space-small $zero;
 
     button {
       font-size: $font-size-small;
@@ -98,10 +98,10 @@
   }
 
   .delete-item {
-    @include padding($space-large);
+    padding: $space-large;
 
     button {
-      @include margin($zero);
+      margin: 0;
     }
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index 1d2c3f63d..d33f558e3 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -1,14 +1,12 @@
 .reply-box {
-  transition: box-shadow .35s $swift-ease-out-function,
+  transition: box-shadow 0.35s $swift-ease-out-function,
     height 2s $swift-ease-out-function;
 
-
   &.is-focused {
     box-shadow: var(--shadow);
   }
 
   .reply-box__top {
-
     .icon {
       color: $medium-gray;
       cursor: pointer;
@@ -20,7 +18,6 @@
       }
     }
 
-
     .attachment {
       cursor: pointer;
       margin-right: $space-one;
@@ -37,13 +34,12 @@
       resize: none;
     }
 
-    >textarea {
+    > textarea {
       @include ghost-input();
-      @include margin(0);
       background: transparent;
-      // Override min-height : 50px in foundation
-      //
+      margin: 0;
       max-height: $space-mega * 2.4;
+      // Override min-height : 50px in foundation
       min-height: 4.8rem;
       padding: var(--space-normal) 0 0;
       resize: none;
@@ -56,10 +52,9 @@
     .reply-box__top {
       background: var(--y-50);
 
-      >input {
+      > input {
         background: var(--y-50);
       }
     }
   }
-
 }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_report.scss b/app/javascript/dashboard/assets/scss/widgets/_report.scss
index 5299f1155..6caf2cac7 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_report.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_report.scss
@@ -1,9 +1,10 @@
 .report-card {
-  @include padding($space-normal $space-small $space-normal $space-two);
-  @include margin($zero);
-  cursor: pointer;
   @include custom-border-top(3px, transparent);
 
+  cursor: pointer;
+  margin: 0;
+  padding: $space-normal $space-small $space-normal $space-two;
+
   &.active {
     @include custom-border-top(3px, $color-woot);
     @include background-white;
@@ -14,12 +15,12 @@
   }
 
   .heading {
-    @include margin($zero);
-    font-size: $font-size-small;
-    font-weight: $font-weight-bold;
+    align-items: center;
     color: $color-heading;
     display: flex;
-    align-items: center;
+    font-size: $font-size-small;
+    font-weight: $font-weight-bold;
+    margin: 0;
   }
 
   .info-icon {
@@ -52,31 +53,31 @@
   }
 
   .desc {
-    @include margin($zero);
     font-size: $font-size-small;
+    margin: 0;
     text-transform: capitalize;
   }
 }
 
 .report-bar {
-  @include margin(-1px $zero);
   @include background-white;
   @include border-light;
-  @include padding($space-small $space-medium);
+  margin: -1px $zero;
+  padding: $space-small $space-medium;
 
   .chart-container {
     @include flex;
-    flex-direction: column;
     @include flex-align(center, middle);
+    flex-direction: column;
 
     div {
       width: 100%;
     }
 
     .empty-state {
-      @include margin($space-jumbo);
-      font-size: $font-size-default;
       color: $color-gray;
+      font-size: $font-size-default;
+      margin: $space-jumbo;
     }
 
     .business-hours {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_search-box.scss b/app/javascript/dashboard/assets/scss/widgets/_search-box.scss
index 6bd3ba2d6..643757e60 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_search-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_search-box.scss
@@ -1,17 +1,18 @@
 .search {
   @include flex;
   @include flex-align($x: left, $y: middle);
-  @include padding($space-one $space-normal);
   @include flex-shrink;
-  transition: all .3s $ease-in-out-quad;
+
+  padding: $space-one $space-normal;
+  transition: all 0.3s var(--ease-in-out-quad);
 
   > .icon {
-    font-size: $font-size-medium;
     color: $medium-gray;
+    font-size: $font-size-medium;
   }
 
   > input {
     @include ghost-input();
-    @include margin(0);
+    margin: 0;
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
index e5e9276fd..a10ef530f 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
@@ -11,8 +11,8 @@
   //logo
   .logo {
     img {
-      @include padding($woot-logo-padding);
       max-height: 108px;
+      padding: $woot-logo-padding;
     }
   }
 
@@ -36,9 +36,9 @@
 .bottom-nav {
   @include flex;
   @include space-between-column;
-  @include padding($space-one $space-normal $space-one $space-one);
   @include border-normal-top;
   flex-direction: column;
+  padding: $space-one $space-normal $space-one $space-one;
   position: relative;
 
   &:hover {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
index 5f60d827c..85d8f747d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
@@ -11,7 +11,6 @@
 }
 
 .ui-snackbar {
-  @include padding($space-slab $space-medium);
   @include shadow;
   background-color: $woot-snackbar-bg;
   border-radius: $space-smaller;
@@ -20,6 +19,7 @@
   max-width: 40rem;
   min-height: 3rem;
   min-width: 24rem;
+  padding: $space-slab $space-medium;
   text-align: left;
 }
 
@@ -34,12 +34,12 @@
   padding-left: 3rem;
 
   button {
-    @include margin(0);
-    @include padding(0);
     background: none;
     border: 0;
     color: $woot-snackbar-button;
     font-size: $font-size-small;
+    margin: 0;
+    padding: 0;
     text-transform: uppercase;
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss b/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
index df0eead9f..ad0f805e2 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
@@ -1,11 +1,10 @@
 .status-bar {
   @include flex;
-  flex-direction: column;
   @include flex-align($x: center, $y: middle);
   background: lighten($warning-color, 36%);
-  // @include elegant-card();
-  @include margin($zero);
-  @include padding($space-normal $space-smaller);
+  flex-direction: column;
+  margin: 0;
+  padding: $space-normal $space-smaller;
 
   .message {
     font-weight: $font-weight-medium;
@@ -13,7 +12,7 @@
   }
 
   .button {
-    @include margin($space-smaller $zero $zero);
+    margin: $space-smaller $zero $zero;
     padding: $space-small $space-normal;
   }
 
@@ -23,14 +22,18 @@
     .button {
       // Default and disabled states
       &,
-      &.disabled, &[disabled],
-      &.disabled:hover, &[disabled]:hover,
-      &.disabled:focus, &[disabled]:focus {
+      &.disabled,
+      &[disabled],
+      &.disabled:hover,
+      &[disabled]:hover,
+      &.disabled:focus,
+      &[disabled]:focus {
         background-color: $alert-color;
         color: $color-white;
       }
 
-      &:hover, &:focus {
+      &:hover,
+      &:focus {
         background-color: darken($alert-color, 7%);
         color: $color-white;
       }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
index 234d7e171..9a6f6951c 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
@@ -7,12 +7,12 @@
 }
 
 .tabs {
-  @include padding($zero $space-normal);
   border-left-width: 0;
   border-right-width: 0;
   border-top-width: 0;
   display: flex;
   min-width: var(--space-mega);
+  padding: $zero $space-normal;
 }
 
 .tabs--with-scroll {
@@ -46,8 +46,8 @@
 }
 
 .tabs-title {
-  @include margin($zero $space-slab);
   flex-shrink: 0;
+  margin: $zero $space-slab;
 
   .badge {
     background: $color-background;
@@ -75,14 +75,15 @@
   }
 
   a {
-    @include position(relative, 1px null null null);
     align-items: center;
     border-bottom: 2px solid transparent;
     color: $medium-gray;
     display: flex;
     flex-direction: row;
     font-size: $font-size-small;
-    transition: border-color .15s $swift-ease-out-function;
+    position: relative;
+    top: 1px;
+    transition: border-color 0.15s $swift-ease-out-function;
   }
 
   &.is-active {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
index 0a1a5c4b6..915840786 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
@@ -15,7 +15,7 @@ table {
     }
 
     td {
-      @include padding($space-one $space-small);
+      padding: $space-one $space-small;
     }
   }
 }
@@ -54,6 +54,6 @@ table {
   }
 
   .button {
-    @include margin($zero);
+    margin: 0;
   }
 }
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index d1ac4945f..16865d0dc 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,5 +1,11 @@
 <template>
-  <div class="conversations-list-wrap">
+  <div
+    class="conversations-list-wrap"
+    :class="{
+      hide: !showConversationList,
+      'list--full-width': isOnExpandedLayout,
+    }"
+  >
     <slot />
     <div
       class="chat-list__top"
@@ -46,7 +52,7 @@
 
         <woot-button
           v-else
-          v-tooltip.top-end="$t('FILTER.TOOLTIP_LABEL')"
+          v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
           variant="clear"
           color-scheme="secondary"
           icon="filter"
@@ -97,7 +103,11 @@
       @update-conversations="onUpdateConversations"
       @assign-labels="onAssignLabels"
     />
-    <div ref="activeConversation" class="conversations-list">
+    <div
+      ref="activeConversation"
+      class="conversations-list"
+      :class="{ 'is-context-menu-open': isContextMenuOpen }"
+    >
       <conversation-card
         v-for="chat in conversationList"
         :key="chat.id"
@@ -110,6 +120,11 @@
         :selected="isConversationSelected(chat.id)"
         @select-conversation="selectConversation"
         @de-select-conversation="deSelectConversation"
+        @assign-agent="onAssignAgent"
+        @assign-team="onAssignTeam"
+        @assign-label="onAssignLabels"
+        @update-conversation-status="toggleConversationStatus"
+        @context-menu-toggle="onContextMenuToggle"
       />
 
       <div v-if="chatListLoading" class="text-center">
@@ -202,6 +217,14 @@ export default {
       type: [String, Number],
       default: 0,
     },
+    showConversationList: {
+      default: true,
+      type: Boolean,
+    },
+    isOnExpandedLayout: {
+      default: false,
+      type: Boolean,
+    },
   },
   data() {
     return {
@@ -217,6 +240,7 @@ export default {
       showDeleteFoldersModal: false,
       selectedConversations: [],
       selectedInboxes: [],
+      isContextMenuOpen: false,
     };
   },
   computed: {
@@ -584,32 +608,79 @@ export default {
         this.resetBulkActions();
       }
     },
-    async onAssignAgent(agent) {
+    // Same method used in context menu, conversationId being passed from there.
+    async onAssignAgent(agent, conversationId = null) {
       try {
         await this.$store.dispatch('bulkActions/process', {
           type: 'Conversation',
-          ids: this.selectedConversations,
+          ids: conversationId || this.selectedConversations,
           fields: {
             assignee_id: agent.id,
           },
         });
         this.selectedConversations = [];
-        this.showAlert(this.$t('BULK_ACTION.ASSIGN_SUCCESFUL'));
+        if (conversationId) {
+          this.showAlert(
+            this.$t(
+              'CONVERSATION.CARD_CONTEXT_MENU.API.AGENT_ASSIGNMENT.SUCCESFUL',
+              {
+                agentName: agent.name,
+                conversationId,
+              }
+            )
+          );
+        } else {
+          this.showAlert(this.$t('BULK_ACTION.ASSIGN_SUCCESFUL'));
+        }
       } catch (err) {
         this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
       }
     },
-    async onAssignLabels(labels) {
+    async onAssignTeam(team, conversationId = null) {
+      try {
+        await this.$store.dispatch('assignTeam', {
+          conversationId,
+          teamId: team.id,
+        });
+        this.showAlert(
+          this.$t(
+            'CONVERSATION.CARD_CONTEXT_MENU.API.TEAM_ASSIGNMENT.SUCCESFUL',
+            {
+              team: team.name,
+              conversationId,
+            }
+          )
+        );
+      } catch (error) {
+        this.showAlert(
+          this.$t('CONVERSATION.CARD_CONTEXT_MENU.API.TEAM_ASSIGNMENT.FAILED')
+        );
+      }
+    },
+    // Same method used in context menu, conversationId being passed from there.
+    async onAssignLabels(labels, conversationId = null) {
       try {
         await this.$store.dispatch('bulkActions/process', {
           type: 'Conversation',
-          ids: this.selectedConversations,
+          ids: conversationId || this.selectedConversations,
           labels: {
             add: labels,
           },
         });
         this.selectedConversations = [];
-        this.showAlert(this.$t('BULK_ACTION.LABELS.ASSIGN_SUCCESFUL'));
+        if (conversationId) {
+          this.showAlert(
+            this.$t(
+              'CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_ASSIGNMENT.SUCCESFUL',
+              {
+                labelName: labels[0],
+                conversationId,
+              }
+            )
+          );
+        } else {
+          this.showAlert(this.$t('BULK_ACTION.LABELS.ASSIGN_SUCCESFUL'));
+        }
       } catch (err) {
         this.showAlert(this.$t('BULK_ACTION.LABELS.ASSIGN_FAILED'));
       }
@@ -629,12 +700,27 @@ export default {
         this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_FAILED'));
       }
     },
+    toggleConversationStatus(conversationId, status, snoozedUntil) {
+      this.$store
+        .dispatch('toggleStatus', {
+          conversationId,
+          status,
+          snoozedUntil,
+        })
+        .then(() => {
+          this.showAlert(this.$t('CONVERSATION.CHANGE_STATUS'));
+          this.isLoading = false;
+        });
+    },
     allSelectedConversationsStatus(status) {
       if (!this.selectedConversations.length) return false;
       return this.selectedConversations.every(item => {
         return this.$store.getters.getConversationById(item).status === status;
       });
     },
+    onContextMenuToggle(state) {
+      this.isContextMenuOpen = state;
+    },
   },
 };
 </script>
@@ -647,6 +733,13 @@ export default {
   margin-bottom: var(--space-normal);
 }
 
+.conversations-list {
+  // Prevent the list from scrolling if the submenu is opened
+  &.is-context-menu-open {
+    overflow: hidden !important;
+  }
+}
+
 .conversations-list-wrap {
   flex-shrink: 0;
   width: 34rem;
@@ -663,6 +756,17 @@ export default {
   @include breakpoint(xxxlarge up) {
     flex-basis: 46rem;
   }
+
+  &.hide {
+    display: none;
+  }
+
+  &.list--full-width {
+    width: 100%;
+    @include breakpoint(xxxlarge up) {
+      flex-basis: 100%;
+    }
+  }
 }
 .filter--actions {
   display: flex;
diff --git a/app/javascript/dashboard/components/Code.vue b/app/javascript/dashboard/components/Code.vue
index b5edfa8d7..f348114a6 100644
--- a/app/javascript/dashboard/components/Code.vue
+++ b/app/javascript/dashboard/components/Code.vue
@@ -9,7 +9,7 @@
 
 <script>
 import 'highlight.js/styles/default.css';
-import copy from 'copy-text-to-clipboard';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
 
 export default {
   props: {
@@ -23,9 +23,9 @@ export default {
     },
   },
   methods: {
-    onCopy(e) {
+    async onCopy(e) {
       e.preventDefault();
-      copy(this.script);
+      await copyTextToClipboard(this.script);
       bus.$emit('newToastMessage', this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
     },
   },
diff --git a/app/javascript/dashboard/components/app/UpdateBanner.vue b/app/javascript/dashboard/components/app/UpdateBanner.vue
index 2e4b00031..49a1f988a 100644
--- a/app/javascript/dashboard/components/app/UpdateBanner.vue
+++ b/app/javascript/dashboard/components/app/UpdateBanner.vue
@@ -12,33 +12,26 @@
 </template>
 <script>
 import Banner from 'dashboard/components/ui/Banner.vue';
-import LocalStorage from '../../helper/localStorage';
+import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../helper/localStorage';
 import { mapGetters } from 'vuex';
 import adminMixin from 'dashboard/mixins/isAdmin';
-
-const semver = require('semver');
-const dismissedUpdates = new LocalStorage('dismissedUpdates');
+import { hasAnUpdateAvailable } from './versionCheckHelper';
 
 export default {
-  components: {
-    Banner,
-  },
+  components: { Banner },
   mixins: [adminMixin],
   props: {
-    latestChatwootVersion: {
-      type: String,
-      default: '',
-    },
+    latestChatwootVersion: { type: String, default: '' },
+  },
+  data() {
+    return { userDismissedBanner: false };
   },
   computed: {
     ...mapGetters({ globalConfig: 'globalConfig/get' }),
-    hasAnUpdateAvailable() {
-      if (!semver.valid(this.latestChatwootVersion)) {
-        return false;
-      }
-      return semver.lt(
-        this.globalConfig.appVersion,
-        this.latestChatwootVersion
+    updateAvailable() {
+      return hasAnUpdateAvailable(
+        this.latestChatwootVersion,
+        this.globalConfig.appVersion
       );
     },
     bannerMessage() {
@@ -48,8 +41,9 @@ export default {
     },
     shouldShowBanner() {
       return (
+        !this.userDismissedBanner &&
         this.globalConfig.displayManifest &&
-        this.hasAnUpdateAvailable &&
+        this.updateAvailable &&
         !this.isVersionNotificationDismissed(this.latestChatwootVersion) &&
         this.isAdmin
       );
@@ -57,17 +51,23 @@ export default {
   },
   methods: {
     isVersionNotificationDismissed(version) {
-      return dismissedUpdates.get().includes(version);
+      const dismissedVersions =
+        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
+      return dismissedVersions.includes(version);
     },
     dismissUpdateBanner() {
-      let updatedDismissedItems = dismissedUpdates.get();
+      let updatedDismissedItems =
+        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
       if (updatedDismissedItems instanceof Array) {
         updatedDismissedItems.push(this.latestChatwootVersion);
       } else {
         updatedDismissedItems = [this.latestChatwootVersion];
       }
-      dismissedUpdates.store(updatedDismissedItems);
-      this.latestChatwootVersion = this.globalConfig.appVersion;
+      LocalStorage.set(
+        LOCAL_STORAGE_KEYS.DISMISSED_UPDATES,
+        updatedDismissedItems
+      );
+      this.userDismissedBanner = true;
     },
   },
 };
diff --git a/app/javascript/dashboard/components/app/specs/versionCheckHelper.spec.js b/app/javascript/dashboard/components/app/specs/versionCheckHelper.spec.js
new file mode 100644
index 000000000..a0fdefc44
--- /dev/null
+++ b/app/javascript/dashboard/components/app/specs/versionCheckHelper.spec.js
@@ -0,0 +1,15 @@
+import { hasAnUpdateAvailable } from '../versionCheckHelper';
+
+describe('#hasAnUpdateAvailable', () => {
+  it('return false if latest version is invalid', () => {
+    expect(hasAnUpdateAvailable('invalid', '1.0.0')).toBe(false);
+    expect(hasAnUpdateAvailable(null, '1.0.0')).toBe(false);
+    expect(hasAnUpdateAvailable(undefined, '1.0.0')).toBe(false);
+    expect(hasAnUpdateAvailable('', '1.0.0')).toBe(false);
+  });
+
+  it('return correct value if latest version is valid', () => {
+    expect(hasAnUpdateAvailable('1.1.0', '1.0.0')).toBe(true);
+    expect(hasAnUpdateAvailable('0.1.0', '1.0.0')).toBe(false);
+  });
+});
diff --git a/app/javascript/dashboard/components/app/versionCheckHelper.js b/app/javascript/dashboard/components/app/versionCheckHelper.js
new file mode 100644
index 000000000..2a36be9cf
--- /dev/null
+++ b/app/javascript/dashboard/components/app/versionCheckHelper.js
@@ -0,0 +1,8 @@
+const semver = require('semver');
+
+export const hasAnUpdateAvailable = (latestVersion, currentVersion) => {
+  if (!semver.valid(latestVersion)) {
+    return false;
+  }
+  return semver.lt(currentVersion, latestVersion);
+};
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 810172ae5..afcdc0b1d 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -113,6 +113,7 @@
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
+import snoozeTimesMixin from 'dashboard/mixins/conversation/snoozeTimesMixin.js';
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import {
   hasPressedAltAndEKey,
@@ -126,13 +127,6 @@ import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
 import WootDropdownDivider from 'shared/components/ui/dropdown/DropdownDivider';
 
 import wootConstants from '../../constants';
-import {
-  getUnixTime,
-  addHours,
-  addWeeks,
-  startOfTomorrow,
-  startOfWeek,
-} from 'date-fns';
 import {
   CMD_REOPEN_CONVERSATION,
   CMD_RESOLVE_CONVERSATION,
@@ -146,7 +140,7 @@ export default {
     WootDropdownSubMenu,
     WootDropdownDivider,
   },
-  mixins: [clickaway, alertMixin, eventListenerMixins],
+  mixins: [clickaway, alertMixin, eventListenerMixins, snoozeTimesMixin],
   props: { conversationId: { type: [String, Number], required: true } },
   data() {
     return {
@@ -178,16 +172,6 @@ export default {
     showAdditionalActions() {
       return !this.isPending && !this.isSnoozed;
     },
-    snoozeTimes() {
-      return {
-        // tomorrow  = 9AM next day
-        tomorrow: getUnixTime(addHours(startOfTomorrow(), 9)),
-        // next week = 9AM Monday, next week
-        nextWeek: getUnixTime(
-          addHours(startOfWeek(addWeeks(new Date(), 1), { weekStartsOn: 1 }), 9)
-        ),
-      };
-    },
   },
   mounted() {
     bus.$on(CMD_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
diff --git a/app/javascript/dashboard/components/helpCenter/EditArticle.stories.js b/app/javascript/dashboard/components/helpCenter/EditArticle.stories.js
new file mode 100644
index 000000000..b7e13e1d1
--- /dev/null
+++ b/app/javascript/dashboard/components/helpCenter/EditArticle.stories.js
@@ -0,0 +1,34 @@
+import { action } from '@storybook/addon-actions';
+import EditArticle from './EditArticle.vue';
+
+export default {
+  title: 'Components/Help Center',
+  component: EditArticle,
+  argTypes: {
+    article: {
+      defaultValue: {},
+      control: {
+        type: 'object',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { EditArticle },
+  template:
+    '<edit-article v-bind="$props" @focus="onFocus" @blur="onBlur"></edit-article>',
+});
+
+export const EditArticleView = Template.bind({});
+EditArticleView.args = {
+  article: {
+    id: '1',
+    title: 'Lorem ipsum',
+    content:
+      'L**orem ipsum** dolor sit amet, consectetur adipiscing elit. Congue diam orci tellus *varius per cras turpis aliquet commodo dolor justo* rutrum lorem venenatis aliquet orci curae hac. Sagittis ultrices felis **`ante placerat condimentum parturient erat consequat`** sollicitudin *sagittis potenti sollicitudin* quis velit at placerat mi torquent. Dignissim luctus nulla suspendisse purus cras commodo ipsum orci tempus morbi metus conubia et hac potenti quam suspendisse feugiat. Turpis eros dictum tellus natoque laoreet lacus dolor cras interdum **vitae gravida tincidunt ultricies tempor convallis tortor rhoncus suspendisse.** Nisi lacinia etiam vivamus tellus sed taciti potenti quam praesent congue euismod mauris est eu risus convallis taciti etiam. Inceptos iaculis turpis leo porta pellentesque dictum `bibendum blandit parturient nulla leo pretium` rhoncus litora dapibus fringilla hac litora.',
+  },
+  onFocus: action('focus'),
+  onBlur: action('blur'),
+};
diff --git a/app/javascript/dashboard/components/helpCenter/EditArticle.vue b/app/javascript/dashboard/components/helpCenter/EditArticle.vue
new file mode 100644
index 000000000..cf6eafb15
--- /dev/null
+++ b/app/javascript/dashboard/components/helpCenter/EditArticle.vue
@@ -0,0 +1,113 @@
+<template>
+  <div
+    class="edit-article--container"
+    :class="{ 'is-settings-sidebar-open': isSettingsSidebarOpen }"
+  >
+    <input
+      v-model="articleTitle"
+      type="text"
+      class="article-heading"
+      :placeholder="$t('HELP_CENTER.EDIT_ARTICLE.TITLE_PLACEHOLDER')"
+      @focus="onFocus"
+      @blur="onBlur"
+      @input="onTitleInput"
+    />
+    <woot-message-editor
+      v-model="articleContent"
+      class="article-content"
+      :placeholder="$t('HELP_CENTER.EDIT_ARTICLE.CONTENT_PLACEHOLDER')"
+      :is-format-mode="true"
+      @focus="onFocus"
+      @blur="onBlur"
+      @input="onContentInput"
+    />
+  </div>
+</template>
+
+<script>
+import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
+export default {
+  components: {
+    WootMessageEditor,
+  },
+  props: {
+    article: {
+      type: Object,
+      default: () => ({}),
+    },
+    isSettingsSidebarOpen: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      articleTitle: '',
+      articleContent: '',
+    };
+  },
+  mounted() {
+    this.articleTitle = this.article.title;
+    this.articleContent = this.article.content;
+  },
+  methods: {
+    onFocus() {
+      this.$emit('focus');
+    },
+    onBlur() {
+      this.$emit('blur');
+    },
+    onTitleInput() {
+      this.$emit('titleInput', this.articleTitle);
+    },
+    onContentInput() {
+      this.$emit('contentInput', this.articleContent);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.edit-article--container {
+  margin: var(--space-large) auto;
+  width: 640px;
+}
+
+.is-settings-sidebar-open {
+  margin: var(--space-large) var(--space-small);
+}
+
+.article-heading {
+  font-size: var(--font-size-giga);
+  font-weight: var(--font-weight-bold);
+  min-height: var(--space-jumbo);
+  max-height: var(--space-jumbo);
+  border: 0px solid transparent;
+  padding: 0;
+}
+
+::v-deep {
+  .ProseMirror-menubar-wrapper {
+    .ProseMirror-menubar .ProseMirror-menuitem {
+      .ProseMirror-icon {
+        margin-right: var(--space-normal);
+        font-size: var(--font-size-small);
+      }
+    }
+
+    .ProseMirror-woot-style {
+      min-height: var(--space-giga);
+      max-height: 100%;
+
+      p {
+        font-size: var(--font-size-default);
+        line-height: 1.5;
+      }
+
+      li::marker {
+        font-size: var(--font-size-default);
+      }
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js
index d2614421c..5e58aa049 100644
--- a/app/javascript/dashboard/components/index.js
+++ b/app/javascript/dashboard/components/index.js
@@ -22,6 +22,7 @@ import Tabs from './ui/Tabs/Tabs';
 import TabsItem from './ui/Tabs/TabsItem';
 import Thumbnail from './widgets/Thumbnail.vue';
 import ConfirmModal from './widgets/modal/ConfirmationModal.vue';
+import ContextMenu from './ui/ContextMenu.vue';
 
 const WootUIKit = {
   AvatarUploader,
@@ -47,6 +48,7 @@ const WootUIKit = {
   TabsItem,
   Thumbnail,
   ConfirmModal,
+  ContextMenu,
   install(Vue) {
     const keys = Object.keys(this);
     keys.pop(); // remove 'install' from keys
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 80b2486e6..ca6524db3 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -3,6 +3,7 @@
     <primary-sidebar
       :logo-source="globalConfig.logoThumbnail"
       :installation-name="globalConfig.installationName"
+      :is-a-custom-branded-instance="isACustomBrandedInstance"
       :account-id="accountId"
       :menu-items="primaryMenuItems"
       :active-menu-item="activePrimaryMenu.key"
@@ -19,6 +20,7 @@
       :custom-views="customViews"
       :menu-config="activeSecondaryMenu"
       :current-role="currentRole"
+      :is-on-chatwoot-cloud="isOnChatwootCloud"
       @add-label="showAddLabelPopup"
       @toggle-accounts="toggleAccountModal"
     />
@@ -67,6 +69,8 @@ export default {
     ...mapGetters({
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
+      isACustomBrandedInstance: 'globalConfig/isACustomBrandedInstance',
+      isOnChatwootCloud: 'globalConfig/isOnChatwootCloud',
       inboxes: 'inboxes/getInboxes',
       accountId: 'getCurrentAccountId',
       currentRole: 'getCurrentRole',
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 0b78e8a21..990b35d4a 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -30,6 +30,7 @@ const settings = accountId => ({
     'settings_teams_edit',
     'settings_teams_edit_members',
     'settings_teams_edit_finish',
+    'billing_settings_index',
     'automation_list',
   ],
   menuItems: [
@@ -100,6 +101,14 @@ const settings = accountId => ({
       toState: frontendURL(`accounts/${accountId}/settings/applications`),
       toStateName: 'settings_applications',
     },
+    {
+      icon: 'credit-card-person',
+      label: 'BILLING',
+      hasSubMenu: false,
+      toState: frontendURL(`accounts/${accountId}/settings/billing`),
+      toStateName: 'billing_settings_index',
+      showOnlyOnCloud: true,
+    },
     {
       icon: 'settings',
       label: 'ACCOUNT_SETTINGS',
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Primary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Primary.vue
index 956daa5eb..7bebe24a7 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Primary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Primary.vue
@@ -16,6 +16,13 @@
       />
     </nav>
     <div class="menu vertical user-menu">
+      <primary-nav-item
+        v-if="!isACustomBrandedInstance"
+        icon="book-open-globe"
+        name="DOCS"
+        :open-in-new-page="true"
+        :to="helpDocsURL"
+      />
       <notification-bell @open-notification-panel="openNotificationPanel" />
       <agent-details @toggle-menu="toggleOptions" />
       <options-menu
@@ -34,7 +41,7 @@ import PrimaryNavItem from './PrimaryNavItem';
 import OptionsMenu from './OptionsMenu';
 import AgentDetails from './AgentDetails';
 import NotificationBell from './NotificationBell';
-
+import wootConstants from 'dashboard/constants';
 import { frontendURL } from 'dashboard/helper/URLHelper';
 
 export default {
@@ -46,6 +53,10 @@ export default {
     NotificationBell,
   },
   props: {
+    isACustomBrandedInstance: {
+      type: Boolean,
+      default: false,
+    },
     logoSource: {
       type: String,
       default: '',
@@ -69,6 +80,7 @@ export default {
   },
   data() {
     return {
+      helpDocsURL: wootConstants.DOCS_URL,
       showOptionsMenu: false,
     };
   },
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/PrimaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/PrimaryNavItem.vue
index 67765b90e..36cc69da2 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/PrimaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/PrimaryNavItem.vue
@@ -5,6 +5,8 @@
       :href="href"
       class="button clear button--only-icon menu-item"
       :class="{ 'is-active': isActive || isChildMenuActive }"
+      :rel="openInNewPage ? 'noopener noreferrer nofollow' : undefined"
+      :target="openInNewPage ? '_blank' : undefined"
       @click="navigate"
     >
       <fluent-icon :icon="icon" />
@@ -36,6 +38,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    openInNewPage: {
+      type: Boolean,
+      default: false,
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 4b19a3ec3..4f0a5e38d 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -55,6 +55,10 @@ export default {
       type: String,
       default: '',
     },
+    isOnChatwootCloud: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     hasSecondaryMenu() {
@@ -67,12 +71,18 @@ export default {
       if (!this.currentRole) {
         return [];
       }
-      return this.menuConfig.menuItems.filter(
+      const menuItemsFilteredByRole = this.menuConfig.menuItems.filter(
         menuItem =>
           window.roleWiseRoutes[this.currentRole].indexOf(
             menuItem.toStateName
           ) > -1
       );
+      return menuItemsFilteredByRole.filter(item => {
+        if (item.showOnlyOnCloud) {
+          return this.isOnChatwootCloud;
+        }
+        return true;
+      });
     },
     inboxSection() {
       return {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index e89a1ab51..861805589 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -5,8 +5,12 @@
         {{ $t(`SIDEBAR.${menuItem.label}`) }}
       </span>
       <div v-if="isHelpCenterSidebar" class="submenu-icons">
-        <fluent-icon icon="search" class="submenu-icon" size="16" />
-        <fluent-icon icon="add" class="submenu-icon" size="16" />
+        <div class="submenu-icon">
+          <fluent-icon icon="search" size="16" />
+        </div>
+        <div class="submenu-icon" @click="onClickOpen">
+          <fluent-icon icon="add" size="16" />
+        </div>
       </div>
     </div>
     <router-link
@@ -71,6 +75,9 @@
           </a>
         </li>
       </router-link>
+      <p v-if="isHelpCenterSidebar && isCategoryEmpty" class="empty-text">
+        {{ $t('SIDEBAR.HELP_CENTER.CATEGORY_EMPTY_MESSAGE') }}
+      </p>
     </ul>
   </li>
 </template>
@@ -98,6 +105,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isCategoryEmpty: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters({ activeInbox: 'getSelectedInbox' }),
@@ -134,6 +145,9 @@ export default {
         this.menuItem.toStateName === 'settings_applications'
       );
     },
+    isArticlesView() {
+      return this.$store.state.route.name === this.menuItem.toStateName;
+    },
 
     computedClass() {
       // If active Inbox is present
@@ -151,6 +165,12 @@ export default {
         }
         return ' ';
       }
+      if (this.isHelpCenterSidebar) {
+        if (this.isArticlesView) {
+          return 'is-active';
+        }
+        return ' ';
+      }
       return '';
     },
   },
@@ -183,6 +203,9 @@ export default {
     showItem(item) {
       return this.isAdmin && item.newLink !== undefined;
     },
+    onClickOpen() {
+      this.$emit('open');
+    },
   },
 };
 </script>
@@ -312,4 +335,10 @@ export default {
     }
   }
 }
+
+.empty-text {
+  color: var(--s-600);
+  font-size: var(--font-size-small);
+  margin: var(--space-smaller) 0;
+}
 </style>
diff --git a/app/javascript/dashboard/components/ui/AnnouncementPopup.vue b/app/javascript/dashboard/components/ui/AnnouncementPopup.vue
new file mode 100644
index 000000000..ad59bc8ac
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/AnnouncementPopup.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="announcement-popup">
+    <span v-if="popupMessage" class="popup-content">
+      {{ popupMessage }}
+      <span v-if="routeText" class="route-url" @click="onClickOpenPath">
+        {{ routeText }}
+      </span>
+    </span>
+    <div v-if="hasCloseButton" class="popup-close">
+      <woot-button
+        v-if="hasCloseButton"
+        color-scheme="primary"
+        variant="link"
+        size="small"
+        @click="onClickClose"
+      >
+        {{ closeButtonText }}
+      </woot-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    popupMessage: {
+      type: String,
+      default: '',
+    },
+    routeText: {
+      type: String,
+      default: '',
+    },
+    hasCloseButton: {
+      type: Boolean,
+      default: true,
+    },
+    closeButtonText: {
+      type: String,
+      default: '',
+    },
+  },
+  methods: {
+    onClickOpenPath() {
+      this.$emit('open');
+    },
+    onClickClose(e) {
+      this.$emit('close', e);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.announcement-popup {
+  max-width: 24rem;
+  min-width: 16rem;
+  display: flex;
+  position: absolute;
+  flex-direction: column;
+  align-items: flex-start;
+  height: fit-content;
+  background: var(--white);
+  padding: 0 var(--space-normal);
+  z-index: var(--z-index-much-higher);
+  box-shadow: var(--b-200) 4px 4px 16px 4px;
+  border-radius: var(--border-radius-normal);
+
+  .popup-content {
+    font-size: var(--font-size-mini);
+    color: var(--s-700);
+    padding: var(--space-one) 0;
+    .route-url {
+      font-size: var(--font-size-mini);
+      color: var(--s-600);
+      cursor: pointer;
+      text-decoration: underline;
+    }
+  }
+
+  .popup-close {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    padding: var(--space-one) 0;
+    border-top: 1px solid var(--color-border-light);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/ui/ContextMenu.vue b/app/javascript/dashboard/components/ui/ContextMenu.vue
new file mode 100644
index 000000000..b968cda19
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/ContextMenu.vue
@@ -0,0 +1,53 @@
+<template>
+  <div
+    v-show="show"
+    ref="context"
+    class="context-menu-container"
+    :style="style"
+    tabindex="0"
+    @blur="$emit('close')"
+  >
+    <slot />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    x: {
+      type: Number,
+      default: 0,
+    },
+    y: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      left: this.x,
+      top: this.y,
+      show: false,
+    };
+  },
+  computed: {
+    style() {
+      return {
+        top: this.top + 'px',
+        left: this.left + 'px',
+      };
+    },
+  },
+  mounted() {
+    this.$nextTick(() => this.$el.focus());
+    this.show = true;
+  },
+};
+</script>
+<style>
+.context-menu-container {
+  position: fixed;
+  z-index: var(--z-index-very-high);
+  outline: none;
+  cursor: pointer;
+}
+</style>
diff --git a/app/javascript/dashboard/components/ui/stories/AnnouncementPopup.stories.js b/app/javascript/dashboard/components/ui/stories/AnnouncementPopup.stories.js
new file mode 100644
index 000000000..3166eff05
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/stories/AnnouncementPopup.stories.js
@@ -0,0 +1,46 @@
+import { action } from '@storybook/addon-actions';
+import WootAnnouncementPopup from '../AnnouncementPopup.vue';
+
+export default {
+  title: 'Components/Popup/Announcement Popup',
+  argTypes: {
+    popupMessage: {
+      defaultValue:
+        'Now a new key shortcut (⌘ + ↵) is available to send messages. You can enable it in the',
+      control: {
+        type: 'text',
+      },
+    },
+    routeText: {
+      defaultValue: 'profile settings',
+      control: {
+        type: 'text',
+      },
+    },
+    hasCloseButton: {
+      defaultValue: true,
+      control: {
+        type: 'boolean',
+      },
+    },
+    closeButtonText: {
+      defaultValue: 'Got it',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { WootAnnouncementPopup },
+  template:
+    '<woot-announcement-popup v-bind="$props" @open="onClickOpenPath" @close="onClickClose"></woot-announcement-popup>',
+});
+
+export const AnnouncementPopup = Template.bind({});
+AnnouncementPopup.args = {
+  onClickOpenPath: action('opened path'),
+  onClickClose: action('closed the popup'),
+};
diff --git a/app/javascript/dashboard/components/widgets/Thumbnail.vue b/app/javascript/dashboard/components/widgets/Thumbnail.vue
index ea0e0f99a..4bfc729de 100644
--- a/app/javascript/dashboard/components/widgets/Thumbnail.vue
+++ b/app/javascript/dashboard/components/widgets/Thumbnail.vue
@@ -9,7 +9,7 @@
     />
     <Avatar
       v-else
-      :username="username"
+      :username="userNameWithoutEmoji"
       :class="thumbnailClass"
       :size="avatarSize"
       :variant="variant"
@@ -86,6 +86,7 @@
  * Username - User name for avatar
  */
 import Avatar from './Avatar';
+import { removeEmoji } from 'shared/helpers/emoji';
 
 export default {
   components: {
@@ -131,6 +132,9 @@ export default {
     };
   },
   computed: {
+    userNameWithoutEmoji() {
+      return removeEmoji(this.username);
+    },
     showStatusIndicator() {
       if (this.shouldShowStatusAlways) return true;
       return this.status === 'online' || this.status === 'busy';
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 08909566e..801aad164 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -1,9 +1,13 @@
 <template>
-  <div class="conversation-details-wrap">
+  <div
+    class="conversation-details-wrap"
+    :class="{ 'with-border-left': !isOnExpandedLayout }"
+  >
     <conversation-header
       v-if="currentChat.id"
       :chat="currentChat"
       :is-contact-panel-open="isContactPanelOpen"
+      :show-back-button="isOnExpandedLayout"
       @contact-panel-toggle="onToggleContactPanel"
     />
     <woot-tabs
@@ -26,7 +30,7 @@
         :is-contact-panel-open="isContactPanelOpen"
         @contact-panel-toggle="onToggleContactPanel"
       />
-      <empty-state v-else />
+      <empty-state v-else :is-on-expanded-layout="isOnExpandedLayout" />
       <div v-show="showContactPanel" class="conversation-sidebar-wrap">
         <contact-panel
           v-if="showContactPanel"
@@ -71,6 +75,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    isOnExpandedLayout: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return { activeIndex: 0 };
@@ -134,8 +142,11 @@ export default {
   flex-direction: column;
   min-width: 0;
   width: 100%;
-  border-left: 1px solid var(--color-border);
   background: var(--color-background-light);
+
+  &.with-border-left {
+    border-left: 1px solid var(--color-border);
+  }
 }
 
 .dashboard-app--tabs {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 7b90ef6eb..78e8c1988 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -10,6 +10,7 @@
     @mouseenter="onCardHover"
     @mouseleave="onCardLeave"
     @click="cardClick(chat)"
+    @contextmenu="openContextMenu($event)"
   >
     <label v-if="hovered || selected" class="checkbox-wrapper" @click.stop>
       <input
@@ -91,6 +92,22 @@
         <span class="unread">{{ unreadCount > 9 ? '9+' : unreadCount }}</span>
       </div>
     </div>
+    <woot-context-menu
+      v-if="showContextMenu"
+      ref="menu"
+      :x="contextMenu.x"
+      :y="contextMenu.y"
+      @close="closeContextMenu"
+    >
+      <conversation-context-menu
+        :status="chat.status"
+        :inbox-id="inbox.id"
+        @update-conversation="onUpdateConversation"
+        @assign-agent="onAssignAgent"
+        @assign-label="onAssignLabel"
+        @assign-team="onAssignTeam"
+      />
+    </woot-context-menu>
   </div>
 </template>
 <script>
@@ -104,6 +121,8 @@ import router from '../../../routes';
 import { frontendURL, conversationUrl } from '../../../helper/URLHelper';
 import InboxName from '../InboxName';
 import inboxMixin from 'shared/mixins/inboxMixin';
+import ConversationContextMenu from './contextMenu/Index.vue';
+import alertMixin from 'shared/mixins/alertMixin';
 
 const ATTACHMENT_ICONS = {
   image: 'image',
@@ -118,9 +137,16 @@ export default {
   components: {
     InboxName,
     Thumbnail,
+    ConversationContextMenu,
   },
 
-  mixins: [inboxMixin, timeMixin, conversationMixin, messageFormatterMixin],
+  mixins: [
+    inboxMixin,
+    timeMixin,
+    conversationMixin,
+    messageFormatterMixin,
+    alertMixin,
+  ],
   props: {
     activeLabel: {
       type: String,
@@ -162,6 +188,11 @@ export default {
   data() {
     return {
       hovered: false,
+      showContextMenu: false,
+      contextMenu: {
+        x: null,
+        y: null,
+      },
     };
   },
   computed: {
@@ -292,6 +323,40 @@ export default {
       const action = checked ? 'select-conversation' : 'de-select-conversation';
       this.$emit(action, this.chat.id, this.inbox.id);
     },
+    openContextMenu(e) {
+      e.preventDefault();
+      this.$emit('context-menu-toggle', true);
+      this.contextMenu.x = e.pageX || e.clientX;
+      this.contextMenu.y = e.pageY || e.clientY;
+      this.showContextMenu = true;
+    },
+    closeContextMenu() {
+      this.$emit('context-menu-toggle', false);
+      this.showContextMenu = false;
+      this.contextMenu.x = null;
+      this.contextMenu.y = null;
+    },
+    onUpdateConversation(status, snoozedUntil) {
+      this.closeContextMenu();
+      this.$emit(
+        'update-conversation-status',
+        this.chat.id,
+        status,
+        snoozedUntil
+      );
+    },
+    async onAssignAgent(agent) {
+      this.$emit('assign-agent', agent, [this.chat.id]);
+      this.closeContextMenu();
+    },
+    async onAssignLabel(label) {
+      this.$emit('assign-label', [label.title], [this.chat.id]);
+      this.closeContextMenu();
+    },
+    async onAssignTeam(team) {
+      this.$emit('assign-team', team, this.chat.id);
+      this.closeContextMenu();
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index c30f23c20..5abf0eb5c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="conv-header">
     <div class="user">
+      <back-button v-if="showBackButton" :back-url="backButtonUrl" />
       <Thumbnail
         :src="currentContact.thumbnail"
         size="40px"
@@ -47,19 +48,21 @@
   </div>
 </template>
 <script>
+import { hasPressedAltAndOKey } from 'shared/helpers/KeyboardHelpers';
 import { mapGetters } from 'vuex';
-import MoreActions from './MoreActions';
-import Thumbnail from '../Thumbnail';
 import agentMixin from '../../../mixins/agentMixin.js';
+import BackButton from '../BackButton';
+import differenceInHours from 'date-fns/differenceInHours';
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import inboxMixin from 'shared/mixins/inboxMixin';
-import { hasPressedAltAndOKey } from 'shared/helpers/KeyboardHelpers';
-import wootConstants from '../../../constants';
-import differenceInHours from 'date-fns/differenceInHours';
 import InboxName from '../InboxName';
-
+import MoreActions from './MoreActions';
+import Thumbnail from '../Thumbnail';
+import wootConstants from '../../../constants';
+import { conversationListPageURL } from 'dashboard/helper/URLHelper';
 export default {
   components: {
+    BackButton,
     InboxName,
     MoreActions,
     Thumbnail,
@@ -74,6 +77,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showBackButton: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters({
@@ -83,6 +90,19 @@ export default {
     chatMetadata() {
       return this.chat.meta;
     },
+    backButtonUrl() {
+      const {
+        params: { accountId, inbox_id: inboxId, label, teamId },
+        name,
+      } = this.$route;
+      return conversationListPageURL({
+        accountId,
+        inboxId,
+        label,
+        teamId,
+        conversationType: name === 'conversation_mentions' ? 'mention' : '',
+      });
+    },
     isHMACVerified() {
       if (!this.isAWebWidgetInbox) {
         return true;
diff --git a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
index bafceb688..d1ab8cc04 100644
--- a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
@@ -35,7 +35,7 @@
       <!-- No conversation selected -->
       <div v-else-if="allConversations.length && !currentChat.id">
         <img src="~dashboard/assets/images/chat.svg" alt="No Chat" />
-        <span>{{ $t('CONVERSATION.404') }}</span>
+        <span>{{ conversationMissingMessage }}</span>
       </div>
     </div>
   </div>
@@ -51,6 +51,12 @@ export default {
     OnboardingView,
   },
   mixins: [accountMixin, adminMixin],
+  props: {
+    isOnExpandedLayout: {
+      type: Boolean,
+      default: false,
+    },
+  },
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
@@ -65,6 +71,12 @@ export default {
       }
       return this.$t('CONVERSATION.LOADING_CONVERSATIONS');
     },
+    conversationMissingMessage() {
+      if (!this.isOnExpandedLayout) {
+        return this.$t('CONVERSATION.SELECT_A_CONVERSATION');
+      }
+      return this.$t('CONVERSATION.404');
+    },
     newInboxURL() {
       return this.addAccountScoping('settings/inboxes/new');
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 708fba2cc..045f1abb9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -109,8 +109,6 @@
   </li>
 </template>
 <script>
-import copy from 'copy-text-to-clipboard';
-
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import timeMixin from '../../../mixins/time';
 
@@ -128,6 +126,7 @@ import alertMixin from 'shared/mixins/alertMixin';
 import contentTypeMixin from 'shared/mixins/contentTypeMixin';
 import { MESSAGE_TYPE, MESSAGE_STATUS } from 'shared/constants/messages';
 import { generateBotMessageContent } from './helpers/botMessageContentHelper';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
 
 export default {
   components: {
@@ -170,7 +169,7 @@ export default {
     };
   },
   computed: {
-    contentToBeParsed() {
+    emailMessageContent() {
       const {
         html_content: { full: fullHTMLContent } = {},
         text_content: { full: fullTextContent } = {},
@@ -182,13 +181,19 @@ export default {
         return false;
       }
 
-      if (this.contentToBeParsed.includes('<blockquote')) {
+      if (this.emailMessageContent.includes('<blockquote')) {
         return true;
       }
 
       return false;
     },
     message() {
+      // If the message is an email, emailMessageContent would be present
+      // In that case, we would use letter package to render the email
+      if (this.emailMessageContent && this.isIncoming) {
+        return this.emailMessageContent;
+      }
+
       const botMessageContent = generateBotMessageContent(
         this.contentType,
         this.contentAttributes,
@@ -200,21 +205,6 @@ export default {
           },
         }
       );
-
-      const {
-        email: { content_type: contentType = '' } = {},
-      } = this.contentAttributes;
-      if (this.contentToBeParsed && this.isIncoming) {
-        const parsedContent = this.stripStyleCharacters(this.contentToBeParsed);
-        if (parsedContent) {
-          // This is a temporary fix for line-breaks in text/plain emails
-          // Now, It is not rendered properly in the email preview.
-          // FIXME: Remove this once we have a better solution for rendering text/plain emails
-          return contentType.includes('text/plain')
-            ? parsedContent.replace(/\n/g, '<br />')
-            : parsedContent;
-        }
-      }
       return (
         this.formatMessage(
           this.data.content,
@@ -331,6 +321,7 @@ export default {
         'activity-wrap': !this.isBubble,
         'is-pending': this.isPending,
         'is-failed': this.isFailed,
+        'is-email': this.isEmailContentType,
       };
     },
     bubbleClass() {
@@ -342,6 +333,7 @@ export default {
         'is-text': this.hasText,
         'is-from-bot': this.isSentByBot,
         'is-failed': this.isFailed,
+        'is-email': this.isEmailContentType,
       };
     },
     isPending() {
@@ -412,8 +404,8 @@ export default {
         this.showAlert(this.$t('CONVERSATION.FAIL_DELETE_MESSSAGE'));
       }
     },
-    handleCopy() {
-      copy(this.data.content);
+    async handleCopy() {
+      await copyTextToClipboard(this.data.content);
       this.showAlert(this.$t('CONTACT_PANEL.COPY_SUCCESSFUL'));
       this.showContextMenu = false;
     },
@@ -518,6 +510,10 @@ export default {
   }
 }
 
+.wrap.is-email {
+  --bubble-max-width: 84% !important;
+}
+
 .sender--info {
   align-items: center;
   color: var(--b-700);
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 0b5aba1e2..50ca28b8f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -87,7 +87,6 @@
         :selected-tweet="selectedTweet"
         :popout-reply-box.sync="isPopoutReplyBox"
         @click="showPopoutReplyBox"
-        @scrollToMessage="scrollToBottom"
       />
     </div>
   </div>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
index b2ec48805..d5d56be41 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
@@ -126,6 +126,7 @@ export default {
     background: transparent;
     font-size: var(--font-size-mini);
     font-weight: var(--font-weight-bold);
+    padding-left: 0;
   }
   .input-group-field::v-deep input {
     margin-bottom: 0;
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
index 093eda3b9..31529f0c7 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
@@ -1,132 +1,742 @@
 const languages = [
   {
-    id: 'eng',
-    name: 'English (en)',
+    name: 'Abkhazian',
+    id: 'ab',
   },
   {
+    name: 'Afar',
+    id: 'aa',
+  },
+  {
+    name: 'Afrikaans',
+    id: 'af',
+  },
+  {
+    name: 'Akan',
+    id: 'ak',
+  },
+  {
+    name: 'Albanian',
+    id: 'sq',
+  },
+  {
+    name: 'Amharic',
+    id: 'am',
+  },
+  {
+    name: 'Arabic',
     id: 'ar',
-    name: 'العربية (ar)',
   },
   {
-    id: 'nl',
-    name: 'Nederlands (nl)',
+    name: 'Aragonese',
+    id: 'an',
   },
   {
-    id: 'fr',
-    name: 'Français (fr)',
+    name: 'Armenian',
+    id: 'hy',
   },
   {
-    id: 'de',
-    name: 'Deutsch (de)',
+    name: 'Assamese',
+    id: 'as',
   },
   {
-    id: 'हिन्दी (hi)',
-    name: 'hi',
+    name: 'Avaric',
+    id: 'av',
   },
   {
-    id: 'it',
-    name: 'Italiano (it)',
+    name: 'Avestan',
+    id: 'ae',
   },
   {
-    id: 'ja',
-    name: '日本語 (ja)',
+    name: 'Aymara',
+    id: 'ay',
   },
   {
-    id: 'ko',
-    name: '한국어 (ko)',
+    name: 'Azerbaijani',
+    id: 'az',
   },
   {
-    id: 'pt',
-    name: 'Português (pt)',
+    name: 'Bambara',
+    id: 'bm',
   },
   {
-    id: 'ru',
-    name: 'русский (ru)',
+    name: 'Bashkir',
+    id: 'ba',
   },
   {
-    id: 'zh',
-    name: '中文 (zh)',
+    name: 'Basque',
+    id: 'eu',
   },
   {
-    id: 'es',
-    name: 'Español (es)',
+    name: 'Belarusian',
+    id: 'be',
   },
   {
-    id: 'ml',
-    name: 'മലയാളം (ml)',
+    name: 'Bengali',
+    id: 'bn',
   },
   {
+    name: 'Bislama',
+    id: 'bi',
+  },
+  {
+    name: 'Bosnian',
+    id: 'bs',
+  },
+  {
+    name: 'Breton',
+    id: 'br',
+  },
+  {
+    name: 'Bulgarian',
+    id: 'bg',
+  },
+  {
+    name: 'Burmese',
+    id: 'my',
+  },
+  {
+    name: 'Catalan',
     id: 'ca',
-    name: 'Català (ca)',
   },
   {
-    id: 'el',
-    name: 'ελληνικά (el)',
+    name: 'Chamorro',
+    id: 'ch',
   },
   {
-    id: 'pt-BR',
-    name: 'Português Brasileiro (pt-BR)',
+    name: 'Chechen',
+    id: 'ce',
   },
   {
-    id: 'ro',
-    name: 'Română (ro)',
+    name: 'Chichewa',
+    id: 'ny',
   },
   {
-    id: 'ta',
-    name: 'தமிழ் (ta)',
+    name: 'Chinese',
+    id: 'zh',
   },
   {
-    id: 'fa',
-    name: 'فارسی (fa)',
+    name: 'Church Slavonic',
+    id: 'cu',
   },
   {
-    id: 'zh-TW',
-    name: '中文 (台湾) (zh-TW)',
+    name: 'Chuvash',
+    id: 'cv',
   },
   {
-    id: 'vi',
-    name: 'Tiếng Việt (vi)',
+    name: 'Cornish',
+    id: 'kw',
   },
   {
-    id: 'da',
-    name: 'dansk (da)',
+    name: 'Corsican',
+    id: 'co',
   },
   {
-    id: 'tr',
-    name: 'Türkçe (tr)',
+    name: 'Cree',
+    id: 'cr',
   },
   {
+    name: 'Croatian',
+    id: 'hr',
+  },
+  {
+    name: 'Czech',
     id: 'cs',
-    name: 'čeština (cs)',
   },
   {
+    name: 'Danish',
+    id: 'da',
+  },
+  {
+    name: 'Divehi',
+    id: 'dv',
+  },
+  {
+    name: 'Dutch',
+    id: 'nl',
+  },
+  {
+    name: 'Dzongkha',
+    id: 'dz',
+  },
+  {
+    name: 'English',
+    id: 'en',
+  },
+  {
+    name: 'Esperanto',
+    id: 'eo',
+  },
+  {
+    name: 'Estonian',
+    id: 'et',
+  },
+  {
+    name: 'Ewe',
+    id: 'ee',
+  },
+  {
+    name: 'Faroese',
+    id: 'fo',
+  },
+  {
+    name: 'Fijian',
+    id: 'fj',
+  },
+  {
+    name: 'Finnish',
     id: 'fi',
-    name: 'suomi, suomen kieli (fi)',
   },
   {
-    id: 'id',
-    name: 'Bahasa Indonesia (id)',
+    name: 'French',
+    id: 'fr',
   },
   {
-    id: 'sv',
-    name: 'Svenska (sv)',
+    name: 'Western Frisian',
+    id: 'fy',
   },
   {
+    name: 'Fulah',
+    id: 'ff',
+  },
+  {
+    name: 'Gaelic',
+    id: 'gd',
+  },
+  {
+    name: 'Galician',
+    id: 'gl',
+  },
+  {
+    name: 'Ganda',
+    id: 'lg',
+  },
+  {
+    name: 'Georgian',
+    id: 'ka',
+  },
+  {
+    name: 'German',
+    id: 'de',
+  },
+  {
+    name: 'Greek',
+    id: 'el',
+  },
+  {
+    name: 'Kalaallisut',
+    id: 'kl',
+  },
+  {
+    name: 'Guarani',
+    id: 'gn',
+  },
+  {
+    name: 'Gujarati',
+    id: 'gu',
+  },
+  {
+    name: 'Haitian',
+    id: 'ht',
+  },
+  {
+    name: 'Hausa',
+    id: 'ha',
+  },
+  {
+    name: 'Hebrew',
+    id: 'he',
+  },
+  {
+    name: 'Herero',
+    id: 'hz',
+  },
+  {
+    name: 'Hindi',
+    id: 'hi',
+  },
+  {
+    name: 'Hiri Motu',
+    id: 'ho',
+  },
+  {
+    name: 'Hungarian',
     id: 'hu',
-    name: 'magyar nyelv (hu)',
   },
   {
+    name: 'Icelandic',
+    id: 'is',
+  },
+  {
+    name: 'Ido',
+    id: 'io',
+  },
+  {
+    name: 'Igbo',
+    id: 'ig',
+  },
+  {
+    name: 'Indonesian',
+    id: 'id',
+  },
+  {
+    name: 'Interlingua',
+    id: 'ia',
+  },
+  {
+    name: 'Interlingue',
+    id: 'ie',
+  },
+  {
+    name: 'Inuktitut',
+    id: 'iu',
+  },
+  {
+    name: 'Inupiaq',
+    id: 'ik',
+  },
+  {
+    name: 'Irish',
+    id: 'ga',
+  },
+  {
+    name: 'Italian',
+    id: 'it',
+  },
+  {
+    name: 'Japanese',
+    id: 'ja',
+  },
+  {
+    name: 'Javanese',
+    id: 'jv',
+  },
+  {
+    name: 'Kannada',
+    id: 'kn',
+  },
+  {
+    name: 'Kanuri',
+    id: 'kr',
+  },
+  {
+    name: 'Kashmiri',
+    id: 'ks',
+  },
+  {
+    name: 'Kazakh',
+    id: 'kk',
+  },
+  {
+    name: 'Central Khmer',
+    id: 'km',
+  },
+  {
+    name: 'Kikuyu',
+    id: 'ki',
+  },
+  {
+    name: 'Kinyarwanda',
+    id: 'rw',
+  },
+  {
+    name: 'Kirghiz',
+    id: 'ky',
+  },
+  {
+    name: 'Komi',
+    id: 'kv',
+  },
+  {
+    name: 'Kongo',
+    id: 'kg',
+  },
+  {
+    name: 'Korean',
+    id: 'ko',
+  },
+  {
+    name: 'Kuanyama',
+    id: 'kj',
+  },
+  {
+    name: 'Kurdish',
+    id: 'ku',
+  },
+  {
+    name: 'Lao',
+    id: 'lo',
+  },
+  {
+    name: 'Latin',
+    id: 'la',
+  },
+  {
+    name: 'Latvian',
+    id: 'lv',
+  },
+  {
+    name: 'Limburgan',
+    id: 'li',
+  },
+  {
+    name: 'Lingala',
+    id: 'ln',
+  },
+  {
+    name: 'Lithuanian',
+    id: 'lt',
+  },
+  {
+    name: 'Luba-Katanga',
+    id: 'lu',
+  },
+  {
+    name: 'Luxembourgish',
+    id: 'lb',
+  },
+  {
+    name: 'Macedonian',
+    id: 'mk',
+  },
+  {
+    name: 'Malagasy',
+    id: 'mg',
+  },
+  {
+    name: 'Malay',
+    id: 'ms',
+  },
+  {
+    name: 'Malayalam',
+    id: 'ml',
+  },
+  {
+    name: 'Maltese',
+    id: 'mt',
+  },
+  {
+    name: 'Manx',
+    id: 'gv',
+  },
+  {
+    name: 'Maori',
+    id: 'mi',
+  },
+  {
+    name: 'Marathi',
+    id: 'mr',
+  },
+  {
+    name: 'Marshallese',
+    id: 'mh',
+  },
+  {
+    name: 'Mongolian',
+    id: 'mn',
+  },
+  {
+    name: 'Nauru',
+    id: 'na',
+  },
+  {
+    name: 'Navajo',
+    id: 'nv',
+  },
+  {
+    name: 'North Ndebele',
+    id: 'nd',
+  },
+  {
+    name: 'South Ndebele',
+    id: 'nr',
+  },
+  {
+    name: 'Ndonga',
+    id: 'ng',
+  },
+  {
+    name: 'Nepali',
+    id: 'ne',
+  },
+  {
+    name: 'Norwegian',
     id: 'no',
-    name: 'norsk (no)',
   },
   {
-    id: 'zh-CN',
-    name: '中文 (zh-CN)',
+    name: 'Norwegian Bokmål',
+    id: 'nb',
   },
   {
+    name: 'Norwegian Nynorsk',
+    id: 'nn',
+  },
+  {
+    name: 'Sichuan Yi',
+    id: 'ii',
+  },
+  {
+    name: 'Occitan',
+    id: 'oc',
+  },
+  {
+    name: 'Ojibwa',
+    id: 'oj',
+  },
+  {
+    name: 'Oriya',
+    id: 'or',
+  },
+  {
+    name: 'Oromo',
+    id: 'om',
+  },
+  {
+    name: 'Ossetian',
+    id: 'os',
+  },
+  {
+    name: 'Pali',
+    id: 'pi',
+  },
+  {
+    name: 'Pashto, Pushto',
+    id: 'ps',
+  },
+  {
+    name: 'Persian',
+    id: 'fa',
+  },
+  {
+    name: 'Polish',
     id: 'pl',
-    name: 'język polski (pl)',
+  },
+  {
+    name: 'Portuguese',
+    id: 'pt',
+  },
+  {
+    name: 'Punjabi',
+    id: 'pa',
+  },
+  {
+    name: 'Quechua',
+    id: 'qu',
+  },
+  {
+    name: 'Romanian',
+    id: 'ro',
+  },
+  {
+    name: 'Romansh',
+    id: 'rm',
+  },
+  {
+    name: 'Rundi',
+    id: 'rn',
+  },
+  {
+    name: 'Russian',
+    id: 'ru',
+  },
+  {
+    name: 'Northern Sami',
+    id: 'se',
+  },
+  {
+    name: 'Samoan',
+    id: 'sm',
+  },
+  {
+    name: 'Sango',
+    id: 'sg',
+  },
+  {
+    name: 'Sanskrit',
+    id: 'sa',
+  },
+  {
+    name: 'Sardinian',
+    id: 'sc',
+  },
+  {
+    name: 'Serbian',
+    id: 'sr',
+  },
+  {
+    name: 'Shona',
+    id: 'sn',
+  },
+  {
+    name: 'Sindhi',
+    id: 'sd',
+  },
+  {
+    name: 'Sinhala',
+    id: 'si',
+  },
+  {
+    name: 'Slovak',
+    id: 'sk',
+  },
+  {
+    name: 'Slovenian',
+    id: 'sl',
+  },
+  {
+    name: 'Somali',
+    id: 'so',
+  },
+  {
+    name: 'Southern Sotho',
+    id: 'st',
+  },
+  {
+    name: 'Spanish',
+    id: 'es',
+  },
+  {
+    name: 'Sundanese',
+    id: 'su',
+  },
+  {
+    name: 'Swahili',
+    id: 'sw',
+  },
+  {
+    name: 'Swati',
+    id: 'ss',
+  },
+  {
+    name: 'Swedish',
+    id: 'sv',
+  },
+  {
+    name: 'Tagalog',
+    id: 'tl',
+  },
+  {
+    name: 'Tahitian',
+    id: 'ty',
+  },
+  {
+    name: 'Tajik',
+    id: 'tg',
+  },
+  {
+    name: 'Tamil',
+    id: 'ta',
+  },
+  {
+    name: 'Tatar',
+    id: 'tt',
+  },
+  {
+    name: 'Telugu',
+    id: 'te',
+  },
+  {
+    name: 'Thai',
+    id: 'th',
+  },
+  {
+    name: 'Tibetan',
+    id: 'bo',
+  },
+  {
+    name: 'Tigrinya',
+    id: 'ti',
+  },
+  {
+    name: 'Tonga',
+    id: 'to',
+  },
+  {
+    name: 'Tsonga',
+    id: 'ts',
+  },
+  {
+    name: 'Tswana',
+    id: 'tn',
+  },
+  {
+    name: 'Turkish',
+    id: 'tr',
+  },
+  {
+    name: 'Turkmen',
+    id: 'tk',
+  },
+  {
+    name: 'Twi',
+    id: 'tw',
+  },
+  {
+    name: 'Uighur',
+    id: 'ug',
+  },
+  {
+    name: 'Ukrainian',
+    id: 'uk',
+  },
+  {
+    name: 'Urdu',
+    id: 'ur',
+  },
+  {
+    name: 'Uzbek',
+    id: 'uz',
+  },
+  {
+    name: 'Venda',
+    id: 've',
+  },
+  {
+    name: 'Vietnamese',
+    id: 'vi',
+  },
+  {
+    name: 'Volapük',
+    id: 'vo',
+  },
+  {
+    name: 'Walloon',
+    id: 'wa',
+  },
+  {
+    name: 'Welsh',
+    id: 'cy',
+  },
+  {
+    name: 'Wolof',
+    id: 'wo',
+  },
+  {
+    name: 'Xhosa',
+    id: 'xh',
+  },
+  {
+    name: 'Yiddish',
+    id: 'yi',
+  },
+  {
+    name: 'Yoruba',
+    id: 'yo',
+  },
+  {
+    name: 'Zhuang, Chuang',
+    id: 'za',
+  },
+  {
+    name: 'Zulu',
+    id: 'zu',
   },
 ];
 
+export const getLanguageName = (languageCode = '') => {
+  const languageObj =
+    languages.find(language => language.id === languageCode) || {};
+  return languageObj.name || '';
+};
+
 export default languages;
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/advancedFilterItems.spec.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/advancedFilterItems.spec.js
similarity index 71%
rename from app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/advancedFilterItems.spec.js
rename to app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/advancedFilterItems.spec.js
index 69eafa994..2132ebaf2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/advancedFilterItems.spec.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/advancedFilterItems.spec.js
@@ -1,5 +1,5 @@
-import defaultFilters from './index';
-import { filterAttributeGroups } from './index';
+import defaultFilters from '../index';
+import { filterAttributeGroups } from '../index';
 
 describe('#filterItems', () => {
   it('Matches the correct filterItems', () => {
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js
new file mode 100644
index 000000000..52bc981fd
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js
@@ -0,0 +1,10 @@
+import { getLanguageName } from '../languages';
+
+describe('#getLanguageName', () => {
+  it('Returns correct language name', () => {
+    expect(getLanguageName('es')).toEqual('Spanish');
+    expect(getLanguageName()).toEqual('');
+    expect(getLanguageName('rrr')).toEqual('');
+    expect(getLanguageName('')).toEqual('');
+  });
+});
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
index 87df4d281..6bf9cdc65 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
@@ -6,7 +6,8 @@
       'hide--quoted': !showQuotedContent,
     }"
   >
-    <div v-dompurify-html="message" class="text-content" />
+    <div v-if="!isEmail" v-dompurify-html="message" class="text-content" />
+    <letter v-else class="text-content" :html="message" />
     <button
       v-if="displayQuotedButton"
       class="quoted-text--button"
@@ -25,7 +26,10 @@
 </template>
 
 <script>
+import Letter from 'vue-letter';
+
 export default {
+  components: { Letter },
   props: {
     message: {
       type: String,
@@ -65,14 +69,16 @@ export default {
     padding-left: var(--space-two);
   }
   table {
-    all: revert;
+    margin: 0;
+    border: 0;
 
     td {
-      all: revert;
+      margin: 0;
+      border: 0;
     }
 
     tr {
-      all: revert;
+      border-bottom: 0 !important;
     }
   }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
new file mode 100644
index 000000000..dc5a8887f
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="menu-container">
+    <template v-for="option in statusMenuConfig">
+      <menu-item
+        v-if="show(option.key)"
+        :key="option.key"
+        :option="option"
+        variant="icon"
+        @click="toggleStatus(option.key, null)"
+      />
+    </template>
+    <menu-item-with-submenu :option="snoozeMenuConfig">
+      <menu-item
+        v-for="(option, i) in snoozeMenuConfig.options"
+        :key="i"
+        :option="option"
+        @click="snoozeConversation(option.snoozedUntil)"
+      />
+    </menu-item-with-submenu>
+    <menu-item-with-submenu :option="labelMenuConfig">
+      <template>
+        <menu-item
+          v-for="label in labels"
+          :key="label.id"
+          :option="generateMenuLabelConfig(label, 'label')"
+          variant="label"
+          @click="$emit('assign-label', label)"
+        />
+      </template>
+    </menu-item-with-submenu>
+    <menu-item-with-submenu :option="agentMenuConfig">
+      <agent-loading-placeholder v-if="assignableAgentsUiFlags.isFetching" />
+      <template v-else>
+        <menu-item
+          v-for="agent in assignableAgents"
+          :key="agent.id"
+          :option="generateMenuLabelConfig(agent, 'agent')"
+          variant="agent"
+          @click="$emit('assign-agent', agent)"
+        />
+      </template>
+    </menu-item-with-submenu>
+    <menu-item-with-submenu :option="teamMenuConfig">
+      <menu-item
+        v-for="team in teams"
+        :key="team.id"
+        :option="generateMenuLabelConfig(team, 'team')"
+        @click="$emit('assign-team', team)"
+      />
+    </menu-item-with-submenu>
+  </div>
+</template>
+
+<script>
+import MenuItem from './menuItem.vue';
+import MenuItemWithSubmenu from './menuItemWithSubmenu.vue';
+import wootConstants from 'dashboard/constants.js';
+import snoozeTimesMixin from 'dashboard/mixins/conversation/snoozeTimesMixin';
+import { mapGetters } from 'vuex';
+import AgentLoadingPlaceholder from './agentLoadingPlaceholder.vue';
+export default {
+  components: {
+    MenuItem,
+    MenuItemWithSubmenu,
+    AgentLoadingPlaceholder,
+  },
+  mixins: [snoozeTimesMixin],
+  props: {
+    status: {
+      type: String,
+      default: '',
+    },
+    inboxId: {
+      type: Number,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      STATUS_TYPE: wootConstants.STATUS_TYPE,
+      statusMenuConfig: [
+        {
+          key: wootConstants.STATUS_TYPE.RESOLVED,
+          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.RESOLVED'),
+          icon: 'checkmark',
+        },
+        {
+          key: wootConstants.STATUS_TYPE.PENDING,
+          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.PENDING'),
+          icon: 'book-clock',
+        },
+        {
+          key: wootConstants.STATUS_TYPE.OPEN,
+          label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.REOPEN'),
+          icon: 'arrow-redo',
+        },
+      ],
+      snoozeMenuConfig: {
+        key: 'snooze',
+        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.SNOOZE.TITLE'),
+        icon: 'snooze',
+        options: [
+          {
+            label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.SNOOZE.NEXT_REPLY'),
+            key: 'next-reply',
+            snoozedUntil: null,
+          },
+          {
+            label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.SNOOZE.TOMORROW'),
+            key: 'tomorrow',
+            snoozedUntil: 'tomorrow',
+          },
+          {
+            label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.SNOOZE.NEXT_WEEK'),
+            key: 'next-week',
+            snoozedUntil: 'nextWeek',
+          },
+        ],
+      },
+      labelMenuConfig: {
+        key: 'label',
+        icon: 'tag',
+        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.ASSIGN_LABEL'),
+      },
+      agentMenuConfig: {
+        key: 'agent',
+        icon: 'person-add',
+        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.ASSIGN_AGENT'),
+      },
+      teamMenuConfig: {
+        key: 'team',
+        icon: 'people-team-add',
+        label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.ASSIGN_TEAM'),
+      },
+    };
+  },
+  computed: {
+    ...mapGetters({
+      labels: 'labels/getLabels',
+      teams: 'teams/getTeams',
+      assignableAgentsUiFlags: 'inboxAssignableAgents/getUIFlags',
+    }),
+    assignableAgents() {
+      return this.$store.getters['inboxAssignableAgents/getAssignableAgents'](
+        this.inboxId
+      );
+    },
+  },
+  mounted() {
+    this.$store.dispatch('inboxAssignableAgents/fetch', [this.inboxId]);
+  },
+  methods: {
+    toggleStatus(status, snoozedUntil) {
+      this.$emit('update-conversation', status, snoozedUntil);
+    },
+    snoozeConversation(snoozedUntil) {
+      this.$emit(
+        'update-conversation',
+        this.STATUS_TYPE.SNOOZED,
+        this.snoozeTimes[snoozedUntil] || null
+      );
+    },
+    show(key) {
+      // If the conversation status is same as the action, then don't display the option
+      // i.e.: Don't show an option to resolve if the conversation is already resolved.
+      return this.status !== key;
+    },
+    generateMenuLabelConfig(option, type = 'text') {
+      return {
+        key: option.id,
+        ...(type === 'icon' && { icon: option.icon }),
+        ...(type === 'label' && { color: option.color }),
+        ...(type === 'agent' && { thumbnail: option.thumbnail }),
+        ...(type === 'text' && { label: option.label }),
+        ...(type === 'label' && { label: option.title }),
+        ...(type === 'agent' && { label: option.name }),
+        ...(type === 'team' && { label: option.name }),
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.menu-container {
+  padding: var(--space-smaller);
+  background-color: var(--white);
+  box-shadow: var(--shadow-context-menu);
+  border-radius: var(--border-radius-normal);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/agentLoadingPlaceholder.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/agentLoadingPlaceholder.vue
new file mode 100644
index 000000000..975d57fdc
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/agentLoadingPlaceholder.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="agent-placeholder">
+    <spinner />
+    <p>{{ $t('CONVERSATION.CARD_CONTEXT_MENU.AGENTS_LOADING') }}</p>
+  </div>
+</template>
+
+<script>
+import Spinner from 'shared/components/Spinner';
+
+export default {
+  components: {
+    Spinner,
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.agent-placeholder {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  padding: var(--space-normal) 0;
+  min-width: calc(var(--space-mega) * 2);
+
+  p {
+    margin: var(--space-small) 0 0 0;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
new file mode 100644
index 000000000..7534430d5
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="menu" @click.stop="$emit('click')">
+    <fluent-icon
+      v-if="variant === 'icon' && option.icon"
+      :icon="option.icon"
+      size="14"
+      class="menu-icon"
+    />
+    <span
+      v-if="variant === 'label' && option.color"
+      class="label-pill"
+      :style="{ backgroundColor: option.color }"
+    />
+    <thumbnail
+      v-if="variant === 'agent'"
+      :username="option.label"
+      :src="option.thumbnail"
+      size="20px"
+      class="agent-thumbnail"
+    />
+    <p class="menu-label truncate-text">{{ option.label }}</p>
+  </div>
+</template>
+
+<script>
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+export default {
+  components: {
+    Thumbnail,
+  },
+  props: {
+    option: {
+      type: Object,
+      default: () => {},
+    },
+    variant: {
+      type: String,
+      default: 'default',
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.menu {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  width: calc(var(--space-mega) * 2);
+  padding: var(--space-smaller);
+  border-radius: var(--border-radius-small);
+  overflow: hidden;
+
+  .menu-label {
+    margin: 0;
+    font-size: var(--font-size-mini);
+    flex-shrink: 0;
+  }
+
+  .menu-icon {
+    margin-right: var(--space-small);
+  }
+
+  &:hover {
+    background-color: var(--w-500);
+    color: var(--white);
+  }
+}
+
+.agent-thumbnail {
+  margin-top: 0 !important;
+  margin-right: var(--space-small);
+}
+
+.label-pill {
+  width: var(--space-normal);
+  height: var(--space-normal);
+  border-radius: var(--border-radius-rounded);
+  border: 1px solid var(--s-50);
+  flex-shrink: 0;
+  margin-right: var(--space-small);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
new file mode 100644
index 000000000..08922bc37
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="menu-with-submenu flex-between">
+    <div class="menu-left">
+      <fluent-icon :icon="option.icon" size="14" class="menu-icon" />
+      <p class="menu-label">{{ option.label }}</p>
+    </div>
+    <fluent-icon icon="chevron-right" size="12" />
+    <div class="submenu">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    option: {
+      type: Object,
+      default: () => {},
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.menu-with-submenu {
+  width: 100%;
+  padding: var(--space-smaller);
+  border-radius: var(--border-radius-small);
+  position: relative;
+  min-width: calc(var(--space-mega) * 2);
+  background-color: var(--white);
+
+  .menu-left {
+    display: flex;
+    align-items: center;
+
+    .menu-label {
+      margin: 0;
+      font-size: var(--font-size-mini);
+    }
+
+    .menu-icon {
+      margin-right: var(--space-small);
+    }
+  }
+
+  .submenu {
+    padding: var(--space-smaller);
+    background-color: var(--white);
+    box-shadow: var(--shadow-context-menu);
+    border-radius: var(--border-radius-normal);
+    position: absolute;
+    position: absolute;
+    left: 100%;
+    top: 0;
+    display: none;
+  }
+
+  &:hover {
+    background-color: var(--w-75);
+    .submenu {
+      display: block;
+    }
+    &:before {
+      content: '';
+      position: absolute;
+      z-index: var(--z-index-highest);
+      bottom: -65%;
+      height: 75%;
+      right: 0%;
+      width: 50%;
+      clip-path: polygon(100% 0, 0% 0%, 100% 100%);
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index 0161240b8..057438895 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -1,5 +1,5 @@
 <template>
-  <label>
+  <label class="input-container">
     <span v-if="label">{{ label }}</span>
     <input
       :value="value"
@@ -10,7 +10,7 @@
       @input="onChange"
       @blur="onBlur"
     />
-    <p v-if="helpText" class="help-text" />
+    <p v-if="helpText" class="help-text">{{ helpText }}</p>
     <span v-if="error" class="message">
       {{ error }}
     </span>
@@ -46,7 +46,7 @@ export default {
     },
     readonly: {
       type: Boolean,
-      deafaut: false,
+      default: false,
     },
     styles: {
       type: Object,
@@ -63,3 +63,14 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+.help-text {
+  margin-top: var(--space-micro);
+  font-size: var(--font-size-mini);
+  color: var(--s-600);
+  font-style: normal;
+}
+.message {
+  margin-top: 0 !important;
+}
+</style>
diff --git a/app/javascript/dashboard/constants.js b/app/javascript/dashboard/constants.js
index 5692e85e4..64ee11e07 100644
--- a/app/javascript/dashboard/constants.js
+++ b/app/javascript/dashboard/constants.js
@@ -12,5 +12,10 @@ export default {
     SNOOZED: 'snoozed',
     ALL: 'all',
   },
+  LAYOUT_TYPES: {
+    CONDENSED: 'condensed',
+    EXPANDED: 'expanded',
+  },
+  DOCS_URL: '//www.chatwoot.com/docs/product/',
 };
 export const DEFAULT_REDIRECT_URL = '/app/';
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 4c1a6f718..04bd4104e 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -1,21 +1,35 @@
-import queryString from 'query-string';
 import { DEFAULT_REDIRECT_URL } from '../constants';
 
 export const frontendURL = (path, params) => {
-  const stringifiedParams = params ? `?${queryString.stringify(params)}` : '';
+  const stringifiedParams = params ? `?${new URLSearchParams(params)}` : '';
   return `/app/${path}${stringifiedParams}`;
 };
 
-export const getLoginRedirectURL = (ssoAccountId, user) => {
+const getSSOAccountPath = ({ ssoAccountId, user }) => {
   const { accounts = [] } = user || {};
   const ssoAccount = accounts.find(
     account => account.id === Number(ssoAccountId)
   );
+  let accountPath = '';
   if (ssoAccount) {
-    return frontendURL(`accounts/${ssoAccountId}/dashboard`);
+    accountPath = `accounts/${ssoAccountId}`;
+  } else if (accounts.length) {
+    accountPath = `accounts/${accounts[0].id}`;
   }
-  if (accounts.length) {
-    return frontendURL(`accounts/${accounts[0].id}/dashboard`);
+  return accountPath;
+};
+
+export const getLoginRedirectURL = ({
+  ssoAccountId,
+  ssoConversationId,
+  user,
+}) => {
+  const accountPath = getSSOAccountPath({ ssoAccountId, user });
+  if (accountPath) {
+    if (ssoConversationId) {
+      return frontendURL(`${accountPath}/conversations/${ssoConversationId}`);
+    }
+    return frontendURL(`${accountPath}/dashboard`);
   }
   return DEFAULT_REDIRECT_URL;
 };
@@ -44,6 +58,26 @@ export const conversationUrl = ({
   return url;
 };
 
+export const conversationListPageURL = ({
+  accountId,
+  conversationType = '',
+  inboxId,
+  label,
+  teamId,
+}) => {
+  let url = `accounts/${accountId}/dashboard`;
+  if (label) {
+    url = `accounts/${accountId}/label/${label}`;
+  } else if (teamId) {
+    url = `accounts/${accountId}/team/${teamId}`;
+  } else if (conversationType === 'mention') {
+    url = `accounts/${accountId}/mentions/conversations`;
+  } else if (inboxId) {
+    url = `accounts/${accountId}/inbox/${inboxId}`;
+  }
+  return frontendURL(url);
+};
+
 export const isValidURL = value => {
   /* eslint-disable no-useless-escape */
   const URL_REGEX = /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
diff --git a/app/javascript/dashboard/helper/commons.js b/app/javascript/dashboard/helper/commons.js
index 85e997802..d50080e82 100644
--- a/app/javascript/dashboard/helper/commons.js
+++ b/app/javascript/dashboard/helper/commons.js
@@ -62,9 +62,23 @@ export const createPendingMessage = data => {
   return pendingMessage;
 };
 
-export const convertToSlug = text => {
+export const convertToAttributeSlug = text => {
   return text
     .toLowerCase()
     .replace(/[^\w ]+/g, '')
     .replace(/ +/g, '_');
 };
+
+export const convertToCategorySlug = text => {
+  return text
+    .toLowerCase()
+    .replace(/[^\w ]+/g, '')
+    .replace(/ +/g, '-');
+};
+
+export const convertToPortalSlug = text => {
+  return text
+    .toLowerCase()
+    .replace(/[^\w ]+/g, '')
+    .replace(/ +/g, '-');
+};
diff --git a/app/javascript/dashboard/helper/flag.js b/app/javascript/dashboard/helper/flag.js
new file mode 100644
index 000000000..637589a23
--- /dev/null
+++ b/app/javascript/dashboard/helper/flag.js
@@ -0,0 +1,19 @@
+const FLAG_OFFSET = 127397;
+
+/**
+ * Gets emoji flag for given locale.
+ *
+ * @param {string} countryCode locale code
+ * @return {string} emoji flag
+ *
+ * @example
+ * getCountryFlag('cz') // '🇨🇿'
+ */
+export const getCountryFlag = countryCode => {
+  const codePoints = countryCode
+    .toUpperCase()
+    .split('')
+    .map(char => FLAG_OFFSET + char.charCodeAt());
+
+  return String.fromCodePoint(...codePoints);
+};
diff --git a/app/javascript/dashboard/helper/localStorage.js b/app/javascript/dashboard/helper/localStorage.js
index cc963aa48..13bbf2e0d 100644
--- a/app/javascript/dashboard/helper/localStorage.js
+++ b/app/javascript/dashboard/helper/localStorage.js
@@ -1,17 +1,32 @@
-class LocalStorage {
-  constructor(key) {
-    this.key = key;
-  }
+export const LOCAL_STORAGE_KEYS = {
+  DISMISSED_UPDATES: 'dismissedUpdates',
+  WIDGET_BUILDER: 'widgetBubble_',
+};
 
-  store(allItems) {
-    localStorage.setItem(this.key, JSON.stringify(allItems));
-    localStorage.setItem(this.key + ':ts', Date.now());
-  }
+export const LocalStorage = {
+  clearAll() {
+    window.localStorage.clear();
+  },
 
-  get() {
-    let stored = localStorage.getItem(this.key);
-    return JSON.parse(stored) || [];
-  }
-}
+  get(key) {
+    const value = window.localStorage.getItem(key);
+    try {
+      return typeof value === 'string' ? JSON.parse(value) : value;
+    } catch (error) {
+      return value;
+    }
+  },
+  set(key, value) {
+    if (typeof value === 'object') {
+      window.localStorage.setItem(key, JSON.stringify(value));
+    } else {
+      window.localStorage.setItem(key, value);
+    }
+    window.localStorage.setItem(key + ':ts', Date.now());
+  },
 
-export default LocalStorage;
+  remove(key) {
+    window.localStorage.removeItem(key);
+    window.localStorage.removeItem(key + ':ts');
+  },
+};
diff --git a/app/javascript/dashboard/helper/routeHelpers.js b/app/javascript/dashboard/helper/routeHelpers.js
new file mode 100644
index 000000000..c0abccc00
--- /dev/null
+++ b/app/javascript/dashboard/helper/routeHelpers.js
@@ -0,0 +1,51 @@
+export const getCurrentAccount = ({ accounts } = {}, accountId) => {
+  return accounts.find(account => account.id === accountId);
+};
+
+export const getUserRole = ({ accounts } = {}, accountId) => {
+  const currentAccount = getCurrentAccount({ accounts }, accountId) || {};
+  return currentAccount.role || null;
+};
+
+export const routeIsAccessibleFor = (route, role, roleWiseRoutes) => {
+  return roleWiseRoutes[role].includes(route);
+};
+
+const validateActiveAccountRoutes = (to, user, roleWiseRoutes) => {
+  // If the current account is active, then check for the route permissions
+  const accountDashboardURL = `accounts/${to.params.accountId}/dashboard`;
+
+  // If the user is trying to access suspended route, redirect them to dashboard
+  if (to.name === 'account_suspended') {
+    return accountDashboardURL;
+  }
+
+  const userRole = getUserRole(user, Number(to.params.accountId));
+  const isAccessible = routeIsAccessibleFor(to.name, userRole, roleWiseRoutes);
+  // If the route is not accessible for the user, return to dashboard screen
+  return isAccessible ? null : accountDashboardURL;
+};
+
+export const validateLoggedInRoutes = (to, user, roleWiseRoutes) => {
+  const currentAccount = getCurrentAccount(user, Number(to.params.accountId));
+
+  // If current account is missing, either user does not have
+  // access to the account or the account is deleted, return to login screen
+  if (!currentAccount) {
+    return `app/login`;
+  }
+
+  const isCurrentAccountActive = currentAccount.status === 'active';
+
+  if (isCurrentAccountActive) {
+    return validateActiveAccountRoutes(to, user, roleWiseRoutes);
+  }
+
+  // If the current account is not active, then redirect the user to the suspended screen
+  if (to.name !== 'account_suspended') {
+    return `accounts/${to.params.accountId}/suspended`;
+  }
+
+  // Proceed to the route if none of the above conditions are met
+  return null;
+};
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 96c9a8156..088f384d6 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -3,9 +3,33 @@ import {
   conversationUrl,
   isValidURL,
   getLoginRedirectURL,
+  conversationListPageURL,
 } from '../URLHelper';
 
 describe('#URL Helpers', () => {
+  describe('conversationListPageURL', () => {
+    it('should return url to dashboard', () => {
+      expect(conversationListPageURL({ accountId: 1 })).toBe(
+        '/app/accounts/1/dashboard'
+      );
+    });
+    it('should return url to inbox', () => {
+      expect(conversationListPageURL({ accountId: 1, inboxId: 1 })).toBe(
+        '/app/accounts/1/inbox/1'
+      );
+    });
+    it('should return url to label', () => {
+      expect(conversationListPageURL({ accountId: 1, label: 'support' })).toBe(
+        '/app/accounts/1/label/support'
+      );
+    });
+
+    it('should return url to team', () => {
+      expect(conversationListPageURL({ accountId: 1, teamId: 1 })).toBe(
+        '/app/accounts/1/team/1'
+      );
+    });
+  });
   describe('conversationUrl', () => {
     it('should return direct conversation URL if activeInbox is nil', () => {
       expect(conversationUrl({ accountId: 1, id: 1 })).toBe(
@@ -50,17 +74,37 @@ describe('#URL Helpers', () => {
   describe('getLoginRedirectURL', () => {
     it('should return correct Account URL if account id is present', () => {
       expect(
-        getLoginRedirectURL('7500', {
-          accounts: [{ id: 7500, name: 'Test Account 7500' }],
+        getLoginRedirectURL({
+          ssoAccountId: '7500',
+          user: {
+            accounts: [{ id: 7500, name: 'Test Account 7500' }],
+          },
         })
       ).toBe('/app/accounts/7500/dashboard');
     });
 
-    it('should return default URL if account id is not present', () => {
-      expect(getLoginRedirectURL('7500', {})).toBe('/app/');
+    it('should return correct conversation URL if account id and conversationId is present', () => {
       expect(
-        getLoginRedirectURL('7500', {
-          accounts: [{ id: '7501', name: 'Test Account 7501' }],
+        getLoginRedirectURL({
+          ssoAccountId: '7500',
+          ssoConversationId: '752',
+          user: {
+            accounts: [{ id: 7500, name: 'Test Account 7500' }],
+          },
+        })
+      ).toBe('/app/accounts/7500/conversations/752');
+    });
+
+    it('should return default URL if account id is not present', () => {
+      expect(getLoginRedirectURL({ ssoAccountId: '7500', user: {} })).toBe(
+        '/app/'
+      );
+      expect(
+        getLoginRedirectURL({
+          ssoAccountId: '7500',
+          user: {
+            accounts: [{ id: '7501', name: 'Test Account 7501' }],
+          },
         })
       ).toBe('/app/accounts/7501/dashboard');
       expect(getLoginRedirectURL('7500', null)).toBe('/app/');
diff --git a/app/javascript/dashboard/helper/specs/commons.spec.js b/app/javascript/dashboard/helper/specs/commons.spec.js
index 379e97e86..85e2beb37 100644
--- a/app/javascript/dashboard/helper/specs/commons.spec.js
+++ b/app/javascript/dashboard/helper/specs/commons.spec.js
@@ -1,7 +1,9 @@
 import {
   getTypingUsersText,
   createPendingMessage,
-  convertToSlug,
+  convertToAttributeSlug,
+  convertToCategorySlug,
+  convertToPortalSlug,
 } from '../commons';
 
 describe('#getTypingUsersText', () => {
@@ -88,8 +90,24 @@ describe('#createPendingMessage', () => {
   });
 });
 
-describe('convertToSlug', () => {
+describe('convertToAttributeSlug', () => {
   it('should convert to slug', () => {
-    expect(convertToSlug('Test@%^&*(){}>.!@`~_ ing')).toBe('test__ing');
+    expect(convertToAttributeSlug('Test@%^&*(){}>.!@`~_ ing')).toBe(
+      'test__ing'
+    );
+  });
+});
+
+describe('convertToCategorySlug', () => {
+  it('should convert to slug', () => {
+    expect(convertToCategorySlug('User profile guide')).toBe(
+      'user-profile-guide'
+    );
+  });
+});
+
+describe('convertToPortalSlug', () => {
+  it('should convert to slug', () => {
+    expect(convertToPortalSlug('Room rental')).toBe('room-rental');
   });
 });
diff --git a/app/javascript/dashboard/helper/specs/flag.spec.js b/app/javascript/dashboard/helper/specs/flag.spec.js
new file mode 100644
index 000000000..a57a8edfa
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/flag.spec.js
@@ -0,0 +1,9 @@
+import { getCountryFlag } from '../flag';
+
+describe('#flag', () => {
+  it('returns the correct flag ', () => {
+    expect(getCountryFlag('cz')).toBe('🇨🇿');
+    expect(getCountryFlag('IN')).toBe('🇮🇳');
+    expect(getCountryFlag('US')).toBe('🇺🇸');
+  });
+});
diff --git a/app/javascript/dashboard/helper/specs/routeHelpers.spec.js b/app/javascript/dashboard/helper/specs/routeHelpers.spec.js
new file mode 100644
index 000000000..f3417111a
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/routeHelpers.spec.js
@@ -0,0 +1,96 @@
+import {
+  getCurrentAccount,
+  getUserRole,
+  routeIsAccessibleFor,
+  validateLoggedInRoutes,
+} from '../routeHelpers';
+
+describe('#getCurrentAccount', () => {
+  it('should return the current account', () => {
+    expect(getCurrentAccount({ accounts: [{ id: 1 }] }, 1)).toEqual({ id: 1 });
+    expect(getCurrentAccount({ accounts: [] }, 1)).toEqual(undefined);
+  });
+});
+
+describe('#getUserRole', () => {
+  it('should return the current role', () => {
+    expect(
+      getUserRole({ accounts: [{ id: 1, role: 'administrator' }] }, 1)
+    ).toEqual('administrator');
+    expect(getUserRole({ accounts: [] }, 1)).toEqual(null);
+  });
+});
+
+describe('#routeIsAccessibleFor', () => {
+  it('should return the correct access', () => {
+    const roleWiseRoutes = { agent: ['conversations'], admin: ['billing'] };
+    expect(routeIsAccessibleFor('billing', 'agent', roleWiseRoutes)).toEqual(
+      false
+    );
+    expect(routeIsAccessibleFor('billing', 'admin', roleWiseRoutes)).toEqual(
+      true
+    );
+  });
+});
+
+describe('#validateLoggedInRoutes', () => {
+  describe('when account access is missing', () => {
+    it('should return the login route', () => {
+      expect(
+        validateLoggedInRoutes(
+          { params: { accountId: 1 } },
+          { accounts: [] },
+          {}
+        )
+      ).toEqual(`app/login`);
+    });
+  });
+  describe('when account access is available', () => {
+    describe('when account is suspended', () => {
+      it('return suspended route', () => {
+        expect(
+          validateLoggedInRoutes(
+            { name: 'conversations', params: { accountId: 1 } },
+            { accounts: [{ id: 1, role: 'agent', status: 'suspended' }] },
+            { agent: ['conversations'] }
+          )
+        ).toEqual(`accounts/1/suspended`);
+      });
+    });
+    describe('when account is active', () => {
+      describe('when route is accessible', () => {
+        it('returns null (no action required)', () => {
+          expect(
+            validateLoggedInRoutes(
+              { name: 'conversations', params: { accountId: 1 } },
+              { accounts: [{ id: 1, role: 'agent', status: 'active' }] },
+              { agent: ['conversations'] }
+            )
+          ).toEqual(null);
+        });
+      });
+      describe('when route is not accessible', () => {
+        it('returns dashboard url', () => {
+          expect(
+            validateLoggedInRoutes(
+              { name: 'conversations', params: { accountId: 1 } },
+              { accounts: [{ id: 1, role: 'agent', status: 'active' }] },
+              { admin: ['conversations'], agent: [] }
+            )
+          ).toEqual(`accounts/1/dashboard`);
+        });
+      });
+      describe('when route is suspended route', () => {
+        it('returns dashboard url', () => {
+          expect(
+            validateLoggedInRoutes(
+              { name: 'account_suspended', params: { accountId: 1 } },
+              { accounts: [{ id: 1, role: 'agent', status: 'active' }] },
+              { agent: ['account_suspended'] }
+            )
+          ).toEqual(`accounts/1/dashboard`);
+        });
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/i18n/index.js b/app/javascript/dashboard/i18n/index.js
index 940a1ae4c..812b69018 100644
--- a/app/javascript/dashboard/i18n/index.js
+++ b/app/javascript/dashboard/i18n/index.js
@@ -26,6 +26,7 @@ import ru from './locale/ru';
 import sk from './locale/sk';
 import sv from './locale/sv';
 import ta from './locale/ta';
+import th from './locale/th';
 import tr from './locale/tr';
 import uk from './locale/uk';
 import vi from './locale/vi';
@@ -54,13 +55,14 @@ export default {
   nl,
   no,
   pl,
-  pt,
   pt_BR,
+  pt,
   ro,
   ru,
   sk,
   sv,
   ta,
+  th,
   tr,
   uk,
   vi,
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 342f6e8cf..ab134c256 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "تم النسخ إلى الحافظة بنجاح",
     "COMPANY": "الشركة",
     "LOCATION": "الموقع الجغرافي",
+    "BROWSER_LANGUAGE": "لغة المتصفح",
     "CONVERSATION_TITLE": "تفاصيل المحادثة",
     "VIEW_PROFILE": "عرض الملف الشخصي",
     "BROWSER": "المتصفح",
@@ -150,8 +151,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "تم حذف صورة جهة الاتصال بنجاح",
+        "ERROR_MESSAGE": "تعذر حذف الصورة الرمزية لجهة الإتصال. الرجاء المحاولة مرة أخرى لاحقاً."
       }
     },
     "SUCCESS_MESSAGE": "تم حفظ جهة الاتصال بنجاح",
diff --git a/app/javascript/dashboard/i18n/locale/ar/contactFilters.json b/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
index aae39fe5f..ad6c3ccc3 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
@@ -39,7 +39,7 @@
             "CUSTOM_ATTRIBUTE_CHECKBOX": "مربع",
             "CREATED_AT": "تم إنشاؤها في",
             "LAST_ACTIVITY": "آخر نشاط",
-            "REFERER_LINK": "Referrer link"
+            "REFERER_LINK": "رابط المرجع"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "الفلاتر القياسية",
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 5d6d7b7ce..d5b4eef83 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "الرجاء اختيار محادثة من قائمة المحادثات",
+    "SELECT_A_CONVERSATION": "الرجاء اختيار محادثة من قائمة المحادثات",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "الرسائل",
     "UNVERIFIED_SESSION": "لم يتم التحقق من هوية هذا المستخدم",
     "NO_MESSAGE_1": "لا توجد رسائل بعد من العملاء في صندوق الوارد الخاص بك.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "الأسبوع المقبل"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "تحديد كمعلق",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "إعادة فتح المحادثة",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "حتى الرد القادم",
+        "TOMORROW": "حتى الغد",
+        "NEXT_WEEK": "حتى الأسبوع القادم"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "توقيع الرسالة",
       "ENABLE_SIGN_TOOLTIP": "تمكين التوقيع",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "ملاحظة خاصة: مرئية فقط لأعضاء فريق العمل والموظفين",
     "CHANGE_STATUS": "تم تغيير حالة المحادثة",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "تم تغيير الموظف الذي تم إحالة المحادثة إليه",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "تم تغيير فريق المحادثة",
     "FILE_SIZE_LIMIT": "حجم الملف يتجاوز حد الاقصى وهو {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "غير قادر على إرسال هذه الرسالة، الرجاء المحاولة مرة أخرى لاحقاً",
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index ea0283165..7e90e02a7 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -1,23 +1,219 @@
 {
   "HELP_CENTER": {
     "HEADER": {
-      "FILTER": "Filter by",
-      "SORT": "Sort by",
+      "FILTER": "تصفية حسب",
+      "SORT": "ترتيب حسب",
       "SETTINGS_BUTTON": "الإعدادات",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "مقالة جديدة",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
-      "PUBLISH_BUTTON": "Publish",
-      "PREVIEW": "Preview",
-      "ADD_TRANSLATION": "Add translation",
-      "OPEN_SIDEBAR": "Open sidebar",
-      "CLOSE_SIDEBAR": "Close sidebar",
-      "SAVING": "Draft saving...",
-      "SAVED": "Draft saved"
+      "PUBLISH_BUTTON": "نشر",
+      "PREVIEW": "معاينة",
+      "ADD_TRANSLATION": "إضافة ترجمة",
+      "OPEN_SIDEBAR": "فتح الشريط الجانبي",
+      "CLOSE_SIDEBAR": "إغلاق الشريط الجانبي",
+      "SAVING": "حفظ المسودة...",
+      "SAVED": "تم حفظ المسودة"
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "الفئة",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "مفعل",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "إلغاء",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "الإعدادات"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "الاسم",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "حذف",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "الاسم",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "الاسم مطلوب"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "إلغاء"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
     },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "العنوان",
+        "CATEGORY": "الفئة",
+        "READ_COUNT": "Read count",
+        "STATUS": "الحالة",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "بواسطة"
+      }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "الاسم",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "الاسم مطلوب"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "الوصف",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "الوصف مطلوب"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "إلغاء"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 70eedc327..f1e998840 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -112,10 +112,10 @@
           "ERROR": "هذا الحقل مطلوب"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "SID خدمة المراسلة",
+          "PLACEHOLDER": "الرجاء إدخال SID لخدمة مراسلة Twilio",
           "ERROR": "هذا الحقل مطلوب",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "استخدام خدمة مراسلة توليو"
         },
         "CHANNEL_TYPE": {
           "LABEL": "نوع القناة",
@@ -413,7 +413,8 @@
       "CONFIGURATION": "الإعدادات",
       "CAMPAIGN": "الحملات",
       "PRE_CHAT_FORM": "نموذج ما قبل الدردشة",
-      "BUSINESS_HOURS": "ساعات العمل"
+      "BUSINESS_HOURS": "ساعات العمل",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "الإعدادات",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "فتح وضع التحقق من SSL",
       "AUTH_MECHANISM": "المصادقة"
     },
-    "NOTE": "ملاحظة: "
+    "NOTE": "ملاحظة: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "اسم الموقع",
+          "PLACE_HOLDER": "أدخل اسم موقع الويب الخاص بك (مثال: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "العنوان الترحيبي",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "افتتاحية الترحيب",
+          "PLACE_HOLDER": "نحن نجعل من السهل عليك التواصل معنا. اسألنا أي شيء، أو قم بمشاركتنا ملاحظاتك."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "في غضون دقائق قليلة",
+          "IN_A_FEW_HOURS": "في غضون ساعات قليلة",
+          "IN_A_DAY": "خلال يوم"
+        },
+        "WIDGET_COLOR_LABEL": "لون صندوق الدردشة",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "تحدث الينا",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "تحدث الينا"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "معاينة",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "عادة نقوم بالرد خلال بضع دقائق",
+        "IN_A_FEW_HOURS": "عادة نقوم بالرد خلال بضع ساعات",
+        "IN_A_DAY": "عادة نقوم بالرد خلال يوم واحد"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "ابدأ المحادثة",
+        "CHAT_INPUT_PLACEHOLDER": "أكتب رسالتك"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "نحن بعيدون في الوقت الحالي"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "مدعوم بواسطة Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index b7eb4a66e..299294819 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -86,49 +86,49 @@
       "BUTTON_TEXT": "ربط الاتصال"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
+      "TITLE": "تطبيقات لوحة التحكم",
+      "HEADER_BTN_TXT": "إضافة تطبيق جديد للوحة التحكم",
       "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "DESCRIPTION": "تسمح تطبيقات لوحة التحكم للمنظمات بتضمين تطبيق داخل لوحة التحكم لتوفير السياق لوكلاء دعم العملاء. هذه الميزة تسمح لك بإنشاء تطبيق بشكل مستقل وإدراج لتوفير معلومات المستخدم أو طلباتهم أو سجل الدفع السابق.",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "لا توجد تطبيقات لوحة التحكم التي تم تكوينها على هذا الحساب حتى الآن",
+        "LOADING": "جلب تطبيقات لوحة التحكم...",
         "TABLE_HEADER": [
           "الاسم",
-          "Endpoint"
+          "نقطة الوصول"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "تعديل التطبيق",
+        "DELETE_TOOLTIP": "حذف التطبيق"
       },
       "FORM": {
         "TITLE_LABEL": "الاسم",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
-        "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "TITLE_PLACEHOLDER": "أدخل اسم لتطبيق لوحة التحكم الخاصة بك",
+        "TITLE_ERROR": "مطلوب اسم لتطبيق لوحة التحكم",
+        "URL_LABEL": "نقطة الوصول",
+        "URL_PLACEHOLDER": "أدخل عنوان URL لنقطة النهاية حيث يتم استضافة التطبيق الخاص بك",
+        "URL_ERROR": "رابط صحيح مطلوب"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "إضافة تطبيق جديد للوحة التحكم",
         "FORM_SUBMIT": "إرسال",
         "FORM_CANCEL": "إلغاء",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "تم تكوين تطبيق لوحة التحكم بنجاح",
+        "API_ERROR": "لم نتمكن من إنشاء تطبيق. الرجاء المحاولة مرة أخرى لاحقاً"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "تعديل تطبيق لوحة التحكم",
         "FORM_SUBMIT": "تحديث",
         "FORM_CANCEL": "إلغاء",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "تم تحديث تطبيق لوحة التحكم بنجاح",
+        "API_ERROR": "لم نتمكن من تحديث التطبيق. الرجاء المحاولة مرة أخرى لاحقاً"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "نعم، احذف",
+        "CONFIRM_NO": "لا، احتفظ به",
         "TITLE": "تأكيد الحذف",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "MESSAGE": "هل أنت متأكد من حذف التطبيق - %{appName}؟",
+        "API_SUCCESS": "تم حذف تطبيق لوحة التحكم بنجاح",
+        "API_ERROR": "لم نتمكن من حذف التطبيق. الرجاء المحاولة مرة أخرى لاحقاً"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index bb1e9f492..a51c24386 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "أيام متبقية من الفترة التجريبية.",
     "TRAIL_BUTTON": "اشترك الآن",
-    "DELETED_USER": "حذف المستخدم"
+    "DELETED_USER": "حذف المستخدم",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "سمات مخصصة",
     "AUTOMATION": "الأتمتة",
     "TEAMS": "الفرق",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "المجلدات",
     "CUSTOM_VIEWS_SEGMENTS": "الأجزاء",
     "ALL_CONTACTS": "جميع جهات الاتصال",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "تعيين نفسك كـ",
     "BETA": "تجريبي",
     "REPORTS_OVERVIEW": "نظرة عامة",
-    "FACEBOOK_REAUTHORIZE": "انتهت صلاحية اتصال الفيسبوك الخاص بك، يرجى إعادة الاتصال بصفحة الفيسبوك الخاصة بك لمواصلة الخدمات"
+    "FACEBOOK_REAUTHORIZE": "انتهت صلاحية اتصال الفيسبوك الخاص بك، يرجى إعادة الاتصال بصفحة الفيسبوك الخاصة بك لمواصلة الخدمات",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "الفئة",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "تحدث الينا"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "أوه! لم نتمكن من العثور على الحساب. الرجاء إنشاء حساب جديد للمتابعة.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 4cea7bd70..f47704bfc 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Успешно копиране в клипборда",
     "COMPANY": "Фирма",
     "LOCATION": "Локация",
+    "BROWSER_LANGUAGE": "Език на браузъра",
     "CONVERSATION_TITLE": "Детайли на разговора",
     "VIEW_PROFILE": "Виж профила",
     "BROWSER": "Браузър",
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 593f40df0..ce83258ad 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 3605814c6..8d549335c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "активен",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Отмени",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Име",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Изтрий",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Име",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Отмени"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Статус",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Име",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Описание",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Отмени"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index b56e58c0f..0593a6c43 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Чатете с нас",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Чатете с нас"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Обикновено отговаряме до няколко минути",
+        "IN_A_FEW_HOURS": "Обикновено отговаряме до няколко часа",
+        "IN_A_DAY": "Обикновено отговаряме до един ден"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Започнете разговор",
+        "CHAT_INPUT_PLACEHOLDER": "Напишете вашето съобщение"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "В момента не сме на линия"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Осъществено от Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 2e1c1fc69..f393e2cb1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Персонализирани атрибути",
     "AUTOMATION": "Автоматизация",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Чатете с нас"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index cbfe852b6..0205732ff 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "S'ha copiat al porta-retalls amb èxit",
     "COMPANY": "Companyia",
     "LOCATION": "Ubicació",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Detalls de les converses",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Navegador",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 243645494..31a9c312d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Si us plau, selecciona una conversa al panell de l’esquerra",
+    "SELECT_A_CONVERSATION": "Si us plau, selecciona una conversa al panell de l’esquerra",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Sembla que no hi ha missatges de clients a la safata d'entrada.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Torna a obrir la conversa",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Nota privada: Només és visible per tu i el vostre equip",
     "CHANGE_STATUS": "Estat de la conversa canviat",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Assignació de la conversa canviat",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 6961467d8..106e44e45 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Configuracions",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel·la",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Configuracions"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nom",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Esborrar",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nom",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel·la"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Estat",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nom",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descripció",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel·la"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index cbcc6791d..1ce7e853f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuració",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Configuracions",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nom del lloc web",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Encapçalament de benvinguda",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Lema de benvinguda",
+          "PLACE_HOLDER": "Facilitem la connexió amb nosaltres. Pregunteu-nos qualsevol cosa o compartiu els vostres comentaris."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "En pocs minuts",
+          "IN_A_FEW_HOURS": "En poques hores",
+          "IN_A_DAY": "En un dia"
+        },
+        "WIDGET_COLOR_LABEL": "Color del Widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Xateja amb nosaltres",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Xateja amb nosaltres"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Normalment responem en pocs minuts",
+        "IN_A_FEW_HOURS": "Normalment responem en poques hores",
+        "IN_A_DAY": "Normalment respon en un dia"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Inicia la conversa",
+        "CHAT_INPUT_PLACEHOLDER": "Escriu el missatge"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Desenvolupat per Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 72cdf2c7b..bf80fe9bc 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dies de prova restants.",
     "TRAIL_BUTTON": "Compra ara",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Atributs personalitzats",
     "AUTOMATION": "Automation",
     "TEAMS": "Equips",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis"
+    "FACEBOOK_REAUTHORIZE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Xateja amb nosaltres"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index de11f47bd..96ab4cfdd 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Úspěšně zkopírováno do schránky",
     "COMPANY": "Společnost",
     "LOCATION": "Poloha",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Podrobnosti konverzace",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Prohlížeč",
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 7242aa5f9..01bb19a86 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Vyberte prosím konverzaci z levého panelu",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Identita tohoto uživatele není ověřena",
     "NO_MESSAGE_1": "Ale ne! Vypadá to, že ve vaší schránce nejsou žádné zprávy od zákazníků.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Příští týden"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Označit jako nevyřízené",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Podpis zprávy",
       "ENABLE_SIGN_TOOLTIP": "Povolit podpis",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Soukromá poznámka: Viditelné pouze pro vás a váš tým",
     "CHANGE_STATUS": "Stav konverzace byl změněn",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Konverzace pověřená osoba změněna",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Tým konverzace se změnil",
     "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
     "MESSAGE_ERROR": "Nepodařilo se odeslat tuto zprávu, zkuste to prosím později",
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index 51c9600f2..d5d8824b8 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Nastavení",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Zrušit",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Nastavení"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Název",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Vymazat",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Název",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Zrušit"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Stav",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Název",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Zrušit"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index b84ac2837..abcc35387 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Nastavení",
       "CAMPAIGN": "Kampaně",
       "PRE_CHAT_FORM": "Formulář před chatem",
-      "BUSINESS_HOURS": "Pracovní doba"
+      "BUSINESS_HOURS": "Pracovní doba",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Nastavení",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Úvod uvítání",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Vítejte Tagline",
+          "PLACE_HOLDER": "Snadno se s námi spojujeme. Požádejte nás o cokoliv, nebo sdílejte svou zpětnou vazbu."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Do několika minut",
+          "IN_A_FEW_HOURS": "Do několika hodin",
+          "IN_A_DAY": "Do dne"
+        },
+        "WIDGET_COLOR_LABEL": "Barva widgetu",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Napiště nám",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Napiště nám"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Většinou odpovíme během pár minut",
+        "IN_A_FEW_HOURS": "Většinou odpovíme během pár hodin",
+        "IN_A_DAY": "Obvykle odpoví za den"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Zahájit konverzaci",
+        "CHAT_INPUT_PLACEHOLDER": "Zde začněte psát"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "V současné době jsme pryč"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index fc65e6386..94ed6e58d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dní zbývá zkušební verze.",
     "TRAIL_BUTTON": "Koupit nyní",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Vlastní atributy",
     "AUTOMATION": "Automation",
     "TEAMS": "Týmy",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Napiště nám"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 57bd4c203..e5722fc28 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Kopiering til udklipsholder lykkedes",
     "COMPANY": "Virksomhed",
     "LOCATION": "Lokation",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Samtaledetaljer",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 2b7df2ce6..97e3bb3f1 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Vælg venligst en samtale fra venstre rude",
+    "SELECT_A_CONVERSATION": "Vælg venligst en samtale fra venstre rude",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Åh oh! Det ser ud til, at der ikke er nogen beskeder fra kunder i din indbakke.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privat Note: Kun synlig for dig og dit team",
     "CHANGE_STATUS": "Samtalestatus ændret",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Samtaleansvarlig ændret",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index f452017dc..e6c92c284 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Indstillinger",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Annuller",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Indstillinger"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Navn",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Slet",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Navn",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Annuller"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Navn",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Beskrivelse",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Annuller"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index f6ef8baa0..007d6de49 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfiguration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Indstillinger",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Websted Navn",
+          "PLACE_HOLDER": "Indtast dit websted navn (fx: Firma ApS)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Velkomstoverskrift",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Velkomst Tagline",
+          "PLACE_HOLDER": "Vi gør det nemt at komme i kontakt med os. Spørg os om noget, eller del din feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "På nogle få minutter",
+          "IN_A_FEW_HOURS": "Om et par timer",
+          "IN_A_DAY": "På en dag"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Farve",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat med os",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat med os"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Svarer typisk på et par minutter",
+        "IN_A_FEW_HOURS": "Svarer typisk på et par timer",
+        "IN_A_DAY": "Svarer typisk på en dag"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Samtale",
+        "CHAT_INPUT_PLACEHOLDER": "Skriv din besked"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Vi er ikke tilgængelige i øjeblikket"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Drevet af Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index b15bb48aa..46e47635a 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dage prøveperiode tilbage.",
     "TRAIL_BUTTON": "Køb Nu",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Din Facebook-forbindelse er udløbet, tilslut venligst din Facebook-side igen for at fortsætte tjenesterne"
+    "FACEBOOK_REAUTHORIZE": "Din Facebook-forbindelse er udløbet, tilslut venligst din Facebook-side igen for at fortsætte tjenesterne",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat med os"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 433cd6e2e..94a621688 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Der Code wurde erfolgreich in die Zwischenablage kopiert",
     "COMPANY": "Firma",
     "LOCATION": "Ort",
+    "BROWSER_LANGUAGE": "Browsersprache",
     "CONVERSATION_TITLE": "Unterhaltungsdetails",
     "VIEW_PROFILE": "Profil anzeigen",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 80c3e8aba..257c7cb52 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Bitte wählen Sie eine Konversation aus dem linken Bereich",
+    "SELECT_A_CONVERSATION": "Bitte wählen Sie eine Konversation aus dem linken Bereich aus",
+    "404": "Wir können die Konversation leider nicht finden. Bitte versuche es erneut",
+    "SWITCH_VIEW_LAYOUT": "Layout wechseln",
     "DASHBOARD_APP_TAB_MESSAGES": "Nachrichten",
     "UNVERIFIED_SESSION": "Die Identität dieses Benutzers ist nicht verifiziert",
     "NO_MESSAGE_1": "Oh oh! Anscheinend befinden sich keine Nachrichten von Kunden in Ihrem Posteingang.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Nächste Woche"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Als ausstehend markieren",
+      "RESOLVED": "Als gelöst markieren",
+      "REOPEN": "Konversation wieder öffnen",
+      "SNOOZE": {
+        "TITLE": "Erinnern",
+        "NEXT_REPLY": "Bis zur nächsten Antwort",
+        "TOMORROW": "Bis morgen",
+        "NEXT_WEEK": "Bis nächste Woche"
+      },
+      "ASSIGN_AGENT": "Agent zuweisen",
+      "ASSIGN_LABEL": "Label zuweisen",
+      "AGENTS_LOADING": "Agenten werden geladen...",
+      "ASSIGN_TEAM": "Team zuweisen",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Konversations-ID %{conversationId} zugewiesen zu \"%{agentName}\"",
+          "FAILED": "Agent konnte nicht zugewiesen werden. Bitte versuche es erneut."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Das Label #%{labelName} wurde der Konversations-ID %{conversationId} zugewiesen",
+          "FAILED": "Label konnte nicht zugewiesen werden. Bitte versuche es erneut."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Das Team\"%{team}\" wurde der Konversations-ID %{conversationId} zugewiesen",
+          "FAILED": "Team konnte nicht zugewiesen werden. Bitte versuche es erneut."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Nachrichten-Signatur",
       "ENABLE_SIGN_TOOLTIP": "Signatur aktivieren",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privater Hinweis: Nur für Sie und Ihr Team sichtbar",
     "CHANGE_STATUS": "Gesprächsstatus geändert",
+    "CHANGE_STATUS_FAILED": "Änderung des Konversationsstatus fehlgeschlagen",
     "CHANGE_AGENT": "Konversationsempfänger geändert",
+    "CHANGE_AGENT_FAILED": "Zuweisungswechsel fehlgeschlagen",
+    "ASSIGN_LABEL_SUCCESFUL": "Label erfolgreich zugewiesen",
+    "ASSIGN_LABEL_FAILED": "Labelzuweisung fehlgeschlagen",
     "CHANGE_TEAM": "Das Konversationsteam hat sich geändert",
     "FILE_SIZE_LIMIT": "Die Datei überschreitet das Limit von {MAXIMUM_FILE_UPLOAD_SIZE} für Anhänge",
     "MESSAGE_ERROR": "Nachricht konnte nicht gesendet werden, bitte versuchen Sie es später erneut",
diff --git a/app/javascript/dashboard/i18n/locale/de/helpCenter.json b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
index a40b84961..3559c87ec 100644
--- a/app/javascript/dashboard/i18n/locale/de/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filtern nach",
       "SORT": "Sortieren nach",
       "SETTINGS_BUTTON": "Einstellungen",
-      "NEW_BUTTON": "Neuer Artikel"
+      "NEW_BUTTON": "Neuer Artikel",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Veröffentlicht",
+        "DRAFT": "Entwürfe",
+        "ARCHIVED": "Archiviert"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Alle Artikel",
+        "MINE": "Meine Artikel",
+        "DRAFT": "Artikelentwürfe",
+        "ARCHIVED": "Archivierte Artikel"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Veröffentlichen",
@@ -15,10 +26,195 @@
       "SAVING": "Entwurf speichern...",
       "SAVED": "Entwurf gespeichert"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Artikeleinstellungen",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Kategorie",
+          "TITLE": "Kategorie wählen",
+          "PLACEHOLDER": "Kategorie wählen",
+          "NO_RESULT": "Keine Kategorie gefunden",
+          "SEARCH_PLACEHOLDER": "Kategorie suchen"
+        },
+        "AUTHOR": {
+          "LABEL": "Autor",
+          "TITLE": "Autor auswählen",
+          "PLACEHOLDER": "Autor auswählen",
+          "NO_RESULT": "Keine Autoren gefunden",
+          "SEARCH_PLACEHOLDER": "Autor suchen"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta-Titel",
+          "PLACEHOLDER": "Metatitel hinzufügen"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta-Beschreibung",
+          "PLACEHOLDER": "Fügen Sie Ihre Meta-Beschreibung hinzu, um bessere SEO-Ergebnisse zu erzielen..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta-Tags",
+          "PLACEHOLDER": "Meta-Tags durch Komma getrennt hinzufügen..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Artikel archivieren",
+        "DELETE": "Artikel löschen"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portale",
+      "NEW_BUTTON": "Neues Portal",
+      "ACTIVE_BADGE": "aktiv",
+      "CHOOSE_LOCALE_LABEL": "Wählen Sie ein Gebietsschema",
+      "LOADING_MESSAGE": "Portale werden geladen...",
+      "ARTICLES_LABEL": "Artikel",
+      "NO_PORTALS_MESSAGE": "Es sind keine Portale verfügbar",
+      "ADD_NEW_LOCALE": "Neues Gebietsschema hinzufügen",
+      "POPOVER": {
+        "TITLE": "Portale",
+        "PORTAL_SETTINGS": "Portaleinstellungen",
+        "SUBTITLE": "Sie haben mehrere Portale und können für jedes Portal unterschiedliche Gebietsschemata haben.",
+        "CANCEL_BUTTON_LABEL": "Stornieren",
+        "CHOOSE_LOCALE_BUTTON": "Gebietsschema wählen"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "Artikel",
+            "ADD": "Sprache hinzufügen",
+            "VISIT": "Seite besuchen",
+            "SETTINGS": "Einstellungen"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portalkonfigurationen",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Benutzerdefinierte Domain",
+              "SLUG": "Slug",
+              "TITLE": "Titel des Portals",
+              "THEME": "Themenfarbe",
+              "SUB_TEXT": "Portal-Untertext"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Verfügbare Sprachen",
+            "TABLE": {
+              "NAME": "Name der Sprache",
+              "CODE": "Sprachcode",
+              "ARTICLE_COUNT": "Anzahl Artikel",
+              "CATEGORIES": "Anzahl der Kategorien",
+              "SWAP": "Tauschen",
+              "DELETE": "Löschen",
+              "DEFAULT_LOCALE": "Standard"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Portal erstellen",
+        "SUB_TITLE": "Ein Hilfezentrum in Chatwoot wird als Portal bezeichnet. Sie können mehrere Portale und unterschiedliche Gebietsschemas für jedes Portal haben.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portalname",
+          "HELP_TEXT": "Der Name wird intern im öffentlich zugänglichen Portal verwendet",
+          "ERROR": "Name wird benötigt"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Seitentitel",
+          "PLACEHOLDER": "Titel der Portalseite",
+          "HELP_TEXT": "Der Name wird im öffentlich zugänglichen Portal verwendet",
+          "ERROR": "Seitentitel ist erforderlich"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal-Slug für URLs",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug ist erforderlich"
+        },
+        "DOMAIN": {
+          "LABEL": "Benutzerdefinierte Domain",
+          "PLACEHOLDER": "Benutzerdefinierte Domain des Portals",
+          "HELP_TEXT": "Nur hinzufügen, wenn Sie eine benutzerdefinierte Domain für Ihre Portale verwenden möchten",
+          "ERROR": "Benutzerdefinierte Domäne ist erforderlich"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Homepage-Link",
+          "PLACEHOLDER": "Link zur Startseite des Portals",
+          "HELP_TEXT": "Der Link, der verwendet wird, um vom Portal zur Startseite zurückzukehren.",
+          "ERROR": "Homepage-Link ist erforderlich"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Überschrift",
+          "PLACEHOLDER": "Portal-Header-Text",
+          "HELP_TEXT": "Portal-Header-Text",
+          "ERROR": "Portal-Kopfzeilentext ist erforderlich"
+        },
+        "BUTTONS": {
+          "CREATE": "Portal erstellen",
+          "CANCEL": "Stornieren"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal erfolgreich erstellt.",
+          "ERROR_MESSAGE": "Das Portal konnte nicht erstellt werden. Versuchen Sie es nochmal."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Artikel werden geladen...",
+      "404": "Kein Artikel entspricht Ihrer Suche 🔍",
+      "NO_ARTICLES": "Es sind keine Artikel verfügbar",
+      "HEADERS": {
+        "TITLE": "Titel",
+        "CATEGORY": "Kategorie",
+        "READ_COUNT": "Gelesen",
+        "STATUS": "Status",
+        "LAST_EDITED": "Zuletzt bearbeitet"
+      },
       "COLUMNS": {
         "BY": "von"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Artikeltitel kommt hier rein",
+      "CONTENT_PLACEHOLDER": "Schreiben Sie hier Ihren Artikel"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Suche nach Artikeln"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Kategorie erstellen",
+        "SUB_TITLE": "Die Kategorie wird im öffentlich zugänglichen Portal verwendet, um Artikel zu kategorisieren.",
+        "PORTAL": "Portal",
+        "LOCALE": "Sprache",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Kategoriename",
+          "HELP_TEXT": "Der Kategoriename wird im öffentlich zugänglichen Portal verwendet, um Artikel zu kategorisieren.",
+          "ERROR": "Name wird benötigt"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Kategorie-Slug für URLs",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug ist erforderlich"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Beschreibung",
+          "PLACEHOLDER": "Geben Sie eine kurze Beschreibung der Kategorie ein.",
+          "ERROR": "Beschreibung wird benötigt"
+        },
+        "BUTTONS": {
+          "CREATE": "Kategorie erstellen",
+          "CANCEL": "Stornieren"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Kategorie erfolgreich erstellt",
+          "ERROR_MESSAGE": "Kategorie kann nicht erstellt werden"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 3820ae036..47978112d 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfiguration",
       "CAMPAIGN": "Kampagnen",
       "PRE_CHAT_FORM": "Pre-Chat-Formular",
-      "BUSINESS_HOURS": "Öffnungszeiten"
+      "BUSINESS_HOURS": "Öffnungszeiten",
+      "WIDGET_BUILDER": "Widget-Generator"
     },
     "SETTINGS": "Einstellungen",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "SSL-Überprüfungsmodus öffnen",
       "AUTH_MECHANISM": "Authentifizierung"
     },
-    "NOTE": "Hinweis: "
+    "NOTE": "Hinweis: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website-Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar erfolgreich gelöscht",
+              "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Webseiten-Name",
+          "PLACE_HOLDER": "Geben Sie den Namen Ihrer Website ein (zum Beispiel: Acme Inc)",
+          "ERROR": "Bitte geben Sie einen gültigen Website-Namen ein"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Willkommens-Überschrift",
+          "PLACE_HOLDER": "Hi!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Willkommens-Schlagzeile",
+          "PLACE_HOLDER": "Wir machen es einfach, sich mit uns zu verbinden. Fragen Sie uns etwas oder teilen Sie uns Ihr Feedback mit."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Antwortzeit",
+          "IN_A_FEW_MINUTES": "Innerhalb weniger Minuten",
+          "IN_A_FEW_HOURS": "Innerhalb weniger Stunden",
+          "IN_A_DAY": "Innerhalb eines Tages"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Farbe",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Position der Widget-Blase",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget-Blasentyp",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chatten Sie mit uns",
+          "LABEL": "Widget Bubble Launcher-Titel",
+          "PLACE_HOLDER": "Chatten Sie mit uns"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Widget-Einstellungen aktualisieren",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget-Einstellungen erfolgreich aktualisiert",
+            "ERROR_MESSAGE": "Widget-Einstellungen können nicht aktualisiert werden"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Vorschau",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Links",
+          "RIGHT": "Rechts"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Erweiterte Blase"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Standard",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Wir antworten üblicherweise innerhalb weniger Minuten",
+        "IN_A_FEW_HOURS": "Wir antworten üblicherweise innerhalb weniger Stunden",
+        "IN_A_DAY": "Wir antworten üblicherweise innerhalb eines Tages"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Unterhaltung beginnen",
+        "CHAT_INPUT_PLACEHOLDER": "Schreiben Sie Ihre Nachricht"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Wir sind online",
+          "OFFLINE": "Wir sind momentan abwesend"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hallo"
+      },
+      "BRANDING_TEXT": "Unterstützt von Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index dc5f9355e..d8c9ef18e 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "Tage der Testversion verbleibend.",
     "TRAIL_BUTTON": "Jetzt kaufen",
-    "DELETED_USER": "Gelöschter Benutzer"
+    "DELETED_USER": "Gelöschter Benutzer",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Konto gesperrt",
+      "MESSAGE": "Ihr Account wurde gesperrt. Wenden Sie sich für weitere Informationen bitte an das Support-Team."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute",
     "AUTOMATION": "Automatisierung",
     "TEAMS": "Teams",
+    "BILLING": "Rechnungen",
     "CUSTOM_VIEWS_FOLDER": "Ordner",
     "CUSTOM_VIEWS_SEGMENTS": "Segmente",
     "ALL_CONTACTS": "Alle Kontakte",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Setzen Sie sich als",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Übersicht",
-    "FACEBOOK_REAUTHORIZE": "Ihre Facebook-Verbindung ist abgelaufen, bitte verbinden Sie sich neu, um die Dienste fortzuführen"
+    "FACEBOOK_REAUTHORIZE": "Ihre Facebook-Verbindung ist abgelaufen, bitte verbinden Sie sich neu, um die Dienste fortzuführen",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Alle Artikel",
+      "MY_ARTICLES": "Meine Artikel",
+      "DRAFT": "Entwürfe",
+      "ARCHIVED": "Archiviert",
+      "CATEGORY": "Kategorie",
+      "CATEGORY_EMPTY_MESSAGE": "Keine Kategorien gefunden"
+    },
+    "DOCS": "Dokumente lesen"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Rechnungen",
+    "CURRENT_PLAN": {
+      "TITLE": "Derzeitiger Plan",
+      "PLAN_NOTE": "Sie haben derzeit den Tarif **%{plan}** mit **%{quantity}** Lizenzen abonniert"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Abonnement verwalten",
+      "DESCRIPTION": "Zeigen Sie Ihre vorherigen Rechnungen an, bearbeiten Sie Ihre Rechnungsdaten oder kündigen Sie Ihr Abonnement.",
+      "BUTTON_TXT": "Gehen Sie zum Abrechnungsportal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Brauchen Sie Hilfe?",
+      "DESCRIPTION": "Haben Sie Probleme bei der Abrechnung? Wir sind hier um zu helfen.",
+      "BUTTON_TXT": "Chatten Sie mit uns"
+    },
+    "NO_BILLING_USER": "Ihr Rechnungskonto wird konfiguriert. Bitte aktualisieren Sie die Seite und versuchen Sie es erneut."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh! Wir konnten keine Chatwoot-Konten finden. Bitte erstellen Sie ein neues Konto um fortzufahren.",
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 372ebe36e..f2b781743 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Αντιγράφτηκε με επιτυχία στο πρόχειρο",
     "COMPANY": "Εταιρία",
     "LOCATION": "Θέση",
+    "BROWSER_LANGUAGE": "Γλώσσα Περιήγησης",
     "CONVERSATION_TITLE": "Λεπτομέρειες συνομιλίας",
     "VIEW_PROFILE": "Προβολή Προφίλ",
     "BROWSER": "Φυλλομετρητής",
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index dc8e2a7f7..2a056c810 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Παρακαλώ επιλέξτε συζήτηση από το αριστερό τμήμα",
+    "SELECT_A_CONVERSATION": "Παρακαλώ επιλέξτε συζήτηση από το αριστερό τμήμα",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Μηνύματα",
     "UNVERIFIED_SESSION": "Η ταυτότητα αυτού του χρήστη δεν επαληθεύεται",
     "NO_MESSAGE_1": "Ωχ ωχ! Φαίνεται ότι δεν υπάρχουν μηνύματα από τους πελάτες στα εισερχόμενά σας.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Επόμενη εβδομάδα"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Σήμανση ως εκκρεμής",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Άνοιγμα συνομιλίας",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Μέχρι την επόμενη απάντηση",
+        "TOMORROW": "Μέχρι αύριο",
+        "NEXT_WEEK": "Έως την επόμενη εβδομάδα"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Υπογραφή μηνύματος",
       "ENABLE_SIGN_TOOLTIP": "Ενεργοποίηση υπογραφής",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Ιδιωτική Σημείωση: Ορατή μόνο σε σας και την ομάδα σας",
     "CHANGE_STATUS": "Η κατάσταση της συνομιλίας άλλαξε",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Η εκπροσώπηση για την συνομιλία άλλαξε",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Η ομάδα συνομιλίας άλλαξε",
     "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Δεν είναι δυνατή η αποστολή του μηνύματος, παρακαλώ προσπαθήστε ξανά αργότερα",
diff --git a/app/javascript/dashboard/i18n/locale/el/helpCenter.json b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
index 6fa4aa2e1..ddcd33c37 100644
--- a/app/javascript/dashboard/i18n/locale/el/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Ρυθμίσεις",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Κατηγορία",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "ενεργή",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Άκυρο",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Ρυθμίσεις"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Όνομα",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Διαγραφή",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Όνομα",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Απαιτείται όνομα"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Άκυρο"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Τίτλος",
+        "CATEGORY": "Κατηγορία",
+        "READ_COUNT": "Read count",
+        "STATUS": "Κατάσταση",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Όνομα",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Απαιτείται όνομα"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Περιγραφή",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Η περιγραφή απαιτείται"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Άκυρο"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 6665332af..e92a89ebf 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Διαμόρφωση",
       "CAMPAIGN": "Καμπάνιες",
       "PRE_CHAT_FORM": "Φόρμα Προ-Συνομιλίας",
-      "BUSINESS_HOURS": "Ώρες Εργασίας"
+      "BUSINESS_HOURS": "Ώρες Εργασίας",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Ρυθμίσεις",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Λειτουργία Επιβεβαίωσης SSL",
       "AUTH_MECHANISM": "Πιστοποίηση"
     },
-    "NOTE": "Σημείωση: "
+    "NOTE": "Σημείωση: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Όνομα Ιστοσελίδας",
+          "PLACE_HOLDER": "Συμπληρώστε την ονομασία της ιστοσελίδας σας (π.χ: Ελληνικό Μεσογειακό Πανεπιστήμιο)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Καλώς ήλθατε (Heading)",
+          "PLACE_HOLDER": "Γεια χαρά!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Καλώς ήλθατε (Tagline)",
+          "PLACE_HOLDER": "Είναι απλό να συνδεθείτε μαζί μας. Ζητήστε μας οτιδήποτε, ή μοιραστείτε την εμπειρία σας."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Σε μερικά λεπτά",
+          "IN_A_FEW_HOURS": "Σε μερικές ώρες",
+          "IN_A_DAY": "Σε μία ημέρα"
+        },
+        "WIDGET_COLOR_LABEL": "Χρώμα Widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Συνομιλήστε μαζί μας",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Συνομιλήστε μαζί μας"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Τυπικά έχετε απάντηση σε μερικά λεπτά",
+        "IN_A_FEW_HOURS": "Τυπικά έχετε απάντηση σε μερικές σε μερικές ώρες",
+        "IN_A_DAY": "Τυπικά έχετε απάντηση σε μία ημέρα"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Έναρξη Συνομιλίας",
+        "CHAT_INPUT_PLACEHOLDER": "Πληκτρολογήστε το μήνυμά σας"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Προς το παρόν, είμαστε εκτός"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "με την δύναμη του Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index f59aa5ba4..bd32c67d2 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "ημέρες δοκιμαστικής περιόδου απομένουν.",
     "TRAIL_BUTTON": "Αγόρασε τώρα",
-    "DELETED_USER": "Διαγραμμένος Χρήστης"
+    "DELETED_USER": "Διαγραμμένος Χρήστης",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Προσαρμοζόμενες Ιδιότητες",
     "AUTOMATION": "Αυτοματισμός",
     "TEAMS": "Ομάδες",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Φάκελοι",
     "CUSTOM_VIEWS_SEGMENTS": "Τμήματα",
     "ALL_CONTACTS": "Όλες Οι Επαφές",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Ορίστε τον εαυτό σας ως",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Επισκόπηση",
-    "FACEBOOK_REAUTHORIZE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε"
+    "FACEBOOK_REAUTHORIZE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Κατηγορία",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Συνομιλήστε μαζί μας"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ωχ! Δεν μπορέσαμε να βρούμε κανένα λογαριασμό Chatwoot. Παρακαλούμε δημιουργήστε ένα νέο λογαριασμό για να συνεχίσετε.",
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 2833e37d8..0bc399ba1 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index c38fb16a4..7adac123f 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index 0c04a6c37..3878cef01 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,7 +26,143 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
@@ -27,10 +174,47 @@
         "BY": "by"
       }
     },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
     "SIDEBAR": {
       "SEARCH": {
         "PLACEHOLDER": "Search for articles"
       }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 2b8005e1d..629eac63e 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS":{
+        "AVATAR":{
+          "LABEL": "Website Avatar",
+          "DELETE":{
+            "API":{
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE":{
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION":{
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION":{
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE":{
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY":{
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 0307abe56..038af64a5 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -120,7 +120,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -167,6 +171,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -192,8 +197,29 @@
       "MY_ARTICLES": "My Articles",
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
-      "CATEGORY": "Category"
-    }
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 45f9cfbae..1da3b4544 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copiado al portapapeles satisfactoriamente",
     "COMPANY": "Empresa",
     "LOCATION": "Ubicación",
+    "BROWSER_LANGUAGE": "Idioma del navegador",
     "CONVERSATION_TITLE": "Detalles de la conversación",
     "VIEW_PROFILE": "Ver Perfil",
     "BROWSER": "Navegador",
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index afd28d55a..e58154853 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Por favor, selecciona una conversación del panel izquierdo",
+    "SELECT_A_CONVERSATION": "Por favor, selecciona una conversación del panel izquierdo",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Mensajes",
     "UNVERIFIED_SESSION": "La identidad de este usuario no está verificada",
     "NO_MESSAGE_1": "¡Oh oh! Parece que no hay mensajes de los clientes en tu bandeja de entrada.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Marcar como pendiente",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Resolver conversación",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Hasta la siguiente respuesta",
+        "TOMORROW": "Hasta mañana",
+        "NEXT_WEEK": "Hasta la próxima semana"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Firma del mensaje",
       "ENABLE_SIGN_TOOLTIP": "Activar firma",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Nota privada: solo visible para ti y tu equipo",
     "CHANGE_STATUS": "Estado de la conversación cambiado",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversación cambiada de asignatario",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Equipo de conversación cambiado",
     "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "No se puede enviar este mensaje, por favor inténtalo de nuevo más tarde",
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index 65ad650f9..386edd7b5 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Ajustes",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Categoría",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "activo",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancelar",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Ajustes"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nombre",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Eliminar",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nombre",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "El nombre es requerido"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Título",
+        "CATEGORY": "Categoría",
+        "READ_COUNT": "Read count",
+        "STATUS": "Estado",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nombre",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "El nombre es requerido"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descripción",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Descripción requerida"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index d279971aa..97c6c41f8 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -413,14 +413,15 @@
       "CONFIGURATION": "Configuración",
       "CAMPAIGN": "Campañas",
       "PRE_CHAT_FORM": "Pre-formulario de chat",
-      "BUSINESS_HOURS": "Horarios"
+      "BUSINESS_HOURS": "Horarios",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Ajustes",
     "FEATURES": {
       "LABEL": "Características",
       "DISPLAY_FILE_PICKER": "Mostrar el selector de archivos en el widget",
       "DISPLAY_EMOJI_PICKER": "Mostrar el selector de emoji en el widget",
-      "ALLOW_END_CONVERSATION": "Benutzern erlauben, Konversationen über das Widget zu beenden"
+      "ALLOW_END_CONVERSATION": "Permitir a los usuarios finalizar conversaciones desde el widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script de Messenger",
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificación SSL",
       "AUTH_MECHANISM": "Autenticación"
     },
-    "NOTE": "Nota: "
+    "NOTE": "Nota: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nombre del sitio web",
+          "PLACE_HOLDER": "Introduzca el nombre de su sitio web (por ejemplo: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Cabecera de bienvenida",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Bienvenido Tagline",
+          "PLACE_HOLDER": "Facilitamos la conexión con nosotros. Pídanos cualquier cosa o comparte tus comentarios."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "En algunos minutos",
+          "IN_A_FEW_HOURS": "En unas horas",
+          "IN_A_DAY": "En un día"
+        },
+        "WIDGET_COLOR_LABEL": "Color del widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chatea con nosotros",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chatea con nosotros"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Normalmente responde en unos minutos",
+        "IN_A_FEW_HOURS": "Normalmente responde en unas pocas horas",
+        "IN_A_DAY": "Normalmente responde en un día"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Iniciar conversación",
+        "CHAT_INPUT_PLACEHOLDER": "Escribe tu mensaje"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Estamos ausentes en este momento"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Desarrollado por Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index e3032cc4f..84f12e805 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "días de prueba restantes.",
     "TRAIL_BUTTON": "Comprar ahora",
-    "DELETED_USER": "Usuario eliminado"
+    "DELETED_USER": "Usuario eliminado",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automatización",
     "TEAMS": "Equipos",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Carpetas",
     "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos los contactos",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Ponte como",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Resumen",
-    "FACEBOOK_REAUTHORIZE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio"
+    "FACEBOOK_REAUTHORIZE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Categoría",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chatea con nosotros"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "¡Oh oh! No hemos podido encontrar ninguna cuenta de \"Chatwoot\". Por favor, crea una nueva cuenta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
index c9ad83919..34c647507 100644
--- a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
@@ -2,7 +2,7 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} گفتگو انتخاب شده است",
     "AGENT_SELECT_LABEL": "انتخاب ایجنت",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "ASSIGN_CONFIRMATION_LABEL": "آیا مطمئن هستید که می‌خواهید %{conversationCount} %{conversationLabel} را به آن اختصاص دهید؟",
     "GO_BACK_LABEL": "بازگشت",
     "ASSIGN_LABEL": "اختصاص دادن",
     "ASSIGN_AGENT_TOOLTIP": "تعیین ایجنت",
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 76bd061f1..aa3e44036 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "با موفقیت در کلیپ‌بورد کپی شد",
     "COMPANY": "شرکت",
     "LOCATION": "مکان",
+    "BROWSER_LANGUAGE": "مرور زبان",
     "CONVERSATION_TITLE": "جزئیات مکالمه",
     "VIEW_PROFILE": "نمایش مشخصات",
     "BROWSER": "مرورگر",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 2512ef65e..c1199bb2f 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "لطفا یک گفتگو را از پنجره گفتگوها انتخاب کنید",
+    "SELECT_A_CONVERSATION": "لطفا یک گفتگو را از پنجره گفتگوها انتخاب کنید",
+    "404": "با عرض پوزش، ما نمی‌توانیم گفتگو را پیدا کنیم. لطفا دوباره تلاش کنید",
+    "SWITCH_VIEW_LAYOUT": "تغییر طرح‌بندی",
     "DASHBOARD_APP_TAB_MESSAGES": "پیام‌ها",
     "UNVERIFIED_SESSION": "هویت این کاربر تایید نشده است",
     "NO_MESSAGE_1": "اوه اوه! به نظر می‌رسد هیچ پیامی از طرف مشتری در صندوق ورودی شما وجود ندارد.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "هفته بعد"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "علامت گذاری به عنوان در انتظار",
+      "RESOLVED": "علامت زدن به عنوان حل شده",
+      "REOPEN": "مکالمه را دوباره باز کنید",
+      "SNOOZE": {
+        "TITLE": "به تعویق انداختن",
+        "NEXT_REPLY": "تا پاسخ بعدی",
+        "TOMORROW": "تا فردا",
+        "NEXT_WEEK": "تا هفته بعد"
+      },
+      "ASSIGN_AGENT": "ایجنت را تعیین کنید",
+      "ASSIGN_LABEL": "برچسب اختصاص دهید",
+      "AGENTS_LOADING": "بارگذاری ایجنت ها...",
+      "ASSIGN_TEAM": "تیم را تعیین کنید",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "شناسه مکالمه %{conversationId} به \"%{agentName}\" اختصاص داده شد",
+          "FAILED": "ایجنت تعیین نشد. لطفا دوباره تلاش کنید."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "برچسب #%{labelName} را به شناسه مکالمه %{conversationId} اختصاص داد",
+          "FAILED": "برچسب اختصاص داده نشد. لطفا دوباره تلاش کنید."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "تیم \"%{team}\" را به شناسه مکالمه %{conversationId} اختصاص داد",
+          "FAILED": "تیم تعیین نشد. لطفا دوباره تلاش کنید."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "امضای پیام",
       "ENABLE_SIGN_TOOLTIP": "امضا را فعال کنید",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "یادداشت خصوصی: فقط برای شما و تیم شما قابل مشاهده است",
     "CHANGE_STATUS": "وضعیت گفتگو تغییر کرد",
+    "CHANGE_STATUS_FAILED": "تغییر وضعیت مکالمه انجام نشد",
     "CHANGE_AGENT": "مسول گفتگو تغییر کرد",
+    "CHANGE_AGENT_FAILED": "تغییر انجام نشد",
+    "ASSIGN_LABEL_SUCCESFUL": "برچسب با موفقیت تخصیص یافت",
+    "ASSIGN_LABEL_FAILED": "تخصیص برچسب ناموفق بود",
     "CHANGE_TEAM": "تیم مکالمه تغییر کرد",
     "FILE_SIZE_LIMIT": "فایل ضمیمه شده بیشتر از {MAXIMUM_FILE_UPLOAD_SIZE} است",
     "MESSAGE_ERROR": "ارسال این پیام امکان پذیر نیست ، لطفاً بعداً دوباره امتحان کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index 8e700e40b..53bdeb525 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -4,21 +4,217 @@
       "FILTER": "فیلتر براساس",
       "SORT": "مرتب‌سازی براساس",
       "SETTINGS_BUTTON": "تنظیمات",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "مقاله جدید",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "منتشر شد",
+        "DRAFT": "پیش‌نویس",
+        "ARCHIVED": "بایگانی شد"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "همه مقالات",
+        "MINE": "مقالات من",
+        "DRAFT": "پیش نویس مقالات",
+        "ARCHIVED": "مقالات آرشیو شده"
+      }
     },
     "EDIT_HEADER": {
-      "PUBLISH_BUTTON": "Publish",
+      "PUBLISH_BUTTON": "انتشار",
       "PREVIEW": "پیش‌نمایش",
       "ADD_TRANSLATION": "افزودن ترجمه",
-      "OPEN_SIDEBAR": "Open sidebar",
-      "CLOSE_SIDEBAR": "Close sidebar",
-      "SAVING": "Draft saving...",
-      "SAVED": "Draft saved"
+      "OPEN_SIDEBAR": "نوار کناری را باز کنید",
+      "CLOSE_SIDEBAR": "نوار کناری را ببندید",
+      "SAVING": "در حال ذخیره پیش‌نویس...",
+      "SAVED": "پیش‌نویس ذخیر شد"
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "تنظیمات مقاله",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "دسته‌بندی",
+          "TITLE": "انتخاب دسته‌بندی",
+          "PLACEHOLDER": "انتخاب دسته‌بندی",
+          "NO_RESULT": "هیچ دسته‌بندی‌ای یافت نشد",
+          "SEARCH_PLACEHOLDER": "جستجوی دسته‌بندی"
+        },
+        "AUTHOR": {
+          "LABEL": "نویسنده",
+          "TITLE": "انتخاب نویسنده",
+          "PLACEHOLDER": "انتخاب نویسنده",
+          "NO_RESULT": "هیچ نویسنده‌ای پیدا نشد",
+          "SEARCH_PLACEHOLDER": "جستجوی نویسنده"
+        },
+        "META_TITLE": {
+          "LABEL": "عنوان متا",
+          "PLACEHOLDER": "افزودن عنوان متا"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "توضیحات متا",
+          "PLACEHOLDER": "توضیحات متا خود را برای نتایج بهتر سئو اضافه کنید..."
+        },
+        "META_TAGS": {
+          "LABEL": "برچسب‌های متا",
+          "PLACEHOLDER": "اضافه کردن برچسب‌های متا، با کاما جدا شود..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "بایگانی مقاله",
+        "DELETE": "حذف مقاله"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "پورتال ها",
+      "NEW_BUTTON": "پورتال جدید",
+      "ACTIVE_BADGE": "فعال",
+      "CHOOSE_LOCALE_LABEL": "محلی را انتخاب کنید",
+      "LOADING_MESSAGE": "در حال بارگیری پورتال...",
+      "ARTICLES_LABEL": "مقالات",
+      "NO_PORTALS_MESSAGE": "هیچ پورتالی در دسترس وجود ندارد",
+      "ADD_NEW_LOCALE": "یک محل جدید اضافه کنید",
+      "POPOVER": {
+        "TITLE": "پورتال ها",
+        "PORTAL_SETTINGS": "تنظیمات پورتال",
+        "SUBTITLE": "شما چندین پورتال دارید و می‌توانید برای هر پورتال مکان‌های متفاوتی داشته باشید.",
+        "CANCEL_BUTTON_LABEL": "انصراف",
+        "CHOOSE_LOCALE_BUTTON": "Locale را انتخاب کنید"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "مقالات",
+            "ADD": "افزودن منطقه",
+            "VISIT": "به سایت مراجعه کنید",
+            "SETTINGS": "تنظیمات"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "تنظیمات پورتال",
+            "ITEMS": {
+              "NAME": "نام",
+              "DOMAIN": "دامنه سفارشی",
+              "SLUG": "Slug",
+              "TITLE": "عنوان پورتال",
+              "THEME": "رنگ تم",
+              "SUB_TEXT": "متن فرعی پورتال"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "مناطق موجود",
+            "TABLE": {
+              "NAME": "نام محلی",
+              "CODE": "کد محلی",
+              "ARTICLE_COUNT": "تعداد مقالات",
+              "CATEGORIES": "تعداد دسته ها",
+              "SWAP": "تعویض کنید",
+              "DELETE": "حذف",
+              "DEFAULT_LOCALE": "پیش‌فرض"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "ایجاد پورتال",
+        "SUB_TITLE": "یک مرکز راهنمایی در Chatwoot به عنوان یک پورتال شناخته می‌شود. شما می‌توانید چندین پورتال، در هر قسمت متفاوتی داشته باشید.",
+        "NAME": {
+          "LABEL": "نام",
+          "PLACEHOLDER": "نام پورتال",
+          "HELP_TEXT": "این نام به صورت داخلی در پورتال عمومی استفاده خواهد شد",
+          "ERROR": "نام الزامی است"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "عنوان صفحه",
+          "PLACEHOLDER": "عنوان صفحه پورتال",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "عنوان صفحه الزامی است"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug مورد نیاز است"
+        },
+        "DOMAIN": {
+          "LABEL": "دامنه سفارشی",
+          "PLACEHOLDER": "دامنه سفارشی پورتال",
+          "HELP_TEXT": "فقط اگر می‌خواهید از یک دامنه سفارشی برای پورتال‌های خود استفاده کنید، اضافه کنید",
+          "ERROR": "دامنه سفارشی الزامی است"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "پیوند صفحه اصلی",
+          "PLACEHOLDER": "پیوند صفحه اصلی پورتال",
+          "HELP_TEXT": "پیوند مورد استفاده برای بازگشت از پورتال به صفحه اصلی.",
+          "ERROR": "پیوند صفحه اصلی الزامی است"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "متن سرصفحه",
+          "PLACEHOLDER": "متن سرصفحه پورتال",
+          "HELP_TEXT": "متن سرصفحه پورتال",
+          "ERROR": "متن سرصفحه پورتال الزامی است"
+        },
+        "BUTTONS": {
+          "CREATE": "ایجاد پورتال",
+          "CANCEL": "انصراف"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "پورتال با موفقیت ایجاد شد.",
+          "ERROR_MESSAGE": "پورتال ایجاد نشد. دوباره امتحان کنید."
+        }
+      }
     },
     "TABLE": {
+      "LOADING_MESSAGE": "در حال بارگیری مقالات...",
+      "404": "هیچ مقاله ای با جستجوی شما مطابقت ندارد 🔍",
+      "NO_ARTICLES": "هیچ مقاله ای موجود نیست",
+      "HEADERS": {
+        "TITLE": "عنوان",
+        "CATEGORY": "دسته‌بندی",
+        "READ_COUNT": "تعداد خوانده شده",
+        "STATUS": "وضعیت",
+        "LAST_EDITED": "آخرین ویرایش"
+      },
       "COLUMNS": {
         "BY": "توسط"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "عنوان مقاله اینجاست",
+      "CONTENT_PLACEHOLDER": "مقاله خود را اینجا بنویسید"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "جستجو برای مقالات"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "ایجاد دسته‌بندی",
+        "SUB_TITLE": "این دسته در پرتال عمومی برای دسته بندی مقالات استفاده خواهد شد.",
+        "PORTAL": "پورتال",
+        "LOCALE": "محلی",
+        "NAME": {
+          "LABEL": "نام",
+          "PLACEHOLDER": "نام دسته‌بندی",
+          "HELP_TEXT": "از نام دسته در پرتال عمومی برای دسته بندی مقالات استفاده می شود.",
+          "ERROR": "نام الزامی است"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug دسته برای آدرس ها",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug مورد نیاز است"
+        },
+        "DESCRIPTION": {
+          "LABEL": "توضیحات",
+          "PLACEHOLDER": "یک توضیح کوتاه در مورد دسته ارائه دهید.",
+          "ERROR": "توضیحات الزامی است"
+        },
+        "BUTTONS": {
+          "CREATE": "ایجاد دسته‌بندی",
+          "CANCEL": "انصراف"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "دسته‌بندی با موفقیت ایجاد شد",
+          "ERROR_MESSAGE": "امکان ایجاد دسته‌بندی وجود ندارد"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 5bf6c0c97..c5d2a6e47 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -112,10 +112,10 @@
           "ERROR": "پر کردن این فیلد ضروری است"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "SID سرویس پیام رسانی",
+          "PLACEHOLDER": "لطفاً SID سرویس پیام رسانی Twilio خود را وارد کنید",
           "ERROR": "پر کردن این فیلد ضروری است",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "از سرویس پیام رسانی Twilio استفاده کنید"
         },
         "CHANNEL_TYPE": {
           "LABEL": "نوع کانال",
@@ -227,8 +227,8 @@
           "ERROR": "لطفا یک مقدار معتبر وارد کنید."
         },
         "WEBHOOK_VERIFY_TOKEN": {
-          "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "LABEL": "رمز تأیید وب هوک",
+          "PLACEHOLDER": "یک رمز تأیید را وارد کنید که می خواهید برای وب هوک های فیس بوک پیکربندی کنید.",
           "ERROR": "لطفا یک مقدار معتبر وارد کنید."
         },
         "API_KEY": {
@@ -239,7 +239,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "آدرس URL مربوط به API",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "شما باید URL webhook را در پورتال توسعه دهنده فیس بوک با URL ذکر شده در اینجا پیکربندی کنید."
         },
         "SUBMIT_BUTTON": "ایجاد کانال واتساپ",
         "API": {
@@ -327,7 +327,7 @@
       },
       "AUTH": {
         "TITLE": "کانالی را انتخاب کنید",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "Chatwoot از ویجت های چت زنده، فیس بوک مسنجر، پروفایل های توییتر، واتساپ، ایمیل ها و غیره به عنوان کانال پشتیبانی می کند. اگر می خواهید یک کانال سفارشی بسازید، می توانید آن را با استفاده از کانال API ایجاد کنید. برای شروع، یکی از کانال های زیر را انتخاب کنید."
       },
       "AGENTS": {
         "TITLE": "ایجنت ها",
@@ -413,7 +413,8 @@
       "CONFIGURATION": "پیکربندی",
       "CAMPAIGN": "کمپین ها",
       "PRE_CHAT_FORM": "فرم پیش چت",
-      "BUSINESS_HOURS": "ساعت کاری"
+      "BUSINESS_HOURS": "ساعت کاری",
+      "WIDGET_BUILDER": "سازنده ابزارک"
     },
     "SETTINGS": "تنظیمات",
     "FEATURES": {
@@ -441,16 +442,16 @@
       "INBOX_UPDATE_SUB_TEXT": "تغییر پارامترهای صندوق ورودی",
       "AUTO_ASSIGNMENT_SUB_TEXT": "فعال کردن یا غیرفعال کردن واگذاری خودکار گفتگوها به ایجنت های عضو این صندوق ورودی.",
       "HMAC_VERIFICATION": "اعتبار سنجی کاربر",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "به منظور اعتبارسنجی هویت کاربر، می‌توانید یک «شناسه_هش» برای هر کاربر ارسال کنید. می‌توانید با استفاده از «شناسه» با کلید نشان داده شده در اینجا یک هش HMAC sha256 ایجاد کنید.",
       "HMAC_MANDATORY_VERIFICATION": "مجبور کردن تأیید اعتبار هویت کاربر",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "اگر فعال باشد، درخواست‌هایی که «identifier_hash» را ندارند رد می‌شوند.",
       "INBOX_IDENTIFIER": "شناسه صندوق ورودی",
       "INBOX_IDENTIFIER_SUB_TEXT": "از رمز `inbox_identifier` که در اینجا نشان داده شده است برای احراز هویت کلاینت های API خود استفاده کنید.",
       "FORWARD_EMAIL_TITLE": "ارسال به ایمیل",
       "FORWARD_EMAIL_SUB_TEXT": "ایمیل های خود را به این آدرس ها فوروارد کنید.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "اجازه دادن به پیام ها پس از حل شدن مکالمه",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "به کاربران اجازه دهید حتی پس از حل شدن مکالمه پیام ارسال کنند.",
-      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_SUBHEADER": "این کلید API برای ادغام با API های WhatsApp استفاده می شود.",
       "WHATSAPP_SECTION_TITLE": "API key"
     },
     "AUTO_ASSIGNMENT": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "باز کردن حالت تایید SSL",
       "AUTH_MECHANISM": "احراز هویت"
     },
-    "NOTE": "یادداشت: "
+    "NOTE": "یادداشت: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "آواتار وب‌سایت",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "آواتار با موفقیت حذف شد",
+              "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "عنوان سایت",
+          "PLACE_HOLDER": "عنوان سایت خود را وارد کنید (به عنوان مثال: Acme Inc)",
+          "ERROR": "لطفا یک نام وب‌سایت معتبر وارد کنید"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "تیتر خوش آمدگویی",
+          "PLACE_HOLDER": "سلام!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "زیرتیتر خوش آمدگویی",
+          "PLACE_HOLDER": "دسترسی به ما ساده است. هر سوالی پیش آمد همینجا از ما بپرسید."
+        },
+        "REPLY_TIME": {
+          "LABEL": "زمان پاسخ",
+          "IN_A_FEW_MINUTES": "در چند دقیقه",
+          "IN_A_FEW_HOURS": "در چند ساعت",
+          "IN_A_DAY": "در یک روز"
+        },
+        "WIDGET_COLOR_LABEL": "رنگ ویجت",
+        "WIDGET_BUBBLE_POSITION_LABEL": "موقعیت حباب ابزارک",
+        "WIDGET_BUBBLE_TYPE_LABEL": "نوع حباب ابزارک",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "با ما گفتگو کنید",
+          "LABEL": "عنوان ویجت Bubble",
+          "PLACE_HOLDER": "با ما گفتگو کنید"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "به‌روزرسانی تنظیمات ابزارک",
+          "API": {
+            "SUCCESS_MESSAGE": "تنظیمات ابزارک با موفقیت به‌روز شد",
+            "ERROR_MESSAGE": "به‌روزرسانی تنظیمات ابزارک ممکن نیست"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "پیش‌نمایش",
+          "SCRIPT": "اسکریپت"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "چپ",
+          "RIGHT": "راست"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "استاندارد",
+          "EXPANDED_BUBBLE": "گسترش Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "پیش‌فرض",
+        "CHAT": "گفتگو"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "معمولاً در عرض چند دقیقه پاسخ می دهند",
+        "IN_A_FEW_HOURS": "معمولاً در عرض چند ساعت پاسخ می دهند",
+        "IN_A_DAY": "به طور معمول در یک روز پاسخ می دهند"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "شروع گفتگو",
+        "CHAT_INPUT_PLACEHOLDER": "پیام خود را وارد کنید"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "ما آنلاین هستیم",
+          "OFFLINE": "در حال حاضر دردسترس نیستیم"
+        },
+        "USER_MESSAGE": "سلام",
+        "AGENT_MESSAGE": "سلام"
+      },
+      "BRANDING_TEXT": "قدرت گرفته از چت ووت",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 875707304..12f72eb4f 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -86,49 +86,49 @@
       "BUTTON_TEXT": "اتصال"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
-      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "TITLE": "برنامه‌های پیشخوان",
+      "HEADER_BTN_TXT": "اضافه کردن یک برنامه پیشخوان جدید",
+      "SIDEBAR_TXT": "<p><b>برنامه‌های داشبورد</b></p><p>برنامه‌های داشبورد به سازمان‌ها اجازه می‌دهند تا برنامه‌ای را در داشبورد Chatwoot جاسازی کنند تا زمینه را برای عوامل پشتیبانی مشتری فراهم کنند. این ویژگی به شما این امکان را می دهد که به طور مستقل یک برنامه ایجاد کنید و آن را در داشبورد جاسازی کنید تا اطلاعات کاربر، سفارشات یا سابقه پرداخت قبلی آنها را ارائه کنید.</p><p>وقتی برنامه خود را با استفاده از داشبورد در Chatwoot جاسازی می کنید، برنامه شما این کار را انجام می دهد. زمینه گفتگو و تماس را به عنوان یک رویداد پنجره دریافت کنید. یک شنونده برای رویداد پیام در صفحه خود اجرا کنید تا زمینه را دریافت کنید.</p><p>برای افزودن یک برنامه داشبورد جدید، روی دکمه \"افزودن یک برنامه داشبورد جدید\" کلیک کنید.</p>",
+      "DESCRIPTION": "برنامه‌های داشبورد به سازمان‌ها اجازه می‌دهند تا برنامه‌ای را در داشبورد جاسازی کنند تا زمینه را برای عوامل پشتیبانی مشتری فراهم کنند. این ویژگی به شما این امکان را می دهد که به طور مستقل یک برنامه کاربردی ایجاد کنید و آن را برای ارائه اطلاعات کاربر، سفارشات یا سابقه پرداخت قبلی آنها درج کنید.",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "هنوز هیچ برنامه داشبوردی روی این حساب پیکربندی نشده است",
+        "LOADING": "در حال واکشی برنامه های داشبورد...",
         "TABLE_HEADER": [
           "نام",
-          "Endpoint"
+          "نقطه پایانی"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "ویرایش برنامه",
+        "DELETE_TOOLTIP": "حذف برنامه"
       },
       "FORM": {
         "TITLE_LABEL": "نام",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
-        "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "TITLE_PLACEHOLDER": "یک نام برای برنامه پیشخوان خود وارد کنید",
+        "TITLE_ERROR": "یک نام برای برنامه داشبورد لازم است",
+        "URL_LABEL": "نقطه پایانی",
+        "URL_PLACEHOLDER": "URL نقطه پایانی را که برنامه شما در آن میزبانی شده است وارد کنید",
+        "URL_ERROR": "یک URL معتبر مورد نیاز است"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "اضافه کردن یک برنامه پیشخوان جدید",
         "FORM_SUBMIT": "ثبت",
         "FORM_CANCEL": "انصراف",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "برنامه داشبورد با موفقیت پیکربندی شد",
+        "API_ERROR": "ما نتوانستیم یک برنامه ایجاد کنیم. لطفاً بعداً دوباره امتحان کنید"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "ویرایش برنامه پیشخوان",
         "FORM_SUBMIT": "اعمال شود",
         "FORM_CANCEL": "انصراف",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "برنامه پیشخوان با موفقیت به‌روز شد",
+        "API_ERROR": "ما نمی‌توانستیم برنامه را به‌روز کنیم. لطفا بعدا دوباره امتحان کنید"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "بله، حذف شود",
+        "CONFIRM_NO": "خیر، بماند",
         "TITLE": "تاییدیه حذف",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "MESSAGE": "آیا مطمئن هستید که برنامه %{appName} حذف شود؟",
+        "API_SUCCESS": "برنامه پیشخوان با موفقیت حذف شد",
+        "API_ERROR": "ما نتوانستیم برنامه را حذف کنیم. لطفا بعدا دوباره امتحان کنید"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 1130220f4..53422bc51 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "روز تا اتمام دوره آزمایشی باقی است.",
     "TRAIL_BUTTON": "الان بخرید",
-    "DELETED_USER": "کاربر حذف شده"
+    "DELETED_USER": "کاربر حذف شده",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "حساب‌کاربری معلق شده است",
+      "MESSAGE": "حساب‌کاربری شما به حالت تعلیق درآمده. لطفا برای اطلاعات بیشتر با تیم پشتیبانی تماس بگیرید."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی",
     "AUTOMATION": "خودکارسازی",
     "TEAMS": "تیم‌ها",
+    "BILLING": "صورتحساب",
     "CUSTOM_VIEWS_FOLDER": "پوشه‌ها",
     "CUSTOM_VIEWS_SEGMENTS": "بخش ها",
     "ALL_CONTACTS": "تمام مخاطبین",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "خود را به عنوان",
     "BETA": "آزمایشی",
     "REPORTS_OVERVIEW": "بررسی اجمالی",
-    "FACEBOOK_REAUTHORIZE": "اتصال فیس بوک شما منقضی شده است ، لطفاً برای ادامه خدمات دوباره صفحه فیس بوک خود را متصل کنید"
+    "FACEBOOK_REAUTHORIZE": "اتصال فیس بوک شما منقضی شده است ، لطفاً برای ادامه خدمات دوباره صفحه فیس بوک خود را متصل کنید",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "همه مقالات",
+      "MY_ARTICLES": "مقالات من",
+      "DRAFT": "پیش‌نویس",
+      "ARCHIVED": "بایگانی شد",
+      "CATEGORY": "دسته‌بندی",
+      "CATEGORY_EMPTY_MESSAGE": "هیچ دسته‌بندی‌ای یافت نشد"
+    },
+    "DOCS": "اسناد را بخوانید"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "صورتحساب",
+    "CURRENT_PLAN": {
+      "TITLE": "طرح فعلی",
+      "PLAN_NOTE": "شما در حال حاضر مشترک طرح **%{plan}** با مجوز **%{quantity}** هستید"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "اشتراک خود را مدیریت کنید",
+      "DESCRIPTION": "فاکتورهای قبلی خود را مشاهده کنید، جزئیات صورتحساب خود را ویرایش کنید یا اشتراک خود را لغو کنید.",
+      "BUTTON_TXT": "برو به پورتال صورتحساب"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "به کمک احتياج داری؟",
+      "DESCRIPTION": "آیا در صورتحساب با مشکلی مواجه هستید؟ ما اینجاییم تا کمک کنیم.",
+      "BUTTON_TXT": "با ما گفتگو کنید"
+    },
+    "NO_BILLING_USER": "صورتحساب حساب شما در حال پیکربندی است. لطفا صفحه را مجددا بارگزاری کرده و دوباره تلاش کنید."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "اوه اوه! ما هیچ حسابی روی Chatwoot پاز شما پیدا نکردیم. لطفاً برای ادامه یک حساب جدید ایجاد کنید.",
@@ -215,9 +247,9 @@
       "RESOLVE_AND_NEXT": "حل کنید و به مرحله بعدی بروید",
       "NAVIGATE_DROPDOWN": "به موارد کشویی بروید",
       "RESOLVE_CONVERSATION": "حل مکالمه",
-      "GO_TO_CONVERSATION_DASHBOARD": "به داشبورد مکالمه بروید",
+      "GO_TO_CONVERSATION_DASHBOARD": "به پیشخوان گفتگو بروید",
       "ADD_ATTACHMENT": "افزودن پیوست",
-      "GO_TO_CONTACTS_DASHBOARD": "به داشبورد مخاطبین بروید",
+      "GO_TO_CONTACTS_DASHBOARD": "به پیشخوان مخاطبین بروید",
       "TOGGLE_SIDEBAR": "نوار کناری",
       "GO_TO_REPORTS_SIDEBAR": "به نوار کناری گزارش ها بروید",
       "MOVE_TO_NEXT_TAB": "به برگه بعدی در فهرست مکالمه بروید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json
index a20fe6767..0f1b1a5e7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json
@@ -1,16 +1,16 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "قالب های واتساپ",
+            "SUBTITLE": "قالب واتساپ مورد نظر برای ارسال را انتخاب کنید",
+            "TEMPLATE_SELECTED_SUBTITLE": "فرآیند %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "جستجوی الگوها",
+            "NO_TEMPLATES_FOUND": "هیچ قالبی برای",
             "LABELS": {
                 "LANGUAGE": "زبان",
-                "TEMPLATE_BODY": "Template Body",
+                "TEMPLATE_BODY": "بدنه الگو",
                 "CATEGORY": "دسته‌بندی"
             }
         },
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 335267c25..bd8f6cc3e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Kopioitu leikepöydälle onnistuneesti",
     "COMPANY": "Yritys",
     "LOCATION": "Sijainti",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Keskustelutiedot",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Selain",
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 91f0a693e..41a186cc1 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Ole hyvä ja valitse keskustelu vasemmasta paneelista",
+    "SELECT_A_CONVERSATION": "Ole hyvä ja valitse keskustelu vasemmasta paneelista",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Voi voi! Näyttää siltä, että postilaatikossasi ei ole viestejä.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Avaa keskustelu uudelleen",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Yksityinen huomautus: Näkyy vain sinulle ja tiimillesi",
     "CHANGE_STATUS": "Keskustelun tila muutettu",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Keskustelun vastaanottaja vaihdettu",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index f00145de8..347b369ed 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Asetukset",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Peruuta",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Asetukset"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nimi",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Poista",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nimi",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Peruuta"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Tila",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nimi",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Kuvaus",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Peruuta"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 9c9ed4000..0a5f5da7d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Määritykset",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Asetukset",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Sivuston nimi",
+          "PLACE_HOLDER": "Anna sivuston nimi (esim. Acme Oy)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Tervetuloa-otsikko",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Tervetulotoivotus",
+          "PLACE_HOLDER": "Teemme yhteydenoton yksinkertaiseksi. Kysy meiltä mitä vaan tai kerro palautetta."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Muutamassa minuutissa",
+          "IN_A_FEW_HOURS": "Muutamassa tunnissa",
+          "IN_A_DAY": "Päivän kuluessa"
+        },
+        "WIDGET_COLOR_LABEL": "Widgetin väri",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Keskustele kanssamme",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Keskustele kanssamme"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Vastaa tyypillisesti muutamassa minuutissa",
+        "IN_A_FEW_HOURS": "Tyypillisesti vastaa muutaman tunnin kuluessa",
+        "IN_A_DAY": "Vastaa tyypillisesti päivässä"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Aloita keskustelu",
+        "CHAT_INPUT_PLACEHOLDER": "Kirjoita viestisi"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Palvelun tarjoaa Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 9a745e5f3..104d7d2b0 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "päivää jäljellä.",
     "TRAIL_BUTTON": "Osta nyt",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Facebook-yhteytesi on vanhentunut, ole hyvä ja yhdistä uudelleen Facebook-sivusi jatkaaksesi palveluita"
+    "FACEBOOK_REAUTHORIZE": "Facebook-yhteytesi on vanhentunut, ole hyvä ja yhdistä uudelleen Facebook-sivusi jatkaaksesi palveluita",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Keskustele kanssamme"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 79c8b99f1..6e25fd8f5 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copié dans le presse-papiers avec succès",
     "COMPANY": "Société",
     "LOCATION": "Localisation",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Détails de la conversation",
     "VIEW_PROFILE": "Voir le profil",
     "BROWSER": "Navigateur",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index ad5dd4692..8a24fa2b1 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Veuillez sélectionner une conversation à partir du panneau de gauche",
+    "SELECT_A_CONVERSATION": "Veuillez sélectionner une conversation à partir du panneau de gauche",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "L'identité de cet utilisateur n'est pas vérifiée",
     "NO_MESSAGE_1": "Oh oh ! Il semble qu'il n'y ait aucun message de clients dans votre boîte de réception.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Semaine prochaine"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Marquer comme en attente",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reprendre la conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Signature du message",
       "ENABLE_SIGN_TOOLTIP": "Activer la signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Note privée : uniquement visible par vous et votre équipe",
     "CHANGE_STATUS": "Statut de la conversation modifié",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Responsable de la conversation modifié",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "L'équipe de conversation a été modifiée",
     "FILE_SIZE_LIMIT": "Le fichier dépasse la limite de {MAXIMUM_FILE_UPLOAD_SIZE} pour les pièces jointes",
     "MESSAGE_ERROR": "Impossible d'envoyer ce message, veuillez réessayer plus tard",
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 442ea95c9..535fddd8d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Paramètres",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "actif",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Annuler",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Paramètres"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nom",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Supprimer",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nom",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Le nom est requis"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Annuler"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Titre",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "État",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nom",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Le nom est requis"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "La description est requise"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Annuler"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index f0407b6eb..842382479 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campagnes",
       "PRE_CHAT_FORM": "Formulaire avant chat",
-      "BUSINESS_HOURS": "Heures de bureau"
+      "BUSINESS_HOURS": "Heures de bureau",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Paramètres",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Ouvrir le mode de vérification SSL",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nom du site web",
+          "PLACE_HOLDER": "Entrez le nom de votre boîte de réception (ex: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Titre de Bienvenue",
+          "PLACE_HOLDER": "Salut!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Slogan d'accueil",
+          "PLACE_HOLDER": "C'est simple de rentrer en contact avec nous. Demandez-nous quoi que ce soit ou partagez vos commentaires."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "En quelques minutes",
+          "IN_A_FEW_HOURS": "En quelques heures",
+          "IN_A_DAY": "En une journée"
+        },
+        "WIDGET_COLOR_LABEL": "Couleur du Widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Discutez avec nous",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Discutez avec nous"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Répond généralement en quelques minutes",
+        "IN_A_FEW_HOURS": "Répond généralement en quelques heures",
+        "IN_A_DAY": "Répond généralement dans la journée"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Démarrer la conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Tapez votre message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Nous sommes absents pour le moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Propulsé par Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 7735f829f..bf8a56606 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "jours d'essai restants.",
     "TRAIL_BUTTON": "Acheter Maintenant",
-    "DELETED_USER": "Utilisateur supprimé"
+    "DELETED_USER": "Utilisateur supprimé",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Attributs personnalisés",
     "AUTOMATION": "Automatisations",
     "TEAMS": "Équipes",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Dossiers",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Tous les contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Se définir comme",
     "BETA": "Bêta",
     "REPORTS_OVERVIEW": "Vue d'ensemble",
-    "FACEBOOK_REAUTHORIZE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services"
+    "FACEBOOK_REAUTHORIZE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Discutez avec nous"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh ! Nous n'avons pas trouvé de compte Chatwoot. Veuillez créer un nouveau compte pour continuer.",
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 53f39b9b2..aea842bea 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "הועתק ללוח בהצלחה",
     "COMPANY": "חברה",
     "LOCATION": "מיקום",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "פרטי שיחה",
     "VIEW_PROFILE": "צפה בפרופיל",
     "BROWSER": "דפדפן",
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index ead95d92d..7df2a980b 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "אנא בחר שיחה מהחלונית השמאלית",
+    "SELECT_A_CONVERSATION": "אנא בחר שיחה מהחלונית השמאלית",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "זהות המשתמש לא מְאוּמָתת",
     "NO_MESSAGE_1": "או - או! נראה שאין הודעות מלקוחות בתיבת הדואר הנכנס שלך.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "שבוע הבא"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "סמן כממתין",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "פתח מחדש את השיחה",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "פתקים פרטיים: רק אתה והצוות שלך יכולים לראות",
     "CHANGE_STATUS": "סטטוס השיחה השתנה",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "שיוך שיחה השתנתה",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "שיחת קבוצה השתנתה",
     "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "לא ניתן לשלוח הודעה, אנא נסה שוב מאוחר יותר",
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index 6f34aee39..27b5bce03 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "הגדרות",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "פעיל",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "ביטול",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "הגדרות"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "שם",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "מחק",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "שם",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "שם שדה חובה"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "ביטול"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "כותרת",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "מצב",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "שם",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "שם שדה חובה"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "תיאור",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "נדרש תיאור"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "ביטול"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 079aee430..8dcdf0131 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "תצורה",
       "CAMPAIGN": "קמפיין",
       "PRE_CHAT_FORM": "טופס צ'אט מקדים",
-      "BUSINESS_HOURS": "שעות פעילות"
+      "BUSINESS_HOURS": "שעות פעילות",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "הגדרות",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "שם האתר",
+          "PLACE_HOLDER": "הזן את שם האתר שלך (למשל: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "כותרת ברוכים הבאים",
+          "PLACE_HOLDER": "שלום שם!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "ברוך הבא לתיוג",
+          "PLACE_HOLDER": "אנחנו עושים את זה פשוט להתחבר אלינו. שאל אותנו כל דבר, או שתף את המשוב שלך."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "בעוד כמה דקות",
+          "IN_A_FEW_HOURS": "בעוד כמה שעות",
+          "IN_A_DAY": "ביום"
+        },
+        "WIDGET_COLOR_LABEL": "צבע יישומון",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "דבר איתנו",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "דבר איתנו"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "זמן מענה טיפוסי תוך כמה דקות",
+        "IN_A_FEW_HOURS": "מענה ממוצע תוך כמה שעות",
+        "IN_A_DAY": "מענה ממוצע לאחר יום"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "התחל שיחה",
+        "CHAT_INPUT_PLACEHOLDER": "הקלד הודעה"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "אנחנו לא זמינים כרגע"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "מופעל על ידי Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 6afbc9a95..a8b285c08 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "פג תוקף החיבור שלך לפייסבוק, אנא חבר מחדש את דף הפייסבוק שלך כדי להמשיך בשירותים"
+    "FACEBOOK_REAUTHORIZE": "פג תוקף החיבור שלך לפייסבוק, אנא חבר מחדש את דף הפייסבוק שלך כדי להמשיך בשירותים",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "דבר איתנו"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 2833e37d8..0bc399ba1 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index c38fb16a4..7adac123f 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index 3605814c6..3878cef01 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index e849d0e67..09a6210da 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 977f9e50d..7994321cc 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 218d758f5..fecc18c2c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Vágólapra másolva",
     "COMPANY": "Cég",
     "LOCATION": "Hely",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Beszélgetés részletei",
     "VIEW_PROFILE": "Profil megtekintése",
     "BROWSER": "Böngésző",
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index a06acd989..029536249 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Kérjük válassz egy beszélgetést a bal sávból",
+    "SELECT_A_CONVERSATION": "Kérjük válassz egy beszélgetést a bal sávból",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Jajj ne! Úgy tűnik, hogy nincs több ügyfélbeszélgetés az inboxodban.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Beszélgetés újranyitása",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privát megjegyzés: csak Neked és a csapat tagjainak látható",
     "CHANGE_STATUS": "A beszélgetés státusza megváltozott",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Hozzárendelt ügynök megváltoztatva",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "A beszélgetés csapata megváltozott",
     "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index 4fdd0ebf9..f1c74cd76 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Beállítások",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Mégse",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Beállítások"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Név",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Törlés",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Név",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Mégse"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Státusz",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Név",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Leírás",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Mégse"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 6b96bf7a9..cdd6ebc6e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Beállítások",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Chat előtti űrlap",
-      "BUSINESS_HOURS": "Nyitvatartás"
+      "BUSINESS_HOURS": "Nyitvatartás",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Beállítások",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website név",
+          "PLACE_HOLDER": "Add meg weboldalad nevét (pl.: Példa Kft.)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Köszöntő fejléc üzenet",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Köszöntő üzenet",
+          "PLACE_HOLDER": "Könnyűvé tesszük, hogy kapcsolatba kerülj velünk. Kérdezz bármit, vagy oszd meg véleményed."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Néhány percen belül",
+          "IN_A_FEW_HOURS": "Néhány órán belül",
+          "IN_A_DAY": "Egy napon belül"
+        },
+        "WIDGET_COLOR_LABEL": "Widget szín",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chatelj velünk",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chatelj velünk"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Néhány percen belül válaszol",
+        "IN_A_FEW_HOURS": "Néhány órán belül válaszol",
+        "IN_A_DAY": "Általánban egy napon belül válaszol"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Beszélgetés megkezdése",
+        "CHAT_INPUT_PLACEHOLDER": "Gépeld be üzeneted"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Jelenleg nem vagyunk elérhetőek"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 28d05fa11..379ff29be 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "nap van hátra a próbaidőszakból.",
     "TRAIL_BUTTON": "Előfizetés",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Egyedi atribútumok",
     "AUTOMATION": "Automation",
     "TEAMS": "Csapatok",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "A Facebook kapcsolatod lejárt, kérjük kapcsold össze oldalad újra a szolgáltatás folytatásához"
+    "FACEBOOK_REAUTHORIZE": "A Facebook kapcsolatod lejárt, kérjük kapcsold össze oldalad újra a szolgáltatás folytatásához",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chatelj velünk"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index bcec89319..d11da4b4d 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Berhasil disalin ke clipboard",
     "COMPANY": "Perusahaan",
     "LOCATION": "Lokasi",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Detail Percakapan",
     "VIEW_PROFILE": "Lihat Profil",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 80f95b781..b1a0bb169 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Pilih percakapan dari panel kiri",
+    "SELECT_A_CONVERSATION": "Pilih percakapan dari panel kiri",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Aduh! Sepertinya tidak ada pesan dari pelanggan di kotak masuk Anda.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Catatan Pribadi: Hanya terlihat oleh Anda dan tim Anda",
     "CHANGE_STATUS": "Status percakapan berubah",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Petugas Percakapan berubah",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Tim percakapan berubah",
     "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index a2f1f3501..d3b0d052b 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Pengaturan",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "aktif",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Batalkan",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Pengaturan"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nama",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Hapus",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nama",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Nama dibutuhkan"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Batalkan"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Judul",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nama",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Nama dibutuhkan"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Deskripsi",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Deskripsi dibutuhkan"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Batalkan"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 8678b8ef3..bd3c6003e 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfigurasi",
       "CAMPAIGN": "Kampanye",
       "PRE_CHAT_FORM": "Formulir Pra Obrolan",
-      "BUSINESS_HOURS": "Jam Kerja"
+      "BUSINESS_HOURS": "Jam Kerja",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Pengaturan",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nama Website",
+          "PLACE_HOLDER": "Masukkan nama situs web Anda (misalnya: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Judul Selamat Datang",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Tagline Selamat Datang",
+          "PLACE_HOLDER": "Kami membuatnya mudah untuk terhubung dengan kami. Tanyakan apa saja kepada kami, atau bagikan tanggapan Anda."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Dalam beberapa menit",
+          "IN_A_FEW_HOURS": "Dalam beberapa jam",
+          "IN_A_DAY": "Dalam sehari"
+        },
+        "WIDGET_COLOR_LABEL": "Warna Widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat dengan kami",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat dengan kami"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Biasanya membalas dalam beberapa menit",
+        "IN_A_FEW_HOURS": "Biasanya membalas dalam beberapa jam",
+        "IN_A_DAY": "Biasanya membalas dalam sehari"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Mulai Percakapan",
+        "CHAT_INPUT_PLACEHOLDER": "Ketik pesan Anda"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Kami sedang tidak tersedia saat ini"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index a2eb0955c..b51434118 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "hari percobaan tersisa.",
     "TRAIL_BUTTON": "Beli Sekarang",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Atribut Kustom",
     "AUTOMATION": "Otomatisasi",
     "TEAMS": "Tim",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Semua Kontak",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Gambaran",
-    "FACEBOOK_REAUTHORIZE": "Koneksi Facebook Anda telah kedaluwarsa, hubungkan kembali halaman Facebook Anda untuk melanjutkan layanan"
+    "FACEBOOK_REAUTHORIZE": "Koneksi Facebook Anda telah kedaluwarsa, hubungkan kembali halaman Facebook Anda untuk melanjutkan layanan",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat dengan kami"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 9262300fc..4096e8ae7 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copiato negli appunti con successo",
     "COMPANY": "Azienda",
     "LOCATION": "Posizione",
+    "BROWSER_LANGUAGE": "Lingua del browser",
     "CONVERSATION_TITLE": "Dettagli conversazione",
     "VIEW_PROFILE": "Visualizza profilo",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/it/contactFilters.json b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
index 0001271fd..a09c282fc 100644
--- a/app/javascript/dashboard/i18n/locale/it/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
@@ -39,7 +39,7 @@
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
             "CREATED_AT": "Creato il",
             "LAST_ACTIVITY": "Ultima attività",
-            "REFERER_LINK": "Referrer link"
+            "REFERER_LINK": "Link di riferimento"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "Filtri standard",
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 4782fb564..98de45392 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Si prega di selezionare una conversazione dal pannello sinistro",
+    "SELECT_A_CONVERSATION": "Si prega di selezionare una conversazione dal pannello sinistro",
+    "404": "Siamo spiacenti, non siamo riusciti a trovare la conversazione. Riprova",
+    "SWITCH_VIEW_LAYOUT": "Cambia il layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messaggi",
     "UNVERIFIED_SESSION": "L'identità di questo utente non è verificata",
     "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua casella.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Prossima settimana"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Segna come in sospeso",
+      "RESOLVED": "Contrassegna come risolto",
+      "REOPEN": "Riapri la conversazione",
+      "SNOOZE": {
+        "TITLE": "Posticipa",
+        "NEXT_REPLY": "Fino alla prossima risposta",
+        "TOMORROW": "Fino a domani",
+        "NEXT_WEEK": "Fino alla prossima settimana"
+      },
+      "ASSIGN_AGENT": "Assegna agente",
+      "ASSIGN_LABEL": "Assegna etichetta",
+      "AGENTS_LOADING": "Caricamento agenti...",
+      "ASSIGN_TEAM": "Assegna team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "ID conversazione %{conversationId} assegnato a \"%{agentName}\"",
+          "FAILED": "Impossibile assegnare l'agente. Per favore riprova."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Etichetta #%{labelName} assegnata all'ID conversazione %{conversationId}",
+          "FAILED": "Impossibile assegnare l'etichetta. Per favore riprova."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assegnato il team \"%{team}\" all'id conversazione %{conversationId}",
+          "FAILED": "Impossibile assegnare il team. Riprova."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Firma del messaggio",
       "ENABLE_SIGN_TOOLTIP": "Abilita firma",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Nota privata: visibile solo a te e al tuo team",
     "CHANGE_STATUS": "Stato conversazione cambiato",
+    "CHANGE_STATUS_FAILED": "Cambio di stato conversazione non riuscito",
     "CHANGE_AGENT": "Modifica assegnatario conversazione",
+    "CHANGE_AGENT_FAILED": "Cambio assegnatario non riuscito",
+    "ASSIGN_LABEL_SUCCESFUL": "Etichetta assegnata correttamente",
+    "ASSIGN_LABEL_FAILED": "Assegnazione etichetta non riuscita",
     "CHANGE_TEAM": "Team conversazione cambiato",
     "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
     "MESSAGE_ERROR": "Impossibile inviare questo messaggio, riprova più tardi",
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index be0767d40..bce5f98fb 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filtra per",
       "SORT": "Ordina per",
       "SETTINGS_BUTTON": "Impostazioni",
-      "NEW_BUTTON": "Nuovo articolo"
+      "NEW_BUTTON": "Nuovo articolo",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Pubblicato",
+        "DRAFT": "Bozza",
+        "ARCHIVED": "Archiviato"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Tutti gli articoli",
+        "MINE": "I miei articoli",
+        "DRAFT": "Articoli in bozza",
+        "ARCHIVED": "Articoli archiviati"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Pubblica",
@@ -15,10 +26,195 @@
       "SAVING": "Salvataggio bozza...",
       "SAVED": "Bozza salvata"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Impostazioni articolo",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Categoria",
+          "TITLE": "Seleziona categoria",
+          "PLACEHOLDER": "Seleziona categoria",
+          "NO_RESULT": "Nessuna categoria trovata",
+          "SEARCH_PLACEHOLDER": "Cerca categoria"
+        },
+        "AUTHOR": {
+          "LABEL": "Autore",
+          "TITLE": "Seleziona autore",
+          "PLACEHOLDER": "Seleziona autore",
+          "NO_RESULT": "Nessun autore trovato",
+          "SEARCH_PLACEHOLDER": "Cerca autore"
+        },
+        "META_TITLE": {
+          "LABEL": "Titolo meta",
+          "PLACEHOLDER": "Aggiungi un titolo meta"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Descrizione meta",
+          "PLACEHOLDER": "Aggiungi la tua descrizione meta per migliori risultati SEO..."
+        },
+        "META_TAGS": {
+          "LABEL": "Tag meta",
+          "PLACEHOLDER": "Aggiungi tag meta separati da virgola..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archivia articolo",
+        "DELETE": "Elimina articolo"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portali",
+      "NEW_BUTTON": "Nuovo portale",
+      "ACTIVE_BADGE": "attivo",
+      "CHOOSE_LOCALE_LABEL": "Scegli una lingua",
+      "LOADING_MESSAGE": "Caricamento dei portali...",
+      "ARTICLES_LABEL": "articoli",
+      "NO_PORTALS_MESSAGE": "Non ci sono portali disponibili",
+      "ADD_NEW_LOCALE": "Aggiungi una nuova lingua",
+      "POPOVER": {
+        "TITLE": "Portali",
+        "PORTAL_SETTINGS": "Impostazioni del portale",
+        "SUBTITLE": "Hai più portali e puoi avere diverse lingue per ogni portale.",
+        "CANCEL_BUTTON_LABEL": "annulla",
+        "CHOOSE_LOCALE_BUTTON": "Scegli lingua"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articoli",
+            "ADD": "Aggiungi lingua",
+            "VISIT": "Visita sito",
+            "SETTINGS": "Impostazioni"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Configurazioni portale",
+            "ITEMS": {
+              "NAME": "Nome",
+              "DOMAIN": "Dominio personalizzato",
+              "SLUG": "Slug",
+              "TITLE": "Titolo del portale",
+              "THEME": "Colore del tema",
+              "SUB_TEXT": "Sotto-testo del portale"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Lingue disponibili",
+            "TABLE": {
+              "NAME": "Nome lingua",
+              "CODE": "Codice lingua",
+              "ARTICLE_COUNT": "N° di articoli",
+              "CATEGORIES": "N. di categorie",
+              "SWAP": "Scambia",
+              "DELETE": "Elimina",
+              "DEFAULT_LOCALE": "Predefinito"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Crea un portale",
+        "SUB_TITLE": "Un Centro Assistenza in Chatwoot è noto come portale. Puoi avere più portali e avere diverse lingue per ogni portale.",
+        "NAME": {
+          "LABEL": "Nome",
+          "PLACEHOLDER": "Nome del portale",
+          "HELP_TEXT": "Il nome sarà utilizzato nel portale pubblico rivolto internamente",
+          "ERROR": "Il nome è obbligatorio"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Titolo pagina",
+          "PLACEHOLDER": "Titolo pagina del portale",
+          "HELP_TEXT": "Il nome verrà utilizzato nel portale pubblico",
+          "ERROR": "Il titolo della pagina è obbligatorio"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug portale per URLs",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug è obbligatorio"
+        },
+        "DOMAIN": {
+          "LABEL": "Dominio personalizzato",
+          "PLACEHOLDER": "Dominio personalizzato del portale",
+          "HELP_TEXT": "Aggiungi solo se vuoi usare un dominio personalizzato per i tuoi portali",
+          "ERROR": "Dominio personalizzato richiesto"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Link pagina iniziale",
+          "PLACEHOLDER": "Link della pagina iniziale del portale",
+          "HELP_TEXT": "Il link utilizzato per tornare dal portale alla home page.",
+          "ERROR": "Il link della pagina iniziale è obbligatorio"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Testo intestazione",
+          "PLACEHOLDER": "Testo intestazione del portale",
+          "HELP_TEXT": "Testo intestazione del portale",
+          "ERROR": "Il testo dell'intestazione del portale è obbligatorio"
+        },
+        "BUTTONS": {
+          "CREATE": "Crea portale",
+          "CANCEL": "annulla"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portale creato con successo.",
+          "ERROR_MESSAGE": "Impossibile creare il portale. Riprova."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Caricamento articoli...",
+      "404": "Nessun articolo corrisponde alla tua ricerca 🔍",
+      "NO_ARTICLES": "Non ci sono articoli disponibili",
+      "HEADERS": {
+        "TITLE": "Titolo",
+        "CATEGORY": "Categoria",
+        "READ_COUNT": "Contatore delle letture",
+        "STATUS": "Stato",
+        "LAST_EDITED": "Ultima modifica"
+      },
       "COLUMNS": {
         "BY": "di"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Il titolo dell'articolo va qui",
+      "CONTENT_PLACEHOLDER": "Scrivi qui il tuo articolo"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Cerca articoli"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Crea una categoria",
+        "SUB_TITLE": "La categoria sarà utilizzata nel portale pubblico per classificare gli articoli.",
+        "PORTAL": "Portale",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nome",
+          "PLACEHOLDER": "Nome categoria",
+          "HELP_TEXT": "Il nome della categoria verrà utilizzato nel portale pubblico per categorizzare gli articoli.",
+          "ERROR": "Il nome è obbligatorio"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug categoria per url",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug è obbligatorio"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descrizione",
+          "PLACEHOLDER": "Fornisci una breve descrizione della categoria.",
+          "ERROR": "La descrizione è obbligatoria"
+        },
+        "BUTTONS": {
+          "CREATE": "Crea categoria",
+          "CANCEL": "annulla"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Categoria creata con successo",
+          "ERROR_MESSAGE": "Impossibile creare la categoria"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index e742cef65..6a4f197ac 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configurazione",
       "CAMPAIGN": "Campagne",
       "PRE_CHAT_FORM": "Modulo pre-chat",
-      "BUSINESS_HOURS": "Ore di lavoro"
+      "BUSINESS_HOURS": "Ore di lavoro",
+      "WIDGET_BUILDER": "Costruttore Widget"
     },
     "SETTINGS": "Impostazioni",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Apri modalità di verifica SSL",
       "AUTH_MECHANISM": "Autenticazione"
     },
-    "NOTE": "Nota: "
+    "NOTE": "Nota: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Avatar sito web",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar eliminato con successo",
+              "ERROR_MESSAGE": "Si è verificato un errore, riprova"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nome sito web",
+          "PLACE_HOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Inc)",
+          "ERROR": "Inserisci un nome di sito valido"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Intestazione di benvenuto",
+          "PLACE_HOLDER": "Ciao!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Titolo di benvenuto",
+          "PLACE_HOLDER": "Rendiamo semplice connetterci con noi. Chiedete qualsiasi cosa o condividete il vostro feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Tempo di risposta",
+          "IN_A_FEW_MINUTES": "In pochi minuti",
+          "IN_A_FEW_HOURS": "In poche ore",
+          "IN_A_DAY": "In un giorno"
+        },
+        "WIDGET_COLOR_LABEL": "Colore del widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Posizione bolla del widget",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Tipo bolla del widget",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chatta con noi",
+          "LABEL": "Titolo del launcher della bolla del widget",
+          "PLACE_HOLDER": "Chatta con noi"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Aggiorna impostazioni widget",
+          "API": {
+            "SUCCESS_MESSAGE": "Impostazioni widget aggiornate con successo",
+            "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni del widget"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Anteprima",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Sinistra",
+          "RIGHT": "Destra"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Bolla espansa"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Predefinito",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "In genere risponde in pochi minuti",
+        "IN_A_FEW_HOURS": "In genere risponde in poche ore",
+        "IN_A_DAY": "In genere risponde in un giorno"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Avvia conversazione",
+        "CHAT_INPUT_PLACEHOLDER": "Scrivi il tuo messaggio"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Siamo online",
+          "OFFLINE": "Siamo offline in questo momento"
+        },
+        "USER_MESSAGE": "Salve",
+        "AGENT_MESSAGE": "Ciao"
+      },
+      "BRANDING_TEXT": "Offerto da Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 5898ebc6d..dc0ac5e88 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "giorni di prova rimanenti.",
     "TRAIL_BUTTON": "Acquista ora",
-    "DELETED_USER": "Utente eliminato"
+    "DELETED_USER": "Utente eliminato",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account sospeso",
+      "MESSAGE": "Il tuo account è sospeso. Contatta il team di supporto per ulteriori informazioni."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
     "AUTOMATION": "Automazione",
     "TEAMS": "Teams",
+    "BILLING": "Fatturazione",
     "CUSTOM_VIEWS_FOLDER": "Cartelle",
     "CUSTOM_VIEWS_SEGMENTS": "Segmenti",
     "ALL_CONTACTS": "Tutti i contatti",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Imposta te stesso come",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Panoramica",
-    "FACEBOOK_REAUTHORIZE": "La tua connessione a Facebook è scaduta, ricollegati alla tua pagina Facebook per continuare i servizi"
+    "FACEBOOK_REAUTHORIZE": "La tua connessione a Facebook è scaduta, ricollegati alla tua pagina Facebook per continuare i servizi",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Tutti gli articoli",
+      "MY_ARTICLES": "I miei articoli",
+      "DRAFT": "Bozza",
+      "ARCHIVED": "Archiviato",
+      "CATEGORY": "Categoria",
+      "CATEGORY_EMPTY_MESSAGE": "Nessuna categoria trovata"
+    },
+    "DOCS": "Leggi i documenti"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Fatturazione",
+    "CURRENT_PLAN": {
+      "TITLE": "Piano attuale",
+      "PLAN_NOTE": "Sei attualmente abbonato al piano **%{plan}** con **%{quantity}** licenze"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Gestisci il tuo abbonamento",
+      "DESCRIPTION": "Visualizza le tue fatture precedenti, modifica i tuoi dati di fatturazione o annulla il tuo abbonamento.",
+      "BUTTON_TXT": "Vai al portale di fatturazione"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Hai bisogno di aiuto?",
+      "DESCRIPTION": "Hai qualche problema di fatturazione? Siamo qui per aiutarti.",
+      "BUTTON_TXT": "Chatta con noi"
+    },
+    "NO_BILLING_USER": "Il tuo account di fatturazione è in fase di configurazione. Per favore aggiorna la pagina e riprova."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Non abbiamo trovato alcun account Chatwoot. Si prega di creare un nuovo account per continuare.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 6629553cf..1563af6e4 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "企業",
     "LOCATION": "場所",
+    "BROWSER_LANGUAGE": "ブラウザの言語",
     "CONVERSATION_TITLE": "会話の詳細",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "ブラウザ",
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index b84110d1c..6ea1cb21b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "左のリストから会話を選択してください",
+    "SELECT_A_CONVERSATION": "左のリストから会話を選択してください",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "おっと！受信トレイに顧客からのメッセージがないようです。",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "非公開設定の注意：あなたとあなたのチームのみに表示されます",
     "CHANGE_STATUS": "会話の状態が変更されました",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "会話の担当者が変更されました",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index f297de330..760cd43cc 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "設定",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "キャンセル",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "設定"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "名前",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "削除",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "名前",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "名前が必須です"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "キャンセル"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "状況",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "名前",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "名前が必須です"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "説明",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "キャンセル"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index e1928549f..408d72821 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "設定",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "ウェブサイト名",
+          "PLACE_HOLDER": "ウェブサイト名を入力してください(例：Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "冒頭の見出し",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "冒頭のタグライン",
+          "PLACE_HOLDER": "簡単に連絡が取れる状態です。なんでも聞いてください。フィードバックの共有も歓迎です。"
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "ウィジェットの色",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "チャットをする",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "チャットをする"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "通常数分以内にご返信します。",
+        "IN_A_FEW_HOURS": "通常数時間以内にご返信します。",
+        "IN_A_DAY": "通常数日以内にご返信します。"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "チャットを開始する",
+        "CHAT_INPUT_PLACEHOLDER": "メッセージを入力してください。"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "留守中"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index f5c513039..263151ddb 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "日、トライアル期間が残っています。",
     "TRAIL_BUTTON": "今すぐ購入",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "カスタム属性",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。"
+    "FACEBOOK_REAUTHORIZE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "チャットをする"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json
new file mode 100644
index 000000000..46a573c42
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json
@@ -0,0 +1,93 @@
+{
+  "FILTER": {
+    "TITLE": "Filter Conversations",
+    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "ADD_NEW_FILTER": "Add Filter",
+    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "CANCEL_BUTTON_LABEL": "Cancel",
+    "CLEAR_BUTTON_LABEL": "Clear Filters",
+    "EMPTY_VALUE_ERROR": "Value is required",
+    "TOOLTIP_LABEL": "Filter conversations",
+    "QUERY_DROPDOWN_LABELS": {
+      "AND": "AND",
+      "OR": "OR"
+    },
+    "OPERATOR_LABELS": {
+      "equal_to": "Equal to",
+      "not_equal_to": "Not equal to",
+      "contains": "Contains",
+      "does_not_contain": "Does not contain",
+      "is_present": "Is present",
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_less_than": "Is lesser than",
+      "days_before": "Is x days before"
+    },
+    "ATTRIBUTE_LABELS": {
+      "TRUE": "True",
+      "FALSE": "False"
+    },
+    "ATTRIBUTES": {
+      "STATUS": "Status",
+      "ASSIGNEE_NAME": "Assignee Name",
+      "INBOX_NAME": "Inbox Name",
+      "TEAM_NAME": "Team Name",
+      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
+      "CAMPAIGN_NAME": "Campaign Name",
+      "LABELS": "Labels",
+      "BROWSER_LANGUAGE": "Browser Language",
+      "COUNTRY_NAME": "Country Name",
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "CREATED_AT": "Created At",
+      "LAST_ACTIVITY": "Last Activity"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirm Deletion",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json
new file mode 100644
index 000000000..0f965c717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json
@@ -0,0 +1,113 @@
+{
+  "AGENT_MGMT": {
+    "HEADER": "Agents",
+    "HEADER_BTN_TXT": "Add Agent",
+    "LOADING": "Fetching Agent List",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "AGENT_TYPES": {
+      "ADMINISTRATOR": "Administrator",
+      "AGENT": "Agent"
+    },
+    "LIST": {
+      "404": "There are no agents associated to this account",
+      "TITLE": "Manage agents in your team",
+      "DESC": "You can add/remove agents to/in your team.",
+      "NAME": "Name",
+      "EMAIL": "EMAIL",
+      "STATUS": "Status",
+      "ACTIONS": "Actions",
+      "VERIFIED": "Verified",
+      "VERIFICATION_PENDING": "Verification Pending"
+    },
+    "ADD": {
+      "TITLE": "Add agent to your team",
+      "DESC": "You can add people who will be able to handle support for your inboxes.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Agent Name",
+          "PLACEHOLDER": "Please enter a name of the agent"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Role",
+          "PLACEHOLDER": "Please select a role",
+          "ERROR": "Role is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email Address",
+          "PLACEHOLDER": "Please enter an email address of the agent"
+        },
+        "SUBMIT": "Add Agent"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Agent added successfully",
+        "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Agent deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit agent",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Agent Name",
+          "PLACEHOLDER": "Please enter a name of the agent"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Role",
+          "PLACEHOLDER": "Please select a role",
+          "ERROR": "Role is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email Address",
+          "PLACEHOLDER": "Please enter an email address of the agent"
+        },
+        "SUBMIT": "Edit Agent"
+      },
+      "BUTTON_TEXT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Agent updated successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "Reset Password",
+        "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
+        "SUCCESS_MESSAGE": "Agent password reset successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "No results found."
+    },
+    "MULTI_SELECTOR": {
+      "PLACEHOLDER": "None",
+      "TITLE": {
+        "AGENT": "Select agent",
+        "TEAM": "Select team"
+      },
+      "SEARCH": {
+        "NO_RESULTS": {
+          "AGENT": "No agents found",
+          "TEAM": "No teams found"
+        },
+        "PLACEHOLDER": {
+          "AGENT": "Search agents",
+          "TEAM": "Search teams"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
new file mode 100644
index 000000000..ff4904c34
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
@@ -0,0 +1,99 @@
+{
+  "ATTRIBUTES_MGMT": {
+    "HEADER": "Custom Attributes",
+    "HEADER_BTN_TXT": "Add Custom Attribute",
+    "LOADING": "Fetching custom attributes",
+    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "ADD": {
+      "TITLE": "Add Custom Attribute",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Display Name",
+          "PLACEHOLDER": "Enter custom attribute display name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter custom attribute description",
+          "ERROR": "Description is required"
+        },
+        "MODEL": {
+          "LABEL": "Applies to",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Model is required"
+        },
+        "TYPE": {
+          "LABEL": "Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Type is required",
+          "LIST": {
+            "LABEL": "List Values",
+            "PLACEHOLDER": "Please enter value and press enter key",
+            "ERROR": "Must have at least one value"
+          }
+        },
+        "KEY": {
+          "LABEL": "Key",
+          "PLACEHOLDER": "Enter custom attribute key",
+          "ERROR": "Key is required",
+          "IN_VALID": "Invalid key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
+        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{attributeName}",
+        "PLACE_HOLDER": "Please type {attributeName} to confirm",
+        "MESSAGE": "Deleting will remove the custom attribute",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Custom Attribute",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "TYPE": {
+        "LIST": {
+          "LABEL": "List Values",
+          "PLACEHOLDER": "Please enter values and press enter key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+      }
+    },
+    "TABS": {
+      "HEADER": "Custom Attributes",
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Type",
+        "Key"
+      ],
+      "BUTTONS": {
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "EMPTY_RESULT": {
+        "404": "There are no custom attributes created",
+        "NOT_FOUND": "There are no custom attributes configured"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/automation.json b/app/javascript/dashboard/i18n/locale/ka/automation.json
new file mode 100644
index 000000000..5d291814e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/automation.json
@@ -0,0 +1,116 @@
+{
+  "AUTOMATION": {
+    "HEADER": "Automations",
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Update",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    },
+    "CONDITION": {
+      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+    },
+    "ACTION": {
+      "DELETE_MESSAGE": "You need to have atleast one action to save",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+    },
+    "TOGGLE": {
+      "ACTIVATION_TITLE": "Activate Automation Rule",
+      "DEACTIVATION_TITLE": "Deactivate Automation Rule",
+      "ACTIVATION_DESCRIPTION": "This action will activate the automation rule '{automationName}'. Are you sure you want to proceed?",
+      "DEACTIVATION_DESCRIPTION": "This action will deactivate the automation rule '{automationName}'. Are you sure you want to proceed?",
+      "ACTIVATION_SUCCESFUL": "Automation Rule Activated Successfully",
+      "DEACTIVATION_SUCCESFUL": "Automation Rule Deactivated Successfully",
+      "ACTIVATION_ERROR": "Could not Activate Automation, Please try again later",
+      "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
+      "CONFIRMATION_LABEL": "Yes",
+      "CANCEL_LABEL": "No"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Uploading...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
new file mode 100644
index 000000000..7061e5e70
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
@@ -0,0 +1,29 @@
+{
+  "BULK_ACTION": {
+    "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+    "AGENT_SELECT_LABEL": "Select Agent",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "GO_BACK_LABEL": "Go back",
+    "ASSIGN_LABEL": "Assign",
+    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+    "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
+    "ASSIGN_FAILED": "Failed to assign conversations, please try again",
+    "RESOLVE_SUCCESFUL": "Conversations resolved successfully",
+    "RESOLVE_FAILED": "Failed to resolve conversations, please try again",
+    "ALL_CONVERSATIONS_SELECTED_ALERT": "Conversations visible on this page are only selected.",
+    "AGENT_LIST_LOADING": "Loading Agents",
+    "UPDATE": {
+      "CHANGE_STATUS": "Change status",
+      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply",
+      "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
+      "UPDATE_FAILED": "Failed to update conversations, please try again"
+    },
+    "LABELS": {
+      "ASSIGN_LABELS": "Assign Labels",
+      "NO_LABELS_FOUND": "No labels found for",
+      "ASSIGN_SELECTED_LABELS": "Assign selected labels",
+      "ASSIGN_SUCCESFUL": "Labels assigned successfully",
+      "ASSIGN_FAILED": "Failed to assign labels, please try again"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/campaign.json b/app/javascript/dashboard/i18n/locale/ka/campaign.json
new file mode 100644
index 000000000..bbcc463ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/campaign.json
@@ -0,0 +1,126 @@
+{
+  "CAMPAIGN": {
+    "HEADER": "Campaigns",
+    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
+    "HEADER_BTN_TXT": {
+      "ONE_OFF": "Create a one off campaign",
+      "ONGOING": "Create a ongoing campaign"
+    },
+    "ADD": {
+      "TITLE": "Create a campaign",
+      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CREATE_BUTTON_TEXT": "Create",
+      "FORM": {
+        "TITLE": {
+          "LABEL": "Title",
+          "PLACEHOLDER": "Please enter the title of campaign",
+          "ERROR": "Title is required"
+        },
+        "SCHEDULED_AT": {
+          "LABEL": "Scheduled time",
+          "PLACEHOLDER": "Please select the time",
+          "CONFIRM": "Confirm",
+          "ERROR": "Scheduled time is required"
+        },
+        "AUDIENCE": {
+          "LABEL": "Audience",
+          "PLACEHOLDER": "Select the customer labels",
+          "ERROR": "Audience is required"
+        },
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox",
+          "ERROR": "Inbox is required"
+        },
+        "MESSAGE": {
+          "LABEL": "Message",
+          "PLACEHOLDER": "Please enter the message of campaign",
+          "ERROR": "Message is required"
+        },
+        "SENT_BY": {
+          "LABEL": "Sent by",
+          "PLACEHOLDER": "Please select the the content of campaign",
+          "ERROR": "Sender is required"
+        },
+        "END_POINT": {
+          "LABEL": "URL",
+          "PLACEHOLDER": "Please enter the URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "TIME_ON_PAGE": {
+          "LABEL": "Time on page(Seconds)",
+          "PLACEHOLDER": "Please enter the time",
+          "ERROR": "Time on page is required"
+        },
+        "ENABLED": "Enable campaign",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
+        "SUBMIT": "Add Campaign"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign created successfully",
+        "ERROR_MESSAGE": "There was an error. Please try again."
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit campaign",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "LIST": {
+      "LOADING_MESSAGE": "Loading campaigns...",
+      "404": "There are no campaigns created for this inbox.",
+      "TABLE_HEADER": {
+        "TITLE": "Title",
+        "MESSAGE": "Message",
+        "INBOX": "Inbox",
+        "STATUS": "Status",
+        "SENDER": "Sender",
+        "URL": "URL",
+        "SCHEDULED_AT": "Scheduled time",
+        "TIME_ON_PAGE": "Time(Seconds)",
+        "CREATED_AT": "Created at"
+      },
+      "BUTTONS": {
+        "ADD": "Add",
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "STATUS": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled",
+        "COMPLETED": "Completed",
+        "ACTIVE": "Active"
+      },
+      "SENDER": {
+        "BOT": "Bot"
+      }
+    },
+    "ONE_OFF": {
+      "HEADER": "One off campaigns",
+      "404": "There are no one off campaigns created",
+      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+    },
+    "ONGOING": {
+      "HEADER": "Ongoing campaigns",
+      "404": "There are no ongoing campaigns created",
+      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ka/cannedMgmt.json
new file mode 100644
index 000000000..9c14f5a52
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "HEADER": "Canned Responses",
+    "HEADER_BTN_TXT": "Add Canned Response",
+    "LOADING": "Fetching Canned Responses",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "LIST": {
+      "404": "There are no canned responses available in this account.",
+      "TITLE": "Manage canned responses",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "TABLE_HEADER": [
+        "Short Code",
+        "Content",
+        "Actions"
+      ]
+    },
+    "ADD": {
+      "TITLE": "Add Canned Response",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a short code",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "Submit"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Canned Response",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a shortcode",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "Submit"
+      },
+      "BUTTON_TEXT": "Edit",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response updated successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned response deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/chatlist.json b/app/javascript/dashboard/i18n/locale/ka/chatlist.json
new file mode 100644
index 000000000..93bba4aab
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/chatlist.json
@@ -0,0 +1,65 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "Fetching conversations",
+    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
+    "EOF": "All conversations loaded 🎉",
+    "LIST": {
+      "404": "There are no active conversations in this group."
+    },
+    "TAB_HEADING": "Conversations",
+    "MENTION_HEADING": "Mentions",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "FILTER_ALL": "All",
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
+    "CHAT_STATUS_FILTER_ITEMS": {
+      "open": {
+        "TEXT": "Open"
+      },
+      "resolved": {
+        "TEXT": "Resolved"
+      },
+      "pending": {
+        "TEXT": "Pending"
+      },
+      "snoozed": {
+        "TEXT": "Snoozed"
+      }
+    },
+    "ATTACHMENTS": {
+      "image": {
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "CONTENT": "has shared a url"
+      }
+    },
+    "RECEIVED_VIA_EMAIL": "Received via email",
+    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
+    "REPLY_TO_TWEET": "Reply to this tweet",
+    "LINK_TO_STORY": "Go to instagram story",
+    "SENT": "Sent successfully",
+    "NO_MESSAGES": "No Messages",
+    "NO_CONTENT": "No content available",
+    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
new file mode 100644
index 000000000..0bc399ba1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -0,0 +1,346 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "Email Address",
+    "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
+    "CONVERSATION_TITLE": "Conversation Details",
+    "VIEW_PROFILE": "View Profile",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "IP_ADDRESS": "IP Address",
+    "NEW_MESSAGE": "New message",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
+      },
+      "LABEL_SELECT": {
+        "TITLE": "Add Labels",
+        "PLACEHOLDER": "Search labels",
+        "NO_RESULT": "No labels found"
+      }
+    },
+    "MERGE_CONTACT": "Merge contact",
+    "CONTACT_ACTIONS": "Contact actions",
+    "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "Send Transcript",
+    "EDIT_LABEL": "Edit",
+    "SIDEBAR_SECTIONS": {
+      "CUSTOM_ATTRIBUTES": "Custom Attributes",
+      "CONTACT_LABELS": "Contact Labels",
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+    }
+  },
+  "EDIT_CONTACT": {
+    "BUTTON_LABEL": "Edit Contact",
+    "TITLE": "Edit contact",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "IMPORT_CONTACTS": {
+    "BUTTON_LABEL": "Import",
+    "TITLE": "Import Contacts",
+    "DESC": "Import contacts through a CSV file.",
+    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "FORM": {
+      "LABEL": "CSV File",
+      "SUBMIT": "Import",
+      "CANCEL": "Cancel"
+    },
+    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirm Deletion",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "No, Keep it"
+    }
+  },
+  "DELETE_CONTACT": {
+    "BUTTON_LABEL": "Delete Contact",
+    "TITLE": "Delete contact",
+    "DESC": "Delete contact details",
+    "CONFIRM": {
+      "TITLE": "Confirm Deletion",
+      "MESSAGE": "Are you sure to delete ",
+      "YES": "Yes, Delete",
+      "NO": "No, Keep"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Contact deleted successfully",
+      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+    }
+  },
+  "CONTACT_FORM": {
+    "FORM": {
+      "SUBMIT": "Submit",
+      "CANCEL": "Cancel",
+      "AVATAR": {
+        "LABEL": "Contact Avatar"
+      },
+      "NAME": {
+        "PLACEHOLDER": "Enter the full name of the contact",
+        "LABEL": "Full Name"
+      },
+      "BIO": {
+        "PLACEHOLDER": "Enter the bio of the contact",
+        "LABEL": "Bio"
+      },
+      "EMAIL_ADDRESS": {
+        "PLACEHOLDER": "Enter the email address of the contact",
+        "LABEL": "Email Address",
+        "DUPLICATE": "This email address is in use for another contact.",
+        "ERROR": "Please enter a valid email address."
+      },
+      "PHONE_NUMBER": {
+        "PLACEHOLDER": "Enter the phone number of the contact",
+        "LABEL": "Phone Number",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Phone number should be either empty or of E.164 format",
+        "DUPLICATE": "This phone number is in use for another contact."
+      },
+      "LOCATION": {
+        "PLACEHOLDER": "Enter the location of the contact",
+        "LABEL": "Location"
+      },
+      "COMPANY_NAME": {
+        "PLACEHOLDER": "Enter the company name",
+        "LABEL": "Company Name"
+      },
+      "SOCIAL_PROFILES": {
+        "FACEBOOK": {
+          "PLACEHOLDER": "Enter the Facebook username",
+          "LABEL": "Facebook"
+        },
+        "TWITTER": {
+          "PLACEHOLDER": "Enter the Twitter username",
+          "LABEL": "Twitter"
+        },
+        "LINKEDIN": {
+          "PLACEHOLDER": "Enter the LinkedIn username",
+          "LABEL": "LinkedIn"
+        },
+        "GITHUB": {
+          "PLACEHOLDER": "Enter the Github username",
+          "LABEL": "Github"
+        }
+      }
+    },
+    "DELETE_AVATAR": {
+      "API": {
+        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+      }
+    },
+    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "NEW_CONVERSATION": {
+    "BUTTON_LABEL": "Start conversation",
+    "TITLE": "New conversation",
+    "DESC": "Start a new conversation by sending a new message.",
+    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "FORM": {
+      "TO": {
+        "LABEL": "To"
+      },
+      "INBOX": {
+        "LABEL": "Inbox",
+        "ERROR": "Select an inbox"
+      },
+      "SUBJECT": {
+        "LABEL": "Subject",
+        "PLACEHOLDER": "Subject",
+        "ERROR": "Subject can't be empty"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Write your message here",
+        "ERROR": "Message can't be empty"
+      },
+      "SUBMIT": "Send message",
+      "CANCEL": "Cancel",
+      "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
+      "ERROR_MESSAGE": "Couldn't send! try again"
+    }
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "FIELDS": "Contact fields",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "NO_CONTACTS": "There are no available contacts",
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
+    }
+  },
+  "CONTACT_PROFILE": {
+    "BACK_BUTTON": "Contacts",
+    "LOADING": "Loading contact profile..."
+  },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "FETCHING_NOTES": "Fetching notes...",
+    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "HEADER": {
+      "TITLE": "Notes"
+    },
+    "LIST": {
+      "LABEL": "added a note"
+    },
+    "ADD": {
+      "BUTTON": "Add",
+      "PLACEHOLDER": "Add a note",
+      "TITLE": "Shift + Enter to create a note"
+    },
+    "CONTENT_HEADER": {
+      "DELETE": "Delete note"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Add attributes",
+    "BUTTON": "Add custom attribute",
+    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "ACTIONS": {
+      "COPY": "Copy attribute",
+      "DELETE": "Delete attribute",
+      "EDIT": "Edit attribute"
+    },
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      },
+      "ADD": {
+        "TITLE": "Create new attribute ",
+        "SUCCESS": "Attribute added successfully",
+        "ERROR": "Unable to add attribute. Please try again later"
+      },
+      "UPDATE": {
+        "SUCCESS": "Attribute updated successfully",
+        "ERROR": "Unable to update attribute. Please try again later"
+      },
+      "DELETE": {
+        "SUCCESS": "Attribute deleted successfully",
+        "ERROR": "Unable to delete attribute. Please try again later"
+      },
+      "ATTRIBUTE_SELECT": {
+        "TITLE": "Add attributes",
+        "PLACEHOLDER": "Search attributes",
+        "NO_RESULT": "No attributes found"
+      },
+      "ATTRIBUTE_TYPE": {
+        "LIST": {
+          "PLACEHOLDER": "Select value",
+          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "NO_RESULT": "No result found"
+        }
+      }
+    },
+    "VALIDATIONS": {
+      "REQUIRED": "Valid value is required",
+      "INVALID_URL": "Invalid URL"
+    }
+  },
+  "MERGE_CONTACTS": {
+    "TITLE": "Merge contacts",
+    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "PRIMARY": {
+      "TITLE": "Primary contact",
+      "HELP_LABEL": "To be kept"
+    },
+    "CHILD": {
+      "TITLE": "Contact to merge",
+      "PLACEHOLDER": "Search for a contact",
+      "HELP_LABEL": "To be deleted"
+    },
+    "SUMMARY": {
+      "TITLE": "Summary",
+      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+    },
+    "SEARCH": {
+      "ERROR": "ERROR_MESSAGE"
+    },
+    "FORM": {
+      "SUBMIT": " Merge contacts",
+      "CANCEL": "Cancel",
+      "CHILD_CONTACT": {
+        "ERROR": "Select a child contact to merge"
+      },
+      "SUCCESS_MESSAGE": "Contact merged successfully",
+      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/contactFilters.json b/app/javascript/dashboard/i18n/locale/ka/contactFilters.json
new file mode 100644
index 000000000..3f84a8476
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/contactFilters.json
@@ -0,0 +1,50 @@
+{
+    "CONTACTS_FILTER": {
+        "TITLE": "Filter Contacts",
+        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+        "ADD_NEW_FILTER": "Add Filter",
+        "CLEAR_ALL_FILTERS": "Clear All Filters",
+        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "SUBMIT_BUTTON_LABEL": "Submit",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CLEAR_BUTTON_LABEL": "Clear Filters",
+        "EMPTY_VALUE_ERROR": "Value is required",
+        "TOOLTIP_LABEL": "Filter contacts",
+        "QUERY_DROPDOWN_LABELS": {
+            "AND": "AND",
+            "OR": "OR"
+        },
+        "OPERATOR_LABELS": {
+            "equal_to": "Equal to",
+            "not_equal_to": "Not equal to",
+            "contains": "Contains",
+            "does_not_contain": "Does not contain",
+            "is_present": "Is present",
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than",
+            "days_before": "Is x days before"
+        },
+        "ATTRIBUTES": {
+            "NAME": "Name",
+            "EMAIL": "Email",
+            "PHONE_NUMBER": "Phone number",
+            "IDENTIFIER": "Identifier",
+            "CITY": "City",
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+            "CREATED_AT": "Created At",
+            "LAST_ACTIVITY": "Last Activity",
+            "REFERER_LINK": "Referrer link"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
new file mode 100644
index 000000000..7adac123f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -0,0 +1,241 @@
+{
+  "CONVERSATION": {
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "RESULT_TITLE": "Search Results",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "No results found."
+    },
+    "UNREAD_MESSAGES": "Unread Messages",
+    "UNREAD_MESSAGE": "Unread Message",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
+    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
+    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
+    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "NO_RESPONSE": "No response",
+    "RATING_TITLE": "Rating",
+    "FEEDBACK_TITLE": "Feedback",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN_ACTION": "Open",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+    },
+    "RESOLVE_DROPDOWN": {
+      "MARK_PENDING": "Mark as pending",
+      "SNOOZE": {
+        "TITLE": "Snooze until",
+        "NEXT_REPLY": "Next reply",
+        "TOMORROW": "Tomorrow",
+        "NEXT_WEEK": "Next week"
+      }
+    },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
+    "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
+      "CLICK_HERE": "Click here to update"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet",
+      "TIP_FORMAT_ICON": "Show rich text editor",
+      "TIP_EMOJI_ICON": "Show emoji selector",
+      "TIP_ATTACH_ICON": "Attach files",
+      "TIP_AUDIORECORDER_ICON": "Record audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
+      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "ENTER_TO_SEND": "Enter to send",
+      "DRAG_DROP": "Drag and drop here to attach",
+      "START_AUDIO_RECORDING": "Start audio recording",
+      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "": "",
+      "EMAIL_HEAD": {
+        "ADD_BCC": "Add bcc",
+        "CC": {
+          "LABEL": "CC",
+          "PLACEHOLDER": "Emails separated by commas",
+          "ERROR": "Please enter valid email addresses"
+        },
+        "BCC": {
+          "LABEL": "BCC",
+          "PLACEHOLDER": "Emails separated by commas",
+          "ERROR": "Please enter valid email addresses"
+        }
+      }
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
+    "ASSIGNMENT": {
+      "SELECT_AGENT": "Select Agent",
+      "REMOVE": "Remove",
+      "ASSIGN": "Assign"
+    },
+    "CONTEXT_MENU": {
+      "COPY": "Copy",
+      "DELETE": "Delete"
+    }
+  },
+  "EMAIL_TRANSCRIPT": {
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "Submit",
+    "CANCEL": "Cancel",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "FORM": {
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "EMAIL": {
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
+      }
+    }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    },
+    "ACCORDION": {
+      "CONTACT_DETAILS": "Contact Details",
+      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONVERSATION_LABELS": "Conversation Labels",
+      "CONVERSATION_INFO": "Conversation Information",
+      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "PREVIOUS_CONVERSATION": "Previous Conversations"
+    }
+  },
+  "CONVERSATION_CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Create attribute",
+    "UPDATE": {
+      "SUCCESS": "Attribute updated successfully",
+      "ERROR": "Unable to update attribute. Please try again later"
+    },
+    "ADD": {
+      "TITLE": "Add",
+      "SUCCESS": "Attribute added successfully",
+      "ERROR": "Unable to add attribute. Please try again later"
+    },
+    "DELETE": {
+      "SUCCESS": "Attribute deleted successfully",
+      "ERROR": "Unable to delete attribute. Please try again later"
+    },
+    "ATTRIBUTE_SELECT": {
+      "TITLE": "Add attributes",
+      "PLACEHOLDER": "Search attributes",
+      "NO_RESULT": "No attributes found"
+    }
+  },
+  "EMAIL_HEADER": {
+    "FROM": "From",
+    "TO": "To",
+    "BCC": "Bcc",
+    "CC": "Cc",
+    "SUBJECT": "Subject"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/csatMgmt.json b/app/javascript/dashboard/i18n/locale/ka/csatMgmt.json
new file mode 100644
index 000000000..d7d2efc2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/csatMgmt.json
@@ -0,0 +1,6 @@
+{
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "PLACEHOLDER": "Tell us more..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
new file mode 100644
index 000000000..5a0c4f7d7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -0,0 +1,140 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Account settings",
+    "SUBMIT": "Update settings",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Could not update settings, try again!",
+      "SUCCESS": "Successfully updated account settings"
+    },
+    "FORM": {
+      "ERROR": "Please fix form errors",
+      "GENERAL_SECTION": {
+        "TITLE": "General settings",
+        "NOTE": ""
+      },
+      "ACCOUNT_ID": {
+        "TITLE": "Account ID",
+        "NOTE": "This ID is required if you are building an API based integration"
+      },
+      "NAME": {
+        "LABEL": "Account name",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": "Please enter a valid account name"
+      },
+      "LANGUAGE": {
+        "LABEL": "Site language (Beta)",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Incoming Email Domain",
+        "PLACEHOLDER": "The domain where you will receive the emails",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+      },
+      "FEATURES": {
+        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+      }
+    },
+    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
+    "LEARN_MORE": "Learn more"
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "Notifications",
+    "MARK_ALL_DONE": "Mark All Done",
+    "DELETE_TITLE": "deleted",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Unread Notifications",
+      "ALL_NOTIFICATIONS": "View all notifications",
+      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
+      "EMPTY_MESSAGE": "You have no unread notifications"
+    },
+    "LIST": {
+      "LOADING_MESSAGE": "Loading notifications...",
+      "404": "No Notifications",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    },
+    "TYPE_LABEL": {
+      "conversation_creation": "New conversation",
+      "conversation_assignment": "Conversation Assigned",
+      "assigned_conversation_new_message": "New Message",
+      "conversation_mention": "Mention"
+    }
+  },
+  "NETWORK": {
+    "NOTIFICATION": {
+      "TEXT": "Disconnected from Chatwoot"
+    },
+    "BUTTON": {
+      "REFRESH": "Refresh"
+    }
+  },
+  "COMMAND_BAR": {
+    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SECTIONS": {
+      "GENERAL": "General",
+      "REPORTS": "Reports",
+      "CONVERSATION": "Conversation",
+      "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_TEAM": "Change Team",
+      "ADD_LABEL": "Add label to the conversation",
+      "REMOVE_LABEL": "Remove label from the conversation",
+      "SETTINGS": "Settings"
+    },
+    "COMMANDS": {
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
+      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
+      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
+      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
+      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
+      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
+      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
+      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
+      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
+      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
+      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
+      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
+      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
+      "GO_TO_NOTIFICATIONS": "Go to Notifications",
+      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
+      "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_A_TEAM": "Assign a team",
+      "MUTE_CONVERSATION": "Mute conversation",
+      "UNMUTE_CONVERSATION": "Unmute conversation",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
+      "REOPEN_CONVERSATION": "Reopen conversation",
+      "RESOLVE_CONVERSATION": "Resolve conversation",
+      "SEND_TRANSCRIPT": "Send an email transcript",
+      "SNOOZE_CONVERSATION": "Snooze Conversation",
+      "UNTIL_NEXT_REPLY": "Until next reply",
+      "UNTIL_NEXT_WEEK": "Until next week",
+      "UNTIL_TOMORROW": "Until tomorrow"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
new file mode 100644
index 000000000..3878cef01
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -0,0 +1,220 @@
+{
+  "HELP_CENTER": {
+    "HEADER": {
+      "FILTER": "Filter by",
+      "SORT": "Sort by",
+      "SETTINGS_BUTTON": "Settings",
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
+    },
+    "EDIT_HEADER": {
+      "PUBLISH_BUTTON": "Publish",
+      "PREVIEW": "Preview",
+      "ADD_TRANSLATION": "Add translation",
+      "OPEN_SIDEBAR": "Open sidebar",
+      "CLOSE_SIDEBAR": "Close sidebar",
+      "SAVING": "Draft saving...",
+      "SAVED": "Draft saved"
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
+    "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
+      "COLUMNS": {
+        "BY": "by"
+      }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
new file mode 100644
index 000000000..09a6210da
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -0,0 +1,662 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inboxes",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "LIST": {
+      "404": "There are no inboxes attached to this account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Choose Channel",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Create Inbox",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Add Agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "You are all set to go!"
+      }
+    ],
+    "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)",
+        "ERROR": "Please enter a valid inbox name"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
+      "FB": {
+        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
+        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PLACEHOLDER": "Select a page from the list",
+        "INBOX_NAME": "Inbox Name",
+        "ADD_NAME": "Add a name for your inbox",
+        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_A_VALUE": "Pick a value"
+      },
+      "TWITTER": {
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "TWEETS": {
+          "ENABLE": "Create conversations from mentioned Tweets"
+        }
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Website channel",
+        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Enter your Webhook URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Website Domain",
+          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Welcome Heading",
+          "PLACEHOLDER": "Hi there !"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget Color",
+          "PLACEHOLDER": "Update the widget color used in widget"
+        },
+        "SUBMIT_BUTTON": "Create inbox",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+        }
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/WhatsApp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Account SID",
+          "PLACEHOLDER": "Please enter your Twilio Account SID",
+          "ERROR": "This field is required"
+        },
+        "MESSAGING_SERVICE_SID": {
+          "LABEL": "Messaging Service SID",
+          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "ERROR": "This field is required",
+          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Please enter your Twilio Auth Token",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter a inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+        }
+      },
+      "SMS": {
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
+      },
+      "WHATSAPP": {
+        "TITLE": "WhatsApp Channel",
+        "DESC": "Start supporting your customers via WhatsApp.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "WHATSAPP_CLOUD": "WhatsApp Cloud",
+          "360_DIALOG": "360Dialog"
+        },
+        "INBOX_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "PHONE_NUMBER_ID": {
+          "LABEL": "Phone number ID",
+          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
+          "ERROR": "Please enter a valid value."
+        },
+        "BUSINESS_ACCOUNT_ID": {
+          "LABEL": "Business Account ID",
+          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
+          "ERROR": "Please enter a valid value."
+        },
+        "WEBHOOK_VERIFY_TOKEN": {
+          "LABEL": "Webhook Verify Token",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "ERROR": "Please enter a valid value."
+        },
+        "API_KEY": {
+          "LABEL": "API key",
+          "SUBTITLE": "Configure the WhatsApp API key.",
+          "PLACEHOLDER": "API key",
+          "ERROR": "Please enter a valid value."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+        }
+      },
+      "API_CHANNEL": {
+        "TITLE": "API Channel",
+        "DESC": "Integrate with API channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "PLACEHOLDER": "Webhook URL"
+        },
+        "SUBMIT_BUTTON": "Create API Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the api channel"
+        }
+      },
+      "EMAIL_CHANNEL": {
+        "TITLE": "Email Channel",
+        "DESC": "Integrate you email inbox.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email",
+          "SUBTITLE": "Email where your customers sends you support tickets",
+          "PLACEHOLDER": "Email"
+        },
+        "SUBMIT_BUTTON": "Create Email Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the email channel"
+        },
+        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+      },
+      "LINE_CHANNEL": {
+        "TITLE": "LINE Channel",
+        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "LINE_CHANNEL_ID": {
+          "LABEL": "LINE Channel ID",
+          "PLACEHOLDER": "LINE Channel ID"
+        },
+        "LINE_CHANNEL_SECRET": {
+          "LABEL": "LINE Channel Secret",
+          "PLACEHOLDER": "LINE Channel Secret"
+        },
+        "LINE_CHANNEL_TOKEN": {
+          "LABEL": "LINE Channel Token",
+          "PLACEHOLDER": "LINE Channel Token"
+        },
+        "SUBMIT_BUTTON": "Create LINE Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+        }
+      },
+      "TELEGRAM_CHANNEL": {
+        "TITLE": "Telegram Channel",
+        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "BOT_TOKEN": {
+          "LABEL": "Bot Token",
+          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "PLACEHOLDER": "Bot Token"
+        },
+        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Choose a channel",
+        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+      },
+      "AGENTS": {
+        "TITLE": "Agents",
+        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
+        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "PICK_AGENTS": "Pick agents for the inbox"
+      },
+      "DETAILS": {
+        "TITLE": "Inbox Details",
+        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+      },
+      "FINISH": {
+        "TITLE": "Nailed It!",
+        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Authenticating you with Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Creating your Inbox...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Inbox..."
+    },
+    "FINISH": {
+      "TITLE": "Your Inbox is ready!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "BUTTON_TEXT": "Take me there",
+      "MORE_SETTINGS": "More settings",
+      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+    },
+    "REAUTH": "Reauthorize",
+    "VIEW": "View",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
+        "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CSAT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_HMAC": {
+        "LABEL": "Enable"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later.",
+        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
+        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+      }
+    },
+    "TABS": {
+      "SETTINGS": "Settings",
+      "COLLABORATORS": "Collaborators",
+      "CONFIGURATION": "Configuration",
+      "CAMPAIGN": "Campaigns",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
+    },
+    "SETTINGS": "Settings",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
+    },
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "INBOX_AGENTS": "Agents",
+      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "ENABLE_CSAT": "Enable CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
+      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
+      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
+      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_TITLE": "API Key"
+    },
+    "AUTO_ASSIGNMENT": {
+      "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
+      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
+      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre chat message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      },
+      "ALL_DAY": "All-Day"
+    },
+    "IMAP": {
+      "TITLE": "IMAP",
+      "SUBTITLE": "Set your IMAP details",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
+      "UPDATE": "Update IMAP settings",
+      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "EDIT": {
+        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
+        "ERROR_MESSAGE": "Unable to update IMAP settings"
+      },
+      "ADDRESS": {
+        "LABEL": "Address",
+        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+      },
+      "PORT": {
+        "LABEL": "Port",
+        "PLACE_HOLDER": "Port"
+      },
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "ENABLE_SSL": "Enable SSL"
+    },
+    "SMTP": {
+      "TITLE": "SMTP",
+      "SUBTITLE": "Set your SMTP details",
+      "UPDATE": "Update SMTP settings",
+      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
+      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "EDIT": {
+        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
+        "ERROR_MESSAGE": "Unable to update SMTP settings"
+      },
+      "ADDRESS": {
+        "LABEL": "Address",
+        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+      },
+      "PORT": {
+        "LABEL": "Port",
+        "PLACE_HOLDER": "Port"
+      },
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACE_HOLDER": "Domain"
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrationApps.json b/app/javascript/dashboard/i18n/locale/ka/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
new file mode 100644
index 000000000..6c6cecde9
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -0,0 +1,135 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Events",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Conversation Created",
+            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
+            "CONVERSATION_UPDATED": "Conversation Updated",
+            "MESSAGE_CREATED": "Message created",
+            "MESSAGE_UPDATED": "Message updated",
+            "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Example: https://example/api/webhook",
+          "ERROR": "Please enter a valid URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create webhook"
+      },
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "LOADING": "Fetching attached webhooks",
+      "SEARCH_404": "There are no items matching this query",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
+      "LIST": {
+        "404": "There are no webhooks configured for this account.",
+        "TITLE": "Manage webhooks",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "SLACK": {
+      "HELP_TEXT": {
+        "TITLE": "Using Slack Integration",
+        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DASHBOARD_APPS": {
+      "TITLE": "Dashboard Apps",
+      "HEADER_BTN_TXT": "Add a new dashboard app",
+      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
+      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "LIST": {
+        "404": "There are no dashboard apps configured on this account yet",
+        "LOADING": "Fetching dashboard apps...",
+        "TABLE_HEADER": [
+          "Name",
+          "Endpoint"
+        ],
+        "EDIT_TOOLTIP": "Edit app",
+        "DELETE_TOOLTIP": "Delete app"
+      },
+      "FORM": {
+        "TITLE_LABEL": "Name",
+        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
+        "TITLE_ERROR": "A name for the dashboard app is required",
+        "URL_LABEL": "Endpoint",
+        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
+        "URL_ERROR": "A valid URL is required"
+      },
+      "CREATE": {
+        "HEADER": "Add a new dashboard app",
+        "FORM_SUBMIT": "Submit",
+        "FORM_CANCEL": "Cancel",
+        "API_SUCCESS": "Dashboard app configured successfully",
+        "API_ERROR": "We couldn't create an app. Please try again later"
+      },
+      "UPDATE": {
+        "HEADER": "Edit dashboard app",
+        "FORM_SUBMIT": "Update",
+        "FORM_CANCEL": "Cancel",
+        "API_SUCCESS": "Dashboard app updated successfully",
+        "API_ERROR": "We couldn't update the app. Please try again later"
+      },
+      "DELETE": {
+        "CONFIRM_YES": "Yes, delete it",
+        "CONFIRM_NO": "No, keep it",
+        "TITLE": "Confirm deletion",
+        "MESSAGE": "Are you sure to delete the app - %{appName}?",
+        "API_SUCCESS": "Dashboard app deleted successfully",
+        "API_ERROR": "We couldn't delete the app. Please try again later"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ka/labelsMgmt.json
new file mode 100644
index 000000000..db12fa32a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/labelsMgmt.json
@@ -0,0 +1,70 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "LIST": {
+      "404": "There are no labels available in this account.",
+      "TITLE": "Manage labels",
+      "DESC": "Labels let you group the conversations together.",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add label",
+      "DESC": "Labels let you group the conversations together.",
+      "API": {
+        "SUCCESS_MESSAGE": "Label added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit label",
+      "API": {
+        "SUCCESS_MESSAGE": "Label updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/login.json b/app/javascript/dashboard/i18n/locale/ka/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Login to Chatwoot",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Email eg: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
+    },
+    "FORGOT_PASSWORD": "Forgot your password?",
+    "CREATE_NEW_ACCOUNT": "Create new account",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/report.json b/app/javascript/dashboard/i18n/locale/ka/report.json
new file mode 100644
index 000000000..0bd9b544d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/report.json
@@ -0,0 +1,447 @@
+{
+  "REPORT": {
+    "HEADER": "Conversations",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First Response Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    },
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "DURATION_FILTER_LABEL": "Duration",
+    "GROUP_BY_DAY_OPTIONS": [
+      {
+        "id": 1,
+        "groupBy": "Day"
+      }
+    ],
+    "GROUP_BY_WEEK_OPTIONS": [
+      {
+        "id": 1,
+        "groupBy": "Day"
+      },
+      {
+        "id": 2,
+        "groupBy": "Week"
+      }
+    ],
+    "GROUP_BY_MONTH_OPTIONS": [
+      {
+        "id": 1,
+        "groupBy": "Day"
+      },
+      {
+        "id": 2,
+        "groupBy": "Week"
+      },
+      {
+        "id": 3,
+        "groupBy": "Month"
+      }
+    ],
+    "GROUP_BY_YEAR_OPTIONS": [
+      {
+        "id": 1,
+        "groupBy": "Day"
+      },
+      {
+        "id": 2,
+        "groupBy": "Week"
+      },
+      {
+        "id": 3,
+        "groupBy": "Month"
+      },
+      {
+        "id": 4,
+        "groupBy": "Year"
+      }
+    ],
+    "BUSINESS_HOURS": "Business Hours"
+  },
+  "AGENT_REPORTS": {
+    "HEADER": "Agents Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "FILTER_DROPDOWN_LABEL": "Select Agent",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First Response Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "LABEL_REPORTS": {
+    "HEADER": "Labels Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
+    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First Response Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "INBOX_REPORTS": {
+    "HEADER": "Inbox Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
+    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First Response Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "TEAM_REPORTS": {
+    "HEADER": "Team Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
+    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First Response Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "CSAT_REPORTS": {
+    "HEADER": "CSAT Reports",
+    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
+    "FILTERS": {
+      "AGENTS": {
+        "PLACEHOLDER": "Choose Agents"
+      }
+    },
+    "TABLE": {
+      "HEADER": {
+        "CONTACT_NAME": "Contact",
+        "AGENT_NAME": "Assigned agent",
+        "RATING": "Rating",
+        "FEEDBACK_TEXT": "Feedback comment"
+      }
+    },
+    "METRIC": {
+      "TOTAL_RESPONSES": {
+        "LABEL": "Total responses",
+        "TOOLTIP": "Total number of responses collected"
+      },
+      "SATISFACTION_SCORE": {
+        "LABEL": "Satisfaction score",
+        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+      },
+      "RESPONSE_RATE": {
+        "LABEL": "Response rate",
+        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+      }
+    }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Overview",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Open",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Unassigned"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Agent",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Busy",
+      "OFFLINE": "Offline"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/resetPassword.json b/app/javascript/dashboard/i18n/locale/ka/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "Reset Password",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Please enter your email",
+      "ERROR": "Please enter a valid email"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json
new file mode 100644
index 000000000..ec2d94744
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json
@@ -0,0 +1,23 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
new file mode 100644
index 000000000..7994321cc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -0,0 +1,269 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "DELETE_AVATAR": "Delete Avatar",
+    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
+    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices.",
+        "BTN_TEXT": "Change password"
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "NONE": "None",
+        "ASSIGNED": "Assigned Conversations",
+        "ALL_CONVERSATIONS": "All Conversations"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Email Notifications",
+        "NOTE": "Update your email notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Push Notifications",
+        "NOTE": "Update your push notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your full name",
+        "ERROR": "Please enter a valid full name",
+        "PLACEHOLDER": "Please enter your full name"
+      },
+      "DISPLAY_NAME": {
+        "LABEL": "Display name",
+        "ERROR": "Please enter a valid display name",
+        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          "Online",
+          "Busy",
+          "Offline"
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Your email address",
+        "ERROR": "Please enter a valid email address",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
+      "PASSWORD": {
+        "LABEL": "New password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your new password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "CONTACT_SUPPORT": "Contact Support",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now",
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
+    "CONVERSATIONS": "Conversations",
+    "ALL_CONVERSATIONS": "All Conversations",
+    "MENTIONED_CONVERSATIONS": "Mentions",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "CONTACTS": "Contacts",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "NOTIFICATIONS": "Notifications",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
+    "LABELS": "Labels",
+    "CUSTOM_ATTRIBUTES": "Custom Attributes",
+    "AUTOMATION": "Automation",
+    "TEAMS": "Teams",
+    "BILLING": "Billing",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
+    "ALL_CONTACTS": "All Contacts",
+    "TAGGED_WITH": "Tagged with",
+    "NEW_LABEL": "New label",
+    "NEW_TEAM": "New team",
+    "NEW_INBOX": "New inbox",
+    "REPORTS_CONVERSATION": "Conversations",
+    "CSAT": "CSAT",
+    "CAMPAIGNS": "Campaigns",
+    "ONGOING": "Ongoing",
+    "ONE_OFF": "One off",
+    "REPORTS_AGENT": "Agents",
+    "REPORTS_LABEL": "Labels",
+    "REPORTS_INBOX": "Inbox",
+    "REPORTS_TEAM": "Team",
+    "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+  },
+  "CREATE_ACCOUNT": {
+    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NEW_ACCOUNT": "New Account",
+    "SELECTOR_SUBTITLE": "Create a new account",
+    "API": {
+      "SUCCESS_MESSAGE": "Account created successfully",
+      "EXIST_MESSAGE": "Account already exists",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Account Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "Submit"
+    }
+  },
+  "KEYBOARD_SHORTCUTS": {
+    "TITLE": {
+      "OPEN_CONVERSATION": "Open conversation",
+      "RESOLVE_AND_NEXT": "Resolve and move to next",
+      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
+      "RESOLVE_CONVERSATION": "Resolve Conversation",
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "ADD_ATTACHMENT": "Add Attachment",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "TOGGLE_SIDEBAR": "Toggle Sidebar",
+      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
+      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
+      "GO_TO_SETTINGS": "Go to Settings",
+      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
+      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
+      "SWITCH_TO_REPLY": "Switch to Reply",
+      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+    },
+    "KEYS": {
+      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
+      "ALT_OR_OPTION_KEY": "Alt / ⌥",
+      "FORWARD_SLASH_KEY": "/"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/signup.json b/app/javascript/dashboard/i18n/locale/ka/signup.json
new file mode 100644
index 000000000..8dd5c0d4e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/signup.json
@@ -0,0 +1,39 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Register an account",
+    "TITLE": "Register",
+    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Account name",
+      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
+      "ERROR": "Account name is too short"
+    },
+    "FULL_NAME": {
+      "LABEL": "Full name",
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Work email",
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Email address is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ka/teamsSettings.json
new file mode 100644
index 000000000..f9ecaaaae
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/teamsSettings.json
@@ -0,0 +1,125 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/webhooks.json b/app/javascript/dashboard/i18n/locale/ka/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ka/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/whatsappTemplates.json
@@ -0,0 +1,25 @@
+{
+    "WHATSAPP_TEMPLATES": {
+        "MODAL": {
+            "TITLE": "Whatsapp Templates",
+            "SUBTITLE": "Select the whatsapp template you want to send",
+            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+        },
+        "PICKER": {
+            "SEARCH_PLACEHOLDER": "Search Templates",
+            "NO_TEMPLATES_FOUND": "No templates found for",
+            "LABELS": {
+                "LANGUAGE": "Language",
+                "TEMPLATE_BODY": "Template Body",
+                "CATEGORY": "Category"
+            }
+        },
+        "PARSER": {
+            "VARIABLES_LABEL": "Variables",
+            "VARIABLE_PLACEHOLDER": "Enter %{variable} value",
+            "GO_BACK_LABEL": "Go Back",
+            "SEND_MESSAGE_LABEL": "Send Message",
+            "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index a2fb3f2e5..45a8c66f7 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "클립보드에 성공적으로 복사됨",
     "COMPANY": "회사",
     "LOCATION": "장소",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "대화 자세히",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "브라우저",
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 170cab627..21f761cfb 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "왼쪽 창에서 대화를 선택하십시오.",
+    "SELECT_A_CONVERSATION": "왼쪽 창에서 대화를 선택하십시오.",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "어라! 받은 메시지함에 고객의 메시지가 없는 것 같아요.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "개인 노트: 귀하와 귀하의 팀만 볼 수 있음",
     "CHANGE_STATUS": "대화 상태가 변경됨",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "대화 담당자가 변경됨",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "대화 담당자가 변경됨",
     "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index c1d4eeb53..6ec43ced4 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "설정",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "취소",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "설정"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "이름",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "삭제",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "이름",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "취소"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "상태",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "이름",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "내용",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "취소"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index e61f1de15..49bf52858 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "설치",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "대화 전 설문",
-      "BUSINESS_HOURS": "영업시간"
+      "BUSINESS_HOURS": "영업시간",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "설정",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "웹사이트 이름",
+          "PLACE_HOLDER": "웹사이트 이름 입력 (예: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "헤드라인 입력",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "태그라인 입력",
+          "PLACE_HOLDER": "우리는 간단하게 우리와 연결되도록 합니다. 우리에게 무엇이든 물어보거나 피드백을 공유하십시오."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "몇 분 후에",
+          "IN_A_FEW_HOURS": "몇 시간 안에",
+          "IN_A_DAY": "며칠 안에"
+        },
+        "WIDGET_COLOR_LABEL": "위젯 색깔",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "채팅하기",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "채팅하기"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "보통 몇 분 안에 응답",
+        "IN_A_FEW_HOURS": "보통 몇 시간 내에 응답",
+        "IN_A_DAY": "보통 하루 안에 응답"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "대화 시작",
+        "CHAT_INPUT_PLACEHOLDER": "메시지 입력"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "부재중"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Chatwoot 작동중",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 3afa563dd..d534cc099 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "일 평가판이 남아 있습니다.",
     "TRAIL_BUTTON": "지금 구입하기",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "사용자 지정 특성",
     "AUTOMATION": "Automation",
     "TEAMS": "팀",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "페이스북 연결이 만료되었습니다. 서비스를 계속하려면 페이스북 페이지를 다시 연결하십시오."
+    "FACEBOOK_REAUTHORIZE": "페이스북 연결이 만료되었습니다. 서비스를 계속하려면 페이스북 페이지를 다시 연결하십시오.",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "채팅하기"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 2833e37d8..0bc399ba1 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index c38fb16a4..7adac123f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
index 3605814c6..3878cef01 100644
--- a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index e849d0e67..09a6210da 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 977f9e50d..7994321cc 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 17f55dffc..64cbfeb8f 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "ക്ലിപ്പ്ബോർഡിലേക്ക് വിജയകരമായി പകർത്തി",
     "COMPANY": "കമ്പനി",
     "LOCATION": "സ്ഥാനം",
+    "BROWSER_LANGUAGE": "ബ്രൗസറിന്റെ ഭാഷ",
     "CONVERSATION_TITLE": "സംഭാഷണ വിശദാംശങ്ങൾ",
     "VIEW_PROFILE": "വ്യക്തിവിവരങ്ങൾ കാണുക",
     "BROWSER": "ബ്രൗസർ",
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 0f95236b7..f6b76df89 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "ഇടത് പാളിയിൽ നിന്ന് ഒരു സംഭാഷണം തിരഞ്ഞെടുക്കുക",
+    "SELECT_A_CONVERSATION": "ഇടത് പാളിയിൽ നിന്ന് ഒരു സംഭാഷണം തിരഞ്ഞെടുക്കുക",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "നിങ്ങളുടെ ഇൻ‌ബോക്സിൽ ഉപഭോക്താക്കളിൽ നിന്ന് സന്ദേശങ്ങളൊന്നും ഇല്ലെന്ന് തോന്നുന്നു.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "സംഭാഷണം വീണ്ടും തുറക്കുക",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "സ്വകാര്യ കുറിപ്പ്: നിങ്ങൾക്കും നിങ്ങളുടെ ടീമിനും മാത്രം ദൃശ്യമാണ്",
     "CHANGE_STATUS": "സംഭാഷണ നില മാറ്റി",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "സംഭാഷണ നിയുക്തനെ മാറ്റി",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index 18ee082bd..880e42683 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "ക്രമീകരണങ്ങൾ",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "സജീവമാണ്",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "റദ്ദാക്കുക",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "ക്രമീകരണങ്ങൾ"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "പേര്",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "ഇല്ലാതാക്കുക",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "പേര്",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "നാമം ആവശ്യമാണ്"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "റദ്ദാക്കുക"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "തലക്കെട്ട്",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "സ്റ്റാറ്റസ്",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "പേര്",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "നാമം ആവശ്യമാണ്"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "വിവരണം",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "വിവരണം ആവശ്യമാണ്"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "റദ്ദാക്കുക"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 52433ffb4..06c54bdaf 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "പ്രചാരണങ്ങൾ",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "വെബ്‌സൈറ്റിന്റെ പേര്",
+          "PLACE_HOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റിന്റെ പേര് നൽകുക (ഉദാ: പുണ്ണ്യാളൻ അഗർബത്തീസ്)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "സ്വാഗത തലക്കെട്ട്",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "ടാഗ്‌ലൈൻ സ്വാഗതം",
+          "PLACE_HOLDER": "ഞങ്ങളുമായി കണക്റ്റുചെയ്യുന്നത് ഞങ്ങൾ ലളിതമാക്കുന്നു. ഞങ്ങളോട് എന്തും ചോദിക്കുക, അല്ലെങ്കിൽ നിങ്ങളുടെ ഫീഡ്‌ബാക്ക് പങ്കിടുക."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "വിജറ്റ് നിറം",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "ഞങ്ങളുമായി ചാറ്റുചെയ്യുക",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "ഞങ്ങളുമായി ചാറ്റുചെയ്യുക"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "സാധാരണയായി കുറച്ച് മിനിറ്റിനുള്ളിൽ മറുപടി നൽകുന്നു",
+        "IN_A_FEW_HOURS": "സാധാരണയായി കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു",
+        "IN_A_DAY": "സാധാരണയായി ഒരു ദിവസത്തിൽ മറുപടി നൽകുന്നു"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "സംഭാഷണം ആരംഭിക്കുക",
+        "CHAT_INPUT_PLACEHOLDER": "നിങ്ങളുടെ സന്ദേശം ടൈപ്പുചെയ്യുക"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "ഞങ്ങൾ ഇപ്പോൾ അകലെയാണ്"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "പ്രായോജകർ Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 99c95a71e..3bdfd1e49 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "ദിവസത്തെ ട്രയൽ ശേഷിക്കുന്നു.",
     "TRAIL_BUTTON": "ഇപ്പോൾ വാങ്ങുക",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "ഫോൾഡറുകൾ",
     "CUSTOM_VIEWS_SEGMENTS": "അംശങ്ങൾ",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "അവലോകനം",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "ഞങ്ങളുമായി ചാറ്റുചെയ്യുക"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 59ddae0b7..02e7d2b29 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 1fb484706..e07cd3150 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index 3605814c6..3878cef01 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index e849d0e67..c8a4c04a7 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "हामीसँग कुराकानी गर्नुहोस्",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "हामीसँग कुराकानी गर्नुहोस्"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "धेरै जसो केहि मिनेटमा जवाफ हुन्छ",
+        "IN_A_FEW_HOURS": "धेरै जसो केहि घण्टामा जवाफ हुन्छ",
+        "IN_A_DAY": "धेरै जसो एक दिनमा जवाफ हुन्छ"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "कुराकानी सुरु गर्नुहोस्",
+        "CHAT_INPUT_PLACEHOLDER": "तपाईंको सन्देश टाइप गर्नुहोस्"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Chatwoot द्वारा संचालित",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index cd27d2119..991466d0e 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "हामीसँग कुराकानी गर्नुहोस्"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 39ed883ee..3a5ebf083 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Succesvol gekopieerd naar klembord",
     "COMPANY": "Bedrijfsnaam",
     "LOCATION": "Locatie",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Gesprekdetails",
     "VIEW_PROFILE": "Profiel Bekijken",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 06f6142b7..04a979538 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Selecteer een gesprek in het linker paneel",
+    "SELECT_A_CONVERSATION": "Selecteer een gesprek in het linker paneel",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Oh oh! Het lijkt erop dat er geen berichten van klanten in uw inbox staan.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Heropen gesprek",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privéopmerking: alleen zichtbaar voor jou en je team",
     "CHANGE_STATUS": "Gespreksstatus veranderd",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Toegewezen persoon voor dit gesprek is veranderd",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 13a9fc867..4aa60809c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Instellingen",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Annuleren",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Instellingen"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Naam",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Verwijderen",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Naam",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Annuleren"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Naam",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Beschrijving",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Annuleren"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index aa520bb5c..874b17495 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Instellingen",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website naam",
+          "PLACE_HOLDER": "Voer de naam van je website in (bv. Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welkom op titel",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welkom Tagline",
+          "PLACE_HOLDER": "We maken het eenvoudig om met ons te verbinden. Vraag ons iets of deel uw feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Kleur van widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat met ons",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat met ons"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Reageert meestal binnen een paar minuten",
+        "IN_A_FEW_HOURS": "Reageert meestal binnen een paar uur",
+        "IN_A_DAY": "Reageert meestal binnen een dag"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Chat",
+        "CHAT_INPUT_PLACEHOLDER": "Typ uw bericht"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Op dit moment zijn we niet aanwezig"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Mogelijk gemaakt door Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index e5f585bc3..8e4e881ba 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dagen proefperiode resterend.",
     "TRAIL_BUTTON": "Nu kopen",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat met ons"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 99c55790e..31754ebc8 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Kopiert til utklippstavle",
     "COMPANY": "Firma",
     "LOCATION": "Plassering",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Samtaledetaljer",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Nettleser",
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 43ae32b9c..d875f98f4 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Velg en samtale fra venstre panel",
+    "SELECT_A_CONVERSATION": "Velg en samtale fra venstre panel",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Å nei! Ser ut til at det ikke er noen meldinger fra kunder i innboksen din.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privat notat: bare synlig for deg og ditt team",
     "CHANGE_STATUS": "Samtalestatus er endret",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Tildelt agent er endret",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index d57887a39..658c74b8e 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Innstillinger",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Avbryt",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Innstillinger"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Navn",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Slett",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Navn",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Avbryt"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Satus",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Navn",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Beskrivelse",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Avbryt"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index eda26a34d..3a7e0b068 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfigurasjon",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Innstillinger",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nettstedsnavn",
+          "PLACE_HOLDER": "Angi navnet på nettsiden (f. eks.: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Velkomsttittel",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Velkomsthilsen undertittel",
+          "PLACE_HOLDER": "Det skal være lett å kontakte oss. Spør oss om hva som helst, eller del din tilbakemelding."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Om noen få minutter",
+          "IN_A_FEW_HOURS": "Om noen få timer",
+          "IN_A_DAY": "Om en dag"
+        },
+        "WIDGET_COLOR_LABEL": "Widget farge",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat med oss",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat med oss"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Svarer vanligvis innen et par timer",
+        "IN_A_FEW_HOURS": "Svarer vanligvis innen et par timer",
+        "IN_A_DAY": "Svarer vanligvis innen en dag"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start samtale",
+        "CHAT_INPUT_PLACEHOLDER": "Skriv inn meldingen"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Vi er for øyeblikket borte"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Drevet av Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 813187130..342296c45 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dager gjenværende av prøveperioden.",
     "TRAIL_BUTTON": "Kjøp nå",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Egendefinerte verdier",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Facebook-tilkoblingen din er utløpt, koble til Facebook-siden din for å fortsette tjenester"
+    "FACEBOOK_REAUTHORIZE": "Facebook-tilkoblingen din er utløpt, koble til Facebook-siden din for å fortsette tjenester",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat med oss"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 3110394fe..ee909d0a8 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Pomyślnie skopiowano do schowka",
     "COMPANY": "Firma",
     "LOCATION": "Lokalizacja",
+    "BROWSER_LANGUAGE": "Język przeglądarki",
     "CONVERSATION_TITLE": "Szczegóły konwersacji",
     "VIEW_PROFILE": "Pokaż profil",
     "BROWSER": "Przeglądarki",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 17af3c110..cdab7ccb8 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Wybierz rozmowę z lewej strony",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Tożsamość tego użytkownika nie jest zweryfikowana",
     "NO_MESSAGE_1": "Ups! Wygląda na to, że nie ma wiadomości od klientów w Twojej skrzynce odbiorczej.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Następny tydzień"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Oznacz jako oczekujące",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Otwórz ponownie rozmowę",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Do następnej odpowiedzi",
+        "TOMORROW": "Do jutra",
+        "NEXT_WEEK": "Do następnego tygodnia"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Prywatna uwaga: widoczne tylko dla Ciebie i twojego zespołu",
     "CHANGE_STATUS": "Status konwersacji zmieniony",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Osoba przypisana do konwersacji zmieniona",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Zespół konwersacji został zmieniony",
     "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index 1403491f6..515a3899c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Ustawienia",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "aktywna",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Anuluj",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Ustawienia"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nazwa",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Usuń",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nazwa",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Nazwa jest wymagana"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Anuluj"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Tytuł",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nazwa",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Nazwa jest wymagana"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Opis",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Opis jest wymagany"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Anuluj"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index d8bd75368..5f1783801 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfiguracja",
       "CAMPAIGN": "Kampania",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Godziny pracy"
+      "BUSINESS_HOURS": "Godziny pracy",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Ustawienia",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Otwórz tryb weryfikacji SSL",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nazwa strony",
+          "PLACE_HOLDER": "Wprowadź nazwę swojej strony (np. Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Nagłówek powitalny",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Tagline powitalny",
+          "PLACE_HOLDER": "Łatwo się z nami połączyć. Zapytaj nas o coś lub podziel się swoją opinią."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "W ciągu kilku minut",
+          "IN_A_FEW_HOURS": "W ciągu kilku godzin",
+          "IN_A_DAY": "W ciągu dnia"
+        },
+        "WIDGET_COLOR_LABEL": "Kolor widżetu",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Porozmawiaj z nami",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Porozmawiaj z nami"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Zwykle odpowiadamy w ciągu paru minut",
+        "IN_A_FEW_HOURS": "Zwykle odpowiadamy w ciągu paru godzin",
+        "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Rozpocznij rozmowę",
+        "CHAT_INPUT_PLACEHOLDER": "Wpisz treść wiadomości"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "W tej chwili jesteśmy niedostępni"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Napędzany przez Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index a2a857c81..3c048ac85 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
     "AUTOMATION": "Automatyzacja",
     "TEAMS": "Zespoły",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Porozmawiaj z nami"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index fc879b5a5..6c53e4882 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copiado para área de transferência com sucesso",
     "COMPANY": "Empresa",
     "LOCATION": "Localização",
+    "BROWSER_LANGUAGE": "Idioma do Navegador",
     "CONVERSATION_TITLE": "Detalhes da conversa",
     "VIEW_PROFILE": "Ver Perfil",
     "BROWSER": "Navegador",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index a5ae9d6ee..9a0a3abce 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Por favor, selecione uma conversa no painel da esquerda",
+    "SELECT_A_CONVERSATION": "Por favor, selecione uma conversa no painel da esquerda",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "A identidade deste usuário não foi verificada",
     "NO_MESSAGE_1": "Oh oh! Parece que não há mensagens de clientes na sua caixa de entrada.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Marcar como pendente",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reabrir conversa",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Até à próxima resposta",
+        "TOMORROW": "Até amanhã",
+        "NEXT_WEEK": "Até à próxima semana"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Assinatura da mensagem",
       "ENABLE_SIGN_TOOLTIP": "Habilitar assinatura",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Nota Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa alterado",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Responsável da conversa alterado",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Equipa de conversação alterada",
     "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 5a685852d..90e2d8e99 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Confirgurações",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "ativa",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "cancelar",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Confirgurações"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nome:",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "excluir",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nome:",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Nome é obrigatório"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Nome",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "SItuação",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nome:",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Nome é obrigatório"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descrição",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Descrição é obrigatória"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index b9a27de3b..0c420d926 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuração",
       "CAMPAIGN": "Campanhas",
       "PRE_CHAT_FORM": "Formulário pré-chat",
-      "BUSINESS_HOURS": "Horário comercial"
+      "BUSINESS_HOURS": "Horário comercial",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Confirgurações",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Abrir Modo de Verificação SSL",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nome do site",
+          "PLACE_HOLDER": "Digite o nome do seu site (por exemplo: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Título de Boas-Vindas",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Bem-vindo Slogan",
+          "PLACE_HOLDER": "Nós simplificamos nos conectar com a gente. Pergunte a nós qualquer coisa ou compartilhe seus comentários."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Em poucos minutos",
+          "IN_A_FEW_HOURS": "Em poucas horas",
+          "IN_A_DAY": "Dentro de um dia"
+        },
+        "WIDGET_COLOR_LABEL": "Cor do widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Fale connosco",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Fale connosco"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Normalmente respondemos em poucos minutos",
+        "IN_A_FEW_HOURS": "Normalmente respondemos em poucas horas",
+        "IN_A_DAY": "Normalmente respondemos num dia"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Iniciar Conversa",
+        "CHAT_INPUT_PLACEHOLDER": "Escreva a sua mensagem"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Estamos ausentes"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Desenvolvido por Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 52095c0aa..a8fa35de3 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dias de teste restantes.",
     "TRAIL_BUTTON": "Comprar agora",
-    "DELETED_USER": "Usuário Excluído"
+    "DELETED_USER": "Usuário Excluído",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automatização",
     "TEAMS": "Equipas",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
     "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos os contatos",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Defina-se como",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Visão geral",
-    "FACEBOOK_REAUTHORIZE": "A sua ligação ao Facebook caducou, volte a ligar a página para poder continuar a utilizar os serviços"
+    "FACEBOOK_REAUTHORIZE": "A sua ligação ao Facebook caducou, volte a ligar a página para poder continuar a utilizar os serviços",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Fale connosco"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Não conseguimos encontrar nenhuma conta do Chatwoot. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index bf10f4b20..7672a7e06 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copiado para área de transferência com sucesso",
     "COMPANY": "Empresa",
     "LOCATION": "Localização",
+    "BROWSER_LANGUAGE": "Idioma do navegador",
     "CONVERSATION_TITLE": "Detalhes da conversa",
     "VIEW_PROFILE": "Visualizar Perfil",
     "BROWSER": "Navegador",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 98d3e771f..88f6bb83e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Por favor, selecione uma conversa no painel da esquerda",
+    "SELECT_A_CONVERSATION": "Por favor, selecione uma conversa no painel da esquerda",
+    "404": "Desculpe, não conseguimos encontrar a conversa. Por favor, tente novamente",
+    "SWITCH_VIEW_LAYOUT": "Alternar o layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Mensagens",
     "UNVERIFIED_SESSION": "A identidade deste usuário não foi verificada",
     "NO_MESSAGE_1": "Oh oh! Parece que não há mensagens de clientes na sua caixa de entrada.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Marcar como pendente",
+      "RESOLVED": "Marcar como resolvido",
+      "REOPEN": "Reabrir conversa",
+      "SNOOZE": {
+        "TITLE": "Adiar",
+        "NEXT_REPLY": "Até a próxima resposta",
+        "TOMORROW": "Até amanhã",
+        "NEXT_WEEK": "Até a próxima semana"
+      },
+      "ASSIGN_AGENT": "Atribuir Agente",
+      "ASSIGN_LABEL": "Atribuir etiqueta",
+      "AGENTS_LOADING": "Carregando agentes...",
+      "ASSIGN_TEAM": "Atribuir equipe",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "ID da conversa %{conversationId} atribuído para \"%{agentName}\"",
+          "FAILED": "Não foi possível atribuir agente. Por favor, tente novamente."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Etiqueta #%{labelName} atribuída para o id de conversa %{conversationId}",
+          "FAILED": "Não foi possível atribuir etiqueta. Por favor, tente novamente."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Equipe %{team} atribuído para o id de conversa %{conversationId}",
+          "FAILED": "Não foi possível atribuir equipe. Por favor, tente novamente."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Assinatura de mensagem",
       "ENABLE_SIGN_TOOLTIP": "Ativar assinatura",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Mensagem Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa mudou",
+    "CHANGE_STATUS_FAILED": "Mudança de status da conversa falhou",
     "CHANGE_AGENT": "Responsável da conversa alterado",
+    "CHANGE_AGENT_FAILED": "Falha ao atribuir outro agente",
+    "ASSIGN_LABEL_SUCCESFUL": "Etiqueta atribuída com sucesso",
+    "ASSIGN_LABEL_FAILED": "Falha ao atribuir etiqueta",
     "CHANGE_TEAM": "Estado da conversa mudou",
     "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index f32c4fb76..0184a1133 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filtrar por",
       "SORT": "Ordenar por",
       "SETTINGS_BUTTON": "Confirgurações",
-      "NEW_BUTTON": "Novo artigo"
+      "NEW_BUTTON": "Novo artigo",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Publicado",
+        "DRAFT": "Rascunho",
+        "ARCHIVED": "Arquivado"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Todos os artigos",
+        "MINE": "Meus Artigos",
+        "DRAFT": "Artigos em rascunho",
+        "ARCHIVED": "Artigos arquivados"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publicar",
@@ -15,10 +26,195 @@
       "SAVING": "Salvando rascunho...",
       "SAVED": "Rascunho salvo"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Configurações de Artigo",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Categoria",
+          "TITLE": "Selecionar categoria",
+          "PLACEHOLDER": "Selecionar categoria",
+          "NO_RESULT": "Nenhuma categoria encontrada",
+          "SEARCH_PLACEHOLDER": "Pesquisar categoria"
+        },
+        "AUTHOR": {
+          "LABEL": "Autor",
+          "TITLE": "Selecionar autor",
+          "PLACEHOLDER": "Selecionar autor",
+          "NO_RESULT": "Nenhum autor encontrado",
+          "SEARCH_PLACEHOLDER": "Pesquisar autor"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Adicionar um meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Adicione suas meta descriptions para melhorar os resultados de SEO..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Adicione meta tags separadas por virgula..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Arquivar artigo",
+        "DELETE": "Excluir artigo"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portais",
+      "NEW_BUTTON": "Novo portal",
+      "ACTIVE_BADGE": "ativo",
+      "CHOOSE_LOCALE_LABEL": "Escolha uma localidade",
+      "LOADING_MESSAGE": "Carregando portais...",
+      "ARTICLES_LABEL": "artigos",
+      "NO_PORTALS_MESSAGE": "Não há portais disponíveis",
+      "ADD_NEW_LOCALE": "Adicionar uma nova localidade",
+      "POPOVER": {
+        "TITLE": "Portais",
+        "PORTAL_SETTINGS": "Configurações do Portal",
+        "SUBTITLE": "Você tem vários portais e pode ter diferentes localidades para cada portal.",
+        "CANCEL_BUTTON_LABEL": "Cancelar",
+        "CHOOSE_LOCALE_BUTTON": "Escolher localidade"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "artigos",
+            "ADD": "Adicionar localidade",
+            "VISIT": "Visitar site",
+            "SETTINGS": "Confirgurações"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Configurações do Portal",
+            "ITEMS": {
+              "NAME": "Nome",
+              "DOMAIN": "Domínio personalizado",
+              "SLUG": "Slug",
+              "TITLE": "Título do portal",
+              "THEME": "Cor do tema",
+              "SUB_TEXT": "Sub texto do Portal"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Localidades disponíveis",
+            "TABLE": {
+              "NAME": "Nome da localidade",
+              "CODE": "Código local",
+              "ARTICLE_COUNT": "No. de artigos",
+              "CATEGORIES": "No. de categorias",
+              "SWAP": "Trocar",
+              "DELETE": "Excluir",
+              "DEFAULT_LOCALE": "Padrão"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Criar um portal",
+        "SUB_TITLE": "Um Centro de Ajuda no Chatwoot é conhecido como um portal. Você pode ter vários portais e pode ter diferentes localidades para cada portal.",
+        "NAME": {
+          "LABEL": "Nome",
+          "PLACEHOLDER": "Nome do portal",
+          "HELP_TEXT": "O nome será usado no portal voltado ao público internamente",
+          "ERROR": "O nome é obrigatório"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Título da Página",
+          "PLACEHOLDER": "Título da página do portal",
+          "HELP_TEXT": "O nome será usado no portal voltado ao público",
+          "ERROR": "Título da página é obrigatório"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug do Portal para URLs",
+          "HELP_TEXT": "app.chatwoot.com/portal/meu-portal",
+          "ERROR": "Slug é obrigatório"
+        },
+        "DOMAIN": {
+          "LABEL": "Domínio personalizado",
+          "PLACEHOLDER": "Domínio personalizado do portal",
+          "HELP_TEXT": "Adicionar somente se você quiser usar um domínio personalizado para seus portais",
+          "ERROR": "Domínio Personalizado é obrigatório"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Link da Página Inicial",
+          "PLACEHOLDER": "Link da página inicial do portal",
+          "HELP_TEXT": "O link usado para retornar do portal para a página inicial.",
+          "ERROR": "O Link da Página Inicial é obrigatório"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Texto do Cabeçalho",
+          "PLACEHOLDER": "Texto do cabeçalho do portal",
+          "HELP_TEXT": "Texto do cabeçalho do portal",
+          "ERROR": "O texto do cabeçalho do Portal é obrigatório"
+        },
+        "BUTTONS": {
+          "CREATE": "Criar portal",
+          "CANCEL": "Cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal criado com sucesso.",
+          "ERROR_MESSAGE": "Não foi possível criar o portal. Tente novamente."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Carregando artigos...",
+      "404": "Nenhum artigo corresponde à sua pesquisa 🔍",
+      "NO_ARTICLES": "Não há artigos disponíveis",
+      "HEADERS": {
+        "TITLE": "Título",
+        "CATEGORY": "Categoria",
+        "READ_COUNT": "Contagem de leituras",
+        "STATUS": "SItuação",
+        "LAST_EDITED": "Última edição"
+      },
       "COLUMNS": {
         "BY": "por"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "O título do artigo vai aqui",
+      "CONTENT_PLACEHOLDER": "Escreva o seu artigo aqui"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Buscar artigos"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Criar uma categoria",
+        "SUB_TITLE": "A categoria será utilizada no portal voltado ao público para categorizar os artigos.",
+        "PORTAL": "Portal",
+        "LOCALE": "Localidade",
+        "NAME": {
+          "LABEL": "Nome",
+          "PLACEHOLDER": "Nome da categoria",
+          "HELP_TEXT": "O nome da categoria será utilizada no portal voltado ao público para categorizar artigos.",
+          "ERROR": "O nome é obrigatório"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Categoria de slug para URLs",
+          "HELP_TEXT": "app.chatwoot.com/portal/meu-portal/en-US/categories/meu-slug",
+          "ERROR": "Slug é obrigatório"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descrição",
+          "PLACEHOLDER": "Forneça uma breve descrição sobre a categoria.",
+          "ERROR": "Descrição obrigatória"
+        },
+        "BUTTONS": {
+          "CREATE": "Criar categoria",
+          "CANCEL": "Cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Categoria criada com sucesso",
+          "ERROR_MESSAGE": "Não é possível criar categoria"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index fd05dcc2e..2325cd722 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuração",
       "CAMPAIGN": "Campanhas",
       "PRE_CHAT_FORM": "Formulário Chat Pré",
-      "BUSINESS_HOURS": "Horário de funcionamento"
+      "BUSINESS_HOURS": "Horário de funcionamento",
+      "WIDGET_BUILDER": "Construtor de Widget"
     },
     "SETTINGS": "Confirgurações",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificação SSL",
       "AUTH_MECHANISM": "Autenticação"
     },
-    "NOTE": "Observação: "
+    "NOTE": "Observação: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Avatar do site",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar excluído com sucesso",
+              "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nome do site",
+          "PLACE_HOLDER": "Informe o nome do seu site (por exemplo: Acme Inc)",
+          "ERROR": "Por favor, insira um nome válido para o website"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Seja bem-vindo",
+          "PLACE_HOLDER": "Olá!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Bem-vindo, saudação",
+          "PLACE_HOLDER": "Nós tornamos simples a conexão conosco. Pergunte qualquer assunto ou compartilhe seus comentários."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Tempo de Resposta",
+          "IN_A_FEW_MINUTES": "Em alguns minutos",
+          "IN_A_FEW_HOURS": "Em algumas horas",
+          "IN_A_DAY": "Em um dia"
+        },
+        "WIDGET_COLOR_LABEL": "Cor do Widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Posição do Balão do Widget",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Tipo de Balão do Widget",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Fale conosco no chat",
+          "LABEL": "Título do disparador da Bolha do Widget",
+          "PLACE_HOLDER": "Fale conosco no chat"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Atualizar configurações do widget",
+          "API": {
+            "SUCCESS_MESSAGE": "Configurações do widget atualizadas com sucesso",
+            "ERROR_MESSAGE": "Não é possível atualizar as configurações do widget"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Pré-visualizar",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Esquerda",
+          "RIGHT": "Direita"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Padrão",
+          "EXPANDED_BUBBLE": "Balão Expandido"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Padrão",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Normalmente responde em alguns minutos",
+        "IN_A_FEW_HOURS": "Responde normalmente em algumas horas",
+        "IN_A_DAY": "Responde normalmente em um dia"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Iniciar Conversa",
+        "CHAT_INPUT_PLACEHOLDER": "Digite sua mensagem"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Estamos On-line",
+          "OFFLINE": "Estamos ausentes no momento"
+        },
+        "USER_MESSAGE": "Oi",
+        "AGENT_MESSAGE": "Olá"
+      },
+      "BRANDING_TEXT": "Desenvolvido por Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index ed53f32a7..a5142033b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dias de teste restantes.",
     "TRAIL_BUTTON": "Comprar agora",
-    "DELETED_USER": "Deletar Usuário"
+    "DELETED_USER": "Deletar Usuário",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Conta Suspensa",
+      "MESSAGE": "Sua conta está suspensa. Por favor, entre em contato com a equipe de suporte para mais informações."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Atributos Personalizados",
     "AUTOMATION": "Automação",
     "TEAMS": "Times",
+    "BILLING": "Cobrança",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
     "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos os Contatos",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Defina como",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Visão geral",
-    "FACEBOOK_REAUTHORIZE": "Sua conexão com o Facebook expirou! Por favor, reconecte sua página do Facebook para continuar os serviços"
+    "FACEBOOK_REAUTHORIZE": "Sua conexão com o Facebook expirou! Por favor, reconecte sua página do Facebook para continuar os serviços",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Todos os artigos",
+      "MY_ARTICLES": "Meus Artigos",
+      "DRAFT": "Rascunho",
+      "ARCHIVED": "Arquivado",
+      "CATEGORY": "Categoria",
+      "CATEGORY_EMPTY_MESSAGE": "Nenhuma categoria encontrada"
+    },
+    "DOCS": "Ler documentos"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Cobrança",
+    "CURRENT_PLAN": {
+      "TITLE": "Plano Atual",
+      "PLAN_NOTE": "Você está atualmente inscrito no plano **%{plan}** com **%{quantity}** licenças"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Gerencie sua assinatura",
+      "DESCRIPTION": "Veja suas faturas anteriores, edite seus detalhes de cobrança, ou cancele sua assinatura.",
+      "BUTTON_TXT": "Ir para o portal de cobrança"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Precisa de ajuda?",
+      "DESCRIPTION": "Você está com algum problema de cobrança? Nós estamos aqui para ajudar.",
+      "BUTTON_TXT": "Fale conosco no chat"
+    },
+    "NO_BILLING_USER": "A sua conta de cobrança está sendo configurada. Atualize a página e tente novamente."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ah oh! Não conseguimos encontrar nenhuma conta. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
index 84c2da9bd..13b959d6b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
@@ -55,7 +55,7 @@
         "TITLE": "Confirmă ștergerea",
         "MESSAGE": "Sigur doriți să ștergeți ",
         "YES": "Da, șterge ",
-        "NO": "Nu, păstreaza"
+        "NO": "Nu, păstreaza "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/chatlist.json b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
index f97c89570..731f0d906 100644
--- a/app/javascript/dashboard/i18n/locale/ro/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
@@ -60,6 +60,6 @@
     "NO_CONTENT": "Nici un conținut disponibil",
     "HIDE_QUOTED_TEXT": "Ascunde textul citat",
     "SHOW_QUOTED_TEXT": "Arată textul citat",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Citește"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index c0c5ad004..2511c9cba 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Cod copiat în clipboard cu succes",
     "COMPANY": "Companie",
     "LOCATION": "Locaţie",
+    "BROWSER_LANGUAGE": "Limba browserului",
     "CONVERSATION_TITLE": "Detalii conversație",
     "VIEW_PROFILE": "Vezi profil",
     "BROWSER": "Navigator",
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index f154dc30e..63017f9aa 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Vă rugăm să selectați o conversație din panoul din stânga",
+    "SELECT_A_CONVERSATION": "Vă rugăm să selectați o conversație din panoul din stânga",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Identitatea acestui utilizator nu este verificată",
     "NO_MESSAGE_1": "Uh oh! Se pare că nu există niciun mesaj de la clienți în căsuța poștală.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Săptămâna viitoare"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Marchează ca în așteptare",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Redeschiderea conversației",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Până la următorul răspuns",
+        "TOMORROW": "Până mâine",
+        "NEXT_WEEK": "Până săptămâna viitoare"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Semnătura mesajului",
       "ENABLE_SIGN_TOOLTIP": "Activarea semnăturii",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Notă privată: vizibilă doar pentru tine și echipa ta",
     "CHANGE_STATUS": "Stare conversație schimbată",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Persoana căreia i-a fost ateribuită conversația a fost schimbată",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Echipa de conversație schimbată",
     "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
     "MESSAGE_ERROR": "Mesajul nu poate fi trimis, te rugăm să încerci din nou mai târziu",
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index 288893889..85e7df216 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Setări",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "activ",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Renunță",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Setări"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Nume",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Şterge",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Nume",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Numele este obligatoriu"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Renunță"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Titlu",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Nume",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Numele este obligatoriu"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descriere",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Descrierea este obligatorie"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Renunță"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index e6bcb1ff4..8ddb95a09 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configurare",
       "CAMPAIGN": "Campanii",
       "PRE_CHAT_FORM": "Formular pre chat",
-      "BUSINESS_HOURS": "Program de lucru"
+      "BUSINESS_HOURS": "Program de lucru",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Setări",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Deschideți modul de verificare SSL",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Nume website",
+          "PLACE_HOLDER": "Introduceți numele website-ului dvs. (de exemplu: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Titlu de salut",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Tagline de Bun Venit",
+          "PLACE_HOLDER": "Noi facem conectarea cu noi simplă. Întreabă-ne orice, sau partajează-ți feedback-ul."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "În câteva minute",
+          "IN_A_FEW_HOURS": "În câteva ore",
+          "IN_A_DAY": "Într-o zi"
+        },
+        "WIDGET_COLOR_LABEL": "Culoare widget",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Discută cu noi",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Discută cu noi"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "De obicei, răspunsurile în câteva minute",
+        "IN_A_FEW_HOURS": "De obicei, răspunsurile în câteva ore",
+        "IN_A_DAY": "De obicei, răspunsurile într-o zi"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Începe conversația",
+        "CHAT_INPUT_PLACEHOLDER": "Scrie mesajul tău"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Suntem plecați în acest moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Oferit de Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index ead10ad2d..e19a39546 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "zile de încercare rămase.",
     "TRAIL_BUTTON": "Cumpara acum",
-    "DELETED_USER": "Utilizator șters"
+    "DELETED_USER": "Utilizator șters",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
     "AUTOMATION": "Automatizare",
     "TEAMS": "Echipe",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Foldere",
     "CUSTOM_VIEWS_SEGMENTS": "Segmente",
     "ALL_CONTACTS": "Toate persoanele de contact",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Setați-vă ca",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Prezentare generală",
-    "FACEBOOK_REAUTHORIZE": "Conexiunea ta de Facebook a expirat, te rugăm să-ți reconectezi pagina de Facebook pentru a continua serviciile"
+    "FACEBOOK_REAUTHORIZE": "Conexiunea ta de Facebook a expirat, te rugăm să-ți reconectezi pagina de Facebook pentru a continua serviciile",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Discută cu noi"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Nu am putut găsi niciun cont Chatwoot. Vă rugăm să creați un cont nou pentru a continua.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index f05d890e6..20c8b4e2d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Скопировано в буфер обмена",
     "COMPANY": "Компания",
     "LOCATION": "Местоположение",
+    "BROWSER_LANGUAGE": "Язык браузера",
     "CONVERSATION_TITLE": "Детали диалога",
     "VIEW_PROFILE": "Просмотр профиля",
     "BROWSER": "Браузер",
@@ -150,8 +151,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Аватар контакта удален",
+        "ERROR_MESSAGE": "Не удалось удалить аватар контакта. Пожалуйста, повторите попытку позже."
       }
     },
     "SUCCESS_MESSAGE": "Контакт успешно сохранен",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 6f1d30332..182d6a64d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Пожалуйста, выберите диалог из левой панели",
+    "SELECT_A_CONVERSATION": "Пожалуйста, выберите диалог из левой панели",
+    "404": "Мы не можем найти разговор. Пожалуйста, попробуйте еще раз",
+    "SWITCH_VIEW_LAYOUT": "Изменить раскладку",
     "DASHBOARD_APP_TAB_MESSAGES": "Сообщения",
     "UNVERIFIED_SESSION": "Подлинность этого пользователя не подтверждена",
     "NO_MESSAGE_1": "Ой! Похоже, сообщений от клиентов нет.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "На следующей неделе"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Отметить как ожидающие",
+      "RESOLVED": "Пометить как разрешено",
+      "REOPEN": "Переоткрыть разговор",
+      "SNOOZE": {
+        "TITLE": "Отложено",
+        "NEXT_REPLY": "До следующего ответа",
+        "TOMORROW": "До завтра",
+        "NEXT_WEEK": "До следующей недели"
+      },
+      "ASSIGN_AGENT": "Назначить агента",
+      "ASSIGN_LABEL": "Назначить метки",
+      "AGENTS_LOADING": "Загрузка агентов...",
+      "ASSIGN_TEAM": "Назначить команду",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "ID разговора %{conversationId} присвоен \"%{agentName}\"",
+          "FAILED": "Не удалось назначить агента. Пожалуйста, попробуйте еще раз."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Назначена метка #%{labelName} в разговор id %{conversationId}",
+          "FAILED": "Не удалось назначить метку. Пожалуйста, попробуйте еще раз."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Назначена метка #%{team} в разговор id %{conversationId}",
+          "FAILED": "Не удалось назначить команду. Пожалуйста, попробуйте еще раз."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Подпись сообщения",
       "ENABLE_SIGN_TOOLTIP": "Включить подпись",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Приватная заметка: видна только вам и вашей команде",
     "CHANGE_STATUS": "Статус разговора изменен",
+    "CHANGE_STATUS_FAILED": "Не удалось изменить статус диалога",
     "CHANGE_AGENT": "Назначенный оператор изменен",
+    "CHANGE_AGENT_FAILED": "Не удалось изменить назначение",
+    "ASSIGN_LABEL_SUCCESFUL": "Метка успешно назначена",
+    "ASSIGN_LABEL_FAILED": "Назначение метки не удалось",
     "CHANGE_TEAM": "Команда назначенная в беседу изменена",
     "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Не удается отправить это сообщение, повторите попытку позже",
diff --git a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
index 596c2289e..0a8f3fc48 100644
--- a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
@@ -1,24 +1,220 @@
 {
   "HELP_CENTER": {
     "HEADER": {
-      "FILTER": "Filter by",
-      "SORT": "Sort by",
+      "FILTER": "Фильтровать по",
+      "SORT": "Сортировать по",
       "SETTINGS_BUTTON": "Настройки",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "Новая статья",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Опубликовано",
+        "DRAFT": "Черновик",
+        "ARCHIVED": "Архив"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Все статьи",
+        "MINE": "Мои статьи",
+        "DRAFT": "Черновики статей",
+        "ARCHIVED": "Архивы статей"
+      }
     },
     "EDIT_HEADER": {
-      "PUBLISH_BUTTON": "Publish",
-      "PREVIEW": "Preview",
-      "ADD_TRANSLATION": "Add translation",
-      "OPEN_SIDEBAR": "Open sidebar",
-      "CLOSE_SIDEBAR": "Close sidebar",
-      "SAVING": "Draft saving...",
-      "SAVED": "Draft saved"
+      "PUBLISH_BUTTON": "Опубликовано",
+      "PREVIEW": "Предпросмотр",
+      "ADD_TRANSLATION": "Добавить перевод",
+      "OPEN_SIDEBAR": "Открыть боковую панель",
+      "CLOSE_SIDEBAR": "Закрыть боковую панель",
+      "SAVING": "Сохранение черновиков...",
+      "SAVED": "Черновик сохранён"
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Категория",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Автор",
+          "TITLE": "Выбрать автора",
+          "PLACEHOLDER": "Выбрать автора",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Портал",
+      "NEW_BUTTON": "Новый портал",
+      "ACTIVE_BADGE": "активно",
+      "CHOOSE_LOCALE_LABEL": "Выберите локаль",
+      "LOADING_MESSAGE": "Загрузка порталов...",
+      "ARTICLES_LABEL": "статьи",
+      "NO_PORTALS_MESSAGE": "Нет доступных порталов",
+      "ADD_NEW_LOCALE": "Добавить новую локаль",
+      "POPOVER": {
+        "TITLE": "Портал",
+        "PORTAL_SETTINGS": "Настройки портала",
+        "SUBTITLE": "У вас есть несколько порталов и могут иметь разные локали для каждого портала.",
+        "CANCEL_BUTTON_LABEL": "Отменить",
+        "CHOOSE_LOCALE_BUTTON": "Выберите локаль"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "статьи",
+            "ADD": "Добавить локали",
+            "VISIT": "Посетить сайт",
+            "SETTINGS": "Настройки"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Конфигурации портала",
+            "ITEMS": {
+              "NAME": "Имя",
+              "DOMAIN": "Свой домен",
+              "SLUG": "Метка",
+              "TITLE": "Название портала",
+              "THEME": "Цвет темы",
+              "SUB_TEXT": "Подтекст портала"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Доступные локали",
+            "TABLE": {
+              "NAME": "Локальное имя",
+              "CODE": "Код локали",
+              "ARTICLE_COUNT": "№ статей",
+              "CATEGORIES": "№ категорий",
+              "SWAP": "Поменять",
+              "DELETE": "Удалить",
+              "DEFAULT_LOCALE": "По умолчанию"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Создать портал",
+        "SUB_TITLE": "Справочный центр в  Chatwoot известен как портал. У вас может быть несколько порталов и может иметь разные доколе для каждого портала.",
+        "NAME": {
+          "LABEL": "Имя",
+          "PLACEHOLDER": "Имя портала",
+          "HELP_TEXT": "Название будет использоваться на публичном портале",
+          "ERROR": "Необходимо указать имя"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Название страницы",
+          "PLACEHOLDER": "Заголовок страницы портала",
+          "HELP_TEXT": "Название будет использоваться на публичном портале",
+          "ERROR": "Необходимо указать название"
+        },
+        "SLUG": {
+          "LABEL": "Метка",
+          "PLACEHOLDER": "Слаг портала для url",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Необходимо указать метку"
+        },
+        "DOMAIN": {
+          "LABEL": "Пользовательский домен",
+          "PLACEHOLDER": "Пользовательский домен портала",
+          "HELP_TEXT": "Добавьте только если вы хотите использовать пользовательский домен для ваших порталов",
+          "ERROR": "Требуется пользовательский домен"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Домашняя ссылка",
+          "PLACEHOLDER": "Ссылка на главную страницу портала",
+          "HELP_TEXT": "Ссылка, используемая для возврата с портала на главную страницу.",
+          "ERROR": "Счалка главной страницы обязательна"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Создать портал",
+          "CANCEL": "Отменить"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Портал создан успешно.",
+          "ERROR_MESSAGE": "Не удалось создать портал. Попробуйте еще раз."
+        }
+      }
     },
     "TABLE": {
+      "LOADING_MESSAGE": "Загрузка статей...",
+      "404": "Нет статей, соответствующих вашему запросу 🔍",
+      "NO_ARTICLES": "Нет доступных статей",
+      "HEADERS": {
+        "TITLE": "Название",
+        "CATEGORY": "Категория",
+        "READ_COUNT": "Счетчик просмотров",
+        "STATUS": "Статус",
+        "LAST_EDITED": "Последнее изменение"
+      },
       "COLUMNS": {
         "BY": "От"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Название статьи",
+      "CONTENT_PLACEHOLDER": "Напишите свою статью здесь"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Поиск статей"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Создать категорию",
+        "SUB_TITLE": "Категория будет использоваться в публичном портале для классификации статей.",
+        "PORTAL": "Портал",
+        "LOCALE": "Local",
+        "NAME": {
+          "LABEL": "Имя",
+          "PLACEHOLDER": "Имя категории",
+          "HELP_TEXT": "Название категории будет использоваться на портале общего доступа для классификации статей.",
+          "ERROR": "Необходимо указать имя"
+        },
+        "SLUG": {
+          "LABEL": "Метка",
+          "PLACEHOLDER": "Метка категории для url",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Необходимо указать метку"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Описание",
+          "PLACEHOLDER": "Укажите краткое описание категории.",
+          "ERROR": "Необходимо описание"
+        },
+        "BUTTONS": {
+          "CREATE": "Создать категорию",
+          "CANCEL": "Отменить"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Категория успешно создана",
+          "ERROR_MESSAGE": "Не удалось создать категорию"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 1f90ce1d4..2dcd87af6 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -112,10 +112,10 @@
           "ERROR": "Это поле обязательно"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "SID службы обмена сообщениями",
+          "PLACEHOLDER": "Пожалуйста, введите SID службы сообщений Twilio",
           "ERROR": "Это поле обязательно",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "Использовать сервис Twilio"
         },
         "CHANNEL_TYPE": {
           "LABEL": "Тип источника",
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Настройки",
       "CAMPAIGN": "Кампании",
       "PRE_CHAT_FORM": "Форма, показываемая перед стартом диалога",
-      "BUSINESS_HOURS": "Время работы"
+      "BUSINESS_HOURS": "Время работы",
+      "WIDGET_BUILDER": "Конструктор виджетов"
     },
     "SETTINGS": "Настройки",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Режим проверки Open SSL",
       "AUTH_MECHANISM": "Авторизация"
     },
-    "NOTE": "Примечание: "
+    "NOTE": "Примечание: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Аватар сайта",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Аватар успешно удален",
+              "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Имя сайта",
+          "PLACE_HOLDER": "Введите имя вашего сайта (например: Acme Inc)",
+          "ERROR": "Пожалуйста, правильно введите имя веб-сайта"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Заголовок приветствия",
+          "PLACE_HOLDER": "Привет!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Текст приветствия",
+          "PLACE_HOLDER": "Связаться с нами просто! Напишите нам, или задайте вопрос."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Время ответа",
+          "IN_A_FEW_MINUTES": "Через несколько минут",
+          "IN_A_FEW_HOURS": "Через несколько часов",
+          "IN_A_DAY": "Через день"
+        },
+        "WIDGET_COLOR_LABEL": "Цвет виджета",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Позиция конструктора виджетов",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Тип рамки для виджета",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Пообщайтесь с нами",
+          "LABEL": "Название виджета",
+          "PLACE_HOLDER": "Пообщайтесь с нами"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Обновить настройки виджета",
+          "API": {
+            "SUCCESS_MESSAGE": "Настройки виджета успешно обновлены",
+            "ERROR_MESSAGE": "Не удается обновить настройки виджета"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Предпросмотр",
+          "SCRIPT": "Скрипт"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Слева",
+          "RIGHT": "Справа"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Стандартный",
+          "EXPANDED_BUBBLE": "Расширенная рамка сообщений"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "По умолчанию",
+        "CHAT": "Чат"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Обычно отвечаем в течение нескольких минут",
+        "IN_A_FEW_HOURS": "Обычно отвечаем в течение нескольких часов",
+        "IN_A_DAY": "Обычно отвечаем в течение дня"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Начать диалог",
+        "CHAT_INPUT_PLACEHOLDER": "Введите сообщение"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Мы в сети",
+          "OFFLINE": "В данный момент мы отсутствуем"
+        },
+        "USER_MESSAGE": "Хай",
+        "AGENT_MESSAGE": "Привет"
+      },
+      "BRANDING_TEXT": "Работает на Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index b1b0cf880..76f1c8ee8 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -105,30 +105,30 @@
         "TITLE_PLACEHOLDER": "Введите имя для вашего приложения",
         "TITLE_ERROR": "Требуется название для панели приложений",
         "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "URL_PLACEHOLDER": "Введите URL-адрес конечной точки, где размещено приложение",
+        "URL_ERROR": "Требуется действительный URL"
       },
       "CREATE": {
         "HEADER": "Добавить новое приложение",
         "FORM_SUBMIT": "Отправить",
         "FORM_CANCEL": "Отменить",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "Приложение панели инструментов успешно настроено",
+        "API_ERROR": "Не удалось обновить настройки входящих сообщений. Пожалуйста, повторите попытку позже"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "Редактировать приложение",
         "FORM_SUBMIT": "Обновить",
         "FORM_CANCEL": "Отменить",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "Приложение панели инструментов успешно обновлено",
+        "API_ERROR": "Не удалось обновить приложение. Повторите попытку позже"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "Да, удалить",
+        "CONFIRM_NO": "Нет, не удалять",
         "TITLE": "Подтвердите удаление",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "MESSAGE": "Вы уверены, что хотите удалить приложение - %{appName}?",
+        "API_SUCCESS": "Приложение успешно удалено",
+        "API_ERROR": "Не удалось удалить приложение. Повторите попытку позже"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index a5788f28c..d4239c0d0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "дней до окончания бесплатного периода.",
     "TRAIL_BUTTON": "Купить",
-    "DELETED_USER": "Удаленный пользователь"
+    "DELETED_USER": "Удаленный пользователь",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Аккаунт заблокирован",
+      "MESSAGE": "Ваша учетная запись приостановлена. Пожалуйста, обратитесь в службу поддержки для получения дополнительной информации."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты",
     "AUTOMATION": "Автоматизация",
     "TEAMS": "Команды",
+    "BILLING": "Платёж",
     "CUSTOM_VIEWS_FOLDER": "Папки",
     "CUSTOM_VIEWS_SEGMENTS": "Сегменты",
     "ALL_CONTACTS": "Все контакты",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Установить себя",
     "BETA": "Бета",
     "REPORTS_OVERVIEW": "Обзор",
-    "FACEBOOK_REAUTHORIZE": "Ваше подключение к Facebook истекло. Пожалуйста, переподключитесь к Facebook для продолжения работы"
+    "FACEBOOK_REAUTHORIZE": "Ваше подключение к Facebook истекло. Пожалуйста, переподключитесь к Facebook для продолжения работы",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Все статьи",
+      "MY_ARTICLES": "Мои статьи",
+      "DRAFT": "Черновик",
+      "ARCHIVED": "Архив",
+      "CATEGORY": "Категория",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Чтение документов"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Платёж",
+    "CURRENT_PLAN": {
+      "TITLE": "Текущий план",
+      "PLAN_NOTE": "На данный момент вы подписаны на ** план%{plan}** с **%{quantity}** лицензиями"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Управление подпиской",
+      "DESCRIPTION": "Просматривайте ваши предыдущие счета, редактируйте платежные реквизиты или отмените подписку.",
+      "BUTTON_TXT": "Перейти на платёжный портал"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Нужна помощь?",
+      "DESCRIPTION": "Вы сталкиваетесь с какими-либо проблемами при оплате? Мы здесь, чтобы помочь.",
+      "BUTTON_TXT": "Пообщайтесь с нами"
+    },
+    "NO_BILLING_USER": "Ваш платёжный счёт настраивается. Пожалуйста, обновите страницу и повторите попытку."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Мы не смогли найти ни одного аккаунта в Chatwoot. Пожалуйста, создайте новый аккаунт, чтобы продолжить.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index d46987fc9..a622799c0 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Úspešne nakopírované",
     "COMPANY": "Spoločnosť",
     "LOCATION": "Lokácia",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Detaily konverzácie",
     "VIEW_PROFILE": "Ukáž profil",
     "BROWSER": "Prehliadač",
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 64d748f97..4518a0e9e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Vyberte si konverzáciu z ľavého panela",
+    "SELECT_A_CONVERSATION": "Vyberte si konverzáciu z ľavého panela",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Totožnosť tohto používateľa nie je overená",
     "NO_MESSAGE_1": "Zdá sa, že v doručenej pošte nemáte žiadne správy od zákazníkov.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Ďalší ťýždeň"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Označiť ako čakajúce na vybavenie",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index 2d531202b..2d0a84602 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Nastavenia",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Zrušiť",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Nastavenia"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Meno",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Vymazať",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Meno",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Zrušiť"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Meno",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Zrušiť"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 69dce84e4..c4f47252b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Uvítací nadpis",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Uvítací slogan",
+          "PLACE_HOLDER": "Spojenie s nami je jednoduché. Spýtajte sa nás na čokoľvek alebo sa podeľte o svoju spätnú väzbu."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "O pár minút",
+          "IN_A_FEW_HOURS": "O pár hodín",
+          "IN_A_DAY": "O deň"
+        },
+        "WIDGET_COLOR_LABEL": "Farba widgetu",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Četujte s nami",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Četujte s nami"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Zvyčajne odpovedá do niekoľkých minút",
+        "IN_A_FEW_HOURS": "Zvyčajne odpovedá do niekoľkých hodín",
+        "IN_A_DAY": "Zvyčajne odpovedá do dňa"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Začať konverzáciu",
+        "CHAT_INPUT_PLACEHOLDER": "Zadajte svoju správu"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Momentálne nie sme k dispozícii"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Používame Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index f8fc86516..18b93f1c0 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Prehľad",
-    "FACEBOOK_REAUTHORIZE": "Vaše pripojenie k Facebooku vypršalo, pre pokračovanie v službách prosím znovu pripojte svoju stránku na Facebooku"
+    "FACEBOOK_REAUTHORIZE": "Vaše pripojenie k Facebooku vypršalo, pre pokračovanie v službách prosím znovu pripojte svoju stránku na Facebooku",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Četujte s nami"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
index 371a74000..41c1d1793 100644
--- a/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
@@ -1,7 +1,7 @@
 {
   "FILTER": {
     "TITLE": "Filtrirajte razgovore",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "SUBTITLE": "Dodajte filtere ispod i kliknite na 'Primeni filtere' da bi ste flitrirali razgovore.",
     "ADD_NEW_FILTER": "Dodajte filter",
     "FILTER_DELETE_ERROR": "Trebali bi da imate barem jedan filter da bi ste ga sačuvali",
     "SUBMIT_BUTTON_LABEL": "Primenite filtere",
@@ -30,7 +30,7 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Ime dodeljenom",
       "INBOX_NAME": "Naziv prijemnog sandučeta",
       "TEAM_NAME": "Naziv tima",
       "CONVERSATION_IDENTIFIER": "Identifikator razgovora",
@@ -43,7 +43,7 @@
       "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
       "CUSTOM_ATTRIBUTE_NUMBER": "Broj",
       "CUSTOM_ATTRIBUTE_LINK": "Veza",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Polje za potvrdu",
       "CREATED_AT": "Kreirano",
       "LAST_ACTIVITY": "Poslednja aktivnost"
     },
diff --git a/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
index 56565177a..aef71c796 100644
--- a/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenti",
     "HEADER_BTN_TXT": "Dodaj agenta",
     "LOADING": "Preuzimanje liste agenata",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "SIDEBAR_TXT": "<p><b>Agenti</b></p> <p> <b>Agent</b> je član vašeg tima korisničke podršek. </p><p> Agenti će biti u mogućnosti da vide i odgovore na poruke od strane vaših korisnika. Spisak prikazuje sve trenutne agente na vašem nalogu. </p><p> Kliknite na <b>Dodaj agenta</b> da bi ste dodali novog agenta. Agent će dobiti e-poruku sa vezom za potvrdu aktiviranja njihovog naloga, nakon čega mogu da pristupe Chatwoot-u i odgovaraju na poruke. </p><p> Pristup mogućnostima Chatwoot-a zavisi od sledećih uloga. </p><p> <b>Agent</b> - Agent sa ovom ulogom može samo da pristupa prijamnim sandučićima, izveštajima i razgovorima. Oni mogu da dodele razgovore drugim agentima ili sami sebi i da rešavaju razgovore.</p><p> <b>Administrator</b> - Administrator ima pristup svim mogućnostima Chatwoot-a koja su aktivirana za vaš nalog, uključujući podešavanjima, pored svih normalnih privilegija agenata.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Administrator",
       "AGENT": "Agent"
diff --git a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
index 490a0123a..ac1ed4f7b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Prilagođeni atributi",
     "HEADER_BTN_TXT": "Dodaj prilagođeni atribut",
     "LOADING": "Prikupljanje prilagođenih atributa",
-    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "SIDEBAR_TXT": "<p><b>Prilagođeni atributi</b> <p>Prilagođeni atribut vodi računa o činjenicama o vašim kontaktima/razgovorima - kao što je pretplatni plan, ili kada su prvi put naručili neki proizvod itd. <br /><br />Da bi ste kreirali prilagođeni atribut, samo kliknite na <b>Dodaj prilagođeni atribut.</b> Takođe možete urediti ili obrisati postojeći Prilagođeni atribut klikom na dugme Uredi ili Obriši.</p>",
     "ADD": {
       "TITLE": "Dodaj prilagođeni atribut",
       "SUBMIT": "Kreiraj",
diff --git a/app/javascript/dashboard/i18n/locale/sr/automation.json b/app/javascript/dashboard/i18n/locale/sr/automation.json
index a75a78483..7ffc19cda 100644
--- a/app/javascript/dashboard/i18n/locale/sr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/automation.json
@@ -1,54 +1,54 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automations",
-    "HEADER_BTN_TXT": "Add Automation Rule",
-    "LOADING": "Fetching automation rules",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "HEADER": "Automatizacije",
+    "HEADER_BTN_TXT": "Dodaj pravilo automatizacije",
+    "LOADING": "Prikupljanje pravila automatizacije",
+    "SIDEBAR_TXT": "<p><b>Pravila automatizacije</b> <p>Automatizacija može da zameni i automatizuje postojeće procese koji zahtevaju ručnu aktivnost. Možete odraditi puno stvari sa automatizacijom, uključujući dodavanje oznaka i dodeljivanje razgovora najboljem agentu. Tako tim može da se usresredi na ono što rade najbolje i provedu što je manje vremena na ručne zadatke.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
-      "SUBMIT": "Create",
+      "TITLE": "Dodaj pravilo automatizacije",
+      "SUBMIT": "Napravi",
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
+          "LABEL": "Naziv pravila",
+          "PLACEHOLDER": "Unesite naziv pravila",
           "ERROR": "Ime je neophodno"
         },
         "DESC": {
-          "LABEL": "Description",
-          "PLACEHOLDER": "Enter rule description",
+          "LABEL": "Opis",
+          "PLACEHOLDER": "Unesite opis pravila",
           "ERROR": "Opis je neophodan"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "Događaj",
           "PLACEHOLDER": "Molim izaberite jedno",
-          "ERROR": "Event is required"
+          "ERROR": "Događaj je obavezan"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Uslovi"
         },
         "ACTIONS": {
           "LABEL": "Akcije"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Dodaj uslov",
+      "ACTION_BUTTON_LABEL": "Dodaj akciju",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Pravilo automatizacije je uspešno dodato",
+        "ERROR_MESSAGE": "Nije bilo moguće napraviti pravilo automatizacije. Molim vas pokušajte ponovo"
       }
     },
     "LIST": {
       "TABLE_HEADER": [
         "Ime",
-        "Description",
-        "Active",
-        "Created on"
+        "Opis",
+        "Aktivno",
+        "Napravljeno"
       ],
-      "404": "No automation rules found"
+      "404": "Nisu pronađena pravila automatizacije"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "Obriši pravilo automatizacije",
       "SUBMIT": "Izbriši",
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "CONFIRM": {
@@ -58,59 +58,59 @@
         "NO": "Ne, zadrži "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Pravilo automatizacije je uspešno obrisano",
+        "ERROR_MESSAGE": "Nije bilo moguće obrisati pravilo automatizacije. Molim vas pokušajte ponovo"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
-      "SUBMIT": "Update",
+      "TITLE": "Uredi pravilo automatizacije",
+      "SUBMIT": "Primeni",
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Pravilo automatizacije je uspešno izmenjeno",
+        "ERROR_MESSAGE": "Nije bilo moguće izmeniti pravilo automatizacije. Molim vas pokušajte ponovo"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Kloniraj",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Automatizacija je uspešno klonirana",
+        "ERROR_MESSAGE": "Nije bilo moguće klonirati pravilo automatizacije. Molim vas pokušajte ponovo"
       }
     },
     "FORM": {
       "EDIT": "Uredi",
-      "CREATE": "Create",
+      "CREATE": "Napravi",
       "DELETE": "Izbriši",
       "CANCEL": "Otkaži",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "Promena tipa događaja će resetovati uslove i događaje koje ste dodali ispod"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+      "DELETE_MESSAGE": "Morate imati barem jedan uslov da bi ste mogli da sačuvate"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save",
-      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
-      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+      "DELETE_MESSAGE": "Morate imati barem jednu akciju da bi ste mogli da sačuvate",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Unesite ovde vašu poruku",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Izaberite timove"
     },
     "TOGGLE": {
-      "ACTIVATION_TITLE": "Activate Automation Rule",
-      "DEACTIVATION_TITLE": "Deactivate Automation Rule",
-      "ACTIVATION_DESCRIPTION": "This action will activate the automation rule '{automationName}'. Are you sure you want to proceed?",
-      "DEACTIVATION_DESCRIPTION": "This action will deactivate the automation rule '{automationName}'. Are you sure you want to proceed?",
-      "ACTIVATION_SUCCESFUL": "Automation Rule Activated Successfully",
-      "DEACTIVATION_SUCCESFUL": "Automation Rule Deactivated Successfully",
-      "ACTIVATION_ERROR": "Could not Activate Automation, Please try again later",
-      "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
-      "CONFIRMATION_LABEL": "Yes",
-      "CANCEL_LABEL": "No"
+      "ACTIVATION_TITLE": "Aktiviraj pravilo automatizacije",
+      "DEACTIVATION_TITLE": "Deaktiviraj pravilo automatizacije",
+      "ACTIVATION_DESCRIPTION": "Ova akcija će aktivirati pravilo automatizacije '{automationName}'. Da li zaista želite da nastavite?",
+      "DEACTIVATION_DESCRIPTION": "Ova akcija će deaktivirati pravilo automatizacije '{automationName}'. Da li zaista želite da nastavite?",
+      "ACTIVATION_SUCCESFUL": "Pravilo automatizacije je uspešno aktivirano",
+      "DEACTIVATION_SUCCESFUL": "Pravilo automatizacije je uspešno deaktivirano",
+      "ACTIVATION_ERROR": "Nije bilo moguće aktivirati automatizaciju. Molim vas pokušajte ponovo",
+      "DEACTIVATION_ERROR": "Nije bilo moguće deaktivirati automatizaciju. Molim vas pokušajte ponovo",
+      "CONFIRMATION_LABEL": "Da",
+      "CANCEL_LABEL": "Ne"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "Nije bilo moguće dodati prilog. Molim vas pokušajte ponovo",
+      "LABEL_IDLE": "Dodaj prilog",
       "LABEL_UPLOADING": "Dodavanje...",
-      "LABEL_UPLOADED": "Succesfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Upload Failed"
+      "LABEL_UPLOADED": "Uspešno je dodato",
+      "LABEL_UPLOAD_FAILED": "Dodavanje nije uspelo"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
index 7061e5e70..5734d33d9 100644
--- a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
@@ -1,29 +1,29 @@
 {
   "BULK_ACTION": {
-    "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
-    "AGENT_SELECT_LABEL": "Select Agent",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-    "GO_BACK_LABEL": "Go back",
-    "ASSIGN_LABEL": "Assign",
-    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
-    "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
-    "ASSIGN_FAILED": "Failed to assign conversations, please try again",
-    "RESOLVE_SUCCESFUL": "Conversations resolved successfully",
-    "RESOLVE_FAILED": "Failed to resolve conversations, please try again",
-    "ALL_CONVERSATIONS_SELECTED_ALERT": "Conversations visible on this page are only selected.",
-    "AGENT_LIST_LOADING": "Loading Agents",
+    "CONVERSATIONS_SELECTED": "%{conversationCount} razgovora je izabrano",
+    "AGENT_SELECT_LABEL": "Izaberite agenta",
+    "ASSIGN_CONFIRMATION_LABEL": "Da li zaista želite da dodelite %{conversationCount} %{conversationLabel}",
+    "GO_BACK_LABEL": "Povratak",
+    "ASSIGN_LABEL": "Dodeli",
+    "ASSIGN_AGENT_TOOLTIP": "Dodeli agenta",
+    "ASSIGN_SUCCESFUL": "Razgovor je uspešno dodeljen",
+    "ASSIGN_FAILED": "Neuspelo je dodeljivanje razgovora, molim vas pokušajte ponovo",
+    "RESOLVE_SUCCESFUL": "Razgovor je uspešno rešen",
+    "RESOLVE_FAILED": "Nije uspelo rešavanje razgovora, molim vas pokušajte ponovo",
+    "ALL_CONVERSATIONS_SELECTED_ALERT": "Jedino razgovori na ovoj stranici su izabrani.",
+    "AGENT_LIST_LOADING": "Učitavanje agenata",
     "UPDATE": {
-      "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply",
-      "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
-      "UPDATE_FAILED": "Failed to update conversations, please try again"
+      "CHANGE_STATUS": "Promeni status",
+      "SNOOZE_UNTIL_NEXT_REPLY": "Odloži do sledećeg odgovora",
+      "UPDATE_SUCCESFUL": "Status razgovora je uspešno promenjen.",
+      "UPDATE_FAILED": "Nije uspela promena razgovora, molim vas pokušajte ponovo"
     },
     "LABELS": {
-      "ASSIGN_LABELS": "Assign Labels",
-      "NO_LABELS_FOUND": "No labels found for",
-      "ASSIGN_SELECTED_LABELS": "Assign selected labels",
-      "ASSIGN_SUCCESFUL": "Labels assigned successfully",
-      "ASSIGN_FAILED": "Failed to assign labels, please try again"
+      "ASSIGN_LABELS": "Dodeli oznake",
+      "NO_LABELS_FOUND": "Nije pronađena nijedna oznaka",
+      "ASSIGN_SELECTED_LABELS": "Dodeli izabrane oznake",
+      "ASSIGN_SUCCESFUL": "Oznake su uspešno dodeljene",
+      "ASSIGN_FAILED": "Nije uspelo dodeljivanje oznaka, molim vas pokušajte ponovo"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/campaign.json b/app/javascript/dashboard/i18n/locale/sr/campaign.json
index e563382d8..987a19e93 100644
--- a/app/javascript/dashboard/i18n/locale/sr/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/sr/campaign.json
@@ -1,101 +1,101 @@
 {
   "CAMPAIGN": {
-    "HEADER": "Campaigns",
-    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
+    "HEADER": "Kampanje",
+    "SIDEBAR_TXT": "Proaktivne poruke omogućavaju korisnicima da šalju odlazne poruke njihovim kontaktima koje će pokrenuti dodatne razgovore. Kliknite na <b>Dodaj kampanju</b> da bi ste napravili novu kampanju. Takođe možetet urediti ili obrisati postojeću kampanju klikom na dugme Uredi ili Obriši.",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "Create a one off campaign",
-      "ONGOING": "Create a ongoing campaign"
+      "ONE_OFF": "Napravi jednokratnu kampanju",
+      "ONGOING": "Napravi dugotrajnu kampanju"
     },
     "ADD": {
-      "TITLE": "Create a campaign",
-      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "TITLE": "Napravi kamapanju",
+      "DESC": "Proaktivne poruke omogućavaju korisnicima da šalju odlazne poruke njihovim kontaktima koje će pokrenuti dodatne razgovore.",
       "CANCEL_BUTTON_TEXT": "Otkaži",
-      "CREATE_BUTTON_TEXT": "Create",
+      "CREATE_BUTTON_TEXT": "Napravi",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
-          "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "LABEL": "Naslov",
+          "PLACEHOLDER": "Molim vas unesite naslov kampanje",
+          "ERROR": "Naslov je obavezan"
         },
         "SCHEDULED_AT": {
-          "LABEL": "Scheduled time",
-          "PLACEHOLDER": "Please select the time",
-          "CONFIRM": "Confirm",
-          "ERROR": "Scheduled time is required"
+          "LABEL": "Vremenski raspored",
+          "PLACEHOLDER": "Molim vas unesite vreme",
+          "CONFIRM": "Potvrdi",
+          "ERROR": "Vremenski raspored je obavezan"
         },
         "AUDIENCE": {
-          "LABEL": "Audience",
-          "PLACEHOLDER": "Select the customer labels",
-          "ERROR": "Audience is required"
+          "LABEL": "Publika",
+          "PLACEHOLDER": "Izaberite oznake potrošača",
+          "ERROR": "Publika je obavezna"
         },
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox",
-          "ERROR": "Inbox is required"
+          "LABEL": "Izaberite prijemno sanduče",
+          "PLACEHOLDER": "Izaberite prijemno sanduče",
+          "ERROR": "Prijemno sanduče je obavezno"
         },
         "MESSAGE": {
           "LABEL": "Poruka",
-          "PLACEHOLDER": "Please enter the message of campaign",
-          "ERROR": "Message is required"
+          "PLACEHOLDER": "Molim vas unesite poruku kampanje",
+          "ERROR": "Poruka je obavezna"
         },
         "SENT_BY": {
-          "LABEL": "Sent by",
-          "PLACEHOLDER": "Please select the the content of campaign",
-          "ERROR": "Sender is required"
+          "LABEL": "Poslao",
+          "PLACEHOLDER": "Molim vas izaberite sadržaj kampanje",
+          "ERROR": "Pošiljalac je obavezan"
         },
         "END_POINT": {
-          "LABEL": "URL",
-          "PLACEHOLDER": "Please enter the URL",
-          "ERROR": "Please enter a valid URL"
+          "LABEL": "Adresa",
+          "PLACEHOLDER": "Molim vas unesite adresu",
+          "ERROR": "Molim vas unesite ispravnu adresu"
         },
         "TIME_ON_PAGE": {
-          "LABEL": "Time on page(Seconds)",
-          "PLACEHOLDER": "Please enter the time",
-          "ERROR": "Time on page is required"
+          "LABEL": "Vreme na stranici(sekunde)",
+          "PLACEHOLDER": "Molim vas unesite vreme",
+          "ERROR": "Vreme na stranici je obavezno"
         },
-        "ENABLED": "Enable campaign",
-        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
-        "SUBMIT": "Add Campaign"
+        "ENABLED": "Omogući kampanju",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "Aktiviraj samo tokom radnog vremena",
+        "SUBMIT": "Dodaj kampanju"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign created successfully",
-        "ERROR_MESSAGE": "There was an error. Please try again."
+        "SUCCESS_MESSAGE": "Kampanja je uspešno napravljena",
+        "ERROR_MESSAGE": "Pojavila se greška. Molim vas pokušajte ponovo."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
       "CONFIRM": {
         "TITLE": "Potvrdite brisanje",
-        "MESSAGE": "Are you sure to delete?",
+        "MESSAGE": "Da li zaista želite da izbrišete?",
         "YES": "Da, izbriši ",
         "NO": "Ne, zadrži "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+        "SUCCESS_MESSAGE": "Kampanja je uspešno obrisana",
+        "ERROR_MESSAGE": "Nije bilo moguće obrisati kampanju. Molim vas pokušajte ponovo."
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
-      "UPDATE_BUTTON_TEXT": "Update",
+      "TITLE": "Uredi kampanju",
+      "UPDATE_BUTTON_TEXT": "Primeni",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Kampanja je uspešno izmenjena",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
-      "404": "There are no campaigns created for this inbox.",
+      "LOADING_MESSAGE": "Preuzimanje kampanji...",
+      "404": "Nema kampanji napravljenih za ovo prijemno sanduče.",
       "TABLE_HEADER": {
-        "TITLE": "Title",
+        "TITLE": "Naslov",
         "MESSAGE": "Poruka",
-        "INBOX": "Inbox",
+        "INBOX": "Prijemno sanduče",
         "STATUS": "Status",
-        "SENDER": "Sender",
-        "URL": "URL",
-        "SCHEDULED_AT": "Scheduled time",
-        "TIME_ON_PAGE": "Time(Seconds)",
-        "CREATED_AT": "Created at"
+        "SENDER": "Pošiljalac",
+        "URL": "Adresa",
+        "SCHEDULED_AT": "Vremenski raspored",
+        "TIME_ON_PAGE": "Vreme(sekunde)",
+        "CREATED_AT": "Napravljena u"
       },
       "BUTTONS": {
         "ADD": "Dodaj",
@@ -103,24 +103,24 @@
         "DELETE": "Izbriši"
       },
       "STATUS": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled",
-        "COMPLETED": "Completed",
-        "ACTIVE": "Active"
+        "ENABLED": "Omogućeno",
+        "DISABLED": "Onemogućeno",
+        "COMPLETED": "Završeno",
+        "ACTIVE": "Aktivno"
       },
       "SENDER": {
         "BOT": "Bot"
       }
     },
     "ONE_OFF": {
-      "HEADER": "One off campaigns",
-      "404": "There are no one off campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+      "HEADER": "Jednokratne kampanje",
+      "404": "Ne postoje napravljene jednokratne kampanje",
+      "INBOXES_NOT_FOUND": "Molim vas napravite sms prijemno sanduče i započnite dodavanje kamapanja"
     },
     "ONGOING": {
-      "HEADER": "Ongoing campaigns",
-      "404": "There are no ongoing campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "HEADER": "Dugotrajne kamapanje",
+      "404": "Ne postoje napravljene dugotrajne kampanje",
+      "INBOXES_NOT_FOUND": "Molim vas napravite prijemno sanduče sajta i započnite dodavanje kampanja"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/sr/cannedMgmt.json
index 51308e184..e3b5a615d 100644
--- a/app/javascript/dashboard/i18n/locale/sr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/cannedMgmt.json
@@ -1,14 +1,14 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Gotovi odgovori",
-    "HEADER_BTN_TXT": "Dodaj gotov odgovor",
-    "LOADING": "Preuzimanje gotovih odgovara",
-    "SEARCH_404": "Nema razultata",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "HEADER": "Brzi odgovori",
+    "HEADER_BTN_TXT": "Dodaj brzi odgovor",
+    "LOADING": "Preuzimanje brzih odgovora",
+    "SEARCH_404": "Nema stavki koje se poklapaju sa upitom",
+    "SIDEBAR_TXT": "<p><b>Brzi odgovori</b> </p><p> Brzi odgovori su sačuvani šabloni odgovora koji se mogu koristiti za brzo slanje odgovora u razgovoru. </p><p> Za pravljenje Brzih odgovora, samo kliknite na <b>Dodaj brzi odgovor</b>. Takođe možete urediti ili obrisati postojeći Brzi odgovor klikom na dugme Uredi ili Obriši. </p><p> Brzi odgovori se koriste uz pomoć <b>Brzih kodova</b>. Agenti mogu da pristupe brzim odgovorima tokom ćaskanja kucanjem <b>'/'</b> pa zatim brzog koda. </p>",
     "LIST": {
-      "404": "Ne postoje gotovi odgovori u ovom nalogu.",
-      "TITLE": "Upravljajte gotovim odgovorima",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "404": "Ne postoje brzi odgovori u ovom nalogu.",
+      "TITLE": "Upravljajte brzim odgovorima",
+      "DESC": "Brzi odgovori su predefinisani šabloni odgovora koji se mogu koristiti za slanje brzih odgovora na tikete.",
       "TABLE_HEADER": [
         "Brzi kod",
         "Sadržaj",
@@ -16,29 +16,29 @@
       ]
     },
     "ADD": {
-      "TITLE": "Dodaj gotov odgovor",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "TITLE": "Dodaj brzi odgovor",
+      "DESC": "Brzi odgovori su predefinisani šabloni odgovora koji se mogu koristiti za slanje brzih odgovora u razgovorima.",
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Brzi kod",
-          "PLACEHOLDER": "Unesite brzi kod",
+          "PLACEHOLDER": "Molim vas unesite brzi kod",
           "ERROR": "Brzi kod je obavezan"
         },
         "CONTENT": {
           "LABEL": "Sadržaj",
-          "PLACEHOLDER": "Unesite sadržaj",
+          "PLACEHOLDER": "Molim vas unesite sadržaj",
           "ERROR": "Sadržaj je obavezan"
         },
         "SUBMIT": "Pošalji"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Gotov odgovor je uspešno dodat",
+        "SUCCESS_MESSAGE": "Brzi odgovor je uspešno dodat",
         "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
       }
     },
     "EDIT": {
-      "TITLE": "Uredi gotov odgovor",
+      "TITLE": "Uredi brzi odgovor",
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "FORM": {
         "SHORT_CODE": {
@@ -48,21 +48,21 @@
         },
         "CONTENT": {
           "LABEL": "Sadržaj",
-          "PLACEHOLDER": "Unesite sadržaj",
+          "PLACEHOLDER": "Molim vas unesite sadržaj",
           "ERROR": "Sadržaj je obavezan"
         },
         "SUBMIT": "Pošalji"
       },
       "BUTTON_TEXT": "Uredi",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
+        "SUCCESS_MESSAGE": "Brzi odgovor je uspešno izmenjen",
         "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Izbriši",
+      "BUTTON_TEXT": "Obriši",
       "API": {
-        "SUCCESS_MESSAGE": "Gotov odgovor je uspešno izbrisan",
+        "SUCCESS_MESSAGE": "Brzi odgovor je uspešno izbrisan",
         "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 303d274b5..fb86fa0ad 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -3,85 +3,86 @@
     "NOT_AVAILABLE": "Nije dostupno",
     "EMAIL_ADDRESS": "E-mail adresa",
     "PHONE_NUMBER": "Broj telefona",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COPY_SUCCESSFUL": "Uspešno kopirano na beležnicu",
     "COMPANY": "Firma",
     "LOCATION": "Lokacija",
+    "BROWSER_LANGUAGE": "Jezik pregledača",
     "CONVERSATION_TITLE": "Detalji razgovora",
     "VIEW_PROFILE": "Pogledaj profil",
     "BROWSER": "Pretraživač",
     "OS": "Operativni sistem",
-    "INITIATED_FROM": "Initiated from",
-    "INITIATED_AT": "Initiated at",
+    "INITIATED_FROM": "Započeto sa",
+    "INITIATED_AT": "Započeto u",
     "IP_ADDRESS": "IP adresa",
     "NEW_MESSAGE": "Nova poruka",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "NO_RECORDS_FOUND": "Nema ranijih razgovora povezanih sa ovim kontaktom.",
       "TITLE": "Prethodni razgovor"
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Contact Labels",
-        "ERROR": "Couldn't update labels"
+        "TITLE": "Oznake kontakta",
+        "ERROR": "Nije bilo moguće izmeniti oznake"
       },
       "CONVERSATION": {
-        "TITLE": "Conversation Labels",
-        "ADD_BUTTON": "Add Labels"
+        "TITLE": "Oznake razgovora",
+        "ADD_BUTTON": "Dodaj oznake"
       },
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Dodaj oznake",
+        "PLACEHOLDER": "Pretraži oznake",
+        "NO_RESULT": "Oznake nisu pronađene"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Mute Conversation",
-    "UNMUTE_CONTACT": "Unmute Conversation",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
-    "SEND_TRANSCRIPT": "Send Transcript",
+    "MERGE_CONTACT": "Spoji kontakt",
+    "CONTACT_ACTIONS": "Akcije nad kontaktom",
+    "MUTE_CONTACT": "Utišaj razgovor",
+    "UNMUTE_CONTACT": "Poništi utišanje razgovora",
+    "MUTED_SUCCESS": "Ovaj razgovor je utišan za narednih 6 sati",
+    "UNMUTED_SUCCESS": "Ovaj razgovor više nije utišan",
+    "SEND_TRANSCRIPT": "Pošalji transkript",
     "EDIT_LABEL": "Uredi",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Prilagođeni atributi",
-      "CONTACT_LABELS": "Contact Labels",
+      "CONTACT_LABELS": "Oznake kontakta",
       "PREVIOUS_CONVERSATIONS": "Prethodni razgovor"
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
+    "BUTTON_LABEL": "Uredi kontakt",
     "TITLE": "Uredi kontakta",
-    "DESC": "Edit contact details"
+    "DESC": "Uredi detalje kontakta"
   },
   "CREATE_CONTACT": {
     "BUTTON_LABEL": "Novi kontakt",
-    "TITLE": "Create new contact",
-    "DESC": "Add basic information details about the contact."
+    "TITLE": "Napravi novi kontakt",
+    "DESC": "Dodaj osnovne informacije o kontaktu."
   },
   "IMPORT_CONTACTS": {
     "BUTTON_LABEL": "Uvoz",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "TITLE": "Uvezi kontakte",
+    "DESC": "Uvezi kontakte uz pomoć CSV datoteke.",
+    "DOWNLOAD_LABEL": "Preuzmi csv primer.",
     "FORM": {
-      "LABEL": "CSV File",
+      "LABEL": "CSV datoteka",
       "SUBMIT": "Uvoz",
       "CANCEL": "Otkaži"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "SUCCESS_MESSAGE": "Kontakti su uspešno sačuvani",
+    "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Potvrdite brisanje",
-      "MESSAGE": "Are you want sure to delete this note?",
-      "YES": "Yes, Delete it",
-      "NO": "No, Keep it"
+      "MESSAGE": "Da li zaista želite da obrišete ovu belešku?",
+      "YES": "Da, obriši je",
+      "NO": "Ne, ostavi je"
     }
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "Obriši kontakt",
+    "TITLE": "Obriši kontakt",
+    "DESC": "Obriši detalje o kontaktu",
     "CONFIRM": {
       "TITLE": "Potvrdite brisanje",
       "MESSAGE": "Sigurni ste da želite izbrisati ",
@@ -90,7 +91,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Kontakt je uspešno obrisan",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "ERROR_MESSAGE": "Nije bilo moguće obrisati kontakt. Molim vas pokušajte ponovo."
     }
   },
   "CONTACT_FORM": {
@@ -98,80 +99,80 @@
       "SUBMIT": "Pošalji",
       "CANCEL": "Otkaži",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Avatar kontakta"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
+        "PLACEHOLDER": "Unesite puno ime kontakta",
         "LABEL": "Puno ime"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
+        "PLACEHOLDER": "Unesite biografiju kontakta",
         "LABEL": "Bio"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "Unesite adresu e-pošte kontakta",
         "LABEL": "E-mail adresa",
-        "DUPLICATE": "This email address is in use for another contact.",
-        "ERROR": "Please enter a valid email address."
+        "DUPLICATE": "Ova adresa e-pošte je iskorišćena kod drugog kontakta.",
+        "ERROR": "Molim vas unesite ispravnu adresu e-pošte."
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
+        "PLACEHOLDER": "Unesite broj telefona kontakta",
         "LABEL": "Broj telefona",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
-        "ERROR": "Phone number should be either empty or of E.164 format",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "HELP": "Broj telefona bi trebao biti u E.164 formatu npr.: +381601234567 [+][broj države][pozivni broj][broj telefona]",
+        "ERROR": "Broj telefona bi trebao biti ili prazan ili u E.164 formatu",
+        "DUPLICATE": "Broj telefona je iskorišćen kod drugog kontakta."
       },
       "LOCATION": {
         "PLACEHOLDER": "Unesite lokaciju kontakta",
         "LABEL": "Lokacija"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
+        "PLACEHOLDER": "Unesite ime kompanije",
         "LABEL": "Ime firme"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Unesite Fejsbuk korisničko ime",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Unesite Tviter korisničko ime",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Unesite LinkedIn korisničko ime",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Unesite Github korisničko ime",
           "LABEL": "Github"
         }
       }
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Avatar kontakta je uspešno obrisan",
+        "ERROR_MESSAGE": "Nije bilo moguće obrisati avatar kontakta. Molim vas pokušajte ponovo."
       }
     },
     "SUCCESS_MESSAGE": "Kontakt je uspešno sačuvan",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
+    "BUTTON_LABEL": "Započnite razgovor",
     "TITLE": "Novi razgovor",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "DESC": "Započnite novi razgovor slanjem poruke.",
+    "NO_INBOX": "Nije bilo moguće pronaći prijemno sanduče da bi se započeo novi razgovor sa ovim kontaktom.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Za"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Prijemno sanduče",
+        "ERROR": "Izaberite prijemno sanduče"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
+        "LABEL": "Naslov",
         "PLACEHOLDER": "Naslov",
         "ERROR": "Naslov ne može biti prazan"
       },
@@ -198,7 +199,7 @@
     "LIST": {
       "LOADING_MESSAGE": "Preuzimanje kontakata...",
       "404": "Nisu pronađeni kontakti 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "NO_CONTACTS": "Nema dostupnih kontakata",
       "TABLE_HEADER": {
         "NAME": "Ime",
         "PHONE_NUMBER": "Broj telefona",
@@ -229,12 +230,12 @@
   },
   "NOTES": {
     "FETCHING_NOTES": "Preuzimanje beleški...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "NOT_AVAILABLE": "Nema napravljenih beleški za ovaj kontakt",
     "HEADER": {
       "TITLE": "Beleške"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "beleška je dodata"
     },
     "ADD": {
       "BUTTON": "Dodaj",
@@ -258,76 +259,76 @@
   "CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Dodaj atribute",
     "BUTTON": "Dodaj vlastite atribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "NOT_AVAILABLE": "Nema dostupnih prilagođenih atributa za ovaj kontakt.",
+    "COPY_SUCCESSFUL": "Uspešno kopirano na beležnicu",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "Kopiraj atribut",
+      "DELETE": "Obriši atribut",
+      "EDIT": "Uredi atribut"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Napravi prilagođeni atribut",
+      "DESC": "Dodaj prilagođenu informaciju ovom kontaktu."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Dodaj atribut",
       "CANCEL": "Otkaži",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Naziv prilagođenog atributa",
+        "PLACEHOLDER": "Npr.: shopify id",
+        "ERROR": "Neispravan naziv prilagođenog atributa"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "Vrednost atributa",
+        "PLACEHOLDER": "Npr.: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "Napravi novi atribut ",
+        "SUCCESS": "Atribut je uspešno dodat",
+        "ERROR": "Nije bilo moguće dodati atribut. Molim vas pokušajte ponovo"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Atribut je uspešno izmenjen",
+        "ERROR": "Nije bilo moguće izmeniti atribut. Molim vas pokušajte ponovo"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Atribut je uspešno obrisan",
+        "ERROR": "Nije bilo moguće obrisati atribut. Molim vas pokušajte ponovo"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Dodaj atribute",
         "PLACEHOLDER": "Traži atribute",
-        "NO_RESULT": "No attributes found"
+        "NO_RESULT": "Nijedan atribut nije pronađen"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "PLACEHOLDER": "Izaberite vrednost",
+          "SEARCH_INPUT_PLACEHOLDER": "Pretražite vrednost",
           "NO_RESULT": "Nema rezultata"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Ispravna vrednost je obavezna",
+      "INVALID_URL": "Neispravna adresa"
     }
   },
   "MERGE_CONTACTS": {
     "TITLE": "Spajanje kontakata",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "DESCRIPTION": "Spojite kontakte da bi ste spojili dva profila u jedan, uključujući sve atribute i razgovore. U slučaju neslaganja, atributi primarnog kontakta će imati prednost.",
     "PRIMARY": {
       "TITLE": "Glavni kontakt",
-      "HELP_LABEL": "To be kept"
+      "HELP_LABEL": "Da bude zadržan"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
+      "TITLE": "Kontakt za spajanje",
       "PLACEHOLDER": "Traži kontakta",
-      "HELP_LABEL": "To be deleted"
+      "HELP_LABEL": "Da bude obrisan"
     },
     "SUMMARY": {
       "TITLE": "Rezime",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "DELETE_WARNING": "Kontakt <strong>%{childContactName}</strong> će biti obrisan.",
+      "ATTRIBUTE_WARNING": "Detalji kontakta <strong>%{childContactName}</strong> će biti iskopirani u <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
       "ERROR": "ERROR_MESSAGE"
@@ -336,10 +337,10 @@
       "SUBMIT": " Spajanje kontakata",
       "CANCEL": "Otkaži",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Izaberite dete kontakt za spajanje"
       },
       "SUCCESS_MESSAGE": "Kontakt je uspešno spojen",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "ERROR_MESSAGE": "Nije bilo moguće spojiti kontakte, pokušajte ponovo!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/contactFilters.json b/app/javascript/dashboard/i18n/locale/sr/contactFilters.json
index 83844a2af..5f4579688 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contactFilters.json
@@ -1,15 +1,15 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+        "TITLE": "Filtriraj kontakte",
+        "SUBTITLE": "Dodajte filtere ispod i kliknite na 'Primeni' da bi ste flitrirali kontakte.",
         "ADD_NEW_FILTER": "Dodajte filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
+        "CLEAR_ALL_FILTERS": "Ukloni sve filtere",
         "FILTER_DELETE_ERROR": "Trebali bi da imate barem jedan filter da bi ste ga sačuvali",
         "SUBMIT_BUTTON_LABEL": "Pošalji",
         "CANCEL_BUTTON_LABEL": "Otkaži",
         "CLEAR_BUTTON_LABEL": "Poništite filtere",
         "EMPTY_VALUE_ERROR": "Vrednost je neophodna",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "TOOLTIP_LABEL": "Filtriraj kontakte",
         "QUERY_DROPDOWN_LABELS": {
             "AND": "I",
             "OR": "ILI"
@@ -22,24 +22,24 @@
             "is_present": "Postoji",
             "is_not_present": "Ne postoji",
             "is_greater_than": "Veće je od",
-            "is_lesser_than": "Is lesser than",
+            "is_lesser_than": "Je manje od",
             "days_before": "Je x dana pre"
         },
         "ATTRIBUTES": {
             "NAME": "Ime",
-            "EMAIL": "Email",
-            "PHONE_NUMBER": "Phone number",
-            "IDENTIFIER": "Identifier",
+            "EMAIL": "E-pošta",
+            "PHONE_NUMBER": "Broj telefona",
+            "IDENTIFIER": "Identifikator",
             "CITY": "Grad",
             "COUNTRY": "Država",
             "CUSTOM_ATTRIBUTE_LIST": "Lista",
             "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
             "CUSTOM_ATTRIBUTE_NUMBER": "Broj",
             "CUSTOM_ATTRIBUTE_LINK": "Veza",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Polje za potvrdu",
             "CREATED_AT": "Kreirano",
             "LAST_ACTIVITY": "Poslednja aktivnost",
-            "REFERER_LINK": "Referrer link"
+            "REFERER_LINK": "Veza preporuke"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "Standardni filteri",
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index 982f41439..6dd4c2125 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -1,206 +1,241 @@
 {
   "CONVERSATION": {
-    "404": "Izaberite razgovor sa leve strane",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
-    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
-    "NO_MESSAGE_2": " to send a message to your page!",
-    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
-    "NO_INBOX_2": " to get started",
-    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SELECT_A_CONVERSATION": "Izaberite razgovor sa leve strane",
+    "404": "Izvinite, ne možemo da pronađemo razgovor. Molim vas pokušajte ponovo",
+    "SWITCH_VIEW_LAYOUT": "Promeni raspored",
+    "DASHBOARD_APP_TAB_MESSAGES": "Poruke",
+    "UNVERIFIED_SESSION": "Identitet korisnika nije potvrđen",
+    "NO_MESSAGE_1": "O ne! Izgleda da nema poruka od korisnika u vašem prijemnom sandučetu.",
+    "NO_MESSAGE_2": " poslati poruku tvojoj stranici!",
+    "NO_INBOX_1": "Pozdrav! Izgleda da još uvek niste dodali prijemno sanduče.",
+    "NO_INBOX_2": " da bi ste počeli",
+    "NO_INBOX_AGENT": "O ne! Izgleda da niste deo nijednog prijemnog sandučeta. Molim vas kontaktirajte vašeg administratora",
+    "SEARCH_MESSAGES": "Pretražite poruke u razgovorima",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "Pretraži poruke",
+      "RESULT_TITLE": "Rezultat pretrage",
+      "LOADING_MESSAGE": "Obrada podataka...",
+      "PLACEHOLDER": "Upišite bilo koji tekst da bi ste pretražili poruke",
+      "NO_MATCHING_RESULTS": "Ništa nije pronađeno."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
-    "CLICK_HERE": "Click here",
-    "LOADING_INBOXES": "Loading inboxes",
-    "LOADING_CONVERSATIONS": "Loading Conversations",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
-    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
-    "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "UNREAD_MESSAGES": "Nepročitane poruke",
+    "UNREAD_MESSAGE": "Nepročitana poruka",
+    "CLICK_HERE": "Kliknite ovde",
+    "LOADING_INBOXES": "Učitavanje prijemnih sandučića",
+    "LOADING_CONVERSATIONS": "Učitavanje razgovora",
+    "CANNOT_REPLY": "Ne možete da odgovorite zbog",
+    "24_HOURS_WINDOW": "24-časovno ograničenje poruka",
+    "NOT_ASSIGNED_TO_YOU": "Ovaj razgovor nije dodeljen vama. Da li želite da dodelite razgovor sebi?",
+    "ASSIGN_TO_ME": "Dodeli meni",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Možete jedino da odgovarate na ovaj razgovor koristeći šablon poruka zbog",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-časovno ograničenje poruka",
+    "SELECT_A_TWEET_TO_REPLY": "Molim vas izaberite tvit na koji da odgovorite.",
+    "REPLYING_TO": "Odgovarate na:",
+    "REMOVE_SELECTION": "Ukloni izbor",
+    "DOWNLOAD": "Preuzmi",
+    "UNKNOWN_FILE_TYPE": "Nepoznata datoteka",
+    "UPLOADING_ATTACHMENTS": "Dodavanje priloga...",
+    "SUCCESS_DELETE_MESSAGE": "Poruka je uspešno obrisana",
+    "FAIL_DELETE_MESSSAGE": "Nije bilo moguće obrisati poruku! Pokušajte ponovo",
+    "NO_RESPONSE": "Nema odgovora",
+    "RATING_TITLE": "Ocena",
+    "FEEDBACK_TITLE": "Povratne informacije",
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
+      "RESOLVE_ACTION": "Reši",
+      "REOPEN_ACTION": "Ponovo otvori",
       "OPEN_ACTION": "Otvoreni",
-      "OPEN": "More",
-      "CLOSE": "Close",
-      "DETAILS": "details",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "OPEN": "Više",
+      "CLOSE": "Zatvori",
+      "DETAILS": "detalji",
+      "SNOOZED_UNTIL_TOMORROW": "Odloženo do sutra",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Odloženo do sledeće nedelje",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Odloženo do sledećeg odgovora"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Označeno na čekanju",
       "SNOOZE": {
-        "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TITLE": "Odloži do",
+        "NEXT_REPLY": "Sledećeg odgovora",
+        "TOMORROW": "Sutra",
+        "NEXT_WEEK": "Sledeće nedelje"
+      }
+    },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Označeno na čekanju",
+      "RESOLVED": "Označi kao rešeno",
+      "REOPEN": "Ponovo otvori razgovor",
+      "SNOOZE": {
+        "TITLE": "Odloži",
+        "NEXT_REPLY": "Do sledećeg odgovora",
+        "TOMORROW": "Do sutra",
+        "NEXT_WEEK": "Do sledeće nedelje"
+      },
+      "ASSIGN_AGENT": "Dodeli agenta",
+      "ASSIGN_LABEL": "Dodeli oznaku",
+      "AGENTS_LOADING": "Učitavanje agenata...",
+      "ASSIGN_TEAM": "Dodeli tim",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Razgovor sa ID %{conversationId} je dodeljen \"%{agentName}\"",
+          "FAILED": "Nije bilo moguće dodeliti agenta. Molim vas pokušajte ponovo."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Dodeljena je oznaka # %{labelName} razgovoru sa id %{conversationId}",
+          "FAILED": "Nije bilo moguće dodeliti oznaku. Molim vas pokušajte ponovo."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Dodeljen je tim \"%{team}\" razgovoru sa id %{conversationId}",
+          "FAILED": "Nije bilo moguće dodeliti tim. Molim vas pokušajte ponovo."
+        }
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
-      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
-      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGN_TOOLTIP": "Potpis poruke",
+      "ENABLE_SIGN_TOOLTIP": "Omogući potpis",
+      "DISABLE_SIGN_TOOLTIP": "Onemogući potpis",
+      "MSG_INPUT": "Shift + enter za novi red. Počni sa '/' da bi ste izabrali brzi odgovor.",
+      "PRIVATE_MSG_INPUT": "Shift + enter za novi red. Ovo će biti vidljivo samo agentima",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Potpis poruke nije podešen, molim vas podesite ga u podešavanjima profila.",
+      "CLICK_HERE": "Kliknite ovde da izmenite"
     },
     "REPLYBOX": {
-      "REPLY": "Reply",
-      "PRIVATE_NOTE": "Private Note",
-      "SEND": "Send",
-      "CREATE": "Add Note",
-      "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
+      "REPLY": "Odgovor",
+      "PRIVATE_NOTE": "Privatna beleška",
+      "SEND": "Pošalji",
+      "CREATE": "Dodaj belešku",
+      "TWEET": "Tvit",
+      "TIP_FORMAT_ICON": "Prikaži bogat uređivač teksta",
+      "TIP_EMOJI_ICON": "Prikaži birač emotikona",
+      "TIP_ATTACH_ICON": "Dodaj datoteke",
       "TIP_AUDIORECORDER_ICON": "Snimi zvuk",
       "TIP_AUDIORECORDER_PERMISSION": "Dozvoli pristup zvuku",
       "TIP_AUDIORECORDER_ERROR": "Nije moguće pristupiti zvuku",
-      "ENTER_TO_SEND": "Enter to send",
-      "DRAG_DROP": "Drag and drop here to attach",
+      "ENTER_TO_SEND": "Enter za slanje",
+      "DRAG_DROP": "Prevuci i pusti za dodavanje",
       "START_AUDIO_RECORDING": "Pokreni snimanje zvuka",
       "STOP_AUDIO_RECORDING": "Zaustavi snimanje zvuka",
       "": "",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Dodaj bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "E-pošte odvojene zarezima",
+          "ERROR": "Molim vas unesite ispravne adrese e-pošte"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "E-pošte odvojene zarezima",
+          "ERROR": "Molim vas unesite ispravne adrese e-pošte"
         }
       }
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
-    "CHANGE_AGENT": "Conversation Assignee changed",
-    "CHANGE_TEAM": "Conversation team changed",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
-    "SENT_BY": "Sent by:",
+    "VISIBLE_TO_AGENTS": "Privatna beleška: Vidljiva samo vama i vašem timu",
+    "CHANGE_STATUS": "Status razgovora je izmenjen",
+    "CHANGE_STATUS_FAILED": "Nije uspela izmena statusa razgovora",
+    "CHANGE_AGENT": "Izmenjen je dodeljen razgovoru",
+    "CHANGE_AGENT_FAILED": "Nije uspela izmena dodeljenog",
+    "ASSIGN_LABEL_SUCCESFUL": "Oznaka je uspešno dodeljena",
+    "ASSIGN_LABEL_FAILED": "Nije uspela dodela oznake",
+    "CHANGE_TEAM": "Tim razgovora je promenjen",
+    "FILE_SIZE_LIMIT": "Datoteka premašuje ograničenje priloga od {MAXIMUM_FILE_UPLOAD_SIZE}",
+    "MESSAGE_ERROR": "Nije moguće slanje poruke, molim vas pokušajte ponovo",
+    "SENT_BY": "Poslao:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Nije bilo moguće poslati poruku! Pokušajte ponovo",
+    "TRY_AGAIN": "pokušaj ponovo",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
-      "REMOVE": "Remove",
-      "ASSIGN": "Assign"
+      "SELECT_AGENT": "Izaberi agenta",
+      "REMOVE": "Ukloni",
+      "ASSIGN": "Dodeli"
     },
     "CONTEXT_MENU": {
-      "COPY": "Copy",
+      "COPY": "Kopiraj",
       "DELETE": "Izbriši"
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "TITLE": "Pošalji transkript razgovora",
+    "DESC": "Pošaljite kopiju transkripta razgovora na određenu adresu e-pošte",
     "SUBMIT": "Pošalji",
     "CANCEL": "Otkaži",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "SEND_EMAIL_SUCCESS": "Transkript razgovora je uspešno poslat",
+    "SEND_EMAIL_ERROR": "Pojavila se greška, molim vas pokušajte ponovo",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "Pošaljite transkript potrošaču",
+      "SEND_TO_AGENT": "Pošaljite transkript dodeljenom agentu",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Pošaljite transkript još jednoj adresi e-pošte",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
-        "ERROR": "Please enter a valid email address"
+        "PLACEHOLDER": "Unesite adresu e-pošte",
+        "ERROR": "Molim vas unesite ispravnu adresu e-pošte"
       }
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "Zdravo 👋, Dobrodošli u %{installationName}!",
+    "DESCRIPTION": "Hvala vam na registraciji. Želimo da najbolje iskoristite ovu %{installationName}. Evo nekoliko stvari koje možete da uradite u %{installationName} da bi vaše iskustvo bilo izvrsno.",
+    "READ_LATEST_UPDATES": "Pročitajte naše najnovije izmene",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "Svi vaši razgovori na jednom mestu",
+      "DESCRIPTION": "Pregledajte sve razgovore sa vašim kupcima u jednoj radnoj tabli. Možete filtrirati razgovore prema dolaznom kanalu, oznaci i statusu."
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
-      "NEW_LINK": "Click here to invite a team member"
+      "TITLE": "Pozovite članove vašeg tima",
+      "DESCRIPTION": "Sobzirom da se spremate da razgovarate sa vašim potrošačima, dovedite članove vašeg time da vam pomognu. Možete pozvati članove vašeg time dodavanjem njihove adrese e-pošte u spisak agenata.",
+      "NEW_LINK": "Kliknite ovde da pozovete člana tima"
     },
     "INBOXES": {
-      "TITLE": "Connect Inboxes",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
-      "NEW_LINK": "Click here to create an inbox"
+      "TITLE": "Povežite prijemna sandučeta",
+      "DESCRIPTION": "Povežite razne kanale kroz koje bi vaši potrošači mogli da razgovaraju sa vama. To može biti uživo časkanje na sajtu, vaša Fejsbuk ili Tviter stranica ili čak vaš WhatsApp broj.",
+      "NEW_LINK": "Kliknite ovde da napravite prijemno sanduče"
     },
     "LABELS": {
-      "TITLE": "Organize conversations with labels",
-      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
-      "NEW_LINK": "Click here to create tags"
+      "TITLE": "Organizujte razgovore sa oznakama",
+      "DESCRIPTION": "Oznake omogućavaju lakši način da se kategorišu razgovori. Napravite oznake poput #upit-podrske, #pitanje-placanja itd., kako bi ste ih koristili u kasnijim razgovorima.",
+      "NEW_LINK": "Kliknite ovde da napravite oznake"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Dodeljeni agent",
+    "SELF_ASSIGN": "Dodeli meni",
+    "TEAM_LABEL": "Dodeljeni tim",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Niko"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
-      "CONVERSATION_LABELS": "Conversation Labels",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONTACT_DETAILS": "Detalji o kontaktu",
+      "CONVERSATION_ACTIONS": "Akcije nad razgovorom",
+      "CONVERSATION_LABELS": "Oznake razgovora",
+      "CONVERSATION_INFO": "Informacije o razgovoru",
+      "CONTACT_ATTRIBUTES": "Atributi kontakta",
       "PREVIOUS_CONVERSATION": "Prethodni razgovor"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Napravi atribut",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Atribut je uspešno izmenjen",
+      "ERROR": "Nije bilo moguće izmeniti atribut. Molim vas pokušajte ponovo"
     },
     "ADD": {
       "TITLE": "Dodaj",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "SUCCESS": "Atribut je uspešno dodat",
+      "ERROR": "Nije bilo moguće dodati atribut. Molim vas pokušajte ponovo"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Atribut je uspešno obrisan",
+      "ERROR": "Nije bilo moguće obrisati atribut. Molim vas pokušajte ponovo"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "Dodaj atribute",
       "PLACEHOLDER": "Traži atribute",
-      "NO_RESULT": "No attributes found"
+      "NO_RESULT": "Nijedan atribut nije pronađen"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
+    "FROM": "Od",
+    "TO": "Za",
     "BCC": "Bcc",
     "CC": "Cc",
-    "SUBJECT": "Subject"
+    "SUBJECT": "Naslov"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index aac7fba5f..ea3794734 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -1,140 +1,140 @@
 {
   "GENERAL_SETTINGS": {
-    "TITLE": "Account settings",
-    "SUBMIT": "Update settings",
-    "BACK": "Back",
+    "TITLE": "Podešavanja naloga",
+    "SUBMIT": "Primeni izmene",
+    "BACK": "Nazad",
     "UPDATE": {
-      "ERROR": "Could not update settings, try again!",
-      "SUCCESS": "Successfully updated account settings"
+      "ERROR": "Nije bilo moguće primeniti izmene, pokušajte ponovo!",
+      "SUCCESS": "Izmene podešavanja naloga su uspešno primenjene"
     },
     "FORM": {
-      "ERROR": "Please fix form errors",
+      "ERROR": "Molim vas ispravite greške formulara",
       "GENERAL_SECTION": {
-        "TITLE": "General settings",
+        "TITLE": "Opšta podešavanja",
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID naloga",
+        "NOTE": "Ovaj ID je neophodan ako izgrađujete integraciju zasnovanu na API-ju"
       },
       "NAME": {
-        "LABEL": "Account name",
-        "PLACEHOLDER": "Your account name",
-        "ERROR": "Please enter a valid account name"
+        "LABEL": "Naziv naloga",
+        "PLACEHOLDER": "Naziv vašeg naloga",
+        "ERROR": "Molim vas unesite ispravan naziv naloga"
       },
       "LANGUAGE": {
-        "LABEL": "Site language (Beta)",
-        "PLACEHOLDER": "Your account name",
+        "LABEL": "Jezik sajta (beta)",
+        "PLACEHOLDER": "Naziv vašeg naloga",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "Domen dolazne e-pošte",
+        "PLACEHOLDER": "Domen gde ćete primati e-poruke",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "E-pošta podrške",
+        "PLACEHOLDER": "E-pošta podrške vaše kompanije",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Broj dana nakon čega će se tiket automatski rešiti ako nema aktivnosti",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Molim vas unesite ispravno trajanje za automatsko rešavanje (minimalno 1 dan i maksimalno 999 dana)"
       },
       "FEATURES": {
-        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
-        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+        "INBOUND_EMAIL_ENABLED": "Nastavljanje razgovora putem e-poruka je omogućeno za vaš nalog.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "Sada možete da dobijate e-poruke u vaš prilagođeni domen."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
-    "LEARN_MORE": "Learn more"
+    "UPDATE_CHATWOOT": "Dostupna je nadogradnja %{latestChatwootVersion} za Chatwoot. Molim vas nadogradite vaše izdanje.",
+    "LEARN_MORE": "Saznajte više"
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Pritisnite enter da bi ste izabrali",
+      "ENTER_TO_REMOVE": "Pritisnite enter da bi ste uklonili",
+      "SELECT_ONE": "Izaberite jedno"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
-    "DELETE_TITLE": "deleted",
+    "HEADER": "Obaveštenja",
+    "MARK_ALL_DONE": "Označi sve kao završeno",
+    "DELETE_TITLE": "obrisano",
     "UNREAD_NOTIFICATION": {
-      "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
-      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
-      "EMPTY_MESSAGE": "You have no unread notifications"
+      "TITLE": "Nepročitana obaveštenja",
+      "ALL_NOTIFICATIONS": "Pregledaj sva obaveštenja",
+      "LOADING_UNREAD_MESSAGE": "Učitavanje nepročitanih obaveštenja...",
+      "EMPTY_MESSAGE": "Nemate nepročitanih obaveštenja"
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Učitavanje obaveštenja...",
+      "404": "Nema obaveštenja",
       "TABLE_HEADER": [
         "Ime",
-        "Phone Number",
+        "Broj telefona",
         "Razgovori",
-        "Last Contacted"
+        "Poslednji put kontaktiran"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Novi razgovor",
+      "conversation_assignment": "Dodeljen razgovoru",
+      "assigned_conversation_new_message": "Nova poruka",
+      "conversation_mention": "Pominjanje"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "Prekini vezu sa Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Osveži"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Pretraži ili idi na",
     "SECTIONS": {
-      "GENERAL": "General",
-      "REPORTS": "Reports",
+      "GENERAL": "Opšta",
+      "REPORTS": "Izveštaji",
       "CONVERSATION": "Razgovor",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
-      "SETTINGS": "Settings"
+      "CHANGE_ASSIGNEE": "Promeni dodeljenog",
+      "CHANGE_TEAM": "Promeni tim",
+      "ADD_LABEL": "Dodaj oznaku razgovoru",
+      "REMOVE_LABEL": "Ukloni oznaku sa razgovora",
+      "SETTINGS": "Podešavanja"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_CONVERSATION_DASHBOARD": "Idi na radnu tablu razgovora",
+      "GO_TO_CONTACTS_DASHBOARD": "Idi na radnu tablu kontakata",
+      "GO_TO_REPORTS_OVERVIEW": "Idi na pregled izveštaja",
+      "GO_TO_CONVERSATION_REPORTS": "Idi na izveštaje o razgovorima",
+      "GO_TO_AGENT_REPORTS": "Idi na izveštaje o agentima",
+      "GO_TO_LABEL_REPORTS": "Idi na izveštaje o oznakama",
+      "GO_TO_INBOX_REPORTS": "Idi na izveštaje o prijamnim sandučićima",
+      "GO_TO_TEAM_REPORTS": "Idi na izveštaje o timovima",
+      "GO_TO_SETTINGS_AGENTS": "Idi na podešavanja agenata",
+      "GO_TO_SETTINGS_TEAMS": "Idi na podešavanja timova",
+      "GO_TO_SETTINGS_INBOXES": "Idi na podešavanja prijemnih sandučića",
+      "GO_TO_SETTINGS_LABELS": "Idi na podešavanja oznaka",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Idi na podešavanja brzih odgovora",
+      "GO_TO_SETTINGS_APPLICATIONS": "Idi na podešavanja aplikacije",
+      "GO_TO_SETTINGS_ACCOUNT": "Idi na podešavanja naloga",
+      "GO_TO_SETTINGS_PROFILE": "Idi na podešavanja profila",
+      "GO_TO_NOTIFICATIONS": "Idi na obaveštenja",
+      "ADD_LABELS_TO_CONVERSATION": "Dodaj oznaku razgovoru",
+      "ASSIGN_AN_AGENT": "Dodeli agenta",
+      "ASSIGN_A_TEAM": "Dodeli tim",
+      "MUTE_CONVERSATION": "Utišaj razgovor",
+      "UNMUTE_CONVERSATION": "Poništi utišanje razgovora",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Ukloni oznaku sa razgovora",
+      "REOPEN_CONVERSATION": "Ponovo otvori razgovor",
+      "RESOLVE_CONVERSATION": "Reši razgovor",
+      "SEND_TRANSCRIPT": "Pošalji transkript e-poštom",
+      "SNOOZE_CONVERSATION": "Odloži razgovor",
+      "UNTIL_NEXT_REPLY": "Do sledećeg odgovora",
+      "UNTIL_NEXT_WEEK": "Do sledeće nedelje",
+      "UNTIL_TOMORROW": "Do sutra"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index 01bbdb7f5..5b3fd6c2b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filtrirajte prema",
       "SORT": "Sortirajte prema",
       "SETTINGS_BUTTON": "Podešavanja",
-      "NEW_BUTTON": "Novi članak"
+      "NEW_BUTTON": "Novi članak",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Objavljeno",
+        "DRAFT": "Nacrt",
+        "ARCHIVED": "Arhivirano"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Svi članci",
+        "MINE": "Moji članci",
+        "DRAFT": "Nacrt članaka",
+        "ARCHIVED": "Arhivirani članci"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Objavite",
@@ -15,9 +26,194 @@
       "SAVING": "Nacrt se čuva...",
       "SAVED": "Nacrt je sačuvan"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Podešavanja ćlanka",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Kategorija",
+          "TITLE": "Izaberi kategoriju",
+          "PLACEHOLDER": "Izaberi kategoriju",
+          "NO_RESULT": "Nije pronađena kategorija",
+          "SEARCH_PLACEHOLDER": "Pretraži kategoriju"
+        },
+        "AUTHOR": {
+          "LABEL": "Autor",
+          "TITLE": "Izaberi autora",
+          "PLACEHOLDER": "Izaberi autora",
+          "NO_RESULT": "Nije pronađen autor",
+          "SEARCH_PLACEHOLDER": "Pretraži autora"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta naslov",
+          "PLACEHOLDER": "Dodaj meta naslov"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta opis",
+          "PLACEHOLDER": "Dodajte meta opis za bolje SEO rezultate..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta oznake",
+          "PLACEHOLDER": "Dodajte meta oznake odvojene zarezom..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Arhiviraj članak",
+        "DELETE": "Obriši članak"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portali",
+      "NEW_BUTTON": "Novi portal",
+      "ACTIVE_BADGE": "aktivan",
+      "CHOOSE_LOCALE_LABEL": "Izaberi lokal",
+      "LOADING_MESSAGE": "Učitavanje portala...",
+      "ARTICLES_LABEL": "članci",
+      "NO_PORTALS_MESSAGE": "Nema dostupnih portala",
+      "ADD_NEW_LOCALE": "Dodaj novi lokal",
+      "POPOVER": {
+        "TITLE": "Portali",
+        "PORTAL_SETTINGS": "Podešavanja portala",
+        "SUBTITLE": "Možete imati više portala koji mogu imati različite lokale za svaki portal.",
+        "CANCEL_BUTTON_LABEL": "Otkaži",
+        "CHOOSE_LOCALE_BUTTON": "Izaberi lokal"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "članci",
+            "ADD": "Dodaj lokal",
+            "VISIT": "Poseti sajt",
+            "SETTINGS": "Podešavanja"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Podešavanja portala",
+            "ITEMS": {
+              "NAME": "Ime",
+              "DOMAIN": "Prilagođeni domen",
+              "SLUG": "Slug",
+              "TITLE": "Naslov portala",
+              "THEME": "Boja teme",
+              "SUB_TEXT": "Podtekst portala"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Dostupni lokali",
+            "TABLE": {
+              "NAME": "Naziv lokala",
+              "CODE": "Kod lokala",
+              "ARTICLE_COUNT": "Broj članaka",
+              "CATEGORIES": "Broj kategorija",
+              "SWAP": "Zameni",
+              "DELETE": "Izbriši",
+              "DEFAULT_LOCALE": "Predefinisano"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Napravi portal",
+        "SUB_TITLE": "Centar za pomoć je poznat kao portal. Možete imati više portala i različite lokale za svaki portal.",
+        "NAME": {
+          "LABEL": "Ime",
+          "PLACEHOLDER": "Naziv portala",
+          "HELP_TEXT": "Naziv će se koristiti interno u javno dostupnim portalima",
+          "ERROR": "Ime je neophodno"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Naslov stranice",
+          "PLACEHOLDER": "Naslov stranice portala",
+          "HELP_TEXT": "Naziv će se koristiti u javno dostupnim portalima",
+          "ERROR": "Naslov stranice je obavezan"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug portala za adrese",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug je obavezan"
+        },
+        "DOMAIN": {
+          "LABEL": "Prilagođeni domen",
+          "PLACEHOLDER": "Prilagođeni domen portala",
+          "HELP_TEXT": "Dodajte samo ako želite da koristite prilagođen domen za vaše portale",
+          "ERROR": "Prilagođeni domen je obavezan"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Veza početne stranice",
+          "PLACEHOLDER": "Veza do početne stranice portala",
+          "HELP_TEXT": "Veza koja se koristi kao povratna sa portala na početnu stranicu.",
+          "ERROR": "Veza početne stranice je obavezna"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Tekst zaglavlja",
+          "PLACEHOLDER": "Tekst zaglavlja portala",
+          "HELP_TEXT": "Tekst zaglavlja portala",
+          "ERROR": "Tekst zaglavlja portala je obavezan"
+        },
+        "BUTTONS": {
+          "CREATE": "Napravi portal",
+          "CANCEL": "Otkaži"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal je uspešno napravljen.",
+          "ERROR_MESSAGE": "Nije bilo moguće napraviti portal. Pokušajte ponovo."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Učitavanje čalanaka...",
+      "404": "Nema čalanaka koji se poklapaju sa vašom pretragom 🔍",
+      "NO_ARTICLES": "Nema dostupnih članaka",
+      "HEADERS": {
+        "TITLE": "Naslov",
+        "CATEGORY": "Kategorija",
+        "READ_COUNT": "Broj pročitano",
+        "STATUS": "Status",
+        "LAST_EDITED": "Poslednje izmenjeno"
+      },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "od strane"
+      }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Ovde ide naslov članka",
+      "CONTENT_PLACEHOLDER": "Ovde pišite vaš članak"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Pretražite članke"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Napravi kategoriju",
+        "SUB_TITLE": "Kategorija će se koristiti u javno dostupnim portalima da bi se članci kategorizovali.",
+        "PORTAL": "Portal",
+        "LOCALE": "Lokal",
+        "NAME": {
+          "LABEL": "Ime",
+          "PLACEHOLDER": "Naziv kategorije",
+          "HELP_TEXT": "Naziv kategorije će se koristiti u javno dostupnim portalima da bi se članci kategorizovali.",
+          "ERROR": "Ime je neophodno"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Slug kategorije za adrese",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug je obavezan"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Opis",
+          "PLACEHOLDER": "Dostavite kratak opis kategorije.",
+          "ERROR": "Opis je neophodan"
+        },
+        "BUTTONS": {
+          "CREATE": "Napravi kategoriju",
+          "CANCEL": "Otkaži"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Kategorija je uspešno napravljena",
+          "ERROR_MESSAGE": "Nije bilo moguće napraviti kategoriju"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index d98c0b599..bbc71a992 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -1,579 +1,662 @@
 {
   "INBOX_MGMT": {
-    "HEADER": "Inboxes",
-    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "HEADER": "Prijemni sandučići",
+    "SIDEBAR_TXT": "<p><b>Prijemno sanduče</b></p> <p> Kada povežete veb sajt ili fejsbuk stranicu sa Chatwoot, to se zove <b>prijemno sanduče</b>. Možete imati neograničen broj prijemnih sandučića na vašem Chatwoot nalogu. </p><p> Kliknite na <b>Dodaj prijemno sanduče</b> da bi ste povezali veb sajt ili Fejsbuk stranicu. </p><p> U glavnoj tabli, na jednom mestu možete videti sve razgovore iz svih vaših prijemnih sandučića i odgovarati na njih pod karticom 'Razgovori'. </p><p> Takođe možete videti razgovore u određenom prijemnom sandučetu klikom na ime prijemnog sandučeta u levom panelu glavne table. </p>",
     "LIST": {
-      "404": "There are no inboxes attached to this account."
+      "404": "Nema prijamnih sandučeta povezanih sa ovim nalogom."
     },
     "CREATE_FLOW": [
       {
-        "title": "Choose Channel",
+        "title": "Izaberite kanal",
         "route": "settings_inbox_new",
-        "body": "Choose the provider you want to integrate with Chatwoot."
+        "body": "Izaberte provajdera kojeg želite da integrišete sa Chatwoot-om."
       },
       {
-        "title": "Create Inbox",
+        "title": "Napravi prijemno sanduče",
         "route": "settings_inboxes_page_channel",
-        "body": "Authenticate your account and create an inbox."
+        "body": "Potvrdite vaš nalog i napravite prijemno sanduće."
       },
       {
-        "title": "Add Agents",
+        "title": "Dodaj agente",
         "route": "settings_inboxes_add_agents",
-        "body": "Add agents to the created inbox."
+        "body": "Dodajte agente napravljenom prijamnom sandučetu."
       },
       {
-        "title": "Voila!",
+        "title": "Izvolite!",
         "route": "settings_inbox_finish",
-        "body": "You are all set to go!"
+        "body": "Sve je spremno za početak!"
       }
     ],
     "ADD": {
       "CHANNEL_NAME": {
-        "LABEL": "Inbox Name",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)",
-        "ERROR": "Please enter a valid inbox name"
+        "LABEL": "Naziv prijemnog sandučeta",
+        "PLACEHOLDER": "Unesite naziv prijamnog sandučeta (npr.: Acme Inc)",
+        "ERROR": "Molim vas unesite ispravan naziv prijamnog sandučeta"
       },
       "WEBSITE_NAME": {
-        "LABEL": "Website Name",
-        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        "LABEL": "Naziv veb sajta",
+        "PLACEHOLDER": "Unesite naziv vašeg veb sajta (npr.: Acme Inc)"
       },
       "FB": {
-        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
-        "CHOOSE_PAGE": "Choose Page",
-        "CHOOSE_PLACEHOLDER": "Select a page from the list",
-        "INBOX_NAME": "Inbox Name",
-        "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
-        "PICK_A_VALUE": "Pick a value"
+        "HELP": "PS: Prihvatanjem, mi imamo pristup samo tvojim porukama Stranice. Chatwoot vašim privatnim porukama nikada ne može pristupiti.",
+        "CHOOSE_PAGE": "Izaberite stranicu",
+        "CHOOSE_PLACEHOLDER": "Izaberite stranicu iz spiska",
+        "INBOX_NAME": "Naziv prijemnog sandučeta",
+        "ADD_NAME": "Dodajte naziv vašem prijemnom sandučetu",
+        "PICK_NAME": "Izaberite naziv vašeg prijemnog sandučeta",
+        "PICK_A_VALUE": "Izaberite vrednost"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "HELP": "Da bi ste dodali Tviter profil kao kanal, morate da autentifikujete vaš Tviter profil klikom na 'Prijavi se sa Tviterom' ",
+        "ERROR_MESSAGE": "Pojavila se greška pri povezivanju sa Tviterom, molim pokušajte ponovo",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Napravite razgovore iz tvitova gde ste pomenuti"
         }
       },
       "WEBSITE_CHANNEL": {
-        "TITLE": "Website channel",
-        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
-        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "TITLE": "Veb sajt kanal",
+        "DESC": "Napravite kanal za vaš veb sajt i započnite podršku vašim potrošačima sa našim vidžetom za veb sajt.",
+        "LOADING_MESSAGE": "Napravite kanal za podršku putem veb sajta",
         "CHANNEL_AVATAR": {
-          "LABEL": "Channel Avatar"
+          "LABEL": "Avatar kanala"
         },
         "CHANNEL_WEBHOOK_URL": {
-          "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
-          "ERROR": "Please enter a valid URL"
+          "LABEL": "Adresa veb zakačke",
+          "PLACEHOLDER": "Unesite adresu veb zakačke",
+          "ERROR": "Molim vas unesite ispravnu adresu"
         },
         "CHANNEL_DOMAIN": {
-          "LABEL": "Website Domain",
-          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+          "LABEL": "Domen veb sajta",
+          "PLACEHOLDER": "Unesite domen vašeg veb sajta (npr.: acme.com)"
         },
         "CHANNEL_WELCOME_TITLE": {
-          "LABEL": "Welcome Heading",
-          "PLACEHOLDER": "Hi there !"
+          "LABEL": "Naslov dobrodošlice",
+          "PLACEHOLDER": "Zdravo !"
         },
         "CHANNEL_WELCOME_TAGLINE": {
-          "LABEL": "Welcome Tagline",
-          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+          "LABEL": "Podnaslov dobrodošlice",
+          "PLACEHOLDER": "Činimo jednostavnim da se povežete sa nama. Pitajte nas bilo šta ili podelite sa nama vaše utiske."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Channel greeting message",
-          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+          "LABEL": "Pozdravna poruka kanala",
+          "PLACEHOLDER": "Acme Inc obično odgovara u roku od nekoliko sati."
         },
         "CHANNEL_GREETING_TOGGLE": {
-          "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
-          "ENABLED": "Enabled",
-          "DISABLED": "Disabled"
+          "LABEL": "Omogući pozdrav kanala",
+          "HELP_TEXT": "Automatski pošalji pozdravnu poruku kada se kreira novi razgovor.",
+          "ENABLED": "Omogućeno",
+          "DISABLED": "Onemogućeno"
         },
         "REPLY_TIME": {
-          "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "TITLE": "Podesi vreme odgovora",
+          "IN_A_FEW_MINUTES": "Za nekoliko minuta",
+          "IN_A_FEW_HOURS": "Za nekoliko sati",
+          "IN_A_DAY": "Za dan",
+          "HELP_TEXT": "Vreme odgovora će biti prikazano u vidžetu ćaskanja"
         },
         "WIDGET_COLOR": {
-          "LABEL": "Widget Color",
-          "PLACEHOLDER": "Update the widget color used in widget"
+          "LABEL": "Boja vidžeta",
+          "PLACEHOLDER": "Promenite boju vidžeta"
         },
-        "SUBMIT_BUTTON": "Create inbox",
+        "SUBMIT_BUTTON": "Napravi prijemno sanduče",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+          "ERROR_MESSAGE": "Nismo uspeli da napravimo kanal veb sajta, molim vas pokušajte ponovo"
         }
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Twilio SMS/WhatsApp kanal",
+        "DESC": "Integrišite Twilio i započnite podršku vašim potrošačima putem SMS-a ili WhatsApp-om.",
         "ACCOUNT_SID": {
-          "LABEL": "Account SID",
-          "PLACEHOLDER": "Please enter your Twilio Account SID",
-          "ERROR": "This field is required"
+          "LABEL": "SID naloga",
+          "PLACEHOLDER": "Molim vas unesite SID vašeg Twilio naloga",
+          "ERROR": "Ovo polje je obavezno"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
-          "ERROR": "This field is required",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "LABEL": "SID servisa za poruke",
+          "PLACEHOLDER": "Molim vas unesite SID vašeg Twilio servisa za poruke",
+          "ERROR": "Ovo polje je obavezno",
+          "USE_MESSAGING_SERVICE": "Koristi Twilio servis za poruke"
         },
         "CHANNEL_TYPE": {
-          "LABEL": "Channel Type",
-          "ERROR": "Please select your Channel Type"
+          "LABEL": "Vrsta kanala",
+          "ERROR": "Molim vas izaberite vrstu kanala"
         },
         "AUTH_TOKEN": {
-          "LABEL": "Auth Token",
-          "PLACEHOLDER": "Please enter your Twilio Auth Token",
-          "ERROR": "This field is required"
+          "LABEL": "Token autorizacije",
+          "PLACEHOLDER": "Molim vas unesite Twilio token autorizacije",
+          "ERROR": "Ovo polje je obavezno"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Inbox Name",
-          "PLACEHOLDER": "Please enter a inbox name",
-          "ERROR": "This field is required"
+          "LABEL": "Naziv prijemnog sandučeta",
+          "PLACEHOLDER": "Molim vas unesite naziv prijemnog sandučeta",
+          "ERROR": "Ovo polje je obavezno"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
-          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
-          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          "LABEL": "Broj telefona",
+          "PLACEHOLDER": "Molim vas unesite broj telefona sa kojeg će se slati poruke.",
+          "ERROR": "Molim vas unesite ispravnu vrednost. Broj telefona bi trebao početi sa `+` znakom."
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+          "TITLE": "Adresa povratnog poziva",
+          "SUBTITLE": "Morate da podesite adresu povratnog poziva poruke u Twilio sa adresom pomenutom ovde."
         },
-        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "SUBMIT_BUTTON": "Napravite Twilio kanal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+          "ERROR_MESSAGE": "Nismo uspeli da autentifikujemo Twilio kredencijale, molim vas pokušajte ponovo"
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "SMS kanal",
+        "DESC": "Započnite podršku vašim potrošačima putem SMS-a.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API provajder",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Propusni opseg"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo SMS kanal"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
-            "ERROR": "This field is required"
+            "LABEL": "ID naloga",
+            "PLACEHOLDER": "Molim vas unesite ID Bandwidth naloga",
+            "ERROR": "Ovo polje je obavezno"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
-            "ERROR": "This field is required"
+            "LABEL": "API ključ",
+            "PLACEHOLDER": "Molim vas unesite Bandwidth API ključ",
+            "ERROR": "Ovo polje je obavezno"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
-            "ERROR": "This field is required"
+            "LABEL": "API tajna",
+            "PLACEHOLDER": "Molim vas unesite Bandwidth API tajnu",
+            "ERROR": "Ovo polje je obavezno"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
-            "ERROR": "This field is required"
+            "LABEL": "ID aplikacije",
+            "PLACEHOLDER": "Molim vas unesite ID Bandwidth aplikacije",
+            "ERROR": "Ovo polje je obavezno"
           },
           "INBOX_NAME": {
-            "LABEL": "Inbox Name",
-            "PLACEHOLDER": "Please enter a inbox name",
-            "ERROR": "This field is required"
+            "LABEL": "Naziv prijemnog sandučeta",
+            "PLACEHOLDER": "Molim vas unesite naziv prijemnog sandučeta",
+            "ERROR": "Ovo polje je obavezno"
           },
           "PHONE_NUMBER": {
-            "LABEL": "Phone number",
-            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
-            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+            "LABEL": "Broj telefona",
+            "PLACEHOLDER": "Molim vas unesite broj telefona sa kojeg će se slati poruke.",
+            "ERROR": "Molim vas unesite ispravnu vrednost. Broj telefona bi trebao početi sa `+` znakom."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Napravite Bandwidth kanal",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Nisamo uspeli da autentifikujemo Bandwidth kredencijale, molim vas pokušajte ponovo"
           },
           "API_CALLBACK": {
-            "TITLE": "Callback URL",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "TITLE": "Adresa povratnog poziva",
+            "SUBTITLE": "Morate da podesite adresu povratnog poziva poruke u Bandwidth sa adresom pomenutom ovde."
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "WhatsApp kanal",
+        "DESC": "Započnite podršku vašim potrošačima putem WhatsApp-a.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API provajder",
           "TWILIO": "Twilio",
-          "WHATSAPP_CLOUD": "WhatsApp Cloud",
+          "WHATSAPP_CLOUD": "WhatsApp oblak",
           "360_DIALOG": "360Dialog"
         },
         "INBOX_NAME": {
-          "LABEL": "Inbox Name",
-          "PLACEHOLDER": "Please enter an inbox name",
-          "ERROR": "This field is required"
+          "LABEL": "Naziv prijemnog sandučeta",
+          "PLACEHOLDER": "Molim vas unesite naziv prijemnog sandučeta",
+          "ERROR": "Ovo polje je obavezno"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
-          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
-          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          "LABEL": "Broj telefona",
+          "PLACEHOLDER": "Molim vas unesite broj telefona sa kojeg će se slati poruke.",
+          "ERROR": "Molim vas unesite ispravnu vrednost. Broj telefona bi trebao početi sa `+` znakom."
         },
         "PHONE_NUMBER_ID": {
-          "LABEL": "Phone number ID",
-          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "ID broja telefona",
+          "PLACEHOLDER": "Molim vas unesite ID broja telefona dobijen iz radne table programera Fejsbuka.",
+          "ERROR": "Molim vas unesite ispravnu vrednost."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "Business Account ID",
-          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "ID poslovnog naloga",
+          "PLACEHOLDER": "Molim vas unesite ID poslovnog naloga dobijen iz radne table programera Fejsbuka.",
+          "ERROR": "Molim vas unesite ispravnu vrednost."
         },
         "WEBHOOK_VERIFY_TOKEN": {
-          "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Token potvrde veb zakačke",
+          "PLACEHOLDER": "Unesite token potvrde koji želite da podesite za fejsbuk veb zakačke.",
+          "ERROR": "Molim vas unesite ispravnu vrednost."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "API ključ",
+          "SUBTITLE": "Podesite WhatsApp API ključ.",
+          "PLACEHOLDER": "API ključ",
+          "ERROR": "Molim vas unesite ispravnu vrednost."
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "TITLE": "Adresa povratnog poziva",
+          "SUBTITLE": "Morate da podesite adresu veb zakačke u fejsbuk portalu programera sa adresom pomenutom ovde."
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "Napravite WhatsApp kanal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo WhatsApp kanal"
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "TITLE": "API kanal",
+        "DESC": "Integrišite sa API kanalom i započnite podršku vašim potrošačima.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Naziv kanala",
+          "PLACEHOLDER": "Molim vas unesite naziv kanala",
+          "ERROR": "Ovo polje je obavezno"
         },
         "WEBHOOK_URL": {
-          "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
-          "PLACEHOLDER": "Webhook URL"
+          "LABEL": "Adresa veb zakačke",
+          "SUBTITLE": "Podesite adresu gde želite da primate povratne pozive za događaje.",
+          "PLACEHOLDER": "Adresa veb zakačke"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "Napravite API kanal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the api channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo api kanal"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "Kanal e-pošte",
+        "DESC": "Integrišite prijemno sanduče vaše e-pošte.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Naziv kanala",
+          "PLACEHOLDER": "Molim vas unesite naziv kanala",
+          "ERROR": "Ovo polje je obavezno"
         },
         "EMAIL": {
-          "LABEL": "Email",
-          "SUBTITLE": "Email where your customers sends you support tickets",
-          "PLACEHOLDER": "Email"
+          "LABEL": "E-pošta",
+          "SUBTITLE": "E-pošta gde će vaši potrošači slati tikete podrške",
+          "PLACEHOLDER": "E-pošta"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "Napravite kanal e-pošte",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo kanal e-pošte"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Započnite preusmerenje vaših e-poruka na sledeću adresu e-pošte."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "LINE kanal",
+        "DESC": "Integrišite sa LINE kanalom i započnite podršku vašim potrošačima.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Naziv kanala",
+          "PLACEHOLDER": "Molim vas unesite naziv kanala",
+          "ERROR": "Ovo polje je obavezno"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "ID LINE kanala",
+          "PLACEHOLDER": "ID LINE kanala"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Tajna LINE kanala",
+          "PLACEHOLDER": "Tajna LINE kanala"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Token LINE kanala",
+          "PLACEHOLDER": "Token LINE kanala"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Napravite LINE kanal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo LINE kanal"
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "TITLE": "Adresa povratnog poziva",
+          "SUBTITLE": "Morate da podesite adresu veb zakačke u LINE aplikaciji sa adresom pomenutom ovde."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Telegram kanal",
+        "DESC": "Integrišite sa Telegram kanalom i započnite podršku vašim potrošačima.",
         "BOT_TOKEN": {
-          "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
-          "PLACEHOLDER": "Bot Token"
+          "LABEL": "Token bota",
+          "SUBTITLE": "Podesite bot token koji ste dobili od Telegram BotFather-a.",
+          "PLACEHOLDER": "Token bota"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Napravi Telegram kanal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "Nisamo uspeli da sačuvamo telegram kanal"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "TITLE": "Izaberite kanal",
+        "DESC": "Chatwoot podržava vidžete ćaskanja, Fejbuk Mesindžer, Tviter profile, WhatsApp, E-poštu, itd., kao kanale. Ako želite da izgradite proizvoljan kanal, možete kreirati ga korišćenjem API kanala. Da bi ste počeli, izaberite jedan od kanala ispod."
       },
       "AGENTS": {
         "TITLE": "Agenti",
-        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "DESC": "Ovde možete da dodate agente da upravljaju vašim novokreiranim poštaniskim sandučetom. Samo ovi agenti će imati pristup vašem poštanskom sandučetu. Agenti koji nisu deo ovog poštanskog sandučeta neće moći da vide ili odgovaraju na poruke u ovom poštanskom sandučetu kada se prijave. <br> <b>PS:</b> Kao administrator, ako vam je potreban pristup svim poštanskim sandučićima, trebalo bi da dodate sebe kao agenta u sve poštanske sandučiće koje napravite.",
+        "VALIDATION_ERROR": "Dodajte najmanje jednog agenta novom poštanskom sandučetu",
+        "PICK_AGENTS": "Izaberite agente za prijemno sanduče"
       },
       "DETAILS": {
-        "TITLE": "Inbox Details",
-        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+        "TITLE": "Detalji prijemnog sandučeta",
+        "DESC": "Iz padajućeg menija ispod, izaberite Fejsbuk stranicu koju želite da povežete sa Chatwoot-om. Takođe možete navesti proizvoljan naziv prijemnog sandučeta za bolju identifikaciju."
       },
       "FINISH": {
-        "TITLE": "Nailed It!",
-        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+        "TITLE": "Uspeli ste!",
+        "DESC": "Uspešno ste završili integraciju vaše Fejsbuk stranice sa Chatwoo-om. Kada potrošač sledeći put pošalje poruku na tvojoj stranici, razgovor će se automatski pojaviti u prijemnom sandučetu.<br>Takođe vam pružamo skriptu za vidžet koju možete jednostavno dodati na veb sajt. Onda kada je postavljen na veb sajt, potrošači mogu da vam pošalju poruku direktno sa veb sajta bez pomoći eksternih alata i razgovor će se pojaviti ovde, na Chatwoot-u.<br>Kul, zar ne? Pa, svakako se trudimo da bude :)"
       }
     },
     "DETAILS": {
-      "LOADING_FB": "Authenticating you with Facebook...",
-      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
-      "CREATING_CHANNEL": "Creating your Inbox...",
-      "TITLE": "Configure Inbox Details",
+      "LOADING_FB": "Autentifikacija sa Fejsbukom...",
+      "ERROR_FB_AUTH": "Nešto je pošlo po zlu, Molim vas osvežite stranicu...",
+      "CREATING_CHANNEL": "Pravljenje vašeg prijemnog sandučeta...",
+      "TITLE": "Podesite detalje prijemnog sandučeta",
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Add agents",
-      "ADD_AGENTS": "Adding Agents to your Inbox..."
+      "BUTTON_TEXT": "Dodaj agente",
+      "ADD_AGENTS": "Dodaju se agenti vašem prijenom sandučetu..."
     },
     "FINISH": {
-      "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
-      "BUTTON_TEXT": "Take me there",
-      "MORE_SETTINGS": "More settings",
-      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+      "TITLE": "Vaše prijemno sanduče je spremno!",
+      "MESSAGE": "Možete se povezati sa vašim potrošačima kroz vaš novi kanal. Srećna podrška ",
+      "BUTTON_TEXT": "Odvedi me tamo",
+      "MORE_SETTINGS": "Više podešavanja",
+      "WEBSITE_SUCCESS": "Uspešno ste završili pravljenje kanala veb sajta. Iskopirajte kod prikazan ispod i nalepite ga u vaš vab sajt. Sledeći put kada potrošač koristi ćaskanje uživo, razgovor će se automatski pojaviti u prijemnom sandučetu."
     },
-    "REAUTH": "Reauthorize",
-    "VIEW": "View",
+    "REAUTH": "Ponovna autorizacija",
+    "VIEW": "Pregled",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
-        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
-        "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
+        "SUCCESS_MESSAGE": "Podešavanja prijemnog sandučeta su uspešno izmenjena",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatsko dodeljivanje je uspešno izmenjeno",
+        "ERROR_MESSAGE": "Nisamo mogli da izmenimo podešavanja prijemnog sandučeta. Molim vas pokušajte ponovo."
       },
       "EMAIL_COLLECT_BOX": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Omogućeno",
+        "DISABLED": "Onemogućeno"
       },
       "ENABLE_CSAT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Omogućeno",
+        "DISABLED": "Onemogućeno"
       },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Omogućeno",
+        "DISABLED": "Onemogućeno"
       },
       "ENABLE_CONTINUITY_VIA_EMAIL": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Omogućeno",
+        "DISABLED": "Onemogućeno"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Omogućeno"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Obriši avatar",
       "CONFIRM": {
         "TITLE": "Potvrdite brisanje",
         "MESSAGE": "Sigurni ste da želite izbrisati ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "Molim vas upišite {inboxName} za potvrdu",
         "YES": "Da, izbriši ",
         "NO": "Ne, zadrži "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Inbox deleted successfully",
-        "ERROR_MESSAGE": "Could not delete inbox. Please try again later.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Prijemno sanduče je uspešno obrisano",
+        "ERROR_MESSAGE": "Nije bilo moguće obrisati prijemno sanduče. Molim vas pokušajte ponovo.",
+        "AVATAR_SUCCESS_MESSAGE": "Avatar prijemnog sandučeta je uspešno obrisan",
+        "AVATAR_ERROR_MESSAGE": "Nije bilo moguće obrisati avatar prijemnog sandučeta. Molim vas pokušajte ponovo."
       }
     },
     "TABS": {
-      "SETTINGS": "Settings",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
-      "CAMPAIGN": "Campaigns",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "SETTINGS": "Podešavanja",
+      "COLLABORATORS": "Saradnici",
+      "CONFIGURATION": "Konfiguracije",
+      "CAMPAIGN": "Kampanje",
+      "PRE_CHAT_FORM": "Formular pre ćaskanja",
+      "BUSINESS_HOURS": "Radno vreme",
+      "WIDGET_BUILDER": "Izgrađivač vidžeta"
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "Podešavanja",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
-      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
+      "LABEL": "Mogućnosti",
+      "DISPLAY_FILE_PICKER": "Prikaži izbornik datoteke na vidžetu",
+      "DISPLAY_EMOJI_PICKER": "Prikaži izbornik emotikona u vidžetu",
+      "ALLOW_END_CONVERSATION": "Dozvoli korisnicima da završe razgovor iz vidžeta"
     },
     "SETTINGS_POPUP": {
-      "MESSENGER_HEADING": "Messenger Script",
-      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "MESSENGER_HEADING": "Mesindžer skripta",
+      "MESSENGER_SUB_HEAD": "Postavite ovo dugme unutar body oznake",
       "INBOX_AGENTS": "Agenti",
-      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
-      "UPDATE": "Update",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
-      "AUTO_ASSIGNMENT": "Enable auto assignment",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
-      "INBOX_UPDATE_TITLE": "Inbox Settings",
-      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
-      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
-      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_TITLE": "API Key"
+      "INBOX_AGENTS_SUB_TEXT": "Dodajte ili uklonite agente iz ovog prijemnog sandučeta",
+      "AGENT_ASSIGNMENT": "Dodeljivanje razgovoru",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Izmena podešavanja dodele razgovora",
+      "UPDATE": "Primeni",
+      "ENABLE_EMAIL_COLLECT_BOX": "Omogući polje za prikupljanje e-pošte",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Omogući ili onemogući polje za prikupljanje e-pošte za novi razgovor",
+      "AUTO_ASSIGNMENT": "Omogući automatsko dodeljivanje",
+      "ENABLE_CSAT": "Omogući ocenu zadovoljstva korisnika",
+      "ENABLE_CSAT_SUB_TEXT": "Omogući/onemogući upitnik o zadovoljstvu korisnika nakon rešavanja razgovora",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Omogući nastavljanje razgovora putem e-pošte",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Razgovori će se nastaviti putem e-pošte ako je dostupna adresa e-pošte kontakta.",
+      "INBOX_UPDATE_TITLE": "Podešavanja prijemnog sandučeta",
+      "INBOX_UPDATE_SUB_TEXT": "Izmenite podešavanja vašeg prijemnog sandučeta",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Omogući ili onemogući automatsku dodelu novih razgovora agentima dodatih ovom prijemnom sandučetu.",
+      "HMAC_VERIFICATION": "Potvrda identiteta korisnika",
+      "HMAC_DESCRIPTION": "Da bi se potvrdio identitet korisnika, morate proslediti `identifier_hash` za svakog korisnika. Možete generisti HMAC sha256 heš koristeći `identifier` sa ključem prikazanim ovde.",
+      "HMAC_MANDATORY_VERIFICATION": "Primoraj potvrdu identiteta korisnika",
+      "HMAC_MANDATORY_DESCRIPTION": "Ukoliko je omogućeno, zahtevi kojima nedostaje `identifier_hash` će biti odbijeni.",
+      "INBOX_IDENTIFIER": "Identifikator prijemnog sandučeta",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Koristite `inbox_identifier` token prikazan ovde za autentifikaciju vaših API klijenata.",
+      "FORWARD_EMAIL_TITLE": "Prosledi na e-poštu",
+      "FORWARD_EMAIL_SUB_TEXT": "Započnite preusmerenje vaših e-poruka na sledeću adresu e-pošte.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Dozvoli poruke nakon rešavanja razgovora",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Dozvolite krajnjim korisnicima da šalju poruke čak i kada je razgovor rešen.",
+      "WHATSAPP_SECTION_SUBHEADER": "Ovaj API ključ se koristi za integraciju sa WhatsApp API-jima.",
+      "WHATSAPP_SECTION_TITLE": "API ključ"
     },
     "AUTO_ASSIGNMENT": {
-      "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
-      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
-      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
+      "MAX_ASSIGNMENT_LIMIT": "Ograničenje automatskog dodeljivanja",
+      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Molim vas unesite vrednost veću od 0",
+      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Ograničite maksimalni broj razgovora u ovom prijemnom sandučetu koja mogu biti automatski dodeljena agentu"
     },
     "FACEBOOK_REAUTHORIZE": {
-      "TITLE": "Reauthorize",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
-      "MESSAGE_ERROR": "There was an error, please try again"
+      "TITLE": "Ponovna autorizacija",
+      "SUBTITLE": "Vaša veza sa Fejsbukom je istekla, molim vas povežite ponovo vašu Fejsbuk stranicu za nastavak servisa",
+      "MESSAGE_SUCCESS": "Uspešno ponovno povezivanje",
+      "MESSAGE_ERROR": "Pojavila se greška, molim vas pokušajte ponovo"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
-      "SET_FIELDS": "Pre chat form fields",
+      "DESCRIPTION": "Formular pre ćaskanja omogućava vam da dobijete informacije o korisniku pre započinjanja razgovora sa vama.",
+      "SET_FIELDS": "Polja formulara pre ćaskanja",
       "SET_FIELDS_HEADER": {
-        "FIELDS": "Fields",
-        "LABEL": "Label",
-        "PLACE_HOLDER": "Placeholder",
+        "FIELDS": "Polja",
+        "LABEL": "Oznaka",
+        "PLACE_HOLDER": "Pomoćni tekst",
         "KEY": "Ključ",
         "TYPE": "Tip",
-        "REQUIRED": "Required"
+        "REQUIRED": "Obavezno"
       },
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Omogući formular pre ćaskanja",
         "OPTIONS": {
-          "ENABLED": "Yes",
-          "DISABLED": "No"
+          "ENABLED": "Da",
+          "DISABLED": "Ne"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre chat message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Poruka pre ćaskanja",
+        "PLACEHOLDER": "Ova poruka će biti vidljiva korisnicima uz formular"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "Posetioci bi trebali da dostave njihovo ime i adresu e-pošte pre započinjanja ćaskanja"
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
-      "WEEKLY_TITLE": "Set your weekly hours",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TITLE": "Podesite vašu dostupnost",
+      "SUBTITLE": "Podesite vašu dostupnost na vidžetu za uživo razgovor",
+      "WEEKLY_TITLE": "Podesite vaše nedeljne sate",
+      "TIMEZONE_LABEL": "Izaberite vremenski zonu",
+      "UPDATE": "Izmena podešavanja radnog vremena",
+      "TOGGLE_AVAILABILITY": "Omogući vreme dostupnosti za ovo prijemno sanduče",
+      "UNAVAILABLE_MESSAGE_LABEL": "Poruka nedostupnosti za posetioce",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Trenutno nismo dostupni. Ostavite poruku i odgovorićemo vam čim je pročitamo.",
+      "TOGGLE_HELP": "Omogućavanje vremena dostupnosti će prikazati dostupno vreme na vidžetu ćaskanja čak i kada su svi agenti nedostupni. Van radnih sati posetioci će biti upozoreni porukom i formularom pre ćaskanja.",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
-        "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "ENABLE": "Omogućite dostupnost za ovaj dan",
+        "UNAVAILABLE": "Nedostupan",
+        "HOURS": "sati",
+        "VALIDATION_ERROR": "Vreme početka bi trebalo biti pre vremena završetka.",
+        "CHOOSE": "Izaberite"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "Ceo dan"
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Podesite vaše IMAP detalje",
+      "NOTE_TEXT": "Da bi ste omogućili SMTP, molim vas podesite IMAP.",
+      "UPDATE": "Izmenite IMAP podešavanja",
+      "TOGGLE_AVAILABILITY": "Omogući IMAP podešavanja za ovo prijemno sanduče",
+      "TOGGLE_HELP": "Omogućavanje IMAP-a će pomoći korisniku da prima e-poruke",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "IMAP podešavanja su uspešno izmenjena",
+        "ERROR_MESSAGE": "Nije bilo moguče izmeniti IMAP podešavanja"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Adresa",
+        "PLACE_HOLDER": "Adresa (npr.: imap.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
       "LOGIN": {
-        "LABEL": "Login",
-        "PLACE_HOLDER": "Login"
+        "LABEL": "Prijava",
+        "PLACE_HOLDER": "Prijava"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "PLACE_HOLDER": "Password"
+        "LABEL": "Lozinka",
+        "PLACE_HOLDER": "Lozinka"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Omogući SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Podesite vaše SMTP detalje",
+      "UPDATE": "Izmenite SMTP podešavanja",
+      "TOGGLE_AVAILABILITY": "Omogući SMTP podešavanja za ovo prijemno sanduče",
+      "TOGGLE_HELP": "Omogućavanje SMTP-a će pomoći korisniku da šalje e-poruke",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "SMTP podešavanja su uspešno izmenjena",
+        "ERROR_MESSAGE": "Nije bilo moguče izmeniti SMTP podešavanja"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Adresa",
+        "PLACE_HOLDER": "Adresa (npr.: smtp.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
       "LOGIN": {
-        "LABEL": "Login",
-        "PLACE_HOLDER": "Login"
+        "LABEL": "Prijava",
+        "PLACE_HOLDER": "Prijava"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "PLACE_HOLDER": "Password"
+        "LABEL": "Lozinka",
+        "PLACE_HOLDER": "Lozinka"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
+        "LABEL": "Domen",
+        "PLACE_HOLDER": "Domen"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Enkripcija",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
-      "AUTH_MECHANISM": "Authentication"
+      "OPEN_SSL_VERIFY_MODE": "Mod provere otvorenog SSL-a",
+      "AUTH_MECHANISM": "Autentifikacija"
     },
-    "NOTE": "Note: "
+    "NOTE": "Beleška: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Avatar veb sajta",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar je uspešno obrisan",
+              "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Naziv veb sajta",
+          "PLACE_HOLDER": "Unesite naziv vašeg veb sajta (npr.: Acme Inc)",
+          "ERROR": "Molim vas unesite ispravan naziv veb sajta"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Naslov dobrodošlice",
+          "PLACE_HOLDER": "Zdravo!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Podnaslov dobrodošlice",
+          "PLACE_HOLDER": "Činimo jednostavnim da se povežete sa nama. Pitajte nas bilo šta ili podelite sa nama vaše utiske."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Vreme odgovora",
+          "IN_A_FEW_MINUTES": "Za nekoliko minuta",
+          "IN_A_FEW_HOURS": "Za nekoliko sati",
+          "IN_A_DAY": "Za dan"
+        },
+        "WIDGET_COLOR_LABEL": "Boja vidžeta",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Pozicija vidžet balončića",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Vrsta vidžet balončića",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Razgovarajte sa nama",
+          "LABEL": "Naslov pokretača vidžet balončića",
+          "PLACE_HOLDER": "Razgovarajte sa nama"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Izmeni vidžet podešavanja",
+          "API": {
+            "SUCCESS_MESSAGE": "Vidžet podešavanja su uspešno izmenjena",
+            "ERROR_MESSAGE": "Nije bilo moguče izmeniti vidžet podešavanja"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Pregledajte",
+          "SCRIPT": "Skripta"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Levo",
+          "RIGHT": "Desno"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standardno",
+          "EXPANDED_BUBBLE": "Prošireni balončić"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Predefinisano",
+        "CHAT": "Ćaskanje"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Obično odgovaramo u roku od nekoliko minuta",
+        "IN_A_FEW_HOURS": "Obično odgovaramo u roku od nekoliko sati",
+        "IN_A_DAY": "Obično odgovaramo u roku od jednog dana"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Započnite razgovor",
+        "CHAT_INPUT_PLACEHOLDER": "Napišite vašu poruku"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Dostupni smo",
+          "OFFLINE": "Trenutno nismo dostupni"
+        },
+        "USER_MESSAGE": "Ćao",
+        "AGENT_MESSAGE": "Zdravo"
+      },
+      "BRANDING_TEXT": "Pokreće Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings ={options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrationApps.json b/app/javascript/dashboard/i18n/locale/sr/integrationApps.json
index b201f95ff..5cb514968 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrationApps.json
@@ -1,36 +1,36 @@
 {
   "INTEGRATION_APPS": {
-    "FETCHING": "Fetching Integrations",
-    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
-    "HEADER": "Applications",
+    "FETCHING": "Preuzimanje integracija",
+    "NO_HOOK_CONFIGURED": "Nema %{integrationId} integracija podešenih na ovom nalogu.",
+    "HEADER": "Aplikacije",
     "STATUS": {
-      "ENABLED": "Enabled",
-      "DISABLED": "Disabled"
+      "ENABLED": "Omogućeno",
+      "DISABLED": "Onemogućeno"
     },
-    "CONFIGURE": "Configure",
-    "ADD_BUTTON": "Add a new hook",
+    "CONFIGURE": "Podesi",
+    "ADD_BUTTON": "Dodaj novu zakačku",
     "DELETE": {
       "TITLE": {
-        "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "INBOX": "Potvrdi brisanje",
+        "ACCOUNT": "Prekini vezu"
       },
       "MESSAGE": {
-        "INBOX": "Are you sure to delete?",
-        "ACCOUNT": "Are you sure to disconnect?"
+        "INBOX": "Da li zaista želite da obrišete?",
+        "ACCOUNT": "Da li zaista želite da prekinete vezu?"
       },
       "CONFIRM_BUTTON_TEXT": {
-        "INBOX": "Yes, Delete",
-        "ACCOUNT": "Yes, Disconnect"
+        "INBOX": "Da, obriši",
+        "ACCOUNT": "Da, prekini vezu"
       },
       "CANCEL_BUTTON_TEXT": "Otkaži",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "Zakačka je uspešno obrisana",
         "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "FETCHING": "Preuzimanje zakački integracija",
+      "INBOX": "Prijemno sanduče",
       "DELETE": {
         "BUTTON_TEXT": "Izbriši"
       }
@@ -38,25 +38,25 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "Izaberi prijemno sanduče",
+          "PLACEHOLDER": "Izaberi prijemno sanduče"
         },
-        "SUBMIT": "Create",
+        "SUBMIT": "Napravi",
         "CANCEL": "Otkaži"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "Zakačka integracije je uspešno dodata",
         "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "Poveži"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "Prekini vezu"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow je platforma za razumevanje prirodnog jezika koja olakšava dizajniranje i integraciju interfejsa korisnika razgovora u vašu aplikaciju za mobilne telefone, wev aplikaciju, uređaj, bot, sistem interaktivnog glasovnog odgovora itd. <br /> <br /> Dialogflow integracija sa %{installationName} vam omogućava da podesite Dialogflow bot sa vašim prijemnim sandučićima što omogućava botu da rešava početne upite i prosleđuje ih agentu kada je to potrebno. Dialogflow se može koristiti za kvalifikaciju tragova, smanjenje opterećenja agenata prosleđivanjem često postavljanih pitanja itd. <br /> <br /> Da bi ste dodali Dialogflow, morate da kreirate servisni nalog u konzoli vašeg Google projekta i podeliti kredencijale. Konsultujte Dialogflow dokumentaciju za dodatne informacije."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 5c5f33fa8..0d52b7595 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -1,134 +1,134 @@
 {
   "INTEGRATION_SETTINGS": {
-    "HEADER": "Integrations",
+    "HEADER": "Integracije",
     "WEBHOOK": {
-      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "SUBSCRIBED_EVENTS": "Pretplaćeni događaji",
       "FORM": {
         "CANCEL": "Otkaži",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "DESC": "Događaji veb zakački vam omogućavaju informacije u realnom vremenu o onome šta se događa na vašem Chatwoot nalogu. Molim vas unesite ispravnu adresu da bi ste podesili povratni poziv.",
         "SUBSCRIPTIONS": {
-          "LABEL": "Events",
+          "LABEL": "Događaji",
           "EVENTS": {
-            "CONVERSATION_CREATED": "Conversation Created",
-            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
-            "CONVERSATION_UPDATED": "Conversation Updated",
-            "MESSAGE_CREATED": "Message created",
-            "MESSAGE_UPDATED": "Message updated",
-            "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user"
+            "CONVERSATION_CREATED": "Razgovor je napravljen",
+            "CONVERSATION_STATUS_CHANGED": "Status razgovora je promenjen",
+            "CONVERSATION_UPDATED": "Razgovor je izmenjen",
+            "MESSAGE_CREATED": "Poruka je napravljena",
+            "MESSAGE_UPDATED": "Poruka je izmenjena",
+            "WEBWIDGET_TRIGGERED": "Vidžet za ćaskanje je otvoren od strane korisnika"
           }
         },
         "END_POINT": {
-          "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Example: https://example/api/webhook",
-          "ERROR": "Please enter a valid URL"
+          "LABEL": "Adresa veb zakačke",
+          "PLACEHOLDER": "Primer: https://example/api/webhook",
+          "ERROR": "Molim vas unesite ispravnu adresu"
         },
-        "EDIT_SUBMIT": "Update webhook",
-        "ADD_SUBMIT": "Create webhook"
+        "EDIT_SUBMIT": "Izmeni veb zakačku",
+        "ADD_SUBMIT": "Napravi veb zakačku"
       },
-      "TITLE": "Webhook",
-      "CONFIGURE": "Configure",
-      "HEADER": "Webhook settings",
-      "HEADER_BTN_TXT": "Add new webhook",
-      "LOADING": "Fetching attached webhooks",
+      "TITLE": "Veb zakačka",
+      "CONFIGURE": "Podesi",
+      "HEADER": "Podešavanja veb zakačke",
+      "HEADER_BTN_TXT": "Dodaj novu veb zakačku",
+      "LOADING": "Prikupljanje dodatih veb zakački",
       "SEARCH_404": "Nema razultata",
-      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
+      "SIDEBAR_TXT": "<p><b>Veb zakačke</b> </p> <p>Veb zakačke su HTTP povratni pozivi koji mogu biti definisani za svaki nalog. Pozivaju ih događaji kao što je pravljenje poruke u Chatwoot-u. Možete kreirati više od jedne veb zakačke za ovaj nalog. <br /><br /> Za kreiranje <b>veb zakačke</b>, kliknite na dugem <b>Dodaj novu veb zakačku</b>. Takođe možete ukloniti postojeće veb zakačke klikom na dugme Obriši.</p>",
       "LIST": {
-        "404": "There are no webhooks configured for this account.",
-        "TITLE": "Manage webhooks",
+        "404": "Nema veb zakački podešenih za ovaj nalog.",
+        "TITLE": "Upravljanje veb zakačkama",
         "TABLE_HEADER": [
-          "Webhook endpoint",
+          "Krajnje tačke veb zakački",
           "Akcije"
         ]
       },
       "EDIT": {
         "BUTTON_TEXT": "Uredi",
-        "TITLE": "Edit webhook",
+        "TITLE": "Uredi veb zakačku",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "SUCCESS_MESSAGE": "Veb zakačka je uspešno izmenjena",
           "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
         }
       },
       "ADD": {
         "CANCEL": "Otkaži",
-        "TITLE": "Add new webhook",
+        "TITLE": "Dodaj novu veb zakačku",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
+          "SUCCESS_MESSAGE": "Podešavanje veb zakačke je uspešno dodato",
           "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
         }
       },
       "DELETE": {
         "BUTTON_TEXT": "Izbriši",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "SUCCESS_MESSAGE": "Veb zakačka je uspešno obrisana",
           "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
         },
         "CONFIRM": {
           "TITLE": "Potvrdite brisanje",
-          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
+          "MESSAGE": "Da li zaista želite da obrišete veb zakačku? (%{webhookURL})",
           "YES": "Da, izbriši ",
-          "NO": "No, Keep it"
+          "NO": "Ne, zadrži je"
         }
       }
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+        "TITLE": "Koristi Slack integraciju",
+        "BODY": "<br/><p>Chatwoot će sada sinhronizovati sve dolazne razgovore u kanal <b><i>customer-conversations</i></b> unutar vašeg slack radnog mesta.</p><p>Odgovaranjem na razgovor u <b><i>customer-conversations</i></b> slack kanal će napraviti odgovor potrošaču kroz chatwoot.</p><p>Započnite odgovore sa <b><i>note:</i></b> da bi ste napravili privatne beleške umesto odgovora.</p><p>Ako odgovarač na slack-u ima agentski profil u chatwoot-u pod istom adresom e-pošte, odgovori će biti odgovarajuće povezani.</p><p>Kada odgovarač nema povezani agentski profil, odgovori će biti napravljeni od strane bot profila.</p>"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "Integracija je uspešno obrisana"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "Poveži se"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
-      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "TITLE": "Aplikacije radne table",
+      "HEADER_BTN_TXT": "Dodaj novu aplikaciju radne table",
+      "SIDEBAR_TXT": "<p><b>Aplikacije radne table</b></p><p>Aplikacije radne table omogućavaju organizacijama da integrišu aplikaciju unutar Chatwoot radne table da dostave kontekst agentima podrške. Ova mogućnosti vam omogućava da napravite aplikaciju nezavisno i integrišete je unutar radne table da bi ste dostavili informacije o korisniku, njihovim narudžbama ili istoriji prethodnih plaćanja.</p><p>Kada integrišete vašu aplikaciju koristeći radnu tablu u Chatwoot-u, vaša aplikacija će dobiti kontakst razgovora i kontakta kao window događaj. Implementirajte osluškivač događaj poruke na vašoj stranici da bi ste primili kontakst.</p><p>Da bi ste dodali novu aplikaciju radne table, kliknite na dugme 'Dodaj novu aplikaciju radne table'.</p>",
+      "DESCRIPTION": "Aplikacije radne table omogućavaju organizacijama da integrišu aplikaciju unutar radne table da bi omogućili kontekst agentima podrške. Ova mogućnost omogućava da nezavisno napravite aplikaciju i integrišete je da bi ste dostavili informacije o korisniku, njihovim narudžbama ili njihovoj istoriji plaćanja.",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "Još uvek nema aplikacija radne table podešenih za ovaj nalog",
+        "LOADING": "Prikupljanje aplikacija radne table...",
         "TABLE_HEADER": [
           "Ime",
-          "Endpoint"
+          "Krajnja tačka"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "Uredi aplikaciju",
+        "DELETE_TOOLTIP": "Obriši aplikaciju"
       },
       "FORM": {
         "TITLE_LABEL": "Ime",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
-        "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "TITLE_PLACEHOLDER": "Unesite naziv vaše aplikacije radne table",
+        "TITLE_ERROR": "Naziv aplikacije radne table je obavezno",
+        "URL_LABEL": "Krajnja tačka",
+        "URL_PLACEHOLDER": "Unesite adresu krajnje tačke gde je hostovana vaša aplikacija",
+        "URL_ERROR": "Ispravna adresa je obavezna"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "Dodaj novu aplikaciju radne table",
         "FORM_SUBMIT": "Pošalji",
         "FORM_CANCEL": "Otkaži",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "Aplikacija radne table je uspešno podešena",
+        "API_ERROR": "Nismo mogli da napravimo aplikaciju. Molim vas pokušajte ponovo"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
-        "FORM_SUBMIT": "Update",
+        "HEADER": "Uredi aplikaciju radne table",
+        "FORM_SUBMIT": "Primeni",
         "FORM_CANCEL": "Otkaži",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "Aplikacija radne table je uspešno izmenjena",
+        "API_ERROR": "Nismo mogli da izmenimo aplikaciju. Molim vas pokušajte ponovo"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
-        "TITLE": "Confirm deletion",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "CONFIRM_YES": "Da, obriši je",
+        "CONFIRM_NO": "Ne, zadrži je",
+        "TITLE": "Potvrdi brisanje",
+        "MESSAGE": "Da li zaista želite da obrišete aplikaciju - %{appName}?",
+        "API_SUCCESS": "Aplikacija radne table je uspešno obrisana",
+        "API_ERROR": "Nismo mogli da obrišemo aplikaciju. Molim vas pokušajte ponovo"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/sr/labelsMgmt.json
index 478a2b5b5..57e80ea7c 100644
--- a/app/javascript/dashboard/i18n/locale/sr/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/labelsMgmt.json
@@ -1,63 +1,63 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
+    "HEADER": "Oznake",
+    "HEADER_BTN_TXT": "Dodaj oznaku",
+    "LOADING": "Preuzimanje oznaka",
     "SEARCH_404": "Nema razultata",
-    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "SIDEBAR_TXT": "<p><b>Oznake</b> <p>Oznake vam pomažu da kategorišete razgovore i učinite ih prioritetnim. Možete dodeliti oznaku razgovoru iz trake sa strane. <br /><br />Oznake su povezane sa nalogom i mogu biti korišćene za pravljenje prilagođenih radnih tokova u vašoj organizaciji. Možete dodeliti prilagođenu boju oznaci, što će je učiniti lakšom za identifikaciju. Možete da prikažete oznaku na traci sa strane da bi ste lakše filtrirali razgovore.</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "Ne postoje dostupne oznake u ovom nalogu.",
+      "TITLE": "Upravljanje oznakama",
+      "DESC": "Oznake vam omogućavaju da grupišete razgovore.",
       "TABLE_HEADER": [
         "Ime",
-        "Description",
-        "Color"
+        "Opis",
+        "Bojan"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "LABEL": "Naziv oznake",
+        "PLACEHOLDER": "Naziv oznake",
+        "REQUIRED_ERROR": "Naziv oznake je obavezno",
+        "MINIMUM_LENGTH_ERROR": "Obavezna je minimalna dužina od 2 karaktera",
+        "VALID_ERROR": "Dozvoljena su samo slova, brojevi, crtice i donje crtice"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "Opis",
+        "PLACEHOLDER": "Opis oznake"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "Bojan"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "Prikaži oznaku u traci sa strane"
       },
       "EDIT": "Uredi",
-      "CREATE": "Create",
+      "CREATE": "Napravi",
       "DELETE": "Izbriši",
       "CANCEL": "Otkaži"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Dodaj oznaku",
+      "DESC": "Oznake vam omogućavaju da grupišete razgovore.",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Oznaka je uspešno dodata",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "Uredi oznaku",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Oznaka je uspešno izmenjena",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Oznaka je uspešno obrisana",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
       },
       "CONFIRM": {
         "TITLE": "Potvrdite brisanje",
diff --git a/app/javascript/dashboard/i18n/locale/sr/login.json b/app/javascript/dashboard/i18n/locale/sr/login.json
index 36582819b..02d476daa 100644
--- a/app/javascript/dashboard/i18n/locale/sr/login.json
+++ b/app/javascript/dashboard/i18n/locale/sr/login.json
@@ -2,20 +2,20 @@
   "LOGIN": {
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "LABEL": "E-pošta",
+      "PLACEHOLDER": "E-pošta npr.: ime.prezime@primer.com"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password"
+      "LABEL": "Lozinka",
+      "PLACEHOLDER": "Lozinka"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
+      "SUCCESS_MESSAGE": "Prijava je uspešna",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "UNAUTH": "Korisničko ime / lozinka nije ispravna. Molim vas pokušajte ponovo"
     },
-    "FORGOT_PASSWORD": "Forgot your password?",
-    "CREATE_NEW_ACCOUNT": "Create new account",
-    "SUBMIT": "Login"
+    "FORGOT_PASSWORD": "Da li ste zaboravili lozinku?",
+    "CREATE_NEW_ACCOUNT": "Napravite novi nalog",
+    "SUBMIT": "Prijava"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index b0d38af02..eb70e80a1 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -1,447 +1,447 @@
 {
   "REPORT": {
     "HEADER": "Razgovori",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "LOADING_CHART": "Učitavanje podataka grafikona...",
+    "NO_ENOUGH_DATA": "Nismo primili dovoljno podataka da bi smo generisali izveštaj, Molim vas pokušajte ponovo.",
+    "DOWNLOAD_AGENT_REPORTS": "Preuzmi izveštaj o agentima",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Razgovori",
-        "DESC": "( Total )"
+        "DESC": "( Ukupno )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Dolazne poruke",
+        "DESC": "( Ukupno )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Odlazne poruke",
+        "DESC": "( Ukupno )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme prvog odgovora",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme prvog odgovora je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme rešavanja",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme rešenja je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Broj rešenih",
+        "DESC": "( Ukupno )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Poslednjih 7 dana"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Poslednjih 30 dana"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Poslednja 3 meseca"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Poslednjih 6 meseci"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslednja godina"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Prilagođen opseg vremena"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Primeni",
+      "PLACEHOLDER": "Izaberite opseg vremena"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
-    "DURATION_FILTER_LABEL": "Duration",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Vrednost za grupisanje",
+    "DURATION_FILTER_LABEL": "Trajanje",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Dan"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Dan"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Nedelja"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Dan"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Nedelja"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mesec"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Dan"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Nedelja"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mesec"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Godina"
       }
     ],
-    "BUSINESS_HOURS": "Business Hours"
+    "BUSINESS_HOURS": "Radno vreme"
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
-    "FILTER_DROPDOWN_LABEL": "Select Agent",
+    "HEADER": "Pregled agenata",
+    "LOADING_CHART": "Učitavanje podataka grafikona...",
+    "NO_ENOUGH_DATA": "Nismo primili dovoljno podataka da bi smo generisali izveštaj, Molim vas pokušajte ponovo.",
+    "DOWNLOAD_AGENT_REPORTS": "Preuzmi izveštaj o agentima",
+    "FILTER_DROPDOWN_LABEL": "Izaberi agenta",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Razgovori",
-        "DESC": "( Total )"
+        "DESC": "( Ukupno )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Dolazne poruke",
+        "DESC": "( Ukupno )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Odlazne poruke",
+        "DESC": "( Ukupno )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme prvog odgovora",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme prvog odgovora je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme rešavanja",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme rešenja je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Broj rešenih",
+        "DESC": "( Ukupno )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Poslednjih 7 dana"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Poslednjih 30 dana"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Poslednja 3 meseca"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Poslednjih 6 meseci"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslednja godina"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Prilagođen opseg vremena"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Primeni",
+      "PLACEHOLDER": "Izaberite opseg vremena"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "HEADER": "Pregled oznaka",
+    "LOADING_CHART": "Učitavanje podataka grafikona...",
+    "NO_ENOUGH_DATA": "Nismo primili dovoljno podataka da bi smo generisali izveštaj, Molim vas pokušajte ponovo.",
+    "DOWNLOAD_LABEL_REPORTS": "Preuzmi izveštaj o oznakama",
+    "FILTER_DROPDOWN_LABEL": "Izaberi oznaku",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Razgovori",
-        "DESC": "( Total )"
+        "DESC": "( Ukupno )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Dolazne poruke",
+        "DESC": "( Ukupno )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Odlazne poruke",
+        "DESC": "( Ukupno )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme prvog odgovora",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme prvog odgovora je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme rešavanja",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme rešenja je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Broj rešenih",
+        "DESC": "( Ukupno )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Poslednjih 7 dana"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Poslednjih 30 dana"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Poslednja 3 meseca"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Poslednjih 6 meseci"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslednja godina"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Prilagođen opseg vremena"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Primeni",
+      "PLACEHOLDER": "Izaberite opseg vremena"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "HEADER": "Pregled prijemnih sandučića",
+    "LOADING_CHART": "Učitavanje podataka grafikona...",
+    "NO_ENOUGH_DATA": "Nismo primili dovoljno podataka da bi smo generisali izveštaj, Molim vas pokušajte ponovo.",
+    "DOWNLOAD_INBOX_REPORTS": "Preuzmi izveštaj o prijemnim sandučićima",
+    "FILTER_DROPDOWN_LABEL": "Izaberi prijemno sanduče",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Razgovori",
-        "DESC": "( Total )"
+        "DESC": "( Ukupno )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Dolazne poruke",
+        "DESC": "( Ukupno )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Odlazne poruke",
+        "DESC": "( Ukupno )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme prvog odgovora",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme prvog odgovora je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme rešavanja",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme rešenja je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Broj rešenih",
+        "DESC": "( Ukupno )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Poslednjih 7 dana"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Poslednjih 30 dana"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Poslednja 3 meseca"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Poslednjih 6 meseci"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslednja godina"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Prilagođen opseg vremena"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Primeni",
+      "PLACEHOLDER": "Izaberite opseg vremena"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "HEADER": "Pregled tima",
+    "LOADING_CHART": "Učitavanje podataka grafikona...",
+    "NO_ENOUGH_DATA": "Nismo primili dovoljno podataka da bi smo generisali izveštaj, Molim vas pokušajte ponovo.",
+    "DOWNLOAD_TEAM_REPORTS": "Preuzmi izveštaj o timu",
+    "FILTER_DROPDOWN_LABEL": "Izaberi tim",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Razgovori",
-        "DESC": "( Total )"
+        "DESC": "( Ukupno )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Dolazne poruke",
+        "DESC": "( Ukupno )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Odlazne poruke",
+        "DESC": "( Ukupno )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme prvog odgovora",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme prvog odgovora je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "NAME": "Vreme rešavanja",
+        "DESC": "( Prosečno )",
+        "INFO_TEXT": "Ukupan broj razgovora korišćen za izračunavanje:",
+        "TOOLTIP_TEXT": "Vreme rešenja je %{metricValue} (zasnovano na %{conversationCount} razgovora)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Broj rešenih",
+        "DESC": "( Ukupno )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Poslednjih 7 dana"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Poslednjih 30 dana"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Poslednja 3 meseca"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Poslednjih 6 meseci"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslednja godina"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Prilagođen opseg vremena"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Primeni",
+      "PLACEHOLDER": "Izaberite opseg vremena"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
-    "DOWNLOAD": "Download CSAT Reports",
+    "HEADER": "Izveštaji zadovoljstva korisnika",
+    "NO_RECORDS": "Nema dostupnih odgovora o zadovoljstvu korisnika.",
+    "DOWNLOAD": "Preuzmite izveštaje o zadovoljstvu korisnika",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "Izaberite agente"
       }
     },
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "CONTACT_NAME": "Kontakt",
+        "AGENT_NAME": "Dodeljeni agent",
+        "RATING": "Ocena",
+        "FEEDBACK_TEXT": "Komentar povratne informacije"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "Ukupno odgovora",
+        "TOOLTIP": "Ukupan broj prikupljenih odgovora"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "Ocena zadovoljstva",
+        "TOOLTIP": "Ukupan broj pozitivnih odgovora / Ukupan broj odgovora * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "Procenat odgovora",
+        "TOOLTIP": "Ukupan broj odgovora / Ukupan broj poruka o zadovoljstvu korisnika * 100"
       }
     }
   },
   "OVERVIEW_REPORTS": {
-    "HEADER": "Overview",
-    "LIVE": "Live",
+    "HEADER": "Pregled",
+    "LIVE": "Uživo",
     "ACCOUNT_CONVERSATIONS": {
-      "HEADER": "Open Conversations",
-      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "HEADER": "Otvoreni razgovori",
+      "LOADING_MESSAGE": "Učitavanje metrike razgovora...",
       "OPEN": "Otvoreni",
-      "UNATTENDED": "Unattended",
+      "UNATTENDED": "Nedodeljeni",
       "UNASSIGNED": "Nedodeljen"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "Conversations by agents",
-      "LOADING_MESSAGE": "Loading agent metrics...",
-      "NO_AGENTS": "There are no conversations by agents",
+      "HEADER": "Razgovori prema agentima",
+      "LOADING_MESSAGE": "Učitavanje metrike agenata...",
+      "NO_AGENTS": "Nema razgovora po agentima",
       "TABLE_HEADER": {
         "AGENT": "Agent",
-        "OPEN": "OPEN",
-        "UNATTENDED": "Unattended",
+        "OPEN": "OTVORENI",
+        "UNATTENDED": "Nedodeljeni",
         "STATUS": "Status"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Agent status",
-      "ONLINE": "Online",
-      "BUSY": "Busy",
-      "OFFLINE": "Offline"
+      "HEADER": "Status agenta",
+      "ONLINE": "Dostupan",
+      "BUSY": "Zauzet",
+      "OFFLINE": "Nedostupan"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/resetPassword.json b/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
index 7169aeff9..1a76b2e1b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
@@ -2,12 +2,12 @@
   "RESET_PASSWORD": {
     "TITLE": "Resetuj šifru",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "LABEL": "E-pošta",
+      "PLACEHOLDER": "Molim vas unesite vašu e-poštu",
+      "ERROR": "Molim vas unesite ispravnu e-poštu"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "SUCCESS_MESSAGE": "Veza za resetovanje lozinke je poslata na vašu e-poštu",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     },
     "SUBMIT": "Pošalji"
diff --git a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
index 2896943d9..991e6c5ce 100644
--- a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
@@ -1,22 +1,22 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Postavite novu lozinku",
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "Lozinka",
+      "PLACEHOLDER": "Lozinka",
+      "ERROR": "Lozinka je prekratka"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "LABEL": "Potvrdite lozinku",
+      "PLACEHOLDER": "Potvrdite lozinku",
+      "ERROR": "Lozinke se ne poklapaju"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "SUCCESS_MESSAGE": "Lozinka je uspešno promenjena",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     },
     "CAPTCHA": {
-      "ERROR": "Verification expired. Please solve captcha again."
+      "ERROR": "Potvrda je istekla. Molim vas ponovo rešite captcha."
     },
     "SUBMIT": "Pošalji"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 9c80eb635..1efc6c08d 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -1,209 +1,241 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profile Settings",
-    "TITLE": "Profile Settings",
-    "BTN_TEXT": "Update Profile",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
-    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
-    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "LINK": "Podešavanja profila",
+    "TITLE": "Podešavanja profila",
+    "BTN_TEXT": "Izmeni profil",
+    "DELETE_AVATAR": "Obriši avatar",
+    "AVATAR_DELETE_SUCCESS": "Avatar je uspešno obrisan",
+    "AVATAR_DELETE_FAILED": "Pojavila se greška pri brisanju avatara, molim vas pokušajte ponovo",
+    "UPDATE_SUCCESS": "Vaš profil je uspešno izmenjen",
+    "PASSWORD_UPDATE_SUCCESS": "Vaša lozinka je uspešno promenjena",
+    "AFTER_EMAIL_CHANGED": "Vaš profil je uspešno izmenjen, molim vas prijavite se ponovo jer su vaši kredencijali za prijavu izmenjeni",
     "FORM": {
-      "AVATAR": "Profile Image",
-      "ERROR": "Please fix form errors",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "AVATAR": "Slika profila",
+      "ERROR": "Molim vas ispravite greške formulara",
+      "REMOVE_IMAGE": "Ukloni",
+      "UPLOAD_IMAGE": "Dodaj sliku",
+      "UPDATE_IMAGE": "Izmeni sliku",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
-        "NOTE": "Your email address is your identity and is used to log in."
+        "TITLE": "Profil",
+        "NOTE": "Vaša adresa e-pošte je vaš identitet i koristi se za prijavu."
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "TITLE": "Potpis privatne poruke",
+        "NOTE": "Napravite potpis privatne poruke koji će se dodavati svakoj poruci koju pošaljete u prijemno sanduče e-pošte. Koristite bogati uređivač sadržaja da bi ste napravili personalizovan potpis.",
+        "BTN_TEXT": "Sačuvaj potpis poruke",
+        "API_ERROR": "Nije bilo moguće sačuvati potpis! Pokušajte ponovo",
+        "API_SUCCESS": "Potpis je uspešno sačuvan"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "LABEL": "Potpis poruke",
+        "ERROR": "Potpis poruke ne može biti prazan",
+        "PLACEHOLDER": "Unesite ovde vaš potpis lične poruke."
       },
       "PASSWORD_SECTION": {
-        "TITLE": "Password",
-        "NOTE": "Updating your password would reset your logins in multiple devices.",
-        "BTN_TEXT": "Change password"
+        "TITLE": "Lozinka",
+        "NOTE": "Izmena lozinke će resetovati vaše prijave na više uređaja.",
+        "BTN_TEXT": "Promeni lozinku"
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "TITLE": "Token za pristup",
+        "NOTE": "Ovaj token se može koristiti ako izgrađujete integraciju zasnovanu na API-ju"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "NONE": "None",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "TITLE": "Zvučna obaveštenja",
+        "NOTE": "Omogućavanje zvučnih obaveštenja u radnoj tabli za nove poruke i razgovore.",
+        "NONE": "Niko",
+        "ASSIGNED": "Dodeljeni razgovori",
+        "ALL_CONVERSATIONS": "Svi razgovori"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Email Notifications",
-        "NOTE": "Update your email notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "TITLE": "Obaveštenja e-porukom",
+        "NOTE": "Ovde izmenite podešavanja obaveštenja putem e-pošte",
+        "CONVERSATION_ASSIGNMENT": "Pošalji obaveštenje putem e-poruke kada je razgovor dodeljen meni",
+        "CONVERSATION_CREATION": "Pošalji obaveštenje putem e-poruke kada je napravljen novi razgovor",
+        "CONVERSATION_MENTION": "Pošalji obaveštenje putem e-poruke kada ste pomenuti u razgovoru",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Pošalji obaveštenje putem e-poruke kada je napravljena nova poruka u dodeljenom razgovoru"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "Vaša podešavanja obaveštenja su uspešno izmenjena",
+        "UPDATE_ERROR": "Pojavila se greška pri izmeni podešavanja, molim vas pokušajte ponovo"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "Mobilna obaveštenja",
+        "NOTE": "Ovde izmenite vaša podešavanja mobilnih obaveštenja",
+        "CONVERSATION_ASSIGNMENT": "Pošalji mobilno obaveštenje kada je razgovor dodeljen meni",
+        "CONVERSATION_CREATION": "Pošalji mobilno obaveštenje kada je napravljen novi razgovor",
+        "CONVERSATION_MENTION": "Pošalji mobilno obaveštenje kada ste pomenuti u razgovoru",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Pošalji mobilno obaveštenje kada je napravljena nova poruka u dodeljenom razgovoru",
+        "HAS_ENABLED_PUSH": "Omogućili ste obaveštenje za ovaj pregledač.",
+        "REQUEST_PUSH": "Omogućite mobilna obaveštenja"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "Slika profila"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "Vaše puno ime",
+        "ERROR": "Molimo unesite ispravno puno ime",
+        "PLACEHOLDER": "Molimo unesite vaše puno ime"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Ime za prikaz",
+        "ERROR": "Molimo unesite ispravno ime za prikaz",
+        "PLACEHOLDER": "Molim vas unesite ime za prikaz, ovo će biti prikazano u razgovorima"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Dostupnost",
         "STATUSES_LIST": [
-          "Online",
-          "Busy",
-          "Offline"
+          "Dostupan",
+          "Zauzet",
+          "Nedostupan"
         ]
       },
       "EMAIL": {
-        "LABEL": "Your email address",
-        "ERROR": "Please enter a valid email address",
-        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+        "LABEL": "Vaša adresa e-pošte",
+        "ERROR": "Molim vas unesite ispravnu adresu e-pošte",
+        "PLACEHOLDER": "Molim vas unesite adresu e-pošte, ovo će biti prikazano u razgovorima"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "Trenutna lozinka",
+        "ERROR": "Molim vas unesite trenutnu lozinku",
+        "PLACEHOLDER": "Molim vas unesite trenutnu lozinku"
       },
       "PASSWORD": {
-        "LABEL": "New password",
-        "ERROR": "Please enter a password of length 6 or more",
-        "PLACEHOLDER": "Please enter a new password"
+        "LABEL": "Nova lozinka",
+        "ERROR": "Molim vas unesite lozinku od 6 karaktera ili dužu",
+        "PLACEHOLDER": "Molim vas unesite novu lozinku"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
-        "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "LABEL": "Potvrdite novu lozinku",
+        "ERROR": "Potvrdna lozinka bi trebala da se poklapa sa lozinkom",
+        "PLACEHOLDER": "Molim vas ponovo unesite novu lozinku"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Change",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "CONTACT_SUPPORT": "Contact Support",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
-    "LOGOUT": "Logout"
+    "CHANGE_AVAILABILITY_STATUS": "Promeni",
+    "CHANGE_ACCOUNTS": "Promeni nalog",
+    "CONTACT_SUPPORT": "Kontaktiraj podršku",
+    "SELECTOR_SUBTITLE": "Izaberite nalog iz sledećeg spiska",
+    "PROFILE_SETTINGS": "Podešavanja profila",
+    "KEYBOARD_SHORTCUTS": "Prečice tastature",
+    "LOGOUT": "Odjavi se"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "TRIAL_MESSAGE": "dana preostalo od probnog perioda.",
+    "TRAIL_BUTTON": "Kupi sada",
+    "DELETED_USER": "Obrisan korisnik",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Nalog je suspendovan",
+      "MESSAGE": "Vaš nalog je suspendovan. Molim vas kontaktirajte tim za podršku za dodatne informacije."
+    }
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Kopiraj",
+      "COPY_SUCCESSFUL": "Kod je uspešno kopiran na beležnicu"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Prikaži više",
+      "SHOW_LESS": "Prikaži manje"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "Preuzmi",
       "UPLOADING": "Dodavanje..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Pošalji"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Proveravanje...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "Dodaj prijemno sanduče"
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
-    "SWITCH": "Switch",
+    "CURRENTLY_VIEWING_ACCOUNT": "Trenutno pregledate:",
+    "SWITCH": "Prebaci",
     "CONVERSATIONS": "Razgovori",
-    "ALL_CONVERSATIONS": "All Conversations",
+    "ALL_CONVERSATIONS": "Svi razgovori",
     "MENTIONED_CONVERSATIONS": "Spominjanja",
-    "REPORTS": "Reports",
-    "SETTINGS": "Settings",
+    "REPORTS": "Izveštaji",
+    "SETTINGS": "Podešavanja",
     "CONTACTS": "Kontakti",
-    "HOME": "Home",
+    "HOME": "Početak",
     "AGENTS": "Agenti",
-    "INBOXES": "Inboxes",
-    "NOTIFICATIONS": "Notifications",
+    "INBOXES": "Prijemni sandučići",
+    "NOTIFICATIONS": "Obaveštenja",
     "CANNED_RESPONSES": "Gotovi odgovori",
-    "INTEGRATIONS": "Integrations",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "APPLICATIONS": "Applications",
-    "LABELS": "Labels",
+    "INTEGRATIONS": "Integracije",
+    "PROFILE_SETTINGS": "Podešavanja profila",
+    "ACCOUNT_SETTINGS": "Podešavanja naloga",
+    "APPLICATIONS": "Aplikacije",
+    "LABELS": "Oznake",
     "CUSTOM_ATTRIBUTES": "Prilagođeni atributi",
-    "AUTOMATION": "Automation",
-    "TEAMS": "Teams",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
-    "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
+    "AUTOMATION": "Automatizacija",
+    "TEAMS": "Timovi",
+    "BILLING": "Plaćanje",
+    "CUSTOM_VIEWS_FOLDER": "Fascikle",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmenti",
+    "ALL_CONTACTS": "Svi kontakti",
+    "TAGGED_WITH": "Označeni sa",
+    "NEW_LABEL": "Nova oznaka",
+    "NEW_TEAM": "Novi tim",
+    "NEW_INBOX": "Novo prijemno sanduče",
     "REPORTS_CONVERSATION": "Razgovori",
-    "CSAT": "CSAT",
-    "CAMPAIGNS": "Campaigns",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "CSAT": "Izveštaj o zadovoljstvu",
+    "CAMPAIGNS": "Kampanje",
+    "ONGOING": "Dugotrajne",
+    "ONE_OFF": "Jednokratne",
     "REPORTS_AGENT": "Agenti",
-    "REPORTS_LABEL": "Labels",
-    "REPORTS_INBOX": "Inbox",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "REPORTS_LABEL": "Oznake",
+    "REPORTS_INBOX": "Prijemno sanduče",
+    "REPORTS_TEAM": "Tim",
+    "SET_AVAILABILITY_TITLE": "Postavite da ste",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "REPORTS_OVERVIEW": "Pregled",
+    "FACEBOOK_REAUTHORIZE": "Vaša veza sa Fejsbukom je istekla, molim vas povežite ponovo vašu Fejsbuk stranicu za nastavak servisa",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Svi članci",
+      "MY_ARTICLES": "Moji članci",
+      "DRAFT": "Nacrt",
+      "ARCHIVED": "Arhivirano",
+      "CATEGORY": "Kategorija",
+      "CATEGORY_EMPTY_MESSAGE": "Nije pronađena nijedna kategorija"
+    },
+    "DOCS": "Pročitaj dokumentaciju"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Plaćanje",
+    "CURRENT_PLAN": {
+      "TITLE": "Trenutni plan",
+      "PLAN_NOTE": "Trenutno ste pretplaćeni na **%{plan}** plan sa **%{quantity}** licenci"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Upravljate vašom pretplatom",
+      "DESCRIPTION": "Pregledajte vaše prethodne račune, izmenite podatke o plaćanju ili prekinite vašu pretplatu.",
+      "BUTTON_TXT": "Idite na portal za plaćanje"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Treba vam pomoć?",
+      "DESCRIPTION": "Da li imate probleme sa plaćanjem? Ovde smo da bi vam pomogli.",
+      "BUTTON_TXT": "Razgovarajte sa nama"
+    },
+    "NO_BILLING_USER": "Vaš nalog za plaćanje se podešava. Molim vas osvežite stranicu i pokušajte ponovo."
   },
   "CREATE_ACCOUNT": {
-    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NO_ACCOUNT_WARNING": "O ne! Nismo mogli da pronađemo nijedan Chatwoot nalog. Molim vas kreirajte novi da bi ste nastavili.",
+    "NEW_ACCOUNT": "Novi nalog",
+    "SELECTOR_SUBTITLE": "Napravite novi nalog",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "Nalog je uspešno kreiran",
+      "EXIST_MESSAGE": "Nalog već postoji",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Account Name",
+        "LABEL": "Naziv naloga",
         "PLACEHOLDER": "Wayne Enterprises"
       },
       "SUBMIT": "Pošalji"
@@ -211,22 +243,22 @@
   },
   "KEYBOARD_SHORTCUTS": {
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
-      "RESOLVE_AND_NEXT": "Resolve and move to next",
-      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
-      "RESOLVE_CONVERSATION": "Resolve Conversation",
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "TOGGLE_SIDEBAR": "Toggle Sidebar",
-      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
-      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "Otvoren razgovor",
+      "RESOLVE_AND_NEXT": "Reši i idi na sledeći",
+      "NAVIGATE_DROPDOWN": "Navigacija stavkama padajućeg menija",
+      "RESOLVE_CONVERSATION": "Reši razgovor",
+      "GO_TO_CONVERSATION_DASHBOARD": "Idi na radnu tablu razgovora",
+      "ADD_ATTACHMENT": "Dodaj prilog",
+      "GO_TO_CONTACTS_DASHBOARD": "Idi na radnu tablu kontakata",
+      "TOGGLE_SIDEBAR": "Prikaži bočnu traku",
+      "GO_TO_REPORTS_SIDEBAR": "Idi na bočnu traku izveštaja",
+      "MOVE_TO_NEXT_TAB": "idi na sledeću karticu u spisku razgovora",
+      "GO_TO_SETTINGS": "Idi na podešavanja",
+      "SWITCH_CONVERSATION_STATUS": "Prebaci se na sledeći status razgovora",
+      "SWITCH_TO_PRIVATE_NOTE": "Prebaci se na privatnu belešku",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Uključi uređivač bogatog sadržaja",
+      "SWITCH_TO_REPLY": "Prebaci se na odgovor",
+      "TOGGLE_SNOOZE_DROPDOWN": "Uključite padajućim menijom odlaganja"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/sr/signup.json b/app/javascript/dashboard/i18n/locale/sr/signup.json
index bff1182d9..c62b2ad59 100644
--- a/app/javascript/dashboard/i18n/locale/sr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sr/signup.json
@@ -1,39 +1,39 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Register an account",
-    "TITLE": "Register",
-    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TRY_WOOT": "Registrujte nalog",
+    "TITLE": "Registruj",
+    "TERMS_ACCEPT": "Registracijom prihvatate naše <a href=\"https://www.chatwoot.com/terms\">uslove korišćenja</a> i <a href=\"https://www.chatwoot.com/privacy-policy\">politiku privatnosti</a>",
     "ACCOUNT_NAME": {
-      "LABEL": "Account name",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "LABEL": "Naziv naloga",
+      "PLACEHOLDER": "Unesite naziv naloga. npr.: Wayne Enterprises",
+      "ERROR": "Naziv naloga je prekratak"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Puno ime",
+      "PLACEHOLDER": "Unesite vaše puno ime. npr.: Bruce Wayne",
+      "ERROR": "Puno ime je prekratko"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "Poslovna e-pošta",
+      "PLACEHOLDER": "Unesite adresu vaše poslovne e-pošte. npr.: bruce@wayne.enterprises",
+      "ERROR": "E-pošta nije ispravna"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "LABEL": "Lozinka",
+      "PLACEHOLDER": "Lozinka",
+      "ERROR": "Lozinka je prekratka",
+      "IS_INVALID_PASSWORD": "Lozinka bi trebalo da sadrži najmanje 1 veliko slovo, 1 malo slovo, 1 broj i 1 specijalni karakter"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Potvrdite lozinku",
+      "PLACEHOLDER": "Potvrdite lozinku",
+      "ERROR": "Lozinka se ne poklapa"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registration Successfull",
+      "SUCCESS_MESSAGE": "Registracija je uspešna",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     },
     "SUBMIT": "Pošalji",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "Već imate nalog?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
index da9c8eeb3..b4284cb96 100644
--- a/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
@@ -1,125 +1,125 @@
 {
   "TEAMS_SETTINGS": {
-    "NEW_TEAM": "Create new team",
-    "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "NEW_TEAM": "Napravite novi tim",
+    "HEADER": "Timovi",
+    "SIDEBAR_TXT": "<p><b>Timovi</b></p> <p>Timovi vam omogućavaju da organizujete vaše agente u grupe prema njihovim odgovornostima. <br /> Agent može biti član više timova. Možete dodeliti razgovore timu kada radite u saradnji. </p>",
     "LIST": {
-      "404": "There are no teams created on this account.",
-      "EDIT_TEAM": "Edit team"
+      "404": "Nema timova napravljenih na ovom nalogu.",
+      "EDIT_TEAM": "Uredi tim"
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
-        "DESC": "Add a title and description to your new team."
+        "TITLE": "Napravi novi tim",
+        "DESC": "Dodajte naslov i opis vašem novom timu."
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Add agents to team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+        "BUTTON_TEXT": "Dodajte agente timu",
+        "TITLE": "Dodajte agente timu - %{teamName}",
+        "DESC": "Dodajte agente vašem novokreiranom timu. Ovo vam omogućava da sarađujete kao tim u razgovorima, budete obavešteni o novim događajima u istim razgovorima."
       },
       "WIZARD": [
         {
-          "title": "Create",
+          "title": "Napravi",
           "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "body": "Napravi novi tim agenata."
         },
         {
-          "title": "Add Agents",
+          "title": "Dodaj agente",
           "route": "settings_teams_add_agents",
-          "body": "Add agents to the team."
+          "body": "Dodaj agente timu."
         },
         {
-          "title": "Finish",
+          "title": "Završi",
           "route": "settings_teams_finish",
-          "body": "You are all set to go!"
+          "body": "Sve je spremno za početak!"
         }
       ]
     },
     "EDIT_FLOW": {
       "CREATE": {
-        "TITLE": "Edit your team details",
-        "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "TITLE": "Uredite detalje vašeg tima",
+        "DESC": "Uredite naslov i opis vašeg tima.",
+        "BUTTON_TEXT": "Primeni izmene"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Update agents in team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "BUTTON_TEXT": "Uredi agente u timu",
+        "TITLE": "Dodajte agente timu - %{teamName}",
+        "DESC": "Dodajte agente vašem novokreiranom timu. Svi dodati agenti će biti obavešteni kada je razgovor dodeljen ovom timu."
       },
       "WIZARD": [
         {
-          "title": "Team details",
+          "title": "Detalji tima",
           "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "body": "Promenite naziv, opis i ostale detalje."
         },
         {
-          "title": "Edit Agents",
+          "title": "Uredi agente",
           "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "body": "Uredite agente u vašem timu."
         },
         {
-          "title": "Finish",
+          "title": "Završi",
           "route": "settings_teams_edit_finish",
-          "body": "You are all set to go!"
+          "body": "Sve je spremno za početak!"
         }
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+      "ERROR_MESSAGE": "Nije bilo moguće sačuvati detalje tima. Pokušajte ponovo."
     },
     "AGENTS": {
       "AGENT": "AGENT",
       "EMAIL": "E-POŠTA",
-      "BUTTON_TEXT": "Add agents",
-      "ADD_AGENTS": "Adding Agents to your Team...",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+      "BUTTON_TEXT": "Dodaj agente",
+      "ADD_AGENTS": "Dodaju se agenti vašem timu...",
+      "SELECT": "izaberi",
+      "SELECT_ALL": "izaberi sve agente",
+      "SELECTED_COUNT": "%{selected} od %{total} agenata je izabrano."
     },
     "ADD": {
-      "TITLE": "Add agents to team - %{teamName}",
-      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
-      "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select at least one agent."
+      "TITLE": "Dodajte agente timu - %{teamName}",
+      "DESC": "Dodajte agente vašem novokreiranom timu. Ovo vam omogućava da sarađujete kao tim u razgovorima, budete obavešteni o novim događajima u istim razgovorima.",
+      "SELECT": "izaberi",
+      "SELECT_ALL": "izaberi sve agente",
+      "SELECTED_COUNT": "%{selected} od %{total} agenata je izabrano.",
+      "BUTTON_TEXT": "Dodaj agente",
+      "AGENT_VALIDATION_ERROR": "Izaberite barem jednog agenta."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
-      "BUTTON_TEXT": "Finish"
+      "TITLE": "Vaš tim je spreman!",
+      "MESSAGE": "Sada možete sarađivati kao tim u razgovorima. Srećna podrška ",
+      "BUTTON_TEXT": "Završi"
     },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+        "SUCCESS_MESSAGE": "Tim je uspešno obrisan.",
+        "ERROR_MESSAGE": "Nije bilo moguće obrisati tim. Pokušajte ponovo."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
-        "YES": "Delete ",
+        "TITLE": "Da li zaista želite da obrišete - %{teamName}",
+        "PLACE_HOLDER": "Molim upišite {teamName} za potvrdu",
+        "MESSAGE": "Brisanjem tima će se ukloniti sve dodele timu iz razgovora koje su bile dodeljene ovom timu.",
+        "YES": "Obriši ",
         "NO": "Otkaži"
       }
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "Podešavanja",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "Primeni izmene",
+      "CREATE": "Napravi tim",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "Naziv tima",
+        "PLACEHOLDER": "Primer: Prodaja, Korisnička podrška"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "Opis tima",
+        "PLACEHOLDER": "Kratak opis o ovom timu."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "Dozvoli automatsku dodelu ovom timu."
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "Napravi tim"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/webhooks.json b/app/javascript/dashboard/i18n/locale/sr/webhooks.json
index 347c96893..560c5897d 100644
--- a/app/javascript/dashboard/i18n/locale/sr/webhooks.json
+++ b/app/javascript/dashboard/i18n/locale/sr/webhooks.json
@@ -1,5 +1,5 @@
 {
   "WEBHOOKS_SETTINGS": {
-    "HEADER": "Webhook Settings"
+    "HEADER": "Podešavanja veb zakački"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json
index bbcf28156..e49e43afa 100644
--- a/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "Whatsapp šabloni",
+            "SUBTITLE": "Izaberite koji whatsapp šablon želite da pošaljete",
+            "TEMPLATE_SELECTED_SUBTITLE": "Obrada %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Pretraži šablone",
+            "NO_TEMPLATES_FOUND": "Nijedan šablon nije pronađen",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Jezik",
+                "TEMPLATE_BODY": "Telo šablona",
+                "CATEGORY": "Kategorija"
             }
         },
         "PARSER": {
-            "VARIABLES_LABEL": "Variables",
-            "VARIABLE_PLACEHOLDER": "Enter %{variable} value",
-            "GO_BACK_LABEL": "Go Back",
-            "SEND_MESSAGE_LABEL": "Send Message",
-            "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
+            "VARIABLES_LABEL": "Promenljive",
+            "VARIABLE_PLACEHOLDER": "Unesite vrednost za %{variable}",
+            "GO_BACK_LABEL": "Povratak",
+            "SEND_MESSAGE_LABEL": "Pošalji poruku",
+            "FORM_ERROR_MESSAGE": "Molim vas popunite sve promenljive pre slanja"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index eaa9ca799..efa50ee5a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Kopierat till urklipp",
     "COMPANY": "Företag",
     "LOCATION": "Plats",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Konversationsdetaljer",
     "VIEW_PROFILE": "Visa profil",
     "BROWSER": "Webbläsare",
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index d207dce74..941b7356b 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Välj en konversation från vänster panel",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Oj då! Det ser ut som att det inte finns några meddelanden från kunder i din inkorg.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Nästa vecka"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Markera som väntande",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Återöppna konversationen",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Privat anteckning: Endast synlig för dig och ditt team",
     "CHANGE_STATUS": "Konversationsstatus ändrad",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Konversationstilldelning ändrad",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Konversationsteamet har ändrats",
     "FILE_SIZE_LIMIT": "Filen överskrider gränsen för {MAXIMUM_FILE_UPLOAD_SIZE} bifogade filer",
     "MESSAGE_ERROR": "Det gick inte att skicka detta meddelande, försök igen senare",
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index 5e32daa8c..472408ceb 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Inställningar",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Avbryt",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Inställningar"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Namn",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Radera",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Namn",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Avbryt"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Namn",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Beskrivning",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Avbryt"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 2c5a18350..01099ac7d 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Konfiguration",
       "CAMPAIGN": "Kampanjer",
       "PRE_CHAT_FORM": "Förre chattformulär",
-      "BUSINESS_HOURS": "Affärstimmar"
+      "BUSINESS_HOURS": "Affärstimmar",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Inställningar",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Ange namnet på din webbplats (t.ex. Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Välkomstrubrik",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Välkomsttagline",
+          "PLACE_HOLDER": "Vi gör det enkelt att ta kontakt med oss. Fråga oss något, eller dela din feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Inom några minuter",
+          "IN_A_FEW_HOURS": "Inom några timmar",
+          "IN_A_DAY": "Inom en dag"
+        },
+        "WIDGET_COLOR_LABEL": "Widgetfärg",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chatta med oss",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chatta med oss"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Svarar vanligtvis inom några minuter",
+        "IN_A_FEW_HOURS": "Svarar vanligtvis inom några timmar",
+        "IN_A_DAY": "Svar vanligtvis inom en dag"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Starta konversation",
+        "CHAT_INPUT_PLACEHOLDER": "Skriv ditt meddelande"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Vi är borta för tillfället"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Drivs av Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 0c2496bda..a2bc0b758 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "dagars provperiod återstår.",
     "TRAIL_BUTTON": "Köp nu",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Egna egenskaper",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Din Facebook-anslutning har löpt ut, vänligen återanslut din Facebook-sida för att fortsätta med tjänsterna"
+    "FACEBOOK_REAUTHORIZE": "Din Facebook-anslutning har löpt ut, vänligen återanslut din Facebook-sida för att fortsätta med tjänsterna",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chatta med oss"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 386828107..6ddc65fdf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "இருப்பிடம்",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "உரையாடல் விவரங்கள்",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "புரவுஸர்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index ad4e0a091..d8c01a0ae 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "இடது பலகத்தில் இருந்து உரையாடலைத் தேர்ந்தெடுக்கவும்",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "அடடா! உங்கள் இன்பாக்ஸில் வாடிக்கையாளர்களிடமிருந்து செய்திகள் எதுவும் இல்லை.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "தனிப்பட்ட குறிப்பு: உங்களுக்கும் உங்கள் குழுவினருக்கும் மட்டுமே தெரியும்",
     "CHANGE_STATUS": "உரையாடலின் நிலை மாற்றப்பட்டது",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "உரையாடல் ஒதுக்கீட்டாளர் மாற்றப்பட்டார்",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index 4c3c66766..dea3746d6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "அமைப்புகள்",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "ரத்துசெய்",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "அமைப்புகள்"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "பெயர்",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "பெயர்",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "ரத்துசெய்"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "நிலை",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "பெயர்",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "ரத்துசெய்"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 93a86f47f..1ee90dc3e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "அமைப்புகள்",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "வரவேற்பு தலைப்பு",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "வரவேற்பு டேக்லைன்",
+          "PLACE_HOLDER": "எங்களுடன் இணைவதை எளிதாக்குகிறோம். இதன் மூலம் எங்களிடம் எதையும் கேட்கலாம் அல்லது உங்கள் கருத்தைப் பகிர்ந்து கொள்ளலாம்."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "விட்ஜெட் நிறம்",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "உங்கள் செய்தியை உள்ளிடவும்"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "சாட்வுட் மூலம் இயக்கபடுகிறது",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index b2e3bd6ca..9e7ca8180 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "நாட்கள் சோதனை மீதமுள்ளது.",
     "TRAIL_BUTTON": "இப்போது வாங்க",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 1bf688151..f71d87614 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "คัดลอกไปยังคริปบอร์ดเเล้ว",
     "COMPANY": "บริษัท",
     "LOCATION": "สถานที่",
+    "BROWSER_LANGUAGE": "ภาษาของเบราว์เซอร์",
     "CONVERSATION_TITLE": "รายละเอียดการสนทนา",
     "VIEW_PROFILE": "ดูโปรไฟล์",
     "BROWSER": "บราวเซอร์",
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index e880af71f..35405ba33 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "กรุณาเลือกการสนทนาจากด้านซ้าย",
+    "SELECT_A_CONVERSATION": "กรุณาเลือกการสนทนาจากด้านซ้าย",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "ข้อมูลระบุตัวตนของผู้ใช้รายนี้ยังไม่ได้รับการยืนยัน",
     "NO_MESSAGE_1": "โอ้ว ไม่นะเหมือนจะไม่มีข้อความจากลูกค้าของคุณในกล่องข้อความ",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "สัปดาห์หน้า"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างดำเนินการ",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "เปิดการสนทนาอีกครั้ง",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "จนกว่าการตอบกลับถัดไป",
+        "TOMORROW": "จนกว่าพรุ่งนี้",
+        "NEXT_WEEK": "จนกว่าสัปดาห์หน้า"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "ข้อความลายเซ็น",
       "ENABLE_SIGN_TOOLTIP": "เปิดการใช้ลายเซ็นต์",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "โน้ตส่วนตัว: มีเพียงคุณและทีมเท่านั้นที่มองเห็นได้",
     "CHANGE_STATUS": "สถานะการสนทนามีการเปลี่ยนเเปลง",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "ผู้ได้รับมอบหมายการสนทนานี้มีการเปลี่ยนแปลง",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "เปลี่ยนทีมการสนทนาเเล้ว",
     "FILE_SIZE_LIMIT": "ไม่สามารถแนบไฟล์ขนาดใหญ่เกิน {MAXIMUM_FILE_UPLOAD_SIZE} ได้",
     "MESSAGE_ERROR": "ไม่สามารถส่งข้อความนี้ได้ โปรดลองใหม่อีกครั้ง",
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index dc6224506..1eef186d0 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "ตั้งค่า",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "ใช้งานอยู่",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "ยกเลิก",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "ตั้งค่า"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "ชื่อ",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "ลบ",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "ชื่อ",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "โปรดระบุชื่อ"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "ยกเลิก"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "หัวข้อ",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "สถานะ",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "ชื่อ",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "โปรดระบุชื่อ"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "คำอธิบาย",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "โปรดระบุคำอธิบาย"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "ยกเลิก"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 69b92d62e..4c7a23fd3 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "ตั้งค่า",
       "CAMPAIGN": "แคมเปญ",
       "PRE_CHAT_FORM": "แบบสอบถามก่อนแชท",
-      "BUSINESS_HOURS": "เวลาทำการ"
+      "BUSINESS_HOURS": "เวลาทำการ",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "ตั้งค่า",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "เปิดโหมดตรวจสอบ SSL",
       "AUTH_MECHANISM": "การตรวจสอบสิทธิ์"
     },
-    "NOTE": "หมายเหตุ: "
+    "NOTE": "หมายเหตุ: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "ชื่อเว็บไซต์",
+          "PLACE_HOLDER": "กรอกชื่อเว็บไซต์ของคุณ (เช่น SnowBoltz Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "ข้อความยินดีต้อนรับส่วนหัว",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "ข้อความยินดีต้อนรับส่วนล่าง",
+          "PLACE_HOLDER": "เราทำให้การติดต่อกับเราเป็นเรื่องง่าย ถามเราได้ทุกอย่างหรือแบ่งปันความคิดเห็นของคุณ"
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "ในไม่กี่นาที",
+          "IN_A_FEW_HOURS": "ในไม่กี่ชั่วโมง",
+          "IN_A_DAY": "ในหนึ่งวัน"
+        },
+        "WIDGET_COLOR_LABEL": "สีของวิดเจ็ต",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "คุยกับเรา",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "คุยกับเรา"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "ปกติจะตอบกลับภายในไม่กี่นาที",
+        "IN_A_FEW_HOURS": "ปกติจะตอบกลับในไม่กี่ชั่วโมง",
+        "IN_A_DAY": "ปกติจะตอบกลับภายใน 1 วัน"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "เริ่มการสนทนา",
+        "CHAT_INPUT_PLACEHOLDER": "พิมพ์ข้อความ"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "เราไม่อยู่"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index b0919e5d3..965422215 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "จำนวนวันทดลองใช้ที่เหลืออยู่",
     "TRAIL_BUTTON": "ซื้อเลย",
-    "DELETED_USER": "ผู้ใช้งานที่ถูกลบ"
+    "DELETED_USER": "ผู้ใช้งานที่ถูกลบ",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง",
     "AUTOMATION": "เงื่อนไขอัตโนมัติ",
     "TEAMS": "ทีม",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "โฟลเดอร์",
     "CUSTOM_VIEWS_SEGMENTS": "กลุ่มตามตัวกรอง",
     "ALL_CONTACTS": "รายชื่อผู้ติดต่อทั้งหมด",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "ตั้งสถานะเป็น...",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "ภาพรวม",
-    "FACEBOOK_REAUTHORIZE": "การเชื่อมต่อกับ Facebook หมดอายุแล้ว โปรดเชื่อมต่อใหม่อีกครั้ง"
+    "FACEBOOK_REAUTHORIZE": "การเชื่อมต่อกับ Facebook หมดอายุแล้ว โปรดเชื่อมต่อใหม่อีกครั้ง",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "คุยกับเรา"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "ไม่นะ! ดูเหมือนว่าเราจะไม่เจอบัญชี Chatwoot ของคุณ โปรดสร้างบัญชีใหม่เพื่อดำเนินการต่อ",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index d3340dc70..9180eb135 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Panoya başarıyla kopyalandı",
     "COMPANY": "Şirket",
     "LOCATION": "Yer",
+    "BROWSER_LANGUAGE": "Tarayıcı Dili",
     "CONVERSATION_TITLE": "Sohbet Ayrıntıları",
     "VIEW_PROFILE": "Profili Görüntüle",
     "BROWSER": "Tarayıcı",
@@ -150,7 +151,7 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
+        "SUCCESS_MESSAGE": "Kişi profil resmi başarıyla silindi",
         "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 1478bd738..86d8451b2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Lütfen sol bölmeden bir konuşma seçin",
+    "SELECT_A_CONVERSATION": "Lütfen sol bölmeden bir konuşma seçin",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Mesajlar",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Görünüşe göre gelen kutunuzda müşterilerden hiç mesaj yok.",
@@ -54,10 +56,39 @@
       "SNOOZE": {
         "TITLE": "Snooze until",
         "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
+        "TOMORROW": "Yarın",
         "NEXT_WEEK": "Sonraki hafta"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Görüşmeyi yeniden açın",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "İmzanız",
       "ENABLE_SIGN_TOOLTIP": "İmzayı aktif et",
@@ -100,9 +131,13 @@
     },
     "VISIBLE_TO_AGENTS": "Özel Not: Yalnızca siz ve ekibiniz tarafından görülebilir",
     "CHANGE_STATUS": "Görüşme durumu değişti",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Görüşme Atanan kişiyi değiştirildi",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Görüşme takımı değişti",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "FILE_SIZE_LIMIT": "Dosya {MAXIMUM_FILE_UPLOAD_SIZE} sınırını aşıyor",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Tarafından gönderildi:",
     "BOT": "Bot",
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index acb3d67d7..82a914688 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Ayarlar",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "aktif",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "İptal Et",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Ayarlar"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "İsim",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Sil",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "İsim",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "İsim gereklidir"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "İptal Et"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Başlık",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Durum",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "İsim",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "İsim gereklidir"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Açıklama",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Açıklama zorunludur"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "İptal Et"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index d21874eb2..d84a7f3f3 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Yapılandırma",
       "CAMPAIGN": "Kampanyalar",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Ayarlar",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Web Sitesi Adı",
+          "PLACE_HOLDER": "Web sitenizin adını girin",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Hoş Geldiniz Başlığı",
+          "PLACE_HOLDER": "Merhaba!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Hoş Geldiniz Etiketi",
+          "PLACE_HOLDER": "Bizimle bağlantı kurmayı kolaylaştırıyoruz. Bize bir şey sorun veya görüşlerinizi paylaşın."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Birkaç dakika içinde",
+          "IN_A_FEW_HOURS": "Bir kaç saat içinde",
+          "IN_A_DAY": "Bir gün içinde"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Rengi",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Sohbet et",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Sohbet et"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Genellikle birkaç dakika içinde yanıt verir",
+        "IN_A_FEW_HOURS": "Genellikle birkaç saat içinde yanıt verir",
+        "IN_A_DAY": "Genellikle bir gün içinde yanıtlar"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Görüşmeyi Başlatın",
+        "CHAT_INPUT_PLACEHOLDER": "Mesajınız"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Şu an operatörlerimiz müsait değil"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Chatwoot tarafından desteklenmektedir",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 6347dcc16..b98319a68 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "gün deneme kaldı.",
     "TRAIL_BUTTON": "Şimdi satın al",
-    "DELETED_USER": "Silinmiş Kullanıcı"
+    "DELETED_USER": "Silinmiş Kullanıcı",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Hesap Askıya Alndı",
+      "MESSAGE": "Hesabınız askıya alındı. Daha fazla bilgi için lütfen destek ekibine ulaşın."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Özel Nitelikler",
     "AUTOMATION": "Otomasyon",
     "TEAMS": "Ekipler",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Klasörler",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Tüm Kişiler",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Önizleme",
-    "FACEBOOK_REAUTHORIZE": "Facebook bağlantınızın süresi doldu, hizmetlere devam etmek için lütfen Facebook sayfanızı yeniden bağlayın"
+    "FACEBOOK_REAUTHORIZE": "Facebook bağlantınızın süresi doldu, hizmetlere devam etmek için lütfen Facebook sayfanızı yeniden bağlayın",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Sohbet et"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 4253f3887..bd3ee6166 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Скопійовано до буферу обміну",
     "COMPANY": "Організація",
     "LOCATION": "Місцезнаходження",
+    "BROWSER_LANGUAGE": "Мова браузера",
     "CONVERSATION_TITLE": "Деталі бесіди",
     "VIEW_PROFILE": "Дивитись профіль",
     "BROWSER": "Браузер",
@@ -150,8 +151,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Аватар контакту успішно видалено",
+        "ERROR_MESSAGE": "Не вдалося видалити аватар. Будь ласка, повторіть спробу пізніше."
       }
     },
     "SUCCESS_MESSAGE": "Контакт успішно збережено",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
index 6d968feb1..2117a0203 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
@@ -39,7 +39,7 @@
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Прапорець",
             "CREATED_AT": "Створений в",
             "LAST_ACTIVITY": "Остання активність",
-            "REFERER_LINK": "Referrer link"
+            "REFERER_LINK": "Реферальне посилання"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "Стандартні фільтри",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 9629514e0..e79fc69fa 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Будь ласка, виберіть бесіду з лівої панелі",
+    "SELECT_A_CONVERSATION": "Будь ласка, виберіть бесіду з лівої панелі",
+    "404": "На жаль, не вдалося знайти розмову. Будь ласка, спробуйте ще раз",
+    "SWITCH_VIEW_LAYOUT": "Змінити розкладку",
     "DASHBOARD_APP_TAB_MESSAGES": "Текст повідомлень",
     "UNVERIFIED_SESSION": "Користувач не верифікований",
     "NO_MESSAGE_1": "Ой! Схоже, у вашій поштовій скринці немає ніяких повідомлень.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Наступного тижня"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Позначити як \"В очікуванні\"",
+      "RESOLVED": "Позначити як вирішене",
+      "REOPEN": "Повторно відкрити розмову",
+      "SNOOZE": {
+        "TITLE": "Відкласти",
+        "NEXT_REPLY": "До наступної відповіді",
+        "TOMORROW": "До завтра",
+        "NEXT_WEEK": "До наступного тижня"
+      },
+      "ASSIGN_AGENT": "Призначити агента",
+      "ASSIGN_LABEL": "Призначити мітку",
+      "AGENTS_LOADING": "Завантаження агентів...",
+      "ASSIGN_TEAM": "Призначити команду",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Ідентифікатор розмови %{conversationId} призначено для \"%{agentName}\"",
+          "FAILED": "Не вдалося призначити агента. Будь ласка, спробуйте ще раз."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Призначено мітку #%{labelName} до ID розмови %{conversationId}",
+          "FAILED": "Не вдалося призначити мітку. Будь-ласка, спробуйте ще раз."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Призначено команду \"#%{team}\" до ID розмови %{conversationId}",
+          "FAILED": "Не вдалося призначити команду. Будь ласка, спробуйте ще раз."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Підпис повідомлення",
       "ENABLE_SIGN_TOOLTIP": "Увімкнути підпис",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Приватна нотатка: видима тільки вам та вашій команді",
     "CHANGE_STATUS": "Статус бесіди змінено",
+    "CHANGE_STATUS_FAILED": "Не вдалося змінити статус розмови",
     "CHANGE_AGENT": "Оператора бесіди змінено",
+    "CHANGE_AGENT_FAILED": "Не вдалося змінити виконавця",
+    "ASSIGN_LABEL_SUCCESFUL": "Мітка успішно призначена",
+    "ASSIGN_LABEL_FAILED": "Призначення мітки не вдалося",
     "CHANGE_TEAM": "Команда змінена",
     "FILE_SIZE_LIMIT": "Файл перевищує ліміт вкладення {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Не вдалося надіслати повідомлення, будь ласка, повторіть спробу пізніше",
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index f66c3eb27..0e2f55081 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -1,23 +1,219 @@
 {
   "HELP_CENTER": {
     "HEADER": {
-      "FILTER": "Filter by",
-      "SORT": "Sort by",
+      "FILTER": "Фільтрувати за",
+      "SORT": "Сортувати за",
       "SETTINGS_BUTTON": "Налаштування",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "Нова стаття",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Опубліковано",
+        "DRAFT": "Чернетка",
+        "ARCHIVED": "Архівовано"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "Всі статті",
+        "MINE": "Мої статті",
+        "DRAFT": "Чернетки статтей",
+        "ARCHIVED": "Архівовані статті"
+      }
     },
     "EDIT_HEADER": {
-      "PUBLISH_BUTTON": "Publish",
-      "PREVIEW": "Preview",
-      "ADD_TRANSLATION": "Add translation",
-      "OPEN_SIDEBAR": "Open sidebar",
-      "CLOSE_SIDEBAR": "Close sidebar",
-      "SAVING": "Draft saving...",
-      "SAVED": "Draft saved"
+      "PUBLISH_BUTTON": "Опублікувати",
+      "PREVIEW": "Попередній перегляд",
+      "ADD_TRANSLATION": "Додати переклад",
+      "OPEN_SIDEBAR": "Відкрити бічну панель",
+      "CLOSE_SIDEBAR": "Закрити бічну панель",
+      "SAVING": "Збереження чернетки...",
+      "SAVED": "Чернетку збережено"
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Налаштування статей",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Категорія",
+          "TITLE": "Виберіть категорію",
+          "PLACEHOLDER": "Виберіть категорію",
+          "NO_RESULT": "Категорію не знайдено",
+          "SEARCH_PLACEHOLDER": "Пошук категорії"
+        },
+        "AUTHOR": {
+          "LABEL": "Автор",
+          "TITLE": "Виберіть автора",
+          "PLACEHOLDER": "Виберіть автора",
+          "NO_RESULT": "Авторів не знайдено",
+          "SEARCH_PLACEHOLDER": "Пошук автора"
+        },
+        "META_TITLE": {
+          "LABEL": "Мета-заголовок",
+          "PLACEHOLDER": "Додати мета-заголовок"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Мета-опис",
+          "PLACEHOLDER": "Додати мета-опис для кращих SEO результатів..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Додавайте мета-теги, розділені комами..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Архівна стаття",
+        "DELETE": "Видалити статтю"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Портали",
+      "NEW_BUTTON": "Новий портал",
+      "ACTIVE_BADGE": "активний",
+      "CHOOSE_LOCALE_LABEL": "Виберіть мову",
+      "LOADING_MESSAGE": "Завантаження порталів...",
+      "ARTICLES_LABEL": "статті",
+      "NO_PORTALS_MESSAGE": "Немає доступних порталів",
+      "ADD_NEW_LOCALE": "Додати нову локаль",
+      "POPOVER": {
+        "TITLE": "Портали",
+        "PORTAL_SETTINGS": "Налаштування порталу",
+        "SUBTITLE": "У вас є кілька порталів і можна мати різні локалі для кожного порталу.",
+        "CANCEL_BUTTON_LABEL": "Скасувати",
+        "CHOOSE_LOCALE_BUTTON": "Виберіть локаль"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "статті",
+            "ADD": "Додати локаль",
+            "VISIT": "Відвідати сайт",
+            "SETTINGS": "Налаштування"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Конфігурації порталу",
+            "ITEMS": {
+              "NAME": "Ім'я",
+              "DOMAIN": "Користувацький домен",
+              "SLUG": "Мітка",
+              "TITLE": "Заголовок порталу",
+              "THEME": "Колір теми",
+              "SUB_TEXT": "Додатковий текст порталу"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Доступні локалі",
+            "TABLE": {
+              "NAME": "Назва локалі",
+              "CODE": "Код локалі",
+              "ARTICLE_COUNT": "Кількість статей",
+              "CATEGORIES": "Кількість категорій",
+              "SWAP": "Поміняти",
+              "DELETE": "Видалити",
+              "DEFAULT_LOCALE": "За замовчуванням"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Створити портал",
+        "SUB_TITLE": "Довідковий центр з Chatwoot відомий як портал. Ви можете мати кілька порталів і ви можете мати різні локалі для кожного порталу.",
+        "NAME": {
+          "LABEL": "Ім'я",
+          "PLACEHOLDER": "Назва порталу",
+          "HELP_TEXT": "Ім'я буде використовуватися в публічному інтерфейсі порталу всередині",
+          "ERROR": "Назва обов'язкова"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Заголовок сторінки",
+          "PLACEHOLDER": "Заголовок сторінки порталу",
+          "HELP_TEXT": "Ім'я буде використане в публічному інтерфейсі порталу",
+          "ERROR": "Необхідно вказати заголовок сторінки"
+        },
+        "SLUG": {
+          "LABEL": "Мітка",
+          "PLACEHOLDER": "Портал slug для URL-адрес",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Необхідно вказати мітку"
+        },
+        "DOMAIN": {
+          "LABEL": "Домен для користувача",
+          "PLACEHOLDER": "Власний домен порталу",
+          "HELP_TEXT": "Додавати лише у випадку, якщо ви хочете використовувати власний домен для своїх порталів",
+          "ERROR": "Потрібен власний домен"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Посилання на головну сторінку",
+          "PLACEHOLDER": "Посилання на головну сторінку порталу",
+          "HELP_TEXT": "Посилання для повернення з порталу на головну сторінку.",
+          "ERROR": "Потрібне посилання на головну сторінку"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Текст заголовку",
+          "PLACEHOLDER": "Текст заголовку порталу",
+          "HELP_TEXT": "Текст заголовку порталу",
+          "ERROR": "Потрібен текст заголовка портала"
+        },
+        "BUTTONS": {
+          "CREATE": "Створити портал",
+          "CANCEL": "Скасувати"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Портал успішно створено.",
+          "ERROR_MESSAGE": "Не вдалося створити портал. Повторіть спробу."
+        }
+      }
     },
     "TABLE": {
+      "LOADING_MESSAGE": "Завантаження статей...",
+      "404": "Немає статей, які відповідають вашому пошуку 🔍",
+      "NO_ARTICLES": "Немає доступних статей",
+      "HEADERS": {
+        "TITLE": "Назва",
+        "CATEGORY": "Категорія",
+        "READ_COUNT": "Лічильник прочитань",
+        "STATUS": "Статус",
+        "LAST_EDITED": "Останній раз відредагований"
+      },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "від"
+      }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Заголовок статті іде тут",
+      "CONTENT_PLACEHOLDER": "Напишіть свою статтю тут"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Пошук статей"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Створити категорію",
+        "SUB_TITLE": "Категорія буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
+        "PORTAL": "Портал",
+        "LOCALE": "Локаль",
+        "NAME": {
+          "LABEL": "Ім'я",
+          "PLACEHOLDER": "Назва категорії",
+          "HELP_TEXT": "Назва категорії буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
+          "ERROR": "Назва обов'язкова"
+        },
+        "SLUG": {
+          "LABEL": "Мітка",
+          "PLACEHOLDER": "Мітка категорії для URL-адрес",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Необхідно вказати мітку"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Опис",
+          "PLACEHOLDER": "Залиште короткий опис категорії.",
+          "ERROR": "Необхідний опис"
+        },
+        "BUTTONS": {
+          "CREATE": "Створити категорію",
+          "CANCEL": "Скасувати"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Категорію успішно створено",
+          "ERROR_MESSAGE": "Не вдалося створити категорію"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index e6bbff8eb..069873fb0 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -31,7 +31,7 @@
       "CHANNEL_NAME": {
         "LABEL": "Назва Джерела",
         "PLACEHOLDER": "Введіть назву свого Джерела (наприклад: Acme Inc)",
-        "ERROR": "Please enter a valid inbox name"
+        "ERROR": "Будь ласка, введіть припустиме ім'я вхідної скриньки"
       },
       "WEBSITE_NAME": {
         "LABEL": "Назва сайту",
@@ -100,7 +100,7 @@
         },
         "SUBMIT_BUTTON": "Створити скриньку \"Вхідні\"",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+          "ERROR_MESSAGE": "Ми не змогли створити канал сайту, будь ласка, спробуйте ще раз"
         }
       },
       "TWILIO": {
@@ -112,10 +112,10 @@
           "ERROR": "Це поле є обов'язковим"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "Служба обміну повідомленнями SID",
+          "PLACEHOLDER": "Будь ласка, введіть свій Twilio Messaging Service SID",
           "ERROR": "Це поле є обов'язковим",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "Використовувати Twilio Messaging Service"
         },
         "CHANNEL_TYPE": {
           "LABEL": "Тип каналу",
@@ -217,18 +217,18 @@
           "ERROR": "Номер телефону повинен починатися з символу `+'."
         },
         "PHONE_NUMBER_ID": {
-          "LABEL": "Phone number ID",
-          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
+          "LABEL": "ID номера телефону",
+          "PLACEHOLDER": "Введіть ID телефону, отриманого з панелі розробника Facebook.",
           "ERROR": "Будь ласка введіть правильне значення."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "Business Account ID",
-          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
+          "LABEL": "Ідентифікатор бізнес-акаунту",
+          "PLACEHOLDER": "Будь ласка, введіть ідентифікатор бізнес-профілю, отриманий з панелі розробників Facebook.",
           "ERROR": "Будь ласка введіть правильне значення."
         },
         "WEBHOOK_VERIFY_TOKEN": {
-          "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "LABEL": "Токен перевірки вебхуків",
+          "PLACEHOLDER": "Введіть ключ підтвердження, який ви хочете налаштувати на Facebook webhook'и.",
           "ERROR": "Будь ласка введіть правильне значення."
         },
         "API_KEY": {
@@ -239,7 +239,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in facebook developer portal with the URL mentioned here."
+          "SUBTITLE": "Необхідно налаштувати URL вебхука у панелі розробників facebook з URL-адресою, яку ви згадували."
         },
         "SUBMIT_BUTTON": "Створити канал WhatsApp",
         "API": {
@@ -327,7 +327,7 @@
       },
       "AUTH": {
         "TITLE": "Оберіть канал",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "Chatwoot підтримує live-chat віджети, Facebook Messenger, профілі Twitter, WhatsApp, електронну пошту і т.д. Якщо ви хочете створити користувальницький канал, ви можете створити його за допомогою каналу API. Щоб почати, виберіть один з каналів нижче."
       },
       "AGENTS": {
         "TITLE": "Агенти",
@@ -368,7 +368,7 @@
       "API": {
         "SUCCESS_MESSAGE": "Налаштування вхідних повідомлень успішно оновлені",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Автопризначення успішно оновлено",
-        "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
+        "ERROR_MESSAGE": "Ми не змогли оновити параметри \"Вхідні\". Будь ласка, повторіть спробу пізніше."
       },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Увімкнено",
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Конфігурація",
       "CAMPAIGN": "Розсилка",
       "PRE_CHAT_FORM": "Форма, що показується перед стартом діалогу",
-      "BUSINESS_HOURS": "Робочий час"
+      "BUSINESS_HOURS": "Робочий час",
+      "WIDGET_BUILDER": "Конструктор віджетів"
     },
     "SETTINGS": "Налаштування",
     "FEATURES": {
@@ -441,16 +442,16 @@
       "INBOX_UPDATE_SUB_TEXT": "Оновіть параметри каналу",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Увімкнення або вимкнення автоматичного призначення нових розмов до агентів, доданих до цього каналу.",
       "HMAC_VERIFICATION": "Перевірка ідентифікації користувача",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "Щоб підтвердити ідентифікацію користувача, ви можете передати `identifier_hash` для кожного користувача. Ви можете згенерувати хеш HMAC sha256 за допомогою `identifier` з ключем, який показано тут.",
       "HMAC_MANDATORY_VERIFICATION": "Застосувати примусову перевірку особистості користувача",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "Якщо увімкнено, запити де не знайдено `identifier_hash`, буде відхилено.",
       "INBOX_IDENTIFIER": "Ідентифікатор каналу",
       "INBOX_IDENTIFIER_SUB_TEXT": "Використовуйте токен `inbox_identifier`, показаний тут для аутентифікації ваших API клієнтів.",
       "FORWARD_EMAIL_TITLE": "Переслати на ел. пошту",
       "FORWARD_EMAIL_SUB_TEXT": "Почніть перенаправляти листи до наступної адреси електронної пошти.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Дозволити повідомлення після закінчення розмови",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Дозволити кінцевим користувачам надсилати повідомлення навіть після закриття розмови.",
-      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_SUBHEADER": "Цей ключ API використовується для інтеграції з API WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "API ключ"
     },
     "AUTO_ASSIGNMENT": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Режим підтвердження Open SSL",
       "AUTH_MECHANISM": "Автентифікація"
     },
-    "NOTE": "Замітка: "
+    "NOTE": "Замітка: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Аватар веб-сайту",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Аватар успішно видалено",
+              "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Назва сайту",
+          "PLACE_HOLDER": "Введіть назву свого сайту (наприклад: Acme Inc)",
+          "ERROR": "Будь ласка введіть правильну назву сайту"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Заголовок",
+          "PLACE_HOLDER": "Привіт!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Талін привітання",
+          "PLACE_HOLDER": "Ми робимо це простим — запитуємо що-небудь чи поділіться своїми відгуками."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Час відповіді",
+          "IN_A_FEW_MINUTES": "За кілька хвилин",
+          "IN_A_FEW_HOURS": "За кілька годин",
+          "IN_A_DAY": "Протягом дня"
+        },
+        "WIDGET_COLOR_LABEL": "Колір віджета",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Позиція віджету",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Тип віджету",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Почніть розмову з нами",
+          "LABEL": "Заголовок віджета",
+          "PLACE_HOLDER": "Почніть розмову з нами"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Оновити налаштування віджета",
+          "API": {
+            "SUCCESS_MESSAGE": "Налаштування віджета успішно оновлені",
+            "ERROR_MESSAGE": "Не вдалося оновити налаштування віджета"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Попередній перегляд",
+          "SCRIPT": "Скрипт"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Ліворуч",
+          "RIGHT": "Праворуч"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Стандартний",
+          "EXPANDED_BUBBLE": "Розширена рамка сповіщення"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "За замовчуванням",
+        "CHAT": "Чат"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Зазвичай, відповідаємо за декілька хвилин",
+        "IN_A_FEW_HOURS": "Зазвичай, відповідаємо за декілька годин",
+        "IN_A_DAY": "Зазвичай, відповідаємо протягом доби"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Розпочати розмову",
+        "CHAT_INPUT_PLACEHOLDER": "Введіть Ваше повідомлення"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "Ми Онлайн",
+          "OFFLINE": "Нас наразі немає"
+        },
+        "USER_MESSAGE": "Привіт",
+        "AGENT_MESSAGE": "Доброго дня"
+      },
+      "BRANDING_TEXT": "Працює на Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index cf536a273..1be4e99a2 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -86,49 +86,49 @@
       "BUTTON_TEXT": "Підключитися"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
-      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "TITLE": "Додатки для головного екрану",
+      "HEADER_BTN_TXT": "Додати нову інформаційну панель",
+      "SIDEBAR_TXT": "<p><b>Панель управління</b></p><p>Додатки дозволяють організаціям вставляти в панель керування Chatwoot інформацію, щоб надати контекст агентам підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і вставляти його в панелі управління відомості про користувача, свої замовлення або їхня попередня історія платежів.</p><p>Коли ви вставляєте свій застосунок за допомогою панелі керування в Чат-вуті, ваша програма отримає контекст розмови і зв'яжеться як віконна подія. Налаштуйте слухача для заходу повідомлення на вашій сторінці, щоб отримати контекст.</p><p>Щоб додати нову панель керування, натисніть кнопку 'Додати нову програму'.</p>",
+      "DESCRIPTION": "Додатки дозволяють організаціям вбудовувати інформаційну панель керування і надавати контекст для агентів підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і додавати інформацію, що надавали про користувача, свої замовлення або історію платежів.",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "Поки що немає налаштованих додатків в цьому акаунті",
+        "LOADING": "Отримання додатків панелі керування...",
         "TABLE_HEADER": [
           "Ім'я",
           "Endpoint"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "Редагувати додаток",
+        "DELETE_TOOLTIP": "Видалити додаток"
       },
       "FORM": {
         "TITLE_LABEL": "Ім'я",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
+        "TITLE_PLACEHOLDER": "Введіть ім'я для вашої інформаційної панелі",
+        "TITLE_ERROR": "Потрібно ім'я для головної панелі",
         "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "URL_PLACEHOLDER": "Введіть URL кінцевої точки, де розміщено ваш додаток",
+        "URL_ERROR": "Потрібно вказати допустиму URL-адресу"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "Додати нову інформаційну панель",
         "FORM_SUBMIT": "Додати",
         "FORM_CANCEL": "Скасувати",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "Панель інструментів успішно налаштовано",
+        "API_ERROR": "Не вдалося створити додаток. Будь ласка, спробуйте ще раз пізніше"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "Редагувати інформаційну панель",
         "FORM_SUBMIT": "Оновити",
         "FORM_CANCEL": "Скасувати",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "Панель інструментів успішно оновлено",
+        "API_ERROR": "Не вдалося оновити додаток. Будь ласка, спробуйте ще раз пізніше"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "Так, видалити це",
+        "CONFIRM_NO": "Ні, зберегти це",
         "TITLE": "Підтвердіть видалення",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "MESSAGE": "Ви дійсно бажаєте видалити програму - %{appName}?",
+        "API_SUCCESS": "Панель інструментів успішно видалено",
+        "API_ERROR": "Не вдалося видалити додаток. Будь ласка, спробуйте ще раз пізніше"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index eee4c378d..14f863157 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -65,7 +65,7 @@
       "PLACEHOLDER": "Виберіть діапазон дат"
     },
     "GROUP_BY_FILTER_DROPDOWN_LABEL": "Групувати за",
-    "DURATION_FILTER_LABEL": "Duration",
+    "DURATION_FILTER_LABEL": "Тривалість",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index b39f49818..2d3c043d9 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "днів пробного періоду залишилося.",
     "TRAIL_BUTTON": "Придбати зараз",
-    "DELETED_USER": "Видалений користувач"
+    "DELETED_USER": "Видалений користувач",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Обліковий запис призупинено",
+      "MESSAGE": "Ваш обліковий запис призупинено. Будь ласка, зверніться до служби підтримки для отримання додаткової інформації."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Свої атрибути",
     "AUTOMATION": "Автоматизація",
     "TEAMS": "Команди",
+    "BILLING": "Біллінг",
     "CUSTOM_VIEWS_FOLDER": "Папки",
     "CUSTOM_VIEWS_SEGMENTS": "Сегменти",
     "ALL_CONTACTS": "Усі контакти",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Позначити себе як",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Огляд",
-    "FACEBOOK_REAUTHORIZE": "Підключення до Facebook закінчилося, будь ласка, поновіть сторінку Facebook, щоб продовжити роботу служб"
+    "FACEBOOK_REAUTHORIZE": "Підключення до Facebook закінчилося, будь ласка, поновіть сторінку Facebook, щоб продовжити роботу служб",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "Всі статті",
+      "MY_ARTICLES": "Мої статті",
+      "DRAFT": "Чернетка",
+      "ARCHIVED": "Архівовано",
+      "CATEGORY": "Категорія",
+      "CATEGORY_EMPTY_MESSAGE": "Категорій не знайдено"
+    },
+    "DOCS": "Читати документи"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Біллінг",
+    "CURRENT_PLAN": {
+      "TITLE": "Поточний План",
+      "PLAN_NOTE": "Зараз ви підписані на **%{plan}** план з **%{quantity}** ліцензій"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Керування підпискою",
+      "DESCRIPTION": "Перегляньте попередні рахунки, відредагуйте платіжні реквізити, або скасуйте вашу підписку.",
+      "BUTTON_TXT": "Перейти на портал для платежів"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Потрібна допомога?",
+      "DESCRIPTION": "Чи стикаються ви з питаннями у рахунках? Ми тут, щоб допомогти.",
+      "BUTTON_TXT": "Почніть розмову з нами"
+    },
+    "NO_BILLING_USER": "Ваш платіжний обліковий запис налаштовується. Будь ласка, оновіть сторінку та повторіть спробу."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Ми не змогли знайти жодного облікового запису Chatwoot. Будь ласка, створіть новий обліковий запис, щоб продовжити.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index e8829bb8d..e7ce17764 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "کامیابی کے ساتھ کلپ بورڈ پر کاپی ہو گیا۔",
     "COMPANY": "کمپنی",
     "LOCATION": "مقام",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "گفتگو کی تفصیلات",
     "VIEW_PROFILE": "پروفائل کا مشاھدہ کریں",
     "BROWSER": "براؤزر",
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 6ebf0a0a9..1171316cb 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "براہ کرم بائیں پین سے گفتگو کا انتخاب کریں۔",
+    "SELECT_A_CONVERSATION": "براہ کرم بائیں پین سے گفتگو کا انتخاب کریں۔",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "اس صارف کی شناخت کی تصدیق نہیں ہوئی ہے۔",
     "NO_MESSAGE_1": "اوہ! ایسا لگتا ہے کہ آپ کے ان باکس میں صارفین کی جانب سے کوئی پیغامات نہیں ہیں۔.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index 3605814c6..31d55a985 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "منسوخ کریں۔",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "نام",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "حذف کریں۔",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "نام",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "منسوخ کریں۔"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "اسٹیٹس",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "نام",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "منسوخ کریں۔"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index 4663c9121..7c53a975b 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 941472e0a..236623fd3 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index 2833e37d8..0bc399ba1 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index c38fb16a4..7adac123f 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index 3605814c6..3878cef01 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Settings",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Name is required"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index e849d0e67..09a6210da 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+        "IN_A_FEW_HOURS": "Typically replies in a few hours",
+        "IN_A_DAY": "Typically replies in a day"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 977f9e50d..7994321cc 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index b2b6f1fe0..1bb98a535 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "Đã sao chép mã thành công",
     "COMPANY": "Công ty",
     "LOCATION": "Vị trí",
+    "BROWSER_LANGUAGE": "Ngôn ngữ của Trình duyệt",
     "CONVERSATION_TITLE": "Chi tiết của cuộc trò chuyện",
     "VIEW_PROFILE": "Xem hồ sơ cá nhân",
     "BROWSER": "Trình duyệt",
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 8acee1d63..77a5fb032 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "Vui lòng chọn một cuộc trò chuyện từ ngăn bên trái",
+    "SELECT_A_CONVERSATION": "Vui lòng chọn một cuộc trò chuyện từ ngăn bên trái",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "Tin nhắn",
     "UNVERIFIED_SESSION": "Danh tính của người dùng này không được xác thực",
     "NO_MESSAGE_1": "Uh oh! Có vẻ như không có tin nhắn nào từ khách hàng trong hộp thư đến của bạn.",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "Tuần sau"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Đánh dấu chưa giải quyết",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Mở lại cuộc trò chuyện",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Cho đến phản hồi kế tiếp",
+        "TOMORROW": "Cho đến ngày mai",
+        "NEXT_WEEK": "Cho đến tuần sau"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Chữ ký tin nhắn",
       "ENABLE_SIGN_TOOLTIP": "Bật chữ ký",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "Lưu ý riêng: Chỉ hiển thị với bạn và nhóm của bạn",
     "CHANGE_STATUS": "Trạng thái cuộc trò chuyện đã thay đổi",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "Người Được Chỉ Định Cuộc Hội Thoại đã thay đổi",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Nhóm của cuộc trò chuyện đã được thay đổi",
     "FILE_SIZE_LIMIT": "File vượt quá kích thước giới hạn {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Không thể gửi tin nhắn này, vui lòng thử lại sau",
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index 13bd68c6f..3f75d9a46 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "Cài đặt",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "có hiệu lực",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Huỷ",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Cài đặt"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Tên",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Xoá",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "Tên",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "Tên bắt buộc có"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "Huỷ"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Tiêu đề",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Trạng thái",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Tên",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Tên bắt buộc có"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Mô tả",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Mô tả bắt buộc có"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Huỷ"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 0aa542c27..63c1cf0f4 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Cấu hình",
       "CAMPAIGN": "Chiến dịch",
       "PRE_CHAT_FORM": "Biểu mẫu trước khi trò chuyện",
-      "BUSINESS_HOURS": "Giờ làm việc"
+      "BUSINESS_HOURS": "Giờ làm việc",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "Cài đặt",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Mở Chế độ xác minh SSL",
       "AUTH_MECHANISM": "Xác minh"
     },
-    "NOTE": "Ghi chú: "
+    "NOTE": "Ghi chú: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Tên trang web",
+          "PLACE_HOLDER": "Nhập tên trang web của bạn (ví dụ: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Tiêu đề chào mừng",
+          "PLACE_HOLDER": "Chào bạn!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Dòng giới thiệu chào mừng",
+          "PLACE_HOLDER": "Chúng tôi làm cho việc kết nối với chúng tôi trở nên đơn giản. Hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi của bạn."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "Trong một vài phút",
+          "IN_A_FEW_HOURS": "Trong một vài giờ",
+          "IN_A_DAY": "Trong một ngày"
+        },
+        "WIDGET_COLOR_LABEL": "Màu tiện ích",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Trò chuyện với chúng tôi",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Trò chuyện với chúng tôi"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "Thường trả lời sau vài phút",
+        "IN_A_FEW_HOURS": "Thường trả lời sau vài giờ",
+        "IN_A_DAY": "Thường trả lời trong một ngày"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Bắt đầu một cuộc trò chuyện",
+        "CHAT_INPUT_PLACEHOLDER": "Gõ tin nhắn của bạn"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "Hiện tại chúng tôi đang ngoại tuyến"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Cung cấp bởi Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index a7ab2c7d4..2f52308aa 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "ngày dùng thử còn lại.",
     "TRAIL_BUTTON": "Mua Ngay",
-    "DELETED_USER": "Người dùng bị xoá"
+    "DELETED_USER": "Người dùng bị xoá",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
     "AUTOMATION": "Tự động hoá",
     "TEAMS": "Nhóm",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Thư mục",
     "CUSTOM_VIEWS_SEGMENTS": "Phân khúc",
     "ALL_CONTACTS": "Tất cả liên lạc",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Đặt chính mình như",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Tổng quan",
-    "FACEBOOK_REAUTHORIZE": "Kết nối Facebook của bạn đã hết hạn, vui lòng kết nối lại trang Facebook của bạn để tiếp tục dịch vụ"
+    "FACEBOOK_REAUTHORIZE": "Kết nối Facebook của bạn đã hết hạn, vui lòng kết nối lại trang Facebook của bạn để tiếp tục dịch vụ",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Trò chuyện với chúng tôi"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ồ ồ! Chúng tôi không thể tìm thấy bất kỳ tài khoản Chatwoot nào. Vui lòng tạo một tài khoản mới để tiếp tục.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
index d9bdac801..043f0a6cb 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
@@ -95,16 +95,16 @@
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "没有",
       "TITLE": {
-        "AGENT": "选择代理",
+        "AGENT": "选择客服代表",
         "TEAM": "选择团队"
       },
       "SEARCH": {
         "NO_RESULTS": {
-          "AGENT": "未找到代理",
+          "AGENT": "未找到客服代表",
           "TEAM": "没有找到团队"
         },
         "PLACEHOLDER": {
-          "AGENT": "搜索代理",
+          "AGENT": "搜索客服代表",
           "TEAM": "查找团队"
         }
       }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index a33296c4a..b839fa52b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -1,40 +1,40 @@
 {
   "AUTOMATION": {
     "HEADER": "Automations",
-    "HEADER_BTN_TXT": "Add Automation Rule",
-    "LOADING": "Fetching automation rules",
+    "HEADER_BTN_TXT": "添加自动化规则",
+    "LOADING": "正在获取自动化规则",
     "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
+      "TITLE": "添加自动化规则",
       "SUBMIT": "创建",
       "CANCEL_BUTTON_TEXT": "取消",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
-          "ERROR": "名字必填"
+          "LABEL": "规则名称",
+          "PLACEHOLDER": "请输入规则名称",
+          "ERROR": "名称是必填项"
         },
         "DESC": {
           "LABEL": "描述信息",
-          "PLACEHOLDER": "Enter rule description",
+          "PLACEHOLDER": "输入规则说明",
           "ERROR": "描述是必需的"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "事件",
           "PLACEHOLDER": "请选择一个",
-          "ERROR": "Event is required"
+          "ERROR": "事件是必填项"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "条件"
         },
         "ACTIONS": {
           "LABEL": "操作"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "添加条件",
+      "ACTION_BUTTON_LABEL": "添加操作",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "SUCCESS_MESSAGE": "自动化规则添加成功",
         "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
       }
     },
@@ -102,15 +102,15 @@
       "DEACTIVATION_SUCCESFUL": "Automation Rule Deactivated Successfully",
       "ACTIVATION_ERROR": "Could not Activate Automation, Please try again later",
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
-      "CONFIRMATION_LABEL": "Yes",
-      "CANCEL_LABEL": "No"
+      "CONFIRMATION_LABEL": "是",
+      "CANCEL_LABEL": "否"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "无法上传附件。请重试",
+      "LABEL_IDLE": "上传附件",
       "LABEL_UPLOADING": "上传中...",
-      "LABEL_UPLOADED": "Succesfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Upload Failed"
+      "LABEL_UPLOADED": "上传成功",
+      "LABEL_UPLOAD_FAILED": "上传失败"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
index 0919e095c..4e4bb49b0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
@@ -4,7 +4,7 @@
     "AGENT_SELECT_LABEL": "选择代理",
     "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
     "GO_BACK_LABEL": "Go back",
-    "ASSIGN_LABEL": "Assign",
+    "ASSIGN_LABEL": "分配",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
index 35ada914c..ab5ba8bb3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
@@ -89,7 +89,7 @@
       "TABLE_HEADER": {
         "TITLE": "Title",
         "MESSAGE": "消息",
-        "INBOX": "Inbox",
+        "INBOX": "收件箱",
         "STATUS": "状态",
         "SENDER": "Sender",
         "URL": "URL",
@@ -98,7 +98,7 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "添加",
         "EDIT": "编辑",
         "DELETE": "删除"
       },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
index 17790567e..7e18b3f20 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "添加预设回复",
     "LOADING": "获取预设回复",
     "SEARCH_404": "没有任何项目符合此查询",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>预设回复</b> </p><p> 预设回复是保存的回复模板，可用于快速发送回复到对话中。 </p><p> 若要创建预设回复，只需点击 <b>添加预设回复</b> 按钮。 您也可以通过点击编辑或删除按钮来编辑或删除已存在的预定回复。 </p><p> <b>短码</b> 可用于帮助使用预设回复。 客服代表在聊天时可以通过输入 <b>'/'</b> 加短码来快速使用预设回复。 </p>",
     "LIST": {
       "404": "此帐户中没有预设的回复。",
       "TITLE": "管理预设回复",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "添加预设回复",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "预设回复是保存的回复模板，可用于快速发送回复到对话中。",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "短码",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "请输入一个短代码",
           "ERROR": "必须输入短代码"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 5271a309f..e8a7fc24b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "已成功复制到剪贴板",
     "COMPANY": "公司",
     "LOCATION": "位置",
+    "BROWSER_LANGUAGE": "浏览器语言",
     "CONVERSATION_TITLE": "对话详情",
     "VIEW_PROFILE": "查看资料",
     "BROWSER": "浏览器",
@@ -39,7 +40,7 @@
     "UNMUTE_CONTACT": "取消静音",
     "MUTED_SUCCESS": "此对话被静音6小时",
     "UNMUTED_SUCCESS": "此对话已取消静音",
-    "SEND_TRANSCRIPT": "Send Transcript",
+    "SEND_TRANSCRIPT": "发送客服记录",
     "EDIT_LABEL": "编辑",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "自定义属性",
@@ -67,13 +68,13 @@
       "SUBMIT": "导入",
       "CANCEL": "取消"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "已成功保存联系人",
     "ERROR_MESSAGE": "出现错误，请重试"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "确认删除",
-      "MESSAGE": "您确定要删除此笔记吗？",
+      "MESSAGE": "您确定要删除此备注吗？",
       "YES": "是的，删除",
       "NO": "否，保留它"
     }
@@ -90,7 +91,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "联系人删除成功",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "ERROR_MESSAGE": "无法删除联系人，请稍后再试。"
     }
   },
   "CONTACT_FORM": {
@@ -111,7 +112,7 @@
       "EMAIL_ADDRESS": {
         "PLACEHOLDER": "输入联系人的电子邮件地址",
         "LABEL": "电子邮件地址",
-        "DUPLICATE": "This email address is in use for another contact.",
+        "DUPLICATE": "此电子邮件地址正在用于另一个联系人。",
         "ERROR": "请输入一个有效的电子邮件."
       },
       "PHONE_NUMBER": {
@@ -119,19 +120,19 @@
         "LABEL": "电话号码",
         "HELP": "电话号码应为E.164格式，例如：+14155555 [+] [国家代码][地区代码][本地电话号码]",
         "ERROR": "电话号码应为空或E.164格式",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "此电话号码正在用于另一个联系人。"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "输入联系人的位置",
         "LABEL": "位置"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "输入公司名称",
+        "LABEL": "公司名称"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "输入 Facebook 用户名",
           "LABEL": "Facebook"
         },
         "TWITTER": {
@@ -160,186 +161,186 @@
   "NEW_CONVERSATION": {
     "BUTTON_LABEL": "开始会话",
     "TITLE": "新的会话",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "DESC": "通过发送一条新消息来开始新的对话。",
+    "NO_INBOX": "找不到收件箱来发起与此联系人的新对话。",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "发送至"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "收件箱",
+        "ERROR": "选择一个收件箱"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "主题",
+        "PLACEHOLDER": "主题",
+        "ERROR": "主题不能为空"
       },
       "MESSAGE": {
         "LABEL": "消息",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "在此处输入您的消息",
+        "ERROR": "消息不能为空"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "发送消息",
       "CANCEL": "取消",
-      "SUCCESS_MESSAGE": "Message sent!",
+      "SUCCESS_MESSAGE": "消息已发送！",
       "GO_TO_CONVERSATION": "查看",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "ERROR_MESSAGE": "无法发送，请重试！"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
+    "HEADER": "联系人",
+    "FIELDS": "联系人字段",
     "SEARCH_BUTTON": "搜索",
     "SEARCH_INPUT_PLACEHOLDER": "搜索联系人",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "过滤器",
     "FILTER_CONTACTS_SAVE": "保存过滤器",
     "FILTER_CONTACTS_DELETE": "删除过滤器",
     "LIST": {
       "LOADING_MESSAGE": "正在加载联系人列表...",
       "404": "没有搜索到联系人🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "NO_CONTACTS": "没有可用的联系人",
       "TABLE_HEADER": {
         "NAME": "姓名：",
         "PHONE_NUMBER": "电话号码",
         "CONVERSATIONS": "会话",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "LAST_ACTIVITY": "最后一次活动",
+        "COUNTRY": "国家",
+        "CITY": "城市",
+        "SOCIAL_PROFILES": "社交资料",
         "COMPANY": "公司",
         "EMAIL_ADDRESS": "电子邮件地址"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "查看详细信息"
     }
   },
   "CONTACT_PROFILE": {
-    "BACK_BUTTON": "Contacts",
-    "LOADING": "Loading contact profile..."
+    "BACK_BUTTON": "联系人",
+    "LOADING": "正在加载联系人资料..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "添加",
+      "TITLE": "Shift + Enter 创建任务"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
+      "DUE_DATE": "截止日期",
       "LABEL_TITLE": "Set type"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "正在获取备注...",
+    "NOT_AVAILABLE": "没有为此联系人创建备注",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "备注"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "添加备注"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "添加",
+      "PLACEHOLDER": "添加备注",
+      "TITLE": "Shift + Enter 创建备注"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "删除备注"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "活动"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_NOTES": "备注",
+      "PILL_BUTTON_EVENTS": "事件",
       "PILL_BUTTON_CONVO": "会话"
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
-    "BUTTON": "Add custom attribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "ADD_BUTTON_TEXT": "添加属性",
+    "BUTTON": "添加自定义属性",
+    "NOT_AVAILABLE": "此联系人没有可用的自定义属性。",
     "COPY_SUCCESSFUL": "已成功复制到剪贴板",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "复制属性",
+      "DELETE": "删除属性",
+      "EDIT": "编辑属性"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "创建自定义属性",
+      "DESC": "在此联系人中添加自定义信息。"
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "添加属性",
       "CANCEL": "取消",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "自定义属性名称",
+        "PLACEHOLDER": "例如：会员 ID",
+        "ERROR": "无效的自定义属性名称"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "属性值",
+        "PLACEHOLDER": "例如：11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "新建属性 ",
+        "SUCCESS": "已成功添加属性",
+        "ERROR": "无法添加属性，请稍后再试。"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "已成功更新属性",
+        "ERROR": "无法更新属性，请稍后再试。"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "已成功删除属性",
+        "ERROR": "无法删除属性，请稍后再试。"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "添加属性",
+        "PLACEHOLDER": "搜索属性",
+        "NO_RESULT": "未找到属性"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "选择值",
+          "SEARCH_INPUT_PLACEHOLDER": "搜索值",
+          "NO_RESULT": "未找到结果"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "需要有效的值",
+      "INVALID_URL": "无效的 URL"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "Merge contacts",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "TITLE": "合并联系人",
+    "DESCRIPTION": "合并联系人以将两个个人资料合并为一个，包括所有属性和对话。 如果发生冲突，将以主联系人的属性为优先。",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "主联系人",
+      "HELP_LABEL": "将被保留"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "需要合并的联系人",
+      "PLACEHOLDER": "搜索联系人",
+      "HELP_LABEL": "将被删除"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "TITLE": "总结",
+      "DELETE_WARNING": "<strong>%{childContactName}</strong> 的联系信息将被删除。",
+      "ATTRIBUTE_WARNING": "<strong>%{childContactName}</strong> 的联系信息将拷贝到 <strong>%{primaryContactName}</strong>。"
     },
     "SEARCH": {
       "ERROR": "ERROR_MESSAGE"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " 合并联系人",
       "CANCEL": "取消",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "选择一个需要合并的子联系人"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "已成功合并联系人",
+      "ERROR_MESSAGE": "无法合并联系人，请重试！"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
index f7a9fe36b..0f04fc3d2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
@@ -30,15 +30,15 @@
             "EMAIL": "Email",
             "PHONE_NUMBER": "电话号码",
             "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
+            "CITY": "城市",
+            "COUNTRY": "国家",
             "CUSTOM_ATTRIBUTE_LIST": "列表",
             "CUSTOM_ATTRIBUTE_TEXT": "文本",
             "CUSTOM_ATTRIBUTE_NUMBER": "号码",
             "CUSTOM_ATTRIBUTE_LINK": "链接",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "复选框",
             "CREATED_AT": "创建于",
-            "LAST_ACTIVITY": "Last Activity",
+            "LAST_ACTIVITY": "最后一次活动",
             "REFERER_LINK": "Referrer link"
         },
         "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 94a0adab6..ad6d6caef 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -1,20 +1,22 @@
 {
   "CONVERSATION": {
-    "404": "请从左侧窗格选择一个对话",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "SELECT_A_CONVERSATION": "请从左侧窗格选择一个对话",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
+    "DASHBOARD_APP_TAB_MESSAGES": "消息",
+    "UNVERIFIED_SESSION": "未验证此用户的身份",
     "NO_MESSAGE_1": "您的收件箱中似乎没有客户的消息。",
     "NO_MESSAGE_2": " 向您的页面发送一条消息！",
     "NO_INBOX_1": "看来你还没有添加任何收件箱。",
     "NO_INBOX_2": " 开始吧",
     "NO_INBOX_AGENT": "看起来您还没有分配到收件箱。请联系您的管理员",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "搜索对话中的消息",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
+      "TITLE": "搜索消息",
+      "RESULT_TITLE": "搜索结果",
       "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "PLACEHOLDER": "输入任何文本来搜索消息",
+      "NO_MATCHING_RESULTS": "未找到结果。"
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -23,20 +25,20 @@
     "LOADING_CONVERSATIONS": "加载更多对话",
     "CANNOT_REPLY": "您不能回复，原因是：",
     "24_HOURS_WINDOW": "24 小时消息窗口限制",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "NOT_ASSIGNED_TO_YOU": "此对话未分配给您。您想要将此对话分配给自己吗？",
+    "ASSIGN_TO_ME": "分配给我",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 小时消息窗口限制",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
+    "SELECT_A_TWEET_TO_REPLY": "请选择要回复的推文。",
+    "REPLYING_TO": "您正在回复到：",
+    "REMOVE_SELECTION": "移除选择",
     "DOWNLOAD": "下载",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "UNKNOWN_FILE_TYPE": "未知文件",
+    "UPLOADING_ATTACHMENTS": "正在上传附件...",
+    "SUCCESS_DELETE_MESSAGE": "已成功删除消息",
+    "FAIL_DELETE_MESSSAGE": "无法删除消息，请重试！",
     "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
+    "RATING_TITLE": "评分",
     "FEEDBACK_TITLE": "Feedback",
     "HEADER": {
       "RESOLVE_ACTION": "已解决",
@@ -50,22 +52,51 @@
       "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "标记为待处理",
       "SNOOZE": {
         "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "NEXT_REPLY": "下一个回复",
+        "TOMORROW": "明天",
+        "NEXT_WEEK": "下周"
+      }
+    },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "标记为待处理",
+      "RESOLVED": "标记为已解决",
+      "REOPEN": "重新打开会话",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "分配客服代表",
+      "ASSIGN_LABEL": "分配标签",
+      "AGENTS_LOADING": "正在加载客服代表...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "消息签名",
+      "ENABLE_SIGN_TOOLTIP": "启用签名",
+      "DISABLE_SIGN_TOOLTIP": "禁用签名",
       "MSG_INPUT": "输入“/”开始选择快捷回复",
       "PRIVATE_MSG_INPUT": "Shift + 输入新行。这只对客服可见",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "未设置消息签名，请在个人资料中进行设置。",
+      "CLICK_HERE": "点击此处更新"
     },
     "REPLYBOX": {
       "REPLY": "回复",
@@ -73,45 +104,49 @@
       "SEND": "发送",
       "CREATE": "添加便笺",
       "TWEET": "推特",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
-      "ENTER_TO_SEND": "Enter to send",
-      "DRAG_DROP": "Drag and drop here to attach",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "TIP_FORMAT_ICON": "显示富文本编辑器",
+      "TIP_EMOJI_ICON": "显示表情选择器",
+      "TIP_ATTACH_ICON": "附加文件",
+      "TIP_AUDIORECORDER_ICON": "录制音频",
+      "TIP_AUDIORECORDER_PERMISSION": "允许访问音频",
+      "TIP_AUDIORECORDER_ERROR": "无法打开音频",
+      "ENTER_TO_SEND": "Enter 键发送",
+      "DRAG_DROP": "拖放到此处添加附件",
+      "START_AUDIO_RECORDING": "开始录音",
+      "STOP_AUDIO_RECORDING": "停止录音",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Add bcc",
         "CC": {
-          "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "LABEL": "抄送",
+          "PLACEHOLDER": "多个电子邮件地址之间用逗号隔开",
+          "ERROR": "请输入有效的电子邮件地址"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "多个电子邮件地址之间用逗号隔开",
+          "ERROR": "请输入有效的电子邮件地址"
         }
       }
     },
     "VISIBLE_TO_AGENTS": "私人便签：仅对您和您的团队可见",
     "CHANGE_STATUS": "对话状态已更改",
+    "CHANGE_STATUS_FAILED": "更改对话状态失败",
     "CHANGE_AGENT": "对话分配人已更改",
-    "CHANGE_TEAM": "Conversation team changed",
+    "CHANGE_AGENT_FAILED": "更改分配失败",
+    "ASSIGN_LABEL_SUCCESFUL": "已成功分配标签",
+    "ASSIGN_LABEL_FAILED": "分配标签失败",
+    "CHANGE_TEAM": "对话团队已更改",
     "FILE_SIZE_LIMIT": "文件超过大小 {MAXIMUM_FILE_UPLOAD_SIZE} 附件限制",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
-    "SENT_BY": "Sent by:",
+    "MESSAGE_ERROR": "无法发送此消息，请稍后再试",
+    "SENT_BY": "发送人：",
     "BOT": "机器人",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "无法发送消息，请重试！",
+    "TRY_AGAIN": "重试",
     "ASSIGNMENT": {
       "SELECT_AGENT": "选择代理",
       "REMOVE": "删除",
-      "ASSIGN": "Assign"
+      "ASSIGN": "分配"
     },
     "CONTEXT_MENU": {
       "COPY": "复制",
@@ -119,7 +154,7 @@
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
+    "TITLE": "发送对话记录",
     "DESC": "Send a copy of the conversation transcript to the specified email address",
     "SUBMIT": "提交",
     "CANCEL": "取消操作",
@@ -130,75 +165,75 @@
       "SEND_TO_AGENT": "Send the transcript to the assigned agent",
       "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "输入一个电子邮件地址",
         "ERROR": "请输入一个有效的电子邮件"
       }
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "您好 👋, 欢迎来到 %{installationName}!",
+    "DESCRIPTION": "感谢您注册。我们希望您能够充分使用 %{installationName}。 这里有几件您可以在 %{installationName} 做的事情，让体验变得愉快。",
+    "READ_LATEST_UPDATES": "阅读我们的最新升级日志",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "您的所有对话都在一个地方",
+      "DESCRIPTION": "在单个面板中查看您客户的所有对话。您可以通过通道、标签和状态筛选对话。"
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
-      "NEW_LINK": "Click here to invite a team member"
+      "TITLE": "邀请您的团队成员",
+      "DESCRIPTION": "当您准备好与您的客户交谈时，带上您的队友来协助您。 您可以通过添加他们的电子邮件地址到客服代表列表来邀请您的队友。",
+      "NEW_LINK": "点击此处邀请一位请团队成员"
     },
     "INBOXES": {
-      "TITLE": "Connect Inboxes",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
-      "NEW_LINK": "Click here to create an inbox"
+      "TITLE": "连接收件箱",
+      "DESCRIPTION": "连接您的客户可以与您交谈的各种通道。可以是一个网站的在线聊天，也可以是您的 Facebook 或者 Twitter 主页，或者甚至可以是您的 WhatsApp 号码。",
+      "NEW_LINK": "点击此处创建收件箱"
     },
     "LABELS": {
-      "TITLE": "Organize conversations with labels",
-      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
-      "NEW_LINK": "Click here to create tags"
+      "TITLE": "使用标签组织对话",
+      "DESCRIPTION": "标签提供了一种简单的方法来让您归类对话。创建一些类似 #价格、#问题反馈 这样的标签，之后您可以在对话中使用它们。",
+      "NEW_LINK": "点击此处创建标签"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
+    "ASSIGNEE_LABEL": "已分配的客服代表",
+    "SELF_ASSIGN": "分配给我",
     "TEAM_LABEL": "Assigned Team",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "啥都没有"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
+      "CONTACT_DETAILS": "联系人详细信息",
       "CONVERSATION_ACTIONS": "Conversation Actions",
       "CONVERSATION_LABELS": "对话标记",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONVERSATION_INFO": "对话信息",
+      "CONTACT_ATTRIBUTES": "联系人属性",
       "PREVIOUS_CONVERSATION": "上一次对话"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "创建属性",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "已成功更新属性",
+      "ERROR": "无法更新属性，请稍后再试。"
     },
     "ADD": {
-      "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "TITLE": "添加",
+      "SUCCESS": "已成功添加属性",
+      "ERROR": "无法添加属性，请稍后再试。"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "已成功删除属性",
+      "ERROR": "无法删除属性，请稍后再试。"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "添加属性",
+      "PLACEHOLDER": "搜索属性",
+      "NO_RESULT": "未找到属性"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
+    "FROM": "来自",
+    "TO": "发送至",
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 514e7ca89..b9140cde7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "帐号 ID",
+        "NOTE": "如果您正在构建基于 API 的集成，那么此 ID 是必需的"
       },
       "NAME": {
         "LABEL": "帐户名称",
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "非活跃工单的自动结单的天数",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "请输入一个有效的自动解决时间 (至少 1 天，最多999 天)。"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
@@ -48,7 +48,7 @@
       }
     },
     "UPDATE_CHATWOOT": "Chatwoot 有可用更新%{latestChatwootVersion}，请更新您的应用。",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "了解更多"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -59,17 +59,17 @@
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "消息通知",
-    "MARK_ALL_DONE": "Mark All Done",
-    "DELETE_TITLE": "deleted",
+    "MARK_ALL_DONE": "标记全部完成",
+    "DELETE_TITLE": "已删除",
     "UNREAD_NOTIFICATION": {
       "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
+      "ALL_NOTIFICATIONS": "查看所有通知",
       "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
       "EMPTY_MESSAGE": "You have no unread notifications"
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "正在加载通知...",
+      "404": "没有通知",
       "TABLE_HEADER": [
         "姓名：",
         "电话号码",
@@ -78,35 +78,35 @@
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
+      "conversation_creation": "新建对话",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_mention": "提及"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "已与 Chatwoot 断开链接"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "刷新"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "搜索或跳转到",
     "SECTIONS": {
       "GENERAL": "General",
       "REPORTS": "报告",
       "CONVERSATION": "会话",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CHANGE_ASSIGNEE": "更改分配",
+      "CHANGE_TEAM": "更改团队",
+      "ADD_LABEL": "为对话添加标签",
+      "REMOVE_LABEL": "从对话移除标签",
       "SETTINGS": "设置"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "GO_TO_CONVERSATION_DASHBOARD": "转到对话面板",
+      "GO_TO_CONTACTS_DASHBOARD": "转到联系人面板",
       "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
       "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
       "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
@@ -121,13 +121,13 @@
       "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
       "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
       "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
+      "GO_TO_NOTIFICATIONS": "转到通知",
+      "ADD_LABELS_TO_CONVERSATION": "为对话添加标签",
+      "ASSIGN_AN_AGENT": "分配一位客服代表",
+      "ASSIGN_A_TEAM": "分配一个团队",
+      "MUTE_CONVERSATION": "静音对话",
+      "UNMUTE_CONVERSATION": "取消静音对话",
+      "REMOVE_LABEL_FROM_CONVERSATION": "从对话移除标签",
       "REOPEN_CONVERSATION": "重新打开会话",
       "RESOLVE_CONVERSATION": "解决会话",
       "SEND_TRANSCRIPT": "Send an email transcript",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 0892785d2..6d1435e7c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "设置",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "已发布",
+        "DRAFT": "草稿",
+        "ARCHIVED": "已存档"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "所有文章",
+        "MINE": "我的文章",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "已存档的文章"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "类别",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "门户网站",
+      "NEW_BUTTON": "新门户网站",
+      "ACTIVE_BADGE": "活跃",
+      "CHOOSE_LOCALE_LABEL": "选择一个语言环境",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "文章",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "添加一个新的语言环境",
+      "POPOVER": {
+        "TITLE": "门户网站",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "您有多个门户网站，每个门户网站可以有不同的语言环境。",
+        "CANCEL_BUTTON_LABEL": "取消",
+        "CHOOSE_LOCALE_BUTTON": "选择语言"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "文章",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "设置"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "姓名：",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "删除",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "姓名：",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "名字必填"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "取消"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "正在加载文章...",
+      "404": "没有找到您要搜索的文章 🔍",
+      "NO_ARTICLES": "没有可用的文章",
+      "HEADERS": {
+        "TITLE": "标题",
+        "CATEGORY": "类别",
+        "READ_COUNT": "阅读数",
+        "STATUS": "状态",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "文章标题在此处显示",
+      "CONTENT_PLACEHOLDER": "在此处写下您的文章"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "搜索文章"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "创建一个类别",
+        "SUB_TITLE": "类别将用于公共门户来对文章进行归类。",
+        "PORTAL": "门户网站",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "姓名：",
+          "PLACEHOLDER": "类别名称",
+          "HELP_TEXT": "类别名称将用于公共门户来对文章进行归类。",
+          "ERROR": "名字必填"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/zh-CN/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "描述信息",
+          "PLACEHOLDER": "给出有关该类别的简短描述。",
+          "ERROR": "描述是必需的"
+        },
+        "BUTTONS": {
+          "CREATE": "创建类别",
+          "CANCEL": "取消"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 55fadfbde..b699160a8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -158,7 +158,7 @@
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
+            "LABEL": "帐号 ID",
             "PLACEHOLDER": "Please enter your Bandwidth Account ID",
             "ERROR": "此字段是必填项"
           },
@@ -413,7 +413,8 @@
       "CONFIGURATION": "Configuration",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "BUSINESS_HOURS": "Business Hours",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "设置",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "出现错误，请重试"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "网站名称",
+          "PLACE_HOLDER": "输入您的网站名称 (e.g: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "欢迎标题：",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "欢迎标签行",
+          "PLACE_HOLDER": "如有疑问，请联系我们"
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "几分钟前",
+          "IN_A_FEW_HOURS": "几个小时前",
+          "IN_A_DAY": "一天内"
+        },
+        "WIDGET_COLOR_LABEL": "窗口小部件颜色",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "联系我们",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "联系我们"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "通常在几分钟内回复您",
+        "IN_A_FEW_HOURS": "通常在几小时内回复您",
+        "IN_A_DAY": "通常在一天之内回复您"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "开始会话",
+        "CHAT_INPUT_PLACEHOLDER": "输入您的消息"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "当前已离线"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "由 Chatwoot 支持",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
index 221660a0c..ba8df8b9a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
@@ -30,7 +30,7 @@
     },
     "LIST": {
       "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "INBOX": "收件箱",
       "DELETE": {
         "BUTTON_TEXT": "删除"
       }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index 720e16633..49cd1e32d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -397,7 +397,7 @@
       "HEADER": {
         "CONTACT_NAME": "Contact",
         "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
+        "RATING": "评分",
         "FEEDBACK_TEXT": "Feedback comment"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index a95027b94..8f60babe7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -43,7 +43,7 @@
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "NONE": "None",
+        "NONE": "啥都没有",
         "ASSIGNED": "Assigned Conversations",
         "ALL_CONVERSATIONS": "All Conversations"
       },
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "剩余试用期天数",
     "TRAIL_BUTTON": "立即购买",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -157,7 +161,7 @@
     "MENTIONED_CONVERSATIONS": "提及",
     "REPORTS": "报告",
     "SETTINGS": "设置",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "联系人",
     "HOME": "首页",
     "AGENTS": "客服代理们",
     "INBOXES": "收件箱",
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "自定义属性",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
@@ -185,12 +190,39 @@
     "ONE_OFF": "One off",
     "REPORTS_AGENT": "客服",
     "REPORTS_LABEL": "标签",
-    "REPORTS_INBOX": "Inbox",
+    "REPORTS_INBOX": "收件箱",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务"
+    "FACEBOOK_REAUTHORIZE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "联系我们"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 478f7b04d..77fde0391 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -6,6 +6,7 @@
     "COPY_SUCCESSFUL": "成功複製到剪貼簿",
     "COMPANY": "公司",
     "LOCATION": "位置",
+    "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "對話詳細資訊",
     "VIEW_PROFILE": "查看個人檔案",
     "BROWSER": "瀏覽器",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 6e841b216..6bd1a6de1 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -1,6 +1,8 @@
 {
   "CONVERSATION": {
-    "404": "請從左側窗格選擇一個對話",
+    "SELECT_A_CONVERSATION": "請從左側窗格選擇一個對話",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
     "DASHBOARD_APP_TAB_MESSAGES": "訊息",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "您的收件匣中似乎没有客户的消息。",
@@ -58,6 +60,35 @@
         "NEXT_WEEK": "下週"
       }
     },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "標記為待處理",
+      "RESOLVED": "Mark as resolved",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
     "FOOTER": {
       "MESSAGE_SIGN_TOOLTIP": "Message signature",
       "ENABLE_SIGN_TOOLTIP": "Enable signature",
@@ -100,7 +131,11 @@
     },
     "VISIBLE_TO_AGENTS": "私人筆記：僅對您和您的團隊可以看見",
     "CHANGE_STATUS": "對話狀態已更改",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
     "CHANGE_AGENT": "對話指派人已更改",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index f297de330..cda62efef 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -4,7 +4,18 @@
       "FILTER": "Filter by",
       "SORT": "Sort by",
       "SETTINGS_BUTTON": "設定",
-      "NEW_BUTTON": "New Article"
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
     },
     "EDIT_HEADER": {
       "PUBLISH_BUTTON": "Publish",
@@ -15,10 +26,195 @@
       "SAVING": "Draft saving...",
       "SAVED": "Draft saved"
     },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "取消",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "設定"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "姓名",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "刪除",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        }
+      },
+      "ADD": {
+        "TITLE": "Create a portal",
+        "SUB_TITLE": "A Help Center in Chatwoot is known as a portal. You can have multiple portals and can have different locales for each portal.",
+        "NAME": {
+          "LABEL": "姓名",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally",
+          "ERROR": "名稱為必填"
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The name will be used in the public facing portal",
+          "ERROR": "Page title is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals",
+          "ERROR": "Custom Domain is required"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page.",
+          "ERROR": "Home Page Link is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "Portal header text",
+          "ERROR": "Portal header text is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create portal",
+          "CANCEL": "取消"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Portal created successfully.",
+          "ERROR_MESSAGE": "Couldn't create the portal. Try again."
+        }
+      }
+    },
     "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "標題",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "狀態",
+        "LAST_EDITED": "Last edited"
+      },
       "COLUMNS": {
         "BY": "by"
       }
+    },
+    "EDIT_ARTICLE": {
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "姓名",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "名稱為必填"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/portal/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "描述資訊",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "描述為必填"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "取消"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index a6e13c0e8..909666cd0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -413,7 +413,8 @@
       "CONFIGURATION": "組態",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "服務時間"
+      "BUSINESS_HOURS": "服務時間",
+      "WIDGET_BUILDER": "Widget Builder"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -574,6 +575,88 @@
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
       "AUTH_MECHANISM": "Authentication"
     },
-    "NOTE": "Note: "
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "出現錯誤，請重試"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "網站名稱",
+          "PLACE_HOLDER": "輸入您的網站名稱 (e.g: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "歡迎標題：",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "歡迎標籤行",
+          "PLACE_HOLDER": "如有疑問，請聯繫我們"
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "幾分鐘內",
+          "IN_A_FEW_HOURS": "幾小時內",
+          "IN_A_DAY": "一天內"
+        },
+        "WIDGET_COLOR_LABEL": "視窗小元件顏色",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "與我們對話",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "與我們對話"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "REPLY_TIME": {
+        "IN_A_FEW_MINUTES": "通常在幾分鐘內回覆",
+        "IN_A_FEW_HOURS": "通常在幾小時內回覆",
+        "IN_A_DAY": "通常在一天內回覆"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "開始對話",
+        "CHAT_INPUT_PLACEHOLDER": "輸入你的訊息"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "我們目前不在線上"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 2e4b6c9d2..c2ed00a30 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -124,7 +124,11 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "剩餘試用期天數",
     "TRAIL_BUTTON": "立即購買",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
   },
   "COMPONENTS": {
     "CODE": {
@@ -171,6 +175,7 @@
     "CUSTOM_ATTRIBUTES": "自訂屬性",
     "AUTOMATION": "Automation",
     "TEAMS": "團隊",
+    "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "所有聯絡人",
@@ -190,7 +195,34 @@
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "總覽",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "與我們對話"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/mixins/conversation/snoozeTimesMixin.js b/app/javascript/dashboard/mixins/conversation/snoozeTimesMixin.js
new file mode 100644
index 000000000..a7eb1f90f
--- /dev/null
+++ b/app/javascript/dashboard/mixins/conversation/snoozeTimesMixin.js
@@ -0,0 +1,22 @@
+import {
+  getUnixTime,
+  addHours,
+  addWeeks,
+  startOfTomorrow,
+  startOfWeek,
+} from 'date-fns';
+
+export default {
+  computed: {
+    snoozeTimes() {
+      return {
+        // tomorrow  = 9AM next day
+        tomorrow: getUnixTime(addHours(startOfTomorrow(), 9)),
+        // next week = 9AM Monday, next week
+        nextWeek: getUnixTime(
+          addHours(startOfWeek(addWeeks(new Date(), 1), { weekStartsOn: 1 }), 9)
+        ),
+      };
+    },
+  },
+};
diff --git a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
index 0f630cbf7..d2e5622a2 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
@@ -1,8 +1,42 @@
 <template>
-  <div class="widget-wrapper">
-    <WidgetHead :config="getWidgetHeadConfig" />
-    <WidgetBody />
-    <WidgetFooter />
+  <div class="widget-preview-container">
+    <div v-if="isWidgetVisible" class="screen-selector">
+      <input-radio-group
+        name="widget-screen"
+        :items="widgetScreens"
+        :action="handleScreenChange"
+      />
+    </div>
+    <div v-if="isWidgetVisible" class="widget-wrapper">
+      <WidgetHead :config="getWidgetHeadConfig" />
+      <div>
+        <WidgetBody :config="getWidgetBodyConfig" />
+        <WidgetFooter :config="getWidgetFooterConfig" />
+        <div class="branding">
+          <a class="branding-link">
+            <img class="branding-image" :src="globalConfig.logoThumbnail" />
+            <span>{{ $t('INBOX_MGMT.WIDGET_BUILDER.BRANDING_TEXT') }}</span>
+          </a>
+        </div>
+      </div>
+    </div>
+    <div class="widget-bubble" :style="getBubblePositionStyle">
+      <button
+        class="bubble"
+        :class="getBubbleTypeClass"
+        :style="{ background: color }"
+        @click="toggleWidget"
+      >
+        <img
+          v-if="!isWidgetVisible"
+          src="~dashboard/assets/images/bubble-logo.svg"
+          alt=""
+        />
+        <div>
+          {{ getWidgetBubbleLauncherTitle }}
+        </div>
+      </button>
+    </div>
   </div>
 </template>
 
@@ -10,6 +44,9 @@
 import WidgetHead from './WidgetHead';
 import WidgetBody from './WidgetBody';
 import WidgetFooter from './WidgetFooter';
+import InputRadioGroup from 'dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup';
+
+const { LOGO_THUMBNAIL: logoThumbnail } = window.globalConfig || {};
 
 export default {
   name: 'Widget',
@@ -17,13 +54,14 @@ export default {
     WidgetHead,
     WidgetBody,
     WidgetFooter,
+    InputRadioGroup,
   },
   props: {
     welcomeHeading: {
       type: String,
-      default: 'Hi There,',
+      default: '',
     },
-    welcomeTagLine: {
+    welcomeTagline: {
       type: String,
       default: '',
     },
@@ -32,52 +70,228 @@ export default {
       default: '',
       required: true,
     },
-    websiteDomain: {
-      type: String,
-      default: '',
-    },
     logo: {
       type: String,
       default: '',
     },
-    isExpanded: {
-      type: Boolean,
-      default: true,
-    },
     isOnline: {
       type: Boolean,
       default: true,
     },
     replyTime: {
       type: String,
-      default: 'few minutes',
+      default: '',
     },
+    color: {
+      type: String,
+      default: '',
+    },
+    widgetBubblePosition: {
+      type: String,
+      default: '',
+    },
+    widgetBubbleLauncherTitle: {
+      type: String,
+      default: '',
+    },
+    widgetBubbleType: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      widgetScreens: [
+        {
+          id: 'default',
+          title: this.$t('INBOX_MGMT.WIDGET_BUILDER.WIDGET_SCREEN.DEFAULT'),
+          checked: true,
+        },
+        {
+          id: 'chat',
+          title: this.$t('INBOX_MGMT.WIDGET_BUILDER.WIDGET_SCREEN.CHAT'),
+          checked: false,
+        },
+      ],
+      isDefaultScreen: true,
+      isWidgetVisible: true,
+      globalConfig: {
+        logoThumbnail,
+      },
+    };
   },
   computed: {
     getWidgetHeadConfig() {
       return {
         welcomeHeading: this.welcomeHeading,
-        welcomeTagLine: this.welcomeTagLine,
+        welcomeTagline: this.welcomeTagline,
         websiteName: this.websiteName,
-        websiteDomain: this.websiteDomain,
         logo: this.logo,
-        isExpanded: this.isExpanded,
+        isDefaultScreen: this.isDefaultScreen,
         isOnline: this.isOnline,
-        replyTime: this.replyTime,
+        replyTime: this.replyTimeText,
+        color: this.color,
       };
     },
+    getWidgetBodyConfig() {
+      return {
+        welcomeHeading: this.welcomeHeading,
+        welcomeTagline: this.welcomeTagline,
+        isDefaultScreen: this.isDefaultScreen,
+        isOnline: this.isOnline,
+        replyTime: this.replyTimeText,
+        color: this.color,
+        logo: this.logo,
+      };
+    },
+    getWidgetFooterConfig() {
+      return {
+        isDefaultScreen: this.isDefaultScreen,
+        color: this.color,
+      };
+    },
+    replyTimeText() {
+      switch (this.replyTime) {
+        case 'in_a_few_minutes':
+          return this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.REPLY_TIME.IN_A_FEW_MINUTES'
+          );
+        case 'in_a_day':
+          return this.$t('INBOX_MGMT.WIDGET_BUILDER.REPLY_TIME.IN_A_DAY');
+        default:
+          return this.$t('INBOX_MGMT.WIDGET_BUILDER.REPLY_TIME.IN_A_FEW_HOURS');
+      }
+    },
+    getBubblePositionStyle() {
+      return {
+        justifyContent: this.widgetBubblePosition === 'left' ? 'start' : 'end',
+      };
+    },
+    getBubbleTypeClass() {
+      return {
+        'bubble-close': this.isWidgetVisible,
+        'bubble-expanded':
+          !this.isWidgetVisible && this.widgetBubbleType === 'expanded_bubble',
+      };
+    },
+    getWidgetBubbleLauncherTitle() {
+      return this.isWidgetVisible || this.widgetBubbleType === 'standard'
+        ? ' '
+        : this.widgetBubbleLauncherTitle;
+    },
+  },
+  methods: {
+    handleScreenChange(item) {
+      this.isDefaultScreen = item.id === 'default';
+    },
+    toggleWidget() {
+      this.isWidgetVisible = !this.isWidgetVisible;
+      this.isDefaultScreen = true;
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.text-lg {
-  font-size: var(--font-size-default);
+.screen-selector {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 .widget-wrapper {
-  box-shadow: var(--shadow-larger);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-shadow: var(--shadow-widget-builder);
   border-radius: var(--border-radius-large);
-  background-color: var(--color-background);
-  z-index: 99;
+  background-color: #f4f6fb;
+  width: calc(var(--space-large) * 10);
+  height: calc(var(--space-mega) * 5);
+
+  .branding {
+    padding-top: var(--space-one);
+    padding-bottom: var(--space-one);
+    display: flex;
+    justify-content: center;
+
+    .branding-link {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      color: var(--b-500);
+      cursor: pointer;
+      filter: grayscale(1);
+      font-size: var(--font-size-micro);
+      opacity: 0.9;
+      text-decoration: none;
+
+      &:hover {
+        filter: grayscale(0);
+        opacity: 1;
+        color: var(--b-600);
+      }
+
+      .branding-image {
+        max-width: var(--space-one);
+        max-height: var(--space-one);
+        margin-right: var(--space-micro);
+      }
+    }
+  }
+}
+.widget-bubble {
+  display: flex;
+  flex-direction: row;
+  margin-top: var(--space-normal);
+  width: calc(var(--space-large) * 10);
+
+  .bubble {
+    display: flex;
+    align-items: center;
+    border-radius: calc(var(--border-radius-small) * 10);
+    height: calc(var(--space-three) * 2);
+    width: calc(var(--space-three) * 2);
+    position: relative;
+    overflow-wrap: anywhere;
+    cursor: pointer;
+
+    img {
+      height: var(--space-two);
+      width: var(--space-two);
+      margin: var(--space-one) var(--space-one) var(--space-one)
+        var(--space-two);
+    }
+
+    div {
+      padding-right: var(--space-two);
+    }
+  }
+
+  .bubble-close::before,
+  .bubble-close::after {
+    background-color: var(--white);
+    content: ' ';
+    display: inline;
+    height: var(--space-medium);
+    width: var(--space-micro);
+    left: var(--space-three);
+    position: absolute;
+  }
+
+  .bubble-close::before {
+    transform: rotate(45deg);
+  }
+
+  .bubble-close::after {
+    transform: rotate(-45deg);
+  }
+
+  .bubble-expanded {
+    font-size: var(--font-size-default);
+    font-weight: var(--font-weight-medium);
+    color: var(--white);
+    width: auto !important;
+    height: var(--space-larger) !important;
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
index 7114e3bf6..1b4ab08a6 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
@@ -1,24 +1,42 @@
 <template>
-  <div class="conversation--container">
-    <div class="conversation-wrap">
-      <div class="message-wrap">
-        <div class="user-message-wrap">
-          <div class="user-message">
-            <div class="message-wrap">
-              <div class="chat-bubble user">
-                <p>Hello</p>
+  <div class="widget-body-container">
+    <div v-if="config.isDefaultScreen" class="availability-content">
+      <div class="availability-info">
+        <div class="team-status">
+          {{ getStatusText }}
+        </div>
+        <div class="reply-wait-message">
+          {{ config.replyTime }}
+        </div>
+      </div>
+      <thumbnail username="J" size="40" />
+    </div>
+    <div v-else class="conversation-content">
+      <div class="conversation-wrap">
+        <div class="message-wrap">
+          <div class="user-message-wrap">
+            <div class="user-message">
+              <div class="message-wrap">
+                <div
+                  class="chat-bubble user"
+                  :style="{ background: config.color }"
+                >
+                  <p>{{ $t('INBOX_MGMT.WIDGET_BUILDER.BODY.USER_MESSAGE') }}</p>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="agent-message-wrap">
-        <div class="agent-message">
-          <div class="avatar-wrap" />
-          <div class="message-wrap">
-            <div class="chat-bubble agent">
-              <div class="message-content">
-                <p>Hello</p>
+        <div class="agent-message-wrap">
+          <div class="agent-message">
+            <div class="avatar-wrap" />
+            <div class="message-wrap">
+              <div class="chat-bubble agent">
+                <div class="message-content">
+                  <p>
+                    {{ $t('INBOX_MGMT.WIDGET_BUILDER.BODY.AGENT_MESSAGE') }}
+                  </p>
+                </div>
               </div>
             </div>
           </div>
@@ -29,51 +47,105 @@
 </template>
 
 <script>
+import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 export default {
   name: 'WidgetBody',
+  components: {
+    Thumbnail,
+  },
+  props: {
+    config: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  computed: {
+    getStatusText() {
+      return this.config.isOnline
+        ? this.$t('INBOX_MGMT.WIDGET_BUILDER.BODY.TEAM_AVAILABILITY.ONLINE')
+        : this.$t('INBOX_MGMT.WIDGET_BUILDER.BODY.TEAM_AVAILABILITY.OFFLINE');
+    },
+    getWidgetBodyClass() {
+      return {
+        'with-chat-view': !this.config.isDefaultScreen,
+        'with-heading-or-title':
+          this.config.isDefaultScreen &&
+          (this.config.welcomeHeading || this.config.welcomeTagline),
+        'with-heading-or-title-without-logo':
+          this.config.isDefaultScreen &&
+          (this.config.welcomeHeading || this.config.welcomeTagline) &&
+          !this.config.logo,
+        'without-heading-and-title':
+          this.config.isDefaultScreen &&
+          !this.config.welcomeHeading &&
+          !this.config.welcomeTagline,
+      };
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
-$tailwind-black-700: #3c4858;
-.conversation--container {
-  width: 100%;
-  padding: var(--space-two);
-  .conversation-wrap {
-    min-height: 200px;
-    .user-message {
-      align-items: flex-end;
-      display: flex;
-      flex-direction: row;
-      justify-content: flex-end;
-      margin-top: 0;
-      margin-bottom: var(--space-smaller);
-      margin-left: auto;
-      max-width: 85%;
-      text-align: right;
+.widget-body-container {
+  .availability-content {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-end;
+    padding: var(--space-one) var(--space-two) var(--space-one) var(--space-two);
+    min-height: inherit;
+
+    .availability-info {
+      width: 100%;
+      .team-status {
+        font-size: var(--font-size-default);
+        font-weight: var(--font-weight-medium);
+      }
+      .reply-wait-message {
+        font-size: var(--font-size-mini);
+      }
     }
-    .message-wrap {
-      margin-right: var(--space-smaller);
-      max-width: 100%;
-      .chat-bubble {
-        box-shadow: var(--shadow-medium);
-        background: var(--color-woot);
-        border-radius: var(--border-radius-large);
-        color: var(--white);
-        display: inline-block;
-        font-size: var(--font-size-nano);
-        line-height: 1.5;
-        padding: var(--space-small) var(--space-one);
-        text-align: left;
-        word-break: break-word;
+  }
+  .conversation-content {
+    height: calc(var(--space-large) * 10);
+    padding: 0 var(--space-two);
+    .conversation-wrap {
+      .user-message {
+        align-items: flex-end;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+        margin-top: var(--space-zero);
+        margin-bottom: var(--space-smaller);
+        margin-left: auto;
+        max-width: 85%;
+        text-align: right;
+      }
+      .message-wrap {
+        margin-right: var(--space-smaller);
         max-width: 100%;
-        &.user {
-          border-bottom-right-radius: var(--border-radius-small);
-        }
-        &.agent {
-          background: var(--white);
-          border-bottom-left-radius: var(--border-radius-small);
-          color: $tailwind-black-700;
+        .chat-bubble {
+          box-shadow: var(--shadow-medium);
+          border-radius: 2rem;
+          color: var(--white);
+          display: inline-block;
+          font-size: var(--font-size-nano);
+          line-height: 1.5;
+          padding: 1.3rem 1.75rem;
+          text-align: left;
+
+          p {
+            margin: var(--space-zero);
+          }
+
+          &.user {
+            border-bottom-right-radius: var(--border-radius-small);
+            background: var(--color-woot);
+          }
+          &.agent {
+            background: var(--white);
+            border-bottom-left-radius: var(--border-radius-small);
+            color: var(--b-900);
+          }
         }
       }
     }
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
index 8aa5c5925..f74b1e349 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
@@ -1,38 +1,102 @@
 <template>
   <div class="footer-wrap">
-    <div class="input-area" />
+    <custom-button
+      v-if="config.isDefaultScreen"
+      class="start-conversation"
+      :style="{ background: config.color }"
+    >
+      {{
+        $t('INBOX_MGMT.WIDGET_BUILDER.FOOTER.START_CONVERSATION_BUTTON_TEXT')
+      }}
+    </custom-button>
+    <div v-else class="chat-message-input is-focused">
+      <resizable-text-area
+        id="chat-input"
+        :placeholder="
+          $t('INBOX_MGMT.WIDGET_BUILDER.FOOTER.CHAT_INPUT_PLACEHOLDER')
+        "
+        class="user-message-input is-focused"
+      />
+      <div class="button-wrap">
+        <fluent-icon icon="emoji" />
+        <fluent-icon class="icon-send" icon="send" />
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import CustomButton from 'dashboard/components/buttons/Button';
+import ResizableTextArea from 'shared/components/ResizableTextArea';
 export default {
   name: 'WidgetFooter',
+  components: {
+    CustomButton,
+    ResizableTextArea,
+  },
+  props: {
+    config: {
+      type: Object,
+      default: () => {},
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
+@import '~dashboard/assets/scss/variables.scss';
 .footer-wrap {
-  flex-shrink: 0;
   width: 100%;
   display: flex;
   flex-direction: column;
   position: relative;
-  &::before {
-    content: '';
-    position: absolute;
-    top: var(--space-one);
-    left: 0;
-    width: 100%;
-    height: var(--space-one);
-    opacity: 0.1;
-    background: var(--color-background);
+  padding-left: var(--space-two);
+  padding-right: var(--space-two);
+
+  .start-conversation {
+    justify-content: center;
+    font-size: var(--font-size-small);
+    border-radius: var(--border-radius-normal);
+    padding-left: var(--space-two);
+    padding-right: var(--space-two);
   }
 
-  .input-area {
-    background-color: var(--white);
+  .chat-message-input {
+    align-items: center;
+    display: flex;
+    padding: var(--space-zero) var(--space-small) var(--space-zero)
+      var(--space-slab);
     border-radius: var(--border-radius-normal);
-    height: var(--space-larger);
-    margin: var(--space-two);
+    background: white;
+
+    &.is-focused {
+      box-shadow: 0 0 0 0.1rem var(--color-woot), 0 0 0.2rem 0.2rem var(--w-100);
+    }
+  }
+
+  .button-wrap {
+    display: flex;
+    align-items: center;
+    padding-left: var(--space-small);
+  }
+
+  .user-message-input {
+    border: 0;
+    height: var(--space-medium);
+    min-height: var(--space-medium);
+    max-height: var(--space-giga);
+    line-height: 1;
+    font-size: var(--font-size-small);
+    resize: none;
+    padding: var(--space-zero);
+    padding-top: var(--space-smaller);
+    padding-bottom: var(--space-smaller);
+    margin-top: var(--space-small);
+    margin-bottom: var(--space-small);
+  }
+
+  .icon-send {
+    margin-left: var(--space-one);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
index 6a08f2f55..2ff57b552 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
@@ -6,25 +6,19 @@
           v-if="config.logo"
           :src="config.logo"
           class="logo"
-          :class="{ small: !config.isExpanded }"
+          :class="{ small: !isDefaultScreen }"
         />
-        <div v-if="!config.isExpanded">
-          <div class="title-block text-base font-medium">
-            <span class="mr-1">{{ config.websiteName }}</span>
+        <div v-if="!isDefaultScreen">
+          <div class="title-block">
+            <span>{{ config.websiteName }}</span>
             <div v-if="config.isOnline" class="online-dot" />
           </div>
-          <div class="text-xs mt-1 text-black-700">
-            {{ responseTime }}
-          </div>
+          <div>{{ config.replyTime }}</div>
         </div>
       </div>
-      <div v-if="config.isExpanded" class="header-expanded">
-        <h2 class="text-slate-900 mt-6 text-4xl mb-3 font-normal">
-          {{ config.welcomeHeading }}
-        </h2>
-        <p class="text-lg text-black-700 leading-normal">
-          {{ config.welcomeTagLine }}
-        </p>
+      <div v-if="isDefaultScreen" class="header-expanded">
+        <h2>{{ config.welcomeHeading }}</h2>
+        <p>{{ config.welcomeTagline }}</p>
       </div>
     </div>
   </div>
@@ -35,44 +29,31 @@ export default {
   props: {
     config: {
       type: Object,
-      default() {
-        return {};
-      },
+      default: () => {},
     },
   },
   computed: {
-    responseTime() {
-      switch (this.config.replyTime) {
-        case 'in_a_few_minutes':
-          return this.$t(
-            'INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.IN_A_FEW_MINUTES'
-          );
-        case 'in_a_few_hours':
-          return this.$t(
-            'INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.IN_A_FEW_HOURS'
-          );
-        case 'in_a_day':
-          return this.$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.IN_A_DAY');
-        default:
-          return this.$t(
-            'INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.IN_A_FEW_HOURS'
-          );
-      }
+    isDefaultScreen() {
+      return (
+        this.config.isDefaultScreen &&
+        (this.config.welcomeHeading.length !== 0 ||
+          this.config.welcomeTagline.length !== 0)
+      );
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-$sucess-green: #10b981;
 .header-wrapper {
   flex-shrink: 0;
   transition: max-height 300ms;
   background-color: var(--white);
   padding: var(--space-two);
+  border-top-left-radius: var(--border-radius-large);
+  border-top-right-radius: var(--border-radius-large);
 
   .header-branding {
-    max-height: 16rem;
     .header {
       display: flex;
       flex-direction: row;
@@ -90,22 +71,34 @@ $sucess-green: #10b981;
         }
       }
     }
+
+    .header-expanded {
+      max-height: var(--space-giga);
+      overflow: scroll;
+      h2 {
+        font-size: var(--font-size-big);
+        margin-bottom: var(--space-small);
+        margin-top: var(--space-two);
+        overflow-wrap: break-word;
+      }
+
+      p {
+        font-size: var(--font-size-small);
+        overflow-wrap: break-word;
+      }
+    }
   }
-  .text-base {
-    font-size: var(--font-size-default);
-  }
-  .mt-6 {
-    margin-top: var(--space-medium);
-  }
+
   .title-block {
     display: flex;
     align-items: center;
+    font-size: var(--font-size-default);
     .online-dot {
-      background-color: $sucess-green;
+      background-color: var(--g-500);
       height: var(--space-small);
       width: var(--space-small);
       border-radius: 100%;
-      margin: var(--space-zero) var(--space-one);
+      margin: var(--space-zero) var(--space-smaller);
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index 4b4b71c10..c40c41bd8 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -28,7 +28,7 @@
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
 import { VeTable } from 'vue-easytable';
-import flag from 'country-code-emoji';
+import { getCountryFlag } from 'dashboard/helper/flag';
 
 import Spinner from 'shared/components/Spinner.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
@@ -200,7 +200,7 @@ export default {
             if (row.country) {
               return (
                 <div class="text-truncate">
-                  {`${flag(row.countryCode)} ${row.country}`}
+                  {`${getCountryFlag(row.countryCode)} ${row.country}`}
                 </div>
               );
             }
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index f6249325e..d71a397c5 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -111,13 +111,11 @@ export default {
         return this.currentChat.meta.team;
       },
       set(team) {
+        const conversationId = this.currentChat.id;
         const teamId = team ? team.id : 0;
-        this.$store.dispatch('setCurrentChatTeam', team);
+        this.$store.dispatch('setCurrentChatTeam', { team, conversationId });
         this.$store
-          .dispatch('assignTeam', {
-            conversationId: this.currentChat.id,
-            teamId,
-          })
+          .dispatch('assignTeam', { conversationId, teamId })
           .then(() => {
             this.showAlert(this.$t('CONVERSATION.CHANGE_TEAM'));
           });
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
index 07883b08a..16a41cc94 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
@@ -6,6 +6,12 @@
       :value="initiatedAt.timestamp"
       class="conversation--attribute"
     />
+    <contact-details-item
+      v-if="browserLanguage"
+      :title="$t('CONTACT_PANEL.BROWSER_LANGUAGE')"
+      :value="browserLanguage"
+      class="conversation--attribute"
+    />
     <contact-details-item
       v-if="referer"
       :title="$t('CONTACT_PANEL.INITIATED_FROM')"
@@ -44,6 +50,7 @@
 </template>
 
 <script>
+import { getLanguageName } from '../../../components/widgets/conversation/advancedFilterItems/languages';
 import ContactDetailsItem from './ContactDetailsItem.vue';
 import CustomAttributes from './customAttributes/CustomAttributes.vue';
 import CustomAttributeSelector from './customAttributes/CustomAttributeSelector.vue';
@@ -103,6 +110,9 @@ export default {
       } = this.conversationAttributes.browser;
       return `${browserName} ${browserVersion}`;
     },
+    browserLanguage() {
+      return getLanguageName(this.conversationAttributes.browser_language);
+    },
     platformName() {
       if (!this.conversationAttributes.browser) {
         return '';
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 13515ac21..f9ed39d19 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -1,18 +1,25 @@
 <template>
   <section class="conversation-page">
     <chat-list
+      :show-conversation-list="showConversationList"
       :conversation-inbox="inboxId"
       :label="label"
       :team-id="teamId"
       :conversation-type="conversationType"
       :folders-id="foldersId"
+      :is-on-expanded-layout="isOnExpandedLayout"
       @conversation-load="onConversationLoad"
     >
-      <pop-over-search />
+      <pop-over-search
+        :is-on-expanded-layout="isOnExpandedLayout"
+        @toggle-conversation-layout="toggleConversationLayout"
+      />
     </chat-list>
     <conversation-box
+      v-if="showMessageView"
       :inbox-id="inboxId"
       :is-contact-panel-open="isContactPanelOpen"
+      :is-on-expanded-layout="isOnExpandedLayout"
       @contact-panel-toggle="onToggleContactPanel"
     />
   </section>
@@ -25,6 +32,7 @@ import ConversationBox from '../../../components/widgets/conversation/Conversati
 import PopOverSearch from './search/PopOverSearch';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
+import wootConstants from 'dashboard/constants';
 
 export default {
   components: {
@@ -69,6 +77,21 @@ export default {
       chatList: 'getAllConversations',
       currentChat: 'getSelectedChat',
     }),
+    showConversationList() {
+      return this.isOnExpandedLayout ? !this.conversationId : true;
+    },
+    showMessageView() {
+      return this.conversationId ? true : !this.isOnExpandedLayout;
+    },
+    isOnExpandedLayout() {
+      const {
+        LAYOUT_TYPES: { CONDENSED },
+      } = wootConstants;
+      const {
+        conversation_display_type: conversationDisplayType = CONDENSED,
+      } = this.uiSettings;
+      return conversationDisplayType !== CONDENSED;
+    },
     isContactPanelOpen() {
       if (this.currentChat.id) {
         const {
@@ -101,6 +124,17 @@ export default {
       this.$store.dispatch('setActiveInbox', this.inboxId);
       this.setActiveChat();
     },
+    toggleConversationLayout() {
+      const { LAYOUT_TYPES } = wootConstants;
+      const {
+        conversation_display_type: conversationDisplayType = LAYOUT_TYPES.CONDENSED,
+      } = this.uiSettings;
+      const newViewType =
+        conversationDisplayType === LAYOUT_TYPES.CONDENSED
+          ? LAYOUT_TYPES.EXPANDED
+          : LAYOUT_TYPES.CONDENSED;
+      this.updateUISettings({ conversation_display_type: newViewType });
+    },
     fetchConversationIfUnavailable() {
       if (!this.conversationId) {
         return;
@@ -117,11 +151,16 @@ export default {
     },
     setActiveChat() {
       if (this.conversationId) {
-        const chat = this.findConversation();
-        if (!chat) {
+        const selectedConversation = this.findConversation();
+        // If conversation doesn't exist or selected conversation is same as the active
+        // conversation, don't set active conversation.
+        if (
+          !selectedConversation ||
+          selectedConversation.id === this.currentChat.id
+        ) {
           return;
         }
-        this.$store.dispatch('setActiveChat', chat).then(() => {
+        this.$store.dispatch('setActiveChat', selectedConversation).then(() => {
           bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
         });
       } else {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index db20d7043..c34764dbd 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -150,7 +150,7 @@ import ContactMergeModal from 'dashboard/modules/contact/ContactMergeModal';
 import alertMixin from 'shared/mixins/alertMixin';
 import adminMixin from '../../../../mixins/isAdmin';
 import { mapGetters } from 'vuex';
-import flag from 'country-code-emoji';
+import { getCountryFlag } from 'dashboard/helper/flag';
 
 export default {
   components: {
@@ -244,7 +244,7 @@ export default {
     },
     findCountryFlag(countryCode, cityAndCountry) {
       try {
-        const countryFlag = countryCode ? flag(countryCode) : '🌎';
+        const countryFlag = countryCode ? getCountryFlag(countryCode) : '🌎';
         return `${cityAndCountry} ${countryFlag}`;
       } catch (error) {
         return '';
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index fdac90d76..33559e123 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -28,9 +28,9 @@
   </div>
 </template>
 <script>
-import copy from 'copy-text-to-clipboard';
 import alertMixin from 'shared/mixins/alertMixin';
 import EmojiOrIcon from 'shared/components/EmojiOrIcon';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
 
 export default {
   components: {
@@ -60,9 +60,9 @@ export default {
     },
   },
   methods: {
-    onCopy(e) {
+    async onCopy(e) {
       e.preventDefault();
-      copy(this.value);
+      await copyTextToClipboard(this.value);
       this.showAlert(this.$t('CONTACT_PANEL.COPY_SUCCESSFUL'));
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
index efef9607e..59f855f0f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
@@ -20,10 +20,11 @@
 </template>
 
 <script>
-import copy from 'copy-text-to-clipboard';
 import CustomAttribute from 'dashboard/components/CustomAttribute.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import attributeMixin from 'dashboard/mixins/attributeMixin';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+
 export default {
   components: {
     CustomAttribute,
@@ -86,8 +87,8 @@ export default {
         this.showAlert(errorMessage);
       }
     },
-    onCopy(attributeValue) {
-      copy(attributeValue);
+    async onCopy(attributeValue) {
+      await copyTextToClipboard(attributeValue);
       this.showAlert(this.$t('CUSTOM_ATTRIBUTES.COPY_SUCCESSFUL'));
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index 5ab0e9708..7f7fb67df 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -11,6 +11,10 @@
         :placeholder="$t('CONVERSATION.SEARCH_MESSAGES')"
         @focus="onSearch"
       />
+      <switch-layout
+        :is-on-expanded-layout="isOnExpandedLayout"
+        @toggle="$emit('toggle-conversation-layout')"
+      />
     </div>
     <div v-if="showSearchBox" class="results-wrap">
       <div class="show-results">
@@ -55,10 +59,11 @@ import { mapGetters } from 'vuex';
 import timeMixin from '../../../../mixins/time';
 import ResultItem from './ResultItem';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-
+import SwitchLayout from './SwitchLayout.vue';
 export default {
   components: {
     ResultItem,
+    SwitchLayout,
   },
 
   directives: {
@@ -71,6 +76,13 @@ export default {
 
   mixins: [timeMixin, messageFormatterMixin, clickaway],
 
+  props: {
+    isOnExpandedLayout: {
+      type: Boolean,
+      required: true,
+    },
+  },
+
   data() {
     return {
       searchTerm: '',
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
new file mode 100644
index 000000000..469a0ca77
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
@@ -0,0 +1,59 @@
+<template>
+  <button
+    v-tooltip.left="$t('CONVERSATION.SWITCH_VIEW_LAYOUT')"
+    class="layout-switch__container"
+    @click="toggle"
+  >
+    <div
+      class="layout-switch__btn left"
+      :class="{ active: !isOnExpandedLayout }"
+    >
+      <fluent-icon icon="panel-sidebar" :size="16" />
+    </div>
+    <div
+      class="layout-switch__btn right"
+      :class="{ active: isOnExpandedLayout }"
+    >
+      <fluent-icon icon="panel-contract" :size="16" />
+    </div>
+  </button>
+</template>
+
+<script>
+export default {
+  props: {
+    isOnExpandedLayout: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  methods: {
+    toggle() {
+      this.$emit('toggle');
+    },
+  },
+};
+</script>
+
+<style lang="scss" soped>
+.layout-switch__container {
+  align-items: center;
+  background-color: var(--s-100);
+  border-radius: var(--border-radius-medium);
+  cursor: pointer;
+  display: flex;
+  padding: var(--space-micro);
+
+  .layout-switch__btn {
+    border-radius: var(--border-radius-normal);
+    color: var(--s-400);
+    display: flex;
+    padding: var(--space-micro) var(--space-smaller);
+
+    &.active {
+      background-color: var(--white);
+      color: var(--w-500);
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index 343b11c27..8a7ebee72 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -6,6 +6,8 @@ import { routes as notificationRoutes } from './notifications/routes';
 import { frontendURL } from '../../helper/URLHelper';
 import helpcenterRoutes from './helpcenter/helpcenter.routes';
 
+const Suspended = () => import('./suspended/Index');
+
 export default {
   routes: [
     ...helpcenterRoutes.routes,
@@ -19,5 +21,11 @@ export default {
         ...notificationRoutes,
       ],
     },
+    {
+      path: frontendURL('accounts/:accountId/suspended'),
+      name: 'account_suspended',
+      roles: ['administrator', 'agent'],
+      component: Suspended,
+    },
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddCategory.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddCategory.vue
new file mode 100644
index 000000000..fc56a684f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddCategory.vue
@@ -0,0 +1,185 @@
+<template>
+  <woot-modal :show.sync="show" :on-close="onClose">
+    <woot-modal-header
+      :header-title="$t('HELP_CENTER.CATEGORY.ADD.TITLE')"
+      :header-content="$t('HELP_CENTER.CATEGORY.ADD.SUB_TITLE')"
+    />
+    <form class="row" @submit.prevent="onCreate">
+      <div class="medium-12 columns">
+        <div class="row article-info">
+          <div class="columns medium-6">
+            <label>
+              <span>{{ $t('HELP_CENTER.CATEGORY.ADD.PORTAL') }}</span>
+              <p class="value">{{ portalName }}</p>
+            </label>
+          </div>
+          <div class="columns medium-6">
+            <label>
+              <span>{{ $t('HELP_CENTER.CATEGORY.ADD.LOCALE') }}</span>
+              <p class="value">{{ locale }}</p>
+            </label>
+          </div>
+        </div>
+        <woot-input
+          v-model.trim="name"
+          :class="{ error: $v.name.$error }"
+          class="medium-12 columns"
+          :error="nameError"
+          :label="$t('HELP_CENTER.CATEGORY.ADD.NAME.LABEL')"
+          :placeholder="$t('HELP_CENTER.CATEGORY.ADD.NAME.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.CATEGORY.ADD.NAME.HELP_TEXT')"
+          @input="onNameChange"
+        />
+        <woot-input
+          v-model.trim="slug"
+          :class="{ error: $v.slug.$error }"
+          class="medium-12 columns"
+          :error="slugError"
+          :label="$t('HELP_CENTER.CATEGORY.ADD.SLUG.LABEL')"
+          :placeholder="$t('HELP_CENTER.CATEGORY.ADD.SLUG.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.CATEGORY.ADD.SLUG.HELP_TEXT')"
+          @input="$v.slug.$touch"
+        />
+        <label>
+          {{ $t('HELP_CENTER.CATEGORY.ADD.DESCRIPTION.LABEL') }}
+          <textarea
+            v-model="description"
+            rows="3"
+            type="text"
+            :placeholder="
+              $t('HELP_CENTER.CATEGORY.ADD.DESCRIPTION.PLACEHOLDER')
+            "
+          />
+        </label>
+        <div class="medium-12 columns">
+          <div class="modal-footer justify-content-end w-full">
+            <woot-button class="button clear" @click.prevent="onClose">
+              {{ $t('HELP_CENTER.CATEGORY.ADD.BUTTONS.CANCEL') }}
+            </woot-button>
+            <woot-button @click="addCategory">
+              {{ $t('HELP_CENTER.CATEGORY.ADD.BUTTONS.CREATE') }}
+            </woot-button>
+          </div>
+        </div>
+      </div>
+    </form>
+  </woot-modal>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import { required, minLength } from 'vuelidate/lib/validators';
+import { convertToCategorySlug } from 'dashboard/helper/commons.js';
+
+export default {
+  mixins: [alertMixin],
+  props: {
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    portalName: {
+      type: String,
+      default: '',
+    },
+    locale: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      name: '',
+      slug: '',
+      description: '',
+    };
+  },
+  validations: {
+    name: {
+      required,
+      minLength: minLength(2),
+    },
+    slug: {
+      required,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      selectedPortal: 'portals/getSelectedPortal',
+    }),
+    selectedPortalSlug() {
+      return this.selectedPortal?.slug;
+    },
+    nameError() {
+      if (this.$v.name.$error) {
+        return this.$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR');
+      }
+      return '';
+    },
+    slugError() {
+      if (this.$v.slug.$error) {
+        return this.$t('HELP_CENTER.CATEGORY.ADD.SLUG.ERROR');
+      }
+      return '';
+    },
+  },
+  methods: {
+    onNameChange() {
+      this.slug = convertToCategorySlug(this.name);
+    },
+    onCreate() {
+      this.$emit('create');
+    },
+    onClose() {
+      this.$emit('cancel');
+    },
+
+    async addCategory() {
+      const { name, slug, description } = this;
+      const data = {
+        name,
+        slug,
+        description,
+      };
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        return;
+      }
+      try {
+        await this.$store.dispatch('categories/create', {
+          portalSlug: this.selectedPortalSlug,
+          categoryObj: data,
+        });
+        this.alertMessage = this.$t(
+          'HELP_CENTER.CATEGORY.ADD.API.SUCCESS_MESSAGE'
+        );
+        this.onClose();
+      } catch (error) {
+        const errorMessage = error?.message;
+        this.alertMessage =
+          errorMessage || this.$t('HELP_CENTER.CATEGORY.ADD.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.article-info {
+  width: 100%;
+  margin: 0 0 var(--space-normal);
+  .value {
+    color: var(--s-600);
+  }
+}
+
+.input-container::v-deep {
+  margin: 0 0 var(--space-normal);
+
+  input {
+    margin-bottom: 0;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddPortal.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddPortal.vue
new file mode 100644
index 000000000..aa526fd99
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/AddPortal.vue
@@ -0,0 +1,185 @@
+<template>
+  <modal :show.sync="show" :on-close="onClose">
+    <woot-modal-header
+      :header-title="$t('HELP_CENTER.PORTAL.ADD.TITLE')"
+      :header-content="$t('HELP_CENTER.PORTAL.ADD.SUB_TITLE')"
+    />
+    <form class="row" @submit.prevent="onCreate">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="name"
+          :class="{ error: $v.name.$error }"
+          class="medium-12 columns"
+          :error="$v.name.$error ? $t('HELP_CENTER.PORTAL.ADD.NAME.ERROR') : ''"
+          :label="$t('HELP_CENTER.PORTAL.ADD.NAME.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.NAME.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.NAME.HELP_TEXT')"
+          @blur="$v.name.$touch"
+          @input="onNameChange"
+        />
+        <woot-input
+          v-model="slug"
+          :class="{ error: $v.slug.$error }"
+          class="medium-12 columns"
+          :error="$v.slug.$error ? $t('HELP_CENTER.PORTAL.ADD.SLUG.ERROR') : ''"
+          :label="$t('HELP_CENTER.PORTAL.ADD.SLUG.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.SLUG.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.SLUG.HELP_TEXT')"
+          @blur="$v.slug.$touch"
+        />
+
+        <woot-input
+          v-model="pageTitle"
+          class="medium-12 columns"
+          :label="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.HELP_TEXT')"
+        />
+        <woot-input
+          v-model="headerText"
+          class="medium-12 columns"
+          :label="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.HELP_TEXT')"
+        />
+
+        <woot-input
+          v-model="domain"
+          class="medium-12 columns"
+          :label="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.HELP_TEXT')"
+        />
+        <woot-input
+          v-model="homePageLink"
+          class="medium-12 columns"
+          :label="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.HELP_TEXT')"
+        />
+
+        <div class="medium-12 columns">
+          <div class="modal-footer justify-content-end w-full">
+            <woot-button
+              class="button clear"
+              :is-loading="uiFlags.isCreating"
+              @click.prevent="onClose"
+            >
+              {{ $t('HELP_CENTER.PORTAL.ADD.BUTTONS.CANCEL') }}
+            </woot-button>
+            <woot-button>
+              {{ $t('HELP_CENTER.PORTAL.ADD.BUTTONS.CREATE') }}
+            </woot-button>
+          </div>
+        </div>
+      </div>
+    </form>
+  </modal>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import Modal from 'dashboard/components/Modal';
+import alertMixin from 'shared/mixins/alertMixin';
+import { required } from 'vuelidate/lib/validators';
+import { convertToPortalSlug } from 'dashboard/helper/commons.js';
+
+export default {
+  components: {
+    Modal,
+  },
+  mixins: [alertMixin],
+  props: {
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    portalName: {
+      type: String,
+      default: '',
+    },
+    locale: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      name: '',
+      slug: '',
+      domain: '',
+      homePageLink: '',
+      pageTitle: '',
+      headerText: '',
+      alertMessage: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'portals/uiFlagsIn',
+    }),
+  },
+  validations: {
+    name: {
+      required,
+    },
+    slug: {
+      required,
+    },
+  },
+  methods: {
+    onNameChange() {
+      this.slug = convertToPortalSlug(this.name);
+    },
+    async onCreate() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        return;
+      }
+
+      try {
+        await this.$store.dispatch('portals/create', {
+          portal: {
+            name: this.name,
+            slug: this.slug,
+            custom_domain: this.domain,
+            // TODO: add support for choosing color
+            color: '#1f93ff',
+            homepage_link: this.homePageLink,
+            page_title: this.pageTitle,
+            header_text: this.headerText,
+            config: {
+              // TODO: add support for choosing locale
+              allowed_locales: ['en'],
+            },
+          },
+        });
+        this.alertMessage = this.$t(
+          'HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE'
+        );
+        this.$emit('cancel');
+      } catch (error) {
+        this.alertMessage =
+          error?.message || this.$t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+    onClose() {
+      this.$emit('cancel');
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.input-container::v-deep {
+  margin: 0 0 var(--space-normal);
+
+  input {
+    margin-bottom: 0;
+  }
+  .message {
+    margin-top: 0;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/helpCenter/ArticleItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
similarity index 88%
rename from app/javascript/dashboard/components/helpCenter/ArticleItem.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
index 252215c8c..3c1f9cdf9 100644
--- a/app/javascript/dashboard/components/helpCenter/ArticleItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
@@ -4,7 +4,7 @@
       <div class="row--article-block">
         <div class="article-block">
           <h6 class="sub-block-title text-truncate">
-            <router-link class="article-name" :to="articlePath">
+            <router-link class="article-name" :to="articleUrl(id)">
               {{ title }}
             </router-link>
           </h6>
@@ -15,7 +15,7 @@
         </div>
       </div>
     </td>
-    <td>{{ category }}</td>
+    <td>{{ category.name }}</td>
     <td>{{ readCount }}</td>
     <td>
       <Label :title="status" :color-scheme="labelColor" />
@@ -24,16 +24,20 @@
   </tr>
 </template>
 <script>
-import { frontendURL } from 'dashboard/helper/URLHelper';
 import Label from 'dashboard/components/ui/Label';
 import timeMixin from 'dashboard/mixins/time';
+import portalMixin from '../mixins/portalMixin';
 export default {
   components: {
     Label,
   },
-  mixins: [timeMixin],
+  mixins: [timeMixin, portalMixin],
 
   props: {
+    id: {
+      type: Number,
+      required: true,
+    },
     title: {
       type: String,
       default: '',
@@ -44,8 +48,8 @@ export default {
       default: () => {},
     },
     category: {
-      type: String,
-      default: '',
+      type: Object,
+      default: () => {},
     },
     readCount: {
       type: Number,
@@ -79,9 +83,6 @@ export default {
           return 'success';
       }
     },
-    articlePath() {
-      return frontendURL(`accounts/${this.accountId}/hc/articles/${this.id}`);
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/helpCenter/ArticleTable.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
similarity index 84%
rename from app/javascript/dashboard/components/helpCenter/ArticleTable.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
index b6b0f34fe..101bc72d7 100644
--- a/app/javascript/dashboard/components/helpCenter/ArticleTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
@@ -16,20 +16,23 @@
       <tbody>
         <ArticleItem
           v-for="article in articles"
+          :id="article.id"
           :key="article.id"
           :title="article.title"
           :author="article.author"
           :category="article.category"
           :read-count="article.readCount"
           :status="article.status"
-          :updated-at="article.updatedAt"
+          :updated-at="article.updated_at"
         />
       </tbody>
     </table>
     <table-footer
+      v-if="articles.length"
       :on-page-change="onPageChange"
       :current-page="Number(currentPage)"
-      :total-count="articleCount"
+      :total-count="totalCount"
+      :page-size="pageSize"
     />
   </div>
 </template>
@@ -47,7 +50,7 @@ export default {
       type: Array,
       default: () => {},
     },
-    articleCount: {
+    totalCount: {
       type: Number,
       default: 0,
     },
@@ -55,10 +58,14 @@ export default {
       type: Number,
       default: 1,
     },
+    pageSize: {
+      type: Number,
+      default: 15,
+    },
   },
   methods: {
-    onPageChange() {
-      this.$emit('onPageChange');
+    onPageChange(page) {
+      this.$emit('on-page-change', page);
     },
   },
 };
@@ -79,6 +86,7 @@ export default {
   }
   .footer {
     padding: 0;
+    border: 0;
   }
 }
 </style>
diff --git a/app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
similarity index 90%
rename from app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index d106bd93c..306770730 100644
--- a/app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -42,7 +42,7 @@
               size="small"
               icon="send-clock"
             >
-              {{ 'Status' }}
+              {{ $t('HELP_CENTER.HEADER.DROPDOWN_OPTIONS.PUBLISHED') }}
             </woot-button>
           </woot-dropdown-item>
           <woot-dropdown-item>
@@ -52,7 +52,7 @@
               size="small"
               icon="dual-screen-clock"
             >
-              {{ 'Created' }}
+              {{ $t('HELP_CENTER.HEADER.DROPDOWN_OPTIONS.DRAFT') }}
             </woot-button>
           </woot-dropdown-item>
           <woot-dropdown-item>
@@ -62,7 +62,7 @@
               size="small"
               icon="calendar-clock"
             >
-              {{ 'Last edited' }}
+              {{ $t('HELP_CENTER.HEADER.DROPDOWN_OPTIONS.ARCHIVED') }}
             </woot-button>
           </woot-dropdown-item>
         </woot-dropdown-menu>
@@ -79,6 +79,7 @@
         class-names="article--buttons"
         size="small"
         color-scheme="primary"
+        @click="onClickNewArticlePage"
       >
         {{ $t('HELP_CENTER.HEADER.NEW_BUTTON') }}
       </woot-button>
@@ -130,6 +131,9 @@ export default {
       this.$emit('close');
       this.showSortByDropdown = false;
     },
+    onClickNewArticlePage() {
+      this.$emit('newArticlePage');
+    },
   },
 };
 </script>
@@ -139,7 +143,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: var(--space-small) var(--space-normal);
   width: 100%;
   height: var(--space-larger);
 }
@@ -154,6 +157,10 @@ export default {
 .count-view {
   margin-left: var(--space-smaller);
 }
+.dropdown-pane--open {
+  top: var(--space-larger);
+  right: 14.8rem;
+}
 .selected-value {
   display: inline-flex;
   margin-left: var(--space-smaller);
diff --git a/app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
similarity index 95%
rename from app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
index 83f2bf987..f1fc4715d 100644
--- a/app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
@@ -3,7 +3,7 @@
     <div class="header-left--wrap">
       <woot-button
         icon="chevron-left"
-        class-names="article--buttons"
+        class-names="article-back-buttons"
         variant="clear"
         color-scheme="primary"
         @click="onClickGoBack"
@@ -36,7 +36,7 @@
         {{ $t('HELP_CENTER.EDIT_HEADER.ADD_TRANSLATION') }}
       </woot-button>
       <woot-button
-        v-if="isSidebarOpen"
+        v-if="!isSidebarOpen"
         v-tooltip.top-end="$t('HELP_CENTER.EDIT_HEADER.OPEN_SIDEBAR')"
         icon="pane-open"
         class-names="article--buttons"
@@ -46,7 +46,7 @@
         @click="openSidebar"
       />
       <woot-button
-        v-else
+        v-if="isSidebarOpen"
         v-tooltip.top-end="$t('HELP_CENTER.EDIT_HEADER.CLOSE_SIDEBAR')"
         icon="pane-close"
         class-names="article--buttons"
@@ -80,7 +80,7 @@ export default {
   },
   data() {
     return {
-      isSidebarOpen: true,
+      isSidebarOpen: false,
     };
   },
   computed: {
@@ -111,12 +111,12 @@ export default {
       this.$emit('add');
     },
     openSidebar() {
-      this.$emit('open');
       this.isSidebarOpen = true;
+      this.$emit('open');
     },
     closeSidebar() {
-      this.$emit('close');
       this.isSidebarOpen = false;
+      this.$emit('close');
     },
   },
 };
@@ -127,7 +127,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: var(--space-small) var(--space-normal);
   width: 100%;
   height: var(--space-larger);
 }
@@ -139,6 +138,9 @@ export default {
   display: flex;
   align-items: center;
 }
+.article-back-buttons {
+  padding-left: 0;
+}
 .article--buttons {
   margin-left: var(--space-smaller);
 }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
index 7b37dc823..b0054811f 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
@@ -6,13 +6,16 @@
       @open-key-shortcut-modal="toggleKeyShortcutModal"
       @close-key-shortcut-modal="closeKeyShortcutModal"
     />
-
-    <!-- TO BE REPLACED WITH HELPCENTER SIDEBAR -->
-    <div class="margin-right-small">
-      {{ `Place the help center sidebar here.  ` }}
+    <div v-if="portals.length" class="margin-right-small">
+      <help-center-sidebar
+        :header-title="headerTitle"
+        :sub-title="localeName(selectedPortalLocale)"
+        :accessible-menu-items="accessibleMenuItems"
+        :additional-secondary-menu-items="additionalSecondaryMenuItems"
+        @open-popover="openPortalPopover"
+        @open-modal="onClickOpenAddCatogoryModal"
+      />
     </div>
-    <!-- END: TO BE REPLACED WITH HELPCENTER SIDEBAR -->
-
     <section class="app-content columns">
       <router-view />
       <command-bar />
@@ -25,34 +28,165 @@
         v-if="showNotificationPanel"
         @close="closeNotificationPanel"
       />
+      <portal-popover
+        v-if="showPortalPopover"
+        :portals="portals"
+        :active-portal="selectedPortal"
+        @close-popover="closePortalPopover"
+      />
+      <add-category
+        v-if="showAddCategoryModal"
+        :portal-name="selectedPortalName"
+        :locale="selectedPortalLocale"
+        @cancel="onClickCloseAddCategoryModal"
+      />
     </section>
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex';
+
+import { frontendURL } from '../../../../helper/URLHelper';
 import Sidebar from 'dashboard/components/layout/Sidebar';
+import PortalPopover from '../components/PortalPopover.vue';
+import HelpCenterSidebar from '../components/Sidebar/Sidebar.vue';
 import CommandBar from 'dashboard/routes/dashboard/commands/commandbar.vue';
 import WootKeyShortcutModal from 'dashboard/components/widgets/modal/WootKeyShortcutModal';
-import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel.vue';
+import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel';
+import portalMixin from '../mixins/portalMixin';
+import AddCategory from '../components/AddCategory.vue';
 
 export default {
   components: {
     Sidebar,
+    HelpCenterSidebar,
     CommandBar,
     WootKeyShortcutModal,
     NotificationPanel,
+    PortalPopover,
+    AddCategory,
   },
+  mixins: [portalMixin],
   data() {
     return {
       showShortcutModal: false,
       showNotificationPanel: false,
+      showPortalPopover: false,
+      showAddCategoryModal: false,
     };
   },
+
   computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      selectedPortal: 'portals/getSelectedPortal',
+      portals: 'portals/allPortals',
+      categories: 'categories/allCategories',
+      meta: 'portals/getMeta',
+      isFetching: 'portals/isFetchingPortals',
+    }),
+    selectedPortalName() {
+      return this.selectedPortal ? this.selectedPortal.name : '';
+    },
+    selectedPortalSlug() {
+      return this.portalSlug || this.selectedPortal?.slug;
+    },
+    selectedPortalLocale() {
+      return this.locale || this.selectedPortal?.meta?.default_locale;
+    },
+    accessibleMenuItems() {
+      const {
+        meta: {
+          all_articles_count: allArticlesCount,
+          mine_articles_count: mineArticlesCount,
+          draft_articles_count: draftArticlesCount,
+          archived_articles_count: archivedArticlesCount,
+        } = {},
+      } = this.selectedPortal;
+      return [
+        {
+          icon: 'book',
+          label: 'HELP_CENTER.ALL_ARTICLES',
+          key: 'list_all_locale_articles',
+          count: allArticlesCount,
+          toState: frontendURL(
+            `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/${this.selectedPortalLocale}/articles`
+          ),
+          toolTip: 'All Articles',
+          toStateName: 'list_all_locale_articles',
+        },
+        {
+          icon: 'pen',
+          label: 'HELP_CENTER.MY_ARTICLES',
+          key: 'list_mine_articles',
+          count: mineArticlesCount,
+          toState: frontendURL(
+            `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/${this.selectedPortalLocale}/articles/mine`
+          ),
+          toolTip: 'My articles',
+          toStateName: 'list_mine_articles',
+        },
+        {
+          icon: 'draft',
+          label: 'HELP_CENTER.DRAFT',
+          key: 'list_draft_articles',
+          count: draftArticlesCount,
+          toState: frontendURL(
+            `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/${this.selectedPortalLocale}/articles/draft`
+          ),
+          toolTip: 'Draft',
+          toStateName: 'list_draft_articles',
+        },
+        {
+          icon: 'archive',
+          label: 'HELP_CENTER.ARCHIVED',
+          key: 'list_archived_articles',
+          count: archivedArticlesCount,
+          toState: frontendURL(
+            `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/${this.selectedPortalLocale}/articles/archived`
+          ),
+          toolTip: 'Archived',
+          toStateName: 'list_archived_articles',
+        },
+      ];
+    },
+    additionalSecondaryMenuItems() {
+      return [
+        {
+          icon: 'folder',
+          label: 'HELP_CENTER.CATEGORY',
+          hasSubMenu: true,
+          key: 'category',
+          children: this.categories.map(category => ({
+            id: category.id,
+            label: category.name,
+            count: category.meta.articles_count,
+            truncateLabel: true,
+            toState: frontendURL(
+              `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/${category.locale}/categories/${category.slug}`
+            ),
+          })),
+        },
+      ];
+    },
     currentRoute() {
       return ' ';
     },
+    headerTitle() {
+      return this.selectedPortal.name;
+    },
+  },
+  mounted() {
+    this.fetchPortalsAndItsCategories();
   },
   methods: {
+    fetchPortalsAndItsCategories() {
+      this.$store.dispatch('portals/index').then(() => {
+        this.$store.dispatch('categories/index', {
+          portalSlug: this.selectedPortalSlug,
+        });
+      });
+    },
     toggleKeyShortcutModal() {
       this.showShortcutModal = true;
     },
@@ -65,6 +199,24 @@ export default {
     closeNotificationPanel() {
       this.showNotificationPanel = false;
     },
+    openPortalPopover() {
+      this.showPortalPopover = !this.showPortalPopover;
+    },
+    closePortalPopover() {
+      this.showPortalPopover = false;
+    },
+    openPortalPage() {
+      this.$router.push({
+        name: 'list_all_portals',
+      });
+      this.showPortalPopover = false;
+    },
+    onClickOpenAddCatogoryModal() {
+      this.showAddCategoryModal = true;
+    },
+    onClickCloseAddCategoryModal() {
+      this.showAddCategoryModal = false;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue
new file mode 100644
index 000000000..55b38231d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue
@@ -0,0 +1,295 @@
+<template>
+  <div>
+    <div class="portal">
+      <thumbnail :username="portal.name" variant="square" />
+      <div class="container">
+        <header>
+          <div>
+            <div class="title-status--wrap">
+              <h2 class="portal-title block-title">{{ portal.name }}</h2>
+              <Label
+                :title="status"
+                :color-scheme="labelColor"
+                :small="true"
+                class="status"
+              />
+            </div>
+            <p class="portal-count">
+              {{ portal.articles_count }}
+              {{
+                $t(
+                  'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.HEADER.COUNT_LABEL'
+                )
+              }}
+            </p>
+          </div>
+          <div>
+            <woot-button
+              variant="smooth"
+              size="small"
+              color-scheme="primary"
+              class="header-action-buttons"
+              @click="addLocale"
+            >
+              {{
+                $t('HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.HEADER.ADD')
+              }}
+            </woot-button>
+            <woot-button
+              variant="hollow"
+              size="small"
+              color-scheme="secondary"
+              class="header-action-buttons"
+              @click="openSite"
+            >
+              {{
+                $t('HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.HEADER.VISIT')
+              }}
+            </woot-button>
+            <woot-button
+              v-tooltip.top-end="
+                $t(
+                  'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.HEADER.SETTINGS'
+                )
+              "
+              variant="hollow"
+              size="small"
+              icon="settings"
+              class="header-action-buttons"
+              color-scheme="secondary"
+              @click="openSettings"
+            />
+          </div>
+        </header>
+        <div class="portal-locales">
+          <h2 class="locale-title sub-block-title">
+            {{
+              $t(
+                'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.TITLE'
+              )
+            }}
+          </h2>
+          <div class="configuration-items--wrap">
+            <div class="configuration-items">
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.NAME'
+                  )
+                }}</label>
+                <span class="text-block-title">{{ portal.header_text }}</span>
+              </div>
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.DOMAIN'
+                  )
+                }}</label>
+                <span class="text-block-title">{{ portal.custom_domain }}</span>
+              </div>
+            </div>
+            <div class="configuration-items">
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.SLUG'
+                  )
+                }}</label>
+                <span class="text-block-title">{{ portal.slug }}</span>
+              </div>
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.TITLE'
+                  )
+                }}</label>
+                <span class="text-block-title">{{ portal.page_title }}</span>
+              </div>
+            </div>
+            <div class="configuration-items">
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.THEME'
+                  )
+                }}</label>
+                <div class="content-theme-wrap">
+                  <div
+                    class="theme-color"
+                    :style="{ background: portal.color }"
+                  />
+                </div>
+              </div>
+              <div class="configuration-item">
+                <label>{{
+                  $t(
+                    'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.PORTAL_CONFIG.ITEMS.SUB_TEXT'
+                  )
+                }}</label>
+                <span class="text-block-title">{{ portal.header_text }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="portal-locales">
+          <h2 class="locale-title sub-block-title">
+            {{
+              $t(
+                'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TITLE'
+              )
+            }}
+          </h2>
+          <locale-item-table
+            :locales="locales"
+            :selected-locale-code="portal.meta.default_locale"
+            @swap="swapLocale"
+            @delete="deleteLocale"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import thumbnail from 'dashboard/components/widgets/Thumbnail';
+import Label from 'dashboard/components/ui/Label';
+import LocaleItemTable from './PortalListItemTable';
+export default {
+  components: {
+    thumbnail,
+    Label,
+    LocaleItemTable,
+  },
+  props: {
+    portal: {
+      type: Object,
+      default: () => {},
+    },
+    status: {
+      type: String,
+      default: '',
+      values: ['archived', 'draft', 'published'],
+    },
+  },
+  computed: {
+    labelColor() {
+      switch (this.status) {
+        case 'Archived':
+          return 'warning';
+        default:
+          return 'success';
+      }
+    },
+
+    locales() {
+      return this.portal ? this.portal.config.allowed_locales : [];
+    },
+  },
+  methods: {
+    addLocale() {
+      this.$emit('add');
+    },
+    openSite() {
+      this.$emit('open-site');
+    },
+    openSettings() {
+      this.$emit('open');
+    },
+    swapLocale() {
+      this.$emit('swap');
+    },
+    deleteLocale() {
+      this.$emit('delete');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.portal {
+  background-color: var(--white);
+  padding: var(--space-normal);
+  border: 1px solid var(--color-border-dark);
+  border-radius: var(--border-radius-medium);
+  position: relative;
+  display: flex;
+  margin-bottom: var(--space-slab);
+
+  .container {
+    margin-left: var(--space-small);
+    flex-grow: 1;
+
+    header {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      margin-bottom: var(--space-normal);
+      .title-status--wrap {
+        display: flex;
+        align-items: center;
+        .status {
+          margin: 0 0 0 var(--space-small);
+        }
+      }
+      .portal-title {
+        color: var(--s-900);
+        margin-bottom: 0;
+      }
+      .portal-count {
+        font-size: var(--font-size-small);
+        margin-bottom: 0;
+        color: var(--s-700);
+      }
+      .header-action-buttons {
+        margin-left: var(--space-smaller);
+      }
+    }
+    .portal-locales {
+      margin-bottom: var(--space-small);
+      .locale-title {
+        color: var(--s-800);
+        font-weight: var(--font-weight-medium);
+        margin-bottom: var(--space-small);
+      }
+    }
+  }
+  .portal-settings--icon {
+    padding: var(--space-smaller);
+    margin-left: var(--space-small);
+
+    &:hover {
+      cursor: pointer;
+      background: var(--s-50);
+      border-radius: var(--border-radius-normal);
+    }
+  }
+  .configuration-items--wrap {
+    display: flex;
+    justify-content: space-between;
+    margin-right: var(--space-mega);
+    max-width: 80vw;
+    .configuration-items {
+      display: flex;
+      flex-direction: column;
+    }
+    .configuration-item {
+      display: flex;
+      align-items: flex-start;
+      flex-direction: column;
+      margin-bottom: var(--space-slab);
+      .content-theme-wrap {
+        display: flex;
+        align-items: center;
+      }
+      .theme-color {
+        width: var(--space-normal);
+        height: var(--space-normal);
+        border-radius: var(--border-radius-normal);
+        margin-right: var(--space-smaller);
+        border: 1px solid var(--color-border-light);
+      }
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue
new file mode 100644
index 000000000..08e1ee719
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue
@@ -0,0 +1,151 @@
+<template>
+  <table>
+    <thead>
+      <tr>
+        <th scope="col">
+          {{
+            $t(
+              'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.NAME'
+            )
+          }}
+        </th>
+        <th scope="col">
+          {{
+            $t(
+              'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.CODE'
+            )
+          }}
+        </th>
+        <th scope="col">
+          {{
+            $t(
+              'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.ARTICLE_COUNT'
+            )
+          }}
+        </th>
+        <th scope="col">
+          {{
+            $t(
+              'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.CATEGORIES'
+            )
+          }}
+        </th>
+        <th scope="col" />
+      </tr>
+    </thead>
+    <tr>
+      <td colspan="100%" class="horizontal-line" />
+    </tr>
+    <tbody>
+      <tr v-for="locale in locales" :key="locale.code">
+        <td>
+          <span>{{ localeName(locale.code) }}</span>
+          <Label
+            v-if="locale.code === selectedLocaleCode"
+            :title="
+              $t(
+                'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.DEFAULT_LOCALE'
+              )
+            "
+            color-scheme="primary"
+            :small="true"
+            class="default-status"
+          />
+        </td>
+        <td>
+          <span>{{ locale.code }}</span>
+        </td>
+        <td>
+          <span>{{ locale.articles_count }}</span>
+        </td>
+        <td>
+          <span>{{ locale.categories_count }}</span>
+        </td>
+        <td>
+          <woot-button
+            v-tooltip.top-end="
+              $t(
+                'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.SWAP'
+              )
+            "
+            size="tiny"
+            variant="smooth"
+            icon="arrow-swap"
+            color-scheme="primary"
+            :disabled="locale.code === selectedLocaleCode"
+            @click="swapLocale"
+          />
+          <woot-button
+            v-tooltip.top-end="
+              $t(
+                'HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.AVAILABLE_LOCALES.TABLE.DELETE'
+              )
+            "
+            size="tiny"
+            variant="smooth"
+            icon="delete"
+            color-scheme="secondary"
+            @click="deleteLocale"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</template>
+
+<script>
+import Label from 'dashboard/components/ui/Label';
+import portalMixin from '../mixins/portalMixin';
+export default {
+  components: {
+    Label,
+  },
+  mixins: [portalMixin],
+  props: {
+    locales: {
+      type: Array,
+      default: () => [],
+    },
+    selectedLocaleCode: {
+      type: String,
+      default: '',
+    },
+  },
+
+  methods: {
+    swapLocale() {
+      this.$emit('swap');
+    },
+    deleteLocale() {
+      this.$emit('delete');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+table {
+  thead tr th {
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-medium);
+    text-transform: none;
+    color: var(--s-600);
+    padding-left: 0;
+    padding-top: 0;
+  }
+
+  tbody tr {
+    border-bottom: 0;
+    td {
+      font-size: var(--font-size-small);
+      padding-left: 0;
+      .default-status {
+        margin: 0 0 0 var(--space-smaller);
+      }
+    }
+  }
+}
+.horizontal-line {
+  border-bottom: 1px solid var(--color-border);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
new file mode 100644
index 000000000..82fb7b61a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
@@ -0,0 +1,125 @@
+<template>
+  <div v-on-clickaway="closePortalPopover" class="portal-popover__container">
+    <header>
+      <div class="actions">
+        <h2 class="block-title">
+          {{ $t('HELP_CENTER.PORTAL.POPOVER.TITLE') }}
+        </h2>
+        <woot-button
+          variant="smooth"
+          color-scheme="secondary"
+          icon="settings"
+          size="small"
+        >
+          {{ $t('HELP_CENTER.PORTAL.POPOVER.PORTAL_SETTINGS') }}
+        </woot-button>
+      </div>
+      <p class="subtitle">
+        {{ $t('HELP_CENTER.PORTAL.POPOVER.SUBTITLE') }}
+      </p>
+    </header>
+    <div>
+      <portal-switch
+        v-for="portal in portals"
+        :key="portal.id"
+        :portal="portal"
+        :active="portal.id === activePortal.id"
+        @open-portal-page="openPortalPage"
+      />
+    </div>
+    <footer>
+      <woot-button variant="link" @click="closePortalPopover">
+        {{ $t('HELP_CENTER.PORTAL.POPOVER.CANCEL_BUTTON_LABEL') }}
+      </woot-button>
+      <woot-button>
+        {{ $t('HELP_CENTER.PORTAL.POPOVER.CHOOSE_LOCALE_BUTTON') }}
+      </woot-button>
+    </footer>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import PortalSwitch from './PortalSwitch.vue';
+export default {
+  components: {
+    PortalSwitch,
+  },
+  mixins: [clickaway],
+  props: {
+    portals: {
+      type: Array,
+      default: () => [],
+    },
+    activePortal: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  methods: {
+    closePortalPopover() {
+      this.$emit('close-popover');
+    },
+    openPortalPage({ slug, locale }) {
+      this.$emit('close-popover');
+      const portal = this.portals.find(p => p.slug === slug);
+      this.$store.dispatch('portals/setPortalId', portal.id);
+      this.$router.push({
+        name: 'list_all_locale_articles',
+        params: {
+          portalSlug: slug,
+          locale: locale,
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.portal-popover__container {
+  position: absolute;
+  overflow: scroll;
+  max-height: 96vh;
+  padding: var(--space-normal);
+  background-color: var(--white);
+  border-radius: var(--border-radius-normal);
+  box-shadow: var(--shadow-large);
+  max-width: 48rem;
+
+  header {
+    .actions {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: var(--space-smaller);
+
+      .new-popover-link {
+        display: flex;
+        align-items: center;
+        padding: var(--space-half) var(--space-one);
+        background-color: var(--s-25);
+        font-size: var(--font-size-mini);
+        color: var(--s-500);
+        margin-left: var(--space-small);
+        border-radius: var(--border-radius-normal);
+        span {
+          margin-left: var(--space-small);
+        }
+      }
+
+      .subtitle {
+        font-size: var(--font-size-mini);
+        color: var(--s-600);
+      }
+    }
+  }
+
+  footer {
+    display: flex;
+    justify-content: end;
+    align-items: center;
+    gap: var(--space-small);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
new file mode 100644
index 000000000..5b1e7f7fe
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="portal" :class="{ active }">
+    <thumbnail :username="portal.name" variant="square" />
+    <div class="actions-container">
+      <header>
+        <div>
+          <h2 class="portal-title">{{ portal.name }}</h2>
+          <p class="portal-count">
+            {{ articlesCount }}
+            {{ $t('HELP_CENTER.PORTAL.ARTICLES_LABEL') }}
+          </p>
+        </div>
+        <span v-if="active" class="badge">{{
+          $t('HELP_CENTER.PORTAL.ACTIVE_BADGE')
+        }}</span>
+      </header>
+      <div class="portal-locales">
+        <h2 class="locale-title">
+          {{ $t('HELP_CENTER.PORTAL.CHOOSE_LOCALE_LABEL') }}
+        </h2>
+        <ul>
+          <li v-for="locale in locales" :key="locale.code">
+            <label :for="`locale-${locale.code}`" class="locale-item">
+              <input
+                :id="`locale-${locale.code}`"
+                v-model="selectedLocale"
+                type="radio"
+                name="locale"
+                :value="locale.code"
+                @click="onClick(locale.code, portal)"
+              />
+              <div>
+                <p>{{ localeName(locale.code) }}</p>
+                <span>
+                  {{ locale.articles_count }}
+                  {{ $t('HELP_CENTER.PORTAL.ARTICLES_LABEL') }} -
+                  {{ locale.code }}
+                </span>
+              </div>
+            </label>
+          </li>
+          <li>
+            <a>+ {{ $t('HELP_CENTER.PORTAL.ADD_NEW_LOCALE') }}</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import thumbnail from 'dashboard/components/widgets/Thumbnail';
+import portalMixin from '../mixins/portalMixin';
+export default {
+  components: {
+    thumbnail,
+  },
+  mixins: [portalMixin],
+  props: {
+    portal: {
+      type: Object,
+      default: () => ({}),
+    },
+    active: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      selectedLocale: null,
+    };
+  },
+  computed: {
+    locales() {
+      return this.portal?.config?.allowed_locales;
+    },
+    articlesCount() {
+      return this.portal?.meta?.all_articles_count;
+    },
+  },
+  mounted() {
+    this.selectedLocale = this.locale || this.portal?.meta?.default_locale;
+  },
+  methods: {
+    onClick(code, portal) {
+      this.$emit('open-portal-page', { slug: portal.slug, locale: code });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.portal {
+  background-color: var(--white);
+  padding: var(--space-normal);
+  border: 1px solid var(--color-border-dark);
+  border-radius: var(--border-radius-medium);
+  position: relative;
+  display: flex;
+  margin-bottom: var(--space-normal);
+
+  &.active {
+    border: 1px solid var(--w-400);
+  }
+
+  .actions-container {
+    margin-left: var(--space-one);
+    flex-grow: 1;
+
+    header {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      margin-bottom: var(--space-one);
+
+      .badge {
+        font-size: var(--font-size-mini);
+        background-color: var(--w-100);
+        color: var(--w-600);
+        padding: var(--space-smaller) var(--space-small);
+      }
+
+      .portal-title {
+        color: var(--s-900);
+        font-size: var(--font-size-medium);
+        font-weight: var(--font-weight-bold);
+        margin-bottom: 0;
+      }
+
+      .portal-count {
+        font-size: var(--font-size-mini);
+        margin-bottom: 0;
+        color: var(--s-500);
+      }
+    }
+
+    .portal-locales {
+      .locale-title {
+        color: var(--s-600);
+        font-size: var(--font-size-default);
+        font-weight: var(--font-weight-medium);
+      }
+
+      ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+
+        .locale-item {
+          display: flex;
+          align-items: flex-start;
+          margin-bottom: var(--space-smaller);
+          cursor: pointer;
+          padding: var(--space-smaller);
+          border-radius: var(--border-radius-normal);
+
+          &:hover {
+            background-color: var(--w-25);
+          }
+
+          p {
+            margin-bottom: 0;
+          }
+
+          span {
+            color: var(--s-500);
+            font-size: var(--font-size-small);
+          }
+        }
+      }
+    }
+  }
+}
+label > [type='radio'] {
+  margin-bottom: 0;
+  margin-top: var(--space-smaller);
+  margin-right: var(--space-one);
+}
+</style>
diff --git a/app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
similarity index 75%
rename from app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
index 2f8fdd2fd..cc3fdcf91 100644
--- a/app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
@@ -4,26 +4,25 @@
       :thumbnail-src="thumbnailSrc"
       :header-title="headerTitle"
       :sub-title="subTitle"
+      @open-popover="openPortalPopover"
     />
     <sidebar-search @input="onSearch" />
-    <!-- <transition-group name="menu-list" tag="ul" class="menu vertical"> -->
-    <div name="menu-list" tag="ul" class="menu vertical">
+    <transition-group name="menu-list" tag="ul" class="menu vertical">
       <secondary-nav-item
         v-for="menuItem in accessibleMenuItems"
         :key="menuItem.toState"
         :menu-item="menuItem"
         :is-help-center-sidebar="true"
       />
-    </div>
-    <div name="menu-list" tag="ul" class="menu vertical">
       <secondary-nav-item
         v-for="menuItem in additionalSecondaryMenuItems"
         :key="menuItem.key"
         :menu-item="menuItem"
         :is-help-center-sidebar="true"
+        :is-category-empty="!hasCategory"
+        @open="onClickOpenAddCatogoryModal"
       />
-    </div>
-    <!-- </transition-group> -->
+    </transition-group>
   </div>
 </template>
 
@@ -63,10 +62,24 @@ export default {
   data() {
     return {};
   },
+  computed: {
+    hasCategory() {
+      return (
+        this.additionalSecondaryMenuItems[0] &&
+        this.additionalSecondaryMenuItems[0].children.length > 0
+      );
+    },
+  },
   methods: {
     onSearch(value) {
       this.$emit('input', value);
     },
+    openPortalPopover() {
+      this.$emit('open-popover');
+    },
+    onClickOpenAddCatogoryModal() {
+      this.$emit('open-modal');
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/helpCenter/Sidebar/SidebarHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/SidebarHeader.vue
similarity index 71%
rename from app/javascript/dashboard/components/helpCenter/Sidebar/SidebarHeader.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/SidebarHeader.vue
index a68ea6b63..bf1c36438 100644
--- a/app/javascript/dashboard/components/helpCenter/Sidebar/SidebarHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/SidebarHeader.vue
@@ -13,18 +13,29 @@
       </div>
     </div>
     <div class="header-right--side">
-      <fluent-icon
-        icon="arrow-up-right"
-        size="28px"
-        class="pop-out--icon"
-        @click="popOutHelpCenter"
-      />
-      <fluent-icon
-        icon="arrow-swap"
-        size="28px"
-        class="portal-switch--icon"
-        @click="openSwitchPortalModal"
-      />
+      <woot-button
+        variant="link"
+        color-scheme="secondary"
+        @click="popoutHelpCenter"
+      >
+        <fluent-icon
+          icon="arrow-up-right"
+          size="28px"
+          class="pop-out--icon"
+          @click="popoutHelpCenter"
+        />
+      </woot-button>
+      <woot-button
+        variant="link"
+        color-scheme="secondary"
+        @click="openPortalPopover"
+      >
+        <fluent-icon
+          icon="arrow-swap"
+          size="28px"
+          class="portal-switch--icon"
+        />
+      </woot-button>
     </div>
   </div>
 </template>
@@ -50,11 +61,11 @@ export default {
     },
   },
   methods: {
-    popOutHelpCenter() {
+    popoutHelpCenter() {
       this.$emit('pop-out');
     },
-    openSwitchPortalModal() {
-      this.$emit('open');
+    openPortalPopover() {
+      this.$emit('open-popover');
     },
   },
 };
@@ -66,7 +77,7 @@ export default {
   height: var(--space-jumbo);
   align-items: center;
   justify-content: space-between;
-  padding: var(--space-normal) 0;
+  padding: var(--space-small) 0 var(--space-normal) 0;
   border-bottom: 1px solid var(--color-border-light);
 }
 
diff --git a/app/javascript/dashboard/components/helpCenter/Sidebar/SidebarSearch.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/SidebarSearch.vue
similarity index 100%
rename from app/javascript/dashboard/components/helpCenter/Sidebar/SidebarSearch.vue
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/SidebarSearch.vue
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/AddCategory.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/AddCategory.stories.js
new file mode 100644
index 000000000..c0b5bb079
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/AddCategory.stories.js
@@ -0,0 +1,30 @@
+import AddCategoryComponent from '../AddCategory.vue';
+import { action } from '@storybook/addon-actions';
+
+export default {
+  title: 'Components/Help Center',
+  component: AddCategoryComponent,
+  argTypes: {
+    show: {
+      defaultValue: true,
+      control: {
+        type: 'boolean',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { AddCategoryComponent },
+  template:
+    '<add-category-component v-bind="$props" @create="onCreate" @cancel="onClose" />',
+});
+
+export const AddCategory = Template.bind({});
+AddCategory.args = {
+  portalName: 'Chatwoot help center',
+  locale: 'En-US',
+  onCreate: action('create'),
+  onClose: action('cancel'),
+};
diff --git a/app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleHeader.stories.js
similarity index 94%
rename from app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.stories.js
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleHeader.stories.js
index 8de3d12b6..c1cfc21ac 100644
--- a/app/javascript/dashboard/components/helpCenter/Header/ArticleHeader.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleHeader.stories.js
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import ArticleHeader from './ArticleHeader';
+import ArticleHeader from '../Header/ArticleHeader';
 
 export default {
   title: 'Components/Help Center/Header',
diff --git a/app/javascript/dashboard/components/helpCenter/ArticleItem.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleItem.stories.js
similarity index 95%
rename from app/javascript/dashboard/components/helpCenter/ArticleItem.stories.js
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleItem.stories.js
index 18dc8295c..7f7c819e3 100644
--- a/app/javascript/dashboard/components/helpCenter/ArticleItem.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleItem.stories.js
@@ -1,4 +1,4 @@
-import ArticleItemComponent from './ArticleItem.vue';
+import ArticleItemComponent from '../ArticleItem.vue';
 const STATUS_LIST = {
   published: 'published',
   draft: 'draft',
diff --git a/app/javascript/dashboard/components/helpCenter/ArticleTable.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleTable.stories.js
similarity index 96%
rename from app/javascript/dashboard/components/helpCenter/ArticleTable.stories.js
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleTable.stories.js
index f921c7eb1..7b0a692f9 100644
--- a/app/javascript/dashboard/components/helpCenter/ArticleTable.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleTable.stories.js
@@ -1,4 +1,4 @@
-import ArticleTableComponent from './ArticleTable.vue';
+import ArticleTableComponent from '../ArticleTable.vue';
 import { action } from '@storybook/addon-actions';
 export default {
   title: 'Components/Help Center',
diff --git a/app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/EditArticleHeader.stories.js
similarity index 94%
rename from app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.stories.js
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/EditArticleHeader.stories.js
index 56e0f8770..1f09ee84f 100644
--- a/app/javascript/dashboard/components/helpCenter/Header/EditArticleHeader.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/EditArticleHeader.stories.js
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import EditArticleHeader from './EditArticleHeader';
+import EditArticleHeader from '../Header/EditArticleHeader';
 
 export default {
   title: 'Components/Help Center/Header',
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalListItem.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalListItem.stories.js
new file mode 100644
index 000000000..1e7112055
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalListItem.stories.js
@@ -0,0 +1,145 @@
+import { action } from '@storybook/addon-actions';
+import PortalListItem from '../PortalListItem';
+
+export default {
+  title: 'Components/Help Center/Portal List',
+  component: PortalListItem,
+  argTypes: {
+    portals: { control: 'array' },
+    status: {
+      control: {
+        type: 'string',
+        options: ['archived', 'draft', 'published'],
+      },
+    },
+    selectedLocaleCode: { control: 'string' },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { PortalListItem },
+  template:
+    '<portal-list-item v-bind="$props" @add="addLocale" @open-site="openSite" @open="openSettings" @swap="swapLocale" @delete="deleteLocale" ></portal-list-item>',
+});
+
+export const PortalListItemView = Template.bind({});
+PortalListItemView.args = {
+  addLocale: action('addLocale'),
+  openSite: action('openSite'),
+  openSettings: action('openSettings'),
+  swapLocale: action('swapLocale'),
+  deleteLocale: action('deleteLocale'),
+  status: 'published',
+  selectedLocaleCode: 'en-US',
+  portals: [
+    {
+      name: 'Chatwoot Help Center',
+      id: 1,
+      color: 'red',
+      custom_domain: 'help-center.chatwoot.com',
+      articles_count: 123,
+      header_text: 'Help center',
+      homepage_link: null,
+      page_title: 'English',
+      slug: 'help-center',
+      archived: false,
+      config: {
+        allowed_locales: [
+          {
+            code: 'en-US',
+            name: 'English',
+            articles_count: 123,
+            categories_count: 42,
+          },
+          {
+            code: 'fr-FR',
+            name: 'Français',
+            articles_count: 23,
+            categories_count: 11,
+          },
+          {
+            code: 'de-DE',
+            name: 'Deutsch',
+            articles_count: 32,
+            categories_count: 12,
+          },
+          {
+            code: 'es-ES',
+            name: 'Español',
+            articles_count: 12,
+            categories_count: 4,
+          },
+        ],
+      },
+      locales: [
+        {
+          code: 'en-US',
+          name: 'English',
+          articles_count: 123,
+          categories_count: 42,
+        },
+        {
+          code: 'fr-FR',
+          name: 'Français',
+          articles_count: 23,
+          categories_count: 11,
+        },
+        {
+          code: 'de-DE',
+          name: 'Deutsch',
+          articles_count: 32,
+          categories_count: 12,
+        },
+        {
+          code: 'es-ES',
+          name: 'Español',
+          articles_count: 12,
+          categories_count: 4,
+        },
+      ],
+    },
+    {
+      name: 'Chatwoot Docs',
+      id: 2,
+      color: 'green',
+      custom_domain: 'doc-chatwoot.com',
+      articles_count: 67,
+      header_text: 'Docs',
+      homepage_link: null,
+      page_title: 'Portal',
+      slug: 'second_portal',
+      archived: false,
+      config: {
+        allowed_locales: [
+          {
+            name: 'English',
+            code: 'en-EN',
+            articles_count: 12,
+            categories_count: 66,
+          },
+          {
+            name: 'Mandarin',
+            code: 'ch-CH',
+            articles_count: 6,
+            categories_count: 23,
+          },
+        ],
+      },
+      locales: [
+        {
+          name: 'English',
+          code: 'en-EN',
+          articles_count: 12,
+          categories_count: 66,
+        },
+        {
+          name: 'Mandarin',
+          code: 'ch-CH',
+          articles_count: 6,
+          categories_count: 23,
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalPopover.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalPopover.stories.js
new file mode 100644
index 000000000..148230327
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalPopover.stories.js
@@ -0,0 +1,154 @@
+import PortalPopover from '../PortalPopover.vue';
+
+export default {
+  title: 'Components/Help Center/Portal Popover',
+  component: PortalPopover,
+  argTypes: {
+    active: {
+      defaultValue: false,
+      control: {
+        type: 'boolean',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { PortalPopover },
+  template:
+    '<PortalPopover v-bind="$props" @click="onClick">{{label}}</PortalPopover>',
+});
+
+export const Primary = Template.bind({});
+
+Primary.args = {
+  portals: [
+    {
+      name: 'Chatwoot Help Center',
+      id: 1,
+      color: null,
+      custom_domain: 'doc',
+      articles_count: 123,
+      header_text: null,
+      homepage_link: null,
+      page_title: null,
+      slug: 'first_portal',
+      archived: false,
+      config: {
+        allowed_locales: [
+          {
+            code: 'en',
+            name: 'English',
+            articles_count: 123,
+          },
+          {
+            code: 'fr',
+            name: 'Français',
+            articles_count: 123,
+          },
+          {
+            code: 'de',
+            name: 'Deutsch',
+            articles_count: 32,
+          },
+          {
+            code: 'es',
+            name: 'Español',
+            articles_count: 12,
+          },
+          {
+            code: 'it',
+            name: 'Italiano',
+            articles_count: 8,
+          },
+        ],
+      },
+      locales: [
+        {
+          name: 'English',
+          code: 'en',
+          articles_count: 12,
+        },
+        {
+          name: 'Español',
+          code: 'es',
+          articles_count: 42,
+        },
+        {
+          name: 'French',
+          code: 'fr',
+          articles_count: 29,
+        },
+        {
+          name: 'Italian',
+          code: 'it',
+          articles_count: 4,
+        },
+        {
+          name: 'German',
+          code: 'de',
+          articles_count: 66,
+        },
+      ],
+    },
+    {
+      name: 'Chatwoot Docs',
+      id: 2,
+      color: null,
+      custom_domain: 'doc',
+      articles_count: 124,
+      header_text: null,
+      homepage_link: null,
+      page_title: null,
+      slug: 'second_portal',
+      archived: false,
+      config: {
+        allowed_locales: [
+          {
+            code: 'en',
+            name: 'English',
+            articles_count: 123,
+          },
+          {
+            code: 'fr',
+            name: 'Français',
+            articles_count: 123,
+          },
+          {
+            code: 'de',
+            name: 'Deutsch',
+            articles_count: 32,
+          },
+          {
+            code: 'es',
+            name: 'Español',
+            articles_count: 12,
+          },
+          {
+            code: 'it',
+            name: 'Italiano',
+            articles_count: 8,
+          },
+        ],
+      },
+      locales: [
+        {
+          name: 'English',
+          code: 'en',
+          articles_count: 12,
+        },
+        {
+          name: 'Japanese',
+          code: 'jp',
+          articles_count: 4,
+        },
+        {
+          name: 'Mandarin',
+          code: 'CH',
+          articles_count: 6,
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalSwitch.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalSwitch.stories.js
new file mode 100644
index 000000000..c3b623cb5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/PortalSwitch.stories.js
@@ -0,0 +1,58 @@
+import PortalSwitch from '../PortalSwitch.vue';
+
+export default {
+  title: 'Components/Help Center/Portal Switch',
+  component: PortalSwitch,
+  argTypes: {
+    active: {
+      defaultValue: false,
+      control: {
+        type: 'boolean',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { PortalSwitch },
+  template:
+    '<PortalSwitch v-bind="$props" @click="onClick">{{label}}</PortalSwitch>',
+});
+
+export const Primary = Template.bind({});
+
+Primary.args = {
+  active: false,
+  portal: {
+    name: 'Chatwoot Help Center',
+    articles_count: 124,
+    locales: [
+      {
+        name: 'English',
+        code: 'en',
+        articles_count: 12,
+      },
+      {
+        name: 'Español',
+        code: 'es',
+        articles_count: 42,
+      },
+      {
+        name: 'French',
+        code: 'fr',
+        articles_count: 29,
+      },
+      {
+        name: 'Italian',
+        code: 'it',
+        articles_count: 4,
+      },
+      {
+        name: 'German',
+        code: 'de',
+        articles_count: 66,
+      },
+    ],
+  },
+};
diff --git a/app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/Sidebar.stories.js
similarity index 98%
rename from app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.stories.js
rename to app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/Sidebar.stories.js
index 245eded8b..a574da002 100644
--- a/app/javascript/dashboard/components/helpCenter/Sidebar/Sidebar.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/Sidebar.stories.js
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import Sidebar from './Sidebar';
+import Sidebar from '../Sidebar/Sidebar';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 
 export default {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/helpcenter.routes.js b/app/javascript/dashboard/routes/dashboard/helpcenter/helpcenter.routes.js
index d95c8ccb0..def3d6464 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/helpcenter.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/helpcenter.routes.js
@@ -9,15 +9,12 @@ const ShowPortal = () => import('./pages/portals/ShowPortal');
 const ListAllCategories = () => import('./pages/categories/ListAllCategories');
 const NewCategory = () => import('./pages/categories/NewCategory');
 const EditCategory = () => import('./pages/categories/EditCategory');
-const ShowCategory = () => import('./pages/categories/ShowCategory');
+// const ShowCategory = () => import('./pages/categories/ShowCategory');
 const ListCategoryArticles = () =>
   import('./pages/articles/ListCategoryArticles');
 
 const ListAllArticles = () => import('./pages/articles/ListAllArticles');
-const ListArchivedArticles = () =>
-  import('./pages/articles/ListArchivedArticles');
-const ListDraftArticles = () => import('./pages/articles/ListDraftArticles');
-const ListMyArticles = () => import('./pages/articles/ListMyArticles');
+
 const NewArticle = () => import('./pages/articles/NewArticle');
 const EditArticle = () => import('./pages/articles/EditArticle');
 
@@ -36,7 +33,7 @@ const portalRoutes = [
   },
   {
     path: getPortalRoute(':portalSlug'),
-    name: 'edit_portal',
+    name: 'portal_slug',
     roles: ['administrator', 'agent'],
     component: ShowPortal,
   },
@@ -55,31 +52,32 @@ const articleRoutes = [
     roles: ['administrator', 'agent'],
     component: ListAllArticles,
   },
+  {
+    path: getPortalRoute(':portalSlug/:locale/articles/new'),
+    name: 'new_article',
+    roles: ['administrator', 'agent'],
+    component: NewArticle,
+  },
+  {
+    path: getPortalRoute(':portalSlug/:locale/articles/mine'),
+    name: 'list_mine_articles',
+    roles: ['administrator', 'agent'],
+    component: ListAllArticles,
+  },
   {
     path: getPortalRoute(':portalSlug/:locale/articles/archived'),
     name: 'list_archived_articles',
     roles: ['administrator', 'agent'],
-    component: ListArchivedArticles,
+    component: ListAllArticles,
   },
 
   {
     path: getPortalRoute(':portalSlug/:locale/articles/draft'),
     name: 'list_draft_articles',
     roles: ['administrator', 'agent'],
-    component: ListDraftArticles,
-  },
-  {
-    path: getPortalRoute(':portalSlug/:locale/articles/mine'),
-    name: 'list_all_locale_articles',
-    roles: ['administrator', 'agent'],
-    component: ListMyArticles,
-  },
-  {
-    path: getPortalRoute(':portalSlug/:locale/articles/new'),
-    name: 'new_article',
-    roles: ['administrator', 'agent'],
-    component: NewArticle,
+    component: ListAllArticles,
   },
+
   {
     path: getPortalRoute(':portalSlug/:locale/articles/:articleSlug'),
     name: 'edit_article',
@@ -105,13 +103,13 @@ const categoryRoutes = [
     path: getPortalRoute(':portalSlug/:locale/categories/:categorySlug'),
     name: 'show_category',
     roles: ['administrator', 'agent'],
-    component: ShowCategory,
+    component: ListAllArticles,
   },
   {
     path: getPortalRoute(
       ':portalSlug/:locale/categories/:categorySlug/articles'
     ),
-    name: 'show_category',
+    name: 'show_category_articles',
     roles: ['administrator', 'agent'],
     component: ListCategoryArticles,
   },
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/portalMixin.js b/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/portalMixin.js
new file mode 100644
index 000000000..8668707c5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/portalMixin.js
@@ -0,0 +1,24 @@
+import { mapGetters } from 'vuex';
+import { frontendURL } from 'dashboard/helper/URLHelper';
+import allLocales from 'shared/constants/locales.js';
+export default {
+  computed: {
+    ...mapGetters({ accountId: 'getCurrentAccountId' }),
+    portalSlug() {
+      return this.$route.params.portalSlug;
+    },
+    locale() {
+      return this.$route.params.locale;
+    },
+  },
+  methods: {
+    articleUrl(id) {
+      return frontendURL(
+        `accounts/${this.accountId}/portals/${this.portalSlug}/${this.locale}/articles/${id}`
+      );
+    },
+    localeName(code) {
+      return allLocales[code];
+    },
+  },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/specs/portalMixin.spec.js b/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/specs/portalMixin.spec.js
new file mode 100644
index 000000000..e43f4ce9b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/mixins/specs/portalMixin.spec.js
@@ -0,0 +1,76 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import portalMixin from '../portalMixin';
+import Vuex from 'vuex';
+import VueRouter from 'vue-router';
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(VueRouter);
+import ListAllArticles from '../../pages/portals/ListAllPortals.vue';
+
+const router = new VueRouter({
+  routes: [
+    {
+      path: ':portalSlug/:locale/articles',
+      name: 'list_all_locale_articles',
+      component: ListAllArticles,
+    },
+  ],
+});
+
+describe('portalMixin', () => {
+  let getters;
+  let store;
+  let wrapper;
+
+  beforeEach(() => {
+    getters = {
+      getCurrentAccountId: () => 1,
+    };
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [portalMixin],
+      router,
+    };
+    store = new Vuex.Store({ getters });
+    wrapper = shallowMount(Component, { store, localVue });
+  });
+
+  it('return account id', () => {
+    expect(wrapper.vm.accountId).toBe(1);
+  });
+
+  it('returns article url', () => {
+    router.push({
+      name: 'list_all_locale_articles',
+      params: { portalSlug: 'fur-rent', locale: 'en' },
+    });
+    expect(wrapper.vm.articleUrl(1)).toBe(
+      '/app/accounts/1/portals/fur-rent/en/articles/1'
+    );
+  });
+
+  it('returns portal locale', () => {
+    router.push({
+      name: 'list_all_locale_articles',
+      params: { portalSlug: 'fur-rent', locale: 'es' },
+    });
+    expect(wrapper.vm.portalSlug).toBe('fur-rent');
+  });
+
+  it('returns portal slug', () => {
+    router.push({
+      name: 'list_all_locale_articles',
+      params: { portalSlug: 'campaign', locale: 'es' },
+    });
+    expect(wrapper.vm.portalSlug).toBe('campaign');
+  });
+
+  it('returns locale name', () => {
+    router.push({
+      name: 'list_all_locale_articles',
+      params: { portalSlug: 'fur-rent', locale: 'es' },
+    });
+    expect(wrapper.vm.localeName('es')).toBe('Spanish');
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
new file mode 100644
index 000000000..5e12ffa29
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
@@ -0,0 +1,232 @@
+<template>
+  <transition name="popover-animation">
+    <div class="article-settings--container">
+      <h3 class="block-title">
+        {{ $t('HELP_CENTER.ARTICLE_SETTINGS.TITLE') }}
+      </h3>
+      <div class="form-wrap">
+        <label>
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.LABEL') }}
+          <multiselect-dropdown
+            :options="categoryList"
+            :selected-item="selectedCategory"
+            :has-thumbnail="false"
+            :multiselector-title="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.TITLE')
+            "
+            :multiselector-placeholder="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.PLACEHOLDER')
+            "
+            :no-search-result="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.NO_RESULT')
+            "
+            :input-placeholder="
+              $t(
+                'HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.SEARCH_PLACEHOLDER'
+              )
+            "
+            @click="onClickSelectCategory"
+          />
+        </label>
+        <label>
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.AUTHOR.LABEL') }}
+          <multiselect-dropdown
+            :options="authorList"
+            :selected-item="assignedAuthor"
+            :multiselector-title="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.AUTHOR.TITLE')
+            "
+            :multiselector-placeholder="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.AUTHOR.PLACEHOLDER')
+            "
+            :no-search-result="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.AUTHOR.NO_RESULT')
+            "
+            :input-placeholder="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.AUTHOR.SEARCH_PLACEHOLDER')
+            "
+            @click="onClickAssignAuthor"
+          />
+        </label>
+        <label>
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_TITLE.LABEL') }}
+          <textarea
+            v-model="title"
+            rows="3"
+            type="text"
+            :placeholder="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_TITLE.PLACEHOLDER')
+            "
+          />
+        </label>
+        <label>
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_DESCRIPTION.LABEL') }}
+          <textarea
+            v-model="description"
+            rows="3"
+            type="text"
+            :placeholder="
+              $t(
+                'HELP_CENTER.ARTICLE_SETTINGS.FORM.META_DESCRIPTION.PLACEHOLDER'
+              )
+            "
+          />
+        </label>
+        <label>
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_TAGS.LABEL') }}
+          <multiselect
+            ref="tagInput"
+            v-model="values"
+            :placeholder="
+              $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_TAGS.PLACEHOLDER')
+            "
+            label="name"
+            track-by="name"
+            :options="options"
+            :multiple="true"
+            :taggable="true"
+            @tag="addTagValue"
+          />
+        </label>
+      </div>
+      <div class="action-buttons">
+        <woot-button
+          icon="archive"
+          size="small"
+          variant="clear"
+          color-scheme="secondary"
+          @click="onClickArchiveArticle"
+        >
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.BUTTONS.ARCHIVE') }}
+        </woot-button>
+        <woot-button
+          icon="delete"
+          size="small"
+          variant="clear"
+          color-scheme="alert"
+          @click="onClickDeleteArticle"
+        >
+          {{ $t('HELP_CENTER.ARTICLE_SETTINGS.BUTTONS.DELETE') }}
+        </woot-button>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown';
+export default {
+  components: {
+    MultiselectDropdown,
+  },
+  data() {
+    return {
+      // Dummy value
+      categoryList: [
+        {
+          id: 1,
+          name: 'Getting started',
+        },
+        {
+          id: 2,
+          name: 'Features',
+        },
+      ],
+      selectedCategory: {
+        id: 1,
+        name: 'Features',
+      },
+      authorList: [
+        {
+          id: 1,
+          name: 'John Doe',
+        },
+        {
+          id: 2,
+          name: 'Jane Doe',
+        },
+      ],
+      assignedAuthor: {
+        id: 1,
+        name: 'John Doe',
+      },
+      title: '',
+      description: '',
+      values: [],
+      options: [],
+    };
+  },
+  methods: {
+    addTagValue(tagValue) {
+      const tag = {
+        name: tagValue,
+      };
+      this.values.push(tag);
+      this.$refs.tagInput.$el.focus();
+    },
+    onClickSelectCategory() {
+      this.$emit('select-category');
+    },
+    onClickAssignAuthor() {
+      this.$emit('assign-author');
+    },
+    onClickArchiveArticle() {
+      this.$emit('archive-article');
+    },
+    onClickDeleteArticle() {
+      this.$emit('delete-article');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.article-settings--container {
+  flex: 0.3;
+  min-width: var(--space-giga);
+  overflow: scroll;
+  border-left: 1px solid var(--color-border-light);
+  margin-left: var(--space-normal);
+  padding-left: var(--space-normal);
+  padding-top: var(--space-small);
+  padding-bottom: var(--space-small);
+
+  .form-wrap {
+    margin-top: var(--space-normal);
+    margin-bottom: var(--space-medium);
+
+    textarea {
+      font-size: var(--font-size-small);
+    }
+  }
+
+  .action-buttons {
+    display: flex;
+    flex-direction: column;
+
+    ::v-deep .button {
+      padding-left: 0;
+    }
+  }
+}
+::v-deep {
+  .multiselect {
+    margin-bottom: 0;
+  }
+  .multiselect__content-wrapper {
+    display: none;
+  }
+  .multiselect--active .multiselect__tags {
+    border-radius: var(--border-radius-normal);
+    padding-right: var(--space-small) !important;
+  }
+  .multiselect__placeholder {
+    color: var(--s-300);
+    padding-top: var(--space-small);
+    margin-bottom: 0;
+  }
+  .multiselect__select {
+    display: none;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
index 9e8ec7ecc..40058368a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
@@ -1,3 +1,39 @@
 <template>
-  <div>Component to edit an article</div>
+  <div class="container">
+    <edit-article-header
+      back-button-label="All Articles"
+      draft-state="saved"
+      @back="onClickGoBack"
+    />
+    <edit-article-field :article="article" />
+  </div>
 </template>
+
+<script>
+import EditArticleHeader from 'dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader';
+import EditArticleField from 'dashboard/components/helpCenter/EditArticle';
+export default {
+  components: {
+    EditArticleHeader,
+    EditArticleField,
+  },
+  props: {
+    article: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  methods: {
+    onClickGoBack() {
+      this.$router.push({ name: 'list_all_locale_articles' });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: var(--space-small) var(--space-normal);
+  width: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
index 10c5e87d6..fcb25546b 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
@@ -1,3 +1,161 @@
 <template>
-  <div>Component to list all articles in a given locale in a portal</div>
+  <div class="container">
+    <article-header
+      :header-title="headerTitle"
+      :count="articleCount"
+      selected-value="Published"
+      @newArticlePage="newArticlePage"
+    />
+    <article-table
+      :articles="articles"
+      :article-count="articles.length"
+      :current-page="Number(meta.currentPage)"
+      :total-count="articleCount"
+      @on-page-change="onPageChange"
+    />
+    <div v-if="shouldShowLoader" class="articles--loader">
+      <spinner />
+      <span>{{ $t('HELP_CENTER.TABLE.LOADING_MESSAGE') }}</span>
+    </div>
+    <empty-state
+      v-else-if="shouldShowEmptyState"
+      :title="$t('HELP_CENTER.TABLE.NO_ARTICLES')"
+    />
+  </div>
 </template>
+<script>
+import { mapGetters } from 'vuex';
+
+import Spinner from 'shared/components/Spinner.vue';
+import ArticleHeader from 'dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader';
+import EmptyState from 'dashboard/components/widgets/EmptyState';
+import ArticleTable from '../../components/ArticleTable';
+export default {
+  components: {
+    ArticleHeader,
+    ArticleTable,
+    EmptyState,
+    Spinner,
+  },
+  data() {
+    return {
+      pageNumber: 1,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      articles: 'articles/allArticles',
+      categories: 'categories/allCategories',
+      selectedPortal: 'portals/getSelectedPortal',
+      uiFlags: 'articles/uiFlags',
+      meta: 'articles/getMeta',
+      isFetching: 'articles/isFetching',
+      currentUserId: 'getCurrentUserID',
+    }),
+    selectedCategory() {
+      return this.categories.find(
+        category => category.slug === this.selectedCategorySlug
+      );
+    },
+    shouldShowEmptyState() {
+      return !this.isFetching && !this.articles.length;
+    },
+    shouldShowLoader() {
+      return this.isFetching && !this.articles.length;
+    },
+    selectedPortalSlug() {
+      return this.selectedPortal?.slug;
+    },
+    selectedCategorySlug() {
+      const { categorySlug } = this.$route.params;
+      return categorySlug;
+    },
+    articleType() {
+      return this.$route.path.split('/').pop();
+    },
+    headerTitle() {
+      switch (this.articleType) {
+        case 'mine':
+          return this.$t('HELP_CENTER.HEADER.TITLES.MINE');
+        case 'draft':
+          return this.$t('HELP_CENTER.HEADER.TITLES.DRAFT');
+        case 'archived':
+          return this.$t('HELP_CENTER.HEADER.TITLES.ARCHIVED');
+        default:
+          if (this.$route.name === 'show_category') {
+            return this.headerTitleInCategoryView;
+          }
+          return this.$t('HELP_CENTER.HEADER.TITLES.ALL_ARTICLES');
+      }
+    },
+    status() {
+      switch (this.articleType) {
+        case 'draft':
+          return 0;
+        case 'published':
+          return 1;
+        case 'archived':
+          return 2;
+        default:
+          return undefined;
+      }
+    },
+    author() {
+      if (this.articleType === 'mine') {
+        return this.currentUserId;
+      }
+      return null;
+    },
+    articleCount() {
+      return this.articles ? this.articles.length : 0;
+    },
+    headerTitleInCategoryView() {
+      return this.categories && this.categories.length
+        ? this.selectedCategory.name
+        : '';
+    },
+  },
+  watch: {
+    $route() {
+      this.pageNumber = 1;
+      this.fetchArticles();
+    },
+  },
+  mounted() {
+    this.fetchArticles();
+  },
+
+  methods: {
+    newArticlePage() {
+      this.$router.push({ name: 'new_article' });
+    },
+    fetchArticles() {
+      this.$store.dispatch('articles/index', {
+        pageNumber: this.pageNumber,
+        portalSlug: this.$route.params.portalSlug,
+        locale: this.$route.params.locale,
+        status: this.status,
+        author_id: this.author,
+        category_slug: this.selectedCategorySlug,
+      });
+    },
+    onPageChange(page) {
+      this.fetchArticles({ pageNumber: page });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: var(--space-small) var(--space-normal);
+  width: 100%;
+  .articles--loader {
+    align-items: center;
+    display: flex;
+    font-size: var(--font-size-default);
+    justify-content: center;
+    padding: var(--space-big);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListArchivedArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListArchivedArticles.vue
deleted file mode 100644
index 9b8b26fa1..000000000
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListArchivedArticles.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>Component to list archived articles in a portal</div>
-</template>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListDraftArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListDraftArticles.vue
deleted file mode 100644
index c869f048a..000000000
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListDraftArticles.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>Component to list all drafts articles in a portal</div>
-</template>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListMyArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListMyArticles.vue
deleted file mode 100644
index 1d029cd51..000000000
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListMyArticles.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div>Component to list my articles in a portal</div>
-</template>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
index 7cd0bff8f..241cac1cf 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
@@ -1,3 +1,79 @@
 <template>
-  <div>Component for New Article</div>
+  <div class="article-container">
+    <div
+      class="edit-article--container"
+      :class="{ 'is-sidebar-open': showArticleSettings }"
+    >
+      <edit-article-header
+        back-button-label="All Articles"
+        draft-state="saved"
+        @back="onClickGoBack"
+        @open="openArticleSettings"
+        @close="closeArticleSettings"
+      />
+      <edit-article-field
+        :is-settings-sidebar-open="showArticleSettings"
+        @titleInput="titleInput"
+        @contentInput="contentInput"
+      />
+    </div>
+    <article-settings v-if="showArticleSettings" />
+  </div>
 </template>
+
+<script>
+import EditArticleHeader from 'dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader';
+import EditArticleField from 'dashboard/components/helpCenter/EditArticle';
+import ArticleSettings from 'dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings';
+export default {
+  components: {
+    EditArticleHeader,
+    EditArticleField,
+    ArticleSettings,
+  },
+  data() {
+    return {
+      articleTitle: '',
+      articleContent: '',
+      showArticleSettings: false,
+    };
+  },
+  methods: {
+    onClickGoBack() {
+      this.$router.push({ name: 'list_all_locale_articles' });
+    },
+    titleInput(value) {
+      this.articleTitle = value;
+    },
+    contentInput(value) {
+      this.articleContent = value;
+    },
+    openArticleSettings() {
+      this.showArticleSettings = true;
+    },
+    closeArticleSettings() {
+      this.showArticleSettings = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.article-container {
+  display: flex;
+  padding: var(--space-small) var(--space-normal);
+  width: 100%;
+  flex: 1;
+  overflow: scroll;
+
+  .edit-article--container {
+    flex: 1;
+    flex-shrink: 0;
+    overflow: scroll;
+  }
+
+  .is-sidebar-open {
+    flex: 0.7;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
index a47765e8a..4ce773921 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
@@ -1,3 +1,96 @@
 <template>
-  <div>Component to list all portals</div>
+  <div class="container">
+    <div class="header-wrap">
+      <h1 class="page-title">{{ $t('HELP_CENTER.PORTAL.HEADER') }}</h1>
+      <woot-button color-scheme="primary" size="small" @click="addPortal">
+        {{ $t('HELP_CENTER.PORTAL.NEW_BUTTON') }}
+      </woot-button>
+    </div>
+    <div class="portal-container">
+      <portal-list-item
+        v-for="portal in portals"
+        :key="portal.id"
+        :portal="portal"
+        :status="portalStatus"
+      />
+      <div v-if="isFetching" class="portals--loader">
+        <spinner />
+        <span>{{ $t('HELP_CENTER.PORTAL.LOADING_MESSAGE') }}</span>
+      </div>
+      <empty-state
+        v-else-if="shouldShowEmptyState"
+        :title="$t('HELP_CENTER.PORTAL.NO_PORTALS_MESSAGE')"
+      />
+    </div>
+    <woot-modal :show.sync="isAddModalOpen" :on-close="closeModal">
+      <add-portal :show="isAddModalOpen" @cancel="closeModal" />
+    </woot-modal>
+  </div>
 </template>
+
+<script>
+import { mapGetters } from 'vuex';
+import PortalListItem from '../../components/PortalListItem';
+import Spinner from 'shared/components/Spinner.vue';
+import EmptyState from 'dashboard/components/widgets/EmptyState';
+import AddPortal from '../../components/AddPortal';
+export default {
+  components: {
+    PortalListItem,
+    EmptyState,
+    Spinner,
+    AddPortal,
+  },
+  data() {
+    return {
+      isAddModalOpen: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      portals: 'portals/allPortals',
+      meta: 'portals/getMeta',
+      isFetching: 'portals/isFetchingPortals',
+    }),
+    portalStatus() {
+      return this.archived ? 'Archived' : 'Live';
+    },
+    shouldShowEmptyState() {
+      return !this.isFetching && !this.portals.length;
+    },
+  },
+  methods: {
+    addPortal() {
+      this.isAddModalOpen = !this.isAddModalOpen;
+    },
+    closeModal() {
+      this.isAddModalOpen = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: var(--space-small) var(--space-normal);
+  width: 100%;
+  .portals--loader {
+    align-items: center;
+    display: flex;
+    font-size: var(--font-size-default);
+    justify-content: center;
+    padding: var(--space-big);
+  }
+  .header-wrap {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0 0 var(--space-small) 0;
+    height: var(--space-larger);
+  }
+  .portal-container {
+    height: 90vh;
+    overflow-y: scroll;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
index 415e87592..fc68afb40 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
@@ -13,6 +13,9 @@
         <tr
           v-for="notificationItem in notifications"
           :key="notificationItem.id"
+          :class="{
+            'is-unread': notificationItem.read_at === null,
+          }"
           @click="() => onClickNotification(notificationItem)"
         >
           <td>
@@ -163,6 +166,10 @@ export default {
   }
 }
 
+.is-unread {
+  font-weight: var(--font-weight-bold);
+}
+
 .notifications--loader {
   font-size: var(--font-size-default);
   display: flex;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue
index 75d0e0f72..38750eb5f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue
@@ -104,7 +104,7 @@
 <script>
 import { required, minLength } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
-import { convertToSlug } from 'dashboard/helper/commons.js';
+import { convertToAttributeSlug } from 'dashboard/helper/commons.js';
 import { ATTRIBUTE_MODELS, ATTRIBUTE_TYPES } from './constants';
 import alertMixin from 'shared/mixins/alertMixin';
 
@@ -199,7 +199,7 @@ export default {
       this.isTouched = true;
     },
     onDisplayNameChange() {
-      this.attributeKey = convertToSlug(this.displayName);
+      this.attributeKey = convertToAttributeSlug(this.displayName);
     },
     async addAttributes() {
       this.$v.$touch();
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
new file mode 100644
index 000000000..a7c330527
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="columns profile--settings">
+    <woot-loading-state v-if="uiFlags.isFetchingItem" />
+    <div v-else-if="!hasABillingPlan">
+      <p>{{ $t('BILLING_SETTINGS.NO_BILLING_USER') }}</p>
+    </div>
+    <div v-else class="small-12 columns ">
+      <div class="current-plan--details">
+        <h6>{{ $t('BILLING_SETTINGS.CURRENT_PLAN.TITLE') }}</h6>
+        <div
+          v-dompurify-html="
+            formatMessage(
+              $t('BILLING_SETTINGS.CURRENT_PLAN.PLAN_NOTE', {
+                plan: planName,
+                quantity: subscribedQuantity,
+              })
+            )
+          "
+        />
+      </div>
+      <billing-item
+        :title="$t('BILLING_SETTINGS.MANAGE_SUBSCRIPTION.TITLE')"
+        :description="$t('BILLING_SETTINGS.MANAGE_SUBSCRIPTION.DESCRIPTION')"
+        :button-label="$t('BILLING_SETTINGS.MANAGE_SUBSCRIPTION.BUTTON_TXT')"
+        @click="onClickBillingPortal"
+      />
+      <billing-item
+        :title="$t('BILLING_SETTINGS.CHAT_WITH_US.TITLE')"
+        :description="$t('BILLING_SETTINGS.CHAT_WITH_US.DESCRIPTION')"
+        :button-label="$t('BILLING_SETTINGS.CHAT_WITH_US.BUTTON_TXT')"
+        button-icon="chat-multiple"
+        @click="onToggleChatWindow"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import accountMixin from '../../../../mixins/account';
+import BillingItem from './components/BillingItem.vue';
+
+export default {
+  components: { BillingItem },
+  mixins: [accountMixin, alertMixin, messageFormatterMixin],
+  computed: {
+    ...mapGetters({
+      getAccount: 'accounts/getAccount',
+      uiFlags: 'accounts/getUIFlags',
+    }),
+    currentAccount() {
+      return this.getAccount(this.accountId) || {};
+    },
+    customAttributes() {
+      return this.currentAccount.custom_attributes || {};
+    },
+    hasABillingPlan() {
+      return !!this.planName;
+    },
+    planName() {
+      return this.customAttributes.plan_name || '';
+    },
+    subscribedQuantity() {
+      return this.customAttributes.subscribed_quantity || 0;
+    },
+  },
+  mounted() {
+    this.fetchAccountDetails();
+  },
+  methods: {
+    async fetchAccountDetails() {
+      await this.$store.dispatch('accounts/get');
+
+      if (!this.hasABillingPlan) {
+        this.$store.dispatch('accounts/subscription');
+      }
+    },
+    onClickBillingPortal() {
+      this.$store.dispatch('accounts/checkout');
+    },
+    onToggleChatWindow() {
+      if (window.$chatwoot) {
+        window.$chatwoot.toggle();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.manage-subscription {
+  align-items: center;
+  background: var(--white);
+  border-radius: var(--border-radius-normal);
+  border: 1px solid var(--color-border);
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: var(--space-small);
+  padding: var(--space-medium) var(--space-normal);
+}
+
+.current-plan--details {
+  border-bottom: 1px solid var(--color-border);
+  margin-bottom: var(--space-normal);
+  padding-bottom: var(--space-normal);
+}
+
+.manage-subscription {
+  .manage-subscription--description {
+    margin-bottom: 0;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js b/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js
new file mode 100644
index 000000000..db28fb844
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js
@@ -0,0 +1,26 @@
+import SettingsContent from '../Wrapper';
+import Index from './Index.vue';
+import { frontendURL } from '../../../../helper/URLHelper';
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/billing'),
+      roles: ['administrator'],
+      component: SettingsContent,
+      props: {
+        headerTitle: 'BILLING_SETTINGS.TITLE',
+        icon: 'credit-card-person',
+        showNewButton: false,
+      },
+      children: [
+        {
+          path: '',
+          name: 'billing_settings_index',
+          component: Index,
+          roles: ['administrator'],
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingItem.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingItem.vue
new file mode 100644
index 000000000..6f8ade8a0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingItem.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="manage-subscription">
+    <div>
+      <h6>{{ title }}</h6>
+      <p class="manage-subscription--description">
+        {{ description }}
+      </p>
+    </div>
+    <div>
+      <woot-button variant="smooth" :icon="buttonIcon" @click="$emit('click')">
+        {{ buttonLabel }}
+      </woot-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+    description: {
+      type: String,
+      default: '',
+    },
+    buttonLabel: {
+      type: String,
+      default: '',
+    },
+
+    buttonIcon: {
+      type: String,
+      default: 'edit',
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index d9d05877a..283c05933 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -325,6 +325,9 @@
     <div v-if="selectedTabKey === 'businesshours'">
       <weekly-availability :inbox="inbox" />
     </div>
+    <div v-if="selectedTabKey === 'widgetBuilder'">
+      <widget-builder :inbox="inbox" />
+    </div>
   </div>
 </template>
 
@@ -342,6 +345,7 @@ import WeeklyAvailability from './components/WeeklyAvailability';
 import GreetingsEditor from 'shared/components/GreetingsEditor';
 import ConfigurationPage from './settingsPage/ConfigurationPage';
 import CollaboratorsPage from './settingsPage/CollaboratorsPage';
+import WidgetBuilder from './WidgetBuilder';
 
 export default {
   components: {
@@ -353,6 +357,7 @@ export default {
     GreetingsEditor,
     ConfigurationPage,
     CollaboratorsPage,
+    WidgetBuilder,
   },
   mixins: [alertMixin, configMixin, inboxMixin],
   data() {
@@ -410,6 +415,10 @@ export default {
             key: 'configuration',
             name: this.$t('INBOX_MGMT.TABS.CONFIGURATION'),
           },
+          {
+            key: 'widgetBuilder',
+            name: this.$t('INBOX_MGMT.TABS.WIDGET_BUILDER'),
+          },
         ];
       }
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
new file mode 100644
index 000000000..8da5183d7
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
@@ -0,0 +1,474 @@
+<template>
+  <div class="settings--content">
+    <div class="widget-builder-conatiner">
+      <div class="settings-container">
+        <div class="settings-content">
+          <form @submit.prevent="updateWidget">
+            <woot-avatar-uploader
+              :label="
+                $t('INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.AVATAR.LABEL')
+              "
+              :src="avatarUrl"
+              delete-avatar
+              @change="handleImageUpload"
+              @onAvatarDelete="handleAvatarDelete"
+            />
+            <woot-input
+              v-model.trim="websiteName"
+              :class="{ error: $v.websiteName.$error }"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WEBSITE_NAME.LABEL'
+                )
+              "
+              :placeholder="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WEBSITE_NAME.PLACE_HOLDER'
+                )
+              "
+              :error="websiteNameValidationErrorMsg"
+              @blur="$v.websiteName.$touch"
+            />
+            <woot-input
+              v-model.trim="welcomeHeading"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WELCOME_HEADING.LABEL'
+                )
+              "
+              :placeholder="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WELCOME_HEADING.PLACE_HOLDER'
+                )
+              "
+            />
+            <woot-input
+              v-model.trim="welcomeTagline"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WELCOME_TAGLINE.LABEL'
+                )
+              "
+              :placeholder="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WELCOME_TAGLINE.PLACE_HOLDER'
+                )
+              "
+            />
+            <label>
+              {{
+                $t('INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.REPLY_TIME.LABEL')
+              }}
+              <select v-model="replyTime">
+                <option
+                  v-for="option in getReplyTimeOptions"
+                  :key="option.key"
+                  :value="option.value"
+                >
+                  {{ option.text }}
+                </option>
+              </select>
+            </label>
+            <label>
+              {{
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_COLOR_LABEL'
+                )
+              }}
+              <woot-color-picker v-model="color" />
+            </label>
+            <input-radio-group
+              name="widget-bubble-position"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_POSITION_LABEL'
+                )
+              "
+              :items="widgetBubblePositions"
+              :action="handleWidgetBubblePositionChange"
+            />
+            <input-radio-group
+              name="widget-bubble-type"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_TYPE_LABEL'
+                )
+              "
+              :items="widgetBubbleTypes"
+              :action="handleWidgetBubbleTypeChange"
+            />
+            <woot-input
+              v-model.trim="widgetBubbleLauncherTitle"
+              :label="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_LAUNCHER_TITLE.LABEL'
+                )
+              "
+              :placeholder="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_LAUNCHER_TITLE.PLACE_HOLDER'
+                )
+              "
+            />
+            <woot-submit-button
+              class="submit-button"
+              :button-text="
+                $t(
+                  'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.UPDATE.BUTTON_TEXT'
+                )
+              "
+              :loading="uiFlags.isUpdating"
+              :disabled="$v.$invalid || uiFlags.isUpdating"
+            />
+          </form>
+        </div>
+      </div>
+      <div class="widget-container">
+        <input-radio-group
+          name="widget-view-options"
+          :items="getWidgetViewOptions"
+          :action="handleWidgetViewChange"
+          :style="{ 'text-align': 'center' }"
+        />
+        <div v-if="isWidgetPreview" class="widget-preview">
+          <Widget
+            :welcome-heading="welcomeHeading"
+            :welcome-tagline="welcomeTagline"
+            :website-name="websiteName"
+            :logo="avatarUrl"
+            is-online
+            :reply-time="replyTime"
+            :color="color"
+            :widget-bubble-position="widgetBubblePosition"
+            :widget-bubble-launcher-title="widgetBubbleLauncherTitle"
+            :widget-bubble-type="widgetBubbleType"
+          />
+        </div>
+        <div v-else class="widget-script">
+          <woot-code :script="widgetScript" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import Widget from 'dashboard/modules/widget-preview/components/Widget';
+import InputRadioGroup from './components/InputRadioGroup';
+import alertMixin from 'shared/mixins/alertMixin';
+import { required } from 'vuelidate/lib/validators';
+import {
+  LocalStorage,
+  LOCAL_STORAGE_KEYS,
+} from 'dashboard/helper/localStorage';
+
+export default {
+  components: {
+    Widget,
+    InputRadioGroup,
+  },
+  mixins: [alertMixin],
+  props: {
+    inbox: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      isWidgetPreview: true,
+      color: '#1f93ff',
+      websiteName: '',
+      welcomeHeading: '',
+      welcomeTagline: '',
+      replyTime: 'in_a_few_minutes',
+      avatarFile: null,
+      avatarUrl: '',
+      widgetBubblePosition: 'right',
+      widgetBubbleLauncherTitle: this.$t(
+        'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_LAUNCHER_TITLE.DEFAULT'
+      ),
+      widgetBubbleType: 'standard',
+      widgetBubblePositions: [
+        {
+          id: 'left',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_POSITION.LEFT'
+          ),
+          checked: false,
+        },
+        {
+          id: 'right',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_POSITION.RIGHT'
+          ),
+          checked: true,
+        },
+      ],
+      widgetBubbleTypes: [
+        {
+          id: 'standard',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_TYPE.STANDARD'
+          ),
+          checked: true,
+        },
+        {
+          id: 'expanded_bubble',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_BUBBLE_TYPE.EXPANDED_BUBBLE'
+          ),
+          checked: false,
+        },
+      ],
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'inboxes/getUIFlags',
+    }),
+    storageKey() {
+      return `${LOCAL_STORAGE_KEYS.WIDGET_BUILDER}${this.inbox.id}`;
+    },
+    widgetScript() {
+      let options = {
+        position: this.widgetBubblePosition,
+        type: this.widgetBubbleType,
+        launcherTitle: this.widgetBubbleLauncherTitle,
+      };
+      let script = this.inbox.web_widget_script;
+      return (
+        script.substring(0, 13) +
+        this.$t('INBOX_MGMT.WIDGET_BUILDER.SCRIPT_SETTINGS', {
+          options: JSON.stringify(options),
+        }) +
+        script.substring(13, script.length)
+      );
+    },
+    getWidgetViewOptions() {
+      return [
+        {
+          id: 'preview',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_VIEW_OPTION.PREVIEW'
+          ),
+          checked: true,
+        },
+        {
+          id: 'script',
+          title: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WIDGET_VIEW_OPTION.SCRIPT'
+          ),
+          checked: false,
+        },
+      ];
+    },
+    getReplyTimeOptions() {
+      return [
+        {
+          key: 'in_a_few_minutes',
+          value: 'in_a_few_minutes',
+          text: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.REPLY_TIME.IN_A_FEW_MINUTES'
+          ),
+        },
+        {
+          key: 'in_a_few_hours',
+          value: 'in_a_few_hours',
+          text: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.REPLY_TIME.IN_A_FEW_HOURS'
+          ),
+        },
+        {
+          key: 'in_a_day',
+          value: 'in_a_day',
+          text: this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.REPLY_TIME.IN_A_DAY'
+          ),
+        },
+      ];
+    },
+    websiteNameValidationErrorMsg() {
+      return this.$v.websiteName.$error
+        ? this.$t('INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.WEBSITE_NAME.ERROR')
+        : '';
+    },
+  },
+  mounted() {
+    this.setDefaults();
+  },
+  validations: {
+    websiteName: { required },
+  },
+  methods: {
+    setDefaults() {
+      // Widget Settings
+      const {
+        name,
+        welcome_title,
+        welcome_tagline,
+        widget_color,
+        reply_time,
+        avatar_url,
+      } = this.inbox;
+      this.websiteName = name;
+      this.welcomeHeading = welcome_title;
+      this.welcomeTagline = welcome_tagline;
+      this.color = widget_color;
+      this.replyTime = reply_time;
+      this.avatarUrl = avatar_url;
+
+      const savedInformation = this.getSavedInboxInformation();
+      if (savedInformation) {
+        this.widgetBubblePositions = this.widgetBubblePositions.map(item => {
+          if (item.id === savedInformation.position) {
+            item.checked = true;
+            this.widgetBubblePosition = item.id;
+          }
+          return item;
+        });
+        this.widgetBubbleTypes = this.widgetBubbleTypes.map(item => {
+          if (item.id === savedInformation.type) {
+            item.checked = true;
+            this.widgetBubbleType = item.id;
+          }
+          return item;
+        });
+        this.widgetBubbleLauncherTitle =
+          savedInformation.launcherTitle || 'Chat with us';
+      }
+    },
+    handleWidgetBubblePositionChange(item) {
+      this.widgetBubblePosition = item.id;
+    },
+    handleWidgetBubbleTypeChange(item) {
+      this.widgetBubbleType = item.id;
+    },
+    handleWidgetViewChange(item) {
+      this.isWidgetPreview = item.id === 'preview';
+    },
+    handleImageUpload({ file, url }) {
+      this.avatarFile = file;
+      this.avatarUrl = url;
+    },
+    async handleAvatarDelete() {
+      try {
+        await this.$store.dispatch('inboxes/deleteInboxAvatar', this.inbox.id);
+        this.avatarFile = null;
+        this.avatarUrl = '';
+        this.showAlert(
+          this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.AVATAR.DELETE.API.SUCCESS_MESSAGE'
+          )
+        );
+      } catch (error) {
+        this.showAlert(
+          error.message
+            ? error.message
+            : this.$t(
+                'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.AVATAR.DELETE.API.ERROR_MESSAGE'
+              )
+        );
+      }
+    },
+    async updateWidget() {
+      const bubbleSettings = {
+        position: this.widgetBubblePosition,
+        launcherTitle: this.widgetBubbleLauncherTitle,
+        type: this.widgetBubbleType,
+      };
+
+      LocalStorage.set(this.storageKey, bubbleSettings);
+
+      try {
+        const payload = {
+          id: this.inbox.id,
+          name: this.websiteName,
+          channel: {
+            widget_color: this.color,
+            welcome_title: this.welcomeHeading,
+            welcome_tagline: this.welcomeTagline,
+            reply_time: this.replyTime,
+          },
+        };
+        if (this.avatarFile) {
+          payload.avatar = this.avatarFile;
+        }
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        this.showAlert(
+          this.$t(
+            'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.UPDATE.API.SUCCESS_MESSAGE'
+          )
+        );
+      } catch (error) {
+        this.showAlert(
+          error.message ||
+            this.$t(
+              'INBOX_MGMT.WIDGET_BUILDER.WIDGET_OPTIONS.UPDATE.API.ERROR_MESSAGE'
+            )
+        );
+      }
+    },
+    getSavedInboxInformation() {
+      return LocalStorage.get(this.storageKey);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/woot';
+
+.widget-builder-conatiner {
+  display: flex;
+  flex-direction: row;
+  padding: var(--space-one);
+  @include breakpoint(900px down) {
+    flex-direction: column;
+  }
+}
+
+.settings-container {
+  width: 40%;
+  @include breakpoint(900px down) {
+    width: 100%;
+  }
+
+  .settings-content {
+    padding: var(--space-normal) var(--space-zero);
+    overflow-y: scroll;
+    min-height: 100%;
+
+    .submit-button {
+      margin-top: var(--space-normal);
+    }
+  }
+}
+.widget-container {
+  width: 60%;
+  @include breakpoint(900px down) {
+    width: 100%;
+  }
+
+  .widget-preview {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    min-height: 64rem;
+    margin: var(--space-zero) var(--space-two) var(--space-two) var(--space-two);
+    padding: var(--space-one) var(--space-one) var(--space-one) var(--space-one);
+    background: var(--s-50);
+
+    @include breakpoint(500px down) {
+      background: none;
+    }
+  }
+  .widget-script {
+    margin: 0 var(--space-two);
+    padding: var(--space-one);
+    background: var(--s-50);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
index 3326261fd..6f08afc3d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
@@ -2,14 +2,17 @@
   <div>
     <label class="radio-group-label">{{ label }}</label>
     <div class="radio-group">
-      <div v-for="item in items" :key="item.id">
-        <input
-          name="radio-input"
-          type="radio"
-          :checked="item.checked"
-          @change="action(item)"
-        />
-        <label>{{ item.title }}</label>
+      <div v-for="item in items" :key="item.id" class="radio-group-item">
+        <label class="radio-group-item-label">
+          <input
+            class="radio-input"
+            :name="`${name} -radio-input`"
+            type="radio"
+            :checked="item.checked"
+            @change="action({ ...item, checked: true })"
+          />
+          <span>{{ item.title }}</span>
+        </label>
       </div>
     </div>
   </div>
@@ -18,6 +21,10 @@
 <script>
 export default {
   props: {
+    name: {
+      type: String,
+      default: 'string',
+    },
     label: {
       type: String,
       default: '',
@@ -36,10 +43,23 @@ export default {
 
 <style lang="scss" scoped>
 .radio-group-label {
-  margin-bottom: var(--space-small);
+  margin-bottom: var(--space-smaller);
 }
 .radio-group {
-  display: flex;
-  align-items: center;
+  display: inline-block;
+  margin-bottom: var(--space-small);
+}
+.radio-group-item {
+  float: left;
+  margin-right: var(--space-one);
+  .radio-group-item-label {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+
+    .radio-input {
+      margin: 0 var(--space-one) 0 0;
+    }
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
index 68f5bc5e3..e830bd640 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -49,9 +49,8 @@
         </p>
       </label>
 
-      <!-- disabling this block temporarily -->
       <div
-        v-if="enableAutoAssignment && isEnterprise && false"
+        v-if="enableAutoAssignment && isEnterprise"
         class="max-assignment-container"
       >
         <woot-input
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
index 6b1cce332..3ff783771 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
@@ -1,7 +1,13 @@
 <template>
   <tr>
-    <td>{{ app.title }}</td>
-    <td>{{ app.content[0].url }}</td>
+    <td>
+      {{ app.title }}
+    </td>
+    <td class="dashboard-app-label-url">
+      <span class="text-truncate">
+        {{ app.content[0].url }}
+      </span>
+    </td>
     <td class="button-wrapper">
       <woot-button
         v-tooltip.top="
@@ -43,3 +49,19 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+.dashboard-app-label-url {
+  position: relative;
+  width: 50%;
+  &:before {
+    content: '&nbsp;';
+    visibility: hidden;
+  }
+  span {
+    position: absolute;
+    left: 0;
+    right: 0;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
index 88aa5c558..9ac93827f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
@@ -41,7 +41,7 @@
         :header="this.$t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.HEADER')"
       >
         <agent-table
-          :total-agents="agentsCount"
+          :agents="agents"
           :agent-metrics="agentConversationMetric"
           :page-index="pageIndex"
           :is-loading="uiFlags.isFetchingAgentConversationMetric"
@@ -70,7 +70,7 @@ export default {
   computed: {
     ...mapGetters({
       agentStatus: 'agents/getAgentStatus',
-      agentsCount: 'agents/getAgentsCount',
+      agents: 'agents/getAgents',
       accountConversationMetric: 'getAccountConversationMetric',
       agentConversationMetric: 'getAgentConversationMetric',
       uiFlags: 'getOverviewUIFlags',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
index 2a5694feb..4ad35288a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
@@ -18,7 +18,7 @@
     />
     <div v-if="agentMetrics.length > 0" class="table-pagination">
       <ve-pagination
-        :total="totalAgents"
+        :total="agents.length"
         :page-index="pageIndex"
         :page-size="25"
         :page-size-option="[25]"
@@ -43,9 +43,9 @@ export default {
     VePagination,
   },
   props: {
-    totalAgents: {
-      type: Number,
-      default: 0,
+    agents: {
+      type: Array,
+      default: () => [],
     },
     agentMetrics: {
       type: Array,
@@ -60,19 +60,17 @@ export default {
       default: 1,
     },
   },
-  data() {
-    return {};
-  },
   computed: {
     tableData() {
       return this.agentMetrics.map(agent => {
+        const agentInformation = this.getAgentInformation(agent.id);
         return {
-          agent: agent.name,
-          email: agent.email,
-          thumbnail: agent.thumbnail,
+          agent: agentInformation.name,
+          email: agentInformation.email,
+          thumbnail: agentInformation.thumbnail,
           open: agent.metric.open || 0,
           unattended: agent.metric.unattended || 0,
-          status: agent.availability,
+          status: agentInformation.availability_status,
         };
       });
     },
@@ -123,11 +121,13 @@ export default {
       ];
     },
   },
-  mounted() {},
   methods: {
     onPageNumberChange(pageIndex) {
       this.$emit('page-change', pageIndex);
     },
+    getAgentInformation(id) {
+      return this.agents.find(agent => agent.id === Number(id));
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 110f26fba..8f3de8f4e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -13,6 +13,7 @@ import teams from './teams/teams.routes';
 import attributes from './attributes/attributes.routes';
 import automation from './automation/automation.routes';
 import store from '../../../store';
+import billing from './billing/billing.routes';
 
 export default {
   routes: [
@@ -29,16 +30,17 @@ export default {
     },
     ...account.routes,
     ...agent.routes,
+    ...attributes.routes,
+    ...automation.routes,
+    ...billing.routes,
+    ...campaigns.routes,
     ...canned.routes,
     ...inbox.routes,
+    ...integrationapps.routes,
     ...integrations.routes,
     ...labels.routes,
     ...profile.routes,
     ...reports.routes,
     ...teams.routes,
-    ...campaigns.routes,
-    ...integrationapps.routes,
-    ...attributes.routes,
-    ...automation.routes,
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/suspended/Index.vue b/app/javascript/dashboard/routes/dashboard/suspended/Index.vue
new file mode 100644
index 000000000..c25a8a7eb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/suspended/Index.vue
@@ -0,0 +1,24 @@
+<template>
+  <div class="suspended-page">
+    <empty-state
+      :title="$t('APP_GLOBAL.ACCOUNT_SUSPENDED.TITLE')"
+      :message="$t('APP_GLOBAL.ACCOUNT_SUSPENDED.MESSAGE')"
+    />
+  </div>
+</template>
+<script>
+import EmptyState from 'dashboard/components/widgets/EmptyState';
+export default {
+  components: { EmptyState },
+};
+</script>
+<style scoped>
+.suspended-page {
+  align-items: center;
+  background: var(--s-50);
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index 2557538ec..586f14804 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -6,6 +6,7 @@ import authRoute from './auth/auth.routes';
 import dashboard from './dashboard/dashboard.routes';
 import login from './login/login.routes';
 import store from '../store';
+import { validateLoggedInRoutes } from '../helper/routeHelpers';
 
 const routes = [...login.routes, ...dashboard.routes, ...authRoute.routes];
 
@@ -14,11 +15,6 @@ window.roleWiseRoutes = {
   administrator: [],
 };
 
-const getUserRole = ({ accounts } = {}, accountId) => {
-  const currentAccount = accounts.find(account => account.id === accountId);
-  return currentAccount ? currentAccount.role : null;
-};
-
 // generateRoleWiseRoute - updates window object with agent/admin route
 const generateRoleWiseRoute = route => {
   route.forEach(element => {
@@ -47,10 +43,6 @@ const authIgnoreRoutes = [
   'auth_password_edit',
 ];
 
-function routeIsAccessibleFor(route, role) {
-  return window.roleWiseRoutes[role].includes(route);
-}
-
 const routeValidators = [
   {
     protected: false,
@@ -68,12 +60,8 @@ const routeValidators = [
   {
     protected: true,
     loggedIn: true,
-    handler: (to, getters) => {
-      const user = getters.getCurrentUser;
-      const userRole = getUserRole(user, Number(to.params.accountId));
-      const isAccessible = routeIsAccessibleFor(to.name, userRole);
-      return isAccessible ? null : `accounts/${to.params.accountId}/dashboard`;
-    },
+    handler: (to, getters) =>
+      validateLoggedInRoutes(to, getters.getCurrentUser, window.roleWiseRoutes),
   },
   {
     protected: false,
diff --git a/app/javascript/dashboard/routes/index.spec.js b/app/javascript/dashboard/routes/index.spec.js
index ae8b21d46..b9bf3c251 100644
--- a/app/javascript/dashboard/routes/index.spec.js
+++ b/app/javascript/dashboard/routes/index.spec.js
@@ -26,7 +26,7 @@ describe('#validateAuthenticateRoutePermission', () => {
         getCurrentUser: {
           account_id: 1,
           id: 1,
-          accounts: [{ id: 1, role: 'admin' }],
+          accounts: [{ id: 1, role: 'admin', status: 'active' }],
         },
       };
       validateAuthenticateRoutePermission(to, from, next, { getters });
@@ -72,7 +72,7 @@ describe('#validateAuthenticateRoutePermission', () => {
             getCurrentUser: {
               account_id: 1,
               id: 1,
-              accounts: [{ id: 1, role: 'agent' }],
+              accounts: [{ id: 1, role: 'agent', status: 'active' }],
             },
           };
           validateAuthenticateRoutePermission(to, from, next, { getters });
@@ -90,7 +90,7 @@ describe('#validateAuthenticateRoutePermission', () => {
             getCurrentUser: {
               account_id: 1,
               id: 1,
-              accounts: [{ id: 1, role: 'agent' }],
+              accounts: [{ id: 1, role: 'agent', status: 'active' }],
             },
           };
           validateAuthenticateRoutePermission(to, from, next, { getters });
diff --git a/app/javascript/dashboard/routes/login/Login.vue b/app/javascript/dashboard/routes/login/Login.vue
index c0626a87c..eac42730c 100644
--- a/app/javascript/dashboard/routes/login/Login.vue
+++ b/app/javascript/dashboard/routes/login/Login.vue
@@ -80,7 +80,7 @@ export default {
   props: {
     ssoAuthToken: { type: String, default: '' },
     ssoAccountId: { type: String, default: '' },
-    redirectUrl: { type: String, default: '' },
+    ssoConversationId: { type: String, default: '' },
     config: { type: String, default: '' },
     email: { type: String, default: '' },
   },
@@ -139,6 +139,7 @@ export default {
         password: this.credentials.password,
         sso_auth_token: this.ssoAuthToken,
         ssoAccountId: this.ssoAccountId,
+        ssoConversationId: this.ssoConversationId,
       };
       this.$store
         .dispatch('login', credentials)
diff --git a/app/javascript/dashboard/routes/login/login.routes.js b/app/javascript/dashboard/routes/login/login.routes.js
index f43e632bf..40038a154 100644
--- a/app/javascript/dashboard/routes/login/login.routes.js
+++ b/app/javascript/dashboard/routes/login/login.routes.js
@@ -11,8 +11,8 @@ export default {
         config: route.query.config,
         email: route.query.email,
         ssoAuthToken: route.query.sso_auth_token,
-        redirectUrl: route.query.route_url,
         ssoAccountId: route.query.sso_account_id,
+        ssoConversationId: route.query.sso_conversation_id,
       }),
     },
   ],
diff --git a/app/javascript/dashboard/store/actions.js b/app/javascript/dashboard/store/actions.js
deleted file mode 100755
index e69de29bb..000000000
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 4957a27cc..8ffbb2db4 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -35,6 +35,9 @@ import teamMembers from './modules/teamMembers';
 import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
+import articles from './modules/helpCenterArticles';
+import portals from './modules/helpCenterPortals';
+import categories from './modules/helpCenterCategories';
 
 Vue.use(Vuex);
 export default new Vuex.Store({
@@ -73,5 +76,8 @@ export default new Vuex.Store({
     teams,
     userNotificationSettings,
     webhooks,
+    articles,
+    portals,
+    categories,
   },
 });
diff --git a/app/javascript/dashboard/store/modules/accounts.js b/app/javascript/dashboard/store/modules/accounts.js
index a30e64e46..32bca04a8 100644
--- a/app/javascript/dashboard/store/modules/accounts.js
+++ b/app/javascript/dashboard/store/modules/accounts.js
@@ -1,9 +1,8 @@
-/* eslint no-console: 0 */
-/* eslint no-param-reassign: 0 */
-/* eslint no-shadow: 0 */
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import AccountAPI from '../../api/account';
+import EnterpriseAccountAPI from '../../api/enterprise/account';
+import { throwErrorMessage } from '../utils/api';
 
 const state = {
   records: [],
@@ -11,6 +10,7 @@ const state = {
     isFetching: false,
     isFetchingItem: false,
     isUpdating: false,
+    isCheckoutInProcess: false,
   },
 };
 
@@ -60,6 +60,29 @@ export const actions = {
       throw error;
     }
   },
+
+  checkout: async ({ commit }) => {
+    commit(types.default.SET_ACCOUNT_UI_FLAG, { isCheckoutInProcess: true });
+    try {
+      const response = await EnterpriseAccountAPI.checkout();
+      window.location = response.data.redirect_url;
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, { isCheckoutInProcess: false });
+    }
+  },
+
+  subscription: async ({ commit }) => {
+    commit(types.default.SET_ACCOUNT_UI_FLAG, { isCheckoutInProcess: true });
+    try {
+      await EnterpriseAccountAPI.subscription();
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, { isCheckoutInProcess: false });
+    }
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/agents.js b/app/javascript/dashboard/store/modules/agents.js
index b8dbc7fc4..d6d1fdc26 100644
--- a/app/javascript/dashboard/store/modules/agents.js
+++ b/app/javascript/dashboard/store/modules/agents.js
@@ -35,9 +35,6 @@ export const getters = {
     };
     return status;
   },
-  getAgentsCount($state) {
-    return $state.records.length;
-  },
 };
 
 export const actions = {
@@ -73,14 +70,15 @@ export const actions = {
       throw new Error(error);
     }
   },
-
-  updatePresence: async ({ commit, dispatch }, data) => {
-    commit(types.default.SET_AGENT_UPDATING_STATUS, true);
-    commit(types.default.UPDATE_AGENTS_PRESENCE, data);
-    dispatch('updateReportAgentStatus', data, { root: true });
-    commit(types.default.SET_AGENT_UPDATING_STATUS, false);
+  updateSingleAgentPresence: ({ commit }, { id, availabilityStatus }) => {
+    commit(types.default.UPDATE_SINGLE_AGENT_PRESENCE, {
+      id,
+      availabilityStatus,
+    });
+  },
+  updatePresence: async ({ commit }, data) => {
+    commit(types.default.UPDATE_AGENTS_PRESENCE, data);
   },
-
   delete: async ({ commit }, agentId) => {
     commit(types.default.SET_AGENT_DELETING_STATUS, true);
     try {
@@ -113,6 +111,14 @@ export const mutations = {
   [types.default.EDIT_AGENT]: MutationHelpers.update,
   [types.default.DELETE_AGENT]: MutationHelpers.destroy,
   [types.default.UPDATE_AGENTS_PRESENCE]: MutationHelpers.updatePresence,
+  [types.default.UPDATE_SINGLE_AGENT_PRESENCE]: (
+    $state,
+    { id, availabilityStatus }
+  ) =>
+    MutationHelpers.updateSingleRecordPresence($state.records, {
+      id,
+      availabilityStatus,
+    }),
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index cb28f0d01..4d33dd0cc 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -84,12 +84,16 @@ export const getters = {
 
 // actions
 export const actions = {
-  login(_, { ssoAccountId, ...credentials }) {
+  login(_, { ssoAccountId, ssoConversationId, ...credentials }) {
     return new Promise((resolve, reject) => {
       authAPI
         .login(credentials)
         .then(response => {
-          window.location = getLoginRedirectURL(ssoAccountId, response.data);
+          window.location = getLoginRedirectURL({
+            ssoAccountId,
+            ssoConversationId,
+            user: response.data,
+          });
           resolve();
         })
         .catch(error => {
@@ -155,7 +159,10 @@ export const actions = {
       const userData = response.data;
       const { id } = userData;
       commit(types.SET_CURRENT_USER, response.data);
-      dispatch('agents/updatePresence', { [id]: params.availability });
+      dispatch('agents/updateSingleAgentPresence', {
+        id,
+        availabilityStatus: params.availability,
+      });
     } catch (error) {
       // Ignore error
     }
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 2012a6edd..22c6721c1 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -121,14 +121,14 @@ const actions = {
         conversationId,
         teamId,
       });
-      dispatch('setCurrentChatTeam', response.data);
+      dispatch('setCurrentChatTeam', { team: response.data, conversationId });
     } catch (error) {
       // Handle error
     }
   },
 
-  setCurrentChatTeam({ commit }, team) {
-    commit(types.ASSIGN_TEAM, team);
+  setCurrentChatTeam({ commit }, { team, conversationId }) {
+    commit(types.ASSIGN_TEAM, { team, conversationId });
   },
 
   toggleStatus: async (
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index e05743dbe..8df08089c 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -68,8 +68,8 @@ export const mutations = {
     Vue.set(chat.meta, 'assignee', assignee);
   },
 
-  [types.ASSIGN_TEAM](_state, team) {
-    const [chat] = getSelectedChatConversation(_state);
+  [types.ASSIGN_TEAM](_state, { team, conversationId }) {
+    const [chat] = _state.allConversations.filter(c => c.id === conversationId);
     Vue.set(chat.meta, 'team', team);
   },
 
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
new file mode 100644
index 000000000..fa985a40a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
@@ -0,0 +1,114 @@
+import articlesAPI from 'dashboard/api/helpCenter/articles';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+
+import types from '../../mutation-types';
+export const actions = {
+  index: async (
+    { commit },
+    { pageNumber, portalSlug, locale, status, author_id, category_slug }
+  ) => {
+    try {
+      commit(types.SET_UI_FLAG, { isFetching: true });
+      const {
+        data: { payload, meta },
+      } = await articlesAPI.getArticles({
+        pageNumber,
+        portalSlug,
+        locale,
+        status,
+        author_id,
+        category_slug,
+      });
+      const articleIds = payload.map(article => article.id);
+      commit(types.CLEAR_ARTICLES);
+      commit(types.ADD_MANY_ARTICLES, payload);
+      commit(types.SET_ARTICLES_META, meta);
+      commit(types.ADD_MANY_ARTICLES_ID, articleIds);
+      return articleIds;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async ({ commit }, params) => {
+    commit(types.SET_UI_FLAG, { isCreating: true });
+    try {
+      const { data } = await articlesAPI.create(params);
+      const { id: articleId } = data;
+      commit(types.ADD_ARTICLE, data);
+      commit(types.ADD_ARTICLE_ID, articleId);
+      return articleId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  show: async ({ commit }, { id, portalSlug }) => {
+    commit(types.SET_UI_FLAG, { isFetching: true });
+    try {
+      const response = await articlesAPI.getArticle({ id, portalSlug });
+      const {
+        data: { payload },
+      } = response;
+      const { id: articleId } = payload;
+      commit(types.ADD_ARTICLE, payload);
+      commit(types.ADD_ARTICLE_ID, articleId);
+      commit(types.SET_UI_FLAG, { isFetching: false });
+    } catch (error) {
+      commit(types.SET_UI_FLAG, { isFetching: false });
+    }
+  },
+  update: async ({ commit }, params) => {
+    const articleId = params.id;
+    commit(types.ADD_ARTICLE_FLAG, {
+      uiFlags: {
+        isUpdating: true,
+      },
+      articleId,
+    });
+    try {
+      const { data } = await articlesAPI.update(params);
+
+      commit(types.UPDATE_ARTICLE, data);
+
+      return articleId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.ADD_ARTICLE_FLAG, {
+        uiFlags: {
+          isUpdating: false,
+        },
+        articleId,
+      });
+    }
+  },
+  delete: async ({ commit }, articleId) => {
+    commit(types.ADD_ARTICLE_FLAG, {
+      uiFlags: {
+        isDeleting: true,
+      },
+      articleId,
+    });
+    try {
+      await articlesAPI.delete(articleId);
+
+      commit(types.REMOVE_ARTICLE, articleId);
+      commit(types.REMOVE_ARTICLE_ID, articleId);
+      return articleId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.ADD_ARTICLE_FLAG, {
+        uiFlags: {
+          isDeleting: false,
+        },
+        articleId,
+      });
+    }
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/getters.js b/app/javascript/dashboard/store/modules/helpCenterArticles/getters.js
new file mode 100644
index 000000000..35e32ee5e
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/getters.js
@@ -0,0 +1,24 @@
+export const getters = {
+  uiFlags: state => helpCenterId => {
+    const uiFlags = state.articles.uiFlags.byId[helpCenterId];
+    if (uiFlags) return uiFlags;
+    return { isFetching: false, isUpdating: false, isDeleting: false };
+  },
+  isFetching: state => state.uiFlags.isFetching,
+  articleById: (...getterArguments) => articleId => {
+    const [state] = getterArguments;
+    const article = state.articles.byId[articleId];
+    if (!article) return undefined;
+    return article;
+  },
+  allArticles: (...getterArguments) => {
+    const [state, _getters] = getterArguments;
+    const articles = state.articles.allIds.map(id => {
+      return _getters.articleById(id);
+    });
+    return articles;
+  },
+  getMeta: state => {
+    return state.meta;
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/index.js b/app/javascript/dashboard/store/modules/helpCenterArticles/index.js
new file mode 100755
index 000000000..7648b1ef6
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/index.js
@@ -0,0 +1,34 @@
+import { getters } from './getters';
+import { actions } from './actions';
+import { mutations } from './mutations';
+
+export const defaultHelpCenterFlags = {
+  isFetching: false,
+  isUpdating: false,
+  isDeleting: false,
+};
+const state = {
+  meta: {
+    count: 0,
+    currentPage: 1,
+  },
+  articles: {
+    byId: {},
+    allIds: [],
+    uiFlags: {
+      byId: {},
+    },
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: false,
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/mutations.js b/app/javascript/dashboard/store/modules/helpCenterArticles/mutations.js
new file mode 100644
index 000000000..9dd0ac28b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/mutations.js
@@ -0,0 +1,74 @@
+import types from '../../mutation-types';
+import Vue from 'vue';
+
+export const mutations = {
+  [types.SET_UI_FLAG](_state, uiFlags) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...uiFlags,
+    };
+  },
+
+  [types.ADD_ARTICLE]: ($state, article) => {
+    if (!article.id) return;
+
+    Vue.set($state.articles.byId, article.id, {
+      ...article,
+    });
+  },
+  [types.CLEAR_ARTICLES]: $state => {
+    Vue.set($state.articles, 'byId', {});
+    Vue.set($state.articles, 'allIds', []);
+    Vue.set($state.articles, 'uiFlags', {});
+  },
+  [types.ADD_MANY_ARTICLES]($state, articles) {
+    const allArticles = { ...$state.articles.byId };
+    articles.forEach(article => {
+      allArticles[article.id] = article;
+    });
+    Vue.set($state.articles, 'byId', allArticles);
+  },
+  [types.ADD_MANY_ARTICLES_ID]($state, articleIds) {
+    $state.articles.allIds.push(...articleIds);
+  },
+
+  [types.SET_ARTICLES_META]: ($state, data) => {
+    const { articles_count: count, current_page: currentPage } = data;
+    Vue.set($state.meta, 'count', count);
+    Vue.set($state.meta, 'currentPage', currentPage);
+  },
+
+  [types.ADD_ARTICLE_ID]: ($state, articleId) => {
+    $state.articles.allIds.push(articleId);
+  },
+  [types.ADD_ARTICLE_FLAG]: ($state, { articleId, uiFlags }) => {
+    const flags = $state.articles.uiFlags.byId[articleId];
+    Vue.set($state.articles.uiFlags.byId, articleId, {
+      ...{
+        isFetching: false,
+        isUpdating: false,
+        isDeleting: false,
+      },
+      ...flags,
+      ...uiFlags,
+    });
+  },
+  [types.UPDATE_ARTICLE]($state, article) {
+    const articleId = article.id;
+
+    if (!$state.articles.allIds.includes(articleId)) return;
+
+    Vue.set($state.articles.byId, articleId, {
+      ...article,
+    });
+  },
+  [types.REMOVE_ARTICLE]($state, articleId) {
+    const { [articleId]: toBeRemoved, ...newById } = $state.articles.byId;
+    Vue.set($state.articles, 'byId', newById);
+  },
+  [types.REMOVE_ARTICLE_ID]($state, articleId) {
+    $state.articles.allIds = $state.articles.allIds.filter(
+      id => id !== articleId
+    );
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/specs/action.spec.js b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/action.spec.js
new file mode 100644
index 000000000..0250031b1
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/action.spec.js
@@ -0,0 +1,158 @@
+import axios from 'axios';
+import { actions } from '../actions';
+import * as types from '../../../mutation-types';
+const articleList = [
+  {
+    id: 1,
+    category_id: 1,
+    title: 'Documents are required to complete KYC',
+  },
+];
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#index', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({
+        data: {
+          payload: articleList,
+          meta: {
+            current_page: '1',
+            articles_count: 5,
+          },
+        },
+      });
+      await actions.index(
+        { commit },
+        { pageNumber: 1, portalSlug: 'test', locale: 'en' }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isFetching: true }],
+        [types.default.CLEAR_ARTICLES],
+        [
+          types.default.ADD_MANY_ARTICLES,
+          [
+            {
+              id: 1,
+              category_id: 1,
+              title: 'Documents are required to complete KYC',
+            },
+          ],
+        ],
+        [
+          types.default.SET_ARTICLES_META,
+          { current_page: '1', articles_count: 5 },
+        ],
+        [types.default.ADD_MANY_ARTICLES_ID, [1]],
+        [types.default.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.index(
+          { commit },
+          { pageNumber: 1, portalSlug: 'test', locale: 'en' }
+        )
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isFetching: true }],
+        [types.default.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: articleList[0] });
+      await actions.create({ commit }, articleList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isCreating: true }],
+        [types.default.ADD_ARTICLE, articleList[0]],
+        [types.default.ADD_ARTICLE_ID, 1],
+        [types.default.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.create({ commit }, articleList[0])).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isCreating: true }],
+        [types.default.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: articleList[0] });
+      await actions.update({ commit }, articleList[0]);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isUpdating: true }, articleId: 1 },
+        ],
+        [types.default.UPDATE_ARTICLE, articleList[0]],
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isUpdating: false }, articleId: 1 },
+        ],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.update({ commit }, articleList[0])).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isUpdating: true }, articleId: 1 },
+        ],
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isUpdating: false }, articleId: 1 },
+        ],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: articleList[0] });
+      await actions.delete({ commit }, articleList[0].id);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isDeleting: true }, articleId: 1 },
+        ],
+        [types.default.REMOVE_ARTICLE, articleList[0].id],
+        [types.default.REMOVE_ARTICLE_ID, articleList[0].id],
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isDeleting: false }, articleId: 1 },
+        ],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, articleList[0].id)
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isDeleting: true }, articleId: 1 },
+        ],
+        [
+          types.default.ADD_ARTICLE_FLAG,
+          { uiFlags: { isDeleting: false }, articleId: 1 },
+        ],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/specs/fixtures.js b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/fixtures.js
new file mode 100644
index 000000000..37de5df56
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/fixtures.js
@@ -0,0 +1,57 @@
+export default {
+  meta: {
+    count: 123,
+    currentPage: 2,
+  },
+  articles: {
+    byId: {
+      1: {
+        id: 1,
+        category_id: 1,
+        title: 'Documents are required to complete KYC',
+        content:
+          'The submission of the following documents is mandatory to complete registration, ID proof - PAN Card, Address proof',
+        description: 'Documents are required to complete KYC',
+        status: 'draft',
+        account_id: 1,
+        views: 122,
+        author: {
+          id: 5,
+          account_id: 1,
+          email: 'tom@furrent.com',
+          available_name: 'Tom',
+          name: 'Tom Jose',
+        },
+      },
+      2: {
+        id: 2,
+        category_id: 1,
+        title:
+          'How do I change my registered email address and/or phone number?',
+        content:
+          'Kindly login to your Furrent account to chat with us or submit a request and we would be glad to help you update the contact details on your account.',
+        description: 'Change my registered email address and/or phone number',
+        status: 'draft',
+        account_id: 1,
+        views: 121,
+        author: {
+          id: 5,
+          account_id: 1,
+          email: 'tom@furrent.com',
+          available_name: 'Tom',
+          name: 'Tom Jose',
+        },
+      },
+    },
+    allIds: [1, 2],
+    uiFlags: {
+      byId: {
+        1: { isFetching: false, isUpdating: true, isDeleting: false },
+      },
+    },
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: true,
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/specs/getters.spec.js b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/getters.spec.js
new file mode 100644
index 000000000..73d703641
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/getters.spec.js
@@ -0,0 +1,40 @@
+import { getters } from '../getters';
+import articles from './fixtures';
+describe('#getters', () => {
+  let state = {};
+  beforeEach(() => {
+    state = articles;
+  });
+  it('uiFlags', () => {
+    expect(getters.uiFlags(state)(1)).toEqual({
+      isFetching: false,
+      isUpdating: true,
+      isDeleting: false,
+    });
+  });
+
+  it('articleById', () => {
+    expect(getters.articleById(state)(1)).toEqual({
+      id: 1,
+      category_id: 1,
+      title: 'Documents are required to complete KYC',
+      content:
+        'The submission of the following documents is mandatory to complete registration, ID proof - PAN Card, Address proof',
+      description: 'Documents are required to complete KYC',
+      status: 'draft',
+      account_id: 1,
+      views: 122,
+      author: {
+        id: 5,
+        account_id: 1,
+        email: 'tom@furrent.com',
+        available_name: 'Tom',
+        name: 'Tom Jose',
+      },
+    });
+  });
+
+  it('isFetchingArticles', () => {
+    expect(getters.isFetching(state)).toEqual(true);
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/specs/mutation.spec.js b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/mutation.spec.js
new file mode 100644
index 000000000..077b35aad
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/specs/mutation.spec.js
@@ -0,0 +1,112 @@
+import { mutations } from '../mutations';
+import article from './fixtures';
+import types from '../../../mutation-types';
+
+describe('#mutations', () => {
+  let state = {};
+  beforeEach(() => {
+    state = article;
+  });
+
+  describe('#SET_UI_FLAG', () => {
+    it('It returns default flags if empty object passed', () => {
+      mutations[types.SET_UI_FLAG](state, {});
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: true,
+      });
+    });
+    it('Update flags when flag passed as parameters', () => {
+      mutations[types.SET_UI_FLAG](state, { isFetching: true });
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: true,
+      });
+    });
+  });
+
+  describe('#ADD_ARTICLE', () => {
+    it('add valid article to state', () => {
+      mutations[types.ADD_ARTICLE](state, {
+        id: 3,
+        category_id: 1,
+        title:
+          'How do I change my registered email address and/or phone number?',
+      });
+      expect(state.articles.byId[3]).toEqual({
+        id: 3,
+        category_id: 1,
+        title:
+          'How do I change my registered email address and/or phone number?',
+      });
+    });
+    it('does not add article with empty data passed', () => {
+      mutations[types.ADD_ARTICLE](state, {});
+      expect(state).toEqual(article);
+    });
+  });
+
+  describe('#ARTICLES_META', () => {
+    it('add meta to state', () => {
+      mutations[types.SET_ARTICLES_META](state, {
+        articles_count: 3,
+        current_page: 1,
+      });
+      expect(state.meta).toEqual({
+        count: 3,
+        currentPage: 1,
+      });
+    });
+  });
+
+  describe('#ADD_ARTICLE_ID', () => {
+    it('add valid article id to state', () => {
+      mutations[types.ADD_ARTICLE_ID](state, 3);
+      expect(state.articles.allIds).toEqual([1, 2, 3]);
+    });
+    it('Does not invalid article with empty data passed', () => {
+      mutations[types.ADD_ARTICLE_ID](state, {});
+      expect(state).toEqual(article);
+    });
+  });
+
+  describe('#UPDATE_ARTICLE', () => {
+    it('does not updates if empty object is passed', () => {
+      mutations[types.UPDATE_ARTICLE](state, {});
+      expect(state).toEqual(article);
+    });
+    it('does not updates if object id is not present ', () => {
+      mutations[types.UPDATE_ARTICLE](state, { id: 5 });
+      expect(state).toEqual(article);
+    });
+    it(' updates if object with id already present in the state', () => {
+      mutations[types.UPDATE_ARTICLE](state, {
+        id: 2,
+        title: 'How do I change my registered email address',
+      });
+      expect(state.articles.byId[2].title).toEqual(
+        'How do I change my registered email address'
+      );
+    });
+  });
+
+  describe('#REMOVE_ARTICLE', () => {
+    it('does not remove object entry if no id is passed', () => {
+      mutations[types.REMOVE_ARTICLE](state, undefined);
+      expect(state).toEqual({ ...article });
+    });
+    it('removes article if valid article id passed', () => {
+      mutations[types.REMOVE_ARTICLE](state, 2);
+      expect(state.articles.byId[2]).toEqual(undefined);
+    });
+  });
+
+  describe('#CLEAR_ARTICLES', () => {
+    it('clears articles', () => {
+      mutations[types.CLEAR_ARTICLES](state);
+      expect(state.articles.allIds).toEqual([]);
+      expect(state.articles.byId).toEqual({});
+      expect(state.articles.uiFlags).toEqual({});
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/actions.js b/app/javascript/dashboard/store/modules/helpCenterCategories/actions.js
new file mode 100644
index 000000000..05d9b04e1
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/actions.js
@@ -0,0 +1,89 @@
+import categoriesAPI from 'dashboard/api/helpCenter/categories.js';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+import types from '../../mutation-types';
+export const actions = {
+  index: async ({ commit }, { portalSlug }) => {
+    try {
+      commit(types.SET_UI_FLAG, { isFetching: true });
+      if (portalSlug) {
+        const {
+          data: { payload },
+        } = await categoriesAPI.get({ portalSlug });
+        const categoryIds = payload.map(category => category.id);
+        commit(types.ADD_MANY_CATEGORIES, payload);
+        commit(types.ADD_MANY_CATEGORIES_ID, categoryIds);
+        return categoryIds;
+      }
+      return '';
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async ({ commit }, { portalSlug, categoryObj }) => {
+    commit(types.SET_UI_FLAG, { isCreating: true });
+    try {
+      const {
+        data: { payload },
+      } = await categoriesAPI.create({ portalSlug, categoryObj });
+      const { id: categoryId } = payload;
+      commit(types.ADD_CATEGORY, payload);
+      commit(types.ADD_CATEGORY_ID, categoryId);
+      return categoryId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async ({ commit }, portalSlug, categoryObj) => {
+    const categoryId = categoryObj.id;
+    commit(types.ADD_CATEGORY_FLAG, {
+      uiFlags: {
+        isUpdating: true,
+      },
+      categoryId,
+    });
+    try {
+      const { data } = await categoriesAPI.update({ portalSlug, categoryObj });
+      commit(types.UPDATE_CATEGORY, data);
+      return categoryId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.ADD_CATEGORY_FLAG, {
+        uiFlags: {
+          isUpdating: false,
+        },
+        categoryId,
+      });
+    }
+  },
+
+  delete: async ({ commit }, portalSlug, categoryId) => {
+    commit(types.ADD_CATEGORY_FLAG, {
+      uiFlags: {
+        isDeleting: true,
+      },
+      categoryId,
+    });
+    try {
+      await categoriesAPI.delete({ portalSlug, categoryId });
+      commit(types.REMOVE_CATEGORY, categoryId);
+      commit(types.REMOVE_CATEGORY_ID, categoryId);
+      return categoryId;
+    } catch (error) {
+      return throwErrorMessage(error);
+    } finally {
+      commit(types.ADD_CATEGORY_FLAG, {
+        uiFlags: {
+          isDeleting: false,
+        },
+        categoryId,
+      });
+    }
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/getters.js b/app/javascript/dashboard/store/modules/helpCenterCategories/getters.js
new file mode 100644
index 000000000..f7745a356
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/getters.js
@@ -0,0 +1,24 @@
+export const getters = {
+  uiFlags: state => helpCenterId => {
+    const uiFlags = state.categories.uiFlags.byId[helpCenterId];
+    if (uiFlags) return uiFlags;
+    return { isFetching: false, isUpdating: false, isDeleting: false };
+  },
+  isFetching: state => state.uiFlags.isFetching,
+  categoryById: (...getterArguments) => categoryId => {
+    const [state] = getterArguments;
+    const category = state.categories.byId[categoryId];
+    if (!category) return undefined;
+    return category;
+  },
+  allCategories: (...getterArguments) => {
+    const [state, _getters] = getterArguments;
+    const categories = state.categories.allIds.map(id => {
+      return _getters.categoryById(id);
+    });
+    return categories;
+  },
+  getMeta: state => {
+    return state.meta;
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/index.js b/app/javascript/dashboard/store/modules/helpCenterCategories/index.js
new file mode 100644
index 000000000..5ed17b661
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/index.js
@@ -0,0 +1,31 @@
+import { getters } from './getters';
+import { actions } from './actions';
+import { mutations } from './mutations';
+
+export const defaultHelpCenterFlags = {
+  isFetching: false,
+  isUpdating: false,
+  isDeleting: false,
+};
+const state = {
+  categories: {
+    byId: {},
+    byLocale: {},
+    allIds: [],
+    uiFlags: {
+      byId: {},
+    },
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: false,
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/mutations.js b/app/javascript/dashboard/store/modules/helpCenterCategories/mutations.js
new file mode 100644
index 000000000..11addb9be
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/mutations.js
@@ -0,0 +1,74 @@
+import types from '../../mutation-types';
+import Vue from 'vue';
+
+export const mutations = {
+  [types.SET_UI_FLAG](_state, uiFlags) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...uiFlags,
+    };
+  },
+
+  [types.ADD_CATEGORY]: ($state, category) => {
+    if (!category.id) return;
+
+    Vue.set($state.categories.byId, category.id, {
+      ...category,
+    });
+  },
+  [types.CLEAR_CATEGORIES]: $state => {
+    Vue.set($state.categories, 'byId', {});
+    Vue.set($state.categories, 'allIds', []);
+    Vue.set($state.categories, 'uiFlags', {});
+  },
+  [types.ADD_MANY_CATEGORIES]($state, categories) {
+    const allCategories = { ...$state.categories.byId };
+    categories.forEach(category => {
+      allCategories[category.id] = category;
+    });
+    Vue.set($state.categories, 'byId', allCategories);
+  },
+  [types.ADD_MANY_CATEGORIES_ID]($state, categoryIds) {
+    $state.categories.allIds.push(...categoryIds);
+  },
+
+  [types.SET_CATEGORIES_META]: ($state, data) => {
+    const { categories_count: count, current_page: currentPage } = data;
+    Vue.set($state.meta, 'count', count);
+    Vue.set($state.meta, 'currentPage', currentPage);
+  },
+
+  [types.ADD_CATEGORY_ID]: ($state, categoryId) => {
+    $state.categories.allIds.push(categoryId);
+  },
+  [types.ADD_CATEGORY_FLAG]: ($state, { categoryId, uiFlags }) => {
+    const flags = $state.categories.uiFlags.byId[categoryId];
+    Vue.set($state.categories.uiFlags.byId, categoryId, {
+      ...{
+        isFetching: false,
+        isUpdating: false,
+        isDeleting: false,
+      },
+      ...flags,
+      ...uiFlags,
+    });
+  },
+  [types.UPDATE_CATEGORY]($state, category) {
+    const categoryId = category.id;
+
+    if (!$state.categories.allIds.includes(categoryId)) return;
+
+    Vue.set($state.categories.byId, categoryId, {
+      ...category,
+    });
+  },
+  [types.REMOVE_CATEGORY]($state, categoryId) {
+    const { [categoryId]: toBeRemoved, ...newById } = $state.categories.byId;
+    Vue.set($state.categories, 'byId', newById);
+  },
+  [types.REMOVE_CATEGORY_ID]($state, categoryId) {
+    $state.categories.allIds = $state.categories.allIds.filter(
+      id => id !== categoryId
+    );
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/specs/actions.spec.js b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/actions.spec.js
new file mode 100644
index 000000000..351147e26
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/actions.spec.js
@@ -0,0 +1,139 @@
+import axios from 'axios';
+import { actions } from '../actions';
+import * as types from '../../../mutation-types';
+import { categoriesPayload } from './fixtures';
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#index', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: categoriesPayload });
+      await actions.index({ commit }, { portalSlug: 'room-rental' });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isFetching: true }],
+        [types.default.ADD_MANY_CATEGORIES, categoriesPayload.payload],
+        [types.default.ADD_MANY_CATEGORIES_ID, [1, 2]],
+        [types.default.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.index({ commit }, { portalSlug: 'room-rental' })
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isFetching: true }],
+        [types.default.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: categoriesPayload });
+      await actions.create({ commit }, categoriesPayload);
+      const { id: categoryId } = categoriesPayload;
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isCreating: true }],
+        [types.default.ADD_CATEGORY, categoriesPayload.payload],
+        [types.default.ADD_CATEGORY_ID, categoryId],
+        [types.default.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.create({ commit }, 'web-docs', categoriesPayload.payload[0])
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_UI_FLAG, { isCreating: true }],
+        [types.default.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: categoriesPayload.payload[0] });
+      await actions.update(
+        { commit },
+        'web-docs',
+        categoriesPayload.payload[0]
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isUpdating: true }, categoryId: 1 },
+        ],
+        [types.default.UPDATE_CATEGORY, categoriesPayload.payload[0]],
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isUpdating: false }, categoryId: 1 },
+        ],
+      ]);
+    });
+
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.update({ commit }, 'web-docs', categoriesPayload.payload[0])
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isUpdating: true }, categoryId: 1 },
+        ],
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isUpdating: false }, categoryId: 1 },
+        ],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: categoriesPayload.payload[0] });
+      await actions.delete(
+        { commit },
+        'portal-slug',
+        categoriesPayload.payload[0].id
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isDeleting: true }, categoryId: 1 },
+        ],
+        [types.default.REMOVE_CATEGORY, categoriesPayload.payload[0].id],
+        [types.default.REMOVE_CATEGORY_ID, categoriesPayload.payload[0].id],
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isDeleting: false }, categoryId: 1 },
+        ],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete(
+          { commit },
+          'portal-slug',
+          categoriesPayload.payload[0].id
+        )
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isDeleting: true }, categoryId: 1 },
+        ],
+        [
+          types.default.ADD_CATEGORY_FLAG,
+          { uiFlags: { isDeleting: false }, categoryId: 1 },
+        ],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/specs/fixtures.js b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/fixtures.js
new file mode 100644
index 000000000..c19d7a615
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/fixtures.js
@@ -0,0 +1,77 @@
+export const categoriesPayload = {
+  payload: [
+    {
+      id: 1,
+      name: 'FAQs',
+      slug: 'faq',
+      locale: 'en',
+      description: 'This category is for FAQs',
+      position: 0,
+      account_id: 1,
+      meta: {
+        articles_count: 1,
+      },
+    },
+    {
+      id: 2,
+      name: 'Product updates',
+      slug: 'product-updates',
+      locale: 'en',
+      description: 'This category is for product updates',
+      position: 0,
+      account_id: 1,
+      meta: {
+        articles_count: 0,
+      },
+    },
+  ],
+  meta: {
+    current_page: 1,
+    categories_count: 2,
+  },
+};
+
+export const categoriesState = {
+  meta: {
+    count: 123,
+    currentPage: 1,
+  },
+  categories: {
+    byId: {
+      1: {
+        id: 1,
+        name: 'FAQs',
+        slug: 'faq',
+        locale: 'en',
+        description: 'This category is for FAQs',
+        position: 0,
+        account_id: 1,
+        meta: {
+          articles_count: 1,
+        },
+      },
+      2: {
+        id: 2,
+        name: 'Product updates',
+        slug: 'product-updates',
+        locale: 'en',
+        description: 'This category is for product updates',
+        position: 0,
+        account_id: 1,
+        meta: {
+          articles_count: 0,
+        },
+      },
+    },
+    allIds: [1, 2],
+    uiFlags: {
+      byId: {
+        1: { isFetching: false, isUpdating: true, isDeleting: false },
+      },
+    },
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: true,
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/specs/getters.spec.js b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/getters.spec.js
new file mode 100644
index 000000000..9890d6cc6
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/getters.spec.js
@@ -0,0 +1,25 @@
+import { getters } from '../getters';
+import { categoriesState } from './fixtures';
+describe('#getters', () => {
+  let state = {};
+  beforeEach(() => {
+    state = categoriesState;
+  });
+  it('uiFlags', () => {
+    expect(getters.uiFlags(state)(1)).toEqual({
+      isFetching: false,
+      isUpdating: true,
+      isDeleting: false,
+    });
+  });
+
+  it('categoryById', () => {
+    expect(getters.categoryById(state)(1)).toEqual(
+      categoriesState.categories.byId[1]
+    );
+  });
+
+  it('isFetchingCategories', () => {
+    expect(getters.isFetching(state)).toEqual(true);
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterCategories/specs/mutations.spec.js b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/mutations.spec.js
new file mode 100644
index 000000000..d7ea4623e
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterCategories/specs/mutations.spec.js
@@ -0,0 +1,101 @@
+import { mutations } from '../mutations';
+import types from '../../../mutation-types';
+import { categoriesState, categoriesPayload } from './fixtures';
+describe('#mutations', () => {
+  let state = {};
+  beforeEach(() => {
+    state = categoriesState;
+  });
+
+  describe('#SET_UI_FLAG', () => {
+    it('It returns default flags if empty object passed', () => {
+      mutations[types.SET_UI_FLAG](state, {});
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: true,
+      });
+    });
+    it('Update flags when flag passed as parameters', () => {
+      mutations[types.SET_UI_FLAG](state, { isFetching: true });
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: true,
+      });
+    });
+  });
+
+  describe('#ADD_CATEGORY', () => {
+    it('add valid category to state', () => {
+      mutations[types.ADD_CATEGORY](state, categoriesPayload.payload[0]);
+      expect(state.categories.byId[1]).toEqual(categoriesPayload.payload[0]);
+    });
+    it('does not add category with empty data passed', () => {
+      mutations[types.ADD_CATEGORY](state, {});
+      expect(state).toEqual(categoriesState);
+    });
+  });
+
+  describe('#CATEGORIES_META', () => {
+    it('add meta to state', () => {
+      mutations[types.SET_CATEGORIES_META](state, {
+        categories_count: 3,
+        current_page: 1,
+      });
+      expect(state.meta).toEqual({
+        count: 3,
+        currentPage: 1,
+      });
+    });
+  });
+
+  describe('#ADD_CATEGORY_ID', () => {
+    it('add valid category id to state', () => {
+      mutations[types.ADD_CATEGORY_ID](state, 3);
+      expect(state.categories.allIds).toEqual([1, 2, 3]);
+    });
+    it('Does not invalid category with empty data passed', () => {
+      mutations[types.ADD_CATEGORY_ID](state, {});
+      expect(state).toEqual(categoriesState);
+    });
+  });
+
+  describe('#UPDATE_CATEGORY', () => {
+    it('does not updates if empty object is passed', () => {
+      mutations[types.UPDATE_CATEGORY](state, {});
+      expect(state).toEqual(categoriesState);
+    });
+    it('does not updates if object id is not present ', () => {
+      mutations[types.UPDATE_CATEGORY](state, { id: 5 });
+      expect(state).toEqual(categoriesState);
+    });
+    it(' updates if object with id already present in the state', () => {
+      mutations[types.UPDATE_CATEGORY](state, {
+        id: 2,
+        title: 'This category is for product updates',
+      });
+      expect(state.categories.byId[2].title).toEqual(
+        'This category is for product updates'
+      );
+    });
+  });
+
+  describe('#REMOVE_CATEGORY', () => {
+    it('does not remove object entry if no id is passed', () => {
+      mutations[types.REMOVE_CATEGORY](state, undefined);
+      expect(state).toEqual({ ...categoriesState });
+    });
+    it('removes category if valid category id passed', () => {
+      mutations[types.REMOVE_CATEGORY](state, 2);
+      expect(state.categories.byId[2]).toEqual(undefined);
+    });
+  });
+
+  // describe('#CLEAR_CATEGORIES', () => {
+  //   it('clears categories', () => {
+  //     mutations[types.CLEAR_CATEGORIES](state);
+  //     expect(state.categories.allIds).toEqual([]);
+  //     expect(state.categories.byId).toEqual({});
+  //     expect(state.categories.uiFlags).toEqual({});
+  //   });
+  // });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js b/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js
new file mode 100644
index 000000000..5afdead83
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js
@@ -0,0 +1,91 @@
+import PortalAPI from 'dashboard/api/helpCenter/portals.js';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+import { types } from './mutations';
+const portalAPIs = new PortalAPI();
+export const actions = {
+  index: async ({ commit, state, dispatch }) => {
+    try {
+      commit(types.SET_UI_FLAG, { isFetching: true });
+      const {
+        data: { payload, meta },
+      } = await portalAPIs.get();
+      commit(types.CLEAR_PORTALS);
+      const portalIds = payload.map(portal => portal.id);
+      commit(types.ADD_MANY_PORTALS_ENTRY, payload);
+      commit(types.ADD_MANY_PORTALS_IDS, portalIds);
+      const { selectedPortalId } = state;
+      // Check if selected portal is still in the portals list
+      if (!portalIds.includes(selectedPortalId)) {
+        dispatch('setPortalId', portalIds[0]);
+      }
+      commit(types.SET_PORTALS_META, meta);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async ({ commit, state, dispatch }, params) => {
+    commit(types.SET_UI_FLAG, { isCreating: true });
+    try {
+      const { data } = await portalAPIs.create(params);
+      const { id: portalId } = data;
+      commit(types.ADD_PORTAL_ENTRY, data);
+      commit(types.ADD_PORTAL_ID, portalId);
+      const {
+        portals: { selectedPortalId },
+      } = state;
+      // Check if there are any selected portal
+      if (!selectedPortalId) {
+        dispatch('setPortalId', portalId);
+      }
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async ({ commit }, params) => {
+    const portalId = params.id;
+    commit(types.SET_HELP_PORTAL_UI_FLAG, {
+      uiFlags: { isUpdating: true },
+      portalId,
+    });
+    try {
+      const { data } = await portalAPIs.update(params);
+      commit(types.UPDATE_PORTAL_ENTRY, data);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_HELP_PORTAL_UI_FLAG, {
+        uiFlags: { isUpdating: false },
+        portalId,
+      });
+    }
+  },
+
+  delete: async ({ commit }, portalId) => {
+    commit(types.SET_HELP_PORTAL_UI_FLAG, {
+      uiFlags: { isDeleting: true },
+      portalId,
+    });
+    try {
+      await portalAPIs.delete(portalId);
+      commit(types.REMOVE_PORTAL_ENTRY, portalId);
+      commit(types.REMOVE_PORTAL_ID, portalId);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_HELP_PORTAL_UI_FLAG, {
+        uiFlags: { isDeleting: false },
+        portalId,
+      });
+    }
+  },
+
+  setPortalId: async ({ commit }, portalId) => {
+    commit(types.SET_SELECTED_PORTAL_ID, portalId);
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/getters.js b/app/javascript/dashboard/store/modules/helpCenterPortals/getters.js
new file mode 100644
index 000000000..201308714
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/getters.js
@@ -0,0 +1,33 @@
+export const getters = {
+  uiFlagsIn: state => portalId => {
+    const uiFlags = state.portals.uiFlags.byId[portalId];
+    if (uiFlags) return uiFlags;
+    return { isFetching: false, isUpdating: false, isDeleting: false };
+  },
+
+  isFetchingPortals: state => state.uiFlags.isFetching,
+  portalById: (...getterArguments) => portalId => {
+    const [state] = getterArguments;
+    const portal = state.portals.byId[portalId];
+
+    return {
+      ...portal,
+    };
+  },
+  allPortals: (...getterArguments) => {
+    const [state, _getters] = getterArguments;
+    const portals = state.portals.allIds.map(id => {
+      return _getters.portalById(id);
+    });
+    return portals;
+  },
+  count: state => state.portals.allIds.length || 0,
+  getMeta: state => {
+    return state.meta;
+  },
+  getSelectedPortal: (...getterArguments) => {
+    const [state, _getters] = getterArguments;
+    const { selectedPortalId } = state.portals;
+    return _getters.portalById(selectedPortalId);
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/index.js b/app/javascript/dashboard/store/modules/helpCenterPortals/index.js
new file mode 100755
index 000000000..59a971443
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/index.js
@@ -0,0 +1,42 @@
+import { getters } from './getters';
+import { actions } from './actions';
+import { mutations } from './mutations';
+
+export const defaultPortalFlags = {
+  isFetching: false,
+  isUpdating: false,
+  isDeleting: false,
+};
+
+const state = {
+  meta: {
+    count: 0,
+    currentPage: 1,
+  },
+
+  portals: {
+    byId: {},
+    allIds: [],
+    uiFlags: {
+      byId: {
+        // 1: { isFetching: false, isUpdating: false, isDeleting: false },
+      },
+    },
+    meta: {
+      byId: {},
+    },
+    selectedPortalId: null,
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: false,
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/mutations.js b/app/javascript/dashboard/store/modules/helpCenterPortals/mutations.js
new file mode 100644
index 000000000..710d84828
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/mutations.js
@@ -0,0 +1,93 @@
+import Vue from 'vue';
+import { defaultPortalFlags } from './index';
+
+export const types = {
+  SET_UI_FLAG: 'setUIFlag',
+  ADD_PORTAL_ENTRY: 'addPortalEntry',
+  SET_PORTALS_META: 'setPortalsMeta',
+  ADD_MANY_PORTALS_ENTRY: 'addManyPortalsEntry',
+  ADD_PORTAL_ID: 'addPortalId',
+  CLEAR_PORTALS: 'clearPortals',
+  ADD_MANY_PORTALS_IDS: 'addManyPortalsIds',
+  SET_SELECTED_PORTAL_ID: 'setSelectedPortalId',
+  UPDATE_PORTAL_ENTRY: 'updatePortalEntry',
+  REMOVE_PORTAL_ENTRY: 'removePortalEntry',
+  REMOVE_PORTAL_ID: 'removePortalId',
+  SET_HELP_PORTAL_UI_FLAG: 'setHelpCenterUIFlag',
+};
+
+export const mutations = {
+  [types.SET_UI_FLAG]($state, uiFlags) {
+    $state.uiFlags = {
+      ...$state.uiFlags,
+      ...uiFlags,
+    };
+  },
+
+  [types.ADD_PORTAL_ENTRY]($state, portal) {
+    Vue.set($state.portals.byId, portal.id, {
+      ...portal,
+    });
+  },
+
+  [types.ADD_MANY_PORTALS_ENTRY]($state, portals) {
+    const allPortals = { ...$state.portals.byId };
+    portals.forEach(portal => {
+      allPortals[portal.id] = portal;
+    });
+    Vue.set($state.portals, 'byId', allPortals);
+  },
+
+  [types.CLEAR_PORTALS]: $state => {
+    Vue.set($state.portals, 'byId', {});
+    Vue.set($state.portals, 'allIds', []);
+    Vue.set($state.portals, 'uiFlags', {});
+  },
+
+  [types.SET_PORTALS_META]: ($state, data) => {
+    const { portals_count: count, current_page: currentPage } = data;
+    Vue.set($state.meta, 'count', count);
+    Vue.set($state.meta, 'currentPage', currentPage);
+  },
+
+  [types.SET_SELECTED_PORTAL_ID]: ($state, portalId) => {
+    Vue.set($state.portals, 'selectedPortalId', portalId);
+  },
+
+  [types.ADD_PORTAL_ID]($state, portalId) {
+    $state.portals.allIds.push(portalId);
+  },
+
+  [types.ADD_MANY_PORTALS_IDS]($state, portalIds) {
+    $state.portals.allIds.push(...portalIds);
+  },
+
+  [types.UPDATE_PORTAL_ENTRY]($state, portal) {
+    const portalId = portal.id;
+    if (!$state.portals.allIds.includes(portalId)) return;
+
+    Vue.set($state.portals.byId, portalId, {
+      ...portal,
+    });
+  },
+
+  [types.REMOVE_PORTAL_ENTRY]($state, portalId) {
+    if (!portalId) return;
+
+    const { [portalId]: toBeRemoved, ...newById } = $state.portals.byId;
+    Vue.set($state.portals, 'byId', newById);
+  },
+
+  [types.REMOVE_PORTAL_ID]($state, portalId) {
+    $state.portals.allIds = $state.portals.allIds.filter(id => id !== portalId);
+  },
+
+  [types.SET_HELP_PORTAL_UI_FLAG]($state, { portalId, uiFlags }) {
+    const flags = $state.portals.uiFlags.byId[portalId];
+    Vue.set($state.portals.uiFlags.byId, portalId, {
+      ...defaultPortalFlags,
+      ...flags,
+      ...uiFlags,
+    });
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/specs/actions.spec.js b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/actions.spec.js
new file mode 100644
index 000000000..c78a2a97c
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/actions.spec.js
@@ -0,0 +1,148 @@
+import axios from 'axios';
+import { actions } from '../actions';
+import { types } from '../mutations';
+import { apiResponse } from './fixtures';
+
+const commit = jest.fn();
+const dispatch = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#index', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: apiResponse });
+      await actions.index({
+        commit,
+        dispatch,
+        state: {
+          selectedPortalId: 4,
+        },
+      });
+      expect(dispatch.mock.calls).toMatchObject([['setPortalId', 1]]);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_UI_FLAG, { isFetching: true }],
+        [types.CLEAR_PORTALS],
+        [types.ADD_MANY_PORTALS_ENTRY, apiResponse.payload],
+        [types.ADD_MANY_PORTALS_IDS, [1, 2]],
+        [types.SET_PORTALS_META, { current_page: 1, portals_count: 1 }],
+        [types.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.index({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_UI_FLAG, { isFetching: true }],
+        [types.SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: apiResponse.payload[1] });
+      await actions.create(
+        { commit, dispatch, state: { portals: { selectedPortalId: null } } },
+        {
+          color: 'red',
+          custom_domain: 'domain_for_help',
+          header_text: 'Domain Header',
+        }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.SET_UI_FLAG, { isCreating: true }],
+        [types.ADD_PORTAL_ENTRY, apiResponse.payload[1]],
+        [types.ADD_PORTAL_ID, 2],
+        [types.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.create(
+          { commit, dispatch, state: { portals: { selectedPortalId: null } } },
+          {}
+        )
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_UI_FLAG, { isCreating: true }],
+        [types.SET_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: apiResponse.payload[1] });
+      await actions.update({ commit }, apiResponse.payload[1]);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isUpdating: true }, portalId: 2 },
+        ],
+        [types.UPDATE_PORTAL_ENTRY, apiResponse.payload[1]],
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isUpdating: false }, portalId: 2 },
+        ],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.update({ commit }, apiResponse.payload[1])
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isUpdating: true }, portalId: 2 },
+        ],
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isUpdating: false }, portalId: 2 },
+        ],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({});
+      await actions.delete({ commit }, 2);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isDeleting: true }, portalId: 2 },
+        ],
+        [types.REMOVE_PORTAL_ENTRY, 2],
+        [types.REMOVE_PORTAL_ID, 2],
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isDeleting: false }, portalId: 2 },
+        ],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.delete({ commit }, 2)).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isDeleting: true }, portalId: 2 },
+        ],
+        [
+          types.SET_HELP_PORTAL_UI_FLAG,
+          { uiFlags: { isDeleting: false }, portalId: 2 },
+        ],
+      ]);
+    });
+  });
+  describe('#setPortalId', () => {
+    it('sends correct actions', async () => {
+      axios.delete.mockResolvedValue({});
+      await actions.setPortalId({ commit }, 1);
+      expect(commit.mock.calls).toEqual([[types.SET_SELECTED_PORTAL_ID, 1]]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/specs/fixtures.js b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/fixtures.js
new file mode 100644
index 000000000..1ed5ed47f
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/fixtures.js
@@ -0,0 +1,86 @@
+export default {
+  meta: {
+    count: 0,
+    currentPage: 1,
+  },
+  portals: {
+    byId: {
+      1: {
+        id: 1,
+        color: 'red',
+        custom_domain: 'domain_for_help',
+        header_text: 'Domain Header',
+        homepage_link: 'help-center',
+        name: 'help name',
+        page_title: 'page title',
+        slug: 'domain',
+        archived: false,
+        config: {
+          allowed_locales: ['en'],
+        },
+      },
+      2: {
+        id: 2,
+        color: 'green',
+        custom_domain: 'campaign_for_help',
+        header_text: 'Campaign Header',
+        homepage_link: 'help-center',
+        name: 'help name',
+        page_title: 'campaign title',
+        slug: 'campaign',
+        archived: false,
+        config: {
+          allowed_locales: ['en'],
+        },
+      },
+    },
+    allIds: [1, 2],
+    uiFlags: {
+      byId: {
+        1: { isFetching: false, isUpdating: true, isDeleting: false },
+      },
+    },
+    selectedPortalId: 1,
+  },
+  uiFlags: {
+    allFetched: false,
+    isFetching: true,
+  },
+};
+
+export const apiResponse = {
+  payload: [
+    {
+      id: 1,
+      color: 'red',
+      custom_domain: 'domain_for_help',
+      header_text: 'Domain Header',
+      homepage_link: 'help-center',
+      name: 'help name',
+      page_title: 'page title',
+      slug: 'domain',
+      archived: false,
+      config: {
+        allowed_locales: ['en'],
+      },
+    },
+    {
+      id: 2,
+      color: 'green',
+      custom_domain: 'campaign_for_help',
+      header_text: 'Campaign Header',
+      homepage_link: 'help-center',
+      name: 'help name',
+      page_title: 'campaign title',
+      slug: 'campaign',
+      archived: false,
+      config: {
+        allowed_locales: ['en'],
+      },
+    },
+  ],
+  meta: {
+    current_page: 1,
+    portals_count: 1,
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/specs/getters.spec.js b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/getters.spec.js
new file mode 100644
index 000000000..c7475812a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/getters.spec.js
@@ -0,0 +1,50 @@
+import { getters } from '../getters';
+import portal from './fixtures';
+
+describe('#getters', () => {
+  it('getUIFlagsIn', () => {
+    const state = portal;
+    expect(getters.uiFlagsIn(state)(1)).toEqual({
+      isFetching: false,
+      isUpdating: true,
+      isDeleting: false,
+    });
+  });
+
+  it('isFetchingPortals', () => {
+    const state = portal;
+    expect(getters.isFetchingPortals(state)).toEqual(true);
+  });
+
+  it('portalById', () => {
+    const state = portal;
+    expect(getters.portalById(state)(1)).toEqual({
+      id: 1,
+      color: 'red',
+      custom_domain: 'domain_for_help',
+      header_text: 'Domain Header',
+      homepage_link: 'help-center',
+      name: 'help name',
+      page_title: 'page title',
+      slug: 'domain',
+      archived: false,
+      config: {
+        allowed_locales: ['en'],
+      },
+    });
+  });
+
+  it('allPortals', () => {
+    const state = portal;
+    expect(getters.allPortals(state, getters).length).toEqual(2);
+  });
+  it('count', () => {
+    const state = portal;
+    expect(getters.count(state)).toEqual(2);
+  });
+
+  it('getMeta', () => {
+    const state = portal;
+    expect(getters.getMeta(state)).toEqual({ count: 0, currentPage: 1 });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/specs/mutations.spec.js b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/mutations.spec.js
new file mode 100644
index 000000000..fe7a97ea8
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/specs/mutations.spec.js
@@ -0,0 +1,124 @@
+import { mutations, types } from '../mutations';
+import portal from './fixtures';
+
+describe('#mutations', () => {
+  let state = {};
+  beforeEach(() => {
+    state = { ...portal };
+  });
+
+  describe('#SET_UI_FLAG', () => {
+    it('It returns default flags if empty object passed', () => {
+      mutations[types.SET_UI_FLAG](state, {});
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: true,
+      });
+    });
+
+    it('It updates keys when passed as parameters', () => {
+      mutations[types.SET_UI_FLAG](state, { isFetching: false });
+      expect(state.uiFlags).toEqual({
+        allFetched: false,
+        isFetching: false,
+      });
+    });
+  });
+
+  describe('[types.ADD_PORTAL_ENTRY]', () => {
+    it('does not add empty objects to state', () => {
+      mutations[types.ADD_PORTAL_ENTRY](state, {});
+      expect(state).toEqual(portal);
+    });
+    it('does adds helpcenter object to state', () => {
+      mutations[types.ADD_PORTAL_ENTRY](state, { id: 3 });
+      expect(state.portals.byId[3]).toEqual({ id: 3 });
+    });
+  });
+
+  describe('[types.ADD_PORTAL_ID]', () => {
+    it('adds helpcenter id to state', () => {
+      mutations[types.ADD_PORTAL_ID](state, 12);
+      expect(state.portals.allIds).toEqual([1, 2, 12]);
+    });
+  });
+
+  describe('[types.UPDATE_PORTAL_ENTRY]', () => {
+    it('does not updates if empty object is passed', () => {
+      mutations[types.UPDATE_PORTAL_ENTRY](state, {});
+      expect(state).toEqual(portal);
+    });
+    it('does not updates if object id is not present ', () => {
+      mutations[types.UPDATE_PORTAL_ENTRY](state, { id: 5 });
+      expect(state).toEqual(portal);
+    });
+    it(' updates if object with id already present in the state', () => {
+      mutations[types.UPDATE_PORTAL_ENTRY](state, {
+        id: 2,
+        name: 'Updated name',
+      });
+      expect(state.portals.byId[2].name).toEqual('Updated name');
+    });
+  });
+
+  describe('[types.REMOVE_PORTAL_ENTRY]', () => {
+    it('does not remove object entry if no id is passed', () => {
+      mutations[types.REMOVE_PORTAL_ENTRY](state, undefined);
+      expect(state).toEqual({ ...portal });
+    });
+    it('removes object entry with to conversation if outgoing', () => {
+      mutations[types.REMOVE_PORTAL_ENTRY](state, 2);
+      expect(state.portals.byId[2]).toEqual(undefined);
+    });
+  });
+
+  describe('[types.REMOVE_PORTAL_ID]', () => {
+    it('removes id from state', () => {
+      mutations[types.REMOVE_PORTAL_ID](state, 2);
+      expect(state.portals.allIds).toEqual([1, 12]);
+    });
+  });
+
+  describe('[types.SET_HELP_PORTAL_UI_FLAG]', () => {
+    it('sets correct flag in state', () => {
+      mutations[types.SET_HELP_PORTAL_UI_FLAG](state, {
+        portalId: 1,
+        uiFlags: { isFetching: true },
+      });
+      expect(state.portals.uiFlags.byId[1]).toEqual({
+        isFetching: true,
+        isUpdating: true,
+        isDeleting: false,
+      });
+    });
+  });
+
+  describe('#CLEAR_PORTALS', () => {
+    it('clears portals', () => {
+      mutations[types.CLEAR_PORTALS](state);
+      expect(state.portals.allIds).toEqual([]);
+      expect(state.portals.byId).toEqual({});
+      expect(state.portals.uiFlags).toEqual({});
+    });
+  });
+
+  describe('#SET_PORTALS_META', () => {
+    it('add meta to state', () => {
+      mutations[types.SET_PORTALS_META](state, {
+        portals_count: 10,
+        current_page: 1,
+      });
+      expect(state.meta).toEqual({
+        count: 10,
+        currentPage: 1,
+      });
+    });
+  });
+
+  describe('#SET_SELECTED_PORTAL_ID', () => {
+    it('set selected portal id', () => {
+      mutations[types.SET_SELECTED_PORTAL_ID](state, 4);
+      expect(state.portals.selectedPortalId).toEqual(4);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 7821e6c36..8d97f088a 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -5,7 +5,7 @@ import InboxesAPI from '../../api/inboxes';
 import WebChannel from '../../api/channel/webChannel';
 import FBChannel from '../../api/channel/fbChannel';
 import TwilioChannel from '../../api/channel/twilioChannel';
-import { parseAPIErrorResponse } from '../utils/api';
+import { throwErrorMessage } from '../utils/api';
 
 const buildInboxData = inboxParams => {
   const formData = new FormData();
@@ -43,11 +43,6 @@ export const state = {
   },
 };
 
-const throwErrorMessage = error => {
-  const errorMessage = parseAPIErrorResponse(error);
-  throw new Error(errorMessage);
-};
-
 export const getters = {
   getInboxes($state) {
     return $state.records;
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 0404d1aca..b6c72c19b 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -1,10 +1,6 @@
 /* eslint no-console: 0 */
-/* eslint no-param-reassign: 0 */
-/* eslint no-shadow: 0 */
 import * as types from '../mutation-types';
 import Report from '../../api/reports';
-import Vue from 'vue';
-
 import { downloadCsvFile } from '../../helper/downloadHelper';
 
 const state = {
@@ -116,9 +112,6 @@ export const actions = {
         commit(types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING, false);
       });
   },
-  updateReportAgentStatus({ commit }, data) {
-    commit(types.default.UPDATE_REPORT_AGENTS_STATUS, data);
-  },
   downloadAgentReports(_, reportObj) {
     return Report.getAgentReports(reportObj)
       .then(response => {
@@ -179,16 +172,6 @@ const mutations = {
   [types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING](_state, flag) {
     _state.overview.uiFlags.isFetchingAgentConversationMetric = flag;
   },
-  [types.default.UPDATE_REPORT_AGENTS_STATUS](_state, data) {
-    _state.overview.agentConversationMetric.forEach((element, index) => {
-      const availabilityStatus = data[element.id];
-      Vue.set(
-        _state.overview.agentConversationMetric[index],
-        'availability',
-        availabilityStatus || 'offline'
-      );
-    });
-  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js b/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
index 5c6310f48..104d75501 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
@@ -96,13 +96,21 @@ describe('#actions', () => {
   });
 
   describe('#updatePresence', () => {
-    it('sends correct actions if API is success', async () => {
+    it('sends correct actions', async () => {
       const data = { users: { 1: 'online' }, contacts: { 2: 'online' } };
       actions.updatePresence({ commit, dispatch }, data);
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_AGENT_UPDATING_STATUS, true],
         [types.default.UPDATE_AGENTS_PRESENCE, data],
-        [types.default.SET_AGENT_UPDATING_STATUS, false],
+      ]);
+    });
+  });
+
+  describe('#updateSingleAgentPresence', () => {
+    it('sends correct actions', async () => {
+      const data = { id: 1, availabilityStatus: 'online' };
+      actions.updateSingleAgentPresence({ commit, dispatch }, data);
+      expect(commit.mock.calls).toEqual([
+        [types.default.UPDATE_SINGLE_AGENT_PRESENCE, data],
       ]);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js b/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
index b40bff351..b03ebb171 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
@@ -129,19 +129,4 @@ describe('#getters', () => {
       offline: 1,
     });
   });
-
-  it('getAgentStatus', () => {
-    const state = {
-      records: [
-        {
-          id: 1,
-          name: 'Agent 1',
-          email: 'agent1@chatwoot.com',
-          confirmed: true,
-          availability_status: 'online',
-        },
-      ],
-    };
-    expect(getters.getAgentsCount(state)).toEqual(1);
-  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
index 5c918582d..ed4bb053f 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
@@ -97,4 +97,44 @@ describe('#mutations', () => {
       ]);
     });
   });
+
+  describe('#UPDATE_SINGLE_AGENT_PRESENCE', () => {
+    it('updates single agent presence', () => {
+      const state = {
+        records: [
+          {
+            id: 1,
+            name: 'Agent1',
+            email: 'agent1@chatwoot.com',
+            availability_status: 'offline',
+          },
+          {
+            id: 2,
+            name: 'Agent1',
+            email: 'agent1@chatwoot.com',
+            availability_status: 'online',
+          },
+        ],
+      };
+
+      mutations[types.default.UPDATE_SINGLE_AGENT_PRESENCE](state, {
+        id: 1,
+        availabilityStatus: 'busy',
+      });
+      expect(state.records).toEqual([
+        {
+          id: 1,
+          name: 'Agent1',
+          email: 'agent1@chatwoot.com',
+          availability_status: 'busy',
+        },
+        {
+          id: 2,
+          name: 'Agent1',
+          email: 'agent1@chatwoot.com',
+          availability_status: 'online',
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
index 3490d0d29..f6211f324 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
@@ -80,7 +80,10 @@ describe('#actions', () => {
         ],
       ]);
       expect(dispatch.mock.calls).toEqual([
-        ['agents/updatePresence', { 1: 'offline' }],
+        [
+          'agents/updateSingleAgentPresence',
+          { availabilityStatus: 'offline', id: 1 },
+        ],
       ]);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index 91cbfa626..d566b1df7 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -327,10 +327,13 @@ describe('#actions', () => {
       axios.post.mockResolvedValue({
         data: { id: 1, name: 'Team' },
       });
-      await actions.setCurrentChatTeam({ commit }, { id: 1, name: 'Team' });
+      await actions.setCurrentChatTeam(
+        { commit },
+        { team: { id: 1, name: 'Team' }, conversationId: 1 }
+      );
       expect(commit).toHaveBeenCalledTimes(1);
       expect(commit.mock.calls).toEqual([
-        ['ASSIGN_TEAM', { id: 1, name: 'Team' }],
+        ['ASSIGN_TEAM', { team: { id: 1, name: 'Team' }, conversationId: 1 }],
       ]);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index 8d4535b21..1cba8e973 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -37,6 +37,19 @@ describe('#mutations', () => {
     });
   });
 
+  describe('#ASSIGN_TEAM', () => {
+    it('clears current chat window', () => {
+      const state = { allConversations: [{ id: 1, meta: {} }] };
+      mutations[types.ASSIGN_TEAM](state, {
+        team: { id: 1, name: 'Team 1' },
+        conversationId: 1,
+      });
+      expect(state.allConversations).toEqual([
+        { id: 1, meta: { team: { id: 1, name: 'Team 1' } } },
+      ]);
+    });
+  });
+
   describe('#SET_CURRENT_CHAT_WINDOW', () => {
     it('set current chat window', () => {
       const state = { selectedChatId: 1 };
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 40a44c066..795032afc 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -70,6 +70,7 @@ export default {
   EDIT_AGENT: 'EDIT_AGENT',
   DELETE_AGENT: 'DELETE_AGENT',
   UPDATE_AGENTS_PRESENCE: 'UPDATE_AGENTS_PRESENCE',
+  UPDATE_SINGLE_AGENT_PRESENCE: 'UPDATE_SINGLE_AGENT_PRESENCE',
 
   // Canned Response
   SET_CANNED_UI_FLAG: 'SET_CANNED_UI_FLAG',
@@ -150,7 +151,6 @@ export default {
   SET_AGENT_CONVERSATION_METRIC: 'SET_AGENT_CONVERSATION_METRIC',
   TOGGLE_AGENT_CONVERSATION_METRIC_LOADING:
     'TOGGLE_AGENT_CONVERSATION_METRIC_LOADING',
-  UPDATE_REPORT_AGENTS_STATUS: 'UPDATE_AGENTS_STATUS',
 
   // Conversation Metadata
   SET_CONVERSATION_METADATA: 'SET_CONVERSATION_METADATA',
@@ -220,4 +220,26 @@ export default {
   CREATE_DASHBOARD_APP: 'CREATE_DASHBOARD_APP',
   EDIT_DASHBOARD_APP: 'EDIT_DASHBOARD_APP',
   DELETE_DASHBOARD_APP: 'DELETE_DASHBOARD_APP',
+
+  // Help center
+  ADD_ARTICLE: 'ADD_ARTICLE',
+  ADD_ARTICLE_ID: 'ADD_ARTICLE_ID',
+  ADD_MANY_ARTICLES: 'ADD_MANY_ARTICLES',
+  ADD_MANY_ARTICLES_ID: 'ADD_MANY_ARTICLES_ID',
+  SET_ARTICLES_META: 'SET_ARTICLES_META',
+  ADD_ARTICLE_FLAG: 'ADD_ARTICLE_FLAG',
+  UPDATE_ARTICLE: 'UPDATE_ARTICLE',
+  CLEAR_ARTICLES: 'CLEAR_ARTICLES',
+  REMOVE_ARTICLE: 'REMOVE_ARTICLE',
+  REMOVE_ARTICLE_ID: 'REMOVE_ARTICLE_ID',
+  SET_UI_FLAG: 'SET_UI_FLAG',
+  // Help Center -- Categories
+  ADD_CATEGORY: 'ADD_CATEGORY',
+  ADD_CATEGORY_ID: 'ADD_CATEGORY_ID',
+  ADD_MANY_CATEGORIES: 'ADD_MANY_CATEGORIES',
+  ADD_MANY_CATEGORIES_ID: 'ADD_MANY_CATEGORIES_ID',
+  ADD_CATEGORY_FLAG: 'ADD_CATEGORY_FLAG',
+  UPDATE_CATEGORY: 'UPDATE_CATEGORY',
+  REMOVE_CATEGORY: 'REMOVE_CATEGORY',
+  REMOVE_CATEGORY_ID: 'REMOVE_CATEGORY_ID',
 };
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 55e43fe2f..292ebca7e 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -55,3 +55,8 @@ export const parseAPIErrorResponse = error => {
   }
   return error;
 };
+
+export const throwErrorMessage = error => {
+  const errorMessage = parseAPIErrorResponse(error);
+  throw new Error(errorMessage);
+};
diff --git a/app/javascript/dashboard/store/utils/specs/api.spec.js b/app/javascript/dashboard/store/utils/specs/api.spec.js
index b076b7be3..62a59dde5 100644
--- a/app/javascript/dashboard/store/utils/specs/api.spec.js
+++ b/app/javascript/dashboard/store/utils/specs/api.spec.js
@@ -2,6 +2,7 @@ import {
   getLoadingStatus,
   parseAPIErrorResponse,
   setLoadingStatus,
+  throwErrorMessage,
 } from '../api';
 
 describe('#getLoadingStatus', () => {
@@ -37,3 +38,14 @@ describe('#parseAPIErrorResponse', () => {
     );
   });
 });
+
+describe('#throwErrorMessage', () => {
+  it('throws correct error', () => {
+    const errorFn = function throwErrorMessageFn() {
+      throwErrorMessage({
+        response: { data: { message: 'Error Message [message]' } },
+      });
+    };
+    expect(errorFn).toThrow('Error Message [message]');
+  });
+});
diff --git a/app/javascript/shared/assets/stylesheets/animations.scss b/app/javascript/shared/assets/stylesheets/animations.scss
new file mode 100644
index 000000000..f0f2758c6
--- /dev/null
+++ b/app/javascript/shared/assets/stylesheets/animations.scss
@@ -0,0 +1,11 @@
+// Taken from thoughtbot/bourbon library timing functions
+
+:root {
+  --ease-in-cubic: cubic-bezier(0.17, 0.67, 0.83, 0.67);
+  --ease-in-sine: cubic-bezier(0.47, 0, 0.745, 0.715);
+
+  --ease-out-cubic: cubic-bezier(0.215, 0.61, 0.355, 1);
+  --ease-out-sine: cubic-bezier(0.39, 0.575, 0.565, 1);
+
+  --ease-in-out-quad: cubic-bezier(0.455, 0.03, 0.515, 0.955);
+}
diff --git a/app/javascript/shared/assets/stylesheets/shadows.scss b/app/javascript/shared/assets/stylesheets/shadows.scss
index 6b11a427b..5eebc6f32 100644
--- a/app/javascript/shared/assets/stylesheets/shadows.scss
+++ b/app/javascript/shared/assets/stylesheets/shadows.scss
@@ -13,4 +13,7 @@
         0 0.4rem 1.2rem rgb(0 0 0 / 7%);
     --shadow-bulk-action-container:
         6px 3px 22px 9px rgb(181 181 181 / 25%);
+    --shadow-context-menu: rgb(22 23 24 / 35%) 0px 10px 38px -10px,
+    rgb(22 23 24 / 20%) 0px 10px 20px -15px;
+    --shadow-widget-builder: 0 0px 20px 5px rgb(0 0 0 / 10%);
 }
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index ed818374d..a4066aa71 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -28,6 +28,7 @@
     "M12.375 6.005a4.75 4.75 0 1 0 0 9.5 4.75 4.75 0 0 0 0-9.5Zm-3.5 4.75a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Z",
     "M6.5 2A2.5 2.5 0 0 0 4 4.5v15A2.5 2.5 0 0 0 6.5 22h13.25a.75.75 0 0 0 0-1.5H6.5a1 1 0 0 1-1-1h14.25a.75.75 0 0 0 .75-.75V4.5A2.5 2.5 0 0 0 18 2H6.5ZM19 18H5.5V4.5a1 1 0 0 1 1-1H18a1 1 0 0 1 1 1V18Z"
   ],
+  "book-open-globe-outline": "M3.5 5.75a.25.25 0 0 1 .25-.25H10c.69 0 1.25.56 1.25 1.25v8.959a6.49 6.49 0 0 1 1.5-2.646V6.75c0-.69.56-1.25 1.25-1.25h6.25a.25.25 0 0 1 .25.25v5.982A6.518 6.518 0 0 1 22 12.81V5.75A1.75 1.75 0 0 0 20.25 4H14c-.788 0-1.499.331-2 .863A2.742 2.742 0 0 0 10 4H3.75A1.75 1.75 0 0 0 2 5.75v12.5c0 .966.784 1.75 1.75 1.75H10c.495 0 .96-.13 1.36-.36a6.473 6.473 0 0 1-.343-1.663A1.248 1.248 0 0 1 10 18.5H3.75a.25.25 0 0 1-.25-.25V5.75ZM16.007 17c.04-1.415.248-2.669.553-3.585.171-.513.364-.893.554-1.134.195-.247.329-.281.386-.281.057 0 .192.034.386.281.19.241.383.62.554 1.134.305.916.513 2.17.553 3.585h-2.986Zm-.396-3.9c.108-.323.23-.622.368-.887A5.504 5.504 0 0 0 12.023 17h2.984c.04-1.5.26-2.866.604-3.9Zm3.778 0a6.133 6.133 0 0 0-.368-.887A5.504 5.504 0 0 1 22.978 17h-2.985c-.04-1.5-.26-2.866-.604-3.9Zm.604 4.9h2.985a5.504 5.504 0 0 1-3.957 4.787c.138-.265.26-.564.368-.886.345-1.035.564-2.4.604-3.901Zm-2.107 4.719c-.194.247-.329.281-.386.281-.057 0-.191-.034-.386-.281-.19-.241-.383-.62-.554-1.135-.305-.915-.513-2.17-.553-3.584h2.986c-.04 1.415-.248 2.669-.553 3.584-.171.514-.364.894-.554 1.135ZM12.023 18a5.504 5.504 0 0 0 3.956 4.787 6.133 6.133 0 0 1-.367-.886c-.346-1.035-.565-2.4-.605-3.901h-2.984Z",
   "building-bank-outline": "M13.032 2.325a1.75 1.75 0 0 0-2.064 0L3.547 7.74c-.978.713-.473 2.26.736 2.26H4.5v5.8A2.75 2.75 0 0 0 3 18.25v1.5c0 .413.336.75.75.75h16.5a.75.75 0 0 0 .75-.75v-1.5a2.75 2.75 0 0 0-1.5-2.45V10h.217c1.21 0 1.713-1.547.736-2.26l-7.421-5.416Zm-1.18 1.211a.25.25 0 0 1 .295 0L18.95 8.5H5.05l6.803-4.964ZM18 10v5.5h-2V10h2Zm-3.5 0v5.5h-1.75V10h1.75Zm-3.25 0v5.5H9.5V10h1.75Zm-5.5 7h12.5c.69 0 1.25.56 1.25 1.25V19h-15v-.75c0-.69.56-1.25 1.25-1.25ZM6 15.5V10h2v5.5H6Z",
   "calendar-clock-outline": [
     "M21 6.25A3.25 3.25 0 0 0 17.75 3H6.25A3.25 3.25 0 0 0 3 6.25v11.5A3.25 3.25 0 0 0 6.25 21h5.772a6.471 6.471 0 0 1-.709-1.5H6.25a1.75 1.75 0 0 1-1.75-1.75V8.5h15v2.813a6.471 6.471 0 0 1 1.5.709V6.25ZM6.25 4.5h11.5c.966 0 1.75.784 1.75 1.75V7h-15v-.75c0-.966.784-1.75 1.75-1.75Z",
@@ -63,6 +64,7 @@
     "M10 13.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5z",
     "M4 6h1v6.5A2.5 2.5 0 0 0 7.5 15H14v1a2 2 0 0 1-2 2H5.5A3.5 3.5 0 0 1 2 14.5V8a2 2 0 0 1 2-2z"
   ],
+  "credit-card-person-outline": "M2 7.25A3.25 3.25 0 0 1 5.25 4h13.5A3.25 3.25 0 0 1 22 7.25V10h-.258A3.74 3.74 0 0 0 20.5 7.455V7.25a1.75 1.75 0 0 0-1.75-1.75H5.25A1.75 1.75 0 0 0 3.5 7.25v.25h11.95c-.44.409-.782.922-.987 1.5H3.5v5.75c0 .966.784 1.75 1.75 1.75h6.78c.06.522.217 1.028.458 1.5H5.25A3.25 3.25 0 0 1 2 14.75v-7.5Zm21 8.25a1.5 1.5 0 0 0-1.5-1.5h-7a1.5 1.5 0 0 0-1.5 1.5v.5c0 1.971 1.86 4 5 4 3.14 0 5-2.029 5-4v-.5Zm-2.25-5.25a2.75 2.75 0 1 0-5.5 0 2.75 2.75 0 0 0 5.5 0Z",
   "delete-outline": "M12 1.75a3.25 3.25 0 0 1 3.245 3.066L15.25 5h5.25a.75.75 0 0 1 .102 1.493L20.5 6.5h-.796l-1.28 13.02a2.75 2.75 0 0 1-2.561 2.474l-.176.006H8.313a2.75 2.75 0 0 1-2.714-2.307l-.023-.174L4.295 6.5H3.5a.75.75 0 0 1-.743-.648L2.75 5.75a.75.75 0 0 1 .648-.743L3.5 5h5.25A3.25 3.25 0 0 1 12 1.75Zm6.197 4.75H5.802l1.267 12.872a1.25 1.25 0 0 0 1.117 1.122l.127.006h7.374c.6 0 1.109-.425 1.225-1.002l.02-.126L18.196 6.5ZM13.75 9.25a.75.75 0 0 1 .743.648L14.5 10v7a.75.75 0 0 1-1.493.102L13 17v-7a.75.75 0 0 1 .75-.75Zm-3.5 0a.75.75 0 0 1 .743.648L11 10v7a.75.75 0 0 1-1.493.102L9.5 17v-7a.75.75 0 0 1 .75-.75Zm1.75-6a1.75 1.75 0 0 0-1.744 1.606L10.25 5h3.5A1.75 1.75 0 0 0 12 3.25Z",
   "dismiss-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17Zm3.446 4.897.084.073a.75.75 0 0 1 .073.976l-.073.084L13.061 12l2.47 2.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-2.47 2.47a.75.75 0 0 1-.976.072l-.084-.073a.75.75 0 0 1-.073-.976l.073-.084L10.939 12l-2.47-2.47a.75.75 0 0 1-.072-.976l.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l2.47-2.47a.75.75 0 0 1 .976-.072Z",
   "dismiss-outline": "m4.397 4.554.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l6.47-6.47a.75.75 0 1 1 1.06 1.061L13.061 12l6.47 6.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-6.47 6.47a.75.75 0 0 1-1.06-1.061L10.939 12l-6.47-6.47a.75.75 0 0 1-.072-.976l.073-.084-.073.084Z",
@@ -101,8 +103,11 @@
   "microphone-play-outline": "M8,5.14V19.14L19,12.14L8,5.14Z",
   "number-symbol-outline": "M10.987 2.89a.75.75 0 1 0-1.474-.28L8.494 7.999 3.75 8a.75.75 0 1 0 0 1.5l4.46-.002-.946 5-4.514.002a.75.75 0 0 0 0 1.5l4.23-.002-.967 5.116a.75.75 0 1 0 1.474.278l1.02-5.395 5.474-.002-.968 5.119a.75.75 0 1 0 1.474.278l1.021-5.398 4.742-.002a.75.75 0 1 0 0-1.5l-4.458.002.946-5 4.512-.002a.75.75 0 1 0 0-1.5l-4.229.002.966-5.104a.75.75 0 0 0-1.474-.28l-1.018 5.385-5.474.002.966-5.107Zm-1.25 6.608 5.474-.003-.946 5-5.474.002.946-5Z",
   "open-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .966.783 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75v-4a.75.75 0 0 1 1.5 0v4A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h4a.75.75 0 0 1 0 1.5h-4ZM13 3.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-1.5 0V5.56l-5.22 5.22a.75.75 0 0 1-1.06-1.06l5.22-5.22h-4.69a.75.75 0 0 1-.75-.75Z",
+  "panel-sidebar-outline": "M4.75 4A2.75 2.75 0 0 0 2 6.75v10.5A2.75 2.75 0 0 0 4.75 20h14.5A2.75 2.75 0 0 0 22 17.25V6.75A2.75 2.75 0 0 0 19.25 4H4.75ZM9 18.5v-13h10.25c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H9ZM5.5 3.5h4M5.5 5.5h4M5.5 7.5h4M5.5 9.5h4",
+  "panel-contract-outline": "M14.193 14.751a.75.75 0 0 0 1.059.056l2.5-2.25a.75.75 0 0 0 0-1.114l-2.5-2.25a.75.75 0 0 0-1.004 1.115l1.048.942H11.75a.75.75 0 1 0 0 1.5h3.546l-1.048.942a.75.75 0 0 0-.055 1.06ZM2 6.75A2.75 2.75 0 0 1 4.75 4h14.5A2.75 2.75 0 0 1 22 6.75v10.5A2.75 2.75 0 0 1 19.25 20H4.75A2.75 2.75 0 0 1 2 17.25V6.75ZM9 5.5v13h10.25c.69 0 1.25-.56 1.25-1.25V6.75c0-.69-.56-1.25-1.25-1.25H9Z",
   "pen-outline": "M7.5 2.75a.75.75 0 0 0-1.5 0v3a1.75 1.75 0 0 0 1.543 1.738L6.527 9.993a3.868 3.868 0 0 0 .119 3.143l3.99 7.95c.283.566.803.914 1.364.914s1.08-.348 1.365-.913l3.99-7.951c.481-.96.526-2.137.118-3.143l-1.016-2.505A1.75 1.75 0 0 0 18 5.75v-3a.75.75 0 0 0-1.5 0v3a.25.25 0 0 1-.25.25h-8.5a.25.25 0 0 1-.25-.25v-3Zm7.343 4.75 1.24 3.057c.247.61.217 1.336-.07 1.906l-3.263 6.504v-6.668a1.5 1.5 0 1 0-1.5 0v6.668l-3.264-6.504a2.368 2.368 0 0 1-.069-1.906L9.157 7.5h5.686Z",
   "people-outline": "M4 13.999 13 14a2 2 0 0 1 1.995 1.85L15 16v1.5C14.999 21 11.284 22 8.5 22c-2.722 0-6.335-.956-6.495-4.27L2 17.5v-1.501c0-1.054.816-1.918 1.85-1.995L4 14ZM15.22 14H20c1.054 0 1.918.816 1.994 1.85L22 16v1c-.001 3.062-2.858 4-5 4a7.16 7.16 0 0 1-2.14-.322c.336-.386.607-.827.802-1.327A6.19 6.19 0 0 0 17 19.5l.267-.006c.985-.043 3.086-.363 3.226-2.289L20.5 17v-1a.501.501 0 0 0-.41-.492L20 15.5h-4.051a2.957 2.957 0 0 0-.595-1.34L15.22 14H20h-4.78ZM4 15.499l-.1.01a.51.51 0 0 0-.254.136.506.506 0 0 0-.136.253l-.01.101V17.5c0 1.009.45 1.722 1.417 2.242.826.445 2.003.714 3.266.753l.317.005.317-.005c1.263-.039 2.439-.308 3.266-.753.906-.488 1.359-1.145 1.412-2.057l.005-.186V16a.501.501 0 0 0-.41-.492L13 15.5l-9-.001ZM8.5 3a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm9 2a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm-9-.5c-1.654 0-3 1.346-3 3s1.346 3 3 3 3-1.346 3-3-1.346-3-3-3Zm9 2c-1.103 0-2 .897-2 2s.897 2 2 2 2-.897 2-2-.897-2-2-2Z",
+  "people-team-add-outline": "M17.5 12a5.5 5.5 0 1 1 0 11a5.5 5.5 0 0 1 0-11Zm0 2l-.09.007a.5.5 0 0 0-.402.402L17 14.5V17h-2.502l-.09.008a.5.5 0 0 0-.402.402l-.008.09l.008.09a.5.5 0 0 0 .402.402l.09.008H17v2.503l.008.09a.5.5 0 0 0 .402.402l.09.008l.09-.008a.5.5 0 0 0 .402-.402l.008-.09V18l2.504.001l.09-.008a.5.5 0 0 0 .402-.402l.008-.09l-.008-.09a.5.5 0 0 0-.403-.402l-.09-.008H18v-2.5l-.008-.09a.5.5 0 0 0-.402-.403L17.5 14Zm-3.246-4c.835 0 1.563.454 1.951 1.13a6.44 6.44 0 0 0-1.518.509a.736.736 0 0 0-.433-.139H9.752a.75.75 0 0 0-.75.75v4.249c0 1.41.974 2.594 2.286 2.915a6.42 6.42 0 0 0 .735 1.587l-.02-.001a4.501 4.501 0 0 1-4.501-4.501V12.25A2.25 2.25 0 0 1 9.752 10h4.502Zm-6.848 0a3.243 3.243 0 0 0-.817 1.5H4.25a.75.75 0 0 0-.75.75v2.749a2.501 2.501 0 0 0 3.082 2.433c.085.504.24.985.453 1.432A4.001 4.001 0 0 1 2 14.999V12.25a2.25 2.25 0 0 1 2.096-2.245L4.25 10h3.156Zm12.344 0A2.25 2.25 0 0 1 22 12.25v.56A6.478 6.478 0 0 0 17.5 11l-.245.005A3.21 3.21 0 0 0 16.6 10h3.15ZM18.5 4a2.5 2.5 0 1 1 0 5a2.5 2.5 0 0 1 0-5ZM12 3a3 3 0 1 1 0 6a3 3 0 0 1 0-6ZM5.5 4a2.5 2.5 0 1 1 0 5a2.5 2.5 0 0 1 0-5Zm13 1.5a1 1 0 1 0 0 2a1 1 0 0 0 0-2Zm-6.5-1a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3Zm-6.5 1a1 1 0 1 0 0 2a1 1 0 0 0 0-2Z",
   "people-team-outline": "M14.754 10c.966 0 1.75.784 1.75 1.75v4.749a4.501 4.501 0 0 1-9.002 0V11.75c0-.966.783-1.75 1.75-1.75h5.502Zm0 1.5H9.252a.25.25 0 0 0-.25.25v4.749a3.001 3.001 0 0 0 6.002 0V11.75a.25.25 0 0 0-.25-.25ZM3.75 10h3.381a2.738 2.738 0 0 0-.618 1.5H3.75a.25.25 0 0 0-.25.25v3.249a2.501 2.501 0 0 0 3.082 2.433c.085.504.24.985.453 1.432A4.001 4.001 0 0 1 2 14.999V11.75c0-.966.784-1.75 1.75-1.75Zm13.125 0h3.375c.966 0 1.75.784 1.75 1.75V15a4 4 0 0 1-5.03 3.866c.214-.448.369-.929.455-1.433A2.5 2.5 0 0 0 20.5 15v-3.25a.25.25 0 0 0-.25-.25h-2.757a2.738 2.738 0 0 0-.618-1.5ZM12 3a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm6.5 1a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Zm-13 0a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Zm6.5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm6.5 1a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-13 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z",
   "person-add-outline": "M17.5 12a5.5 5.5 0 1 1 0 11a5.5 5.5 0 0 1 0-11zm-5.477 2a6.47 6.47 0 0 0-.709 1.5H4.253a.749.749 0 0 0-.75.75v.577c0 .535.192 1.053.54 1.46c1.253 1.469 3.22 2.214 5.957 2.214c.597 0 1.157-.035 1.68-.106c.246.495.553.954.912 1.367c-.795.16-1.66.24-2.592.24c-3.146 0-5.532-.906-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.578A2.249 2.249 0 0 1 4.253 14h7.77zm5.477 0l-.09.008a.5.5 0 0 0-.402.402L17 14.5V17h-2.496l-.09.008a.5.5 0 0 0-.402.402l-.008.09l.008.09a.5.5 0 0 0 .402.402l.09.008H17L17 20.5l.008.09a.5.5 0 0 0 .402.402l.09.008l.09-.008a.5.5 0 0 0 .402-.402L18 20.5V18h2.504l.09-.008a.5.5 0 0 0 .402-.402l.008-.09l-.008-.09a.5.5 0 0 0-.402-.402l-.09-.008H18L18 14.5l-.008-.09a.5.5 0 0 0-.402-.402L17.5 14zM10 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10zm0 1.5a3.5 3.5 0 1 0 0 7a3.5 3.5 0 0 0 0-7z",
   "person-assign-outline": "M11.313 15.5a6.471 6.471 0 0 1 .709-1.5h-7.77a2.249 2.249 0 0 0-2.249 2.25v.577c0 .892.319 1.756.899 2.435c1.566 1.834 3.952 2.74 7.098 2.74c.931 0 1.796-.08 2.592-.24a6.51 6.51 0 0 1-.913-1.366c-.524.07-1.083.105-1.68.105c-2.737 0-4.703-.745-5.957-2.213a2.25 2.25 0 0 1-.539-1.461v-.578a.75.75 0 0 1 .75-.749h7.06ZM10 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10Zm0 1.5a3.5 3.5 0 1 0 0 7a3.5 3.5 0 0 0 0-7ZM23 17.5a5.5 5.5 0 1 1-11 0a5.5 5.5 0 0 1 11 0Zm-4.647-2.853a.5.5 0 0 0-.707.707L19.293 17H15a.5.5 0 1 0 0 1h4.293l-1.647 1.647a.5.5 0 0 0 .707.707l2.5-2.5a.497.497 0 0 0 .147-.345V17.5a.498.498 0 0 0-.15-.357l-2.497-2.496Z",
@@ -118,6 +123,7 @@
   "settings-outline": "M12.012 2.25c.734.008 1.465.093 2.182.253a.75.75 0 0 1 .582.649l.17 1.527a1.384 1.384 0 0 0 1.927 1.116l1.401-.615a.75.75 0 0 1 .85.174 9.792 9.792 0 0 1 2.204 3.792.75.75 0 0 1-.271.825l-1.242.916a1.381 1.381 0 0 0 0 2.226l1.243.915a.75.75 0 0 1 .272.826 9.797 9.797 0 0 1-2.204 3.792.75.75 0 0 1-.848.175l-1.407-.617a1.38 1.38 0 0 0-1.926 1.114l-.169 1.526a.75.75 0 0 1-.572.647 9.518 9.518 0 0 1-4.406 0 .75.75 0 0 1-.572-.647l-.168-1.524a1.382 1.382 0 0 0-1.926-1.11l-1.406.616a.75.75 0 0 1-.849-.175 9.798 9.798 0 0 1-2.204-3.796.75.75 0 0 1 .272-.826l1.243-.916a1.38 1.38 0 0 0 0-2.226l-1.243-.914a.75.75 0 0 1-.271-.826 9.793 9.793 0 0 1 2.204-3.792.75.75 0 0 1 .85-.174l1.4.615a1.387 1.387 0 0 0 1.93-1.118l.17-1.526a.75.75 0 0 1 .583-.65c.717-.159 1.45-.243 2.201-.252Zm0 1.5a9.135 9.135 0 0 0-1.354.117l-.109.977A2.886 2.886 0 0 1 6.525 7.17l-.898-.394a8.293 8.293 0 0 0-1.348 2.317l.798.587a2.881 2.881 0 0 1 0 4.643l-.799.588c.32.842.776 1.626 1.348 2.322l.905-.397a2.882 2.882 0 0 1 4.017 2.318l.11.984c.889.15 1.798.15 2.687 0l.11-.984a2.881 2.881 0 0 1 4.018-2.322l.905.396a8.296 8.296 0 0 0 1.347-2.318l-.798-.588a2.881 2.881 0 0 1 0-4.643l.796-.587a8.293 8.293 0 0 0-1.348-2.317l-.896.393a2.884 2.884 0 0 1-4.023-2.324l-.11-.976a8.988 8.988 0 0 0-1.333-.117ZM12 8.25a3.75 3.75 0 1 1 0 7.5 3.75 3.75 0 0 1 0-7.5Zm0 1.5a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5Z",
   "share-outline": "M6.747 4h3.464a.75.75 0 0 1 .102 1.493l-.102.007H6.747a2.25 2.25 0 0 0-2.245 2.096l-.005.154v9.5a2.25 2.25 0 0 0 2.096 2.245l.154.005h9.5a2.25 2.25 0 0 0 2.245-2.096l.005-.154v-.498a.75.75 0 0 1 1.494-.101l.006.101v.498a3.75 3.75 0 0 1-3.55 3.745l-.2.005h-9.5a3.75 3.75 0 0 1-3.745-3.55l-.005-.2v-9.5a3.75 3.75 0 0 1 3.55-3.745l.2-.005h3.464-3.464ZM14.5 6.52V3.75a.75.75 0 0 1 1.187-.61l.082.069 5.994 5.75c.28.268.306.7.077.997l-.077.085-5.994 5.752a.75.75 0 0 1-1.262-.434l-.007-.107v-2.725l-.344.03c-2.4.25-4.7 1.33-6.914 3.26-.52.453-1.323.025-1.237-.658.664-5.32 3.446-8.252 8.195-8.62l.3-.02V3.75v2.77ZM16 5.509V7.25a.75.75 0 0 1-.75.75c-3.874 0-6.274 1.676-7.312 5.157l-.079.279.352-.237C10.45 11.737 12.798 11 15.251 11a.75.75 0 0 1 .743.648l.007.102v1.743L20.16 9.5l-4.16-3.991Z",
   "signature-outline": "M14.75 16.5c1.308 0 1.818.582 2.205 1.874l.068.237c.183.658.292.854.513.946.259.106.431.091.703-.048l.147-.083c.053-.031.11-.068.176-.111l.663-.452c.616-.405 1.17-.672 1.843-.84a.75.75 0 0 1 .364 1.454 4.03 4.03 0 0 0-1.146.49l-.298.19-.48.329a5.45 5.45 0 0 1-.583.357c-.643.33-1.27.385-1.96.1-.746-.306-1.046-.78-1.327-1.721l-.156-.542c-.181-.59-.305-.68-.732-.68-.31 0-.63.155-1.069.523l-.184.16-.921.876c-1.408 1.324-2.609 1.966-4.328 1.966-1.686 0-3.144-.254-4.368-.768l2.947-.805c.447.049.921.073 1.421.073 1.183 0 2.032-.415 3.087-1.362l.258-.239.532-.511c.236-.227.414-.39.592-.54.684-.573 1.305-.873 2.033-.873Zm4.28-13.53a3.579 3.579 0 0 1 0 5.06l-.288.289c1.151 1.401 1.11 2.886.039 3.96l-2.001 2.002a.75.75 0 0 1-1.06-1.062l1.999-1.999c.485-.486.54-1.09-.04-1.838l-8.617 8.617a2.25 2.25 0 0 1-1 .58l-5.115 1.394a.75.75 0 0 1-.92-.92l1.394-5.116a2.25 2.25 0 0 1 .58-1L13.97 2.97a3.578 3.578 0 0 1 5.061 0Zm-4 1.06L5.062 14a.75.75 0 0 0-.193.332l-1.05 3.85 3.85-1.05A.75.75 0 0 0 8 16.938l9.969-9.969a2.078 2.078 0 1 0-2.94-2.939Z",
+  "snooze-outline": "M12 3.5c-3.104 0-6 2.432-6 6.25v4.153L4.682 17h14.67l-1.354-3.093V11.75a.75.75 0 0 1 1.5 0v1.843l1.381 3.156a1.25 1.25 0 0 1-1.145 1.751H15a3.002 3.002 0 0 1-6.003 0H4.305a1.25 1.25 0 0 1-1.15-1.739l1.344-3.164V9.75C4.5 5.068 8.103 2 12 2c.86 0 1.705.15 2.5.432a.75.75 0 0 1-.502 1.413A5.964 5.964 0 0 0 12 3.5ZM12 20c.828 0 1.5-.671 1.501-1.5h-3.003c0 .829.673 1.5 1.502 1.5Zm3.25-13h-2.5l-.101.007A.75.75 0 0 0 12.75 8.5h1.043l-1.653 2.314l-.055.09A.75.75 0 0 0 12.75 12h2.5l.102-.007a.75.75 0 0 0-.102-1.493h-1.042l1.653-2.314l.055-.09A.75.75 0 0 0 15.25 7Zm6-5h-3.5l-.101.007A.75.75 0 0 0 17.75 3.5h2.134l-2.766 4.347l-.05.09A.75.75 0 0 0 17.75 9h3.5l.102-.007A.75.75 0 0 0 21.25 7.5h-2.133l2.766-4.347l.05-.09A.75.75 0 0 0 21.25 2Z",
   "sound-source-outline": "M3.5 12a8.5 8.5 0 1 1 14.762 5.748l.992 1.135A9.966 9.966 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12a9.966 9.966 0 0 0 2.746 6.883l.993-1.134A8.47 8.47 0 0 1 3.5 12Z M19.25 12.125a7.098 7.098 0 0 1-1.783 4.715l-.998-1.14a5.625 5.625 0 1 0-8.806-.15l-1.004 1.146a7.125 7.125 0 1 1 12.59-4.571Z M16.25 12a4.23 4.23 0 0 1-.821 2.511l-1.026-1.172a2.75 2.75 0 1 0-4.806 0L8.571 14.51A4.25 4.25 0 1 1 16.25 12Z M12.564 12.756a.75.75 0 0 0-1.128 0l-7 8A.75.75 0 0 0 5 22h14a.75.75 0 0 0 .564-1.244l-7-8Zm4.783 7.744H6.653L12 14.389l5.347 6.111Z",
   "speaker-1-outline": "M14.704 3.442c.191.226.296.512.296.808v15.502a1.25 1.25 0 0 1-2.058.954L7.975 16.5H4.25A2.25 2.25 0 0 1 2 14.25v-4.5A2.25 2.25 0 0 1 4.25 7.5h3.725l4.968-4.204a1.25 1.25 0 0 1 1.761.147ZM13.5 4.79 8.525 9H4.25a.75.75 0 0 0-.75.75v4.5c0 .415.336.75.75.75h4.275l4.975 4.213V4.79Zm3.604 3.851a.75.75 0 0 1 1.03.25c.574.94.862 1.992.862 3.14 0 1.149-.288 2.201-.862 3.141a.75.75 0 1 1-1.28-.781c.428-.702.642-1.483.642-2.36 0-.876-.214-1.657-.642-2.359a.75.75 0 0 1 .25-1.03Z",
   "speaker-mute-outline": "M12.92 3.316c.806-.717 2.08-.145 2.08.934v15.496c0 1.078-1.274 1.65-2.08.934l-4.492-3.994a.75.75 0 0 0-.498-.19H4.25A2.25 2.25 0 0 1 2 14.247V9.75a2.25 2.25 0 0 1 2.25-2.25h3.68a.75.75 0 0 0 .498-.19l4.491-3.993Zm.58 1.49L9.425 8.43A2.25 2.25 0 0 1 7.93 9H4.25a.75.75 0 0 0-.75.75v4.497c0 .415.336.75.75.75h3.68a2.25 2.25 0 0 1 1.495.57l4.075 3.623V4.807ZM16.22 9.22a.75.75 0 0 1 1.06 0L19 10.94l1.72-1.72a.75.75 0 1 1 1.06 1.06L20.06 12l1.72 1.72a.75.75 0 1 1-1.06 1.06L19 13.06l-1.72 1.72a.75.75 0 1 1-1.06-1.06L17.94 12l-1.72-1.72a.75.75 0 0 1 0-1.06Z",
@@ -142,6 +148,10 @@
   "subtract-solid": "M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z",
   "drag-outline": "M15 3.707V8.5a.5.5 0 0 0 1 0V3.707l1.146 1.147a.5.5 0 0 0 .708-.708l-2-2a.499.499 0 0 0-.708 0l-2 2a.5.5 0 0 0 .708.708L15 3.707ZM2 4.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5Zm0 5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5Zm.5 4.5a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1h-6ZM15 16.293V11.5a.5.5 0 0 1 1 0v4.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L15 16.293Z",
   "pane-open-outline": "M14.807 9.249a.75.75 0 0 0-1.059-.056l-2.5 2.25a.75.75 0 0 0 0 1.114l2.5 2.25a.75.75 0 0 0 1.004-1.115l-1.048-.942h3.546a.75.75 0 1 0 0-1.5h-3.546l1.048-.942a.75.75 0 0 0 .055-1.059ZM2 17.251A2.75 2.75 0 0 0 4.75 20h14.5A2.75 2.75 0 0 0 22 17.25V6.75A2.75 2.75 0 0 0 19.25 4H4.75A2.75 2.75 0 0 0 2 6.75v10.5Zm2.75 1.25c-.69 0-1.25-.56-1.25-1.25V6.749c0-.69.56-1.25 1.25-1.25h3.254V18.5H4.75Zm4.754 0V5.5h9.746c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H9.504Z",
+  "table-switch-outline": [
+    "M8.78 1.22a.75.75 0 0 0-1.06 1.06l.72.72H6.25A3.25 3.25 0 0 0 3 6.25v2.19l-.72-.72a.75.75 0 0 0-1.06 1.06l2 2a.748.748 0 0 0 1.06 0l2-2a.747.747 0 0 0 0-1.06.75.75 0 0 0-1.06 0l-.72.72V6.25c0-.966.784-1.75 1.75-1.75h2.19l-.72.72a.75.75 0 0 0 .78 1.237.75.75 0 0 0 .28-.177l2-2a.75.75 0 0 0 0-1.06l-2-2Z",
+    "M11.832 3a1.755 1.755 0 0 1 0 1.5H14v4h-4V6.475l-.513.512a1.742 1.742 0 0 1-.987.495V8.5H7.482c-.052.361-.217.71-.495.987L6.475 10H8.5v4h-4v-2.168a1.755 1.755 0 0 1-1.5 0v5.918A3.25 3.25 0 0 0 6.25 21h11.5A3.25 3.25 0 0 0 21 17.75V6.25A3.25 3.25 0 0 0 17.75 3h-5.918ZM10 14v-4h4v4h-4Zm5.5 0v-4h4v4h-4ZM14 15.5v4h-4v-4h4Zm1.5 4v-4h4v2.25a1.75 1.75 0 0 1-1.75 1.75H15.5Zm0-11v-4h2.25c.966 0 1.75.784 1.75 1.75V8.5h-4Zm-11 7h4v4H6.25a1.75 1.75 0 0 1-1.75-1.75V15.5Z"
+  ],
   "pane-close-outline": "M9.193 9.249a.75.75 0 0 1 1.059-.056l2.5 2.25a.75.75 0 0 1 0 1.114l-2.5 2.25a.75.75 0 0 1-1.004-1.115l1.048-.942H6.75a.75.75 0 1 1 0-1.5h3.546l-1.048-.942a.75.75 0 0 1-.055-1.06ZM22 17.25A2.75 2.75 0 0 1 19.25 20H4.75A2.75 2.75 0 0 1 2 17.25V6.75A2.75 2.75 0 0 1 4.75 4h14.5A2.75 2.75 0 0 1 22 6.75v10.5Zm-2.75 1.25c.69 0 1.25-.56 1.25-1.25V6.749c0-.69-.56-1.25-1.25-1.25h-3.254V18.5h3.254Zm-4.754 0V5.5H4.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h9.746Z",
   "chevron-left-solid": "M15.707 4.293a1 1 0 0 1 0 1.414L9.414 12l6.293 6.293a1 1 0 0 1-1.414 1.414l-7-7a1 1 0 0 1 0-1.414l7-7a1 1 0 0 1 1.414 0Z",
   "chevron-right-solid": "M8.293 4.293a1 1 0 0 0 0 1.414L14.586 12l-6.293 6.293a1 1 0 1 0 1.414 1.414l7-7a1 1 0 0 0 0-1.414l-7-7a1 1 0 0 0-1.414 0Z"
diff --git a/app/javascript/shared/constants/locales.js b/app/javascript/shared/constants/locales.js
new file mode 100644
index 000000000..ec1bb69f6
--- /dev/null
+++ b/app/javascript/shared/constants/locales.js
@@ -0,0 +1,566 @@
+const locales = {
+  af: 'Afrikaans',
+  af_NA: 'Afrikaans (Namibia)',
+  af_ZA: 'Afrikaans (South Africa)',
+  ak: 'Akan',
+  ak_GH: 'Akan (Ghana)',
+  sq: 'Albanian',
+  sq_AL: 'Albanian (Albania)',
+  sq_XK: 'Albanian (Kosovo)',
+  sq_MK: 'Albanian (Macedonia)',
+  am: 'Amharic',
+  am_ET: 'Amharic (Ethiopia)',
+  ar: 'Arabic',
+  ar_DZ: 'Arabic (Algeria)',
+  ar_BH: 'Arabic (Bahrain)',
+  ar_TD: 'Arabic (Chad)',
+  ar_KM: 'Arabic (Comoros)',
+  ar_DJ: 'Arabic (Djibouti)',
+  ar_EG: 'Arabic (Egypt)',
+  ar_ER: 'Arabic (Eritrea)',
+  ar_IQ: 'Arabic (Iraq)',
+  ar_IL: 'Arabic (Israel)',
+  ar_JO: 'Arabic (Jordan)',
+  ar_KW: 'Arabic (Kuwait)',
+  ar_LB: 'Arabic (Lebanon)',
+  ar_LY: 'Arabic (Libya)',
+  ar_MR: 'Arabic (Mauritania)',
+  ar_MA: 'Arabic (Morocco)',
+  ar_OM: 'Arabic (Oman)',
+  ar_PS: 'Arabic (Palestinian Territories)',
+  ar_QA: 'Arabic (Qatar)',
+  ar_SA: 'Arabic (Saudi Arabia)',
+  ar_SO: 'Arabic (Somalia)',
+  ar_SS: 'Arabic (South Sudan)',
+  ar_SD: 'Arabic (Sudan)',
+  ar_SY: 'Arabic (Syria)',
+  ar_TN: 'Arabic (Tunisia)',
+  ar_AE: 'Arabic (United Arab Emirates)',
+  ar_EH: 'Arabic (Western Sahara)',
+  ar_YE: 'Arabic (Yemen)',
+  hy: 'Armenian',
+  hy_AM: 'Armenian (Armenia)',
+  as: 'Assamese',
+  as_IN: 'Assamese (India)',
+  az: 'Azerbaijani',
+  az_AZ: 'Azerbaijani (Azerbaijan)',
+  az_Cyrl_AZ: 'Azerbaijani (Cyrillic, Azerbaijan)',
+  az_Cyrl: 'Azerbaijani (Cyrillic)',
+  az_Latn_AZ: 'Azerbaijani (Latin, Azerbaijan)',
+  az_Latn: 'Azerbaijani (Latin)',
+  bm: 'Bambara',
+  bm_Latn_ML: 'Bambara (Latin, Mali)',
+  bm_Latn: 'Bambara (Latin)',
+  eu: 'Basque',
+  eu_ES: 'Basque (Spain)',
+  be: 'Belarusian',
+  be_BY: 'Belarusian (Belarus)',
+  bn: 'Bengali',
+  bn_BD: 'Bengali (Bangladesh)',
+  bn_IN: 'Bengali (India)',
+  bs: 'Bosnian',
+  bs_BA: 'Bosnian (Bosnia & Herzegovina)',
+  bs_Cyrl_BA: 'Bosnian (Cyrillic, Bosnia & Herzegovina)',
+  bs_Cyrl: 'Bosnian (Cyrillic)',
+  bs_Latn_BA: 'Bosnian (Latin, Bosnia & Herzegovina)',
+  bs_Latn: 'Bosnian (Latin)',
+  br: 'Breton',
+  br_FR: 'Breton (France)',
+  bg: 'Bulgarian',
+  bg_BG: 'Bulgarian (Bulgaria)',
+  my: 'Burmese',
+  my_MM: 'Burmese (Myanmar (Burma))',
+  ca: 'Catalan',
+  ca_AD: 'Catalan (Andorra)',
+  ca_FR: 'Catalan (France)',
+  ca_IT: 'Catalan (Italy)',
+  ca_ES: 'Catalan (Spain)',
+  zh: 'Chinese',
+  zh_CN: 'Chinese (China)',
+  zh_HK: 'Chinese (Hong Kong SAR China)',
+  zh_MO: 'Chinese (Macau SAR China)',
+  zh_Hans_CN: 'Chinese (Simplified, China)',
+  zh_Hans_HK: 'Chinese (Simplified, Hong Kong SAR China)',
+  zh_Hans_MO: 'Chinese (Simplified, Macau SAR China)',
+  zh_Hans_SG: 'Chinese (Simplified, Singapore)',
+  zh_Hans: 'Chinese (Simplified)',
+  zh_SG: 'Chinese (Singapore)',
+  zh_TW: 'Chinese (Taiwan)',
+  zh_Hant_HK: 'Chinese (Traditional, Hong Kong SAR China)',
+  zh_Hant_MO: 'Chinese (Traditional, Macau SAR China)',
+  zh_Hant_TW: 'Chinese (Traditional, Taiwan)',
+  zh_Hant: 'Chinese (Traditional)',
+  kw: 'Cornish',
+  kw_GB: 'Cornish (United Kingdom)',
+  hr: 'Croatian',
+  hr_BA: 'Croatian (Bosnia & Herzegovina)',
+  hr_HR: 'Croatian (Croatia)',
+  cs: 'Czech',
+  cs_CZ: 'Czech (Czech Republic)',
+  da: 'Danish',
+  da_DK: 'Danish (Denmark)',
+  da_GL: 'Danish (Greenland)',
+  nl: 'Dutch',
+  nl_AW: 'Dutch (Aruba)',
+  nl_BE: 'Dutch (Belgium)',
+  nl_BQ: 'Dutch (Caribbean Netherlands)',
+  nl_CW: 'Dutch (Curaçao)',
+  nl_NL: 'Dutch (Netherlands)',
+  nl_SX: 'Dutch (Sint Maarten)',
+  nl_SR: 'Dutch (Suriname)',
+  dz: 'Dzongkha',
+  dz_BT: 'Dzongkha (Bhutan)',
+  en: 'English',
+  en_AS: 'English (American Samoa)',
+  en_AI: 'English (Anguilla)',
+  en_AG: 'English (Antigua & Barbuda)',
+  en_AU: 'English (Australia)',
+  en_BS: 'English (Bahamas)',
+  en_BB: 'English (Barbados)',
+  en_BE: 'English (Belgium)',
+  en_BZ: 'English (Belize)',
+  en_BM: 'English (Bermuda)',
+  en_BW: 'English (Botswana)',
+  en_IO: 'English (British Indian Ocean Territory)',
+  en_VG: 'English (British Virgin Islands)',
+  en_CM: 'English (Cameroon)',
+  en_CA: 'English (Canada)',
+  en_KY: 'English (Cayman Islands)',
+  en_CX: 'English (Christmas Island)',
+  en_CC: 'English (Cocos (Keeling) Islands)',
+  en_CK: 'English (Cook Islands)',
+  en_DG: 'English (Diego Garcia)',
+  en_DM: 'English (Dominica)',
+  en_ER: 'English (Eritrea)',
+  en_FK: 'English (Falkland Islands)',
+  en_FJ: 'English (Fiji)',
+  en_GM: 'English (Gambia)',
+  en_GH: 'English (Ghana)',
+  en_GI: 'English (Gibraltar)',
+  en_GD: 'English (Grenada)',
+  en_GU: 'English (Guam)',
+  en_GG: 'English (Guernsey)',
+  en_GY: 'English (Guyana)',
+  en_HK: 'English (Hong Kong SAR China)',
+  en_IN: 'English (India)',
+  en_IE: 'English (Ireland)',
+  en_IM: 'English (Isle of Man)',
+  en_JM: 'English (Jamaica)',
+  en_JE: 'English (Jersey)',
+  en_KE: 'English (Kenya)',
+  en_KI: 'English (Kiribati)',
+  en_LS: 'English (Lesotho)',
+  en_LR: 'English (Liberia)',
+  en_MO: 'English (Macau SAR China)',
+  en_MG: 'English (Madagascar)',
+  en_MW: 'English (Malawi)',
+  en_MY: 'English (Malaysia)',
+  en_MT: 'English (Malta)',
+  en_MH: 'English (Marshall Islands)',
+  en_MU: 'English (Mauritius)',
+  en_FM: 'English (Micronesia)',
+  en_MS: 'English (Montserrat)',
+  en_NA: 'English (Namibia)',
+  en_NR: 'English (Nauru)',
+  en_NZ: 'English (New Zealand)',
+  en_NG: 'English (Nigeria)',
+  en_NU: 'English (Niue)',
+  en_NF: 'English (Norfolk Island)',
+  en_MP: 'English (Northern Mariana Islands)',
+  en_PK: 'English (Pakistan)',
+  en_PW: 'English (Palau)',
+  en_PG: 'English (Papua New Guinea)',
+  en_PH: 'English (Philippines)',
+  en_PN: 'English (Pitcairn Islands)',
+  en_PR: 'English (Puerto Rico)',
+  en_RW: 'English (Rwanda)',
+  en_WS: 'English (Samoa)',
+  en_SC: 'English (Seychelles)',
+  en_SL: 'English (Sierra Leone)',
+  en_SG: 'English (Singapore)',
+  en_SX: 'English (Sint Maarten)',
+  en_SB: 'English (Solomon Islands)',
+  en_ZA: 'English (South Africa)',
+  en_SS: 'English (South Sudan)',
+  en_SH: 'English (St. Helena)',
+  en_KN: 'English (St. Kitts & Nevis)',
+  en_LC: 'English (St. Lucia)',
+  en_VC: 'English (St. Vincent & Grenadines)',
+  en_SD: 'English (Sudan)',
+  en_SZ: 'English (Swaziland)',
+  en_TZ: 'English (Tanzania)',
+  en_TK: 'English (Tokelau)',
+  en_TO: 'English (Tonga)',
+  en_TT: 'English (Trinidad & Tobago)',
+  en_TC: 'English (Turks & Caicos Islands)',
+  en_TV: 'English (Tuvalu)',
+  en_UM: 'English (U.S. Outlying Islands)',
+  en_VI: 'English (U.S. Virgin Islands)',
+  en_UG: 'English (Uganda)',
+  en_GB: 'English (United Kingdom)',
+  en_US: 'English (United States)',
+  en_VU: 'English (Vanuatu)',
+  en_ZM: 'English (Zambia)',
+  en_ZW: 'English (Zimbabwe)',
+  eo: 'Esperanto',
+  et: 'Estonian',
+  et_EE: 'Estonian (Estonia)',
+  ee: 'Ewe',
+  ee_GH: 'Ewe (Ghana)',
+  ee_TG: 'Ewe (Togo)',
+  fo: 'Faroese',
+  fo_FO: 'Faroese (Faroe Islands)',
+  fi: 'Finnish',
+  fi_FI: 'Finnish (Finland)',
+  fr: 'French',
+  fr_DZ: 'French (Algeria)',
+  fr_BE: 'French (Belgium)',
+  fr_BJ: 'French (Benin)',
+  fr_BF: 'French (Burkina Faso)',
+  fr_BI: 'French (Burundi)',
+  fr_CM: 'French (Cameroon)',
+  fr_CA: 'French (Canada)',
+  fr_CF: 'French (Central African Republic)',
+  fr_TD: 'French (Chad)',
+  fr_KM: 'French (Comoros)',
+  fr_CG: 'French (Congo - Brazzaville)',
+  fr_CD: 'French (Congo - Kinshasa)',
+  fr_CI: 'French (Côte d’Ivoire)',
+  fr_DJ: 'French (Djibouti)',
+  fr_GQ: 'French (Equatorial Guinea)',
+  fr_FR: 'French (France)',
+  fr_GF: 'French (French Guiana)',
+  fr_PF: 'French (French Polynesia)',
+  fr_GA: 'French (Gabon)',
+  fr_GP: 'French (Guadeloupe)',
+  fr_GN: 'French (Guinea)',
+  fr_HT: 'French (Haiti)',
+  fr_LU: 'French (Luxembourg)',
+  fr_MG: 'French (Madagascar)',
+  fr_ML: 'French (Mali)',
+  fr_MQ: 'French (Martinique)',
+  fr_MR: 'French (Mauritania)',
+  fr_MU: 'French (Mauritius)',
+  fr_YT: 'French (Mayotte)',
+  fr_MC: 'French (Monaco)',
+  fr_MA: 'French (Morocco)',
+  fr_NC: 'French (New Caledonia)',
+  fr_NE: 'French (Niger)',
+  fr_RE: 'French (Réunion)',
+  fr_RW: 'French (Rwanda)',
+  fr_SN: 'French (Senegal)',
+  fr_SC: 'French (Seychelles)',
+  fr_BL: 'French (St. Barthélemy)',
+  fr_MF: 'French (St. Martin)',
+  fr_PM: 'French (St. Pierre & Miquelon)',
+  fr_CH: 'French (Switzerland)',
+  fr_SY: 'French (Syria)',
+  fr_TG: 'French (Togo)',
+  fr_TN: 'French (Tunisia)',
+  fr_VU: 'French (Vanuatu)',
+  fr_WF: 'French (Wallis & Futuna)',
+  ff: 'Fulah',
+  ff_CM: 'Fulah (Cameroon)',
+  ff_GN: 'Fulah (Guinea)',
+  ff_MR: 'Fulah (Mauritania)',
+  ff_SN: 'Fulah (Senegal)',
+  gl: 'Galician',
+  gl_ES: 'Galician (Spain)',
+  lg: 'Ganda',
+  lg_UG: 'Ganda (Uganda)',
+  ka: 'Georgian',
+  ka_GE: 'Georgian (Georgia)',
+  de: 'German',
+  de_AT: 'German (Austria)',
+  de_BE: 'German (Belgium)',
+  de_DE: 'German (Germany)',
+  de_LI: 'German (Liechtenstein)',
+  de_LU: 'German (Luxembourg)',
+  de_CH: 'German (Switzerland)',
+  el: 'Greek',
+  el_CY: 'Greek (Cyprus)',
+  el_GR: 'Greek (Greece)',
+  gu: 'Gujarati',
+  gu_IN: 'Gujarati (India)',
+  ha: 'Hausa',
+  ha_GH: 'Hausa (Ghana)',
+  ha_Latn_GH: 'Hausa (Latin, Ghana)',
+  ha_Latn_NE: 'Hausa (Latin, Niger)',
+  ha_Latn_NG: 'Hausa (Latin, Nigeria)',
+  ha_Latn: 'Hausa (Latin)',
+  ha_NE: 'Hausa (Niger)',
+  ha_NG: 'Hausa (Nigeria)',
+  he: 'Hebrew',
+  he_IL: 'Hebrew (Israel)',
+  hi: 'Hindi',
+  hi_IN: 'Hindi (India)',
+  hu: 'Hungarian',
+  hu_HU: 'Hungarian (Hungary)',
+  is: 'Icelandic',
+  is_IS: 'Icelandic (Iceland)',
+  ig: 'Igbo',
+  ig_NG: 'Igbo (Nigeria)',
+  id: 'Indonesian',
+  id_ID: 'Indonesian (Indonesia)',
+  ga: 'Irish',
+  ga_IE: 'Irish (Ireland)',
+  it: 'Italian',
+  it_IT: 'Italian (Italy)',
+  it_SM: 'Italian (San Marino)',
+  it_CH: 'Italian (Switzerland)',
+  ja: 'Japanese',
+  ja_JP: 'Japanese (Japan)',
+  kl: 'Kalaallisut',
+  kl_GL: 'Kalaallisut (Greenland)',
+  kn: 'Kannada',
+  kn_IN: 'Kannada (India)',
+  ks: 'Kashmiri',
+  ks_Arab_IN: 'Kashmiri (Arabic, India)',
+  ks_Arab: 'Kashmiri (Arabic)',
+  ks_IN: 'Kashmiri (India)',
+  kk: 'Kazakh',
+  kk_Cyrl_KZ: 'Kazakh (Cyrillic, Kazakhstan)',
+  kk_Cyrl: 'Kazakh (Cyrillic)',
+  kk_KZ: 'Kazakh (Kazakhstan)',
+  km: 'Khmer',
+  km_KH: 'Khmer (Cambodia)',
+  ki: 'Kikuyu',
+  ki_KE: 'Kikuyu (Kenya)',
+  rw: 'Kinyarwanda',
+  rw_RW: 'Kinyarwanda (Rwanda)',
+  ko: 'Korean',
+  ko_KP: 'Korean (North Korea)',
+  ko_KR: 'Korean (South Korea)',
+  ky: 'Kyrgyz',
+  ky_Cyrl_KG: 'Kyrgyz (Cyrillic, Kyrgyzstan)',
+  ky_Cyrl: 'Kyrgyz (Cyrillic)',
+  ky_KG: 'Kyrgyz (Kyrgyzstan)',
+  lo: 'Lao',
+  lo_LA: 'Lao (Laos)',
+  lv: 'Latvian',
+  lv_LV: 'Latvian (Latvia)',
+  ln: 'Lingala',
+  ln_AO: 'Lingala (Angola)',
+  ln_CF: 'Lingala (Central African Republic)',
+  ln_CG: 'Lingala (Congo - Brazzaville)',
+  ln_CD: 'Lingala (Congo - Kinshasa)',
+  lt: 'Lithuanian',
+  lt_LT: 'Lithuanian (Lithuania)',
+  lu: 'Luba-Katanga',
+  lu_CD: 'Luba-Katanga (Congo - Kinshasa)',
+  lb: 'Luxembourgish',
+  lb_LU: 'Luxembourgish (Luxembourg)',
+  mk: 'Macedonian',
+  mk_MK: 'Macedonian (Macedonia)',
+  mg: 'Malagasy',
+  mg_MG: 'Malagasy (Madagascar)',
+  ms: 'Malay',
+  ms_BN: 'Malay (Brunei)',
+  ms_Latn_BN: 'Malay (Latin, Brunei)',
+  ms_Latn_MY: 'Malay (Latin, Malaysia)',
+  ms_Latn_SG: 'Malay (Latin, Singapore)',
+  ms_Latn: 'Malay (Latin)',
+  ms_MY: 'Malay (Malaysia)',
+  ms_SG: 'Malay (Singapore)',
+  ml: 'Malayalam',
+  ml_IN: 'Malayalam (India)',
+  mt: 'Maltese',
+  mt_MT: 'Maltese (Malta)',
+  gv: 'Manx',
+  gv_IM: 'Manx (Isle of Man)',
+  mr: 'Marathi',
+  mr_IN: 'Marathi (India)',
+  mn: 'Mongolian',
+  mn_Cyrl_MN: 'Mongolian (Cyrillic, Mongolia)',
+  mn_Cyrl: 'Mongolian (Cyrillic)',
+  mn_MN: 'Mongolian (Mongolia)',
+  ne: 'Nepali',
+  ne_IN: 'Nepali (India)',
+  ne_NP: 'Nepali (Nepal)',
+  nd: 'North Ndebele',
+  nd_ZW: 'North Ndebele (Zimbabwe)',
+  se: 'Northern Sami',
+  se_FI: 'Northern Sami (Finland)',
+  se_NO: 'Northern Sami (Norway)',
+  se_SE: 'Northern Sami (Sweden)',
+  no: 'Norwegian',
+  no_NO: 'Norwegian (Norway)',
+  nb: 'Norwegian Bokmål',
+  nb_NO: 'Norwegian Bokmål (Norway)',
+  nb_SJ: 'Norwegian Bokmål (Svalbard & Jan Mayen)',
+  nn: 'Norwegian Nynorsk',
+  nn_NO: 'Norwegian Nynorsk (Norway)',
+  or: 'Oriya',
+  or_IN: 'Oriya (India)',
+  om: 'Oromo',
+  om_ET: 'Oromo (Ethiopia)',
+  om_KE: 'Oromo (Kenya)',
+  os: 'Ossetic',
+  os_GE: 'Ossetic (Georgia)',
+  os_RU: 'Ossetic (Russia)',
+  ps: 'Pashto',
+  ps_AF: 'Pashto (Afghanistan)',
+  fa: 'Persian',
+  fa_AF: 'Persian (Afghanistan)',
+  fa_IR: 'Persian (Iran)',
+  pl: 'Polish',
+  pl_PL: 'Polish (Poland)',
+  pt: 'Portuguese',
+  pt_AO: 'Portuguese (Angola)',
+  pt_BR: 'Portuguese (Brazil)',
+  pt_CV: 'Portuguese (Cape Verde)',
+  pt_GW: 'Portuguese (Guinea-Bissau)',
+  pt_MO: 'Portuguese (Macau SAR China)',
+  pt_MZ: 'Portuguese (Mozambique)',
+  pt_PT: 'Portuguese (Portugal)',
+  pt_ST: 'Portuguese (São Tomé & Príncipe)',
+  pt_TL: 'Portuguese (Timor-Leste)',
+  pa: 'Punjabi',
+  pa_Arab_PK: 'Punjabi (Arabic, Pakistan)',
+  pa_Arab: 'Punjabi (Arabic)',
+  pa_Guru_IN: 'Punjabi (Gurmukhi, India)',
+  pa_Guru: 'Punjabi (Gurmukhi)',
+  pa_IN: 'Punjabi (India)',
+  pa_PK: 'Punjabi (Pakistan)',
+  qu: 'Quechua',
+  qu_BO: 'Quechua (Bolivia)',
+  qu_EC: 'Quechua (Ecuador)',
+  qu_PE: 'Quechua (Peru)',
+  ro: 'Romanian',
+  ro_MD: 'Romanian (Moldova)',
+  ro_RO: 'Romanian (Romania)',
+  rm: 'Romansh',
+  rm_CH: 'Romansh (Switzerland)',
+  rn: 'Rundi',
+  rn_BI: 'Rundi (Burundi)',
+  ru: 'Russian',
+  ru_BY: 'Russian (Belarus)',
+  ru_KZ: 'Russian (Kazakhstan)',
+  ru_KG: 'Russian (Kyrgyzstan)',
+  ru_MD: 'Russian (Moldova)',
+  ru_RU: 'Russian (Russia)',
+  ru_UA: 'Russian (Ukraine)',
+  sg: 'Sango',
+  sg_CF: 'Sango (Central African Republic)',
+  gd: 'Scottish Gaelic',
+  gd_GB: 'Scottish Gaelic (United Kingdom)',
+  sr: 'Serbian',
+  sr_BA: 'Serbian (Bosnia & Herzegovina)',
+  sr_Cyrl_BA: 'Serbian (Cyrillic, Bosnia & Herzegovina)',
+  sr_Cyrl_XK: 'Serbian (Cyrillic, Kosovo)',
+  sr_Cyrl_ME: 'Serbian (Cyrillic, Montenegro)',
+  sr_Cyrl_RS: 'Serbian (Cyrillic, Serbia)',
+  sr_Cyrl: 'Serbian (Cyrillic)',
+  sr_XK: 'Serbian (Kosovo)',
+  sr_Latn_BA: 'Serbian (Latin, Bosnia & Herzegovina)',
+  sr_Latn_XK: 'Serbian (Latin, Kosovo)',
+  sr_Latn_ME: 'Serbian (Latin, Montenegro)',
+  sr_Latn_RS: 'Serbian (Latin, Serbia)',
+  sr_Latn: 'Serbian (Latin)',
+  sr_ME: 'Serbian (Montenegro)',
+  sr_RS: 'Serbian (Serbia)',
+  sh: 'Serbo-Croatian',
+  sh_BA: 'Serbo-Croatian (Bosnia & Herzegovina)',
+  sn: 'Shona',
+  sn_ZW: 'Shona (Zimbabwe)',
+  ii: 'Sichuan Yi',
+  ii_CN: 'Sichuan Yi (China)',
+  si: 'Sinhala',
+  si_LK: 'Sinhala (Sri Lanka)',
+  sk: 'Slovak',
+  sk_SK: 'Slovak (Slovakia)',
+  sl: 'Slovenian',
+  sl_SI: 'Slovenian (Slovenia)',
+  so: 'Somali',
+  so_DJ: 'Somali (Djibouti)',
+  so_ET: 'Somali (Ethiopia)',
+  so_KE: 'Somali (Kenya)',
+  so_SO: 'Somali (Somalia)',
+  es: 'Spanish',
+  es_AR: 'Spanish (Argentina)',
+  es_BO: 'Spanish (Bolivia)',
+  es_IC: 'Spanish (Canary Islands)',
+  es_EA: 'Spanish (Ceuta & Melilla)',
+  es_CL: 'Spanish (Chile)',
+  es_CO: 'Spanish (Colombia)',
+  es_CR: 'Spanish (Costa Rica)',
+  es_CU: 'Spanish (Cuba)',
+  es_DO: 'Spanish (Dominican Republic)',
+  es_EC: 'Spanish (Ecuador)',
+  es_SV: 'Spanish (El Salvador)',
+  es_GQ: 'Spanish (Equatorial Guinea)',
+  es_GT: 'Spanish (Guatemala)',
+  es_HN: 'Spanish (Honduras)',
+  es_MX: 'Spanish (Mexico)',
+  es_NI: 'Spanish (Nicaragua)',
+  es_PA: 'Spanish (Panama)',
+  es_PY: 'Spanish (Paraguay)',
+  es_PE: 'Spanish (Peru)',
+  es_PH: 'Spanish (Philippines)',
+  es_PR: 'Spanish (Puerto Rico)',
+  es_ES: 'Spanish (Spain)',
+  es_US: 'Spanish (United States)',
+  es_UY: 'Spanish (Uruguay)',
+  es_VE: 'Spanish (Venezuela)',
+  sw: 'Swahili',
+  sw_KE: 'Swahili (Kenya)',
+  sw_TZ: 'Swahili (Tanzania)',
+  sw_UG: 'Swahili (Uganda)',
+  sv: 'Swedish',
+  sv_AX: 'Swedish (Åland Islands)',
+  sv_FI: 'Swedish (Finland)',
+  sv_SE: 'Swedish (Sweden)',
+  tl: 'Tagalog',
+  tl_PH: 'Tagalog (Philippines)',
+  ta: 'Tamil',
+  ta_IN: 'Tamil (India)',
+  ta_MY: 'Tamil (Malaysia)',
+  ta_SG: 'Tamil (Singapore)',
+  ta_LK: 'Tamil (Sri Lanka)',
+  te: 'Telugu',
+  te_IN: 'Telugu (India)',
+  th: 'Thai',
+  th_TH: 'Thai (Thailand)',
+  bo: 'Tibetan',
+  bo_CN: 'Tibetan (China)',
+  bo_IN: 'Tibetan (India)',
+  ti: 'Tigrinya',
+  ti_ER: 'Tigrinya (Eritrea)',
+  ti_ET: 'Tigrinya (Ethiopia)',
+  to: 'Tongan',
+  to_TO: 'Tongan (Tonga)',
+  tr: 'Turkish',
+  tr_CY: 'Turkish (Cyprus)',
+  tr_TR: 'Turkish (Turkey)',
+  uk: 'Ukrainian',
+  uk_UA: 'Ukrainian (Ukraine)',
+  ur: 'Urdu',
+  ur_IN: 'Urdu (India)',
+  ur_PK: 'Urdu (Pakistan)',
+  ug: 'Uyghur',
+  ug_Arab_CN: 'Uyghur (Arabic, China)',
+  ug_Arab: 'Uyghur (Arabic)',
+  ug_CN: 'Uyghur (China)',
+  uz: 'Uzbek',
+  uz_AF: 'Uzbek (Afghanistan)',
+  uz_Arab_AF: 'Uzbek (Arabic, Afghanistan)',
+  uz_Arab: 'Uzbek (Arabic)',
+  uz_Cyrl_UZ: 'Uzbek (Cyrillic, Uzbekistan)',
+  uz_Cyrl: 'Uzbek (Cyrillic)',
+  uz_Latn_UZ: 'Uzbek (Latin, Uzbekistan)',
+  uz_Latn: 'Uzbek (Latin)',
+  uz_UZ: 'Uzbek (Uzbekistan)',
+  vi: 'Vietnamese',
+  vi_VN: 'Vietnamese (Vietnam)',
+  cy: 'Welsh',
+  cy_GB: 'Welsh (United Kingdom)',
+  fy: 'Western Frisian',
+  fy_NL: 'Western Frisian (Netherlands)',
+  yi: 'Yiddish',
+  yo: 'Yoruba',
+  yo_BJ: 'Yoruba (Benin)',
+  yo_NG: 'Yoruba (Nigeria)',
+  zu: 'Zulu',
+  zu_ZA: 'Zulu (South Africa)',
+};
+export default locales;
diff --git a/app/javascript/shared/helpers/AudioNotificationHelper.js b/app/javascript/shared/helpers/AudioNotificationHelper.js
index c3108f174..7db280fa2 100644
--- a/app/javascript/shared/helpers/AudioNotificationHelper.js
+++ b/app/javascript/shared/helpers/AudioNotificationHelper.js
@@ -16,19 +16,18 @@ export const getAlertAudio = async (baseUrl = '', type = 'dashboard') => {
     };
   };
 
-  try {
-    const resourceUrl = `${baseUrl}/audio/${type}/ding.mp3`;
-    const audioRequest = new Request(resourceUrl);
+  const resourceUrl = `${baseUrl}/audio/${type}/ding.mp3`;
+  const audioRequest = new Request(resourceUrl);
 
-    fetch(audioRequest)
-      .then(response => response.arrayBuffer())
-      .then(buffer => {
-        audioCtx.decodeAudioData(buffer).then(playsound);
-        return new Promise(res => res());
-      });
-  } catch (error) {
-    // error
-  }
+  fetch(audioRequest)
+    .then(response => response.arrayBuffer())
+    .then(buffer => {
+      audioCtx.decodeAudioData(buffer).then(playsound);
+      return new Promise(res => res());
+    })
+    .catch(() => {
+      // error
+    });
 };
 
 export const notificationEnabled = (enableAudioAlerts, id, userId) => {
diff --git a/app/javascript/shared/helpers/clipboard.js b/app/javascript/shared/helpers/clipboard.js
new file mode 100644
index 000000000..dbadd4037
--- /dev/null
+++ b/app/javascript/shared/helpers/clipboard.js
@@ -0,0 +1,14 @@
+/**
+ * Writes a text string to the system clipboard.
+ *
+ * @async
+ * @param {string} text text to be written to the clipboard
+ * @throws {Error} unable to copy text to clipboard
+ */
+export const copyTextToClipboard = async text => {
+  try {
+    await navigator.clipboard.writeText(text);
+  } catch (error) {
+    throw new Error(`Unable to copy text to clipboard: ${error.message}`);
+  }
+};
diff --git a/app/javascript/shared/helpers/emoji.js b/app/javascript/shared/helpers/emoji.js
index eb17fbd4e..371472623 100644
--- a/app/javascript/shared/helpers/emoji.js
+++ b/app/javascript/shared/helpers/emoji.js
@@ -32,3 +32,13 @@ export const hasEmojiSupport = () => {
   ctx.fillText('\ud83d\udc28', 0, 0); // U+1F428 KOALA
   return ctx.getImageData(offset, offset, 1, 1).data[0] !== 0;
 };
+
+export const removeEmoji = text => {
+  return text
+    .replace(
+      /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
+      ''
+    )
+    .replace(/\s+/g, ' ')
+    .trim();
+};
diff --git a/app/javascript/shared/helpers/specs/Emoji.spec.js b/app/javascript/shared/helpers/specs/Emoji.spec.js
new file mode 100644
index 000000000..f6583e4ea
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/Emoji.spec.js
@@ -0,0 +1,7 @@
+import { removeEmoji } from '../emoji';
+
+describe('#removeEmoji', () => {
+  it('returns values without emoji', () => {
+    expect(removeEmoji('😄Hi👋🏻 there❕')).toEqual('Hi there');
+  });
+});
diff --git a/app/javascript/shared/helpers/vuex/mutationHelpers.js b/app/javascript/shared/helpers/vuex/mutationHelpers.js
index f54a1d21e..4de50e278 100644
--- a/app/javascript/shared/helpers/vuex/mutationHelpers.js
+++ b/app/javascript/shared/helpers/vuex/mutationHelpers.js
@@ -45,6 +45,16 @@ export const updatePresence = (state, data) => {
   });
 };
 
+export const updateSingleRecordPresence = (
+  records,
+  { id, availabilityStatus }
+) => {
+  const [selectedRecord] = records.filter(record => record.id === Number(id));
+  if (selectedRecord) {
+    Vue.set(selectedRecord, 'availability_status', availabilityStatus);
+  }
+};
+
 export const destroy = (state, id) => {
   state.records = state.records.filter(record => record.id !== id);
 };
diff --git a/app/javascript/shared/mixins/filterMixin.js b/app/javascript/shared/mixins/filterMixin.js
index 801fb2f08..faf7c6220 100644
--- a/app/javascript/shared/mixins/filterMixin.js
+++ b/app/javascript/shared/mixins/filterMixin.js
@@ -1,5 +1,3 @@
-// import groupBy from 'lodash.groupby';
-
 export default {
   methods: {
     setFilterAttributes() {
diff --git a/app/javascript/shared/mixins/messageFormatterMixin.js b/app/javascript/shared/mixins/messageFormatterMixin.js
index 7767e7c76..36ff7bd75 100644
--- a/app/javascript/shared/mixins/messageFormatterMixin.js
+++ b/app/javascript/shared/mixins/messageFormatterMixin.js
@@ -1,5 +1,4 @@
 import MessageFormatter from '../helpers/MessageFormatter';
-import DOMPurify from 'dompurify';
 
 export default {
   methods: {
@@ -22,25 +21,5 @@ export default {
 
       return `${description.slice(0, 97)}...`;
     },
-    stripStyleCharacters(message) {
-      return DOMPurify.sanitize(message, {
-        FORBID_TAGS: ['style'],
-        FORBID_ATTR: [
-          'id',
-          'class',
-          'style',
-          'bgcolor',
-          'valign',
-          'width',
-          'face',
-          'color',
-          'height',
-          'lang',
-          'align',
-          'size',
-          'border',
-        ],
-      });
-    },
   },
 };
diff --git a/app/javascript/shared/mixins/specs/messageFormatterMixin.spec.js b/app/javascript/shared/mixins/specs/messageFormatterMixin.spec.js
index b43129aec..81f653d7f 100644
--- a/app/javascript/shared/mixins/specs/messageFormatterMixin.spec.js
+++ b/app/javascript/shared/mixins/specs/messageFormatterMixin.spec.js
@@ -14,17 +14,4 @@ describe('messageFormatterMixin', () => {
       'Chatwoot is an opensource tool. https://www.chatwoot.com'
     );
   });
-
-  it('stripStyleCharacters returns message without style tags', () => {
-    const Component = {
-      render() {},
-      mixins: [messageFormatterMixin],
-    };
-    const wrapper = shallowMount(Component);
-    const message =
-      '<b style="max-width:100%">Chatwoot is an opensource tool. https://www.chatwoot.com</b><style type="css">.message{}</style>';
-    expect(wrapper.vm.stripStyleCharacters(message)).toMatch(
-      '<b>Chatwoot is an opensource tool. https://www.chatwoot.com</b>'
-    );
-  });
 });
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index d1f7aa64d..c1598ae71 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -15,6 +15,7 @@ const {
   TERMS_URL: termsURL,
   WIDGET_BRAND_URL: widgetBrandURL,
   DISABLE_USER_PROFILE_UPDATE: disableUserProfileUpdate,
+  DEPLOYMENT_ENV: deploymentEnv,
 } = window.globalConfig || {};
 
 const state = {
@@ -23,6 +24,7 @@ const state = {
   appVersion,
   brandName,
   chatwootInboxToken,
+  deploymentEnv,
   createNewAccountFromDashboard,
   directUploadsEnabled: directUploadsEnabled === 'true',
   disableUserProfileUpdate: disableUserProfileUpdate === 'true',
@@ -38,6 +40,8 @@ const state = {
 
 export const getters = {
   get: $state => $state,
+  isOnChatwootCloud: $state => $state.deploymentEnv === 'cloud',
+  isACustomBrandedInstance: $state => $state.installationName !== 'Chatwoot',
 };
 
 export const actions = {};
diff --git a/app/javascript/survey/i18n/index.js b/app/javascript/survey/i18n/index.js
index 7abdefd2b..a4ebfdd6b 100644
--- a/app/javascript/survey/i18n/index.js
+++ b/app/javascript/survey/i18n/index.js
@@ -1,36 +1,37 @@
-import { default as ar } from './locale/ar.json';
-import { default as ca } from './locale/ca.json';
-import { default as cs } from './locale/cs.json';
-import { default as da } from './locale/da.json';
-import { default as de } from './locale/de.json';
-import { default as el } from './locale/el.json';
-import { default as en } from './locale/en.json';
-import { default as es } from './locale/es.json';
-import { default as fa } from './locale/fa.json';
-import { default as fi } from './locale/fi.json';
-import { default as fr } from './locale/fr.json';
-import { default as hi } from './locale/hi.json';
-import { default as hu } from './locale/hu.json';
-import { default as id } from './locale/id.json';
-import { default as it } from './locale/it.json';
-import { default as ja } from './locale/ja.json';
-import { default as ko } from './locale/ko.json';
-import { default as ml } from './locale/ml.json';
-import { default as nl } from './locale/nl.json';
-import { default as no } from './locale/no.json';
-import { default as pl } from './locale/pl.json';
-import { default as pt } from './locale/pt.json';
-import { default as pt_BR } from './locale/pt_BR.json';
-import { default as ro } from './locale/ro.json';
-import { default as ru } from './locale/ru.json';
-import { default as sk } from './locale/sk.json';
-import { default as sv } from './locale/sv.json';
-import { default as ta } from './locale/ta.json';
-import { default as tr } from './locale/tr.json';
-import { default as uk } from './locale/uk.json';
-import { default as vi } from './locale/vi.json';
-import { default as zh_CN } from './locale/zh_CN.json';
-import { default as zh_TW } from './locale/zh_TW.json';
+import ar from './locale/ar.json';
+import ca from './locale/ca.json';
+import cs from './locale/cs.json';
+import da from './locale/da.json';
+import de from './locale/de.json';
+import el from './locale/el.json';
+import en from './locale/en.json';
+import es from './locale/es.json';
+import fa from './locale/fa.json';
+import fi from './locale/fi.json';
+import fr from './locale/fr.json';
+import hi from './locale/hi.json';
+import hu from './locale/hu.json';
+import id from './locale/id.json';
+import it from './locale/it.json';
+import ja from './locale/ja.json';
+import ko from './locale/ko.json';
+import ml from './locale/ml.json';
+import nl from './locale/nl.json';
+import no from './locale/no.json';
+import pl from './locale/pl.json';
+import pt from './locale/pt.json';
+import pt_BR from './locale/pt_BR.json';
+import ro from './locale/ro.json';
+import ru from './locale/ru.json';
+import sk from './locale/sk.json';
+import sv from './locale/sv.json';
+import ta from './locale/ta.json';
+import th from './locale/th.json';
+import tr from './locale/tr.json';
+import uk from './locale/uk.json';
+import vi from './locale/vi.json';
+import zh_CN from './locale/zh_CN.json';
+import zh_TW from './locale/zh_TW.json';
 
 export default {
   ar,
@@ -61,6 +62,7 @@ export default {
   sk,
   sv,
   ta,
+  th,
   tr,
   uk,
   vi,
diff --git a/app/javascript/survey/i18n/locale/ka.json b/app/javascript/survey/i18n/locale/ka.json
new file mode 100644
index 000000000..2473f114e
--- /dev/null
+++ b/app/javascript/survey/i18n/locale/ka.json
@@ -0,0 +1,19 @@
+{
+  "SURVEY": {
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "RATING": {
+      "LABEL": "Rate your conversation",
+      "SUCCESS_MESSAGE": "Thank you for submitting the rating"
+    },
+    "FEEDBACK": {
+      "LABEL": "Do you have any thoughts you'd like to share?",
+      "PLACEHOLDER": "Your feedback (optional)",
+      "BUTTON_TEXT": "Submit feedback"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  },
+  "POWERED_BY": "Powered by Chatwoot"
+}
diff --git a/app/javascript/survey/i18n/locale/sr.json b/app/javascript/survey/i18n/locale/sr.json
index ef4f8e52f..6ffe37e02 100644
--- a/app/javascript/survey/i18n/locale/sr.json
+++ b/app/javascript/survey/i18n/locale/sr.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Poštovani korisniče 👋, molim vas izdvojite jedan trenutak da podelite iskustvo o razgovoru koje ste obavili sa %{inboxName}.",
     "RATING": {
       "LABEL": "Ocenite razgovor",
-      "SUCCESS_MESSAGE": "Thank you for submitting the rating"
+      "SUCCESS_MESSAGE": "Hvala vam na dostavljenoj oceni"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "Da li ima nešto što bi ste podelili sa nama?",
+      "PLACEHOLDER": "Vaš utisak (opciono)",
+      "BUTTON_TEXT": "Podelite utisak"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Anketa je uspešno poslata",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     }
   },
diff --git a/app/javascript/widget/assets/scss/_mixins.scss b/app/javascript/widget/assets/scss/_mixins.scss
index 776d70391..beec14a4b 100755
--- a/app/javascript/widget/assets/scss/_mixins.scss
+++ b/app/javascript/widget/assets/scss/_mixins.scss
@@ -1,8 +1,8 @@
 // scss-lint:disable PseudoElement SpaceBeforeBrace VendorPrefix
 $shadow-color-1: rgba(50, 50, 93, 0.08);
 $shadow-color-2: rgba(0, 0, 0, 0.07);
-$shadow-color-3: rgba(50, 50, 93, .08);
-$shadow-color-4: rgba(0, 0, 0, .05);
+$shadow-color-3: rgba(50, 50, 93, 0.08);
+$shadow-color-4: rgba(0, 0, 0, 0.05);
 
 $color-shadow-medium: rgba(50, 50, 93, 0.08);
 $color-shadow-light: rgba(50, 50, 93, 0.04);
@@ -10,7 +10,8 @@ $color-shadow-large: rgba(50, 50, 93, 0.25);
 $color-shadow-outline: rgba(66, 153, 225, 0.5);
 
 @mixin normal-shadow {
-  box-shadow: 0 $space-small $space-normal $shadow-color-1, 0 $space-smaller $space-slab $shadow-color-2;
+  box-shadow: 0 $space-small $space-normal $shadow-color-1,
+    0 $space-smaller $space-slab $shadow-color-2;
 }
 
 @mixin light-shadow {
@@ -19,19 +20,19 @@ $color-shadow-outline: rgba(66, 153, 225, 0.5);
 
 @mixin placeholder {
   &::-webkit-input-placeholder {
-    @content
+    @content;
   }
 
   &:-moz-placeholder {
-    @content
+    @content;
   }
 
   &::-moz-placeholder {
-    @content
+    @content;
   }
 
   &:-ms-input-placeholder {
-    @content
+    @content;
   }
 }
 
@@ -40,25 +41,21 @@ $color-shadow-outline: rgba(66, 153, 225, 0.5);
     0 1px 5px 1px $color-shadow-light;
 }
 
-
 @mixin shadow-medium {
   box-shadow: 0 4px 24px 4px $color-shadow-medium,
     0 2px 16px 2px $color-shadow-light;
 }
 
-
 @mixin shadow-large {
   box-shadow: 0 10px 15px -16px $color-shadow-medium,
     0 4px 6px -8px $color-shadow-light;
 }
 
-
 @mixin shadow-big {
   box-shadow: 0 20px 25px -20px $color-shadow-medium,
     0 10px 10px -10px $color-shadow-light;
 }
 
-
 @mixin shadow-mega {
   box-shadow: 0 25px 50px -12px $color-shadow-big;
 }
diff --git a/app/javascript/widget/assets/scss/_variables.scss b/app/javascript/widget/assets/scss/_variables.scss
index dff2c30b9..d3cf6cc1c 100755
--- a/app/javascript/widget/assets/scss/_variables.scss
+++ b/app/javascript/widget/assets/scss/_variables.scss
@@ -65,8 +65,8 @@ $spinkit-size: 1.6rem !default;
 $woot-snackbar-bg: #323232;
 $woot-snackbar-button: #ffeb3b;
 
-$swift-ease-out-duration: .4s !default;
-$swift-ease-out-timing-function: cubic-bezier(.25, .8, .25, 1) !default;
+$swift-ease-out-duration: 0.4s !default;
+$swift-ease-out-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
 $swift-ease-out: all $swift-ease-out-duration $swift-ease-out-timing-function !default;
 
 $border-radius: 0.1875px;
@@ -74,20 +74,8 @@ $line-height: 1;
 $footer-height: 11.2rem;
 $header-expanded-height: $space-medium * 10;
 
-$font-family: 'Inter',
--apple-system,
-system-ui,
-BlinkMacSystemFont,
-"Segoe UI",
-Roboto,
-"Helvetica Neue",
-Tahoma,
-Arial,
-sans-serif;
+$font-family: 'Inter', -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI',
+  Roboto, 'Helvetica Neue', Tahoma, Arial, sans-serif;
 
 // Break points
 $break-point-medium: 667px;
-
-// Timing functions
-
-$ease-in-cubic: cubic-bezier(.17, .67, .83, .67);
diff --git a/app/javascript/widget/assets/scss/woot.scss b/app/javascript/widget/assets/scss/woot.scss
index 986dd390b..9a2a6a8e6 100755
--- a/app/javascript/widget/assets/scss/woot.scss
+++ b/app/javascript/widget/assets/scss/woot.scss
@@ -1,3 +1,5 @@
+@import 'shared/assets/stylesheets/animations';
+
 @import 'reset';
 @import 'tailwindcss/base';
 @import 'tailwindcss/components';
@@ -45,7 +47,6 @@ body {
   cursor: pointer;
 }
 
-
 .message-content {
   ul {
     list-style: disc;
diff --git a/app/javascript/widget/components/UnreadMessageList.vue b/app/javascript/widget/components/UnreadMessageList.vue
index 6d8005ef1..19afe49d1 100644
--- a/app/javascript/widget/components/UnreadMessageList.vue
+++ b/app/javascript/widget/components/UnreadMessageList.vue
@@ -111,7 +111,7 @@ export default {
     border: 0;
     font-weight: $font-weight-bold;
     font-size: $font-size-medium;
-    transition: all 0.3s $ease-in-cubic;
+    transition: all 0.3s var(--ease-in-cubic);
     margin-left: $space-smaller;
     padding-right: $space-one;
 
@@ -127,7 +127,7 @@ export default {
     border: 0;
     font-weight: $font-weight-medium;
     font-size: $font-size-mini;
-    transition: all 0.3s $ease-in-cubic;
+    transition: all 0.3s var(--ease-in-cubic);
     margin-bottom: $space-slab;
     border-radius: $space-normal;
 
diff --git a/app/javascript/widget/helpers/utils.js b/app/javascript/widget/helpers/utils.js
index 2b7384f1d..1a4b2c1d6 100755
--- a/app/javascript/widget/helpers/utils.js
+++ b/app/javascript/widget/helpers/utils.js
@@ -36,3 +36,10 @@ export const RNHelper = {
     );
   },
 };
+
+export const groupBy = (array, predicate) => {
+  return array.reduce((acc, value) => {
+    (acc[predicate(value)] ||= []).push(value);
+    return acc;
+  }, {});
+};
diff --git a/app/javascript/widget/i18n/index.js b/app/javascript/widget/i18n/index.js
index 7abdefd2b..1cf045b87 100644
--- a/app/javascript/widget/i18n/index.js
+++ b/app/javascript/widget/i18n/index.js
@@ -1,36 +1,37 @@
-import { default as ar } from './locale/ar.json';
-import { default as ca } from './locale/ca.json';
-import { default as cs } from './locale/cs.json';
-import { default as da } from './locale/da.json';
-import { default as de } from './locale/de.json';
-import { default as el } from './locale/el.json';
-import { default as en } from './locale/en.json';
-import { default as es } from './locale/es.json';
-import { default as fa } from './locale/fa.json';
-import { default as fi } from './locale/fi.json';
-import { default as fr } from './locale/fr.json';
-import { default as hi } from './locale/hi.json';
-import { default as hu } from './locale/hu.json';
-import { default as id } from './locale/id.json';
-import { default as it } from './locale/it.json';
-import { default as ja } from './locale/ja.json';
-import { default as ko } from './locale/ko.json';
-import { default as ml } from './locale/ml.json';
-import { default as nl } from './locale/nl.json';
-import { default as no } from './locale/no.json';
-import { default as pl } from './locale/pl.json';
-import { default as pt } from './locale/pt.json';
-import { default as pt_BR } from './locale/pt_BR.json';
-import { default as ro } from './locale/ro.json';
-import { default as ru } from './locale/ru.json';
-import { default as sk } from './locale/sk.json';
-import { default as sv } from './locale/sv.json';
-import { default as ta } from './locale/ta.json';
-import { default as tr } from './locale/tr.json';
-import { default as uk } from './locale/uk.json';
-import { default as vi } from './locale/vi.json';
-import { default as zh_CN } from './locale/zh_CN.json';
-import { default as zh_TW } from './locale/zh_TW.json';
+import ar from './locale/ar.json';
+import ca from './locale/ca.json';
+import cs from './locale/cs.json';
+import da from './locale/da.json';
+import de from './locale/de.json';
+import el from './locale/el.json';
+import en from './locale/en.json';
+import es from './locale/es.json';
+import fa from './locale/fa.json';
+import fi from './locale/fi.json';
+import fr from './locale/fr.json';
+import hi from './locale/hi.json';
+import hu from './locale/hu.json';
+import id from './locale/id.json';
+import it from './locale/it.json';
+import ja from './locale/ja.json';
+import ko from './locale/ko.json';
+import ml from './locale/ml.json';
+import nl from './locale/nl.json';
+import no from './locale/no.json';
+import pl from './locale/pl.json';
+import pt from './locale/pt.json';
+import pt_BR from './locale/pt_BR.json';
+import ro from './locale/ro.json';
+import ru from './locale/ru.json';
+import sk from './locale/sk.json';
+import sv from './locale/sv.json';
+import ta from './locale/ta.json';
+import th from './locale/th.json';
+import tr from './locale/tr.json';
+import uk from './locale/uk.json';
+import vi from './locale/vi.json';
+import zh_CN from './locale/zh_CN.json';
+import zh_TW from './locale/zh_TW.json';
 
 export default {
   ar,
@@ -54,13 +55,14 @@ export default {
   nl,
   no,
   pl,
-  pt,
   pt_BR,
+  pt,
   ro,
   ru,
   sk,
   sv,
   ta,
+  th,
   tr,
   uk,
   vi,
diff --git a/app/javascript/widget/i18n/locale/ka.json b/app/javascript/widget/i18n/locale/ka.json
new file mode 100644
index 000000000..ef4149191
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ka.json
@@ -0,0 +1,86 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
+    }
+  },
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are away at the moment"
+  },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
+  "END_CONVERSATION": "End Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
+  "START_NEW_CONVERSATION": "Start a new conversation",
+  "UNREAD_VIEW": {
+    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "CLOSE_MESSAGES_BUTTON": "Close",
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
+  },
+  "BUBBLE": {
+    "LABEL": "Chat with us"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message",
+  "TODAY": "Today",
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "REQUIRED_ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Please enter a valid email address"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Phone Number",
+        "PLACEHOLDER": "Please enter your phone number",
+        "REQUIRED_ERROR": "Phone Number is required",
+        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    },
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
+  },
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  },
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "PLACEHOLDER": "Tell us more..."
+  },
+  "EMAIL_TRANSCRIPT": {
+    "BUTTON_TEXT": "Request a conversation transcript",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again"
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/sr.json b/app/javascript/widget/i18n/locale/sr.json
index 256fc0655..db3873570 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -22,7 +22,7 @@
     "IN_A_DAY": "Obično odgovaramo u roku od jednog dana"
   },
   "START_CONVERSATION": "Započnite razgovor",
-  "END_CONVERSATION": "End Conversation",
+  "END_CONVERSATION": "Završi razgovor",
   "CONTINUE_CONVERSATION": "Nastavi razgovor",
   "START_NEW_CONVERSATION": "Započnite novi razgovor",
   "UNREAD_VIEW": {
@@ -49,14 +49,14 @@
       "EMAIL_ADDRESS": {
         "LABEL": "E-mail adresa",
         "PLACEHOLDER": "Molimo unesite vašu e-mail adresu",
-        "REQUIRED_ERROR": "Email Address is required",
-        "VALID_ERROR": "Please enter a valid email address"
+        "REQUIRED_ERROR": "Adresa e-pošte je obavezna",
+        "VALID_ERROR": "Molim vas unesite ispravnu adresu e-pošte"
       },
       "PHONE_NUMBER": {
         "LABEL": "Broj telefona",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "PLACEHOLDER": "Molim vas unesite vaš broj telefona",
+        "REQUIRED_ERROR": "Broj telefona je obavezan",
+        "VALID_ERROR": "Broj telefona bi trebao biti u E.164 formatu npr.: +381601234567"
       },
       "MESSAGE": {
         "LABEL": "Poruka",
@@ -64,23 +64,23 @@
         "ERROR": "Poruka prekratka"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "CAMPAIGN_HEADER": "Molim vas dostavite vaše ime i e-poštu pre započinjanja razgovora",
+    "IS_REQUIRED": "je obavezno"
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "FILE_SIZE_LIMIT": "Datoteka prevazilazi {MAXIMUM_FILE_UPLOAD_SIZE} ograničenje priloga",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Neispravno polje"
     }
   },
   "CSAT": {
     "TITLE": "Ocenite razgovor",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "SUBMITTED_TITLE": "Hvala vam na dostavljenoj oceni",
     "PLACEHOLDER": "Pričajte nam više..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Zatražite kopiju razgovora",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again"
+    "SEND_EMAIL_SUCCESS": "Transkript razgovora je uspešno poslat",
+    "SEND_EMAIL_ERROR": "Pojavila se greška, molim vas pokušajte ponovo"
   }
 }
diff --git a/app/javascript/widget/store/modules/conversation/getters.js b/app/javascript/widget/store/modules/conversation/getters.js
index 165584c1c..9d1c067f4 100644
--- a/app/javascript/widget/store/modules/conversation/getters.js
+++ b/app/javascript/widget/store/modules/conversation/getters.js
@@ -1,5 +1,5 @@
 import { MESSAGE_TYPE } from 'widget/helpers/constants';
-import groupBy from 'lodash.groupby';
+import { groupBy } from 'widget/helpers/utils';
 import { groupConversationBySender } from './helpers';
 import { formatUnixDate } from 'shared/helpers/DateHelper';
 
diff --git a/app/jobs/avatar/avatar_from_gravatar_job.rb b/app/jobs/avatar/avatar_from_gravatar_job.rb
new file mode 100644
index 000000000..4a967d74f
--- /dev/null
+++ b/app/jobs/avatar/avatar_from_gravatar_job.rb
@@ -0,0 +1,13 @@
+class Avatar::AvatarFromGravatarJob < ApplicationJob
+  queue_as :low
+
+  def perform(avatarable, email)
+    return if GlobalConfigService.load('DISABLE_GRAVATAR', '').present?
+    return if email.blank?
+    return if avatarable.avatar_url.present?
+
+    hash = Digest::MD5.hexdigest(email)
+    gravatar_url = "https://www.gravatar.com/avatar/#{hash}?d=404"
+    Avatar::AvatarFromUrlJob.perform_later(avatarable, gravatar_url)
+  end
+end
diff --git a/app/jobs/avatar/avatar_from_url_job.rb b/app/jobs/avatar/avatar_from_url_job.rb
new file mode 100644
index 000000000..a25698bc1
--- /dev/null
+++ b/app/jobs/avatar/avatar_from_url_job.rb
@@ -0,0 +1,15 @@
+class Avatar::AvatarFromUrlJob < ApplicationJob
+  queue_as :default
+
+  def perform(avatarable, avatar_url)
+    return unless avatarable.respond_to?(:avatar)
+
+    avatar_file = Down.download(
+      avatar_url,
+      max_size: 15 * 1024 * 1024
+    )
+    avatarable.avatar.attach(io: avatar_file, filename: avatar_file.original_filename, content_type: avatar_file.content_type)
+  rescue Down::NotFound, Down::Error => e
+    Rails.logger.error "Exception: invalid avatar url #{avatar_url} : #{e.message}"
+  end
+end
diff --git a/app/jobs/contact_avatar_job.rb b/app/jobs/contact_avatar_job.rb
deleted file mode 100644
index 5f07f5f24..000000000
--- a/app/jobs/contact_avatar_job.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class ContactAvatarJob < ApplicationJob
-  queue_as :default
-
-  def perform(contact, avatar_url)
-    avatar_file = Down.download(
-      avatar_url,
-      max_size: 15 * 1024 * 1024
-    )
-    contact.avatar.attach(io: avatar_file, filename: avatar_file.original_filename, content_type: avatar_file.content_type)
-  rescue Down::NotFound
-    contact.avatar.attachment.destroy! if contact.avatar.attached?
-  rescue Down::Error => e
-    Rails.logger.error "Exception: invalid avatar url #{avatar_url} : #{e.message}"
-  end
-end
diff --git a/app/jobs/macros_execution_job.rb b/app/jobs/macros_execution_job.rb
new file mode 100644
index 000000000..66dc43c26
--- /dev/null
+++ b/app/jobs/macros_execution_job.rb
@@ -0,0 +1,14 @@
+class MacrosExecutionJob < ApplicationJob
+  queue_as :medium
+
+  def perform(macro, conversation_ids:, user:)
+    account = macro.account
+    conversations = account.conversations.where(display_id: conversation_ids.to_a)
+
+    return if conversations.blank?
+
+    conversations.each do |conversation|
+      ::Macros::ExecutionService.new(macro, conversation, user).perform
+    end
+  end
+end
diff --git a/app/jobs/migration/remove_stale_notifications_job.rb b/app/jobs/migration/remove_stale_notifications_job.rb
new file mode 100644
index 000000000..ef6dff68d
--- /dev/null
+++ b/app/jobs/migration/remove_stale_notifications_job.rb
@@ -0,0 +1,19 @@
+# Delete migration and spec after 2 consecutive releases.
+class Migration::RemoveStaleNotificationsJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    remove_invalid_messages
+  end
+
+  private
+
+  def remove_invalid_messages
+    deleted_ids = []
+
+    Message.unscoped.distinct.pluck(:inbox_id).each_slice(1000) do |id_list|
+      deleted_ids = (id_list - Inbox.where(id: id_list).pluck(:id))
+      Message.where(inbox_id: deleted_ids.flatten).destroy_all
+    end
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 5ece265bb..7c7336642 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -4,16 +4,22 @@
 #
 #  id                    :integer          not null, primary key
 #  auto_resolve_duration :integer
+#  custom_attributes     :jsonb
 #  domain                :string(100)
 #  feature_flags         :integer          default(0), not null
 #  limits                :jsonb
 #  locale                :integer          default("en")
 #  name                  :string           not null
 #  settings_flags        :integer          default(0), not null
+#  status                :integer          default("active")
 #  support_email         :string(100)
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #
+# Indexes
+#
+#  index_accounts_on_status  (status)
+#
 
 class Account < ApplicationRecord
   # used for single column multi flags
@@ -39,7 +45,8 @@ class Account < ApplicationRecord
   has_many :agent_bots, dependent: :destroy_async
   has_many :api_channels, dependent: :destroy_async, class_name: '::Channel::Api'
   has_many :articles, dependent: :destroy_async, class_name: '::Article'
-  has_many :automation_rules, dependent: :destroy
+  has_many :automation_rules, dependent: :destroy_async
+  has_many :macros, dependent: :destroy_async
   has_many :campaigns, dependent: :destroy_async
   has_many :canned_responses, dependent: :destroy_async
   has_many :categories, dependent: :destroy_async, class_name: '::Category'
@@ -48,7 +55,7 @@ class Account < ApplicationRecord
   has_many :csat_survey_responses, dependent: :destroy_async
   has_many :custom_attribute_definitions, dependent: :destroy_async
   has_many :custom_filters, dependent: :destroy_async
-  has_many :dashboard_apps, dependent: :destroy
+  has_many :dashboard_apps, dependent: :destroy_async
   has_many :data_imports, dependent: :destroy_async
   has_many :email_channels, dependent: :destroy_async, class_name: '::Channel::Email'
   has_many :facebook_pages, dependent: :destroy_async, class_name: '::Channel::FacebookPage'
@@ -60,7 +67,7 @@ class Account < ApplicationRecord
   has_many :messages, dependent: :destroy_async
   has_many :notes, dependent: :destroy_async
   has_many :notification_settings, dependent: :destroy_async
-  has_many :notifications, dependent: :destroy
+  has_many :notifications, dependent: :destroy_async
   has_many :portals, dependent: :destroy_async, class_name: '::Portal'
   has_many :sms_channels, dependent: :destroy_async, class_name: '::Channel::Sms'
   has_many :teams, dependent: :destroy_async
@@ -77,6 +84,7 @@ class Account < ApplicationRecord
   has_flags ACCOUNT_SETTINGS_FLAGS.merge(column: 'settings_flags').merge(DEFAULT_QUERY_SETTING)
 
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
+  enum status: { active: 0, suspended: 1 }
 
   before_validation :validate_limit_keys
   after_create_commit :notify_creation
diff --git a/app/models/account_user.rb b/app/models/account_user.rb
index 526160c5d..a6bf3988a 100644
--- a/app/models/account_user.rb
+++ b/app/models/account_user.rb
@@ -19,11 +19,6 @@
 #  index_account_users_on_user_id     (user_id)
 #  uniq_user_id_per_account_id        (account_id,user_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#  fk_rails_...  (user_id => users.id) ON DELETE => cascade
-#
 
 class AccountUser < ApplicationRecord
   include AvailabilityStatusable
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 6a38167dc..72f6b2618 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -16,10 +16,6 @@
 #
 #  index_agent_bots_on_account_id  (account_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#
 
 class AgentBot < ApplicationRecord
   include AccessTokenable
diff --git a/app/models/article.rb b/app/models/article.rb
index 7cf4ebd41..1044e1107 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -5,6 +5,7 @@
 #  id                    :bigint           not null, primary key
 #  content               :text
 #  description           :text
+#  meta                  :jsonb
 #  status                :integer
 #  title                 :string
 #  views                 :integer
@@ -22,11 +23,6 @@
 #  index_articles_on_associated_article_id  (associated_article_id)
 #  index_articles_on_author_id              (author_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (associated_article_id => articles.id)
-#  fk_rails_...  (author_id => users.id)
-#
 class Article < ApplicationRecord
   include PgSearch::Model
 
@@ -57,6 +53,8 @@ class Article < ApplicationRecord
 
   scope :search_by_category_slug, ->(category_slug) { where(categories: { slug: category_slug }) if category_slug.present? }
   scope :search_by_category_locale, ->(locale) { where(categories: { locale: locale }) if locale.present? }
+  scope :search_by_author, ->(author_id) { where(author_id: author_id) if author_id.present? }
+  scope :search_by_status, ->(status) { where(status: status) if status.present? }
 
   # TODO: if text search slows down https://www.postgresql.org/docs/current/textsearch-features.html#TEXTSEARCH-UPDATE-TRIGGERS
   pg_search_scope(
@@ -76,7 +74,10 @@ class Article < ApplicationRecord
   def self.search(params)
     records = joins(
       :category
-    ).search_by_category_slug(params[:category_slug]).search_by_category_locale(params[:locale])
+    ).search_by_category_slug(
+      params[:category_slug]
+    ).search_by_category_locale(params[:locale]).search_by_author(params[:author_id]).search_by_status(params[:status])
+
     records = records.text_search(params[:query]) if params[:query].present?
     records.page(current_page(params))
   end
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index d76f2058e..f90e20d0c 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -30,7 +30,8 @@ class AutomationRule < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id].freeze
-  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachment].freeze
+  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agent send_webhook_event mute_conversation send_attachment
+                     change_status resolve_conversation snooze_conversation send_email_transcript].freeze
 
   def file_base_data
     files.map do |file|
@@ -49,7 +50,7 @@ class AutomationRule < ApplicationRecord
   private
 
   def json_conditions_format
-    return if conditions.nil?
+    return if conditions.blank?
 
     attributes = conditions.map { |obj, _| obj['attribute_key'] }
     conditions = attributes - CONDITIONS_ATTRS
@@ -58,9 +59,9 @@ class AutomationRule < ApplicationRecord
   end
 
   def json_actions_format
-    return if actions.nil?
+    return if actions.blank?
 
-    attributes = actions.map { |obj, _| obj['attribute_key'] }
+    attributes = actions.map { |obj, _| obj['action_name'] }
     actions = attributes - ACTIONS_ATTRS
 
     errors.add(:actions, "Automation actions #{actions.join(',')} not supported.") if actions.any?
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 1201a79db..7f4cbde69 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -28,11 +28,6 @@
 #  index_campaigns_on_inbox_id         (inbox_id)
 #  index_campaigns_on_scheduled_at     (scheduled_at)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#  fk_rails_...  (inbox_id => inboxes.id) ON DELETE => cascade
-#
 class Campaign < ApplicationRecord
   include UrlHelper
   validates :account_id, presence: true
diff --git a/app/models/category.rb b/app/models/category.rb
index 14c455e29..d0db67b94 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -23,11 +23,6 @@
 #  index_categories_on_parent_category_id             (parent_category_id)
 #  index_categories_on_slug_and_locale_and_portal_id  (slug,locale,portal_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (associated_category_id => categories.id)
-#  fk_rails_...  (parent_category_id => categories.id)
-#
 class Category < ApplicationRecord
   belongs_to :account
   belongs_to :portal
diff --git a/app/models/concerns/assignment_handler.rb b/app/models/concerns/assignment_handler.rb
index 72a7438e9..dde962ba1 100644
--- a/app/models/concerns/assignment_handler.rb
+++ b/app/models/concerns/assignment_handler.rb
@@ -23,8 +23,8 @@ module AssignmentHandler
   def find_assignee_from_team
     return if team&.allow_auto_assign.blank?
 
-    team_members = inbox.members.ids & team.members.ids
-    ::RoundRobin::AssignmentService.new(conversation: self, allowed_member_ids: team_members).find_assignee
+    team_members_with_capacity = inbox.member_ids_with_assignment_capacity & team.members.ids
+    ::AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: team_members_with_capacity).find_assignee
   end
 
   def notify_assignment_change
diff --git a/app/models/concerns/round_robin_handler.rb b/app/models/concerns/auto_assignment_handler.rb
similarity index 59%
rename from app/models/concerns/round_robin_handler.rb
rename to app/models/concerns/auto_assignment_handler.rb
index f543f8e65..de5fdae7d 100644
--- a/app/models/concerns/round_robin_handler.rb
+++ b/app/models/concerns/auto_assignment_handler.rb
@@ -1,23 +1,23 @@
-module RoundRobinHandler
+module AutoAssignmentHandler
   extend ActiveSupport::Concern
   include Events::Types
 
   included do
-    after_save :run_round_robin
+    after_save :run_auto_assignment
   end
 
   private
 
-  def run_round_robin
+  def run_auto_assignment
     # Round robin kicks in on conversation create & update
     # run it only when conversation status changes to open
     return unless conversation_status_changed_to_open?
-    return unless should_round_robin?
+    return unless should_run_auto_assignment?
 
-    ::RoundRobin::AssignmentService.new(conversation: self, allowed_member_ids: inbox.member_ids_with_assignment_capacity).perform
+    ::AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: inbox.member_ids_with_assignment_capacity).perform
   end
 
-  def should_round_robin?
+  def should_run_auto_assignment?
     return false unless inbox.enable_auto_assignment?
 
     # run only if assignee is blank or doesn't have access to inbox
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index b17a0bdbf..852dd311d 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -7,19 +7,24 @@ module Avatarable
   included do
     has_one_attached :avatar
     validate :acceptable_avatar, if: -> { avatar.changed? }
+    after_save :fetch_avatar_from_gravatar
   end
 
   def avatar_url
     return url_for(avatar.representation(resize: '250x250')) if avatar.attached? && avatar.representable?
 
-    if [SuperAdmin, User, Contact].include?(self.class) && email.present?
-      hash = Digest::MD5.hexdigest(email)
-      return "https://www.gravatar.com/avatar/#{hash}?d=404"
-    end
-
     ''
   end
 
+  def fetch_avatar_from_gravatar
+    return unless saved_changes.key?(:email)
+    return if email.blank?
+
+    # Incase avatar_url is supplied, we don't want to fetch avatar from gravatar
+    # So we will wait for it to be processed
+    Avatar::AvatarFromGravatarJob.set(wait: 30.seconds).perform_later(self, email)
+  end
+
   def acceptable_avatar
     return unless avatar.attached?
 
diff --git a/app/models/contact_inbox.rb b/app/models/contact_inbox.rb
index bc4eb6484..dcbd2f56b 100644
--- a/app/models/contact_inbox.rb
+++ b/app/models/contact_inbox.rb
@@ -19,11 +19,6 @@
 #  index_contact_inboxes_on_pubsub_token            (pubsub_token) UNIQUE
 #  index_contact_inboxes_on_source_id               (source_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (contact_id => contacts.id) ON DELETE => cascade
-#  fk_rails_...  (inbox_id => inboxes.id) ON DELETE => cascade
-#
 
 class ContactInbox < ApplicationRecord
   include Pubsubable
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index e3791a9d3..8e6d61660 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -37,17 +37,11 @@
 #  index_conversations_on_status_and_account_id       (status,account_id)
 #  index_conversations_on_team_id                     (team_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (campaign_id => campaigns.id) ON DELETE => cascade
-#  fk_rails_...  (contact_inbox_id => contact_inboxes.id) ON DELETE => cascade
-#  fk_rails_...  (team_id => teams.id) ON DELETE => cascade
-#
 
 class Conversation < ApplicationRecord
   include Labelable
   include AssignmentHandler
-  include RoundRobinHandler
+  include AutoAssignmentHandler
   include ActivityMessageHandler
   include UrlHelper
   include SortHandler
@@ -88,7 +82,7 @@ class Conversation < ApplicationRecord
   has_many :mentions, dependent: :destroy_async
   has_many :messages, dependent: :destroy_async, autosave: true
   has_one :csat_survey_response, dependent: :destroy_async
-  has_many :notifications, as: :primary_actor, dependent: :destroy
+  has_many :notifications, as: :primary_actor, dependent: :destroy_async
 
   before_save :ensure_snooze_until_reset
   before_create :mark_conversation_pending_if_bot
diff --git a/app/models/csat_survey_response.rb b/app/models/csat_survey_response.rb
index 119d5c615..92ea25ebe 100644
--- a/app/models/csat_survey_response.rb
+++ b/app/models/csat_survey_response.rb
@@ -21,14 +21,6 @@
 #  index_csat_survey_responses_on_conversation_id    (conversation_id)
 #  index_csat_survey_responses_on_message_id         (message_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#  fk_rails_...  (assigned_agent_id => users.id) ON DELETE => cascade
-#  fk_rails_...  (contact_id => contacts.id) ON DELETE => cascade
-#  fk_rails_...  (conversation_id => conversations.id) ON DELETE => cascade
-#  fk_rails_...  (message_id => messages.id) ON DELETE => cascade
-#
 class CsatSurveyResponse < ApplicationRecord
   belongs_to :account
   belongs_to :conversation
diff --git a/app/models/dashboard_app.rb b/app/models/dashboard_app.rb
index 1f1b73d5c..c8558fb4c 100644
--- a/app/models/dashboard_app.rb
+++ b/app/models/dashboard_app.rb
@@ -15,11 +15,6 @@
 #  index_dashboard_apps_on_account_id  (account_id)
 #  index_dashboard_apps_on_user_id     (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id)
-#  fk_rails_...  (user_id => users.id)
-#
 class DashboardApp < ApplicationRecord
   belongs_to :user
   belongs_to :account
diff --git a/app/models/data_import.rb b/app/models/data_import.rb
index b83cf596a..b86ebac23 100644
--- a/app/models/data_import.rb
+++ b/app/models/data_import.rb
@@ -16,10 +16,6 @@
 #
 #  index_data_imports_on_account_id  (account_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#
 class DataImport < ApplicationRecord
   belongs_to :account
   validates :data_type, inclusion: { in: ['contacts'], message: I18n.t('errors.data_import.data_type.invalid') }
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 4ae240d7b..54a87bd36 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -136,7 +136,7 @@ class Inbox < ApplicationRecord
   end
 
   def delete_round_robin_agents
-    ::RoundRobin::ManageService.new(inbox: self).clear_queue
+    ::AutoAssignment::InboxRoundRobinService.new(inbox: self).clear_queue
   end
 
   def check_channel_type?
diff --git a/app/models/inbox_member.rb b/app/models/inbox_member.rb
index 38970789c..178c33642 100644
--- a/app/models/inbox_member.rb
+++ b/app/models/inbox_member.rb
@@ -28,10 +28,10 @@ class InboxMember < ApplicationRecord
   private
 
   def add_agent_to_round_robin
-    ::RoundRobin::ManageService.new(inbox: inbox).add_agent_to_queue(user_id)
+    ::AutoAssignment::InboxRoundRobinService.new(inbox: inbox).add_agent_to_queue(user_id)
   end
 
   def remove_agent_from_round_robin
-    ::RoundRobin::ManageService.new(inbox: inbox).remove_agent_from_queue(user_id) if inbox.present?
+    ::AutoAssignment::InboxRoundRobinService.new(inbox: inbox).remove_agent_from_queue(user_id) if inbox.present?
   end
 end
diff --git a/app/models/macro.rb b/app/models/macro.rb
new file mode 100644
index 000000000..df002d680
--- /dev/null
+++ b/app/models/macro.rb
@@ -0,0 +1,60 @@
+# == Schema Information
+#
+# Table name: macros
+#
+#  id            :bigint           not null, primary key
+#  actions       :jsonb            not null
+#  name          :string           not null
+#  visibility    :integer          default("personal")
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  account_id    :bigint           not null
+#  created_by_id :bigint           not null
+#  updated_by_id :bigint           not null
+#
+# Indexes
+#
+#  index_macros_on_account_id     (account_id)
+#  index_macros_on_created_by_id  (created_by_id)
+#  index_macros_on_updated_by_id  (updated_by_id)
+#
+class Macro < ApplicationRecord
+  belongs_to :account
+  belongs_to :created_by,
+             class_name: :User
+  belongs_to :updated_by,
+             class_name: :User
+  enum visibility: { personal: 0, global: 1 }
+
+  validate :json_actions_format
+
+  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agent send_webhook_event mute_conversation change_status
+                     resolve_conversation snooze_conversation].freeze
+
+  def set_visibility(user, params)
+    self.visibility = params[:visibility]
+    self.visibility = :personal if user.agent?
+  end
+
+  def self.with_visibility(user, params)
+    records = user.administrator? ? Current.account.macros : Current.account.macros.global
+    records = records.or(personal.where(created_by_id: user.id)) if user.agent?
+    records.page(current_page(params))
+    records
+  end
+
+  def self.current_page(params)
+    params[:page] || 1
+  end
+
+  private
+
+  def json_actions_format
+    return if actions.blank?
+
+    attributes = actions.map { |obj, _| obj['action_name'] }
+    actions = attributes - ACTIONS_ATTRS
+
+    errors.add(:actions, "Macro execution actions #{actions.join(',')} not supported.") if actions.any?
+  end
+end
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 00a3a859d..0e0fe762a 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -17,11 +17,6 @@
 #  index_mentions_on_user_id                      (user_id)
 #  index_mentions_on_user_id_and_conversation_id  (user_id,conversation_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (conversation_id => conversations.id) ON DELETE => cascade
-#  fk_rails_...  (user_id => users.id) ON DELETE => cascade
-#
 class Mention < ApplicationRecord
   include SortHandler
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 4b8a62e3b..68e4e34af 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -85,8 +85,9 @@ class Message < ApplicationRecord
   belongs_to :contact, required: false
   belongs_to :sender, polymorphic: true, required: false
 
-  has_many :attachments, dependent: :destroy_async, autosave: true, before_add: :validate_attachments_limit
+  has_many :attachments, dependent: :destroy, autosave: true, before_add: :validate_attachments_limit
   has_one :csat_survey_response, dependent: :destroy_async
+  has_many :notifications, as: :primary_actor, dependent: :destroy_async
 
   after_create_commit :execute_after_create_commit_callbacks
 
diff --git a/app/models/note.rb b/app/models/note.rb
index c33fd79b2..c1a49ba07 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -16,12 +16,6 @@
 #  index_notes_on_contact_id  (contact_id)
 #  index_notes_on_user_id     (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#  fk_rails_...  (contact_id => contacts.id) ON DELETE => cascade
-#  fk_rails_...  (user_id => users.id) ON DELETE => cascade
-#
 class Note < ApplicationRecord
   before_validation :ensure_account_id
   validates :content, presence: true
diff --git a/app/models/portal.rb b/app/models/portal.rb
index 19b6cfa31..e37a5992d 100644
--- a/app/models/portal.rb
+++ b/app/models/portal.rb
@@ -46,7 +46,7 @@ class Portal < ApplicationRecord
 
   scope :active, -> { where(archived: false) }
 
-  CONFIG_JSON_KEYS = %w[allowed_locales].freeze
+  CONFIG_JSON_KEYS = %w[allowed_locales default_locale].freeze
 
   def file_base_data
     {
@@ -60,9 +60,14 @@ class Portal < ApplicationRecord
     }
   end
 
+  def default_locale
+    config['default_locale'] || 'en'
+  end
+
   private
 
   def config_json_format
+    config['default_locale'] = 'en'
     denied_keys = config.keys - CONFIG_JSON_KEYS
     errors.add(:cofig, "in portal on #{denied_keys.join(',')} is not supported.") if denied_keys.any?
   end
diff --git a/app/models/team.rb b/app/models/team.rb
index 28e37f0cf..b4811e232 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -15,10 +15,6 @@
 #  index_teams_on_account_id           (account_id)
 #  index_teams_on_name_and_account_id  (name,account_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
-#
 class Team < ApplicationRecord
   belongs_to :account
   has_many :team_members, dependent: :destroy_async
@@ -48,4 +44,11 @@ class Team < ApplicationRecord
   def reporting_events
     account.reporting_events.where(conversation_id: conversations.pluck(:id))
   end
+
+  def push_event_data
+    {
+      id: id,
+      name: name
+    }
+  end
 end
diff --git a/app/models/team_member.rb b/app/models/team_member.rb
index d73cd7c09..f5d364007 100644
--- a/app/models/team_member.rb
+++ b/app/models/team_member.rb
@@ -14,11 +14,6 @@
 #  index_team_members_on_team_id_and_user_id  (team_id,user_id) UNIQUE
 #  index_team_members_on_user_id              (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (team_id => teams.id) ON DELETE => cascade
-#  fk_rails_...  (user_id => users.id) ON DELETE => cascade
-#
 class TeamMember < ApplicationRecord
   belongs_to :user
   belongs_to :team
diff --git a/app/models/user.rb b/app/models/user.rb
index 1da1fb3b7..6ed95ddb3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -100,6 +100,7 @@ class User < ApplicationRecord
            class_name: :Portal,
            dependent: :nullify,
            source: :portal
+  has_many :macros, foreign_key: 'created_by_id', dependent: :destroy_async
 
   before_validation :set_password_and_uid, on: :create
 
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index ec5799587..f97418339 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -10,4 +10,12 @@ class AccountPolicy < ApplicationPolicy
   def update_active_at?
     true
   end
+
+  def subscription?
+    @account_user.administrator?
+  end
+
+  def checkout?
+    @account_user.administrator?
+  end
 end
diff --git a/app/policies/macro_policy.rb b/app/policies/macro_policy.rb
new file mode 100644
index 000000000..f1a83bc4a
--- /dev/null
+++ b/app/policies/macro_policy.rb
@@ -0,0 +1,25 @@
+class MacroPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def create?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def update?
+    true
+  end
+
+  def destroy?
+    true
+  end
+
+  def execute?
+    true
+  end
+end
diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index 9f3b1dced..5981af051 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -27,6 +27,7 @@ class Conversations::EventDataPresenter < SimpleDelegator
     {
       sender: contact.push_event_data,
       assignee: assignee&.push_event_data,
+      team: team&.push_event_data,
       hmac_verified: contact_inbox&.hmac_verified
     }
   end
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
new file mode 100644
index 000000000..2983b3050
--- /dev/null
+++ b/app/services/action_service.rb
@@ -0,0 +1,57 @@
+class ActionService
+  def initialize(conversation)
+    @conversation = conversation
+  end
+
+  def mute_conversation(_params)
+    @conversation.mute!
+  end
+
+  def snooze_conversation(_params)
+    @conversation.snoozed!
+  end
+
+  def resolve_conversation(_params)
+    @conversation.resolved!
+  end
+
+  def change_status(status)
+    @conversation.update!(status: status[0])
+  end
+
+  def add_label(labels)
+    return if labels.empty?
+
+    @conversation.add_labels(labels)
+  end
+
+  def assign_best_agent(agent_ids = [])
+    return unless agent_belongs_to_account?(agent_ids)
+
+    @agent = @account.users.find_by(id: agent_ids)
+
+    @conversation.update!(assignee_id: @agent.id) if @agent.present?
+  end
+
+  def assign_team(team_ids = [])
+    return unless team_belongs_to_account?(team_ids)
+
+    @conversation.update!(team_id: team_ids[0])
+  end
+
+  private
+
+  def agent_belongs_to_account?(agent_ids)
+    @account.agents.pluck(:id).include?(agent_ids[0])
+  end
+
+  def team_belongs_to_account?(team_ids)
+    @account.team_ids.include?(team_ids[0])
+  end
+
+  def conversation_a_tweet?
+    return false if @conversation.additional_attributes.blank?
+
+    @conversation.additional_attributes['type'] == 'tweet'
+  end
+end
diff --git a/app/services/auto_assignment/agent_assignment_service.rb b/app/services/auto_assignment/agent_assignment_service.rb
new file mode 100644
index 000000000..5beaee2c3
--- /dev/null
+++ b/app/services/auto_assignment/agent_assignment_service.rb
@@ -0,0 +1,38 @@
+class AutoAssignment::AgentAssignmentService
+  # Allowed agent ids: array
+  # This is the list of agents from which an agent can be assigned to this conversation
+  # examples: Agents with assignment capacity, Agents who are members of a team etc
+  pattr_initialize [:conversation!, :allowed_agent_ids!]
+
+  def find_assignee
+    round_robin_manage_service.available_agent(allowed_agent_ids: allowed_online_agent_ids)
+  end
+
+  def perform
+    new_assignee = find_assignee
+    conversation.update(assignee: new_assignee) if new_assignee
+  end
+
+  private
+
+  def online_agent_ids
+    online_agents = OnlineStatusTracker.get_available_users(conversation.account_id)
+    online_agents.select { |_key, value| value.eql?('online') }.keys if online_agents.present?
+  end
+
+  def allowed_online_agent_ids
+    # We want to perform roundrobin only over online agents
+    # Hence taking an intersection of online agents and allowed member ids
+
+    # the online user ids are string, since its from redis, allowed member ids are integer, since its from active record
+    @allowed_online_agent_ids ||= online_agent_ids & allowed_agent_ids&.map(&:to_s)
+  end
+
+  def round_robin_manage_service
+    @round_robin_manage_service ||= AutoAssignment::InboxRoundRobinService.new(inbox: conversation.inbox)
+  end
+
+  def round_robin_key
+    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: conversation.inbox_id)
+  end
+end
diff --git a/app/services/auto_assignment/inbox_round_robin_service.rb b/app/services/auto_assignment/inbox_round_robin_service.rb
new file mode 100644
index 000000000..c17f91c6c
--- /dev/null
+++ b/app/services/auto_assignment/inbox_round_robin_service.rb
@@ -0,0 +1,62 @@
+class AutoAssignment::InboxRoundRobinService
+  pattr_initialize [:inbox!]
+
+  # called on inbox delete
+  def clear_queue
+    ::Redis::Alfred.delete(round_robin_key)
+  end
+
+  # called on inbox member create
+  def add_agent_to_queue(user_id)
+    ::Redis::Alfred.lpush(round_robin_key, user_id)
+  end
+
+  # called on inbox member delete
+  def remove_agent_from_queue(user_id)
+    ::Redis::Alfred.lrem(round_robin_key, user_id)
+  end
+
+  def reset_queue
+    clear_queue
+    add_agent_to_queue(inbox.inbox_members.map(&:user_id))
+  end
+
+  # end of queue management functions
+
+  # allowed member ids = [assignable online agents supplied by the assignement service]
+  # the values of allowed member ids should be in string format
+  def available_agent(allowed_agent_ids: [])
+    reset_queue unless validate_queue?
+    user_id = get_member_from_allowed_agent_ids(allowed_agent_ids)
+    inbox.inbox_members.find_by(user_id: user_id)&.user if user_id.present?
+  end
+
+  private
+
+  def get_member_from_allowed_agent_ids(allowed_agent_ids)
+    return nil if allowed_agent_ids.blank?
+
+    user_id = queue.intersection(allowed_agent_ids).pop
+    pop_push_to_queue(user_id)
+    user_id
+  end
+
+  def pop_push_to_queue(user_id)
+    return if user_id.blank?
+
+    remove_agent_from_queue(user_id)
+    add_agent_to_queue(user_id)
+  end
+
+  def validate_queue?
+    return true if inbox.inbox_members.map(&:user_id).sort == queue.map(&:to_i).sort
+  end
+
+  def queue
+    ::Redis::Alfred.lrange(round_robin_key)
+  end
+
+  def round_robin_key
+    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: inbox.id)
+  end
+end
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 1d2e0d4da..c28285fe7 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -1,8 +1,8 @@
-class AutomationRules::ActionService
+class AutomationRules::ActionService < ActionService
   def initialize(rule, account, conversation)
+    super(conversation)
     @rule = rule
     @account = account
-    @conversation = conversation
     Current.executed_by = rule
   end
 
@@ -41,22 +41,6 @@ class AutomationRules::ActionService
     end
   end
 
-  def mute_conversation(_params)
-    @conversation.mute!
-  end
-
-  def snooze_conversation(_params)
-    @conversation.snoozed!
-  end
-
-  def resolve_conversation(_params)
-    @conversation.resolved!
-  end
-
-  def change_status(status)
-    @conversation.update!(status: status[0])
-  end
-
   def send_webhook_event(webhook_url)
     payload = @conversation.webhook_data.merge(event: "automation_event.#{@rule.event_name}")
     WebhookJob.perform_later(webhook_url[0], payload)
@@ -70,26 +54,6 @@ class AutomationRules::ActionService
     mb.perform
   end
 
-  def assign_team(team_ids = [])
-    return unless team_belongs_to_account?(team_ids)
-
-    @conversation.update!(team_id: team_ids[0])
-  end
-
-  def assign_best_agent(agent_ids = [])
-    return unless agent_belongs_to_account?(agent_ids)
-
-    @agent = @account.users.find_by(id: agent_ids)
-
-    @conversation.update!(assignee_id: @agent.id) if @agent.present?
-  end
-
-  def add_label(labels)
-    return if labels.empty?
-
-    @conversation.add_labels(labels)
-  end
-
   def send_email_to_team(params)
     teams = Team.where(id: params[0][:team_ids])
 
@@ -97,18 +61,4 @@ class AutomationRules::ActionService
       TeamNotifications::AutomationNotificationMailer.conversation_creation(@conversation, team, params[0][:message])&.deliver_now
     end
   end
-
-  def agent_belongs_to_account?(agent_ids)
-    @account.agents.pluck(:id).include?(agent_ids[0])
-  end
-
-  def team_belongs_to_account?(team_ids)
-    @account.team_ids.include?(team_ids[0])
-  end
-
-  def conversation_a_tweet?
-    return false if @conversation.additional_attributes.blank?
-
-    @conversation.additional_attributes['type'] == 'tweet'
-  end
 end
diff --git a/app/services/instagram/webhooks_base_service.rb b/app/services/instagram/webhooks_base_service.rb
index 021a132e2..c89b67654 100644
--- a/app/services/instagram/webhooks_base_service.rb
+++ b/app/services/instagram/webhooks_base_service.rb
@@ -16,6 +16,6 @@ class Instagram::WebhooksBaseService
     )
 
     @contact = @contact_inbox.contact
-    ContactAvatarJob.perform_later(@contact, user['profile_pic']) if user['profile_pic']
+    Avatar::AvatarFromUrlJob.perform_later(@contact, user['profile_pic']) if user['profile_pic']
   end
 end
diff --git a/app/services/macros/execution_service.rb b/app/services/macros/execution_service.rb
new file mode 100644
index 000000000..f9a32ef68
--- /dev/null
+++ b/app/services/macros/execution_service.rb
@@ -0,0 +1,38 @@
+class Macros::ExecutionService < ActionService
+  def initialize(macro, conversation, user)
+    super(conversation)
+    @macro = macro
+    @account = macro.account
+    Current.user = user
+  end
+
+  def perform
+    @macro.actions.each do |action|
+      action = action.with_indifferent_access
+      begin
+        send(action[:action_name], action[:action_params])
+      rescue StandardError => e
+        ChatwootExceptionTracker.new(e, account: @account).capture_exception
+      end
+    end
+  ensure
+    Current.reset
+  end
+
+  private
+
+  def send_webhook_event(webhook_url)
+    payload = @conversation.webhook_data.merge(event: "macro_event.#{@macro.name}")
+    WebhookJob.perform_later(webhook_url[0], payload)
+  end
+
+  def send_message(message)
+    return if conversation_a_tweet?
+
+    params = { content: message[0], private: false, content_attributes: { macro_id: @macro.id } }
+    mb = Messages::MessageBuilder.new(nil, @conversation, params)
+    mb.perform
+  end
+
+  def send_email_to_team(_params); end
+end
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index 285ad1bc8..2f2bb11e3 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -33,7 +33,7 @@ class Notification::PushNotificationService
   def push_message
     {
       title: notification.push_message_title,
-      tag: "#{notification.notification_type}_#{conversation.display_id}",
+      tag: "#{notification.notification_type}_#{conversation.display_id}_#{notification.id}",
       url: push_url
     }
   end
diff --git a/app/services/round_robin/assignment_service.rb b/app/services/round_robin/assignment_service.rb
deleted file mode 100644
index 6cd37b8de..000000000
--- a/app/services/round_robin/assignment_service.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class RoundRobin::AssignmentService
-  pattr_initialize [:conversation, { allowed_member_ids: [] }]
-
-  def find_assignee
-    round_robin_manage_service.available_agent(priority_list: online_agents)
-  end
-
-  def perform
-    # online agents will get priority
-    new_assignee = find_assignee
-    conversation.update(assignee: new_assignee) if new_assignee
-  end
-
-  private
-
-  def online_agents
-    online_agents = OnlineStatusTracker.get_available_users(conversation.account_id)
-    online_agents.select { |_key, value| value.eql?('online') }.keys if online_agents.present?
-  end
-
-  def round_robin_manage_service
-    @round_robin_manage_service ||= RoundRobin::ManageService.new(inbox: conversation.inbox, allowed_member_ids: allowed_member_ids)
-  end
-
-  def round_robin_key
-    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: conversation.inbox_id)
-  end
-end
diff --git a/app/services/round_robin/manage_service.rb b/app/services/round_robin/manage_service.rb
deleted file mode 100644
index 3b5fd1660..000000000
--- a/app/services/round_robin/manage_service.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# NOTE: available agent method now expect allowed_member_ids to be passed in always because of inbox limits feature
-# need to refactor this class and split the queue managment into a seperate class
-
-# If allowed_member_ids are supplied round robin service will only fetch a member from member id
-# This is used in case of team assignment
-class RoundRobin::ManageService
-  pattr_initialize [:inbox!, { allowed_member_ids: [] }]
-
-  # called on inbox delete
-  def clear_queue
-    ::Redis::Alfred.delete(round_robin_key)
-  end
-
-  # called on inbox member create
-  def add_agent_to_queue(user_id)
-    ::Redis::Alfred.lpush(round_robin_key, user_id)
-  end
-
-  # called on inbox member delete
-  def remove_agent_from_queue(user_id)
-    ::Redis::Alfred.lrem(round_robin_key, user_id)
-  end
-
-  def reset_queue
-    clear_queue
-    add_agent_to_queue(inbox.inbox_members.map(&:user_id))
-  end
-
-  # end of queue management functions
-
-  def available_agent(priority_list: [])
-    reset_queue unless validate_queue?
-    user_id = get_member_via_priority_list(priority_list)
-    # incase priority list was empty or inbox members weren't present
-    user_id ||= fetch_user_id
-    inbox.inbox_members.find_by(user_id: user_id)&.user if user_id.present?
-  end
-
-  private
-
-  def fetch_user_id
-    return nil if allowed_member_ids_in_str.blank?
-
-    user_id = queue.intersection(allowed_member_ids_in_str).pop
-    pop_push_to_queue(user_id)
-    user_id
-  end
-
-  # priority list is usually the members who are online passed from assignment service
-  def get_member_via_priority_list(priority_list)
-    return if priority_list.blank?
-
-    # When allowed member ids is passed we will be looking to get members from that list alone
-    priority_list = priority_list.intersection(allowed_member_ids_in_str)
-    return if priority_list.blank?
-
-    user_id = queue.intersection(priority_list.map(&:to_s)).pop
-    pop_push_to_queue(user_id)
-    user_id
-  end
-
-  def pop_push_to_queue(user_id)
-    return if user_id.blank?
-
-    remove_agent_from_queue(user_id)
-    add_agent_to_queue(user_id)
-  end
-
-  def validate_queue?
-    return true if inbox.inbox_members.map(&:user_id).sort == queue.map(&:to_i).sort
-  end
-
-  def queue
-    ::Redis::Alfred.lrange(round_robin_key)
-  end
-
-  def round_robin_key
-    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: inbox.id)
-  end
-
-  def allowed_member_ids_in_str
-    # NOTE: the values which are returned from redis for priority list are string
-    @allowed_member_ids_in_str ||= allowed_member_ids.map(&:to_s)
-  end
-end
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index 7ff7a6155..ae26db899 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -45,7 +45,7 @@ class Telegram::IncomingMessageService
     return if @contact.avatar.attached?
 
     avatar_url = inbox.channel.get_telegram_profile_image(params[:message][:from][:id])
-    ::ContactAvatarJob.perform_later(@contact, avatar_url) if avatar_url
+    ::Avatar::AvatarFromUrlJob.perform_later(@contact, avatar_url) if avatar_url
   end
 
   def conversation_params
diff --git a/app/services/twitter/webhooks_base_service.rb b/app/services/twitter/webhooks_base_service.rb
index ea0abadf8..5ad822142 100644
--- a/app/services/twitter/webhooks_base_service.rb
+++ b/app/services/twitter/webhooks_base_service.rb
@@ -30,6 +30,6 @@ class Twitter::WebhooksBaseService
       user['id'], user['name'], additional_contact_attributes(user)
     )
     @contact = @contact_inbox.contact
-    ContactAvatarJob.perform_later(@contact, user['profile_image_url']) if user['profile_image_url']
+    Avatar::AvatarFromUrlJob.perform_later(@contact, user['profile_image_url']) if user['profile_image_url']
   end
 end
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index ea8c01791..0858b28f2 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -70,6 +70,10 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
     attachment = message.attachments.first
     type = %w[image audio video].include?(attachment.file_type) ? attachment.file_type : 'document'
     attachment_url = attachment.download_url
+    type_content = {
+      'link': attachment_url
+    }
+    type_content['caption'] = message.content if type != 'audio'
     response = HTTParty.post(
       "#{phone_id_path}/messages",
       headers: api_headers,
@@ -77,10 +81,7 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
         messaging_product: 'whatsapp',
         'to' => phone_number,
         'type' => type,
-        type.to_s => {
-          'link': attachment_url,
-          'caption': message.content
-        }
+        type.to_s => type_content
       }.to_json
     )
 
diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
index e3b1af52b..035555bea 100644
--- a/app/views/api/v1/accounts/articles/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -1,10 +1,15 @@
 json.id article.id
-json.category_id article.category_id
 json.title article.title
 json.content article.content
 json.description article.description
 json.status article.status
 json.account_id article.account_id
+json.updated_at article.updated_at.to_i
+
+json.category do
+  json.id article.category_id
+  json.name article.category.name
+end
 
 if article.portal.present?
   json.portal do
diff --git a/app/views/api/v1/accounts/articles/index.json.jbuilder b/app/views/api/v1/accounts/articles/index.json.jbuilder
index 3e3364007..fef8dc521 100644
--- a/app/views/api/v1/accounts/articles/index.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/index.json.jbuilder
@@ -1,3 +1,8 @@
 json.payload do
   json.array! @articles, partial: 'article', as: :article
 end
+
+json.meta do
+  json.current_page @current_page
+  json.articles_count @articles_count
+end
diff --git a/app/views/api/v1/accounts/categories/_category.json.jbuilder b/app/views/api/v1/accounts/categories/_category.json.jbuilder
index 2e4263722..dccf70bd6 100644
--- a/app/views/api/v1/accounts/categories/_category.json.jbuilder
+++ b/app/views/api/v1/accounts/categories/_category.json.jbuilder
@@ -25,3 +25,7 @@ if category.root_category.present?
     json.partial! 'api/v1/accounts/categories/associated_category.json.jbuilder', category: category.root_category
   end
 end
+
+json.meta do
+  json.articles_count category.articles.size
+end
diff --git a/app/views/api/v1/accounts/categories/index.json.jbuilder b/app/views/api/v1/accounts/categories/index.json.jbuilder
index 89fa05200..f73995c2c 100644
--- a/app/views/api/v1/accounts/categories/index.json.jbuilder
+++ b/app/views/api/v1/accounts/categories/index.json.jbuilder
@@ -1,3 +1,8 @@
 json.payload do
   json.array! @categories, partial: 'category', as: :category
 end
+
+json.meta do
+  json.current_page @current_page
+  json.categories_count @categories.size
+end
diff --git a/app/views/api/v1/accounts/create.json.jbuilder b/app/views/api/v1/accounts/create.json.jbuilder
index 29bedff8b..240e04ae1 100644
--- a/app/views/api/v1/accounts/create.json.jbuilder
+++ b/app/views/api/v1/accounts/create.json.jbuilder
@@ -18,6 +18,7 @@ json.data do
       json.name account_user.account.name
       json.active_at account_user.active_at
       json.role account_user.role
+      json.locale account_user.account.locale
     end
   end
 end
diff --git a/app/views/api/v1/accounts/macros/create.json.jbuilder b/app/views/api/v1/accounts/macros/create.json.jbuilder
new file mode 100644
index 000000000..5c8ef098f
--- /dev/null
+++ b/app/views/api/v1/accounts/macros/create.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
+end
diff --git a/app/views/api/v1/accounts/macros/index.json.jbuilder b/app/views/api/v1/accounts/macros/index.json.jbuilder
new file mode 100644
index 000000000..5f5c5a9c2
--- /dev/null
+++ b/app/views/api/v1/accounts/macros/index.json.jbuilder
@@ -0,0 +1,5 @@
+json.payload do
+  json.array! @macros do |macro|
+    json.partial! 'api/v1/models/macro.json.jbuilder', macro: macro
+  end
+end
diff --git a/app/views/api/v1/accounts/macros/show.json.jbuilder b/app/views/api/v1/accounts/macros/show.json.jbuilder
new file mode 100644
index 000000000..5c8ef098f
--- /dev/null
+++ b/app/views/api/v1/accounts/macros/show.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
+end
diff --git a/app/views/api/v1/accounts/macros/update.json.jbuilder b/app/views/api/v1/accounts/macros/update.json.jbuilder
new file mode 100644
index 000000000..5c8ef098f
--- /dev/null
+++ b/app/views/api/v1/accounts/macros/update.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
+end
diff --git a/app/views/api/v1/accounts/portals/_portal.json.jbuilder b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
index 12fcde593..a1a16a647 100644
--- a/app/views/api/v1/accounts/portals/_portal.json.jbuilder
+++ b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
@@ -7,7 +7,15 @@ json.name portal.name
 json.page_title portal.page_title
 json.slug portal.slug
 json.archived portal.archived
-json.config portal.config
+
+json.config do
+  json.allowed_locales do
+    json.array! portal.config['allowed_locales'].each do |locale|
+      json.partial! 'api/v1/models/portal_config.json.jbuilder', locale: locale, portal: portal
+    end
+  end
+end
+
 json.logo portal.file_base_data if portal.logo.present?
 
 json.portal_members do
@@ -17,3 +25,13 @@ json.portal_members do
     end
   end
 end
+
+json.meta do
+  json.all_articles_count portal.articles.size
+  json.archived_articles_count portal.articles.archived.size
+  json.published_count portal.articles.published.size
+  json.draft_articles_count portal.articles.draft.size
+  json.mine_articles_count portal.articles.search_by_author(current_user.id).size if current_user.present?
+  json.categories_count portal.categories.size
+  json.default_locale portal.default_locale
+end
diff --git a/app/views/api/v1/accounts/portals/index.json.jbuilder b/app/views/api/v1/accounts/portals/index.json.jbuilder
index 3e4553382..2fb93d918 100644
--- a/app/views/api/v1/accounts/portals/index.json.jbuilder
+++ b/app/views/api/v1/accounts/portals/index.json.jbuilder
@@ -1,3 +1,8 @@
 json.payload do
   json.array! @portals, partial: 'portal', as: :portal
 end
+
+json.meta do
+  json.current_page @current_page
+  json.portals_count @portals.size
+end
diff --git a/app/views/api/v1/accounts/show.json.jbuilder b/app/views/api/v1/accounts/show.json.jbuilder
index 39ca92955..2bbdda576 100644
--- a/app/views/api/v1/accounts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/show.json.jbuilder
@@ -1,9 +1,2 @@
-json.id @account.id
-json.name @account.name
-json.locale @account.locale
-json.domain @account.domain
-json.custom_email_domain_enabled @account.custom_email_domain_enabled
-json.support_email @account.support_email
-json.features @account.all_features
-json.auto_resolve_duration @account.auto_resolve_duration
+json.partial! 'api/v1/models/account.json.jbuilder', resource: @account
 json.latest_chatwoot_version @latest_chatwoot_version
diff --git a/app/views/api/v1/accounts/update.json.jbuilder b/app/views/api/v1/accounts/update.json.jbuilder
index 68acc570a..c1905c972 100644
--- a/app/views/api/v1/accounts/update.json.jbuilder
+++ b/app/views/api/v1/accounts/update.json.jbuilder
@@ -1,7 +1 @@
-json.id @account.id
-json.name @account.name
-json.locale @account.locale
-json.domain @account.domain
-json.custom_email_domain_enabled @account.custom_email_domain_enabled
-json.support_email @account.support_email
-json.features @account.enabled_features
+json.partial! 'api/v1/models/account.json.jbuilder', resource: @account
diff --git a/app/views/api/v1/models/_account.json.jbuilder b/app/views/api/v1/models/_account.json.jbuilder
new file mode 100644
index 000000000..3d258265a
--- /dev/null
+++ b/app/views/api/v1/models/_account.json.jbuilder
@@ -0,0 +1,16 @@
+json.auto_resolve_duration resource.auto_resolve_duration
+json.created_at resource.created_at
+if resource.custom_attributes.present?
+  json.custom_attributes do
+    json.plan_name resource.custom_attributes['plan_name']
+    json.subscribed_quantity resource.custom_attributes['subscribed_quantity']
+  end
+end
+json.custom_email_domain_enabled @account.custom_email_domain_enabled
+json.domain @account.domain
+json.features @account.enabled_features
+json.id @account.id
+json.locale @account.locale
+json.name @account.name
+json.support_email @account.support_email
+json.status @account.status
diff --git a/app/views/api/v1/models/_macro.json.jbuilder b/app/views/api/v1/models/_macro.json.jbuilder
new file mode 100644
index 000000000..f88d5922b
--- /dev/null
+++ b/app/views/api/v1/models/_macro.json.jbuilder
@@ -0,0 +1,18 @@
+json.id macro.id
+json.name macro.name
+json.visibility macro.visibility
+
+if macro.created_by.present?
+  json.created_by do
+    json.partial! 'api/v1/models/agent.json.jbuilder', resource: macro.created_by
+  end
+end
+
+if macro.updated_by.present?
+  json.updated_by do
+    json.partial! 'api/v1/models/agent.json.jbuilder', resource: macro.updated_by
+  end
+end
+
+json.account_id macro.account_id
+json.actions macro.actions
diff --git a/app/views/api/v1/models/_portal_config.json.jbuilder b/app/views/api/v1/models/_portal_config.json.jbuilder
new file mode 100644
index 000000000..38e4fdd50
--- /dev/null
+++ b/app/views/api/v1/models/_portal_config.json.jbuilder
@@ -0,0 +1,3 @@
+json.code locale
+json.articles_count portal.articles.search({ locale: locale }).size
+json.categories_count portal.categories.search_by_locale(locale).size
diff --git a/app/views/api/v1/models/_user.json.jbuilder b/app/views/api/v1/models/_user.json.jbuilder
index 4fc857ae7..4e7075e39 100644
--- a/app/views/api/v1/models/_user.json.jbuilder
+++ b/app/views/api/v1/models/_user.json.jbuilder
@@ -20,6 +20,7 @@ json.accounts do
   json.array! resource.account_users do |account_user|
     json.id account_user.account_id
     json.name account_user.account.name
+    json.status account_user.account.status
     json.active_at account_user.active_at
     json.role account_user.role
     # the actual availability user has configured
diff --git a/app/views/public/api/v1/models/_category.json.jbuilder b/app/views/public/api/v1/models/_category.json.jbuilder
index ee3057ae3..e257b0045 100644
--- a/app/views/public/api/v1/models/_category.json.jbuilder
+++ b/app/views/public/api/v1/models/_category.json.jbuilder
@@ -23,3 +23,7 @@ if category.root_category.present?
     json.partial! partial: 'associated_category', category: category.root_category
   end
 end
+
+json.meta do
+  json.articles_count category.articles.published.size
+end
diff --git a/app/views/public/api/v1/models/_portal.json.jbuilder b/app/views/public/api/v1/models/_portal.json.jbuilder
index 405541a5b..edae5cf98 100644
--- a/app/views/public/api/v1/models/_portal.json.jbuilder
+++ b/app/views/public/api/v1/models/_portal.json.jbuilder
@@ -8,7 +8,13 @@ json.slug portal.slug
 json.categories do
   if portal.categories.any?
     json.array! portal.categories.each do |category|
-      json.partial! 'categories/category.json.jbuilder', category: category
+      json.partial! 'api/v1/models/category.json.jbuilder', category: category
     end
   end
 end
+
+json.meta do
+  json.articles_count portal.articles.published.size
+  json.categories_count portal.categories.size
+  json.default_locale portal.default_locale
+end
diff --git a/app/views/public/api/v1/portals/articles/index.json.jbuilder b/app/views/public/api/v1/portals/articles/index.json.jbuilder
index 477662a36..00d271834 100644
--- a/app/views/public/api/v1/portals/articles/index.json.jbuilder
+++ b/app/views/public/api/v1/portals/articles/index.json.jbuilder
@@ -1,3 +1,7 @@
 json.payload do
   json.array! @articles, partial: 'public/api/v1/models/article.json.jbuilder', as: :article
 end
+
+json.meta do
+  json.articles_count @articles.published.size
+end
diff --git a/config/app.yml b/config/app.yml
index e5964c081..4f7549d2f 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.7.0'
+  version: '2.8.0'
 
 development:
   <<: *shared
diff --git a/config/elastic_apm.yml b/config/elastic_apm.yml
new file mode 100644
index 000000000..6f189d3af
--- /dev/null
+++ b/config/elastic_apm.yml
@@ -0,0 +1,5 @@
+# Disabled by default to prevent the agent starting up when not required
+# To enable, set your ELASTIC_APM_SERVER_URL and ELASTIC_APM_SECRET_TOKEN in your .env
+# Additional configuration options can be set below, as per the docs: https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html#configuration
+
+enabled: <%= ENV.fetch('ELASTIC_APM_SECRET_TOKEN',  false).present? %>
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index f177b8cbb..ead514a2b 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -35,7 +35,8 @@ LANGUAGES_CONFIG = {
   30 => { name: '中文 (zh-CN)', iso_639_3_code: 'zho', iso_639_1_code: 'zh_CN', enabled: true },
   31 => { name: 'język polski (pl)', iso_639_3_code: 'pol', iso_639_1_code: 'pl', enabled: true },
   32 => { name: 'slovenčina (sk)', iso_639_3_code: 'slk', iso_639_1_code: 'sk', enabled: true },
-  33 => { name: 'украї́нська мо́ва (uk)', iso_639_3_code: 'ukr', iso_639_1_code: 'uk', enabled: true }
+  33 => { name: 'украї́нська мо́ва (uk)', iso_639_3_code: 'ukr', iso_639_1_code: 'uk', enabled: true },
+  34 => { name: 'ภาษาไทย (th)', iso_639_3_code: 'tha', iso_639_1_code: 'th', enabled: true }
 }.filter { |_key, val| val[:enabled] }.freeze
 
 Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }
diff --git a/config/initializers/stripe.rb b/config/initializers/stripe.rb
new file mode 100644
index 000000000..585d9dad4
--- /dev/null
+++ b/config/initializers/stripe.rb
@@ -0,0 +1,3 @@
+require 'stripe'
+
+Stripe.api_key = ENV.fetch('STRIPE_SECRET_KEY', nil)
diff --git a/config/installation_config.yml b/config/installation_config.yml
index ec3b0b635..74a45b1c5 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -68,3 +68,7 @@
 - name: CSML_BOT_API_KEY
   value:
   locked: false
+- name: CHATWOOT_CLOUD_PLANS
+  value:
+- name: DEPLOYMENT_ENV
+  value: self-hosted
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index dd63c5e64..2cf73a44b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -23,7 +23,7 @@ ar:
     reset_password_failure: أوه! لم نتمكن من العثور على أي مستخدم بعنوان البريد الإلكتروني المحدد.
   errors:
     validations:
-      presence: must not be blank
+      presence: يجب ألا يكون فارغاً
     webhook:
       invalid: أحداث غير صالحة
     signup:
@@ -33,17 +33,17 @@ ar:
       failed: فشلت عملية التسجيل
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: نوع البيانات غير صالح
     contacts:
       import:
         failed: الملف فارغ
       email:
-        invalid: Invalid email
+        invalid: إيميل غير صالح
       phone_number:
-        invalid: should be in e164 format
+        invalid: يجب أن يكون بصيغة e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: يجب أن تكون فريدة من نوعها في الفئة والبوابة
     inboxes:
       imap:
         socket_error: الرجاء التحقق من اتصال الشبكة، عنوان IMAP وحاول مرة أخرى.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index df5077b8b..58c3a72f7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -23,7 +23,7 @@ de:
     reset_password_failure: Uh ho! Wir konnten keinen Benutzer mit der angegebenen E-Mail-Adresse finden.
   errors:
     validations:
-      presence: must not be blank
+      presence: darf nicht leer sein
     webhook:
       invalid: Ungültige Events
     signup:
@@ -33,17 +33,17 @@ de:
       failed: Anmeldung gescheitert
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Ungültiger Datentyp
     contacts:
       import:
         failed: Datei ist leer
       email:
-        invalid: Invalid email
+        invalid: Ungültige E-Mail
       phone_number:
-        invalid: should be in e164 format
+        invalid: sollte im e164-Format vorliegen
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: sollte in der Kategorie und im Portal eindeutig sein
     inboxes:
       imap:
         socket_error: Bitte überprüfen Sie die Netzwerkverbindung, die IMAP-Adresse und versuchen Sie es erneut.
diff --git a/config/locales/devise.ka.yml b/config/locales/devise.ka.yml
new file mode 100644
index 000000000..be89676a0
--- /dev/null
+++ b/config/locales/devise.ka.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ka:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation Instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index 516a06a31..19e747525 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -2,61 +2,61 @@
 sr-Latn:
   devise:
     confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+      confirmed: "Vaša adresa e-pošte je uspešno potvrđena."
+      send_instructions: "Za nekoliko minuta ćete dobiti e-poruku sa uputstvom kako da potvrdite vašu adresu e-pošte."
+      send_paranoid_instructions: "Ako vaša adresa e-pošte postoji u našoj bazi podataka, za nekoliko minuta ćete dobiti e-poruku sa uputstvom kako da potvrdite vašu adresu e-pošte."
     failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
-      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
+      already_authenticated: "Već ste prijavljeni."
+      inactive: "Vaš nalog još uvek nije aktiviran."
+      invalid: "Neispravan %{authentication_keys}/lozinka ili nalog još uvek nije potvrđen."
+      locked: "Vaš nalog je zaključan."
+      last_attempt: "Imate još jedan pokušaj pre nego što se nalog zaključa."
+      not_found_in_database: "Neispravan %{authentication_keys} ili lozinka."
+      timeout: "Vaša sesija je istekla. Molim vas prijavite se ponovo da bi ste nastavili."
+      unauthenticated: "Morate se prijaviti ili registrovati pre nego što nastavite."
+      unconfirmed: "Morate da potvrdite vašu adresu e-pošte pre nego što nastavite."
     mailer:
       confirmation_instructions:
-        subject: "Confirmation Instructions"
+        subject: "Uputstvo za potvrdu"
       reset_password_instructions:
-        subject: "Reset password instructions"
+        subject: "Uputstvo za resetovanje lozinke"
       unlock_instructions:
-        subject: "Unlock instructions"
+        subject: "Uputstvo za otključavanje"
       password_change:
-        subject: "Password Changed"
+        subject: "Lozinka je promenjena"
     omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
+      failure: "Nismo mogli da vas autentifikujemo sa %{kind} zbog \"%{reason}\"."
+      success: "Uspešna autentifikacija sa %{kind} naloga."
     passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
+      no_token: "Ne možete da pristupite ovoj stranici bez dolaska iz e-poruke za resetovanje lozinke. Ako ste došli iz e-poruke za resetovanje lozinke, proverite da ste koristili kompletnu adresu koja vam je dostavljena."
+      send_instructions: "Za nekoliko minuta ćete dobiti e-poruku sa uputstvom kako da resetujete vašu lozinku."
+      send_paranoid_instructions: "Ako vaša adresa e-pošte postoji u našoj bazi podataka, za nekoliko minuta ćete dobiti vezu za povraćaj lozinke na adresu vaše e-pošte."
+      updated: "Vaša lozinka je uspešno promenjena. Sada ste odjavljeni."
+      updated_not_active: "Vaša lozinka je uspešno promenjena."
     registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated successfully."
+      destroyed: "Zbogom! Vaš nalog je uspešno poništen. Nadamo se da ćemo vas videti ponovo."
+      signed_up: "Dobrodošli! Uspešno ste se registrovali."
+      signed_up_but_inactive: "Uspešno ste se registrovali. Međutim, nismo mogli da vas prijavimo jer vaš nalog još uvek nije aktiviran."
+      signed_up_but_locked: "Uspešno ste se registrovali. Međutim, nismo mogli da vas prijavimo jer je vaš nalog zaključan."
+      signed_up_but_unconfirmed: "Poruka sa vezom za potvrdu je poslata na adresu vaše e-pošte. Molim vas ispratite vezu da bi ste aktivirali vaš nalog."
+      update_needs_confirmation: "Vaš nalog je uspešno izmenjen, ali moramo da potvrdimo vašu novu adresu e-pošte. Molim vas proverite vašu e-poštu i ispratite vezu za potvrdu da bi ste potvrdili vašu novu adresu e-pošte."
+      updated: "Vaš nalog je uspešno izmenjen."
     sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
+      signed_in: "Uspešno ste se prijavili."
+      signed_out: "Uspešno ste se odjavili."
+      already_signed_out: "Uspešno ste se odjavili."
     unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+      send_instructions: "Za nekoliko minuta ćete dobiti e-poruku sa uputstvom kako da otključate vaš nalog."
+      send_paranoid_instructions: "Ako vaš nalog postoji, za nekoliko minuta ćete dobiti e-poruku sa uputstvom kako da ga otključate."
+      unlocked: "Vaš nalog je uspešno otključan. Molim vas prijavite se da bi ste nastavili."
   errors:
     messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
+      already_confirmed: "je već potvrđen, molim vas pokušajte da se prijavite"
+      confirmation_period_expired: "mora da bude potvrđen za %{period}, molim vas zahtevajte novu"
+      expired: "je istekao, molim vas zahtevajte novu"
+      not_found: "nije pronađen"
+      not_locked: "nije zaključan"
       not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        few: "%{count} errors prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+        one: "1 greška je sprečila da ovaj %{resource} bude sačuvan:"
+        few: "%{count} grešaka je sprečilo da ovaj %{resource} bude sačuvan:"
+        other: "%{count} grešaka je sprečilo da ovaj %{resource} bude sačuvan:"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c3d573bfb..28efcc0a8 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -96,7 +96,7 @@ fa:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} در داستان به شما اشاره کرده: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: این داستان دیگر در دسترس نیست.
       deleted: این پیام حذف شد
     activity:
       status:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 496a96556..4cad4543f 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -23,7 +23,7 @@ it:
     reset_password_failure: Uh ho! Non siamo riusciti a trovare alcun utente con l'email specificata.
   errors:
     validations:
-      presence: must not be blank
+      presence: non deve essere vuoto
     webhook:
       invalid: Eventi non validi
     signup:
@@ -33,17 +33,17 @@ it:
       failed: Registrazione non riuscita
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Tipo di dato non valido
     contacts:
       import:
         failed: Il file è vuoto
       email:
-        invalid: Invalid email
+        invalid: Email non valida
       phone_number:
-        invalid: should be in e164 format
+        invalid: dovrebbe essere nel formato e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: dovrebbe essere unico nella categoria e nel portale
     inboxes:
       imap:
         socket_error: Controlla la connessione di rete, l'indirizzo IMAP e riprova.
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
new file mode 100644
index 000000000..c3598b747
--- /dev/null
+++ b/config/locales/ka.yml
@@ -0,0 +1,151 @@
+#Files in the config/locales directory are used for internationalization
+#and are automatically loaded by Rails. If you want to use locales other
+#than English, add the necessary files in this directory.
+#To use the locales, use `I18n.t`:
+#I18n.t 'hello'
+#In views, this is aliased to just `t`:
+#<%= t('hello') %>
+#To use a different locale, set it with `I18n.locale`:
+#I18n.locale = :es
+#This would use the information in config/locales/es.yml.
+#The following keys must be escaped otherwise they will not be retrieved by
+#the default I18n backend:
+#true, false, on, off, yes, no
+#Instead, surround them with single quotes.
+#en:
+#'true': 'foo'
+#To learn more, please read the Rails Internationalization guide
+#available at https://guides.rubyonrails.org/i18n.html.
+ka:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    validations:
+      presence: must not be blank
+    webhook:
+      invalid: Invalid events
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+    data_import:
+      data_type:
+        invalid: Invalid data type
+    contacts:
+      import:
+        failed: File is blank
+      email:
+        invalid: Invalid email
+      phone_number:
+        invalid: should be in e164 format
+    categories:
+      locale:
+        unique: should be unique in the category and portal
+    inboxes:
+      imap:
+        socket_error: Please check the network connection, IMAP address and try again.
+        no_response_error: Please check the IMAP credentials and try again.
+        host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
+        connection_timed_out_error: Connection timed out for %{address}:%{port}
+        connection_closed_error: Connection closed.
+      validations:
+        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+  reports:
+    period: Reporting period %{since} to %{until}
+    agent_csv:
+      agent_name: Agent name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    team_csv:
+      team_name: Team name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    default_group_by: day
+    csat:
+      headers:
+        contact_name: Contact Name
+        contact_email_address: Contact Email Address
+        contact_phone_number: Contact Phone Number
+        link_to_the_conversation: Link to the conversation
+        agent_name: Agent Name
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
+  notifications:
+    notification_title:
+      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
+      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
+      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
+      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+  conversations:
+    messages:
+      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_deleted_story_content: This story is no longer available.
+      deleted: This message was deleted
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        contact_resolved: "Conversation was resolved by %{contact_name}"
+        open: "Conversation was reopened by %{user_name}"
+        pending: "Conversation was marked as pending by %{user_name}"
+        snoozed: "Conversation was snoozed by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+      assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
+    templates:
+      greeting_message_body: "%{account_name} typically replies in a few hours."
+      ways_to_reach_you_message_body: "Give the team a way to reach you."
+      email_input_box_message_body: "Get notified by email"
+      csat_input_message_body: "Please rate the conversation"
+    reply:
+      email:
+        header:
+          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      email_subject: "New messages on this conversation"
+      transcript_subject: "Conversation Transcript"
+    survey:
+      response: "Please rate this conversation, %{link}"
+  contacts:
+    online:
+      delete: "%{contact_name} is Online, please try again later"
+  integration_apps:
+    slack:
+      name: "Slack"
+      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+    webhooks:
+      name: "Webhooks"
+      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+    dialogflow:
+      name: "Dialogflow"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    fullcontact:
+      name: "Fullcontact"
+      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index b68f1dc38..4cb6f912c 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -23,7 +23,7 @@ pt_BR:
     reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
   errors:
     validations:
-      presence: must not be blank
+      presence: não pode ficar em branco
     webhook:
       invalid: Eventos inválidos
     signup:
@@ -33,17 +33,17 @@ pt_BR:
       failed: Registro falhou
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Tipo de dado inválido
     contacts:
       import:
         failed: Arquivo vazio
       email:
-        invalid: Invalid email
+        invalid: E-mail inválido
       phone_number:
-        invalid: should be in e164 format
+        invalid: deve estar no formato e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: deve ser único na categoria e no portal
     inboxes:
       imap:
         socket_error: Por favor, verifique a conexão de rede, endereço de IMAP e tente novamente.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index cd0200fe1..7ef882092 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -23,9 +23,9 @@ ro:
     reset_password_failure: Nu am putut găsi niciun utilizator cu e-mailul specificat.
   errors:
     validations:
-      presence: must not be blank
+      presence: nu trebuie să fie gol
     webhook:
-      invalid: Invalid events
+      invalid: Evenimente nevalide
     signup:
       disposable_email: Nu permitem email-uri de unică folosință
       invalid_email: Ați introdus un e-mail invalid
@@ -33,26 +33,26 @@ ro:
       failed: Înregistrare eșuată
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Tip de date nevalid
     contacts:
       import:
         failed: Fișierul este necompletat
       email:
-        invalid: Invalid email
+        invalid: E-mail invalid
       phone_number:
-        invalid: should be in e164 format
+        invalid: ar trebui să fie în format e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: ar trebui să fie unic în categorie și portal
     inboxes:
       imap:
-        socket_error: Please check the network connection, IMAP address and try again.
-        no_response_error: Please check the IMAP credentials and try again.
-        host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
-        connection_timed_out_error: Connection timed out for %{address}:%{port}
-        connection_closed_error: Connection closed.
+        socket_error: Verificați conexiunea la rețea, adresa IMAP și încercați din nou.
+        no_response_error: Verificați acreditările IMAP și încercați din nou.
+        host_unreachable_error: Gazdă imposibil de găsit, Verificați adresa IMAP, portul IMAP și încercați din nou.
+        connection_timed_out_error: Conexiunea a expirat pentru %{address}:%{port}
+        connection_closed_error: Conexiune închisă.
       validations:
-        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+        name: nu ar trebui să înceapă sau să se termine cu simboluri și nu ar trebui să aibă < > / \ @ caractere.
   reports:
     period: Perioada de raportare %{since}-%{until}
     agent_csv:
@@ -61,14 +61,14 @@ ro:
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
+      inbox_name: Nume Inbox
+      inbox_type: Tip inbox
+      conversations_count: Conversații
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     label_csv:
-      label_title: Label
-      conversations_count: No. of conversations
+      label_title: Etichetă
+      conversations_count: Conversații
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     team_csv:
@@ -79,14 +79,14 @@ ro:
     default_group_by: zi
     csat:
       headers:
-        contact_name: Contact Name
-        contact_email_address: Contact Email Address
-        contact_phone_number: Contact Phone Number
-        link_to_the_conversation: Link to the conversation
+        contact_name: Nume de contact
+        contact_email_address: Adresă de e-mail persoană de contact
+        contact_phone_number: Număr de telefon persoană de contact
+        link_to_the_conversation: Link către conversație
         agent_name: Nume Agent
         rating: Evaluare
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        feedback: Feedback comentariu
+        recorded_at: Data înregistrată
   notifications:
     notification_title:
       conversation_creation: "[Conversație nouă] - #%{display_id} a fost creat în %{inbox_name}"
@@ -96,7 +96,7 @@ ro:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} menționat în poveste: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: Această poveste nu mai este disponibilă.
       deleted: Acest mesaj a fost șters
     activity:
       status:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0462140d5..a64e9bd5f 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -23,9 +23,9 @@ ru:
     reset_password_failure: Ой! Мы не смогли найти пользователя с указанным email.
   errors:
     validations:
-      presence: не должен быть пустым
+      presence: Не должен быть пустым
     webhook:
-      invalid: Invalid events
+      invalid: Недопустимые события
     signup:
       disposable_email: Мы не разрешаем одноразовые почтовые ящики
       invalid_email: Вы ввели неверный email
@@ -96,7 +96,7 @@ ru:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} упомянул Вас в истории: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: Эта история больше недоступна.
       deleted: Это сообщение было удалено
     activity:
       status:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9ff94693a..493449e17 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -17,135 +17,135 @@
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
 sr-Latn:
-  hello: "Hello world"
+  hello: "Zdravo svete"
   messages:
-    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
-    reset_password_failure: Uh ho! We could not find any user with the specified email.
+    reset_password_success: Opa! Zahtev za resetovanjem lozinke je uspešan. Proverite vašu e-poštu za uputstvo.
+    reset_password_failure: O ne! Nismo mogli da pronađemo nijednog korisnika sa navedenom e-poštom.
   errors:
     validations:
-      presence: must not be blank
+      presence: ne sme biti prazno
     webhook:
-      invalid: Invalid events
+      invalid: Neispravni događaji
     signup:
-      disposable_email: We do not allow disposable emails
-      invalid_email: You have entered an invalid email
-      email_already_exists: "You have already signed up for an account with %{email}"
-      failed: Signup failed
+      disposable_email: Ne dozvoljavamo potrošne e-pošte
+      invalid_email: Uneli ste neispravnu e-poštu
+      email_already_exists: "Već ste registrovali nalog sa %{email}"
+      failed: Registracija nije uspela
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Neispravan tip podatka
     contacts:
       import:
-        failed: File is blank
+        failed: Datoteka je prazna
       email:
-        invalid: Invalid email
+        invalid: Neispravna e-pošta
       phone_number:
-        invalid: should be in e164 format
+        invalid: treba biti u e164 formatu
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: treba biti jedinstvena u kategoriji i portalu
     inboxes:
       imap:
-        socket_error: Please check the network connection, IMAP address and try again.
-        no_response_error: Please check the IMAP credentials and try again.
-        host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
-        connection_timed_out_error: Connection timed out for %{address}:%{port}
-        connection_closed_error: Connection closed.
+        socket_error: Molim vas proverite vezu sa mrežom, IMAP adresu i pokušajte ponovo.
+        no_response_error: Molim vas proverite IMAP kredencijale i pokušajte ponovo.
+        host_unreachable_error: Domaćin je nedostupan, Molim vas proverite IMAP adresu, IMAP port i pokušajte ponovo.
+        connection_timed_out_error: Vreme za povezivanje je isteklo za %{address}:%{port}
+        connection_closed_error: Povezivanje je prekinuto.
       validations:
-        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+        name: ne treba početi ili se završiti sa simbolima i ne treba da sadrži < > / \ @ karaktere.
   reports:
-    period: Reporting period %{since} to %{until}
+    period: Period izveštaja %{since} do %{until}
     agent_csv:
-      agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      agent_name: Naziv agenta
+      conversations_count: Broj razgovora
+      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
+      avg_resolution_time: Prosečno vreme rešavanja (minuti)
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      inbox_name: Naziv prijemnog sandučeta
+      inbox_type: Vrsta prijemnog sandučeta
+      conversations_count: Broj razgovora
+      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
+      avg_resolution_time: Prosečno vreme rešavanja (minuti)
     label_csv:
-      label_title: Label
-      conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      label_title: Oznaka
+      conversations_count: Broj razgovora
+      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
+      avg_resolution_time: Prosečno vreme rešavanja (minuti)
     team_csv:
-      team_name: Team name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
-    default_group_by: day
+      team_name: Naziv tima
+      conversations_count: Broj razgovora
+      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
+      avg_resolution_time: Prosečno vreme rešavanja (minuti)
+    default_group_by: dan
     csat:
       headers:
-        contact_name: Contact Name
-        contact_email_address: Contact Email Address
-        contact_phone_number: Contact Phone Number
-        link_to_the_conversation: Link to the conversation
+        contact_name: Naziv kontakta
+        contact_email_address: Adresa e-pošte kontakta
+        contact_phone_number: Broj telefona kontakta
+        link_to_the_conversation: Veza ka razgovoru
         agent_name: Ime agenta
-        rating: Rating
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        rating: Ocena
+        feedback: Komentar povratne informacije
+        recorded_at: Snimljen dana
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Novi razgovor] - #%{display_id} je napravljen u %{inbox_name}"
+      conversation_assignment: "[Dodeljeno vama] - #%{display_id} je dodeljen vama"
+      assigned_conversation_new_message: "[Nova poruka] - #%{display_id} %{content}"
+      conversation_mention: "Pomenuti ste u razgovoru [ID - %{display_id}] od strane %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
-      instagram_deleted_story_content: This story is no longer available.
-      deleted: This message was deleted
+      instagram_story_content: "%{story_sender} vas je pomenuo u priči: "
+      instagram_deleted_story_content: Ova priča više nije dostupna.
+      deleted: Poruka je obrisana
     activity:
       status:
-        resolved: "Conversation was marked resolved by %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
-        open: "Conversation was reopened by %{user_name}"
-        pending: "Conversation was marked as pending by %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        resolved: "Razgovor je označen kao rešen od strane %{user_name}"
+        contact_resolved: "Razgovor je rešen od strane %{contact_name}"
+        open: "Razgovor je ponovo otvoren od strane %{user_name}"
+        pending: "Razgovor je označen kao na čekanju od strane %{user_name}"
+        snoozed: "Razgovor je odložen od strane %{user_name}"
+        auto_resolved: "Razgovor je označen kao rešen od strane sistema zbog %{duration} dana neaktivnosti"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
-        assigned: "Assigned to %{assignee_name} by %{user_name}"
-        removed: "Conversation unassigned by %{user_name}"
+        self_assigned: "%{user_name} je samododelio sebe ovom razgovoru"
+        assigned: "Dodeljeno %{assignee_name} od strane %{user_name}"
+        removed: "Razgovoru uklonjena dodela od strane %{user_name}"
       team:
-        assigned: "Assigned to %{team_name} by %{user_name}"
-        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
-        removed: "Unassigned from %{team_name} by %{user_name}"
+        assigned: "Dodeljeno %{team_name} od strane %{user_name}"
+        assigned_with_assignee: "Dodeljeno %{assignee_name} putem %{team_name} od strane %{user_name}"
+        removed: "Uklonjena dodela %{team_name} od strane %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} je dodao %{labels}"
+        removed: "%{user_name} je uklonio %{labels}"
+      muted: "%{user_name} je utišao razgovor"
+      unmuted: "%{user_name} je uklonio utišanje razgovora"
     templates:
-      greeting_message_body: "%{account_name} typically replies in a few hours."
-      ways_to_reach_you_message_body: "Give the team a way to reach you."
-      email_input_box_message_body: "Get notified by email"
-      csat_input_message_body: "Please rate the conversation"
+      greeting_message_body: "%{account_name} obično odgovara za nekoliko sati."
+      ways_to_reach_you_message_body: "Pružite timu način da vas kontaktira."
+      email_input_box_message_body: "Budite obavešteni putem e-poruke"
+      csat_input_message_body: "Molim vas ocenite ovaj razgovor"
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+          from_with_name: '%{assignee_name} iz %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} iz %{inbox_name} <reply+%{reply_email}>'
+      email_subject: "Nove poruke u ovom razgovoru"
+      transcript_subject: "Transkript razgovora"
     survey:
-      response: "Please rate this conversation, %{link}"
+      response: "Molim vas ocenite ovaj razgovor, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} je dostupan, molim vas pokušajte ponovo"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "Slack je alat za ćaskanje koji objedinjuje sve vaše komunikacije na jedno mesto. Integracijom Slack-a, možete biti obavešteni o svim novim razgovorima na vašem nalogu direktno u Slack-u."
     webhooks:
-      name: "Webhooks"
-      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+      name: "Veb zakačke"
+      description: "Veb zakačke vam donose informacije u realnom vremenu o tome šta se dešava u vašem nalogu. Možete iskoristiti veb zakačke da prosledite događaje do vaših omiljenih aplikacija kao što su Slack ili Github. Kliknite na Konfiguriši da podesite vaše veb zakačke."
     dialogflow:
       name: "Dialogflow"
-      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+      description: "Izgradite botove ćaskanja koristeći Dialogflow i povežite ih sa vašim prijemnim sandučetom. Neka botovi rešavaju upite pre prosleđivanja do agenta korisničke podrške."
     fullcontact:
       name: "Fullcontact"
-      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+      description: "FullContact integracija pomaže vam da obogatite profile posetilaca. Identifikujte korisnike čim podele njihovu adresu e-pošte i ponudite im prilagođenu korisničku podršku. Povežite vaš FullContact sa vašim nalogom deljenjem FullContact API ključa."
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index eca008f27..c07bce8e3 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -23,7 +23,7 @@ uk:
     reset_password_failure: Ой-ой! Ми не змогли знайти жодного користувача з цією адресою електронної пошти.
   errors:
     validations:
-      presence: must not be blank
+      presence: не повинно бути пустим
     webhook:
       invalid: Недійсні події
     signup:
@@ -33,26 +33,26 @@ uk:
       failed: Помилка реєстрації
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Некоректний тип даних
     contacts:
       import:
         failed: Файл порожній
       email:
-        invalid: Invalid email
+        invalid: Невірний email
       phone_number:
-        invalid: should be in e164 format
+        invalid: має бути у форматі e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: має бути унікальним на категорії і порталі
     inboxes:
       imap:
         socket_error: Перевірте підключення до мережі, адреса IMAP і повторіть спробу.
         no_response_error: Будь ласка, перевірте облікові дані IMAP і повторіть спробу.
-        host_unreachable_error: Хост недоступний. Будь-ласка, перевірте адресу IMAP, порт IMAP і повторіть спробу.
+        host_unreachable_error: Хост недоступний. Будь ласка, перевірте адресу IMAP, порт IMAP і повторіть спробу.
         connection_timed_out_error: Вичерпано час очікування з'єднання для %{address}:%{port}
         connection_closed_error: З'єднання закрито.
       validations:
-        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+        name: не повинно починатись або закінчуватися символами, і він не повинен мати < > / \ @ символів.
   reports:
     period: Період звіту %{since} до %{until}
     agent_csv:
@@ -96,7 +96,7 @@ uk:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} згадав вас у сторіс: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: Ця історія більше не доступна.
       deleted: Це повідомлення було видалено
     activity:
       status:
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 08af0a791..9c828dba8 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -84,7 +84,7 @@ zh_CN:
         contact_phone_number: Contact Phone Number
         link_to_the_conversation: Link to the conversation
         agent_name: 客服名称
-        rating: Rating
+        rating: 评分
         feedback: Feedback Comment
         recorded_at: Recorded date
   notifications:
diff --git a/config/routes.rb b/config/routes.rb
index 6e31c4835..44b5ce7ea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,6 +57,11 @@ Rails.application.routes.draw do
             post :clone
             post :attach_file, on: :collection
           end
+          resources :macros, only: [:index, :create, :show, :update, :destroy] do
+            member do
+              post :execute
+            end
+          end
           resources :campaigns, only: [:index, :create, :show, :update, :destroy]
           resources :dashboard_apps, only: [:index, :show, :create, :update, :destroy]
           namespace :channels do
@@ -223,6 +228,23 @@ Rails.application.routes.draw do
     end
   end
 
+  if ChatwootApp.enterprise?
+    namespace :enterprise, defaults: { format: 'json' } do
+      namespace :api do
+        namespace :v1 do
+          resources :accounts do
+            member do
+              post :checkout
+              post :subscription
+            end
+          end
+        end
+      end
+
+      post 'webhooks/stripe', to: 'webhooks/stripe#process_payload'
+    end
+  end
+
   # ----------------------------------------------------------------------
   # Routes for platform APIs
   namespace :platform, defaults: { format: 'json' } do
diff --git a/db/migrate/20220711090528_create_macros.rb b/db/migrate/20220711090528_create_macros.rb
new file mode 100644
index 000000000..35c0825a7
--- /dev/null
+++ b/db/migrate/20220711090528_create_macros.rb
@@ -0,0 +1,14 @@
+class CreateMacros < ActiveRecord::Migration[6.1]
+  def change
+    create_table :macros do |t|
+      t.bigint :account_id, null: false
+      t.string :name, null: false
+      t.integer :visibility, default: 0
+      t.references :created_by, null: false, index: true, foreign_key: { to_table: :users }
+      t.references :updated_by, null: false, index: true, foreign_key: { to_table: :users }
+      t.jsonb :actions, null: false, default: {}
+      t.timestamps
+      t.index :account_id, name: 'index_macros_on_account_id'
+    end
+  end
+end
diff --git a/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb b/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb
new file mode 100644
index 000000000..41405fcaa
--- /dev/null
+++ b/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb
@@ -0,0 +1,26 @@
+class SyncGravatarForExistingAvatarables < ActiveRecord::Migration[6.1]
+  def change
+    return if GlobalConfigService.load('DISABLE_GRAVATAR', '').present?
+
+    sync_user_avatars
+    sync_contact_avatars
+  end
+
+  private
+
+  def sync_user_avatars
+    ::User.find_in_batches do |users_batch|
+      users_batch.each do |user|
+        Avatar::AvatarFromGravatarJob.perform_later(user, user.email)
+      end
+    end
+  end
+
+  def sync_contact_avatars
+    ::Contact.where.not(email: nil).find_in_batches do |contacts_batch|
+      contacts_batch.each do |contact|
+        Avatar::AvatarFromGravatarJob.perform_later(contact, contact.email)
+      end
+    end
+  end
+end
diff --git a/db/migrate/20220718123938_add_custom_attributes_to_account.rb b/db/migrate/20220718123938_add_custom_attributes_to_account.rb
new file mode 100644
index 000000000..39e9abcea
--- /dev/null
+++ b/db/migrate/20220718123938_add_custom_attributes_to_account.rb
@@ -0,0 +1,5 @@
+class AddCustomAttributesToAccount < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :custom_attributes, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20220720080126_add_meta_column_to_article.rb b/db/migrate/20220720080126_add_meta_column_to_article.rb
new file mode 100644
index 000000000..6cb7ca23c
--- /dev/null
+++ b/db/migrate/20220720080126_add_meta_column_to_article.rb
@@ -0,0 +1,5 @@
+class AddMetaColumnToArticle < ActiveRecord::Migration[6.1]
+  def change
+    add_column :articles, :meta, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20220720123615_set_default_locale_at_accounts.rb b/db/migrate/20220720123615_set_default_locale_at_accounts.rb
new file mode 100644
index 000000000..d17837fb9
--- /dev/null
+++ b/db/migrate/20220720123615_set_default_locale_at_accounts.rb
@@ -0,0 +1,5 @@
+class SetDefaultLocaleAtAccounts < ActiveRecord::Migration[6.1]
+  def change
+    change_column_default :accounts, :locale, from: nil, to: 0
+  end
+end
diff --git a/db/migrate/20220802133722_add_status_to_accounts.rb b/db/migrate/20220802133722_add_status_to_accounts.rb
new file mode 100644
index 000000000..b94e8ee74
--- /dev/null
+++ b/db/migrate/20220802133722_add_status_to_accounts.rb
@@ -0,0 +1,6 @@
+class AddStatusToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :status, :integer, default: 0
+    add_index :accounts, :status
+  end
+end
diff --git a/db/migrate/20220809104508_revert_cascading_indexes.rb b/db/migrate/20220809104508_revert_cascading_indexes.rb
new file mode 100644
index 000000000..96d3309d0
--- /dev/null
+++ b/db/migrate/20220809104508_revert_cascading_indexes.rb
@@ -0,0 +1,46 @@
+class RevertCascadingIndexes < ActiveRecord::Migration[6.1]
+  def change
+    remove_foreign_key 'account_users', 'accounts' if foreign_key_exists? 'account_users', 'accounts'
+    remove_foreign_key 'account_users', 'users' if foreign_key_exists? 'account_users', 'users'
+    remove_foreign_key 'agent_bots', 'accounts' if foreign_key_exists? 'agent_bots', 'accounts'
+    remove_foreign_key 'campaigns', 'accounts' if foreign_key_exists? 'campaigns', 'accounts'
+    remove_foreign_key 'campaigns', 'inboxes' if foreign_key_exists? 'campaigns', 'inboxes'
+    remove_foreign_key 'conversations', 'campaigns' if foreign_key_exists? 'conversations', 'campaigns'
+    remove_foreign_key 'conversations', 'contact_inboxes' if foreign_key_exists? 'conversations', 'contact_inboxes'
+    remove_foreign_key 'conversations', 'teams' if foreign_key_exists? 'conversations', 'teams'
+    remove_foreign_key 'csat_survey_responses', 'accounts' if foreign_key_exists? 'csat_survey_responses', 'accounts'
+    remove_foreign_key 'csat_survey_responses', 'contacts' if foreign_key_exists? 'csat_survey_responses', 'contacts'
+    remove_foreign_key 'csat_survey_responses', 'conversations' if foreign_key_exists? 'csat_survey_responses', 'conversations'
+    remove_foreign_key 'csat_survey_responses', 'messages' if foreign_key_exists? 'csat_survey_responses', 'messages'
+    remove_foreign_key 'csat_survey_responses', 'users', column: 'assigned_agent_id' if foreign_key_exists? 'csat_survey_responses', 'users',
+                                                                                                            column: 'assigned_agent_id'
+    remove_foreign_key 'data_imports', 'accounts' if foreign_key_exists? 'data_imports', 'accounts'
+    remove_foreign_key 'mentions', 'conversations' if foreign_key_exists? 'mentions', 'conversations'
+    remove_foreign_key 'mentions', 'users' if foreign_key_exists? 'mentions', 'users'
+    remove_foreign_key 'notes', 'accounts' if foreign_key_exists? 'notes', 'accounts'
+    remove_foreign_key 'notes', 'contacts' if foreign_key_exists? 'notes', 'contacts'
+    remove_foreign_key 'notes', 'users' if foreign_key_exists? 'notes', 'users'
+    remove_foreign_key 'team_members', 'teams' if foreign_key_exists? 'team_members', 'teams'
+    remove_foreign_key 'team_members', 'users' if foreign_key_exists? 'team_members', 'users'
+    remove_foreign_key 'teams', 'accounts' if foreign_key_exists? 'teams', 'accounts'
+    remove_foreign_key 'contact_inboxes', 'contacts' if foreign_key_exists? 'contact_inboxes', 'contacts'
+    remove_foreign_key 'contact_inboxes', 'inboxes' if foreign_key_exists? 'contact_inboxes', 'inboxes'
+
+    remove_foreign_key 'articles', 'articles', column: 'associated_article_id' if foreign_key_exists? 'articles', 'articles',
+                                                                                                      column: 'associated_article_id'
+    remove_foreign_key 'articles', 'users', column: 'author_id' if foreign_key_exists? 'articles', 'users', column: 'author_id'
+
+    remove_foreign_key 'categories', 'categories', column: 'parent_category_id' if foreign_key_exists? 'categories', 'categories',
+                                                                                                       column: 'parent_category_id'
+    remove_foreign_key 'categories', 'categories', column: 'associated_category_id' if foreign_key_exists? 'categories', 'categories',
+                                                                                                           column: 'associated_category_id'
+
+    remove_foreign_key 'dashboard_apps', 'accounts' if foreign_key_exists? 'dashboard_apps', 'accounts'
+    remove_foreign_key 'dashboard_apps', 'users' if foreign_key_exists? 'dashboard_apps', 'users'
+
+    remove_foreign_key 'macros', 'users', column: 'created_by_id' if foreign_key_exists? 'macros', 'users', column: 'created_by_id'
+    remove_foreign_key 'macros', 'users', column: 'updated_by_id' if foreign_key_exists? 'macros', 'users', column: 'updated_by_id'
+
+    Migration::RemoveStaleNotificationsJob.perform_later
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cd7d4eac7..2920c3411 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.define(version: 2022_07_06_085458) do
+ActiveRecord::Schema.define(version: 2022_08_09_104508) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -53,6 +53,9 @@ ActiveRecord::Schema.define(version: 2022_07_06_085458) do
     t.integer "feature_flags", default: 0, null: false
     t.integer "auto_resolve_duration"
     t.jsonb "limits", default: {}
+    t.jsonb "custom_attributes", default: {}
+    t.integer "status", default: 0
+    t.index ["status"], name: "index_accounts_on_status"
   end
 
   create_table "action_mailbox_inbound_emails", force: :cascade do |t|
@@ -127,6 +130,7 @@ ActiveRecord::Schema.define(version: 2022_07_06_085458) do
     t.datetime "updated_at", precision: 6, null: false
     t.bigint "author_id"
     t.bigint "associated_article_id"
+    t.jsonb "meta", default: {}
     t.index ["associated_article_id"], name: "index_articles_on_associated_article_id"
     t.index ["author_id"], name: "index_articles_on_author_id"
   end
@@ -562,6 +566,20 @@ ActiveRecord::Schema.define(version: 2022_07_06_085458) do
     t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
   end
 
+  create_table "macros", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name", null: false
+    t.integer "visibility", default: 0
+    t.bigint "created_by_id", null: false
+    t.bigint "updated_by_id", null: false
+    t.jsonb "actions", default: {}, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id"], name: "index_macros_on_account_id"
+    t.index ["created_by_id"], name: "index_macros_on_created_by_id"
+    t.index ["updated_by_id"], name: "index_macros_on_updated_by_id"
+  end
+
   create_table "mentions", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.bigint "conversation_id", null: false
@@ -844,38 +862,8 @@ ActiveRecord::Schema.define(version: 2022_07_06_085458) do
     t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
   end
 
-  add_foreign_key "account_users", "accounts", on_delete: :cascade
-  add_foreign_key "account_users", "users", on_delete: :cascade
   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 "agent_bots", "accounts", on_delete: :cascade
-  add_foreign_key "articles", "articles", column: "associated_article_id"
-  add_foreign_key "articles", "users", column: "author_id"
-  add_foreign_key "campaigns", "accounts", on_delete: :cascade
-  add_foreign_key "campaigns", "inboxes", on_delete: :cascade
-  add_foreign_key "categories", "categories", column: "associated_category_id"
-  add_foreign_key "categories", "categories", column: "parent_category_id"
-  add_foreign_key "contact_inboxes", "contacts", on_delete: :cascade
-  add_foreign_key "contact_inboxes", "inboxes", on_delete: :cascade
-  add_foreign_key "conversations", "campaigns", on_delete: :cascade
-  add_foreign_key "conversations", "contact_inboxes", on_delete: :cascade
-  add_foreign_key "conversations", "teams", on_delete: :cascade
-  add_foreign_key "csat_survey_responses", "accounts", on_delete: :cascade
-  add_foreign_key "csat_survey_responses", "contacts", on_delete: :cascade
-  add_foreign_key "csat_survey_responses", "conversations", on_delete: :cascade
-  add_foreign_key "csat_survey_responses", "messages", on_delete: :cascade
-  add_foreign_key "csat_survey_responses", "users", column: "assigned_agent_id", on_delete: :cascade
-  add_foreign_key "dashboard_apps", "accounts"
-  add_foreign_key "dashboard_apps", "users"
-  add_foreign_key "data_imports", "accounts", on_delete: :cascade
-  add_foreign_key "mentions", "conversations", on_delete: :cascade
-  add_foreign_key "mentions", "users", on_delete: :cascade
-  add_foreign_key "notes", "accounts", on_delete: :cascade
-  add_foreign_key "notes", "contacts", on_delete: :cascade
-  add_foreign_key "notes", "users", on_delete: :cascade
-  add_foreign_key "team_members", "teams", on_delete: :cascade
-  add_foreign_key "team_members", "users", on_delete: :cascade
-  add_foreign_key "teams", "accounts", on_delete: :cascade
   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_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
new file mode 100644
index 000000000..b648b348c
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
@@ -0,0 +1,50 @@
+class Enterprise::Api::V1::AccountsController < Api::BaseController
+  before_action :fetch_account
+  before_action :check_authorization
+
+  def subscription
+    if stripe_customer_id.blank? && @account.custom_attributes['is_creating_customer'].blank?
+      @account.update(custom_attributes: { is_creating_customer: true })
+      Enterprise::CreateStripeCustomerJob.perform_later(@account)
+    end
+    head :no_content
+  end
+
+  def checkout
+    return create_stripe_billing_session(stripe_customer_id) if stripe_customer_id.present?
+
+    render_invalid_billing_details
+  end
+
+  private
+
+  def fetch_account
+    @account = current_user.accounts.find(params[:id])
+    @current_account_user = @account.account_users.find_by(user_id: current_user.id)
+  end
+
+  def stripe_customer_id
+    @account.custom_attributes['stripe_customer_id']
+  end
+
+  def render_invalid_billing_details
+    render_could_not_create_error('Please subscribe to a plan before viewing the billing details')
+  end
+
+  def create_stripe_billing_session(customer_id)
+    session = Enterprise::Billing::CreateSessionService.new.create_session(customer_id)
+    render_redirect_url(session.url)
+  end
+
+  def render_redirect_url(redirect_url)
+    render json: { redirect_url: redirect_url }
+  end
+
+  def pundit_user
+    {
+      user: current_user,
+      account: @account,
+      account_user: @current_account_user
+    }
+  end
+end
diff --git a/enterprise/app/controllers/enterprise/webhooks/stripe_controller.rb b/enterprise/app/controllers/enterprise/webhooks/stripe_controller.rb
new file mode 100644
index 000000000..0b66182d1
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/webhooks/stripe_controller.rb
@@ -0,0 +1,21 @@
+class Enterprise::Webhooks::StripeController < ActionController::API
+  def process_payload
+    # Get the event payload and signature
+    payload = request.body.read
+    sig_header = request.headers['Stripe-Signature']
+
+    # Attempt to verify the signature. If successful, we'll handle the event
+    begin
+      event = Stripe::Webhook.construct_event(payload, sig_header, ENV.fetch('STRIPE_WEBHOOK_SECRET', nil))
+      ::Enterprise::Billing::HandleStripeEventService.new.perform(event: event)
+    # If we fail to verify the signature, then something was wrong with the request
+    rescue JSON::ParserError, Stripe::SignatureVerificationError
+      # Invalid payload
+      head :bad_request
+      return
+    end
+
+    # We've successfully processed the event without blowing up
+    head :ok
+  end
+end
diff --git a/enterprise/app/jobs/enterprise/create_stripe_customer_job.rb b/enterprise/app/jobs/enterprise/create_stripe_customer_job.rb
new file mode 100644
index 000000000..6b90cbec5
--- /dev/null
+++ b/enterprise/app/jobs/enterprise/create_stripe_customer_job.rb
@@ -0,0 +1,7 @@
+class Enterprise::CreateStripeCustomerJob < ApplicationJob
+  queue_as :default
+
+  def perform(account)
+    Enterprise::Billing::CreateStripeCustomerService.new(account: account).perform
+  end
+end
diff --git a/enterprise/app/models/enterprise/account.rb b/enterprise/app/models/enterprise/account.rb
index 99defb6ea..dac6bb7a1 100644
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -1,13 +1,18 @@
 module Enterprise::Account
   def usage_limits
     {
-      agents: get_limits(:agents).to_i,
+      agents: agent_limits.to_i,
       inboxes: get_limits(:inboxes).to_i
     }
   end
 
   private
 
+  def agent_limits
+    subscribed_quantity = custom_attributes['subscribed_quantity']
+    subscribed_quantity || get_limits(:agents)
+  end
+
   def get_limits(limit_name)
     config_name = "ACCOUNT_#{limit_name.to_s.upcase}_LIMIT"
     self[:limits][limit_name.to_s] || GlobalConfig.get(config_name)[config_name] || ChatwootApp.max_limit
diff --git a/enterprise/app/services/enterprise/billing/create_session_service.rb b/enterprise/app/services/enterprise/billing/create_session_service.rb
new file mode 100644
index 000000000..ad4f8f45b
--- /dev/null
+++ b/enterprise/app/services/enterprise/billing/create_session_service.rb
@@ -0,0 +1,10 @@
+class Enterprise::Billing::CreateSessionService
+  def create_session(customer_id, return_url = ENV.fetch('FRONTEND_URL'))
+    Stripe::BillingPortal::Session.create(
+      {
+        customer: customer_id,
+        return_url: return_url
+      }
+    )
+  end
+end
diff --git a/enterprise/app/services/enterprise/billing/create_stripe_customer_service.rb b/enterprise/app/services/enterprise/billing/create_stripe_customer_service.rb
new file mode 100644
index 000000000..76c09a27a
--- /dev/null
+++ b/enterprise/app/services/enterprise/billing/create_stripe_customer_service.rb
@@ -0,0 +1,53 @@
+class Enterprise::Billing::CreateStripeCustomerService
+  pattr_initialize [:account!]
+
+  DEFAULT_QUANTITY = 2
+
+  def perform
+    customer_id = prepare_customer_id
+    subscription = Stripe::Subscription.create(
+      {
+        customer: customer_id,
+        items: [{ price: price_id, quantity: default_quantity }]
+      }
+    )
+    account.update!(
+      custom_attributes: {
+        stripe_customer_id: customer_id,
+        stripe_price_id: subscription['plan']['id'],
+        stripe_product_id: subscription['plan']['product'],
+        plan_name: default_plan['name'],
+        subscribed_quantity: subscription['quantity']
+      }
+    )
+  end
+
+  private
+
+  def prepare_customer_id
+    customer_id = account.custom_attributes['stripe_customer_id']
+    if customer_id.blank?
+      customer = Stripe::Customer.create({ name: account.name, email: billing_email })
+      customer_id = customer.id
+    end
+    customer_id
+  end
+
+  def default_quantity
+    default_plan['default_quantity'] || DEFAULT_QUANTITY
+  end
+
+  def billing_email
+    account.administrators.first.email
+  end
+
+  def default_plan
+    installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
+    @default_plan ||= installation_config.value.first
+  end
+
+  def price_id
+    price_ids = default_plan['price_ids']
+    price_ids.first
+  end
+end
diff --git a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
new file mode 100644
index 000000000..43b03da8a
--- /dev/null
+++ b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
@@ -0,0 +1,55 @@
+class Enterprise::Billing::HandleStripeEventService
+  def perform(event:)
+    ensure_event_context(event)
+    case @event.type
+    when 'customer.subscription.updated'
+      process_subscription_updated
+    when 'customer.subscription.deleted'
+      process_subscription_deleted
+    else
+      Rails.logger.debug { "Unhandled event type: #{event.type}" }
+    end
+  end
+
+  private
+
+  def process_subscription_updated
+    plan = find_plan(subscription['plan']['product'])
+    # skipping self hosted plan events
+    return if plan.blank? || account.blank?
+
+    account.update(
+      custom_attributes: {
+        stripe_customer_id: subscription.customer,
+        stripe_price_id: subscription['plan']['id'],
+        stripe_product_id: subscription['plan']['product'],
+        plan_name: plan['name'],
+        subscribed_quantity: subscription['quantity']
+      }
+    )
+  end
+
+  def process_subscription_deleted
+    # skipping self hosted plan events
+    return if account.blank?
+
+    Enterprise::Billing::CreateStripeCustomerService.new(account: account).perform
+  end
+
+  def ensure_event_context(event)
+    @event = event
+  end
+
+  def subscription
+    @subscription ||= @event.data.object
+  end
+
+  def account
+    @account ||= Account.where("custom_attributes->>'stripe_customer_id' = ?", subscription.customer).first
+  end
+
+  def find_plan(plan_id)
+    installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
+    installation_config.value.find { |config| config['product_id'].include?(plan_id) }
+  end
+end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index 86c3c232b..966d897f9 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -77,7 +77,7 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def private_note?
-    params[:event][:text].strip.starts_with?('note:', 'private:')
+    params[:event][:text].strip.downcase.starts_with?('note:', 'private:')
   end
 
   def create_message
diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index ec5f65812..40ec7071b 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -1,4 +1,4 @@
-module OnlineStatusTracker
+class OnlineStatusTracker
   # NOTE: You can customise the environment variable to keep your agents/contacts as online for longer
   PRESENCE_DURATION = ENV.fetch('PRESENCE_DURATION', 20).to_i.seconds
 
@@ -39,7 +39,11 @@ module OnlineStatusTracker
   end
 
   def self.get_available_contact_ids(account_id)
-    ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'Contact'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    range_start = (Time.zone.now - PRESENCE_DURATION).to_i
+    # exclusive minimum score is specified by prefixing (
+    # we are clearing old records because this could clogg up the sorted set
+    ::Redis::Alfred.zremrangebyscore(presence_key(account_id, 'Contact'), '-inf', "(#{range_start}")
+    ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'Contact'), range_start, '+inf')
   end
 
   def self.get_available_contacts(account_id)
@@ -48,10 +52,20 @@ module OnlineStatusTracker
   end
 
   def self.get_available_users(account_id)
-    user_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'User'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    user_ids = get_available_user_ids(account_id)
+
     return {} if user_ids.blank?
 
     user_availabilities = ::Redis::Alfred.hmget(status_key(account_id), user_ids)
     user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || 'online')] }.to_h
   end
+
+  def self.get_available_user_ids(account_id)
+    account = Account.find(account_id)
+    range_start = (Time.zone.now - PRESENCE_DURATION).to_i
+    user_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'User'), range_start, '+inf')
+    # since we are dealing with redis items as string, casting to string
+    user_ids += account.account_users.where(auto_offline: false)&.map(&:user_id)&.map(&:to_s)
+    user_ids.uniq
+  end
 end
diff --git a/lib/redis/alfred.rb b/lib/redis/alfred.rb
index ca02eb936..fb782a286 100644
--- a/lib/redis/alfred.rb
+++ b/lib/redis/alfred.rb
@@ -89,5 +89,11 @@ module Redis::Alfred
     def zrangebyscore(key, range_start, range_end)
       $alfred.zrangebyscore(key, range_start, range_end)
     end
+
+    # remove values by score
+    # exclusive score is specified by prefixing (
+    def zremrangebyscore(key, range_start, range_end)
+      $alfred.zremrangebyscore(key, range_start, range_end)
+    end
   end
 end
diff --git a/package.json b/package.json
index f4101843e..486ff537e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
@@ -30,20 +30,15 @@
     "axios": "^0.21.2",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-vue-jsx": "^3.7.0",
-    "bourbon": "^6.0.0",
     "chart.js": "~2.9.4",
-    "copy-text-to-clipboard": "2.2.0",
     "core-js": "3.11.0",
-    "country-code-emoji": "^1.0.0",
     "date-fns": "2.21.1",
     "date-fns-tz": "^1.3.3",
     "dompurify": "2.2.7",
-    "dotenv": "^8.0.0",
     "foundation-sites": "~6.5.3",
     "highlight.js": "~10.4.1",
     "ionicons": "~2.0.1",
     "js-cookie": "^2.2.1",
-    "lodash.groupby": "^4.6.0",
     "marked": "4.0.10",
     "md5": "^2.3.0",
     "ninja-keys": "^1.1.9",
@@ -52,7 +47,6 @@
     "prosemirror-markdown": "1.5.1",
     "prosemirror-state": "1.3.4",
     "prosemirror-view": "1.18.4",
-    "query-string": "5",
     "semver": "7.3.5",
     "spinkit": "~1.2.5",
     "tailwindcss": "^1.9.6",
@@ -60,13 +54,13 @@
     "v-tooltip": "~2.1.3",
     "videojs-record": "^4.5.0",
     "vue": "2.6.12",
-    "vue-axios": "~1.2.2",
     "vue-chartjs": "3.5.1",
     "vue-clickaway": "~2.1.0",
     "vue-color": "2.8.1",
     "vue-dompurify-html": "^2.5.2",
     "vue-easytable": "2.5.5",
     "vue-i18n": "8.24.3",
+    "vue-letter": "^0.1.3",
     "vue-loader": "15.9.6",
     "vue-multiselect": "~2.1.6",
     "vue-router": "~3.5.2",
@@ -74,7 +68,7 @@
     "vue-upload-component": "2.8.22",
     "vue2-datepicker": "^3.9.1",
     "vuedraggable": "^2.24.3",
-    "vuelidate": "0.7.6",
+    "vuelidate": "0.7.7",
     "vuex": "~2.1.1",
     "vuex-router-sync": "~4.1.2",
     "wavesurfer.js": "^6.0.4"
diff --git a/spec/actions/contact_identify_action_spec.rb b/spec/actions/contact_identify_action_spec.rb
index db1c84e6c..64f81ef8f 100644
--- a/spec/actions/contact_identify_action_spec.rb
+++ b/spec/actions/contact_identify_action_spec.rb
@@ -13,7 +13,7 @@ describe ::ContactIdentifyAction do
 
   describe '#perform' do
     it 'updates the contact' do
-      expect(ContactAvatarJob).not_to receive(:perform_later).with(contact, params[:avatar_url])
+      expect(Avatar::AvatarFromUrlJob).not_to receive(:perform_later).with(contact, params[:avatar_url])
       contact_identify
       expect(contact.reload.name).to eq 'test'
       # custom attributes are merged properly without overwriting existing ones
@@ -32,7 +32,7 @@ describe ::ContactIdentifyAction do
 
     it 'enques avatar job when avatar url parameter is passed' do
       params = { name: 'test', avatar_url: 'https://chatwoot-assets.local/sample.png' }
-      expect(ContactAvatarJob).to receive(:perform_later).with(contact, params[:avatar_url]).once
+      expect(Avatar::AvatarFromUrlJob).to receive(:perform_later).with(contact, params[:avatar_url]).once
       described_class.new(contact: contact, params: params).perform
     end
 
diff --git a/spec/builders/notification_builder_spec.rb b/spec/builders/notification_builder_spec.rb
new file mode 100644
index 000000000..74dda0780
--- /dev/null
+++ b/spec/builders/notification_builder_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+describe ::NotificationBuilder do
+  include ActiveJob::TestHelper
+
+  describe '#perform' do
+    let!(:account) { create(:account) }
+    let!(:user) { create(:user, account: account) }
+    let!(:primary_actor) { create(:conversation, account: account) }
+
+    before do
+      notification_setting = user.notification_settings.find_by(account_id: account.id)
+      notification_setting.selected_email_flags = [:email_conversation_creation]
+      notification_setting.save!
+    end
+
+    it 'creates a notification' do
+      expect do
+        described_class.new(
+          notification_type: 'conversation_creation',
+          user: user,
+          account: account,
+          primary_actor: primary_actor
+        ).perform
+      end.to change { user.notifications.count }.by(1)
+    end
+
+    it 'will not throw error if notification setting is not present' do
+      user.account_users.destroy_all
+      expect(
+        described_class.new(
+          notification_type: 'conversation_creation',
+          user: user,
+          account: account,
+          primary_actor: primary_actor
+        ).perform
+      ).to be_nil
+    end
+  end
+end
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index c2c9977b3..5f63ccac2 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 describe ::V2::ReportBuilder do
+  include ActiveJob::TestHelper
   let!(:account) { create(:account) }
   let!(:user) { create(:user, account: account) }
   let!(:inbox) { create(:inbox, account: account) }
@@ -8,49 +9,44 @@ describe ::V2::ReportBuilder do
   let!(:label_1) { create(:label, title: 'Label_1', account: account) }
   let!(:label_2) { create(:label, title: 'Label_2', account: account) }
 
-  # Running jobs inline to calculate the exact metrics
-  around do |test|
-    current_adapter = ActiveJob::Base.queue_adapter
-    ActiveJob::Base.queue_adapter = :inline
-
-    test.run
-  ensure
-    ActiveJob::Base.queue_adapter = current_adapter
-  end
-
   describe '#timeseries' do
     before do
-      10.times do
-        conversation = create(:conversation, account: account,
-                                             inbox: inbox, assignee: user,
-                                             created_at: Time.zone.today)
-        create_list(:message, 5, message_type: 'outgoing',
-                                 account: account, inbox: inbox,
-                                 conversation: conversation, created_at: Time.zone.today + 2.hours)
-        create_list(:message, 2, message_type: 'incoming',
-                                 account: account, inbox: inbox,
-                                 conversation: conversation,
-                                 created_at: Time.zone.today + 3.hours)
-        conversation.update_labels('label_1')
-        conversation.label_list
-        conversation.save!
-      end
+      gravatar_url = 'https://www.gravatar.com'
+      stub_request(:get, /#{gravatar_url}.*/).to_return(status: 404)
 
-      5.times do
-        conversation = create(:conversation, account: account,
-                                             inbox: inbox, assignee: user,
-                                             created_at: (Time.zone.today - 2.days))
-        create_list(:message, 3, message_type: 'outgoing',
-                                 account: account, inbox: inbox,
-                                 conversation: conversation,
-                                 created_at: (Time.zone.today - 2.days))
-        create_list(:message, 1, message_type: 'incoming',
-                                 account: account, inbox: inbox,
-                                 conversation: conversation,
-                                 created_at: (Time.zone.today - 2.days))
-        conversation.update_labels('label_2')
-        conversation.label_list
-        conversation.save!
+      perform_enqueued_jobs do
+        10.times do
+          conversation = create(:conversation, account: account,
+                                               inbox: inbox, assignee: user,
+                                               created_at: Time.zone.today)
+          create_list(:message, 5, message_type: 'outgoing',
+                                   account: account, inbox: inbox,
+                                   conversation: conversation, created_at: Time.zone.today + 2.hours)
+          create_list(:message, 2, message_type: 'incoming',
+                                   account: account, inbox: inbox,
+                                   conversation: conversation,
+                                   created_at: Time.zone.today + 3.hours)
+          conversation.update_labels('label_1')
+          conversation.label_list
+          conversation.save!
+        end
+
+        5.times do
+          conversation = create(:conversation, account: account,
+                                               inbox: inbox, assignee: user,
+                                               created_at: (Time.zone.today - 2.days))
+          create_list(:message, 3, message_type: 'outgoing',
+                                   account: account, inbox: inbox,
+                                   conversation: conversation,
+                                   created_at: (Time.zone.today - 2.days))
+          create_list(:message, 1, message_type: 'incoming',
+                                   account: account, inbox: inbox,
+                                   conversation: conversation,
+                                   created_at: (Time.zone.today - 2.days))
+          conversation.update_labels('label_2')
+          conversation.label_list
+          conversation.save!
+        end
       end
     end
 
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 969b83f68..c1dc781e9 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -56,5 +56,17 @@ RSpec.describe 'API Base', type: :request do
         expect(conversation.reload.status).to eq('open')
       end
     end
+
+    context 'when the account is suspended' do
+      it 'returns 401 unauthorized' do
+        account.update!(status: :suspended)
+
+        post "/api/v1/accounts/#{account.id}/canned_responses",
+             headers: { api_access_token: user.access_token.token },
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
   end
 end
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index ce4aab778..1e98af260 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -157,7 +157,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
 
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
             headers: agent.create_new_auth_token,
-            params: { payload: {} }
+            params: {}
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
         expect(json_response['payload'].count).to be 2
@@ -169,7 +169,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
 
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
             headers: agent.create_new_auth_token,
-            params: { payload: { category_slug: category.slug } }
+            params: { category_slug: category.slug }
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
         expect(json_response['payload'].count).to be 2
@@ -186,10 +186,11 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
 
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
             headers: agent.create_new_auth_token,
-            params: { payload: { query: 'funny' } }
+            params: { query: 'funny' }
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
         expect(json_response['payload'].count).to be 1
+        expect(json_response['meta']['articles_count']).to be 2
       end
     end
 
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index d905bf771..2c8041ab5 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -71,14 +71,6 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
             {
               'action_name': :add_label,
               'action_params': %w[support priority_customer]
-            },
-            {
-              'action_name': :assign_best_administrator,
-              'action_params': [1]
-            },
-            {
-              'action_name': :update_additional_attributes,
-              'action_params': [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
             }
           ]
         }
@@ -283,8 +275,8 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
           ],
           'actions': [
             {
-              'action_name': :update_additional_attributes,
-              'action_params': [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
+              'action_name': :add_label,
+              'action_params': %w[support priority_customer]
             }
           ]
         }
diff --git a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
index cbc6661aa..434ae86d7 100644
--- a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
 
   describe 'POST /api/v1/accounts/{account.id}/bulk_action' do
     context 'when it is an unauthenticated user' do
-      let(:agent) { create(:user) }
+      let!(:agent) { create(:user) }
 
       it 'returns unauthorized' do
         post "/api/v1/accounts/#{account.id}/bulk_actions",
@@ -27,7 +27,7 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let!(:agent) { create(:user, account: account, role: :agent) }
 
       it 'Ignores bulk_actions for wrong type' do
         post "/api/v1/accounts/#{account.id}/bulk_actions",
@@ -117,7 +117,7 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
 
   describe 'POST /api/v1/accounts/{account.id}/bulk_actions' do
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let!(:agent) { create(:user, account: account, role: :agent) }
 
       it 'Bulk delete conversation labels' do
         Conversation.first.add_labels(%w[support priority_customer])
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 0c9b77443..b3390fe03 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -487,6 +487,14 @@ RSpec.describe 'Contacts API', type: :request do
         contact.reload
         expect(contact.avatar.attached?).to be(true)
       end
+
+      it 'updated avatar with avatar_url' do
+        patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
+              params: valid_params.merge(avatar_url: 'http://example.com/avatar.png'),
+              headers: admin.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        expect(Avatar::AvatarFromUrlJob).to have_been_enqueued.with(contact, 'http://example.com/avatar.png')
+      end
     end
   end
 
diff --git a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
index 368849b5f..dbe19690a 100644
--- a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Conversation Assignment API', type: :request do
       end
 
       it 'assigns a team to the conversation' do
-        team_member = create(:user, account: account, role: :agent)
+        team_member = create(:user, account: account, role: :agent, auto_offline: false)
         create(:inbox_member, inbox: conversation.inbox, user: team_member)
         create(:team_member, team: team, user: team_member)
         params = { team_id: team.id }
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index f63e33d0f..d9654fadf 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -220,7 +220,7 @@ RSpec.describe 'Conversations API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent) { create(:user, account: account, role: :agent, auto_offline: false) }
       let(:team) { create(:team, account: account) }
 
       it 'will not create a new conversation if agent does not have access to inbox' do
diff --git a/spec/controllers/api/v1/accounts/macros_controller_spec.rb b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
new file mode 100644
index 000000000..d605dd508
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
@@ -0,0 +1,233 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
+  include ActiveJob::TestHelper
+
+  let(:account) { create(:account) }
+  let(:administrator) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:agent_1) { create(:user, account: account, role: :agent) }
+
+  before do
+    create(:macro, account: account, created_by: administrator, updated_by: administrator, visibility: :global)
+    create(:macro, account: account, created_by: administrator, updated_by: administrator, visibility: :global)
+    create(:macro, account: account, created_by: administrator, updated_by: administrator, visibility: :personal)
+    create(:macro, account: account, created_by: agent, updated_by: agent, visibility: :personal)
+    create(:macro, account: account, created_by: agent, updated_by: agent, visibility: :personal)
+    create(:macro, account: account, created_by: agent_1, updated_by: agent_1, visibility: :personal)
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/macros' do
+    context 'when it is an authenticated administrator' do
+      it 'returns all records in the account' do
+        get "/api/v1/accounts/#{account.id}/macros",
+            headers: administrator.create_new_auth_token
+
+        visible_macros = account.macros
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload'].length).to eq(visible_macros.count)
+        expect(body['payload'].first['id']).to eq(Macro.first.id)
+        expect(body['payload'].last['id']).to eq(Macro.last.id)
+      end
+    end
+
+    context 'when it is an authenticated agent' do
+      it 'returns all records in account and created_by the agent' do
+        get "/api/v1/accounts/#{account.id}/macros",
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        body = JSON.parse(response.body)
+        visible_macros = account.macros.global.or(account.macros.personal.where(created_by_id: agent.id))
+
+        expect(body['payload'].length).to eq(visible_macros.count)
+        expect(body['payload'].first['id']).to eq(visible_macros.first.id)
+        expect(body['payload'].last['id']).to eq(visible_macros.last.id)
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/macros"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/macros' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/macros"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:params) do
+        {
+          'name': 'Add label, send message and close the chat',
+          'actions': [
+            {
+              'action_name': :add_label,
+              'action_params': %w[support priority_customer]
+            },
+            {
+              'action_name': :send_message,
+              'action_params': ['Welcome to the chatwoot platform.']
+            },
+            {
+              'action_name': :resolve_conversation
+            }
+          ],
+          visibility: 'global',
+          created_by_id: administrator.id
+        }.with_indifferent_access
+      end
+
+      it 'creates the macro' do
+        post "/api/v1/accounts/#{account.id}/macros",
+             params: params,
+             headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['payload']['name']).to eql(params['name'])
+        expect(json_response['payload']['visibility']).to eql(params['visibility'])
+        expect(json_response['payload']['created_by']['id']).to eql(administrator.id)
+      end
+
+      it 'sets visibility default to personal for agent' do
+        post "/api/v1/accounts/#{account.id}/macros",
+             params: params,
+             headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['payload']['name']).to eql(params['name'])
+        expect(json_response['payload']['visibility']).to eql('personal')
+        expect(json_response['payload']['created_by']['id']).to eql(agent.id)
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/accounts/{account.id}/macros/{macro.id}' do
+    let!(:macro) { create(:macro, account: account, created_by: administrator, updated_by: administrator) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/macros/#{macro.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:params) do
+        {
+          'name': 'Add label, send message and close the chat'
+        }
+      end
+
+      it 'Updates the macro' do
+        put "/api/v1/accounts/#{account.id}/macros/#{macro.id}",
+            params: params,
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['name']).to eql(params['name'])
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/macros/{macro.id}' do
+    let!(:macro) { create(:macro, account: account, created_by: administrator, updated_by: administrator) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/macros/#{macro.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'fetch the macro' do
+        get "/api/v1/accounts/#{account.id}/macros/#{macro.id}",
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['payload']['name']).to eql(macro.name)
+        expect(json_response['payload']['created_by']['id']).to eql(administrator.id)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/macros/{macro.id}/execute' do
+    let!(:macro) { create(:macro, account: account, created_by: administrator, updated_by: administrator) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:contact) { create(:contact, account: account, identifier: '123') }
+    let(:conversation) { create(:conversation, inbox: inbox, account: account, status: :open) }
+    let(:team) { create(:team, account: account) }
+    let(:user_1) { create(:user, role: 0) }
+
+    before do
+      create(:team_member, user: user_1, team: team)
+      create(:account_user, user: user_1, account: account)
+      macro.update!(actions:
+                              [
+                                {
+                                  'action_name' => 'send_email_to_team', 'action_params' => [{
+                                    'message' => 'Please pay attention to this conversation, its from high priority customer',
+                                    'team_ids' => [team.id]
+                                  }]
+                                },
+                                { 'action_name' => 'assign_team', 'action_params' => [team.id] },
+                                { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] },
+                                { 'action_name' => 'snooze_conversation' },
+                                { 'action_name' => 'assign_best_agent', 'action_params' => [user_1.id] },
+                                { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] }
+                              ])
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/macros/#{macro.id}/execute"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'execute the macro' do
+        expect(conversation.messages).to be_empty
+        expect(conversation.assignee).to be_nil
+        expect(conversation.labels).to be_empty
+
+        perform_enqueued_jobs do
+          post "/api/v1/accounts/#{account.id}/macros/#{macro.id}/execute",
+               params: { conversation_ids: [conversation.display_id] },
+               headers: administrator.create_new_auth_token
+        end
+
+        expect(conversation.reload.status).to eql('snoozed')
+        expect(conversation.messages.chat.last.content).to eq('Send this message.')
+        expect(conversation.label_list).to match_array(%w[support priority_customer])
+        expect(conversation.messages.activity.last.content).to eq("Assigned to #{user_1.name} by #{administrator.name}")
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index e756edb30..71a4b755d 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -115,7 +115,8 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
         expect(json_response['name']).to eql(portal_params[:portal][:name])
-        expect(json_response['config']).to eql({ 'allowed_locales' => %w[en es] })
+        expect(json_response['config']).to eql({ 'allowed_locales' => [{ 'articles_count' => 0, 'categories_count' => 0, 'code' => 'en' },
+                                                                       { 'articles_count' => 0, 'categories_count' => 0, 'code' => 'es' }] })
       end
 
       it 'archive portal' do
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index d7e66fa56..cebc36872 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe 'Accounts API', type: :request do
         with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
           allow(account_builder).to receive(:perform).and_return([user, account])
 
-          params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
+          params = { account_name: 'test', email: email, user: nil, locale: nil, user_full_name: user_full_name, password: 'Password1!' }
 
           post api_v1_accounts_url,
                params: params,
@@ -27,6 +27,7 @@ RSpec.describe 'Accounts API', type: :request do
           expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
           expect(account_builder).to have_received(:perform)
           expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
+          expect(response.body).to include('en')
         end
       end
 
@@ -37,7 +38,7 @@ RSpec.describe 'Accounts API', type: :request do
           allow(ChatwootCaptcha).to receive(:new).and_return(captcha)
           allow(captcha).to receive(:valid?).and_return(true)
 
-          params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!',
+          params = { account_name: 'test', email: email, user: nil, locale: nil, user_full_name: user_full_name, password: 'Password1!',
                      h_captcha_client_response: '123' }
 
           post api_v1_accounts_url,
@@ -46,6 +47,7 @@ RSpec.describe 'Accounts API', type: :request do
 
           expect(ChatwootCaptcha).to have_received(:new).with('123')
           expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
+          expect(response.body).to include('en')
         end
       end
 
@@ -53,7 +55,7 @@ RSpec.describe 'Accounts API', type: :request do
         with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
           allow(account_builder).to receive(:perform).and_return(nil)
 
-          params = { account_name: nil, email: nil, user: nil, user_full_name: nil }
+          params = { account_name: nil, email: nil, user: nil, locale: 'en', user_full_name: nil }
 
           post api_v1_accounts_url,
                params: params,
@@ -130,6 +132,7 @@ RSpec.describe 'Accounts API', type: :request do
         expect(response.body).to include(account.domain)
         expect(response.body).to include(account.support_email)
         expect(response.body).to include(account.auto_resolve_duration.to_s)
+        expect(response.body).to include(account.locale)
       end
     end
   end
diff --git a/spec/controllers/api/v1/widget/configs_controller_spec.rb b/spec/controllers/api/v1/widget/configs_controller_spec.rb
index 8101885bd..4c4cef2c9 100644
--- a/spec/controllers/api/v1/widget/configs_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/configs_controller_spec.rb
@@ -47,6 +47,17 @@ RSpec.describe '/api/v1/widget/config', type: :request do
         expect(response_data.keys).to include(*response_keys)
         expect(response_data['contact']['pubsub_token']).to eq(contact_inbox.pubsub_token)
       end
+
+      it 'returns 401 if account is suspended' do
+        account.update!(status: :suspended)
+
+        post '/api/v1/widget/config',
+             params: params,
+             headers: { 'X-Auth-Token' => token },
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
     end
 
     context 'with correct website token and invalid X-Auth-Token' do
diff --git a/spec/controllers/platform/api/v1/accounts_controller_spec.rb b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
index e81be05ac..addb3c885 100644
--- a/spec/controllers/platform/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
@@ -30,6 +30,15 @@ RSpec.describe 'Platform Accounts API', type: :request do
         expect(response.body).to include('Test Account')
         expect(platform_app.platform_app_permissibles.first.permissible.name).to eq('Test Account')
       end
+
+      it 'creates an account with locale' do
+        post '/platform/api/v1/accounts', params: { name: 'Test Account', locale: 'es' },
+                                          headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include('Test Account')
+        expect(response.body).to include('es')
+      end
     end
   end
 
diff --git a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
index 0e074da68..05a07aeae 100644
--- a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe 'Public Articles API', type: :request do
       json_response = JSON.parse(response.body)
 
       expect(json_response['payload'].length).to eql portal.articles.count
+      expect(json_response['meta']['articles_count']).to be json_response['payload'].size
     end
 
     it 'get all articles with searched text query' do
@@ -36,10 +37,11 @@ RSpec.describe 'Public Articles API', type: :request do
 
       get "/public/api/v1/portals/#{portal.slug}/articles",
           headers: agent.create_new_auth_token,
-          params: { payload: { query: 'funny' } }
+          params: { query: 'funny' }
       expect(response).to have_http_status(:success)
       json_response = JSON.parse(response.body)
       expect(json_response['payload'].count).to be 1
+      expect(json_response['meta']['articles_count']).to be json_response['payload'].size
     end
   end
 
diff --git a/spec/controllers/public/api/v1/portals/categories_controller_spec.rb b/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
index 524871447..7bff264d4 100644
--- a/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
@@ -31,6 +31,7 @@ RSpec.describe 'Public Categories API', type: :request do
       json_response = JSON.parse(response.body)
 
       expect(json_response['slug']).to eql category_slug
+      expect(json_response['meta']['articles_count']).to be 0
     end
   end
 end
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 4abf78c70..71a6cdcc0 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe 'Public Portals API', type: :request do
       expect(response).to have_http_status(:success)
       json_response = JSON.parse(response.body)
       expect(json_response['slug']).to eql 'test-portal'
+      expect(json_response['meta']['articles_count']).to be 0
     end
   end
 end
diff --git a/spec/controllers/widgets_controller_spec.rb b/spec/controllers/widgets_controller_spec.rb
index 07624e03e..8b955b6f6 100644
--- a/spec/controllers/widgets_controller_spec.rb
+++ b/spec/controllers/widgets_controller_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe '/widget', type: :request do
   let(:account) { create(:account) }
-  let(:web_widget) { create(:channel_widget) }
+  let(:web_widget) { create(:channel_widget, account: account) }
   let(:contact) { create(:contact, account: account) }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
@@ -25,5 +25,13 @@ describe '/widget', type: :request do
       get widget_url
       expect(response).to have_http_status(:not_found)
     end
+
+    it 'returns 401 if the account is suspended' do
+      account.update!(status: :suspended)
+
+      get widget_url(website_token: web_widget.website_token)
+      expect(response).to have_http_status(:unauthorized)
+      expect(response.body).to include('Account is suspended')
+    end
   end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
similarity index 100%
rename from spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb
rename to spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
new file mode 100644
index 000000000..354aa5a50
--- /dev/null
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
@@ -0,0 +1,113 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Billing APIs', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  describe 'POST /enterprise/api/v1/accounts/{account.id}/subscription' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/enterprise/api/v1/accounts/#{account.id}/subscription", as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      context 'when it is an agent' do
+        it 'returns unauthorized' do
+          post "/enterprise/api/v1/accounts/#{account.id}/subscription",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+
+      context 'when it is an admin' do
+        it 'enqueues a job' do
+          expect do
+            post "/enterprise/api/v1/accounts/#{account.id}/subscription",
+                 headers: admin.create_new_auth_token,
+                 as: :json
+          end.to have_enqueued_job(Enterprise::CreateStripeCustomerJob).with(account)
+          expect(account.reload.custom_attributes).to eq({ 'is_creating_customer': true }.with_indifferent_access)
+        end
+
+        it 'does not enqueue a job if a job is already enqueued' do
+          account.update!(custom_attributes: { is_creating_customer: true })
+
+          expect do
+            post "/enterprise/api/v1/accounts/#{account.id}/subscription",
+                 headers: admin.create_new_auth_token,
+                 as: :json
+          end.not_to have_enqueued_job(Enterprise::CreateStripeCustomerJob).with(account)
+        end
+
+        it 'does not enqueues a job if customer id is present' do
+          account.update!(custom_attributes: { 'stripe_customer_id': 'cus_random_string' })
+
+          expect do
+            post "/enterprise/api/v1/accounts/#{account.id}/subscription",
+                 headers: admin.create_new_auth_token,
+                 as: :json
+          end.not_to have_enqueued_job(Enterprise::CreateStripeCustomerJob).with(account)
+        end
+      end
+    end
+  end
+
+  describe 'POST /enterprise/api/v1/accounts/{account.id}/checkout' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/enterprise/api/v1/accounts/#{account.id}/checkout", as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      context 'when it is an agent' do
+        it 'returns unauthorized' do
+          post "/enterprise/api/v1/accounts/#{account.id}/checkout",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+
+      context 'when it is an admin and the stripe customer id is not present' do
+        it 'returns error' do
+          post "/enterprise/api/v1/accounts/#{account.id}/checkout",
+               headers: admin.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          json_response = JSON.parse(response.body)
+          expect(json_response['error']).to eq('Please subscribe to a plan before viewing the billing details')
+        end
+      end
+
+      context 'when it is an admin and the stripe customer is present' do
+        it 'calls create session' do
+          account.update!(custom_attributes: { 'stripe_customer_id': 'cus_random_string' })
+
+          create_session_service = double
+          allow(Enterprise::Billing::CreateSessionService).to receive(:new).and_return(create_session_service)
+          allow(create_session_service).to receive(:create_session).and_return(create_session_service)
+          allow(create_session_service).to receive(:url).and_return('https://billing.stripe.com/random_string')
+
+          post "/enterprise/api/v1/accounts/#{account.id}/checkout",
+               headers: admin.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:success)
+          json_response = JSON.parse(response.body)
+          expect(json_response['redirect_url']).to eq('https://billing.stripe.com/random_string')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/enterprise/webooks/stripe_controller_spec.rb b/spec/enterprise/controllers/enterprise/webooks/stripe_controller_spec.rb
new file mode 100644
index 000000000..bbcddeb29
--- /dev/null
+++ b/spec/enterprise/controllers/enterprise/webooks/stripe_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise::Webhooks::StripeController', type: :request do
+  describe 'POST /enterprise/webhooks/stripe' do
+    let(:params) { { content: 'hello' } }
+
+    it 'call the Enterprise::Billing::HandleStripeEventService with the params' do
+      handle_stripe = double
+      allow(Stripe::Webhook).to receive(:construct_event).and_return(params)
+      allow(Enterprise::Billing::HandleStripeEventService).to receive(:new).and_return(handle_stripe)
+      allow(handle_stripe).to receive(:perform)
+      post '/enterprise/webhooks/stripe', headers: { 'Stripe-Signature': 'test' }, params: params
+      expect(handle_stripe).to have_received(:perform).with(event: params)
+    end
+
+    it 'returns a bad request if the headers are missing' do
+      post '/enterprise/webhooks/stripe', params: params
+      expect(response).to have_http_status(:bad_request)
+    end
+
+    it 'returns a bad request if the headers are invalid' do
+      post '/enterprise/webhooks/stripe', headers: { 'Stripe-Signature': 'test' }, params: params
+      expect(response).to have_http_status(:bad_request)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/enterprise/create_stripe_customer_job_spec.rb b/spec/enterprise/jobs/enterprise/create_stripe_customer_job_spec.rb
new file mode 100644
index 000000000..b2c945800
--- /dev/null
+++ b/spec/enterprise/jobs/enterprise/create_stripe_customer_job_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe Enterprise::CreateStripeCustomerJob, type: :job do
+  include ActiveJob::TestHelper
+  subject(:job) { described_class.perform_later(account) }
+
+  let(:account) { create(:account) }
+
+  it 'queues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .with(account)
+      .on_queue('default')
+  end
+
+  it 'executes perform' do
+    create_stripe_customer_service = double
+    allow(Enterprise::Billing::CreateStripeCustomerService)
+      .to receive(:new)
+      .with(account: account)
+      .and_return(create_stripe_customer_service)
+    allow(create_stripe_customer_service).to receive(:perform)
+
+    perform_enqueued_jobs { job }
+
+    expect(Enterprise::Billing::CreateStripeCustomerService).to have_received(:new).with(account: account)
+  end
+end
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index 6f0fa5aa7..16a664ef5 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -28,5 +28,15 @@ RSpec.describe Account do
         }
       )
     end
+
+    it 'returns limits based on subscription' do
+      account.update(limits: { agents: 10 }, custom_attributes: { subscribed_quantity: 5 })
+      expect(account.usage_limits).to eq(
+        {
+          agents: 5,
+          inboxes: ChatwootApp.max_limit
+        }
+      )
+    end
   end
 end
diff --git a/spec/enterprise/services/enterprise/billing/create_session_service_spec.rb b/spec/enterprise/services/enterprise/billing/create_session_service_spec.rb
new file mode 100644
index 000000000..0c7fabaa3
--- /dev/null
+++ b/spec/enterprise/services/enterprise/billing/create_session_service_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe Enterprise::Billing::CreateSessionService do
+  subject(:create_session_service) { described_class }
+
+  describe '#perform' do
+    it 'calls stripe billing portal session' do
+      customer_id = 'cus_random_number'
+      return_url = 'https://www.chatwoot.com'
+      allow(Stripe::BillingPortal::Session).to receive(:create).with({ customer: customer_id, return_url: return_url })
+
+      create_session_service.new.create_session(customer_id, return_url)
+
+      expect(Stripe::BillingPortal::Session).to have_received(:create).with(
+        {
+          customer: customer_id,
+          return_url: return_url
+        }
+      )
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/billing/create_stripe_customer_service_spec.rb b/spec/enterprise/services/enterprise/billing/create_stripe_customer_service_spec.rb
new file mode 100644
index 000000000..95edf73a1
--- /dev/null
+++ b/spec/enterprise/services/enterprise/billing/create_stripe_customer_service_spec.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+describe Enterprise::Billing::CreateStripeCustomerService do
+  subject(:create_stripe_customer_service) { described_class }
+
+  let(:account) { create(:account) }
+  let!(:admin1) { create(:user, account: account, role: :administrator) }
+  let(:admin2) { create(:user, account: account, role: :administrator) }
+
+  describe '#perform' do
+    before do
+      create(
+        :installation_config,
+        { name: 'CHATWOOT_CLOUD_PLANS', value: [
+          { 'name' => 'A Plan Name', 'product_id' => ['prod_hacker_random'], 'price_ids' => ['price_hacker_random'] }
+        ] }
+      )
+    end
+
+    it 'does not call stripe methods if customer id is present' do
+      account.update!(custom_attributes: { stripe_customer_id: 'cus_random_number' })
+
+      allow(Stripe::Customer).to receive(:create)
+      allow(Stripe::Subscription).to receive(:create)
+        .and_return(
+          {
+            plan: { id: 'price_random_number', product: 'prod_random_number' },
+            quantity: 2
+          }.with_indifferent_access
+        )
+
+      create_stripe_customer_service.new(account: account).perform
+
+      expect(Stripe::Customer).not_to have_received(:create)
+      expect(Stripe::Subscription)
+        .to have_received(:create)
+        .with({ customer: 'cus_random_number', items: [{ price: 'price_hacker_random', quantity: 2 }] })
+
+      expect(account.reload.custom_attributes).to eq(
+        {
+          stripe_customer_id: 'cus_random_number',
+          stripe_price_id: 'price_random_number',
+          stripe_product_id: 'prod_random_number',
+          subscribed_quantity: 2,
+          plan_name: 'A Plan Name'
+        }.with_indifferent_access
+      )
+    end
+
+    it 'calls stripe methods to create a customer and updates the account' do
+      customer = double
+      allow(Stripe::Customer).to receive(:create).and_return(customer)
+      allow(customer).to receive(:id).and_return('cus_random_number')
+      allow(Stripe::Subscription)
+        .to receive(:create)
+        .and_return(
+          {
+            plan: { id: 'price_random_number', product: 'prod_random_number' },
+            quantity: 2
+          }.with_indifferent_access
+        )
+
+      create_stripe_customer_service.new(account: account).perform
+
+      expect(Stripe::Customer).to have_received(:create).with({ name: account.name, email: admin1.email })
+      expect(Stripe::Subscription)
+        .to have_received(:create)
+        .with({ customer: customer.id, items: [{ price: 'price_hacker_random', quantity: 2 }] })
+
+      expect(account.reload.custom_attributes).to eq(
+        {
+          stripe_customer_id: customer.id,
+          stripe_price_id: 'price_random_number',
+          stripe_product_id: 'prod_random_number',
+          subscribed_quantity: 2,
+          plan_name: 'A Plan Name'
+        }.with_indifferent_access
+      )
+    end
+  end
+end
diff --git a/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
new file mode 100644
index 000000000..e3898ffec
--- /dev/null
+++ b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+describe Enterprise::Billing::HandleStripeEventService do
+  subject(:stripe_event_service) { described_class }
+
+  let(:event) { double }
+  let(:data) { double }
+  let(:subscription) { double }
+  let!(:account) { create(:account, custom_attributes: { stripe_customer_id: 'cus_123' }) }
+
+  before do
+    allow(event).to receive(:data).and_return(data)
+    allow(data).to receive(:object).and_return(subscription)
+    allow(subscription).to receive(:[]).with('plan')
+                                       .and_return({
+                                                     'id' => 'test', 'product' => 'plan_id', 'name' => 'plan_name'
+                                                   })
+    allow(subscription).to receive(:[]).with('quantity').and_return('10')
+    allow(subscription).to receive(:customer).and_return('cus_123')
+    create(:installation_config, {
+             name: 'CHATWOOT_CLOUD_PLANS',
+             value: [
+               {
+                 'name' => 'Hacker',
+                 'product_id' => ['plan_id'],
+                 'price_ids' => ['price_1']
+               },
+               {
+                 'name' => 'Startups',
+                 'product_id' => ['plan_id_2'],
+                 'price_ids' => ['price_2']
+               }
+             ]
+           })
+  end
+
+  describe '#perform' do
+    it 'handle customer.subscription.updated' do
+      allow(event).to receive(:type).and_return('customer.subscription.updated')
+      allow(subscription).to receive(:customer).and_return('cus_123')
+      stripe_event_service.new.perform(event: event)
+      expect(account.reload.custom_attributes).to eq({
+                                                       'stripe_customer_id' => 'cus_123',
+                                                       'stripe_price_id' => 'test',
+                                                       'stripe_product_id' => 'plan_id',
+                                                       'plan_name' => 'Hacker',
+                                                       'subscribed_quantity' => '10'
+                                                     })
+    end
+
+    it 'handles customer.subscription.deleted' do
+      stripe_customer_service = double
+      allow(event).to receive(:type).and_return('customer.subscription.deleted')
+      allow(Enterprise::Billing::CreateStripeCustomerService).to receive(:new).and_return(stripe_customer_service)
+      allow(stripe_customer_service).to receive(:perform)
+      stripe_event_service.new.perform(event: event)
+      expect(Enterprise::Billing::CreateStripeCustomerService).to have_received(:new).with(account: account)
+    end
+  end
+end
diff --git a/spec/factories/accounts.rb b/spec/factories/accounts.rb
index aa8a9b7e6..968962cff 100644
--- a/spec/factories/accounts.rb
+++ b/spec/factories/accounts.rb
@@ -3,6 +3,7 @@
 FactoryBot.define do
   factory :account do
     sequence(:name) { |n| "Account #{n}" }
+    status { 'active' }
     custom_email_domain_enabled { false }
     domain { 'test.com' }
     support_email { 'support@test.com' }
diff --git a/spec/factories/automation_rules.rb b/spec/factories/automation_rules.rb
index 1b37e40d2..9c7a80254 100644
--- a/spec/factories/automation_rules.rb
+++ b/spec/factories/automation_rules.rb
@@ -12,7 +12,7 @@ FactoryBot.define do
         },
         { 'action_name' => 'assign_team', 'action_params' => [1] },
         { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] },
-        { 'action_name' => 'assign_best_agents', 'action_params' => [1, 2, 3, 4] }
+        { 'action_name' => 'assign_best_agent', 'action_params' => [1, 2, 3, 4] }
       ]
     end
   end
diff --git a/spec/factories/inbox_members.rb b/spec/factories/inbox_members.rb
index 3ee68ebfc..14bf5edbe 100644
--- a/spec/factories/inbox_members.rb
+++ b/spec/factories/inbox_members.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :inbox_member do
-    user
+    user { create(:user, :with_avatar) }
     inbox
   end
 end
diff --git a/spec/factories/macros.rb b/spec/factories/macros.rb
new file mode 100644
index 000000000..1730f58ef
--- /dev/null
+++ b/spec/factories/macros.rb
@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :macro do
+    account
+    name { 'wrong_message_actions' }
+    actions do
+      [
+        { 'action_name' => 'add_label', 'action_params' => %w[wrong_chat] }
+      ]
+    end
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index cbebfa838..9b613e5a1 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -5,6 +5,7 @@ FactoryBot.define do
     transient do
       skip_confirmation { true }
       role { 'agent' }
+      auto_offline { true }
       account { nil }
       inviter { nil }
     end
@@ -18,7 +19,10 @@ FactoryBot.define do
 
     after(:build) do |user, evaluator|
       user.skip_confirmation! if evaluator.skip_confirmation
-      create(:account_user, user: user, account: evaluator.account, role: evaluator.role, inviter: evaluator.inviter) if evaluator.account
+      if evaluator.account
+        create(:account_user, user: user, account: evaluator.account, role: evaluator.role, inviter: evaluator.inviter,
+                              auto_offline: evaluator.auto_offline)
+      end
     end
 
     trait :with_avatar do
diff --git a/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb b/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb
new file mode 100644
index 000000000..c190bf17b
--- /dev/null
+++ b/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe Avatar::AvatarFromGravatarJob, type: :job do
+  let(:avatarable) { create(:contact) }
+  let(:email) { 'test@test.com' }
+  let(:gravatar_url) { "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?d=404" }
+
+  it 'enqueues the job' do
+    expect { described_class.perform_later(avatarable, email) }.to have_enqueued_job(described_class)
+      .on_queue('low')
+  end
+
+  it 'will call AvatarFromUrlJob with gravatar url' do
+    expect(Avatar::AvatarFromUrlJob).to receive(:perform_later).with(avatarable, gravatar_url)
+    described_class.perform_now(avatarable, email)
+  end
+
+  it 'will not call AvatarFromUrlJob if DISABLE_GRAVATAR is configured' do
+    with_modified_env DISABLE_GRAVATAR: 'true' do
+      expect(Avatar::AvatarFromUrlJob).not_to receive(:perform_later).with(avatarable, gravatar_url)
+      described_class.perform_now(avatarable, '')
+    end
+  end
+
+  it 'will not call AvatarFromUrlJob if email is blank' do
+    expect(Avatar::AvatarFromUrlJob).not_to receive(:perform_later).with(avatarable, gravatar_url)
+    described_class.perform_now(avatarable, '')
+  end
+end
diff --git a/spec/jobs/avatar/avatar_from_url_job_spec.rb b/spec/jobs/avatar/avatar_from_url_job_spec.rb
new file mode 100644
index 000000000..9a4ebd646
--- /dev/null
+++ b/spec/jobs/avatar/avatar_from_url_job_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+RSpec.describe Avatar::AvatarFromUrlJob, type: :job do
+  let(:avatarable) { create(:contact) }
+  let(:avatar_url) { 'https://example.com/avatar.png' }
+
+  it 'enqueues the job' do
+    expect { described_class.perform_later(avatarable, avatar_url) }.to have_enqueued_job(described_class)
+      .on_queue('default')
+  end
+
+  it 'will attach avatar from url' do
+    expect(avatarable.avatar).not_to be_attached
+    expect(Down).to receive(:download).with(avatar_url,
+                                            max_size: 15 * 1024 * 1024).and_return(fixture_file_upload(Rails.root.join('spec/assets/avatar.png'),
+                                                                                                       'image/png'))
+    described_class.perform_now(avatarable, avatar_url)
+    expect(avatarable.avatar).to be_attached
+  end
+end
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index 5e2730081..2ec88c026 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -3,6 +3,15 @@ require 'rails_helper'
 describe Integrations::Slack::IncomingMessageBuilder do
   let(:account) { create(:account) }
   let(:message_params) { slack_message_stub }
+  let(:private_message_params) do
+    {
+      team_id: 'TLST3048H',
+      api_app_id: 'A012S5UETV4',
+      event: message_event.merge({ text: 'pRivate: A private note message' }),
+      type: 'event_callback',
+      event_time: 1_588_623_033
+    }
+  end
   let(:message_with_attachments) { slack_attachment_stub }
   let(:message_without_thread_ts) { slack_message_stub_without_thread_ts }
   let(:verification_params) { slack_url_verification_stub }
@@ -45,6 +54,17 @@ describe Integrations::Slack::IncomingMessageBuilder do
         expect(conversation.messages.last.content).to eql('this is test https://chatwoot.com Hey @Sojan Test again')
       end
 
+      it 'creates a private note' do
+        expect(hook).not_to be_nil
+        messages_count = conversation.messages.count
+        builder = described_class.new(private_message_params)
+        allow(builder).to receive(:sender).and_return(nil)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count + 1)
+        expect(conversation.messages.last.content).to eql('pRivate: A private note message')
+        expect(conversation.messages.last.private).to be(true)
+      end
+
       it 'does not create message for invalid event type' do
         messages_count = conversation.messages.count
         message_params[:type] = 'invalid_event_type'
diff --git a/spec/lib/online_status_tracker_spec.rb b/spec/lib/online_status_tracker_spec.rb
new file mode 100644
index 000000000..d4890a6f3
--- /dev/null
+++ b/spec/lib/online_status_tracker_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+describe OnlineStatusTracker do
+  let!(:account) { create(:account) }
+  let!(:user1) { create(:user, account: account) }
+  let!(:user2) { create(:user, account: account) }
+  let!(:user3) { create(:user, account: account) }
+
+  context 'when get_available_users' do
+    before do
+      described_class.update_presence(account.id, 'User', user1.id)
+    end
+
+    it 'returns only the online user ids with presence' do
+      expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s)
+      expect(described_class.get_available_users(account.id).values).not_to include(user3.id)
+    end
+
+    it 'returns agents who have auto offline configured false' do
+      user2.account_users.first.update(auto_offline: false)
+      expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s, user2.id.to_s)
+    end
+  end
+
+  context 'when get_available_contacts' do
+    let(:online_contact) { create(:contact, account: account) }
+    let(:offline_contact) { create(:contact, account: account) }
+
+    before do
+      described_class.update_presence(account.id, 'Contact', online_contact.id)
+      # creating a stale record for offline contact presence
+      ::Redis::Alfred.zadd(format(::Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id),
+                           (Time.zone.now - (OnlineStatusTracker::PRESENCE_DURATION + 20)).to_i, offline_contact.id)
+    end
+
+    it 'returns only the online contact ids with presence' do
+      expect(described_class.get_available_contacts(account.id).keys).to contain_exactly(online_contact.id.to_s)
+    end
+
+    it 'flushes the stale records from sorted set after the duration' do
+      described_class.get_available_contacts(account.id)
+      expect(::Redis::Alfred.zscore(format(::Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id), offline_contact.id)).to be_nil
+    end
+  end
+end
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index ee13a01ba..9d4c03159 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -39,7 +39,7 @@ describe AutomationRuleListener do
                                         { 'action_name' => 'mute_conversation', 'action_params' => nil },
                                         { 'action_name' => 'change_status', 'action_params' => ['snoozed'] },
                                         { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
-                                        { 'action_name' => 'send_attachments' }
+                                        { 'action_name' => 'send_attachment' }
                                       ])
     file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
     automation_rule.files.attach(file)
diff --git a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
index 1186d7cc9..a4e00204d 100644
--- a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
+++ b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
@@ -39,9 +39,17 @@ RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :maile
   end
 
   describe 'conversation_mention' do
+    let(:contact) { create(:contact, name: nil, account: account) }
     let(:another_agent) { create(:user, email: 'agent2@example.com', account: account) }
     let(:message) { create(:message, conversation: conversation, account: account, sender: another_agent) }
     let(:mail) { described_class.with(account: account).conversation_mention(message, agent).deliver_now }
+    let(:contact_inbox) { create(:contact_inbox, account: account, inbox: conversation.inbox) }
+
+    before do
+      create(:message, conversation: conversation, account: account, sender: contact)
+      create(:message, conversation: conversation, account: account, sender: contact)
+      create(:message, conversation: conversation, account: account, sender: contact)
+    end
 
     it 'renders the subject' do
       expect(mail.subject).to eq("#{agent.available_name}, You have been mentioned in conversation [ID - #{conversation.display_id}]")
@@ -54,6 +62,12 @@ RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :maile
     it 'renders the senders name' do
       expect(mail.body.encoded).to match("You've been mentioned in a conversation. <b>#{another_agent.display_name}</b> wrote:")
     end
+
+    it 'renders Customer if contacts name not available in the conversation' do
+      expect(contact.name).to be_nil
+      expect(conversation.recent_messages).not_to be_empty
+      expect(mail.body.encoded).to match('Incoming Message')
+    end
   end
 
   describe 'assigned_conversation_new_message' do
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index e9906f131..9cd5721ac 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -36,6 +36,7 @@ RSpec.describe Account do
       account = create(:account)
       query = "select * from information_schema.sequences where sequence_name in  ('camp_dpid_seq_#{account.id}', 'conv_dpid_seq_#{account.id}');"
       expect(ActiveRecord::Base.connection.execute(query).count).to eq(2)
+      expect(account.locale).to eq('en')
       account.destroy
       expect(ActiveRecord::Base.connection.execute(query).count).to eq(0)
     end
diff --git a/spec/models/agent_bot_spec.rb b/spec/models/agent_bot_spec.rb
index 682da1e74..87a3291b3 100644
--- a/spec/models/agent_bot_spec.rb
+++ b/spec/models/agent_bot_spec.rb
@@ -1,5 +1,6 @@
 require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/access_tokenable_shared.rb'
+require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 
 RSpec.describe AgentBot, type: :model do
   describe 'associations' do
@@ -9,5 +10,6 @@ RSpec.describe AgentBot, type: :model do
 
   describe 'concerns' do
     it_behaves_like 'access_tokenable'
+    it_behaves_like 'avatarable'
   end
 end
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index bcc928214..6a66838ef 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -30,8 +30,8 @@ RSpec.describe Article, type: :model do
       create(:article, category_id: category_1.id, title: 'title 1', content: 'This is the content', portal_id: portal_1.id, author_id: user.id)
       create(:article, category_id: category_2.id, title: 'title 2', portal_id: portal_2.id, author_id: user.id)
       create(:article, category_id: category_2.id, title: 'title 3', portal_id: portal_1.id, author_id: user.id)
-      create(:article, category_id: category_3.id, title: 'title 6', portal_id: portal_2.id, author_id: user.id)
-      create(:article, category_id: category_2.id, title: 'title 7', portal_id: portal_1.id, author_id: user.id)
+      create(:article, category_id: category_3.id, title: 'title 6', portal_id: portal_2.id, author_id: user.id, status: :published)
+      create(:article, category_id: category_2.id, title: 'title 7', portal_id: portal_1.id, author_id: user.id, status: :published)
     end
 
     context 'when no parameters passed' do
@@ -53,6 +53,10 @@ RSpec.describe Article, type: :model do
         params = { query: 'this', locale: 'en', category_slug: 'category_1' }
         records = portal_1.articles.search(params)
         expect(records.count).to eq(2)
+
+        params = { status: 'published' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(portal_1.articles.published.size)
       end
     end
 
@@ -107,6 +111,12 @@ RSpec.describe Article, type: :model do
         records = portal_1.articles.search(params)
         expect(records.count).to eq(2)
       end
+
+      it 'returns records with author and category_slug' do
+        params = { category_slug: 'category_2', author_id: user.id }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
     end
 
     context 'with pagination' do
diff --git a/spec/models/automation_rule_spec.rb b/spec/models/automation_rule_spec.rb
index 501e19637..7a68306d6 100644
--- a/spec/models/automation_rule_spec.rb
+++ b/spec/models/automation_rule_spec.rb
@@ -37,12 +37,8 @@ RSpec.describe AutomationRule, type: :model do
             action_params: %w[support priority_customer]
           },
           {
-            action_name: :assign_best_administrator,
+            action_name: :assign_best_agent,
             action_params: [1]
-          },
-          {
-            action_name: :update_additional_attributes,
-            action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
           }
         ]
       }.with_indifferent_access
diff --git a/spec/models/concerns/assignment_handler_shared.rb b/spec/models/concerns/assignment_handler_shared.rb
index 0194da76c..816351248 100644
--- a/spec/models/concerns/assignment_handler_shared.rb
+++ b/spec/models/concerns/assignment_handler_shared.rb
@@ -6,7 +6,7 @@ shared_examples_for 'assignment_handler' do
   describe '#update_team' do
     let(:conversation) { create(:conversation, assignee: create(:user)) }
     let(:agent) do
-      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
+      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent, auto_offline: false)
     end
     let(:team) do
       create(:team, account: conversation.account, allow_auto_assign: false)
diff --git a/spec/models/concerns/round_robin_handler_shared.rb b/spec/models/concerns/auto_assignment_handler_shared.rb
similarity index 91%
rename from spec/models/concerns/round_robin_handler_shared.rb
rename to spec/models/concerns/auto_assignment_handler_shared.rb
index 1bd7b9ca1..90c9c9d20 100644
--- a/spec/models/concerns/round_robin_handler_shared.rb
+++ b/spec/models/concerns/auto_assignment_handler_shared.rb
@@ -2,10 +2,10 @@
 
 require 'rails_helper'
 
-shared_examples_for 'round_robin_handler' do
-  describe '#round robin' do
+shared_examples_for 'auto_assignment_handler' do
+  describe '#auto assignment' do
     let(:account) { create(:account) }
-    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+    let(:agent) { create(:user, email: 'agent1@example.com', account: account, auto_offline: false) }
     let(:inbox) { create(:inbox, account: account) }
     let(:conversation) do
       create(
@@ -23,14 +23,12 @@ shared_examples_for 'round_robin_handler' do
     end
 
     it 'runs round robin on after_save callbacks' do
-      # run_round_robin
       expect(conversation.reload.assignee).to eq(agent)
     end
 
     it 'will not auto assign agent if enable_auto_assignment is false' do
       inbox.update(enable_auto_assignment: false)
 
-      # run_round_robin
       expect(conversation.reload.assignee).to be_nil
     end
 
@@ -44,7 +42,6 @@ shared_examples_for 'round_robin_handler' do
         assignee: nil
       )
 
-      # run_round_robin
       expect(conversation.reload.assignee).to be_nil
     end
 
@@ -55,7 +52,7 @@ shared_examples_for 'round_robin_handler' do
       inbox.inbox_members.where(user_id: agent.id).first.destroy!
 
       # round robin changes assignee in this case since agent doesn't have access to inbox
-      agent2 = create(:user, email: 'agent2@example.com', account: account)
+      agent2 = create(:user, email: 'agent2@example.com', account: account, auto_offline: false)
       create(:inbox_member, inbox: inbox, user: agent2)
       allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
       conversation.status = 'open'
diff --git a/spec/models/concerns/avatarable_shared.rb b/spec/models/concerns/avatarable_shared.rb
new file mode 100644
index 000000000..188868fa1
--- /dev/null
+++ b/spec/models/concerns/avatarable_shared.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+shared_examples_for 'avatarable' do
+  let(:avatarable) { create(described_class.to_s.underscore) }
+
+  it { is_expected.to have_one_attached(:avatar) }
+
+  it 'add avatar_url method' do
+    expect(avatarable.respond_to?(:avatar_url)).to be true
+  end
+
+  context 'when avatarable has an email attribute' do
+    it 'enques job when email is changed on avatarable create' do
+      avatarable = build(described_class.to_s.underscore, account: create(:account))
+      if avatarable.respond_to?(:email)
+        avatarable.email = 'test@test.com'
+        avatarable.skip_reconfirmation! if avatarable.is_a? User
+        expect(Avatar::AvatarFromGravatarJob).to receive(:set).with(wait: 30.seconds).and_call_original
+      end
+      avatarable.save!
+      expect(Avatar::AvatarFromGravatarJob).to have_been_enqueued.with(avatarable, avatarable.email) if avatarable.respond_to?(:email)
+    end
+
+    it 'enques job when email is changes on avatarable update' do
+      if avatarable.respond_to?(:email)
+        avatarable.email = 'xyc@test.com'
+        avatarable.skip_reconfirmation! if avatarable.is_a? User
+        expect(Avatar::AvatarFromGravatarJob).to receive(:set).with(wait: 30.seconds).and_call_original
+      end
+      avatarable.save!
+      expect(Avatar::AvatarFromGravatarJob).to have_been_enqueued.with(avatarable, avatarable.email) if avatarable.respond_to?(:email)
+    end
+
+    it 'will not enqueu when email is not changed on avatarable update' do
+      avatarable.updated_at = Time.now.utc
+      expect do
+        avatarable.save!
+      end.not_to have_enqueued_job(Avatar::AvatarFromGravatarJob)
+    end
+  end
+end
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index 900d96c2f..64095a830 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -2,6 +2,8 @@
 
 require 'rails_helper'
 
+require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
+
 RSpec.describe Contact do
   context 'validations' do
     it { is_expected.to validate_presence_of(:account_id) }
@@ -12,6 +14,10 @@ RSpec.describe Contact do
     it { is_expected.to have_many(:conversations).dependent(:destroy_async) }
   end
 
+  describe 'concerns' do
+    it_behaves_like 'avatarable'
+  end
+
   context 'prepare contact attributes before validation' do
     it 'sets email to lowercase' do
       contact = create(:contact, email: 'Test@test.com')
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 1d172ca8d..22979b7c6 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/assignment_handler_shared.rb'
-require Rails.root.join 'spec/models/concerns/round_robin_handler_shared.rb'
+require Rails.root.join 'spec/models/concerns/auto_assignment_handler_shared.rb'
 
 RSpec.describe Conversation, type: :model do
   describe 'associations' do
@@ -12,7 +12,7 @@ RSpec.describe Conversation, type: :model do
 
   describe 'concerns' do
     it_behaves_like 'assignment_handler'
-    it_behaves_like 'round_robin_handler'
+    it_behaves_like 'auto_assignment_handler'
   end
 
   describe '.before_create' do
@@ -428,6 +428,7 @@ RSpec.describe Conversation, type: :model do
         meta: {
           sender: conversation.contact.push_event_data,
           assignee: conversation.assignee,
+          team: conversation.team,
           hmac_verified: conversation.contact_inbox.hmac_verified
         },
         id: conversation.display_id,
@@ -581,12 +582,17 @@ RSpec.describe Conversation, type: :model do
   end
 
   describe '#delete conversation' do
+    include ActiveJob::TestHelper
+
     let!(:conversation) { create(:conversation) }
 
     let!(:notification) { create(:notification, notification_type: 'conversation_creation', primary_actor: conversation) }
 
     it 'delete associated notifications if conversation is deleted' do
-      conversation.destroy!
+      perform_enqueued_jobs do
+        conversation.destroy!
+      end
+
       expect { notification.reload }.to raise_error ActiveRecord::RecordNotFound
     end
   end
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index f1aeca2e5..ced8eef2a 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -2,6 +2,7 @@
 
 require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/out_of_offisable_shared.rb'
+require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 
 RSpec.describe Inbox do
   describe 'validations' do
@@ -37,6 +38,7 @@ RSpec.describe Inbox do
 
   describe 'concerns' do
     it_behaves_like 'out_of_offisable'
+    it_behaves_like 'avatarable'
   end
 
   describe '#add_member' do
diff --git a/spec/models/macro_spec.rb b/spec/models/macro_spec.rb
new file mode 100644
index 000000000..2879e38ae
--- /dev/null
+++ b/spec/models/macro_spec.rb
@@ -0,0 +1,93 @@
+require 'rails_helper'
+
+RSpec.describe Macro, type: :model do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:created_by) }
+    it { is_expected.to belong_to(:updated_by) }
+  end
+
+  describe 'validations' do
+    it 'validation action name' do
+      macro = FactoryBot.build(:macro, account: account, created_by: admin, updated_by: admin, actions: [{ action_name: :update_last_seen }])
+      expect(macro).not_to be_valid
+      expect(macro.errors.full_messages).to eq(['Actions Macro execution actions update_last_seen not supported.'])
+    end
+  end
+
+  describe '#set_visibility' do
+    let(:agent) { create(:user, account: account, role: :agent) }
+    let(:macro) { create(:macro, account: account, created_by: admin, updated_by: admin, actions: []) }
+
+    context 'when user is administrator' do
+      it 'set visibility with params' do
+        expect(macro.visibility).to eq('personal')
+
+        macro.set_visibility(admin, { visibility: :global })
+
+        expect(macro.visibility).to eq('global')
+
+        macro.set_visibility(admin, { visibility: :personal })
+
+        expect(macro.visibility).to eq('personal')
+      end
+    end
+
+    context 'when user is agent' do
+      it 'set visibility always to agent' do
+        Current.user = agent
+        Current.account = account
+
+        expect(macro.visibility).to eq('personal')
+
+        macro.set_visibility(agent, { visibility: :global })
+
+        expect(macro.visibility).to eq('personal')
+      end
+    end
+  end
+
+  describe '#with_visibility' do
+    let(:agent_1) { create(:user, account: account, role: :agent) }
+    let(:agent_2) { create(:user, account: account, role: :agent) }
+
+    before do
+      create(:macro, account: account, created_by: admin, updated_by: admin, visibility: :global, actions: [])
+      create(:macro, account: account, created_by: admin, updated_by: admin, visibility: :global, actions: [])
+      create(:macro, account: account, created_by: admin, updated_by: admin, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: admin, updated_by: admin, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: agent_1, updated_by: agent_1, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: agent_1, updated_by: agent_1, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: agent_2, updated_by: agent_2, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: agent_2, updated_by: agent_2, visibility: :personal, actions: [])
+      create(:macro, account: account, created_by: agent_2, updated_by: agent_2, visibility: :personal, actions: [])
+    end
+
+    context 'when user is administrator' do
+      it 'return all macros in account' do
+        Current.user = admin
+        Current.account = account
+
+        expect(described_class.with_visibility(admin, {}).count).to eq(account.macros.count)
+      end
+    end
+
+    context 'when user is agent' do
+      it 'return all macros in account and created_by user' do
+        Current.user = agent_2
+        Current.account = account
+
+        macros_for_agent_2 = account.macros.global.count + agent_2.macros.personal.count
+        expect(described_class.with_visibility(agent_2, {}).count).to eq(macros_for_agent_2)
+
+        Current.user = agent_1
+
+        macros_for_agent_1 = account.macros.global.count + agent_1.macros.personal.count
+        expect(described_class.with_visibility(agent_1, {}).count).to eq(macros_for_agent_1)
+      end
+    end
+  end
+end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 4c5a01e94..e3584d182 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Notification do
+  include ActiveJob::TestHelper
+
   context 'with associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to belong_to(:user) }
@@ -97,4 +99,17 @@ RSpec.describe Notification do
                                                                })
     end
   end
+
+  context 'when primary actory is deleted' do
+    let!(:conversation) { create(:conversation) }
+
+    it 'clears notifications' do
+      notification = create(:notification, notification_type: 'conversation_creation', primary_actor: conversation)
+      perform_enqueued_jobs do
+        conversation.inbox.destroy!
+      end
+
+      expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
 end
diff --git a/spec/models/portal_spec.rb b/spec/models/portal_spec.rb
index 20fc2baba..3e574ff3f 100644
--- a/spec/models/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -24,6 +24,7 @@ RSpec.describe Portal, type: :model do
       it 'Adds default allowed_locales en' do
         expect(portal.config).to be_present
         expect(portal.config['allowed_locales']).to eq(['en'])
+        expect(portal.config['default_locale']).to eq('en')
       end
 
       it 'Does not allow any other config than allowed_locales' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3c8c26cd4..4882dc08f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,6 +2,7 @@
 
 require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/access_tokenable_shared.rb'
+require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 
 RSpec.describe User do
   let!(:user) { create(:user) }
@@ -25,6 +26,7 @@ RSpec.describe User do
 
   describe 'concerns' do
     it_behaves_like 'access_tokenable'
+    it_behaves_like 'avatarable'
   end
 
   describe 'pubsub_token' do
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index b22057435..c883597a8 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe Conversations::EventDataPresenter do
         meta: {
           sender: conversation.contact.push_event_data,
           assignee: conversation.assignee,
+          team: conversation.team,
           hmac_verified: conversation.contact_inbox.hmac_verified
         },
         id: conversation.display_id,
diff --git a/spec/services/auto_assignment/agent_assignment_service_spec.rb b/spec/services/auto_assignment/agent_assignment_service_spec.rb
new file mode 100644
index 000000000..00f813d33
--- /dev/null
+++ b/spec/services/auto_assignment/agent_assignment_service_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe AutoAssignment::AgentAssignmentService do
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
+  let!(:inbox_members) { create_list(:inbox_member, 5, inbox: inbox) }
+  let!(:conversation) { create(:conversation, inbox: inbox, account: account) }
+  let!(:online_users) do
+    {
+      inbox_members[0].user_id.to_s => 'busy',
+      inbox_members[1].user_id.to_s => 'busy',
+      inbox_members[2].user_id.to_s => 'busy',
+      inbox_members[3].user_id.to_s => 'online',
+      inbox_members[4].user_id.to_s => 'online'
+    }
+  end
+
+  before do
+    allow(::OnlineStatusTracker).to receive(:get_available_users).and_return(online_users)
+  end
+
+  describe '#perform' do
+    it 'will assign an online agent to the conversation' do
+      expect(conversation.reload.assignee).to be_nil
+      described_class.new(conversation: conversation, allowed_agent_ids: inbox_members.map(&:user_id).map(&:to_s)).perform
+      expect(conversation.reload.assignee).not_to be_nil
+    end
+  end
+
+  describe '#find_assignee' do
+    it 'will return an online agent from the allowed agent ids in roud robin' do
+      expect(described_class.new(conversation: conversation,
+                                 allowed_agent_ids: inbox_members.map(&:user_id).map(&:to_s)).find_assignee).to eq(inbox_members[3].user)
+      expect(described_class.new(conversation: conversation,
+                                 allowed_agent_ids: inbox_members.map(&:user_id).map(&:to_s)).find_assignee).to eq(inbox_members[4].user)
+    end
+  end
+end
diff --git a/spec/services/auto_assignment/inbox_round_robin_service_spec.rb b/spec/services/auto_assignment/inbox_round_robin_service_spec.rb
new file mode 100644
index 000000000..1c78a2785
--- /dev/null
+++ b/spec/services/auto_assignment/inbox_round_robin_service_spec.rb
@@ -0,0 +1,59 @@
+require 'rails_helper'
+
+describe AutoAssignment::InboxRoundRobinService do
+  subject(:inbox_round_robin_service) { described_class.new(inbox: inbox) }
+
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:inbox_members) { create_list(:inbox_member, 5, inbox: inbox) }
+
+  describe '#available_agent' do
+    it 'returns nil if allowed_agent_ids is not passed or empty' do
+      expect(described_class.new(inbox: inbox).available_agent).to be_nil
+    end
+
+    it 'gets the first available agent in allowed_agent_ids and move agent to end of the list' do
+      expected_queue = [inbox_members[0].user_id, inbox_members[4].user_id, inbox_members[3].user_id, inbox_members[2].user_id,
+                        inbox_members[1].user_id].map(&:to_s)
+      described_class.new(inbox: inbox).available_agent(allowed_agent_ids: [inbox_members[0].user_id, inbox_members[4].user_id].map(&:to_s))
+      expect(inbox_round_robin_service.send(:queue)).to eq(expected_queue)
+    end
+
+    it 'constructs round_robin_queue if queue is not present' do
+      inbox_round_robin_service.clear_queue
+      expect(inbox_round_robin_service.send(:queue)).to eq([])
+      inbox_round_robin_service.available_agent
+      # the service constructed the redis queue before performing
+      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+    end
+
+    it 'validates the queue and correct it before performing round robin' do
+      # adding some invalid ids to queue
+      inbox_round_robin_service.add_agent_to_queue([2, 3, 5, 9])
+      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).not_to eq(inbox_members.map(&:user_id).sort)
+      inbox_round_robin_service.available_agent
+      # the service have refreshed the redis queue before performing
+      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+    end
+
+    context 'when allowed_agent_ids is passed' do
+      it 'will get the first allowed member and move it to the end of the queue' do
+        expected_queue = [inbox_members[3].user_id, inbox_members[2].user_id, inbox_members[4].user_id, inbox_members[1].user_id,
+                          inbox_members[0].user_id].map(&:to_s)
+        expect(described_class.new(inbox: inbox).available_agent(
+                 allowed_agent_ids: [
+                   inbox_members[3].user_id,
+                   inbox_members[2].user_id
+                 ].map(&:to_s)
+               )).to eq inbox_members[2].user
+        expect(described_class.new(inbox: inbox).available_agent(
+                 allowed_agent_ids: [
+                   inbox_members[3].user_id,
+                   inbox_members[2].user_id
+                 ].map(&:to_s)
+               )).to eq inbox_members[3].user
+        expect(inbox_round_robin_service.send(:queue)).to eq(expected_queue)
+      end
+    end
+  end
+end
diff --git a/spec/services/round_robin/manage_service_spec.rb b/spec/services/round_robin/manage_service_spec.rb
deleted file mode 100644
index fafbfb6d4..000000000
--- a/spec/services/round_robin/manage_service_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'rails_helper'
-
-describe RoundRobin::ManageService do
-  subject(:round_robin_manage_service) { described_class.new(inbox: inbox) }
-
-  let!(:account) { create(:account) }
-  let!(:inbox) { create(:inbox, account: account) }
-  let!(:inbox_members) { create_list(:inbox_member, 5, inbox: inbox) }
-
-  describe '#available_agent' do
-    it 'returns nil if allowed_member_ids is empty' do
-      expect(described_class.new(inbox: inbox, allowed_member_ids: []).available_agent).to be_nil
-    end
-
-    it 'gets the first available agent in allowed_member_ids and move agent to end of the list' do
-      expected_queue = [inbox_members[0].user_id, inbox_members[4].user_id, inbox_members[3].user_id, inbox_members[2].user_id,
-                        inbox_members[1].user_id].map(&:to_s)
-      described_class.new(inbox: inbox, allowed_member_ids: [inbox_members[0].user_id, inbox_members[4].user_id]).available_agent
-      expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
-    end
-
-    it 'gets intersection of priority list and agent queue. get and move agent to the end of the list' do
-      expected_queue = [inbox_members[2].user_id, inbox_members[4].user_id, inbox_members[3].user_id, inbox_members[1].user_id,
-                        inbox_members[0].user_id].map(&:to_s)
-      # prority list will be ids in string, since thats what redis supplies to us
-      expect(described_class.new(inbox: inbox, allowed_member_ids: [inbox_members[2].user_id])
-        .available_agent(priority_list: [inbox_members[3].user_id.to_s, inbox_members[2].user_id.to_s])).to eq inbox_members[2].user
-      expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
-    end
-
-    it 'constructs round_robin_queue if queue is not present' do
-      round_robin_manage_service.clear_queue
-      expect(round_robin_manage_service.send(:queue)).to eq([])
-      round_robin_manage_service.available_agent
-      # the service constructed the redis queue before performing
-      expect(round_robin_manage_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
-    end
-
-    it 'validates the queue and correct it before performing round robin' do
-      # adding some invalid ids to queue
-      round_robin_manage_service.add_agent_to_queue([2, 3, 5, 9])
-      expect(round_robin_manage_service.send(:queue).sort.map(&:to_i)).not_to eq(inbox_members.map(&:user_id).sort)
-      round_robin_manage_service.available_agent
-      # the service have refreshed the redis queue before performing
-      expect(round_robin_manage_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
-    end
-
-    context 'when allowed_member_ids is passed' do
-      it 'will get the first allowed member and move it to the end of the queue' do
-        expected_queue = [inbox_members[3].user_id, inbox_members[2].user_id, inbox_members[4].user_id, inbox_members[1].user_id,
-                          inbox_members[0].user_id].map(&:to_s)
-        expect(described_class.new(inbox: inbox,
-                                   allowed_member_ids: [inbox_members[3].user_id,
-                                                        inbox_members[2].user_id]).available_agent).to eq inbox_members[2].user
-        expect(described_class.new(inbox: inbox,
-                                   allowed_member_ids: [inbox_members[3].user_id,
-                                                        inbox_members[2].user_id]).available_agent).to eq inbox_members[3].user
-        expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
-      end
-
-      it 'will get union of priority list and allowed_member_ids and move it to the end of the queue' do
-        expected_queue = [inbox_members[3].user_id, inbox_members[4].user_id, inbox_members[2].user_id, inbox_members[1].user_id,
-                          inbox_members[0].user_id].map(&:to_s)
-        # prority list will be ids in string, since thats what redis supplies to us
-        expect(described_class.new(inbox: inbox,
-                                   allowed_member_ids: [inbox_members[3].user_id,
-                                                        inbox_members[2].user_id])
-                                    .available_agent(
-                                      priority_list: [inbox_members[3].user_id.to_s]
-                                    )).to eq inbox_members[3].user
-        expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
-      end
-    end
-  end
-end
diff --git a/yarn.lock b/yarn.lock
index bc853953d..6a966763a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3668,12 +3668,7 @@ acorn@^7.0.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.1.0:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
-  integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
-
-acorn@^8.4.1, acorn@^8.5.0:
+acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0:
   version "8.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
@@ -4551,11 +4546,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bourbon@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/bourbon/-/bourbon-6.0.0.tgz#41ad318371128888261a390bebe0e9e89daaa01e"
-  integrity sha512-Skds0R1+GY3c1oBddh9BggYVq39Uo4ySvW33zttPk+4+nfGYpbZqwaDwENkbtV7PYhCk0ctTFkzfTNFv5365ag==
-
 boxen@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
@@ -4703,9 +4693,9 @@ buffer-crc32@~0.2.3:
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
@@ -5506,11 +5496,6 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-text-to-clipboard@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-2.2.0.tgz#329dd6daf8c42034c763ace567418401764579ae"
-  integrity sha512-WRvoIdnTs1rgPMkgA2pUOa/M4Enh2uzCwdKsOMYNAJiz/4ZvEJgmbF4OmninPmlFdAWisfeh0tH+Cpf7ni3RqQ==
-
 core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390"
@@ -5566,11 +5551,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-country-code-emoji@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/country-code-emoji/-/country-code-emoji-1.0.0.tgz#7c77791839c9e9921beec08ef080caa7cfb8b40c"
-  integrity sha512-fBM5A49oZkOxOVb0bx7q7Hanlfh8e3z/r6/ZnFhbL57JXGIgWPC2HYrjXEyiGML7OFftDV/WfAlJdDkoAbj1Rg==
-
 cp-file@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd"
@@ -9946,6 +9926,11 @@ lazy-universal-dotenv@^3.0.1:
     dotenv "^8.0.0"
     dotenv-expand "^5.1.0"
 
+lettersanitizer@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/lettersanitizer/-/lettersanitizer-1.0.2.tgz#902b7b4deea0e52f0400e0d268921f489f5ce100"
+  integrity sha512-f035TAen0M3Oh5Nhe8hp2uA5zQwN1rIDdSfC1VNLXd1XoeIm1r/whVCB1YPQH/uN1KhRrjCJcHl0moCpXj0X8A==
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -10173,11 +10158,6 @@ lodash.get@^4.0:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.groupby@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"
-  integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=
-
 lodash.has@^4.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
@@ -12971,15 +12951,6 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -14178,15 +14149,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
+source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -14214,7 +14177,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
+source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -14857,24 +14820,15 @@ terser-webpack-plugin@^5.1.3:
     terser "^5.7.2"
 
 terser@^4.1.2, terser@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.3.4:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
-  integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
-terser@^5.7.2:
+terser@^5.3.4, terser@^5.7.2:
   version "5.14.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca"
   integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==
@@ -15646,11 +15600,6 @@ void-elements@^3.1.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
-vue-axios@~1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/vue-axios/-/vue-axios-1.2.2.tgz#d18bb48fa7bf469ffa86676960f52a89b7d38a9d"
-  integrity sha1-0Yu0j6e/Rp/6hmdpYPUqibfTip0=
-
 vue-chartjs@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.5.1.tgz#d25e845708f7744ae51bed9d23a975f5f8fc6529"
@@ -15765,6 +15714,13 @@ vue-jest@4:
     extract-from-css "^0.4.4"
     source-map "0.5.6"
 
+vue-letter@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/vue-letter/-/vue-letter-0.1.3.tgz#29cfb1768e80382bdebbaeada3d012fd37c47f52"
+  integrity sha512-tobFN1Ri3QJuPJGG+/6ITZuW9DnJ0trIF8AZqhexVKS49lMI560J/DYryTWrITjb7xYicJfDEMXtAFDxxcG3qQ==
+  dependencies:
+    lettersanitizer "^1.0.0"
+
 vue-loader@15.9.6:
   version "15.9.6"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"
@@ -15838,10 +15794,10 @@ vuedraggable@^2.24.3:
   dependencies:
     sortablejs "1.10.2"
 
-vuelidate@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.6.tgz#84100c13b943470660d0416642845cd2a1edf4b2"
-  integrity sha512-suzIuet1jGcyZ4oUSW8J27R2tNrJ9cIfklAh63EbAkFjE380iv97BAiIeolRYoB9bF9usBXCu4BxftWN1Dkn3g==
+vuelidate@0.7.7:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.7.tgz#5df3930a63ddecf56fde7bdacea9dbaf0c9bf899"
+  integrity sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==
 
 vuex-router-sync@~4.1.2:
   version "4.1.3"