diff --git a/Gemfile.lock b/Gemfile.lock
index 8f7385de2..ccd3c39cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -441,7 +441,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     mock_redis (0.36.0)
       ruby2_keywords
     msgpack (1.7.0)
@@ -450,7 +450,7 @@ GEM
     multipart-post (2.3.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -525,7 +525,7 @@ GEM
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.7.0)
+    racc (1.7.1)
     rack (2.2.7)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
@@ -731,7 +731,7 @@ GEM
     time_diff (0.3.0)
       activesupport
       i18n
-    timeout (0.3.2)
+    timeout (0.4.0)
     trailblazer-option (0.1.2)
     twilio-ruby (5.77.0)
       faraday (>= 0.9, < 3.0)
diff --git a/app/assets/stylesheets/administrate/library/_variables.scss b/app/assets/stylesheets/administrate/library/_variables.scss
index 87183a503..5bb3c0710 100644
--- a/app/assets/stylesheets/administrate/library/_variables.scss
+++ b/app/assets/stylesheets/administrate/library/_variables.scss
@@ -4,7 +4,7 @@ $base-font-family: PlusJakarta, Inter, -apple-system, BlinkMacSystemFont, "Segoe
   sans-serif !default;
 $heading-font-family: $base-font-family !default;
 
-$base-font-size: 10px !default;
+$base-font-size: 16px !default;
 
 $base-line-height: 1.5 !default;
 $heading-line-height: 1.2 !default;
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 2f380e0cc..011faaf28 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -124,7 +124,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   def inbox_attributes
     [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
      :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation, :portal_id]
+     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name]
   end
 
   def permitted_params(channel_attributes = [])
diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss
index 2263c4354..e934b50d7 100644
--- a/app/javascript/dashboard/assets/scss/_date-picker.scss
+++ b/app/javascript/dashboard/assets/scss/_date-picker.scss
@@ -26,7 +26,7 @@
     border-radius: var(--border-radius-normal);
     box-shadow: none;
     display: flex;
-    height: 4rem;
+    height: 2.5rem;
   }
 
   .mx-input:disabled,
diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index 5753e7593..605b74483 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -8,7 +8,7 @@
 }
 
 select {
-  height: 4.0rem;
+  height: 2.5rem;
 }
 
 .card {
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 2035585bd..3fd834cdd 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -48,7 +48,7 @@
 // Disable contrast warnings in Foundation.
 $contrast-warnings: false;
 
-$global-font-size: 10px;
+$global-font-size: 16px;
 $global-width: 100%;
 $global-lineheight: 1.5;
 $foundation-palette: (primary: $color-woot,
@@ -117,7 +117,7 @@ $header-font-style: normal;
 $font-family-monospace: $body-font-family;
 $header-color: $color-heading;
 $header-lineheight: 1.4;
-$header-margin-bottom: 0.5rem;
+$header-margin-bottom: 0.3125rem;
 $header-styles: (small: ("h1": ("font-size": 24),
     "h2": ("font-size": 20),
     "h3": ("font-size": 19),
@@ -153,11 +153,11 @@ $list-lineheight: $paragraph-lineheight;
 $list-margin-bottom: $paragraph-margin-bottom;
 $list-style-type: disc;
 $list-style-position: outside;
-$list-side-margin: 1.25rem;
-$list-nested-side-margin: 1.25rem;
-$defnlist-margin-bottom: 1rem;
+$list-side-margin: 0.78125rem;
+$list-nested-side-margin: 0.78125rem;
+$defnlist-margin-bottom: 0.6875rem;
 $defnlist-term-weight: $global-weight-bold;
-$defnlist-term-margin-bottom: 0.3rem;
+$defnlist-term-margin-bottom: 0.1875rem;
 $blockquote-color: $dark-gray;
 $blockquote-padding: rem-calc(9 20 0 19);
 $blockquote-border: 1px solid $medium-gray;
@@ -179,9 +179,9 @@ $lead-lineheight: 1.6;
 $subheader-lineheight: 1.4;
 $subheader-color: $dark-gray;
 $subheader-font-weight: $global-weight-normal;
-$subheader-margin-top: 0.2rem;
-$subheader-margin-bottom: 0.5rem;
-$stat-font-size: 2.5rem;
+$subheader-margin-top: 0.125rem;
+$subheader-margin-bottom: 0.3125rem;
+$stat-font-size: 1.5625rem;
 
 // 6. Abide
 // --------
@@ -202,11 +202,11 @@ $accordion-plusminus: true;
 $accordion-title-font-size: rem-calc(12);
 $accordion-item-color: $primary-color;
 $accordion-item-background-hover: $light-gray;
-$accordion-item-padding: 1.25rem 1rem;
+$accordion-item-padding: 0.78125rem 0.625rem;
 $accordion-content-background: $white;
 $accordion-content-border: 1px solid $light-gray;
 $accordion-content-color: $body-font-color;
-$accordion-content-padding: 1rem;
+$accordion-content-padding: 0.625rem;
 
 // 8. Accordion Menu
 // -----------------
@@ -234,7 +234,7 @@ $breadcrumbs-item-font-size: rem-calc(11);
 $breadcrumbs-item-color: $primary-color;
 $breadcrumbs-item-color-current: $black;
 $breadcrumbs-item-color-disabled: $medium-gray;
-$breadcrumbs-item-margin: 0.75rem;
+$breadcrumbs-item-margin: 0.46875rem;
 $breadcrumbs-item-uppercase: true;
 $breadcrumbs-item-slash: true;
 
@@ -275,8 +275,8 @@ $buttongroup-radius-on-each: false;
 $callout-background: $white;
 $callout-background-fade: 85%;
 $callout-border: 1px solid rgba($black, 0.25);
-$callout-margin: 0 0 1rem 0;
-$callout-padding: 1rem;
+$callout-margin: 0 0 0.625rem 0;
+$callout-padding: 0.625rem;
 $callout-font-color: $body-font-color;
 $callout-font-color-alt: $body-background;
 $callout-radius: $global-radius;
@@ -320,10 +320,10 @@ $drilldown-background: $white;
 // 17. Dropdown
 // ------------
 
-$dropdown-padding: 1rem;
+$dropdown-padding: 0.625rem;
 $dropdown-background: $body-background;
 $dropdown-border: 1px solid $medium-gray;
-$dropdown-font-size: 1rem;
+$dropdown-font-size: 0.625rem;
 $dropdown-width: 300px;
 $dropdown-radius: $global-radius;
 $dropdown-sizes: (tiny: 100px,
@@ -354,7 +354,7 @@ $helptext-font-style: italic;
 $input-prefix-color: $color-body;
 $input-prefix-background: var(--b-100);
 $input-prefix-border: 1px solid $color-border;
-$input-prefix-padding: 1rem;
+$input-prefix-padding: 0.625rem;
 $form-label-color: $color-body;
 $form-label-font-size: rem-calc(14);
 $form-label-font-weight: $font-weight-medium;
@@ -406,14 +406,14 @@ $menu-margin-nested: $space-medium;
 $menu-item-padding: $space-slab;
 $menu-item-color-active: $white;
 $menu-item-background-active: $color-background;
-$menu-icon-spacing: 0.25rem;
+$menu-icon-spacing: 0.15625rem;
 $menu-item-background-hover: $light-gray;
 $menu-border: $light-gray;
 
 // 23. Meter
 // ---------
 
-$meter-height: 1rem;
+$meter-height: 0.625rem;
 $meter-radius: $global-radius;
 $meter-background: $medium-gray;
 $meter-fill-good: $success-color;
@@ -423,11 +423,11 @@ $meter-fill-bad: $alert-color;
 // 24. Off-canvas
 // --------------
 
-$offcanvas-sizes: (small: 23rem,
-  medium: 23rem,
+$offcanvas-sizes: (small: 14.375,
+  medium: 14.375,
 );
-$offcanvas-vertical-sizes: (small: 23rem,
-  medium: 23rem,
+$offcanvas-vertical-sizes: (small: 14.375,
+  medium: 14.375,
 );
 $offcanvas-background: $light-gray;
 $offcanvas-shadow: 0 0 10px rgba($black, 0.7);
@@ -445,14 +445,14 @@ $maincontent-class: 'off-canvas-content';
 
 $orbit-bullet-background: $medium-gray;
 $orbit-bullet-background-active: $dark-gray;
-$orbit-bullet-diameter: 1.2rem;
-$orbit-bullet-margin: 0.1rem;
-$orbit-bullet-margin-top: 0.8rem;
-$orbit-bullet-margin-bottom: 0.8rem;
+$orbit-bullet-diameter: 0.75rem;
+$orbit-bullet-margin: 0.0625rem;
+$orbit-bullet-margin-top: 0.5rem;
+$orbit-bullet-margin-bottom: 0.5rem;
 $orbit-caption-background: rgba($black, 0.5);
-$orbit-caption-padding: 1rem;
+$orbit-caption-padding: 0.625rem;
 $orbit-control-background-hover: rgba($black, 0.5);
-$orbit-control-padding: 1rem;
+$orbit-control-padding: 0.625rem;
 $orbit-control-zindex: 10;
 
 // 26. Pagination
@@ -476,7 +476,7 @@ $pagination-arrows: true;
 // 27. Progress Bar
 // ----------------
 
-$progress-height: 1rem;
+$progress-height: 0.625rem;
 $progress-background: $medium-gray;
 $progress-margin-bottom: $global-margin;
 $progress-meter-background: $primary-color;
@@ -504,13 +504,13 @@ $reveal-overlay-background: rgba($black, 0.45);
 // 30. Slider
 // ----------
 
-$slider-width-vertical: 0.5rem;
+$slider-width-vertical: 0.3125rem;
 $slider-transition: all 0.2s ease-in-out;
-$slider-height: 0.5rem;
+$slider-height: 0.3125rem;
 $slider-background: $light-gray;
 $slider-fill-background: $medium-gray;
-$slider-handle-height: 1.4rem;
-$slider-handle-width: 1.4rem;
+$slider-handle-height: 0.875rem;
+$slider-handle-width: 0.875rem;
 $slider-handle-background: $primary-color;
 $slider-opacity-disabled: 0.25;
 $slider-radius: $global-radius;
@@ -569,7 +569,7 @@ $tab-expand-max: 6;
 $tab-content-background: transparent;
 $tab-content-border: transparent;
 $tab-content-color: foreground($tab-background, $primary-color);
-$tab-content-padding: 1rem;
+$tab-content-padding: 0.625rem;
 
 // 34. Thumbnail
 // -------------
@@ -586,11 +586,11 @@ $thumbnail-radius: $global-radius;
 
 $titlebar-background: $black;
 $titlebar-color: $white;
-$titlebar-padding: 0.5rem;
+$titlebar-padding: 0.3125rem;
 $titlebar-text-font-weight: bold;
 $titlebar-icon-color: $white;
 $titlebar-icon-color-hover: $medium-gray;
-$titlebar-icon-spacing: 0.25rem;
+$titlebar-icon-spacing: 0.15625rem;
 
 // 36. Tooltip
 // -----------
@@ -599,19 +599,19 @@ $has-tip-font-weight: $global-weight-bold;
 $has-tip-border-bottom: dotted 1px $dark-gray;
 $tooltip-background-color: $black;
 $tooltip-color: $white;
-$tooltip-padding: 0.75rem;
+$tooltip-padding: 0.46875rem;
 $tooltip-font-size: $font-size-mini;
-$tooltip-pip-width: 0.75rem;
+$tooltip-pip-width: 0.46875rem;
 $tooltip-pip-height: $tooltip-pip-width * 0.866;
 $tooltip-radius: $global-radius;
 
 // 37. Top Bar
 // -----------
 
-$topbar-padding: 0.5rem;
+$topbar-padding: 0.3125;
 $topbar-background: $light-gray;
 $topbar-submenu-background: $topbar-background;
-$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
+$topbar-title-spacing: 0.3125 0.625rem 0.3125 0;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;
 
diff --git a/app/javascript/dashboard/assets/scss/_mixins.scss b/app/javascript/dashboard/assets/scss/_mixins.scss
index 41ba95276..a55f0a8dd 100644
--- a/app/javascript/dashboard/assets/scss/_mixins.scss
+++ b/app/javascript/dashboard/assets/scss/_mixins.scss
@@ -237,8 +237,8 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
   white-space: nowrap;
 }
 
-@mixin three-column-grid($column-one-width: 25.6rem,
-  $column-three-width: 25.6rem) {
+@mixin three-column-grid($column-one-width: 16rem,
+  $column-three-width: 16rem) {
   width: 100%;
   height: 100%;
   display: grid;
diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 4f7efaab9..b517fc0f2 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -439,7 +439,7 @@
     }
 
     span {
-      --minus-space-one-point-five: -1.5rem;
+      --minus-space-one-point-five: -0.9375rem;
 
       &.active {
         transform: translate(
diff --git a/app/javascript/dashboard/assets/scss/_variables.scss b/app/javascript/dashboard/assets/scss/_variables.scss
index f24f00830..930fe5f0e 100644
--- a/app/javascript/dashboard/assets/scss/_variables.scss
+++ b/app/javascript/dashboard/assets/scss/_variables.scss
@@ -1,30 +1,30 @@
 // Font sizes
-$font-size-nano: 0.8rem;
-$font-size-micro: 1.0rem;
-$font-size-mini: 1.2rem;
-$font-size-small: 1.4rem;
-$font-size-default: 1.6rem;
-$font-size-medium: 1.8rem;
-$font-size-large: 2.2rem;
-$font-size-big: 2.4rem;
-$font-size-bigger: 3.0rem;
-$font-size-mega: 3.4rem;
-$font-size-giga: 4.0rem;
+$font-size-nano: 0.5rem;
+$font-size-micro: 0.675rem;
+$font-size-mini: 0.75rem;
+$font-size-small: 0.875rem;
+$font-size-default: 1rem;
+$font-size-medium: 1.125rem;
+$font-size-large: 1.375rem;
+$font-size-big: 1.5rem;
+$font-size-bigger: 1.75rem;
+$font-size-mega: 2.125rem;
+$font-size-giga: 2.5rem;
 
 // spaces
 $zero: 0;
-$space-micro: 0.2rem;
-$space-smaller: 0.4rem;
-$space-small: 0.8rem;
-$space-one: 1rem;
-$space-slab: 1.2rem;
-$space-normal: 1.6rem;
-$space-two: 2.0rem;
-$space-medium: 2.4rem;
-$space-large: 3.2rem;
-$space-larger: 4.8rem;
-$space-jumbo: 6.4rem;
-$space-mega: 10.0rem;
+$space-micro: 0.125rem;
+$space-smaller: 0.25rem;
+$space-small: 0.5rem;
+$space-one: 0.675rem;
+$space-slab: 0.75rem;
+$space-normal: 1rem;
+$space-two: 1.25rem;
+$space-medium: 1.5rem;
+$space-large: 2rem;
+$space-larger: 3rem;
+$space-jumbo: 4rem;
+$space-mega: 6.25rem;
 
 // font-weight
 $font-weight-feather: 100;
@@ -35,8 +35,8 @@ $font-weight-bold: 600;
 $font-weight-black: 700;
 
 //Navbar
-$nav-bar-width: 23rem;
-$header-height: 5.6rem;
+$nav-bar-width: 14.375rem;
+$header-height: 3.5rem;
 
 $woot-logo-padding: $space-large $space-two;
 
@@ -71,20 +71,20 @@ $color-primary-light: #c7e3ff;
 $color-primary-dark: darken($color-woot, 20%);
 
 // Thumbnail
-$thumbnail-radius: 4rem;
+$thumbnail-radius: 2.5rem;
 
 // chat-header
-$conv-header-height: 4rem;
+$conv-header-height: 2.5rem;
 
 // Inbox List
 
-$inbox-thumb-size: 4.8rem;
+$inbox-thumb-size: 3rem;
 
 
 // Spinner
 $spinkit-spinner-color: $color-white !default;
-$spinkit-spinner-margin: 0 0 0 1.6rem !default;
-$spinkit-size: 1.6rem !default;
+$spinkit-spinner-margin: 0 0 0 1rem !default;
+$spinkit-size: 1rem !default;
 
 // Snackbar default
 $woot-snackbar-bg: #323232;
@@ -101,5 +101,5 @@ $ionicons-font-path: '~ionicons/fonts';
 $transition-ease-in: all 0.250s ease-in;
 
 :root {
-  --dashboard-app-tabs-height: 3.9rem;
+  --dashboard-app-tabs-height: 2.4375rem;
 }
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index f111a414f..4fda218a5 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -28,7 +28,7 @@
   }
 
   .multiselect__select {
-    min-height: 4.6rem;
+    min-height: 2.875rem;
     padding: 0;
     right: 0;
     top: 0;
@@ -98,7 +98,7 @@
     border: 1px solid var(--s-200);
     border-color: var(--s-200);
     margin: 0;
-    min-height: 4.4rem;
+    min-height: 2.75rem;
     padding-top: $zero;
   }
 
@@ -130,7 +130,7 @@
   .multiselect__input {
     @include ghost-input;
     font-size: $font-size-small;
-    height: 4.4rem;
+    height: 2.75rem;
     margin-bottom: $zero;
     padding: 0;
   }
@@ -168,7 +168,7 @@
 }
 
 .multiselect-wrap--small {
-  $multiselect-height: 4.0rem;
+  $multiselect-height: 2.5rem;
 
   .multiselect__tags,
   .multiselect__input {
@@ -195,7 +195,7 @@
     display: flex;
     font-size: var(--font-size-small);
     margin: 0;
-    max-height: 3.8rem;
+    max-height: 2.375rem;
     padding: var(--space-smaller) var(--space-micro);
   }
 
@@ -219,7 +219,7 @@
 }
 
 .multiselect-wrap--medium {
-  $multiselect-height: 4.8rem;
+  $multiselect-height: 3rem;
 
   .multiselect__tags,
   .multiselect__input {
diff --git a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
index 590890499..b7387b90f 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
@@ -8,8 +8,8 @@
 
     .integration--image {
       display: flex;
-      height: 10rem;
-      width: 10rem;
+      height: 6.25rem;
+      width: 6.25rem;
 
       img {
         max-width: 100%;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 58945ffb5..3f36bfa0c 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -1,4 +1,4 @@
-$default-button-height: 4.0rem;
+$default-button-height: 2.5rem;
 
 .button {
   align-items: center;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index c352ff540..d88a7048d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -1,4 +1,4 @@
-$resolve-button-width: 13.2rem;
+$resolve-button-width: 8.25rem;
 
 // Conversation header - Light BG
 .conv-header {
@@ -14,12 +14,12 @@ $resolve-button-width: 13.2rem;
     border: 1px solid var(--color-border);
     border-radius: var(--space-smaller);
     margin-right: var(--space-small);
-    width: 21.6rem;
+    width: 13.5rem;
 
     .icon {
       color: $medium-gray;
       font-size: $font-size-default;
-      line-height: 3.8rem;
+      line-height: 2.375rem;
       padding-left: $space-slab;
       padding-right: $space-smaller;
     }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index e94cee45b..f6da1be3f 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -81,7 +81,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width: 27rem;
+    width: 16.875rem;
   }
 
   .conversation--meta {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 795c8c1c1..cdf66d741 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -273,7 +273,7 @@
   }
 
   .wrap {
-    --bubble-max-width: 49.6rem;
+    --bubble-max-width: 31rem;
     margin: $zero $space-normal;
     max-width: Min(var(--bubble-max-width), 84%);
 
diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
index cc22dc778..644399b9e 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
@@ -27,7 +27,7 @@
   padding: $space-large $space-large $zero;
 
   img {
-    max-height: 6rem;
+    max-height: 3.75rem;
   }
 }
 
@@ -39,11 +39,11 @@
   max-height: 100%;
   overflow: auto;
   position: relative;
-  width: 60rem;
+  width: 37.5rem;
 
   &.medium {
     max-width: 80%;
-    width: 90rem;
+    width: 56.25rem;
   }
 
   .content-box {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index d33f558e3..a51e6047d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -29,7 +29,7 @@
       // Override min-height : 50px in foundation
       //
       max-height: $space-mega * 2.4;
-      min-height: 4.8rem;
+      min-height: 3rem;
       padding: var(--space-normal) 0 0;
       resize: none;
     }
@@ -40,7 +40,7 @@
       margin: 0;
       max-height: $space-mega * 2.4;
       // Override min-height : 50px in foundation
-      min-height: 4.8rem;
+      min-height: 3rem;
       padding: var(--space-normal) 0 0;
       resize: none;
     }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
index e1cdaa491..3de072a77 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
@@ -47,7 +47,7 @@
   }
 
   .dropdown-pane {
-    bottom: 6rem;
+    bottom: 3.75rem;
     display: block;
     visibility: visible;
     width: fit-content;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
index 85d8f747d..ee556682f 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
@@ -1,7 +1,7 @@
 .ui-snackbar-container {
   left: 0;
   margin: 0 auto;
-  max-width: 40rem;
+  max-width: 25rem;
   overflow: hidden;
   position: absolute;
   right: 0;
@@ -16,9 +16,9 @@
   border-radius: $space-smaller;
   display: inline-flex;
   margin-bottom: $space-small;
-  max-width: 40rem;
-  min-height: 3rem;
-  min-width: 24rem;
+  max-width: 25rem;
+  min-height: 1.875rem;
+  min-width: 15rem;
   padding: $space-slab $space-medium;
   text-align: left;
 }
@@ -31,7 +31,7 @@
 
 .ui-snackbar-action {
   margin-left: auto;
-  padding-left: 3rem;
+  padding-left: 1.875rem;
 
   button {
     background: none;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
index 5bbe1248d..6f57f9cb5 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
@@ -43,15 +43,15 @@ table {
 
   .woot-thumbnail {
     border-radius: 50%;
-    height: 5rem;
-    width: 5rem;
+    height: 3.125rem;
+    width: 3.125rem;
   }
 
   .button-wrapper {
     @include flex-align(left, null);
     @include flex;
     flex-direction: row;
-    min-width: 20rem;
+    min-width: 12.5rem;
   }
 
   .button {
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index f4ba84ead..e06c5b2e9 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -972,7 +972,7 @@ export default {
 
 .conversations-list-wrap {
   flex-shrink: 0;
-  flex-basis: clamp(32rem, 4vw + 34rem, 44rem);
+  flex-basis: clamp(20rem, 4vw + 21.25rem, 27.5rem);
   overflow: hidden;
 
   &.hide {
diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index 3ce2787ce..8cc4d4f15 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -343,11 +343,11 @@ export default {
 .error-message {
   color: var(--r-400);
   display: block;
-  font-size: 1.4rem;
+  font-size: 0.875rem;
   font-size: var(--font-size-small);
   font-weight: 400;
-  margin-bottom: 1rem;
-  margin-top: -1.6rem;
+  margin-bottom: 0.625rem;
+  margin-top: -1rem;
   width: 100%;
 }
 
diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue
index e7740cc35..3a4e2b83a 100644
--- a/app/javascript/dashboard/components/Modal.vue
+++ b/app/javascript/dashboard/components/Modal.vue
@@ -106,7 +106,7 @@ export default {
   .modal-container {
     border-radius: 0;
     height: 100%;
-    width: 48rem;
+    width: 30rem;
   }
 }
 .modal-big {
diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue
index 6f29dbb74..6d142b1cd 100644
--- a/app/javascript/dashboard/components/NetworkNotification.vue
+++ b/app/javascript/dashboard/components/NetworkNotification.vue
@@ -77,7 +77,7 @@ export default {
 @import '~dashboard/assets/scss/mixins';
 
 .ui-notification-container {
-  max-width: 40rem;
+  max-width: 25rem;
   position: absolute;
   right: var(--space-normal);
   top: var(--space-normal);
@@ -94,7 +94,7 @@ export default {
   border-radius: var(--border-radius-medium);
   box-shadow: var(--shadow-large);
 
-  min-width: 24rem;
+  min-width: 15rem;
   padding: var(--space-normal);
 }
 
diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index b827ad9d4..3222434ae 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="row settings--section">
+  <div class="row settings--section" :class="{ border: showBorder }">
     <div class="medium-4 small-12 title--section">
-      <p class="sub-block-title">
+      <p v-if="title" class="sub-block-title">
         {{ title }}
       </p>
       <p class="sub-head">
-        <slot name="subTitle">
+        <slot v-if="subTitle" name="subTitle">
           {{ subTitle }}
         </slot>
       </p>
@@ -25,11 +25,15 @@ export default {
   props: {
     title: {
       type: String,
-      required: true,
+      default: '',
     },
     subTitle: {
       type: String,
-      required: true,
+      default: '',
+    },
+    showBorder: {
+      type: Boolean,
+      default: true,
     },
     note: {
       type: String,
@@ -43,9 +47,13 @@ export default {
 @import '~dashboard/assets/scss/variables';
 
 .settings--section {
-  border-bottom: 1px solid $color-border;
   display: flex;
-  padding: $space-normal $space-normal $space-normal 0;
+  padding: 0 $space-normal $space-normal 0;
+
+  &.border {
+    padding-top: $space-normal;
+    border-bottom: 1px solid $color-border;
+  }
 
   .sub-block-title {
     color: $color-woot;
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 5fdffb747..849ccadde 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -50,15 +50,6 @@
     >
       <woot-dropdown-menu>
         <woot-dropdown-item v-if="!isPending">
-          <woot-button
-            variant="clear"
-            color-scheme="secondary"
-            size="small"
-            icon="book-clock"
-            @click="() => toggleStatus(STATUS_TYPE.PENDING)"
-          >
-            {{ this.$t('CONVERSATION.RESOLVE_DROPDOWN.MARK_PENDING') }}
-          </woot-button>
           <woot-button
             variant="clear"
             color-scheme="secondary"
@@ -69,6 +60,17 @@
             {{ this.$t('CONVERSATION.RESOLVE_DROPDOWN.SNOOZE_UNTIL') }}
           </woot-button>
         </woot-dropdown-item>
+        <woot-dropdown-item v-if="!isPending">
+          <woot-button
+            variant="clear"
+            color-scheme="secondary"
+            size="small"
+            icon="book-clock"
+            @click="() => toggleStatus(STATUS_TYPE.PENDING)"
+          >
+            {{ this.$t('CONVERSATION.RESOLVE_DROPDOWN.MARK_PENDING') }}
+          </woot-button>
+        </woot-dropdown-item>
       </woot-dropdown-menu>
     </div>
     <woot-modal
@@ -258,11 +260,11 @@ export default {
 
 .dropdown-pane {
   left: unset;
-  top: 4.2rem;
+  top: 2.625rem;
   margin-top: var(--space-micro);
   right: 0;
-  max-width: 20rem;
-  min-width: 15.6rem;
+  max-width: 12.5rem;
+  min-width: 9.75rem;
 
   .dropdown-menu__item {
     margin-bottom: 0;
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 24b289bab..8295adb6d 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -230,7 +230,7 @@ export default {
 
 .account-selector--modal {
   .modal-container {
-    width: 40rem;
+    width: 25rem;
   }
 }
 
@@ -284,7 +284,7 @@ export default {
   cursor: pointer;
   display: flex;
   flex-direction: row;
-  height: 6rem;
+  height: 3.75rem;
 }
 
 .current-user--options {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
index 9b12f811a..4a8171831 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
@@ -50,7 +50,7 @@
           >
             <a
               :href="href"
-              class="button small clear secondary"
+              class="button small clear secondary custom-sidebar--button"
               :class="{ 'is-active': isActive }"
               @click="e => handleProfileSettingClick(e, navigate)"
             >
@@ -64,7 +64,7 @@
         <woot-dropdown-item v-if="currentUser.type === 'SuperAdmin'">
           <a
             href="/super_admin"
-            class="button small clear secondary"
+            class="button small clear secondary custom-sidebar--button"
             target="_blank"
             rel="noopener nofollow noreferrer"
             @click="$emit('close')"
@@ -157,4 +157,9 @@ export default {
   top: unset;
   z-index: var(--z-index-low);
 }
+
+.custom-sidebar--button {
+  height: var(--space-large) !important;
+  padding: var(--space-smaller) 0.675rem !important;
+}
 </style>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 4d75e363e..22adc05db 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -258,7 +258,7 @@ export default {
   background: var(--white);
   border-right: 1px solid var(--s-50);
   height: 100%;
-  width: 20rem;
+  width: 12.5rem;
   flex-shrink: 0;
   overflow-y: hidden;
   position: unset;
diff --git a/app/javascript/dashboard/components/ui/AnnouncementPopup.vue b/app/javascript/dashboard/components/ui/AnnouncementPopup.vue
index ad59bc8ac..b2ed04c5d 100644
--- a/app/javascript/dashboard/components/ui/AnnouncementPopup.vue
+++ b/app/javascript/dashboard/components/ui/AnnouncementPopup.vue
@@ -52,8 +52,8 @@ export default {
 
 <style lang="scss">
 .announcement-popup {
-  max-width: 24rem;
-  min-width: 16rem;
+  max-width: 15rem;
+  min-width: 10rem;
   display: flex;
   position: absolute;
   flex-direction: column;
diff --git a/app/javascript/dashboard/components/ui/PreviewCard.vue b/app/javascript/dashboard/components/ui/PreviewCard.vue
index 751a070a5..d8355f8aa 100644
--- a/app/javascript/dashboard/components/ui/PreviewCard.vue
+++ b/app/javascript/dashboard/components/ui/PreviewCard.vue
@@ -13,9 +13,10 @@
     <div class="content-wrap">
       {{ content }}
     </div>
-    <div class="image-wrap">
+    <div v-if="src" class="image-wrap">
       <img :src="src" class="image" :class="{ activeimage: active }" />
     </div>
+    <slot v-else />
   </div>
 </template>
 
@@ -52,9 +53,9 @@ export default {
   border: 1px solid var(--color-border);
   display: flex;
   flex-direction: column;
-  max-height: 34rem;
-  max-width: 38rem;
-  min-width: 24rem;
+  max-height: 21.25rem;
+  max-width: 23.75rem;
+  min-width: 15rem;
 
   .header--wrap {
     background: var(--s-50);
@@ -62,7 +63,7 @@ export default {
     border-top-left-radius: var(--border-radius-normal);
     border-top-right-radius: var(--border-radius-normal);
     display: flex;
-    height: 4rem;
+    height: 2.5rem;
     justify-content: space-between;
     padding: var(--space-small);
     width: 100%;
diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index 10a4ecebd..0f1c810e6 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -61,7 +61,7 @@ export default {
   }
 
   span {
-    --space-one-point-five: 1.5rem;
+    --space-one-point-five: 0.9375rem;
     background-color: var(--white);
     border-radius: 100%;
     box-shadow: var(--toggle-button-box-shadow);
diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
index 0264748a9..47aed3974 100644
--- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
+++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
@@ -75,7 +75,7 @@ export default {
   flex-direction: column;
   overflow: auto;
   margin-top: var(--space-normal);
-  max-height: 20rem;
+  max-height: 12.5rem;
 }
 
 .preview-item {
@@ -84,7 +84,7 @@ export default {
   background: var(--color-background-light);
   background: var(--b-50);
   border-radius: var(--border-radius-normal);
-  width: 24rem;
+  width: 15rem;
   padding: var(--space-smaller);
   margin-bottom: var(--space-one);
 }
diff --git a/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue b/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue
index e0bb102b2..884f155a7 100644
--- a/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue
+++ b/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue
@@ -61,7 +61,7 @@ export default {
 .option-item--inbox {
   display: flex;
   align-items: center;
-  height: 3.8rem;
+  height: 2.375rem;
   min-width: 0;
   padding: 0 var(--space-smaller);
 }
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 55db1aad8..029c1dd56 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -225,8 +225,8 @@ export default {
 
 <style lang="scss">
 .audio-wave-wrapper {
-  min-height: 8rem;
-  height: 8rem;
+  min-height: 5rem;
+  height: 5rem;
 }
 .video-js .vjs-control-bar {
   background-color: transparent;
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 5252bed4d..a2b721a2b 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -468,8 +468,8 @@ export default {
 }
 
 .ProseMirror-woot-style {
-  min-height: 8rem;
-  max-height: 12rem;
+  min-height: 5rem;
+  max-height: 7.5rem;
   overflow: auto;
 }
 
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
index 991e5f2ed..e46b487a3 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
@@ -230,8 +230,8 @@ export default {
 }
 
 .ProseMirror-woot-style {
-  min-height: 8rem;
-  max-height: 12rem;
+  min-height: 5rem;
+  max-height: 7.5rem;
   overflow: auto;
 }
 
@@ -241,6 +241,6 @@ export default {
   box-shadow: var(--shadow-large);
   border-radius: var(--border-radius-normal);
   border: 1px solid var(--color-border);
-  min-width: 40rem;
+  min-width: 25rem;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index ccac0cd93..f13057e8a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -365,6 +365,6 @@ export default {
 }
 
 .icon {
-  font-size: 8rem;
+  font-size: 5rem;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index 0e66684a8..15b0ec761 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -90,7 +90,7 @@ export default {
   margin-top: var(--space-smaller);
   padding: var(--space-normal);
   right: 0;
-  width: 21rem;
+  width: 13.125rem;
 
   span {
     font-size: var(--font-size-small);
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index dc4a3bca4..bc7660756 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -176,23 +176,23 @@ export default {
   flex-basis: 100%;
 
   @include breakpoint(medium up) {
-    flex-basis: 28rem;
+    flex-basis: 17.5rem;
   }
 
   @include breakpoint(large up) {
-    flex-basis: 30em;
+    flex-basis: 18.75rem;
   }
 
   @include breakpoint(xlarge up) {
-    flex-basis: 31em;
+    flex-basis: 19.375rem;
   }
 
   @include breakpoint(xxlarge up) {
-    flex-basis: 33rem;
+    flex-basis: 20.625rem;
   }
 
   @include breakpoint(xxxlarge up) {
-    flex-basis: 40rem;
+    flex-basis: 25rem;
   }
 
   &::v-deep .contact--panel {
diff --git a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
index d1ab8cc04..e52165ffa 100644
--- a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
@@ -116,7 +116,7 @@ export default {
 
     img {
       margin: var(--space-normal);
-      width: 10rem;
+      width: 6.25rem;
     }
 
     span {
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 1bca46bdc..da3c2cffd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -520,7 +520,7 @@ export default {
 
       .image,
       .video {
-        max-width: 32rem;
+        max-width: 20rem;
         padding: var(--space-micro);
 
         > img,
@@ -534,13 +534,13 @@ export default {
         }
       }
       .video {
-        height: 18rem;
+        height: 11.25rem;
       }
     }
 
     &.is-image.is-text > .message-text__wrap,
     &.is-video.is-text > .message-text__wrap {
-      max-width: 32rem;
+      max-width: 20rem;
       padding: var(--space-small) var(--space-normal);
     }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 5bac4a631..d6d52ebc2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -430,22 +430,22 @@ export default {
 .modal-mask {
   &::v-deep {
     .ProseMirror-woot-style {
-      max-height: 40rem;
+      max-height: 25rem;
     }
 
     .reply-box {
       border: 1px solid var(--color-border);
-      max-width: 120rem;
+      max-width: 75rem;
       width: 70%;
     }
 
     .reply-box .reply-box__top {
       position: relative;
-      min-height: 44rem;
+      min-height: 27.5rem;
     }
 
     .reply-box__top .input {
-      min-height: 44rem;
+      min-height: 27.5rem;
     }
 
     .emoji-dialog {
diff --git a/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
index e6dfa9654..2b4f9a89d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
@@ -112,7 +112,7 @@ export default {
 }
 
 .scroll-wrap {
-  padding: var(--space-larger) 13.6rem;
+  padding: var(--space-larger) 8.5rem;
   min-height: 100vh;
   display: flex;
   flex-direction: column;
diff --git a/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue b/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
index c48af3f16..0a8d474ad 100644
--- a/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
@@ -96,7 +96,7 @@ export default {
   left: 0;
   bottom: 100%;
   line-height: 1.2;
-  max-height: 20rem;
+  max-height: 12.5rem;
   overflow: auto;
   padding: var(--space-small) var(--space-small) 0 var(--space-small);
   position: absolute;
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
index 1c888408b..8c23c2d74 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
@@ -71,6 +71,6 @@ export default {
 
 <style scoped>
 .modal-content {
-  padding: 2.5rem 3.2rem;
+  padding: 1.5625rem 2rem;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
index 9f11ac2dd..1af4a0099 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
@@ -125,7 +125,7 @@ export default {
 .template__list-container {
   background-color: var(--s-25);
   border-radius: var(--border-radius-medium);
-  max-height: 30rem;
+  max-height: 18.75rem;
   overflow-y: auto;
   padding: var(--space-one);
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/integrations/Dyte.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/integrations/Dyte.vue
index 8fca037f9..a1947992a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/integrations/Dyte.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/integrations/Dyte.vue
@@ -97,7 +97,7 @@ export default {
   button {
     position: absolute;
     top: var(--space-smaller);
-    right: 16rem;
+    right: 10rem;
   }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index 509c0c7e4..ea0748b4d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -341,7 +341,7 @@ export default {
       display: flex;
       font-weight: var(--font-weight-bold);
       justify-content: center;
-      min-width: 8rem;
+      min-width: 5rem;
       padding: var(--space-smaller);
     }
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index a6e1c3897..92c20ba80 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -249,15 +249,15 @@ export default {
 }
 
 .label-actions-box {
-  --triangle-position: 8.5rem;
+  --triangle-position: 5.3125rem;
 }
 .update-actions-box {
-  --triangle-position: 5.6rem;
+  --triangle-position: 3.5rem;
 }
 .agent-actions-box {
-  --triangle-position: 2.8rem;
+  --triangle-position: 1.75rem;
 }
 .team-actions-box {
-  --triangle-position: 0.2rem;
+  --triangle-position: 0.125rem;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
index 6580ab83c..f503e653d 100644
--- a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
+++ b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
@@ -259,8 +259,8 @@ export default {
     justify-content: center;
     gap: var(--space-small);
     background: var(--s-25);
-    height: 4rem;
-    width: 5.2rem;
+    height: 2.5rem;
+    width: 3.25rem;
     border-radius: var(--border-radius-normal) 0 0 var(--border-radius-normal);
     padding: var(--space-small) var(--space-smaller) var(--space-small)
       var(--space-small);
@@ -288,9 +288,9 @@ export default {
     z-index: var(--z-index-low);
     position: absolute;
     height: var(--space-giga);
-    width: 20rem;
+    width: 12.5rem;
     overflow-y: auto;
-    top: 4rem;
+    top: 2.5rem;
     border-radius: var(--border-radius-default);
     padding: 0 0 var(--space-smaller) 0;
     background-color: var(--white);
@@ -314,7 +314,7 @@ export default {
     .country-dropdown--item {
       display: flex;
       align-items: center;
-      height: 2.8rem;
+      height: 1.75rem;
       padding: 0 var(--space-smaller);
       cursor: pointer;
 
@@ -336,7 +336,7 @@ export default {
       }
 
       .country-name {
-        max-width: 12rem;
+        max-width: 7.5rem;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index b2852d3a9..41360ead7 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -85,7 +85,7 @@ export default {
   box-shadow: var(--shadow-medium);
   left: 0;
   bottom: 100%;
-  max-height: 15.6rem;
+  max-height: 9.75rem;
   overflow: auto;
   padding: var(--space-small) var(--space-small) 0;
   position: absolute;
diff --git a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
index c9c03ff3d..b2d1f9191 100644
--- a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
@@ -138,7 +138,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  min-width: 40rem;
+  min-width: 25rem;
 }
 
 .forward-slash {
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 4ed087b94..3f7e943d8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "اضافة تصنيف جديد",
         "PLACEHOLDER": "ابحث عن تصنيفات",
-        "NO_RESULT": "لم يتم العثور على تصنيفات"
+        "NO_RESULT": "لم يتم العثور على تصنيفات",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "دمج جهة الاتصال",
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index e91b59d15..3e7e282f0 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "إعدادات الحساب",
     "SUBMIT": "تحديث الإعدادات",
     "BACK": "العودة",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "تعذر تحديث الإعدادات، الرجاء المحاولة مرة أخرى!",
       "SUCCESS": "تم تحديث إعدادات الحساب بنجاح"
diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
index ef665170a..efd6cb572 100644
--- a/app/javascript/dashboard/i18n/locale/ar/search.json
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "رد آلي",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "من",
+    "EMAIL": "البريد الإلكتروني"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 1eb4c5eaa..04224f1c9 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Добавете етикети",
         "PLACEHOLDER": "Търсене на етикети",
-        "NO_RESULT": "Няма намерени етикети"
+        "NO_RESULT": "Няма намерени етикети",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Обединяване на контакти",
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index 1b65cb1c5..e479470d4 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/bg/search.json b/app/javascript/dashboard/i18n/locale/bg/search.json
index 02d13552c..05461367c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/search.json
+++ b/app/javascript/dashboard/i18n/locale/bg/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "от",
+    "EMAIL": "имейл"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index b87d3283f..1ddfd8773 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Afegir etiquetes",
         "PLACEHOLDER": "Cerca etiquetes",
-        "NO_RESULT": "No s'han trobat etiquetes"
+        "NO_RESULT": "No s'han trobat etiquetes",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Reagrupa contacte",
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index a9952a35a..c39ad2f2d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Configuració del compte",
     "SUBMIT": "Actualització de la configuració",
     "BACK": "Enrere",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "No s'ha pogut actualitzar la configuració, torna-ho a provar!",
       "SUCCESS": "La configuració del compte s'ha actualitzat correctament"
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
index efd6f1503..a114145ee 100644
--- a/app/javascript/dashboard/i18n/locale/ca/search.json
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "correu electrònic"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 30c673138..a51ccaa93 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index f73922244..e8e0df74c 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Nastavení účtu",
     "SUBMIT": "Aktualizovat nastavení",
     "BACK": "Zpět",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Nelze aktualizovat nastavení, zkuste to znovu!",
       "SUCCESS": "Nastavení účtu bylo úspěšně aktualizováno"
diff --git a/app/javascript/dashboard/i18n/locale/cs/search.json b/app/javascript/dashboard/i18n/locale/cs/search.json
index ba3d90461..a4de7a921 100644
--- a/app/javascript/dashboard/i18n/locale/cs/search.json
+++ b/app/javascript/dashboard/i18n/locale/cs/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "od",
+    "EMAIL": "e-mailová adresa"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 7c7cd4212..d5a8dd9bd 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Tilføj Labels",
         "PLACEHOLDER": "Søg efter labels",
-        "NO_RESULT": "Ingen labels fundet"
+        "NO_RESULT": "Ingen labels fundet",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Sammenflet kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 0405b7676..aa1a56827 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Kontoindstillinger",
     "SUBMIT": "Opdater indstillinger",
     "BACK": "Tilbage",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Kunne ikke opdatere indstillinger, prøv igen!",
       "SUCCESS": "Kontoindstillinger blev opdateret"
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
index a87685f4b..3f1f78776 100644
--- a/app/javascript/dashboard/i18n/locale/da/search.json
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "fra",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index df26f8442..8b5a2d091 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Labels hinzufügen",
         "PLACEHOLDER": "Labels suchen",
-        "NO_RESULT": "Keine Labels gefunden"
+        "NO_RESULT": "Keine Labels gefunden",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Kontakte zusammenführen",
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 5251fb8fc..dcf7d89a1 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Kontoeinstellungen",
     "SUBMIT": "Einstellungen aktualisieren",
     "BACK": "Zurück",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Einstellungen konnten nicht aktualisiert werden, versuchen Sie es erneut!",
       "SUCCESS": "Kontoeinstellungen erfolgreich aktualisiert"
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
index d91547092..28b19cea2 100644
--- a/app/javascript/dashboard/i18n/locale/de/search.json
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Mehr erfahren",
-    "WROTE": "schrieb:"
+    "WROTE": "schrieb:",
+    "FROM": "von",
+    "EMAIL": "e-Mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index a82fa6346..0fbd197a2 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Προσθήκη Ετικετών",
         "PLACEHOLDER": "Αναζήτηση ετικετών",
-        "NO_RESULT": "Δεν βρέθηκαν ετικέτες"
+        "NO_RESULT": "Δεν βρέθηκαν ετικέτες",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Συγχώνευση επαφής",
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 83f60205f..dcbb0c052 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Ρυθμίσεις",
     "SUBMIT": "Ενημέρωση Ρυθμίσεων",
     "BACK": "Πίσω",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Δεν μπορεί να ενημερωθεί η ρύθμιση προσπαθήστε ξανά!",
       "SUCCESS": "Επιτυχής Ενημέρωση Ρυθμίσεων"
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
index 0fc63cfd2..e52cd98dd 100644
--- a/app/javascript/dashboard/i18n/locale/el/search.json
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "από",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 5280c7e1a..540db8c76 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -391,6 +391,25 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "SENDER_NAME_SECTION": {
+        "TITLE": "Sender name",
+        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "FOR_EG": "For eg:",
+        "FRIENDLY": {
+          "TITLE": "Friendly",
+          "FROM": "from",
+          "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
+        },
+        "PROFESSIONAL": {
+          "TITLE": "Professional",
+          "SUBTITLE": "Use only the configured business name as the sender name in the email header."
+        },
+        "BUSINESS_NAME": {
+          "BUTTON_TEXT": "+ Configure your business name",
+          "PLACEHOLDER": "Enter your business name",
+          "SAVE_BUTTON_TEXT": "Save"
+        }
+      },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -454,7 +473,9 @@
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
+      "SENDER_NAME_SECTION": "Enable Agent Name in Email",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
       "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.",
       "LOCK_TO_SINGLE_CONVERSATION": "Lock to single conversation",
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 06d699f9c..585666b70 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Añadir etiquetas",
         "PLACEHOLDER": "Buscar etiquetas",
-        "NO_RESULT": "No se encontraron etiquetas"
+        "NO_RESULT": "No se encontraron etiquetas",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Combinar contacto",
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 4dc201ee7..8fd2b4938 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Configuración de la cuenta",
     "SUBMIT": "Actualizar ajustes",
     "BACK": "Atrás",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "No se pudo actualizar la configuración, ¡inténtalo de nuevo!",
       "SUCCESS": "Configuración de cuenta actualizada correctamente"
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
index 138d847cb..7ba67702e 100644
--- a/app/javascript/dashboard/i18n/locale/es/search.json
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Buscar por Id de conversación, correo electrónico, número de teléfono, mensajes para mejores resultados de búsqueda.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Leer más",
-    "WROTE": "escribió:"
+    "WROTE": "escribió:",
+    "FROM": "De",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 4450e9747..79dcee753 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "افزودن برچسب‌ها",
         "PLACEHOLDER": "جستجو برچسب‌ها",
-        "NO_RESULT": "هیچ برچسبی یافت نشد"
+        "NO_RESULT": "هیچ برچسبی یافت نشد",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "ادغام مخاطبین",
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 14ae2cbe1..d779effcb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "تنظیمات حساب",
     "SUBMIT": "به‌روزرسانی تنظیمات",
     "BACK": "بازگشت",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "تنظیمات به‌روزرسانی نشد، دوباره امتحان کنید!",
       "SUCCESS": "تنظیمات با موفقیت اعمال شد"
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
index b695bc8b0..278115f5e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/search.json
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر.",
     "BOT_LABEL": "ربات",
     "READ_MORE": "ادامه مطلب",
-    "WROTE": "نوشت:"
+    "WROTE": "نوشت:",
+    "FROM": "از",
+    "EMAIL": "ایمیل"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 9de4e46c7..7a43ed58f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Yhdistä yhteystieto",
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index b705d553b..ebccb83ea 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Tilin asetukset",
     "SUBMIT": "Päivitä asetukset",
     "BACK": "Takaisin",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Asetuksia ei voitu päivittää, yritä uudelleen",
       "SUCCESS": "Tilin asetukset päivitetty onnistuneesti"
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index c9924167c..8c59027b3 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "sähköposti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 5daa61919..f06b25ba0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Ajouter une étiquette",
         "PLACEHOLDER": "Rechercher des étiquettes",
-        "NO_RESULT": "Aucune étiquette trouvée"
+        "NO_RESULT": "Aucune étiquette trouvée",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Fusionner le contact",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index d78a27a3e..23eb27b60 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Paramètres du compte",
     "SUBMIT": "Mettre à jour les paramètres",
     "BACK": "Précédent",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Impossible de mettre à jour les paramètres, essayez à nouveau !",
       "SUCCESS": "Paramètres du compte mis à jour avec succès"
diff --git a/app/javascript/dashboard/i18n/locale/fr/search.json b/app/javascript/dashboard/i18n/locale/fr/search.json
index c3129a175..1b77dfe4c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/search.json
+++ b/app/javascript/dashboard/i18n/locale/fr/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "de",
+    "EMAIL": "courriel"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 19c43d772..b4e010323 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "הוסף תוויות",
         "PLACEHOLDER": "חפש תוויות",
-        "NO_RESULT": "לא נמצאו תוויות"
+        "NO_RESULT": "לא נמצאו תוויות",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "מזג אנשי קשר",
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 4680ac03d..6a0fa79da 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "הגדרות חשבון",
     "SUBMIT": "עדכן הגדרות",
     "BACK": "חזור",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "לא ניתן היה לעדכן את ההגדרות, נסה שוב!",
       "SUCCESS": "הגדרות החשבון עודכנו בהצלחה"
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
index dd211513c..73fdef26e 100644
--- a/app/javascript/dashboard/i18n/locale/he/search.json
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר.",
     "BOT_LABEL": "בוט",
     "READ_MORE": "קרא עוד",
-    "WROTE": "נכתב:"
+    "WROTE": "נכתב:",
+    "FROM": "מ",
+    "EMAIL": "אימייל"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 761a99e79..d36d0e4ae 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
index 418572c0c..fbafaf73c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/search.json
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index 3417b3379..7517a01a7 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index 17997e4a9..8956e018a 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/hr/search.json b/app/javascript/dashboard/i18n/locale/hr/search.json
index 418572c0c..fbafaf73c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/search.json
+++ b/app/javascript/dashboard/i18n/locale/hr/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 321c42ee1..9270525d0 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Címkék hozzáadása",
         "PLACEHOLDER": "Címkék keresése",
-        "NO_RESULT": "Nem találtunk címkét"
+        "NO_RESULT": "Nem találtunk címkét",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Kapcsolattartók összevonása",
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 0d08cf100..4e5cad3e4 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Fiókbeállítások",
     "SUBMIT": "Beállítások frissítése",
     "BACK": "Vissza",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Beállítás frissítés sikertelen, kérjük próbáld később!",
       "SUCCESS": "Fiókbeállítások frissítve"
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
index 21d4522e5..ae1adab82 100644
--- a/app/javascript/dashboard/i18n/locale/hu/search.json
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "innen",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 761a99e79..d36d0e4ae 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
index 418572c0c..fbafaf73c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/search.json
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index eb686da0d..dc7295c63 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Tambah label",
         "PLACEHOLDER": "Cari label",
-        "NO_RESULT": "Tidak ada label"
+        "NO_RESULT": "Tidak ada label",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Gabungkan Kontak",
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 9acb94b78..f90c8a65c 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Pengaturan akun",
     "SUBMIT": "Ubah pengaturan",
     "BACK": "Kembali",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Tidak dapat memperbarui pengaturan, coba lagi!",
       "SUCCESS": "Pengaturan akun berhasil diperbarui"
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
index e79e2ee85..f871c03b5 100644
--- a/app/javascript/dashboard/i18n/locale/id/search.json
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "dari",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index 863cd9af4..c94243044 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Bæta við Merkingum",
         "PLACEHOLDER": "Leita að merkingum",
-        "NO_RESULT": "Engar merkingar fundust"
+        "NO_RESULT": "Engar merkingar fundust",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Sameina tengilið",
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 58a2a19a0..ea49942b8 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Aðgangs stillingar",
     "SUBMIT": "Uppfæra stillingar",
     "BACK": "Til baka",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Gat ekki uppfært stillingar, reyndu aftur!",
       "SUCCESS": "Tókst að uppfæra stillingar"
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index 6ea79ef5f..53dc6abec 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "frá",
+    "EMAIL": "tölvupóstfang"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index c1e3a931f..e85b08d05 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Aggiungi etichette",
         "PLACEHOLDER": "Cerca etichette",
-        "NO_RESULT": "Nessuna etichetta trovata"
+        "NO_RESULT": "Nessuna etichetta trovata",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Unisci contatto",
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index f82d1abae..7693581d9 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Impostazioni account",
     "SUBMIT": "Aggiorna le impostazioni",
     "BACK": "Indietro",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Impossibile aggiornare le impostazioni, riprova!",
       "SUCCESS": "Impostazioni account aggiornate con successo"
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
index c05eeca37..be8994196 100644
--- a/app/javascript/dashboard/i18n/locale/it/search.json
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "da",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 7a80fc349..ab9dec9b3 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 96586f3d4..7d9002227 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "アカウント設定",
     "SUBMIT": "設定を更新",
     "BACK": "戻る",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "設定を更新できませんでした。もう一度お試しください",
       "SUCCESS": "正常にアカウント設定を更新しました"
diff --git a/app/javascript/dashboard/i18n/locale/ja/search.json b/app/javascript/dashboard/i18n/locale/ja/search.json
index ac17a4127..5c7b2769b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/search.json
+++ b/app/javascript/dashboard/i18n/locale/ja/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "差出人:",
+    "EMAIL": "eメール"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 761a99e79..d36d0e4ae 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/ka/search.json b/app/javascript/dashboard/i18n/locale/ka/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/ka/search.json
+++ b/app/javascript/dashboard/i18n/locale/ka/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 879733e62..1b10ac37f 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "라벨 추가하기",
         "PLACEHOLDER": "라벨 찾기",
-        "NO_RESULT": "라벨을 찾을 수 없습니다"
+        "NO_RESULT": "라벨을 찾을 수 없습니다",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "연락처 합치기",
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 30c128ebf..a52bda118 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "계정 설정",
     "SUBMIT": "설정 업데이트",
     "BACK": "뒤로",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "설정을 업데이트할 수 없습니다, 다시 시도하십시오!",
       "SUCCESS": "계정 설정이 성공적으로 업데이트됨"
diff --git a/app/javascript/dashboard/i18n/locale/ko/search.json b/app/javascript/dashboard/i18n/locale/ko/search.json
index dca48807d..2f872cf59 100644
--- a/app/javascript/dashboard/i18n/locale/ko/search.json
+++ b/app/javascript/dashboard/i18n/locale/ko/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "봇",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "이메일"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index ef491115e..a61cfa6aa 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Pridėti Etiketę",
         "PLACEHOLDER": "Ieškoti etikečių",
-        "NO_RESULT": "Etikečių nerasta"
+        "NO_RESULT": "Etikečių nerasta",
+        "CREATE_LABEL": "Sukurti naują etiketę"
       }
     },
     "MERGE_CONTACT": "Sujungti kontaktą",
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index e7b7cd8e1..718fa78ed 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Paskyros nustatymai",
     "SUBMIT": "Atnaujinti nustatymai",
     "BACK": "Atgal",
+    "DISMISS": "Atsisakyti",
     "UPDATE": {
       "ERROR": "Nepavyko atnaujinti nustatymų, bandykite dar kartą!",
       "SUCCESS": "Sėkmingai atnaujinti paskyros nustatymai"
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
index 479f87572..e87fc02b7 100644
--- a/app/javascript/dashboard/i18n/locale/lt/search.json
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Norėdami gauti geresnių paieškos rezultatų, ieškokite pagal pokalbio ID, el. pašto adresą, telefono numerį, žinutes.",
     "BOT_LABEL": "Botas",
     "READ_MORE": "Skaityti daugiau",
-    "WROTE": "parašei:"
+    "WROTE": "parašei:",
+    "FROM": "nuo",
+    "EMAIL": "el. paštas"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 182c3ba08..2c7d8bf35 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Pievienot Etiķetes",
         "PLACEHOLDER": "Meklēt etiķetes",
-        "NO_RESULT": "Etiķetes nav atrastas"
+        "NO_RESULT": "Etiķetes nav atrastas",
+        "CREATE_LABEL": "Izveidot jaunu etiķeti"
       }
     },
     "MERGE_CONTACT": "Apvienot kontaktu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 4726fec6f..ff6b27231 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Konta iestatījumi",
     "SUBMIT": "Atjaunināt iestatījumus",
     "BACK": "Atpakaļ",
+    "DISMISS": "Atcelt",
     "UPDATE": {
       "ERROR": "Nevarēja atjaunināt iestatījumus, mēģiniet vēlreiz!",
       "SUCCESS": "Konta iestatījumi ir veiksmīgi atjaunināti"
diff --git a/app/javascript/dashboard/i18n/locale/lv/search.json b/app/javascript/dashboard/i18n/locale/lv/search.json
index 8583c3318..42c0b0608 100644
--- a/app/javascript/dashboard/i18n/locale/lv/search.json
+++ b/app/javascript/dashboard/i18n/locale/lv/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Lai iegūtu labākus meklēšanas rezultātus, meklējiet pēc sarunas Id, e-pasta, tālruņa numura vai ziņām. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Lasīt vairāk",
-    "WROTE": "rakstīja:"
+    "WROTE": "rakstīja:",
+    "FROM": "no",
+    "EMAIL": "e-pasts"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 5792fc227..143274801 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "ലേബലുകൾ ചേർക്കുക",
         "PLACEHOLDER": "ലേബലുകൾ തിരയുക",
-        "NO_RESULT": "ലേബലുകളൊന്നും കണ്ടെത്തിയില്ല"
+        "NO_RESULT": "ലേബലുകളൊന്നും കണ്ടെത്തിയില്ല",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "കോൺടാക്റ്റ് ലയിപ്പിക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index bcc070d36..14ca8d680 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ",
     "SUBMIT": "ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റു ചെയ്യുക",
     "BACK": "മടങ്ങിപ്പോവുക",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റു ചെയ്യാനായില്ല, വീണ്ടും ശ്രമിക്കുക!",
       "SUCCESS": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ വിജയകരമായി അപ്‌ഡേറ്റു ചെയ്‌തു"
diff --git a/app/javascript/dashboard/i18n/locale/ml/search.json b/app/javascript/dashboard/i18n/locale/ml/search.json
index 8c651dfab..30472e868 100644
--- a/app/javascript/dashboard/i18n/locale/ml/search.json
+++ b/app/javascript/dashboard/i18n/locale/ml/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "ബോട്ട്",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "നിന്ന്",
+    "EMAIL": "ഇമെയിൽ"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index cadef67ac..517aa7440 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 66aaf858d..9ce46fe6f 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/ms/search.json b/app/javascript/dashboard/i18n/locale/ms/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/ms/search.json
+++ b/app/javascript/dashboard/i18n/locale/ms/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index c0686f9f1..76842169c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/ne/search.json b/app/javascript/dashboard/i18n/locale/ne/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/ne/search.json
+++ b/app/javascript/dashboard/i18n/locale/ne/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index cd9162791..2c270ad7c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Labels toevoegen",
         "PLACEHOLDER": "Zoek op labels",
-        "NO_RESULT": "Geen labels gevonden"
+        "NO_RESULT": "Geen labels gevonden",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Contact samenvoegen",
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 781563406..7f25ab6c6 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Accountinstellingen",
     "SUBMIT": "Instellingen bijwerken",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Instellingen konden niet worden bijgewerkt, probeer het opnieuw!",
       "SUCCESS": "Accountinstellingen succesvol bijgewerkt"
diff --git a/app/javascript/dashboard/i18n/locale/nl/search.json b/app/javascript/dashboard/i18n/locale/nl/search.json
index 504227272..c6f22304c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/search.json
+++ b/app/javascript/dashboard/i18n/locale/nl/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "van",
+    "EMAIL": "e-mailadres"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index e1c6aacf6..e76a8b0c1 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index e70a61c9f..2feb31f9d 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Kontoinnstillinger",
     "SUBMIT": "Oppdater innstillinger",
     "BACK": "Tilbake",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Kunne ikke oppdatere innstillinger, prøv igjen!",
       "SUCCESS": "Innstillinger ble oppdatert"
diff --git a/app/javascript/dashboard/i18n/locale/no/search.json b/app/javascript/dashboard/i18n/locale/no/search.json
index 341635a74..19e5f7e95 100644
--- a/app/javascript/dashboard/i18n/locale/no/search.json
+++ b/app/javascript/dashboard/i18n/locale/no/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "fra",
+    "EMAIL": "e-post"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index 48097dcc9..15bc2b82b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -2,33 +2,33 @@
   "FILTER": {
     "TITLE": "Filtruj rozmowy",
     "SUBTITLE": "Dodaj poniższe filtry i kliknij 'Zastosuj filtry', aby przefiltrować rozmowy.",
-    "EDIT_CUSTOM_FILTER": "Edit Folder",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
+    "EDIT_CUSTOM_FILTER": "Edytuj folder",
+    "CUSTOM_VIEWS_SUBTITLE": "Dodaj lub usuń filtry i zaktualizuj swój folder.",
     "ADD_NEW_FILTER": "Dodaj filtr",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "FILTER_DELETE_ERROR": "Musisz mieć co najmniej jeden filtr do zapisu",
     "SUBMIT_BUTTON_LABEL": "Zastosuj filtry",
-    "UPDATE_BUTTON_LABEL": "Update folder",
+    "UPDATE_BUTTON_LABEL": "Zaktualizuj folder",
     "CANCEL_BUTTON_LABEL": "Anuluj",
     "CLEAR_BUTTON_LABEL": "Wyczyść filtry",
     "EMPTY_VALUE_ERROR": "Wartość jest wymagana",
-    "FOLDER_LABEL": "Folder Name",
-    "FOLDER_QUERY_LABEL": "Folder Query",
+    "FOLDER_LABEL": "Nazwa Folderu",
+    "FOLDER_QUERY_LABEL": "Zapytanie do Folderu",
     "TOOLTIP_LABEL": "Filtruj konwersacje",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "i",
-      "OR": "albo"
+      "OR": "lub"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Równa się",
-      "not_equal_to": "Nie równa się",
+      "equal_to": "Równe",
+      "not_equal_to": "Nierówne",
       "contains": "Zawiera",
       "does_not_contain": "Nie zawiera",
-      "is_present": "Istnieje",
-      "is_not_present": "Nie istnieje",
-      "is_greater_than": "Jest większe niż",
-      "is_less_than": "Jest mniejsze niż",
+      "is_present": "Jest obecny",
+      "is_not_present": "Nie jest obecny",
+      "is_greater_than": "Jest większy niż",
+      "is_less_than": "Jest mniejszy niż",
       "days_before": "Jest x dni przed",
-      "starts_with": "Starts with"
+      "starts_with": "Zaczyna się od"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Prawda",
@@ -36,48 +36,48 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Nazwa osoby przypisanej",
-      "INBOX_NAME": "Nazwa skrzynki odbiorczej",
-      "TEAM_NAME": "Nazwa zespołu",
-      "CONVERSATION_IDENTIFIER": "Identyfikator rozmowy",
-      "CAMPAIGN_NAME": "Nazwa kampanii",
+      "ASSIGNEE_NAME": "Nazwa Przypisanego",
+      "INBOX_NAME": "Nazwa Skrzynki Odbiorczej",
+      "TEAM_NAME": "Nazwa Zespołu",
+      "CONVERSATION_IDENTIFIER": "Identyfikator Rozmowy",
+      "CAMPAIGN_NAME": "Nazwa Kampanii",
       "LABELS": "Etykiety",
-      "BROWSER_LANGUAGE": "Język przeglądarki",
-      "PRIORITY": "Priority",
-      "COUNTRY_NAME": "Nazwa kraju",
-      "REFERER_LINK": "Strona odsyłająca",
+      "BROWSER_LANGUAGE": "Język Przeglądarki",
+      "PRIORITY": "Priorytet",
+      "COUNTRY_NAME": "Nazwa Kraju",
+      "REFERER_LINK": "Link Odsyłający",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
       "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
       "CUSTOM_ATTRIBUTE_NUMBER": "Numer",
-      "CUSTOM_ATTRIBUTE_LINK": "Łącze",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Pole wyboru",
-      "CREATED_AT": "Utworzono",
-      "LAST_ACTIVITY": "Ostatnia aktywność"
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Pole Wyboru",
+      "CREATED_AT": "Utworzono o",
+      "LAST_ACTIVITY": "Ostatnia Aktywność"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Filtry standardowe",
-      "ADDITIONAL_FILTERS": "Dodatkowe filtry",
-      "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty"
+      "STANDARD_FILTERS": "Standardowe Filtry",
+      "ADDITIONAL_FILTERS": "Dodatkowe Filtry",
+      "CUSTOM_ATTRIBUTES": "Niestandardowe Atrybuty"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "Czy chcesz zapisać ten filtr?",
-        "LABEL": "Nazwij filtr",
+        "LABEL": "Nazwa Filtra",
         "PLACEHOLDER": "Wprowadź nazwę dla tego filtra",
         "ERROR_MESSAGE": "Nazwa jest wymagana",
         "SAVE_BUTTON": "Zapisz filtr",
         "CANCEL_BUTTON": "Anuluj",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder utworzony pomyślnie",
+          "SUCCESS_MESSAGE": "Pomyślnie utworzono folder",
           "ERROR_MESSAGE": "Błąd podczas tworzenia folderu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment utworzony pomyślnie",
+          "SUCCESS_MESSAGE": "Pomyślnie utworzono segment",
           "ERROR_MESSAGE": "Błąd podczas tworzenia segmentu"
         }
       },
       "EDIT": {
-        "EDIT_BUTTON": "Edit folder"
+        "EDIT_BUTTON": "Edytuj folder"
       },
       "DELETE": {
         "DELETE_BUTTON": "Usuń filtr",
@@ -90,11 +90,11 @@
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder usunięty pomyślnie",
+          "SUCCESS_MESSAGE": "Pomyślnie usunięto folder",
           "ERROR_MESSAGE": "Błąd podczas usuwania folderu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Zespół został usunięty pomyślnie",
+          "SUCCESS_MESSAGE": "Pomyślnie usunięto segment",
           "ERROR_MESSAGE": "Błąd podczas usuwania segmentu"
         }
       }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentBots.json b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
index c3311e643..f4ba49ff6 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
@@ -1,73 +1,73 @@
 {
   "AGENT_BOTS": {
-    "HEADER": "Bots",
-    "LOADING_EDITOR": "Loading Editor...",
-    "HEADER_BTN_TXT": "Add Bot Configuration",
-    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent bots allows you to automate the conversations</p>",
+    "HEADER": "Boty",
+    "LOADING_EDITOR": "Ładowanie Edytora...",
+    "HEADER_BTN_TXT": "Dodaj Konfigurację Bota",
+    "SIDEBAR_TXT": "<p><b>Boty Agentów</b> <p>Boty agentów pozwalają na automatyzację rozmów</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot Name",
-        "PLACEHOLDER": "Give your bot a name",
-        "ERROR": "Bot name is required"
+        "LABEL": "Nazwa Bota",
+        "PLACEHOLDER": "Nadaj swojemu botowi nazwę",
+        "ERROR": "Nazwa bota jest wymagana"
       },
       "DESCRIPTION": {
-        "LABEL": "Bot Description",
-        "PLACEHOLDER": "What does this bot do?"
+        "LABEL": "Opis Bota",
+        "PLACEHOLDER": "Co robi ten bot?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Please enter your CSML bot configuration above",
-        "API_ERROR": "Your CSML configuration is invalid, please fix it and try again."
+        "ERROR": "Proszę wprowadzić konfigurację bota CSML powyżej",
+        "API_ERROR": "Twoja konfiguracja CSML jest nieprawidłowa, proszę ją poprawić i spróbować ponownie."
       },
-      "SUBMIT": "Validate and save"
+      "SUBMIT": "Sprawdź i zapisz"
     },
     "BOT_CONFIGURATION": {
-      "TITLE": "Select an agent bot",
-      "DESC": "You can set an agent bot from the list to this inbox. The bot can initially handle the conversation and transfer it to an agent when needed.",
+      "TITLE": "Wybierz bota agenta",
+      "DESC": "Możesz ustawić bota agenta z listy na tej skrzynce odbiorczej. Bot może początkowo prowadzić rozmowę i przekazać ją agentowi w razie potrzeby.",
       "SUBMIT": "Aktualizuj",
-      "DISCONNECT": "Disconnect Bot",
-      "SUCCESS_MESSAGE": "Successfully updated the agent bot",
-      "DISCONNECTED_SUCCESS_MESSAGE": "Successfully disconnected the agent bot",
-      "ERROR_MESSAGE": "Could not update the agent bot, please try again later",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot, please try again later",
-      "SELECT_PLACEHOLDER": "Select Bot"
+      "DISCONNECT": "Odłącz Bota",
+      "SUCCESS_MESSAGE": "Pomyślnie zaktualizowano bota agenta",
+      "DISCONNECTED_SUCCESS_MESSAGE": "Pomyślnie odłączono bota agenta",
+      "ERROR_MESSAGE": "Nie udało się zaktualizować bota agenta, spróbuj ponownie później",
+      "DISCONNECTED_ERROR_MESSAGE": "Nie udało się odłączyć bota agenta, spróbuj ponownie później",
+      "SELECT_PLACEHOLDER": "Wybierz Bota"
     },
     "ADD": {
-      "TITLE": "Configure new bot",
+      "TITLE": "Konfiguruj nowego bota",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
-        "SUCCESS_MESSAGE": "Bot added successfully",
-        "ERROR_MESSAGE": "Could not add bot, Please try again later"
+        "SUCCESS_MESSAGE": "Pomyślnie dodano bota",
+        "ERROR_MESSAGE": "Nie udało się dodać bota, spróbuj ponownie później"
       }
     },
     "LIST": {
-      "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
-      "LOADING": "Fetching Bots...",
-      "TYPE": "Bot Type"
+      "404": "Nie znaleziono botów, możesz stworzyć bota, klikając przycisk 'Konfiguruj nowego bota' ↗",
+      "LOADING": "Pobieranie Botów...",
+      "TYPE": "Typ Bota"
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
-      "TITLE": "Delete Bot",
+      "TITLE": "Usuń Bota",
       "SUBMIT": "Usuń",
       "CANCEL_BUTTON_TEXT": "Anuluj",
-      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
+      "DESCRIPTION": "Czy na pewno chcesz usunąć tego bota? Ta akcja jest nieodwracalna",
       "API": {
-        "SUCCESS_MESSAGE": "Bot deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete bot, Please try again later"
+        "SUCCESS_MESSAGE": "Pomyślnie usunięto bota",
+        "ERROR_MESSAGE": "Nie udało się usunąć bota, spróbuj ponownie później"
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Edytuj",
-      "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "LOADING": "Pobieranie Botów...",
+      "TITLE": "Edytuj Bota",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
-        "SUCCESS_MESSAGE": "Bot updated successfully",
-        "ERROR_MESSAGE": "Could not update bot, Please try again later"
+        "SUCCESS_MESSAGE": "Pomyślnie zaktualizowano bota",
+        "ERROR_MESSAGE": "Nie udało się zaktualizować bota, spróbuj ponownie później"
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook Bot",
-      "CSML": "CSML Bot"
+      "WEBHOOK": "Webhook Bota",
+      "CSML": "Bot CSML"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index 937b12d2a..aba4bba2d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Dostępność",
-          "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "PLACEHOLDER": "Wybierz status dostępności",
+          "ERROR": "Wymagana jest dostępność"
         },
         "SUBMIT": "Edytuj agenta"
       },
@@ -111,7 +111,7 @@
         "PLACEHOLDER": {
           "AGENT": "Wyszukaj konsultantów",
           "TEAM": "Wyszukaj zespoły",
-          "INPUT": "Search for agents"
+          "INPUT": "Wyszukiwanie konsultantów"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
index 3853cea94..d04927558 100644
--- a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
@@ -1,77 +1,77 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Niestandardowe atrybuty",
-    "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>",
+    "HEADER_BTN_TXT": "Dodaj niestandardowy atrybut",
+    "LOADING": "Pobieranie niestandardowych atrybutów",
+    "SIDEBAR_TXT": "<p><b>Niestandardowe atrybuty</b> <p>Niestandardowy atrybut śledzi informacje o Twoich kontaktach/rozmowach - na przykład plan subskrypcji lub datę zamówienia pierwszego przedmiotu itp. <br /><br />Aby utworzyć niestandardowy atrybut, wystarczy kliknąć przycisk <b>Dodaj niestandardowy atrybut</b>. Możesz również edytować lub usunąć istniejący niestandardowy atrybut, klikając przycisk Edytuj lub Usuń.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "Dodaj niestandardowy atrybut",
       "SUBMIT": "Stwórz",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "NAME": {
-          "LABEL": "Display Name",
-          "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Name is required"
+          "LABEL": "Nazwa wyświetlana",
+          "PLACEHOLDER": "Wprowadź nazwę wyświetlaną niestandardowego atrybutu",
+          "ERROR": "Nazwa jest wymagana"
         },
         "DESC": {
           "LABEL": "Opis",
-          "PLACEHOLDER": "Enter custom attribute description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "Wprowadź opis niestandardowego atrybutu",
+          "ERROR": "Opis jest wymagany"
         },
         "MODEL": {
-          "LABEL": "Applies to",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Model is required"
+          "LABEL": "Dotyczy",
+          "PLACEHOLDER": "Wybierz jedno",
+          "ERROR": "Model jest wymagany"
         },
         "TYPE": {
-          "LABEL": "Type",
-          "PLACEHOLDER": "Please select a type",
-          "ERROR": "Type is required",
+          "LABEL": "Typ",
+          "PLACEHOLDER": "Wybierz typ",
+          "ERROR": "Typ jest wymagany",
           "LIST": {
-            "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "LABEL": "Wartości listy",
+            "PLACEHOLDER": "Wprowadź wartość i naciśnij klawisz Enter",
+            "ERROR": "Musisz mieć co najmniej jedną wartość"
           }
         },
         "KEY": {
-          "LABEL": "Key",
-          "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "LABEL": "Klucz",
+          "PLACEHOLDER": "Wprowadź klucz niestandardowego atrybutu",
+          "ERROR": "Klucz jest wymagany",
+          "IN_VALID": "Nieprawidłowy klucz"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully!",
-        "ERROR_MESSAGE": "Could not create a Custom Attribute. Please try again later."
+        "SUCCESS_MESSAGE": "Niestandardowy atrybut został pomyślnie dodany!",
+        "ERROR_MESSAGE": "Nie można utworzyć niestandardowego atrybutu. Spróbuj ponownie później."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "Niestandardowy atrybut został pomyślnie usunięty.",
+        "ERROR_MESSAGE": "Nie można usunąć niestandardowego atrybutu. Spróbuj ponownie."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{attributeName}",
-        "PLACE_HOLDER": "Please type {attributeName} to confirm",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "TITLE": "Czy na pewno chcesz usunąć - %{attributeName}",
+        "PLACE_HOLDER": "Wpisz {attributeName}, aby potwierdzić",
+        "MESSAGE": "Spowoduje to usunięcie niestandardowego atrybutu",
         "YES": "Usuń ",
         "NO": "Anuluj"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Custom Attribute",
+      "TITLE": "Edytuj niestandardowy atrybut",
       "UPDATE_BUTTON_TEXT": "Aktualizuj",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "LABEL": "Wartości listy",
+          "PLACEHOLDER": "Wprowadź wartości i naciśnij klawisz Enter"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Atrybut zaktualizowany pomyślnie",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "Atrybut został pomyślnie zaktualizowany",
+        "ERROR_MESSAGE": "Wystąpił błąd podczas aktualizacji niestandardowego atrybutu, spróbuj ponownie"
       }
     },
     "TABS": {
@@ -91,8 +91,8 @@
         "DELETE": "Usuń"
       },
       "EMPTY_RESULT": {
-        "404": "Nie utworzono atrybutów niestandardowych",
-        "NOT_FOUND": "Brak skonfigurowanych atrybutów niestandardowych"
+        "404": "Nie utworzono niestandardowych atrybutów",
+        "NOT_FOUND": "Brak skonfigurowanych niestandardowych atrybutów"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/auditLogs.json b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
index 93e17aa20..10556f669 100644
--- a/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
@@ -1,53 +1,53 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Audit Logs",
-    "HEADER_BTN_TXT": "Add Audit Logs",
-    "LOADING": "Fetching Audit Logs",
+    "HEADER": "Dzienniki audytowe",
+    "HEADER_BTN_TXT": "Dodaj dziennik audytowy",
+    "LOADING": "Pobieranie dzienników audytowych",
     "SEARCH_404": "Brak elementów pasujących do tego zapytania",
-    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "SIDEBAR_TXT": "<p><b>Dzienniki audytowe</b> </p><p>Dzienniki audytowe to ślady zdarzeń i działań w systemie Chatwoot.</p>",
     "LIST": {
-      "404": "There are no Audit Logs available in this account.",
-      "TITLE": "Manage Audit Logs",
-      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "404": "Brak dostępnych dzienników audytowych w tym koncie.",
+      "TITLE": "Zarządzaj dziennikami audytowymi",
+      "DESC": "Dzienniki audytowe to ślady zdarzeń i działań w systemie Chatwoot.",
       "TABLE_HEADER": [
-        "User",
-        "Action",
+        "Użytkownik",
+        "Akcja",
         "Adres IP"
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      "SUCCESS_MESSAGE": "Pomyślnie pobrano dzienniki audytowe",
+      "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, spróbuj ponownie później"
     },
     "DEFAULT_USER": "System",
     "AUTOMATION_RULE": {
-      "ADD": "%{agentName} created a new automation rule (#%{id})",
-      "EDIT": "%{agentName} updated an automation rule (#%{id})",
-      "DELETE": "%{agentName} deleted an automation rule (#%{id})"
+      "ADD": "%{agentName} utworzył nową regułę automatyzacji (#%{id})",
+      "EDIT": "%{agentName} zaktualizował regułę automatyzacji (#%{id})",
+      "DELETE": "%{agentName} usunął regułę automatyzacji (#%{id})"
     },
     "INBOX": {
-      "ADD": "%{agentName} created a new inbox (#%{id})",
-      "EDIT": "%{agentName} updated an inbox (#%{id})",
-      "DELETE": "%{agentName} deleted an inbox (#%{id})"
+      "ADD": "%{agentName} utworzył nową skrzynkę odbiorczą (#%{id})",
+      "EDIT": "%{agentName} zaktualizował skrzynkę odbiorczą (#%{id})",
+      "DELETE": "%{agentName} usunął skrzynkę odbiorczą (#%{id})"
     },
     "WEBHOOK": {
-      "ADD": "%{agentName} created a new webhook (#%{id})",
-      "EDIT": "%{agentName} updated a webhook (#%{id})",
-      "DELETE": "%{agentName} deleted a webhook (#%{id})"
+      "ADD": "%{agentName} utworzył nowy webhook (#%{id})",
+      "EDIT": "%{agentName} zaktualizował webhook (#%{id})",
+      "DELETE": "%{agentName} usunął webhook (#%{id})"
     },
     "USER_ACTION": {
-      "SIGN_IN": "%{agentName} signed in",
-      "SIGN_OUT": "%{agentName} signed out"
+      "SIGN_IN": "%{agentName} zalogował się",
+      "SIGN_OUT": "%{agentName} wylogował się"
     },
     "TEAM": {
-      "ADD": "%{agentName} created a new team (#%{id})",
-      "EDIT": "%{agentName} updated a team (#%{id})",
-      "DELETE": "%{agentName} deleted a team (#%{id})"
+      "ADD": "%{agentName} utworzył nowy zespół (#%{id})",
+      "EDIT": "%{agentName} zaktualizował zespół (#%{id})",
+      "DELETE": "%{agentName} usunął zespół (#%{id})"
     },
     "MACRO": {
-      "ADD": "%{agentName} created a new macro (#%{id})",
-      "EDIT": "%{agentName} updated a macro (#%{id})",
-      "DELETE": "%{agentName} deleted a macro (#%{id})"
+      "ADD": "%{agentName} utworzył nową makro (#%{id})",
+      "EDIT": "%{agentName} zaktualizował makro (#%{id})",
+      "DELETE": "%{agentName} usunął makro (#%{id})"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index b34a72ab1..26ea565ff 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -21,8 +21,8 @@
         },
         "EVENT": {
           "LABEL": "Zdarzenie",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Event is required"
+          "PLACEHOLDER": "Wybierz jedno",
+          "ERROR": "Zdarzenie jest wymagane"
         },
         "CONDITIONS": {
           "LABEL": "Warunki"
@@ -35,7 +35,7 @@
       "ACTION_BUTTON_LABEL": "Dodaj akcję",
       "API": {
         "SUCCESS_MESSAGE": "Reguła automatyzacji została dodana",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "ERROR_MESSAGE": "Nie udało się utworzyć reguły automatyzacji, spróbuj ponownie później"
       }
     },
     "LIST": {
@@ -74,8 +74,8 @@
     "CLONE": {
       "TOOLTIP": "Klonuj",
       "API": {
-        "SUCCESS_MESSAGE": "Reguła automatyzacji sklonowana pomyślnie",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Reguła automatyzacji została sklonowana pomyślnie",
+        "ERROR_MESSAGE": "Nie udało się sklonować reguły automatyzacji, spróbuj ponownie później"
       }
     },
     "FORM": {
@@ -83,26 +83,26 @@
       "CREATE": "Stwórz",
       "DELETE": "Usuń",
       "CANCEL": "Anuluj",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "Zmiana typu zdarzenia spowoduje zresetowanie dodanych warunków i zdarzeń poniżej"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save",
-      "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes",
-      "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes"
+      "DELETE_MESSAGE": "Musisz mieć co najmniej jeden warunek, aby zapisać",
+      "CONTACT_CUSTOM_ATTR_LABEL": "Niestandardowe atrybuty kontaktu",
+      "CONVERSATION_CUSTOM_ATTR_LABEL": "Niestandardowe atrybuty rozmowy"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save",
-      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
+      "DELETE_MESSAGE": "Musisz mieć co najmniej jedną akcję, aby zapisać",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Wprowadź swoją wiadomość tutaj",
       "TEAM_DROPDOWN_PLACEHOLDER": "Wybierz zespoły"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Aktywuj regułę automatyzacji",
       "DEACTIVATION_TITLE": "Wyłącz regułę automatyzacji",
-      "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": "Nie można włączyć reguły automatyzacji, spróbuj ponownie później",
+      "ACTIVATION_DESCRIPTION": "Ta akcja spowoduje aktywację reguły automatyzacji '{automationName}'. Czy na pewno chcesz kontynuować?",
+      "DEACTIVATION_DESCRIPTION": "Ta akcja spowoduje deaktywację reguły automatyzacji '{automationName}'. Czy na pewno chcesz kontynuować?",
+      "ACTIVATION_SUCCESFUL": "Reguła automatyzacji została pomyślnie aktywowana",
+      "DEACTIVATION_SUCCESFUL": "Reguła automatyzacji została pomyślnie wyłączona",
+      "ACTIVATION_ERROR": "Nie można aktywować reguły automatyzacji, spróbuj ponownie później",
       "DEACTIVATION_ERROR": "Nie można wyłączyć reguły automatyzacji, spróbuj ponownie później",
       "CONFIRMATION_LABEL": "Tak",
       "CANCEL_LABEL": "Nie"
@@ -111,8 +111,8 @@
       "UPLOAD_ERROR": "Nie udało się przesłać załącznika, spróbuj ponownie",
       "LABEL_IDLE": "Prześlij załącznik",
       "LABEL_UPLOADING": "Przesyłanie...",
-      "LABEL_UPLOADED": "Successfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Nie powiodło się przesyłanie załącznika"
+      "LABEL_UPLOADED": "Przesłano pomyślnie",
+      "LABEL_UPLOAD_FAILED": "Nie udało się przesłać załącznika"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 5a9c85456..4ca539545 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -49,7 +49,7 @@
         "TEXT": "Utworzono"
       },
       "sort_on_priority": {
-        "TEXT": "Priority"
+        "TEXT": "Priorytet"
       },
       "sort_on_waiting_since": {
         "TEXT": "Pending Response"
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 807079264..12f073c73 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -3,22 +3,22 @@
     "NOT_AVAILABLE": "Niedostępne",
     "EMAIL_ADDRESS": "Adres e-mail",
     "PHONE_NUMBER": "Numer telefonu",
-    "IDENTIFIER": "Identifier",
-    "COPY_SUCCESSFUL": "Pomyślnie skopiowano do schowka",
+    "IDENTIFIER": "Identyfikator",
+    "COPY_SUCCESSFUL": "Skopiowano pomyślnie",
     "COMPANY": "Firma",
     "LOCATION": "Lokalizacja",
     "BROWSER_LANGUAGE": "Język przeglądarki",
-    "CONVERSATION_TITLE": "Szczegóły konwersacji",
+    "CONVERSATION_TITLE": "Szczegóły rozmowy",
     "VIEW_PROFILE": "Pokaż profil",
-    "BROWSER": "Przeglądarki",
+    "BROWSER": "Przeglądarka",
     "OS": "System operacyjny",
-    "INITIATED_FROM": "Zainicjowano z",
-    "INITIATED_AT": "Zainicjowano w",
+    "INITIATED_FROM": "Inicjowane z",
+    "INITIATED_AT": "Inicjowane o",
     "IP_ADDRESS": "Adres IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Utworzono",
     "NEW_MESSAGE": "Nowa wiadomość",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "Brak poprzednich rozmów powiązanych z tym kontaktem.",
+      "NO_RECORDS_FOUND": "Brak wcześniejszych rozmów związanych z tym kontaktem.",
       "TITLE": "Poprzednie rozmowy"
     },
     "LABELS": {
@@ -33,16 +33,17 @@
       "LABEL_SELECT": {
         "TITLE": "Dodaj etykiety",
         "PLACEHOLDER": "Wyszukaj etykiety",
-        "NO_RESULT": "Nie znaleziono etykiet"
+        "NO_RESULT": "Brak wyników",
+        "CREATE_LABEL": "Utwórz nową etykietę"
       }
     },
     "MERGE_CONTACT": "Połącz kontakty",
-    "CONTACT_ACTIONS": "Działania kontaktu",
+    "CONTACT_ACTIONS": "Akcje kontaktu",
     "MUTE_CONTACT": "Wycisz rozmowę",
     "UNMUTE_CONTACT": "Wyłącz wyciszenie rozmowy",
-    "MUTED_SUCCESS": "Ta rozmowa jest wyciszona na 6 godzin",
+    "MUTED_SUCCESS": "Ta rozmowa jest wyciszona przez 6 godzin",
     "UNMUTED_SUCCESS": "Ta rozmowa nie jest wyciszona",
-    "SEND_TRANSCRIPT": "Wyślij transkrypcję",
+    "SEND_TRANSCRIPT": "Wyślij transkrypt",
     "EDIT_LABEL": "Edytuj",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
@@ -51,7 +52,7 @@
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edytuj Kontakt",
+    "BUTTON_LABEL": "Edytuj kontakt",
     "TITLE": "Edytuj kontakt",
     "DESC": "Edytuj dane kontaktowe"
   },
@@ -70,22 +71,22 @@
       "SUBMIT": "Importuj",
       "CANCEL": "Anuluj"
     },
-    "SUCCESS_MESSAGE": "Kontakty zapisane pomyślnie",
+    "SUCCESS_MESSAGE": "Kontakty zostały pomyślnie zapisane",
     "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
   },
   "EXPORT_CONTACTS": {
-    "BUTTON_LABEL": "Export",
-    "TITLE": "Export Contacts",
-    "DESC": "Export contacts to a CSV file.",
-    "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
+    "BUTTON_LABEL": "Eksportuj",
+    "TITLE": "Eksportuj kontakty",
+    "DESC": "Eksportuj kontakty do pliku CSV.",
+    "SUCCESS_MESSAGE": "Trwa eksportowanie, otrzymasz powiadomienie e-mailem, gdy plik eksportu będzie gotowy do pobrania.",
     "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Potwierdź usunięcie",
       "MESSAGE": "Czy na pewno chcesz usunąć tę notatkę?",
-      "YES": "Tak, usuń ją",
-      "NO": "Nie, zachowaj"
+      "YES": "Tak, usuń",
+      "NO": "Nie, anuluj"
     }
   },
   "DELETE_CONTACT": {
@@ -94,21 +95,21 @@
     "DESC": "Usuń dane kontaktowe",
     "CONFIRM": {
       "TITLE": "Potwierdź usunięcie",
-      "MESSAGE": "Czy na pewno chcesz usunąć ",
+      "MESSAGE": "Czy na pewno chcesz usunąć kontakt ",
       "YES": "Tak, usuń",
-      "NO": "Nie, zachowaj"
+      "NO": "Nie, anuluj"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Kontakt został usunięty pomyślnie",
+      "SUCCESS_MESSAGE": "Kontakt został pomyślnie usunięty",
       "ERROR_MESSAGE": "Nie można usunąć kontaktu. Spróbuj ponownie później."
     }
   },
   "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Prześlij",
+      "SUBMIT": "Zapisz",
       "CANCEL": "Anuluj",
       "AVATAR": {
-        "LABEL": "Awatar kontaktu"
+        "LABEL": "Avatar kontaktu"
       },
       "NAME": {
         "PLACEHOLDER": "Wprowadź pełną nazwę kontaktu",
@@ -119,17 +120,17 @@
         "LABEL": "Bio"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Podaj adres e-mail kontaktu",
+        "PLACEHOLDER": "Wprowadź adres e-mail kontaktu",
         "LABEL": "Adres e-mail",
-        "DUPLICATE": "Ten adres e-mail jest już zajęty przez inny kontakt.",
+        "DUPLICATE": "Ten adres e-mail jest już używany przez inny kontakt.",
         "ERROR": "Wprowadź poprawny adres e-mail."
       },
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Wprowadź numer telefonu kontaktu",
         "LABEL": "Numer telefonu",
-        "HELP": "Numer telefonu powinien mieć format E.164, np. +1415555555 [+][kod krajowy][kod kierunkowy][numer telefonu]",
-        "ERROR": "Numer telefonu powinien być pusty lub w formacie E.164",
-        "DIAL_CODE_ERROR": "Please select a dial code from the list",
+        "HELP": "Numer telefonu powinien mieć format E.164, na przykład +1415555555 [+][kod kraju][kod kierunkowy][numer telefonu]",
+        "ERROR": "Numer telefonu powinien być pusty lub mieć format E.164",
+        "DIAL_CODE_ERROR": "Wybierz kod wybierania z listy",
         "DUPLICATE": "Ten numer telefonu jest już zajęty przez inny kontakt."
       },
       "LOCATION": {
@@ -137,60 +138,60 @@
         "LABEL": "Lokalizacja"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Wpisz nazwę firmy",
+        "PLACEHOLDER": "Wprowadź nazwę firmy",
         "LABEL": "Nazwa firmy"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
-        "LABEL": "Nazwa kraju",
-        "SELECT_PLACEHOLDER": "Select",
+        "PLACEHOLDER": "Wprowadź nazwę kraju",
+        "LABEL": "Kraj",
+        "SELECT_PLACEHOLDER": "Wybierz",
         "REMOVE": "Usuń",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "Wybierz kraj"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "Wprowadź nazwę miasta",
+        "LABEL": "Miasto"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Wprowadź nazwę użytkownika Facebook",
+          "PLACEHOLDER": "Wprowadź nazwę użytkownika na Facebooku",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Wprowadź nazwę użytkownika Twitter",
+          "PLACEHOLDER": "Wprowadź nazwę użytkownika na Twitterze",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Wprowadź nazwę użytkownika LinkedIn",
+          "PLACEHOLDER": "Wprowadź nazwę użytkownika na LinkedIn",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Wprowadź nazwę użytkownika Github",
-          "LABEL": "Github"
+          "PLACEHOLDER": "Wprowadź nazwę użytkownika na GitHub",
+          "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 kontaktu został pomyślnie usunięty",
+        "ERROR_MESSAGE": "Nie można usunąć avatara kontaktu. Spróbuj ponownie później."
       }
     },
-    "SUCCESS_MESSAGE": "Kontakt zapisany pomyślnie",
+    "SUCCESS_MESSAGE": "Kontakt został pomyślnie zapisany",
     "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
   },
   "NEW_CONVERSATION": {
     "BUTTON_LABEL": "Rozpocznij rozmowę",
     "TITLE": "Nowa rozmowa",
-    "DESC": "Rozpocznij nową rozmowę wysyłając wiadomość.",
-    "NO_INBOX": "Nie można odnaleźć skrzynki odbiorczej do rozpoczęcia nowej rozmowy z tym kontaktem.",
+    "DESC": "Rozpocznij nową rozmowę, wysyłając wiadomość.",
+    "NO_INBOX": "Nie można znaleźć skrzynki odbiorczej, aby rozpocząć nową rozmowę z tym kontaktem.",
     "FORM": {
       "TO": {
         "LABEL": "Do"
       },
       "INBOX": {
         "LABEL": "Skrzynka odbiorcza",
-        "PLACEHOLDER": "Choose source inbox",
+        "PLACEHOLDER": "Wybierz skrzynkę odbiorczą",
         "ERROR": "Wybierz skrzynkę odbiorczą"
       },
       "SUBJECT": {
@@ -205,23 +206,23 @@
       },
       "SUBMIT": "Wyślij wiadomość",
       "CANCEL": "Anuluj",
-      "SUCCESS_MESSAGE": "Wiadomość wysłana!",
-      "GO_TO_CONVERSATION": "Widok",
-      "ERROR_MESSAGE": "Nie udało się wysłać! Spróbuj ponownie"
+      "SUCCESS_MESSAGE": "Wiadomość została wysłana!",
+      "GO_TO_CONVERSATION": "Przejdź do rozmowy",
+      "ERROR_MESSAGE": "Nie udało się wysłać wiadomości! Spróbuj ponownie"
     }
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakty",
     "FIELDS": "Pola kontaktu",
     "SEARCH_BUTTON": "Szukaj",
-    "SEARCH_INPUT_PLACEHOLDER": "Szukaj kontaktów",
+    "SEARCH_INPUT_PLACEHOLDER": "Wyszukaj kontakty",
     "FILTER_CONTACTS": "Filtruj",
     "FILTER_CONTACTS_SAVE": "Zapisz filtr",
     "FILTER_CONTACTS_DELETE": "Usuń filtr",
-    "FILTER_CONTACTS_EDIT": "Edit segment",
+    "FILTER_CONTACTS_EDIT": "Edytuj segment",
     "LIST": {
       "LOADING_MESSAGE": "Ładowanie kontaktów...",
-      "404": "Brak kontaktów pasujących do Twojego wyszukiwania 🔍",
+      "404": "Brak kontaktów pasujących do wyszukiwania 🔍",
       "NO_CONTACTS": "Brak dostępnych kontaktów",
       "TABLE_HEADER": {
         "NAME": "Nazwisko",
@@ -245,26 +246,26 @@
   "REMINDER": {
     "ADD_BUTTON": {
       "BUTTON": "Dodaj",
-      "TITLE": "Shift + Enter, aby utworzyć zadanie"
+      "TITLE": "Shift + Enter, aby utworzyć przypomnienie"
     },
     "FOOTER": {
-      "DUE_DATE": "Data zakończenia",
+      "DUE_DATE": "Data wykonania",
       "LABEL_TITLE": "Ustaw typ"
     }
   },
   "NOTES": {
     "FETCHING_NOTES": "Pobieranie notatek...",
-    "NOT_AVAILABLE": "Nie ma żadnych notatek dla tego kontaktu",
+    "NOT_AVAILABLE": "Brak dostępnych notatek dla tego kontaktu",
     "HEADER": {
       "TITLE": "Notatki"
     },
     "LIST": {
-      "LABEL": "dodano notatkę"
+      "LABEL": "dodana notatka"
     },
     "ADD": {
       "BUTTON": "Dodaj",
       "PLACEHOLDER": "Dodaj notatkę",
-      "TITLE": "Shift + Enter by utworzyć notatkę"
+      "TITLE": "Shift + Enter, aby utworzyć notatkę"
     },
     "CONTENT_HEADER": {
       "DELETE": "Usuń notatkę"
@@ -275,20 +276,20 @@
       "TITLE": "Aktywności"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notatki",
-      "PILL_BUTTON_EVENTS": "zdarzenia",
-      "PILL_BUTTON_CONVO": "rozmowy"
+      "PILL_BUTTON_NOTES": "Notatki",
+      "PILL_BUTTON_EVENTS": "Wydarzenia",
+      "PILL_BUTTON_CONVO": "Rozmowy"
     }
   },
   "CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Dodaj atrybuty",
     "BUTTON": "Dodaj niestandardowy atrybut",
-    "NOT_AVAILABLE": "Brak niestandardowych atrybutów dostępnych dla tego kontaktu.",
-    "COPY_SUCCESSFUL": "Pomyślnie skopiowano do schowka",
+    "NOT_AVAILABLE": "Brak dostępnych niestandardowych atrybutów dla tego kontaktu.",
+    "COPY_SUCCESSFUL": "Skopiowano pomyślnie",
     "ACTIONS": {
-      "COPY": "Dodaj atrybut",
+      "COPY": "Kopiuj atrybut",
       "DELETE": "Usuń atrybut",
-      "EDIT": "Dodaj atrybut"
+      "EDIT": "Edytuj atrybut"
     },
     "ADD": {
       "TITLE": "Dodaj niestandardowy atrybut",
@@ -298,31 +299,31 @@
       "CREATE": "Dodaj atrybut",
       "CANCEL": "Anuluj",
       "NAME": {
-        "LABEL": "Nazwa atrybutu niestandardowego",
-        "PLACEHOLDER": "Np.: shopify id",
+        "LABEL": "Nazwa niestandardowego atrybutu",
+        "PLACEHOLDER": "Na przykład: ID Shopify",
         "ERROR": "Nieprawidłowa nazwa niestandardowego atrybutu"
       },
       "VALUE": {
         "LABEL": "Wartość atrybutu",
-        "PLACEHOLDER": "Np.: 11901 "
+        "PLACEHOLDER": "Na przykład: 11901"
       },
       "ADD": {
         "TITLE": "Dodaj niestandardowy atrybut ",
-        "SUCCESS": "Atrybut dodany pomyślnie",
-        "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
+        "SUCCESS": "Pomyślnie dodano atrybut",
+        "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później."
       },
       "UPDATE": {
-        "SUCCESS": "Atrybut zaktualizowany pomyślnie",
-        "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
+        "SUCCESS": "Pomyślnie zaktualizowano atrybut",
+        "ERROR": "Nie można zaktualizować atrybutu. Spróbuj ponownie później."
       },
       "DELETE": {
-        "SUCCESS": "Atrybut usunięty pomyślnie",
-        "ERROR": "Nie można usunąć atrybutu. Spróbuj ponownie później"
+        "SUCCESS": "Pomyślnie usunięto atrybut",
+        "ERROR": "Nie można usunąć atrybutu. Spróbuj ponownie później."
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Dodaj atrybuty",
-        "PLACEHOLDER": "Szukaj atrybutów",
-        "NO_RESULT": "Nie znaleziono atrybutów"
+        "PLACEHOLDER": "Wyszukaj atrybuty",
+        "NO_RESULT": "Brak wyników"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
@@ -339,32 +340,32 @@
   },
   "MERGE_CONTACTS": {
     "TITLE": "Połącz kontakty",
-    "DESCRIPTION": "Połącz kontakty w celu połączenia dwóch profili w jeden, w tym wszystkich atrybutów i konwersacji. W przypadku konfliktu atrybuty głównego kontaktu będą miały pierwszeństwo.",
+    "DESCRIPTION": "Połącz kontakty, aby połączyć dwa profile w jeden, wraz z wszystkimi atrybutami i rozmowami. W przypadku konfliktu atrybuty z profilu głównego będą miały pierwszeństwo.",
     "PRIMARY": {
-      "TITLE": "Kontakt podstawowy",
-      "HELP_LABEL": "Do przechowywania"
+      "TITLE": "Kontakt główny",
+      "HELP_LABEL": "Przechowywanie"
     },
     "CHILD": {
       "TITLE": "Kontakt do scalenia",
-      "PLACEHOLDER": "Szukaj kontaktów",
-      "HELP_LABEL": "Do usunięcia"
+      "PLACEHOLDER": "Wyszukaj kontakty",
+      "HELP_LABEL": "Usunięcie"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Kontakt z <strong>%{childContactName}</strong> zostanie usunięty.",
-      "ATTRIBUTE_WARNING": "Dane kontaktowe <strong>%{childContactName}</strong> zostaną skopiowane do <strong>%{primaryContactName}</strong>."
+      "TITLE": "Podsumowanie",
+      "DELETE_WARNING": "Kontakt <strong>%{childContactName}</strong> zostanie usunięty.",
+      "ATTRIBUTE_WARNING": "Dane kontaktowe z <strong>%{childContactName}</strong> zostaną skopiowane do <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
       "ERROR": "Błąd"
     },
     "FORM": {
-      "SUBMIT": " Połącz kontakty",
+      "SUBMIT": "Połącz kontakty",
       "CANCEL": "Anuluj",
       "CHILD_CONTACT": {
-        "ERROR": "Wybierz kontakt podrzędny do scalenia"
+        "ERROR": "Wybierz kontakt do scalenia"
       },
-      "SUCCESS_MESSAGE": "Kontakt pomyślnie scalony",
-      "ERROR_MESSAGE": "Nie można scalić kontaktów, spróbuj ponownie!"
+      "SUCCESS_MESSAGE": "Kontakty zostały pomyślnie połączone",
+      "ERROR_MESSAGE": "Nie można połączyć kontaktów. Spróbuj ponownie!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
index c2d74b97a..19aa08650 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
@@ -6,7 +6,7 @@
     "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
     "ADD_NEW_FILTER": "Dodaj filtr",
     "CLEAR_ALL_FILTERS": "Wyczyść wszystkie filtry",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "FILTER_DELETE_ERROR": "Musisz mieć co najmniej jeden filtr do zapisu",
     "SUBMIT_BUTTON_LABEL": "Prześlij",
     "UPDATE_BUTTON_LABEL": "Update Segment",
     "CANCEL_BUTTON_LABEL": "Anuluj",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 2c1977b73..c966a3c68 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -75,7 +75,7 @@
       "CANCEL": "Anuluj"
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Priorytet",
       "OPTIONS": {
         "NONE": "Brak",
         "URGENT": "Urgent",
@@ -188,7 +188,7 @@
       "ASSIGN": "Przypisz"
     },
     "CONTEXT_MENU": {
-      "COPY": "Copy",
+      "COPY": "Kopiuj",
       "DELETE": "Usuń",
       "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
       "TRANSLATE": "Translate",
diff --git a/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json b/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
index 73e5bec93..568df98fa 100644
--- a/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
@@ -3,11 +3,11 @@
     "TITLE": "Oceń udzielone Ci wsparcie",
     "PLACEHOLDER": "Dodaj swój komentarz...",
     "RATINGS": {
-      "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "POOR": "😞 Słabo",
+      "FAIR": "😑 Średnio",
+      "AVERAGE": "😐 Przeciętnie",
+      "GOOD": "😀 Dobrze",
+      "EXCELLENT": "😍 Doskonale"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/emoji.json b/app/javascript/dashboard/i18n/locale/pl/emoji.json
index fd81268fb..ea6c28cba 100644
--- a/app/javascript/dashboard/i18n/locale/pl/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/pl/emoji.json
@@ -1,6 +1,6 @@
 {
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Wyszukaj emoji",
+    "NOT_FOUND": "Nie znaleziono emoji pasującego do wyszukiwania"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index b34f139b2..796574dd5 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Ustawienia konta",
     "SUBMIT": "Aktualizuj ustawienia",
     "BACK": "Powrót",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Nie można zaktualizować ustawień, spróbuj ponownie!",
       "SUCCESS": "Pomyślnie zaktualizowano ustawienia konta"
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index eda8165d4..898d46d83 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -7,18 +7,18 @@
       "NEW_BUTTON": "New Article",
       "DROPDOWN_OPTIONS": {
         "PUBLISHED": "Published",
-        "DRAFT": "Draft",
-        "ARCHIVED": "Archived"
+        "DRAFT": "Szkic",
+        "ARCHIVED": "Zarchiwizowane"
       },
       "TITLES": {
-        "ALL_ARTICLES": "All Articles",
-        "MINE": "My Articles",
+        "ALL_ARTICLES": "Wszystkie artykuły",
+        "MINE": "Moje artykuły",
         "DRAFT": "Draft Articles",
         "ARCHIVED": "Archived Articles"
       }
     },
     "EDIT_HEADER": {
-      "ALL_ARTICLES": "All Articles",
+      "ALL_ARTICLES": "Wszystkie artykuły",
       "PUBLISH_BUTTON": "Publish",
       "MOVE_TO_ARCHIVE_BUTTON": "Move to archived",
       "PREVIEW": "Preview",
@@ -171,7 +171,7 @@
               "EDIT": "Edit category",
               "DELETE": "Delete category"
             },
-            "EMPTY_TEXT": "No categories found"
+            "EMPTY_TEXT": "Nie znaleziono kategorii"
           }
         },
         "EDIT_BASIC_INFO": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 1a0fd5a7b..fc0ee4197 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -434,7 +434,7 @@
     }
   },
   "OVERVIEW_REPORTS": {
-    "HEADER": "Overview",
+    "HEADER": "Przegląd",
     "LIVE": "Live",
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/pl/search.json b/app/javascript/dashboard/i18n/locale/pl/search.json
index ccfc887d2..d28cbe011 100644
--- a/app/javascript/dashboard/i18n/locale/pl/search.json
+++ b/app/javascript/dashboard/i18n/locale/pl/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "od",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 878c2aba9..977f49f0e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -20,35 +20,35 @@
         "NOTE": "Twój adres e-mail jest Twoją tożsamością i jest używany do logowania."
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
-        "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
-        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "TITLE": "Skrót klawiszowy do wysyłania wiadomości",
+        "NOTE": "Możesz wybrać skrót klawiszowy (Enter lub Cmd/Ctrl+Enter) w zależności od preferencji pisania.",
+        "UPDATE_SUCCESS": "Twoje ustawienia zostały pomyślnie zaktualizowane",
         "CARD": {
           "ENTER_KEY": {
             "HEADING": "Enter (↵)",
-            "CONTENT": "Send messages by pressing Enter key instead of clicking the send button."
+            "CONTENT": "Wyślij wiadomości, naciskając klawisz Enter zamiast kliknięcia przycisku Wyślij."
           },
           "CMD_ENTER_KEY": {
             "HEADING": "Cmd/Ctrl + Enter (⌘ + ↵)",
-            "CONTENT": "Send messages by pressing Cmd/Ctrl + enter key instead of clicking the send button."
+            "CONTENT": "Wyślij wiadomości, naciskając klawisze Cmd/Ctrl + Enter zamiast kliknięcia przycisku Wyślij."
           }
         }
       },
       "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": "Osobisty podpis wiadomości",
+        "NOTE": "Utwórz osobisty podpis wiadomości, który zostanie dodany do wszystkich wiadomości wysyłanych z Twojej skrzynki pocztowej. Użyj edytora bogatego w treści, aby stworzyć wysoko spersonalizowany podpis.",
+        "BTN_TEXT": "Zapisz podpis wiadomości",
+        "API_ERROR": "Nie można zapisać podpisu! Spróbuj ponownie",
+        "API_SUCCESS": "Podpis został pomyślnie zapisany"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "LABEL": "Podpis wiadomości",
+        "ERROR": "Podpis wiadomości nie może być pusty",
+        "PLACEHOLDER": "Wprowadź swój osobisty podpis wiadomości tutaj."
       },
       "PASSWORD_SECTION": {
         "TITLE": "Hasło",
-        "NOTE": "Aktualizacja hasła spowoduje zresetowanie logowania na wielu urządzeniach.",
+        "NOTE": "Zmiana hasła spowoduje zresetowanie logowania na wielu urządzeniach.",
         "BTN_TEXT": "Zmień hasło"
       },
       "ACCESS_TOKEN": {
@@ -57,20 +57,20 @@
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Powiadomienia dźwiękowe",
-        "NOTE": "Włącz powiadomienia audio na pulpicie dla nowych wiadomości i konwersacji.",
+        "NOTE": "Włącz powiadomienia dźwiękowe na pulpicie dla nowych wiadomości i konwersacji.",
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Wydarzenia powiadomień:",
           "NONE": "Brak",
           "ASSIGNED": "Przypisane rozmowy",
           "ALL_CONVERSATIONS": "Rozmowy"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "Domyślny dźwięk powiadomień:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "Warunki powiadomień:",
+          "CONDITION_ONE": "Wysyłaj dźwiękowe powiadomienia tylko wtedy, gdy okno przeglądarki nie jest aktywne",
+          "CONDITION_TWO": "Wysyłaj powiadomienia co 30 sekund, dopóki wszystkie przypisane rozmowy nie zostaną odczytane"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
@@ -79,22 +79,22 @@
         "CONVERSATION_ASSIGNMENT": "Wysyłaj powiadomienia e-mail, gdy konwersacja jest przypisana do mnie",
         "CONVERSATION_CREATION": "Wysyłaj powiadomienia e-mail po utworzeniu nowej rozmowy",
         "CONVERSATION_MENTION": "Wysyłaj powiadomienia e-mail, gdy zostaniesz wymieniony w rozmowie",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia e-mail, gdy nowa wiadomość zostanie utworzona w przypisanej konwersacji",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia e-mail, gdy w przypisanej konwersacji zostanie utworzona nowa wiadomość",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia e-mail, gdy w rozmowie, w której bierzesz udział, zostanie utworzona nowa wiadomość"
       },
       "API": {
         "UPDATE_SUCCESS": "Twoje preferencje powiadomień zostały pomyślnie zaktualizowane",
         "UPDATE_ERROR": "Wystąpił błąd podczas aktualizacji preferencji, spróbuj ponownie"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Powiadomienia dźwiękowe",
-        "NOTE": "Zaktualizuj ustawienia powiadomień tutaj",
+        "TITLE": "Powiadomienia push",
+        "NOTE": "Zaktualizuj ustawienia powiadomień push tutaj",
         "CONVERSATION_ASSIGNMENT": "Wyślij powiadomienia push, gdy konwersacja jest przypisana do mnie",
         "CONVERSATION_CREATION": "Wysyłaj powiadomienia push po utworzeniu nowej rozmowy",
-        "CONVERSATION_MENTION": "Wyślij powiadomienia, gdy jesteś wymieniony w konwersacji",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia push, gdy nowa wiadomość zostanie utworzona w przypisanej konwersacji",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
-        "HAS_ENABLED_PUSH": "Włączyłeś opcję push dla tej przeglądarki.",
+        "CONVERSATION_MENTION": "Wyślij powiadomienia push, gdy jesteś wymieniony w rozmowie",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia push, gdy w przypisanej konwersacji zostanie utworzona nowa wiadomość",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Wyślij powiadomienia push, gdy w rozmowie, w której bierzesz udział, zostanie utworzona nowa wiadomość",
+        "HAS_ENABLED_PUSH": "Włączyłeś opcję powiadomień push dla tej przeglądarki.",
         "REQUEST_PUSH": "Włącz powiadomienia push"
       },
       "PROFILE_IMAGE": {
@@ -107,8 +107,8 @@
       },
       "DISPLAY_NAME": {
         "LABEL": "Wyświetlana nazwa",
-        "ERROR": "Wprowadź prawidłową nazwę wyświetlaną",
-        "PLACEHOLDER": "Wprowadź nazwę wyświetlaną, która będzie wyświetlana w rozmowach"
+        "ERROR": "Wprowadź poprawną nazwę wyświetlaną",
+        "PLACEHOLDER": "Wprowadź nazwę wyświetlaną, która będzie widoczna w rozmowach"
       },
       "AVAILABILITY": {
         "LABEL": "Dostępność",
@@ -117,13 +117,13 @@
           "Zajęty",
           "Offline"
         ],
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_SUCCESS": "Dostępność została pomyślnie ustawiona",
+        "SET_AVAILABILITY_ERROR": "Nie można ustawić dostępności, spróbuj ponownie"
       },
       "EMAIL": {
         "LABEL": "Twój adres e-mail",
         "ERROR": "Wprowadź poprawny adres e-mail",
-        "PLACEHOLDER": "Wprowadź swój adres e-mail, który będzie wyświetlany w rozmowach"
+        "PLACEHOLDER": "Wprowadź swój adres e-mail, który będzie widoczny w rozmowach"
       },
       "CURRENT_PASSWORD": {
         "LABEL": "Aktualne hasło",
@@ -132,180 +132,180 @@
       },
       "PASSWORD": {
         "LABEL": "Nowe hasło",
-        "ERROR": "Wprowadź hasło o długości 6 lub więcej",
+        "ERROR": "Wprowadź hasło o długości co najmniej 6 znaków",
         "PLACEHOLDER": "Wprowadź nowe hasło"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Potwierdź nowe hasło",
-        "ERROR": "Potwierdź hasło powinno być zgodne z hasłem",
-        "PLACEHOLDER": "Wprowadź ponownie swoje nowe hasło"
+        "ERROR": "Potwierdzenie hasła musi być zgodne z hasłem",
+        "PLACEHOLDER": "Wprowadź ponownie nowe hasło"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Zmienić",
+    "CHANGE_AVAILABILITY_STATUS": "Zmień dostępność",
     "CHANGE_ACCOUNTS": "Przełącz konto",
-    "CONTACT_SUPPORT": "Contact Support",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "CONTACT_SUPPORT": "Skontaktuj się z pomocą techniczną",
+    "SELECTOR_SUBTITLE": "Wybierz konto z poniższej listy",
     "PROFILE_SETTINGS": "Ustawienia profilu",
-    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "KEYBOARD_SHORTCUTS": "Skróty klawiszowe",
     "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Wyloguj się"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User",
+    "TRIAL_MESSAGE": "dni pozostało w okresie próbnym.",
+    "TRAIL_BUTTON": "Kup teraz",
+    "DELETED_USER": "Usunięty użytkownik",
     "ACCOUNT_SUSPENDED": {
-      "TITLE": "Account Suspended",
-      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+      "TITLE": "Konto zawieszone",
+      "MESSAGE": "Twoje konto zostało zawieszone. Skontaktuj się z zespołem pomocy technicznej w celu uzyskania dodatkowych informacji."
     }
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "CODEPEN": "Open in CodePen",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Kopiuj",
+      "CODEPEN": "Otwórz w CodePen",
+      "COPY_SUCCESSFUL": "Kod został skopiowany do schowka"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Pokaż więcej",
+      "SHOW_LESS": "Pokaż mniej"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Pobierz",
       "UPLOADING": "Przesyłanie...",
-      "INSTAGRAM_STORY_UNAVAILABLE": "This story is no longer available."
+      "INSTAGRAM_STORY_UNAVAILABLE": "Ta historia nie jest już dostępna."
     },
     "LOCATION_BUBBLE": {
-      "SEE_ON_MAP": "See on map"
+      "SEE_ON_MAP": "Zobacz na mapie"
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Prześlij"
+      "SUBMIT": "Wyślij"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Weryfikacja...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "Dodaj skrzynkę odbiorczą"
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
-    "SWITCH": "Switch",
+    "CURRENTLY_VIEWING_ACCOUNT": "Aktualnie przeglądane konto:",
+    "SWITCH": "Przełącz",
     "CONVERSATIONS": "Rozmowy",
     "ALL_CONVERSATIONS": "Rozmowy",
     "MENTIONED_CONVERSATIONS": "Wzmianki",
-    "PARTICIPATING_CONVERSATIONS": "Participating",
-    "UNATTENDED_CONVERSATIONS": "Unattended",
+    "PARTICIPATING_CONVERSATIONS": "Udział",
+    "UNATTENDED_CONVERSATIONS": "Bez odpowiedzi",
     "REPORTS": "Raporty",
     "SETTINGS": "Ustawienia",
     "CONTACTS": "Kontakty",
-    "HOME": "Home",
+    "HOME": "Strona główna",
     "AGENTS": "Agenci",
-    "AGENT_BOTS": "Bots",
-    "AUDIT_LOGS": "Audit Logs",
-    "INBOXES": "Skrzynki",
+    "AGENT_BOTS": "Boty",
+    "AUDIT_LOGS": "Logi audytowe",
+    "INBOXES": "Skrzynki odbiorcze",
     "NOTIFICATIONS": "Powiadomienia",
     "CANNED_RESPONSES": "Gotowe odpowiedzi",
     "INTEGRATIONS": "Integracje",
     "PROFILE_SETTINGS": "Ustawienia profilu",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "APPLICATIONS": "Applications",
+    "ACCOUNT_SETTINGS": "Ustawienia konta",
+    "APPLICATIONS": "Aplikacje",
     "LABELS": "Etykiety",
     "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
     "AUTOMATION": "Automatyzacja",
-    "MACROS": "Macros",
+    "MACROS": "Makra",
     "TEAMS": "Zespoły",
-    "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",
+    "BILLING": "Rozliczenia",
+    "CUSTOM_VIEWS_FOLDER": "Foldery",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmenty",
+    "ALL_CONTACTS": "Wszyscy Kontakty",
+    "TAGGED_WITH": "Otagowane jako",
+    "NEW_LABEL": "Nowa etykieta",
+    "NEW_TEAM": "Nowy zespół",
+    "NEW_INBOX": "Nowa skrzynka odbiorcza",
     "REPORTS_CONVERSATION": "Rozmowy",
     "CSAT": "CSAT",
-    "CAMPAIGNS": "Kampania",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "CAMPAIGNS": "Kampanie",
+    "ONGOING": "Trwające",
+    "ONE_OFF": "Jednorazowe",
     "REPORTS_AGENT": "Agenci",
     "REPORTS_LABEL": "Etykiety",
     "REPORTS_INBOX": "Skrzynka odbiorcza",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "REPORTS_TEAM": "Zespół",
+    "SET_AVAILABILITY_TITLE": "Ustaw dostępność jako",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview",
-    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "REPORTS_OVERVIEW": "Przegląd",
+    "FACEBOOK_REAUTHORIZE": "Twoje połączenie z Facebookiem wygasło, aby kontynuować usługi, ponownie połącz swoją stronę na Facebooku",
     "HELP_CENTER": {
-      "TITLE": "Help Center (Beta)",
-      "ALL_ARTICLES": "All Articles",
-      "MY_ARTICLES": "My Articles",
-      "DRAFT": "Draft",
-      "ARCHIVED": "Archived",
-      "CATEGORY": "Category",
+      "TITLE": "Centrum pomocy (Beta)",
+      "ALL_ARTICLES": "Wszystkie artykuły",
+      "MY_ARTICLES": "Moje artykuły",
+      "DRAFT": "Szkic",
+      "ARCHIVED": "Zarchiwizowane",
+      "CATEGORY": "Kategoria",
       "SETTINGS": "Ustawienia",
-      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+      "CATEGORY_EMPTY_MESSAGE": "Nie znaleziono kategorii"
     },
     "SET_AUTO_OFFLINE": {
-      "TEXT": "Mark offline automatically",
-      "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
+      "TEXT": "Automatycznie oznaczaj jako offline",
+      "INFO_TEXT": "Pozwól systemowi automatycznie oznaczać Cię jako offline, gdy nie korzystasz z aplikacji lub panelu"
     },
-    "DOCS": "Read docs"
+    "DOCS": "Czytaj dokumentację"
   },
   "BILLING_SETTINGS": {
-    "TITLE": "Billing",
+    "TITLE": "Rozliczenia",
     "CURRENT_PLAN": {
-      "TITLE": "Current Plan",
-      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+      "TITLE": "Obecny plan",
+      "PLAN_NOTE": "Obecnie subskrybujesz plan **%{plan}** z **%{quantity}** licencjami"
     },
     "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"
+      "TITLE": "Zarządzaj subskrypcją",
+      "DESCRIPTION": "Wyświetl swoje poprzednie faktury, edytuj dane rozliczeniowe lub anuluj subskrypcję.",
+      "BUTTON_TXT": "Przejdź do portalu rozliczeniowego"
     },
     "CHAT_WITH_US": {
-      "TITLE": "Need help?",
-      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "TITLE": "Potrzebujesz pomocy?",
+      "DESCRIPTION": "Masz problemy z rozliczeniami? Jesteśmy tutaj, aby pomóc.",
       "BUTTON_TXT": "Porozmawiaj z nami"
     },
-    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+    "NO_BILLING_USER": "Konfigurowanie konta rozliczeniowego. Odśwież stronę i spróbuj ponownie."
   },
   "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": "Ups! Nie znaleziono żadnych kont Chatwoot. Aby kontynuować, utwórz nowe konto.",
+    "NEW_ACCOUNT": "Nowe konto",
+    "SELECTOR_SUBTITLE": "Utwórz nowe konto",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      "SUCCESS_MESSAGE": "Konto zostało pomyślnie utworzone",
+      "EXIST_MESSAGE": "Konto już istnieje",
+      "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, spróbuj ponownie później"
     },
     "FORM": {
       "NAME": {
         "LABEL": "Nazwa firmy",
-        "PLACEHOLDER": "Przedsiębiorstwa Wayne"
+        "PLACEHOLDER": "Przedsiębiorstwo Wayne"
       },
-      "SUBMIT": "Prześlij"
+      "SUBMIT": "Wyślij"
     }
   },
   "KEYBOARD_SHORTCUTS": {
-    "TOGGLE_MODAL": "View all shortcuts",
+    "TOGGLE_MODAL": "Wyświetl wszystkie skróty",
     "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",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "Otwórz rozmowę",
+      "RESOLVE_AND_NEXT": "Zamknij i przejdź do następnej",
+      "NAVIGATE_DROPDOWN": "Przejdź do elementów menu rozwijanego",
+      "RESOLVE_CONVERSATION": "Zamknij rozmowę",
+      "GO_TO_CONVERSATION_DASHBOARD": "Przejdź do panelu rozmów",
+      "ADD_ATTACHMENT": "Dodaj załącznik",
+      "GO_TO_CONTACTS_DASHBOARD": "Przejdź do panelu kontaktów",
+      "TOGGLE_SIDEBAR": "Przełącz panel boczny",
+      "GO_TO_REPORTS_SIDEBAR": "Przejdź do panelu raportów",
+      "MOVE_TO_NEXT_TAB": "Przejdź do następnej karty na liście rozmów",
+      "GO_TO_SETTINGS": "Przejdź do ustawień",
+      "SWITCH_CONVERSATION_STATUS": "Przełącz do następnego statusu rozmowy",
+      "SWITCH_TO_PRIVATE_NOTE": "Przełącz do prywatnej notatki",
+      "SWITCH_TO_REPLY": "Przełącz do odpowiedzi",
+      "TOGGLE_SNOOZE_DROPDOWN": "Przełącz menu rozwijane drzemki"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 03b162497..43cd1eb20 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Adicionar Etiquetas",
         "PLACEHOLDER": "Procurar Etiquetas",
-        "NO_RESULT": "Nenhuma Etiqueta encontrada"
+        "NO_RESULT": "Nenhuma Etiqueta encontrada",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Unir contacto",
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 5d3bea4b0..399a4901f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Configurações da conta",
     "SUBMIT": "Atualizar configurações",
     "BACK": "Voltar",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Não foi possível atualizar as configurações, tente novamente!",
       "SUCCESS": "Configurações de conta atualizadas com sucesso"
diff --git a/app/javascript/dashboard/i18n/locale/pt/search.json b/app/javascript/dashboard/i18n/locale/pt/search.json
index 039060e40..cbec2d0ad 100644
--- a/app/javascript/dashboard/i18n/locale/pt/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "de",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index 7465dea9b..fc3e142d0 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -75,9 +75,9 @@
           "PLACEHOLDER": "Por favor, insira um endereço de e-mail do agente"
         },
         "AGENT_AVAILABILITY": {
-          "LABEL": "Disponibilidade",
-          "PLACEHOLDER": "Por favor selecione a disponibilidade do agente",
-          "ERROR": "Disponibilidade é obrigatória"
+          "LABEL": "Status do agente",
+          "PLACEHOLDER": "Por favor, selecione o status do agente",
+          "ERROR": "O status do agente é obrigatório!"
         },
         "SUBMIT": "Editar agente"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index 25b837d2f..c7f5db18b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Atributos Personalizados",
     "HEADER_BTN_TXT": "Criar atributo personalizado",
     "LOADING": "Buscando atributos",
-    "SIDEBAR_TXT": "<p><b>Atributos personalizados</b> <p>Um atributo personalizado rastreia fatos sobre seus contatos/conversa — como o plano de inscrição, ou quando eles compraram o primeiro item, etc. <br /><br />Para criar um atributo personalizado, basta clicar no <b>Criar atributo</b> Você também pode editar ou apagar um atributo já criado.</p>",
+    "SIDEBAR_TXT": "<p><b>Atributos personalizados</b> <p>Um atributo personalizado rastreia fatos sobre seus contatos/conversas — como o plano de inscrição, ou quando eles compraram o primeiro item, etc. <br /><br />Para criar um atributo personalizado, basta clicar em <b>\"Criar atributo\"</b> Você também pode editar ou apagar um atributo já criado.</p>",
     "ADD": {
       "TITLE": "Adicionar atributo personalizado",
       "SUBMIT": "Criar",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 788632ddb..5a49fbbcc 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Adicionar marcador",
         "PLACEHOLDER": "Pesquisar marcador ",
-        "NO_RESULT": "Nenhum rótulo encontrado"
+        "NO_RESULT": "Nenhum rótulo encontrado",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Mesclar contatos",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/csatMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/csatMgmt.json
index cd995cd7f..2a0eb38a1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/csatMgmt.json
@@ -3,7 +3,7 @@
     "TITLE": "Avalie sua conversa",
     "PLACEHOLDER": "Conte-nos mais...",
     "RATINGS": {
-      "POOR": "😞 Poor",
+      "POOR": "😞Ruim",
       "FAIR": "😑 Fair",
       "AVERAGE": "😐 Average",
       "GOOD": "😀 Good",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 76f19c79b..36e751b08 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Configurações da conta",
     "SUBMIT": "Atualizar configurações",
     "BACK": "Anterior",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Não foi possível atualizar as configurações, tente novamente!",
       "SUCCESS": "Configurações de conta atualizadas com sucesso"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index 767336911..54664ada4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Saiba mais",
-    "WROTE": "escreveu:"
+    "WROTE": "escreveu:",
+    "FROM": "De",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index afe242d30..9ae48bb57 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Adaugă etichete",
         "PLACEHOLDER": "Căutare etichete",
-        "NO_RESULT": "Nu s-au găsit etichete"
+        "NO_RESULT": "Nu s-au găsit etichete",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Îmbinare contact",
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 7c0f706bb..fd9d4bcac 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Setări cont",
     "SUBMIT": "Actualizați setările",
     "BACK": "Înapoi",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Nu s-au putut actualiza setările, încercați din nou!",
       "SUCCESS": "Setările contului actualizate cu succes"
diff --git a/app/javascript/dashboard/i18n/locale/ro/search.json b/app/javascript/dashboard/i18n/locale/ro/search.json
index e58eddadf..106339043 100644
--- a/app/javascript/dashboard/i18n/locale/ro/search.json
+++ b/app/javascript/dashboard/i18n/locale/ro/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Căutați după id-ul conversației, e-mail, numărul de telefon, mesajele pentru rezultate de căutare mai bune. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Citeşte mai mult",
-    "WROTE": "scrisese:"
+    "WROTE": "scrisese:",
+    "FROM": "de la",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index a41cc80e6..0f02ddd63 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Добавить метки",
         "PLACEHOLDER": "Поиск меток",
-        "NO_RESULT": "Метки не найдены"
+        "NO_RESULT": "Метки не найдены",
+        "CREATE_LABEL": "Создать новую метку"
       }
     },
     "MERGE_CONTACT": "Объединить контакты",
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 660c846db..52acebec3 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Настройки аккаунта",
     "SUBMIT": "Изменить настройки",
     "BACK": "Назад",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Не удалось обновить настройки, попробуйте снова!",
       "SUCCESS": "Настройки аккаунта обновлены"
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
index 3fe578801..347f1396e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/search.json
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Поиск по идентификатору разговора, электронной почте, номеру телефона, сообщениям для улучшения результатов поиска. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Читать далее",
-    "WROTE": "написал:"
+    "WROTE": "написал:",
+    "FROM": "от",
+    "EMAIL": "почта"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index feb6f0595..b96b76fb0 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/sh/search.json b/app/javascript/dashboard/i18n/locale/sh/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/sh/search.json
+++ b/app/javascript/dashboard/i18n/locale/sh/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 9b38e6ee3..7e48e32ce 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Pridaj označenia",
         "PLACEHOLDER": "Hľadaj označenia",
-        "NO_RESULT": "Žiadne označenia neboli nájdené"
+        "NO_RESULT": "Žiadne označenia neboli nájdené",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Zlúčiť kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 380108d1d..62a0f75ec 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Nastavenia účtu",
     "SUBMIT": "Aktualizovať nastavenia",
     "BACK": "Späť",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Nastavenia sa nepodarilo aktualizovať, skúste to znova!",
       "SUCCESS": "Úspešne aktualizované nastavenia účtu"
diff --git a/app/javascript/dashboard/i18n/locale/sk/search.json b/app/javascript/dashboard/i18n/locale/sk/search.json
index ebe6a5877..11102ba60 100644
--- a/app/javascript/dashboard/i18n/locale/sk/search.json
+++ b/app/javascript/dashboard/i18n/locale/sk/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "od",
+    "EMAIL": "e-mail"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 63cad5f39..d2a94fc9d 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Dodaj oznake",
         "PLACEHOLDER": "Pretraži oznake",
-        "NO_RESULT": "Oznake nisu pronađene"
+        "NO_RESULT": "Oznake nisu pronađene",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Spoji kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 87c5632ab..a88912178 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Podešavanja naloga",
     "SUBMIT": "Primeni izmene",
     "BACK": "Nazad",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Nije bilo moguće primeniti izmene, pokušajte ponovo!",
       "SUCCESS": "Izmene podešavanja naloga su uspešno primenjene"
diff --git a/app/javascript/dashboard/i18n/locale/sr/search.json b/app/javascript/dashboard/i18n/locale/sr/search.json
index ee1054b81..99b1652f2 100644
--- a/app/javascript/dashboard/i18n/locale/sr/search.json
+++ b/app/javascript/dashboard/i18n/locale/sr/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "od",
+    "EMAIL": "e-pošta"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 76fef5d23..dec80f87c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Lägg till etiketter",
         "PLACEHOLDER": "Sök etiketter",
-        "NO_RESULT": "Inga etiketter hittades"
+        "NO_RESULT": "Inga etiketter hittades",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Slå samman kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 2585e34e2..04ae7f297 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Kontoinställningar",
     "SUBMIT": "Uppdatera inställningar",
     "BACK": "Tillbaka",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Kunde inte uppdatera inställningar, försök igen!",
       "SUCCESS": "Uppdaterade kontoinställningar"
diff --git a/app/javascript/dashboard/i18n/locale/sv/search.json b/app/javascript/dashboard/i18n/locale/sv/search.json
index b47abcd2b..8e032e851 100644
--- a/app/javascript/dashboard/i18n/locale/sv/search.json
+++ b/app/javascript/dashboard/i18n/locale/sv/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "från",
+    "EMAIL": "e-post"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index df4b8bf1b..27eddc0bf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 2177121a2..7d0675d93 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "கணக்கு அமைப்புகள்",
     "SUBMIT": "அமைப்புகளைப் புதுப்பிக்கவும்",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "அமைப்புகளைப் புதுப்பிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்!",
       "SUCCESS": "கணக்கு அமைப்புகளை வெற்றிகரமாக புதுப்பிக்கப்பட்டுள்ளது"
diff --git a/app/javascript/dashboard/i18n/locale/ta/search.json b/app/javascript/dashboard/i18n/locale/ta/search.json
index 1c97153f6..243c0da2c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/search.json
+++ b/app/javascript/dashboard/i18n/locale/ta/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "இமெயில்"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index f11f5540b..d00e7e4db 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "เพิ่มหัวข้อ",
         "PLACEHOLDER": "ค้นหาหัวข้อ",
-        "NO_RESULT": "ไม่พบหัวข้อ"
+        "NO_RESULT": "ไม่พบหัวข้อ",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "รวมผู้ติดต่อ",
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 2a4b8af39..501884c41 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "ตั้งค่าบัญชี",
     "SUBMIT": "อัพเดทการตั้งค่า",
     "BACK": "ย้อนกลับ",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "ไม่สามารถอัพเดทการตั้งค่าได้ ลองอีกครั้งสิ",
       "SUCCESS": "อัพเดทการตั้งค่าบัญชีเเล้ว"
diff --git a/app/javascript/dashboard/i18n/locale/th/search.json b/app/javascript/dashboard/i18n/locale/th/search.json
index 7893d47c7..da078584b 100644
--- a/app/javascript/dashboard/i18n/locale/th/search.json
+++ b/app/javascript/dashboard/i18n/locale/th/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "บอท",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "จาก",
+    "EMAIL": "อีเมล์"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 7cb4bae37..3b27276a7 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Etiketler ekleyin",
         "PLACEHOLDER": "Etiketleri ara",
-        "NO_RESULT": "Etiket bulunamadı"
+        "NO_RESULT": "Etiket bulunamadı",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Kişileri birleştir",
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 214b9e3a5..acb93da21 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Hesap ayarları",
     "SUBMIT": "Ayarları güncelle",
     "BACK": "Geri",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Ayarlar güncellenemedi, tekrar deneyin!",
       "SUCCESS": "Hesap ayarları başarıyla güncellendi"
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
index 56ac34436..9b9da380c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/search.json
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "dan",
+    "EMAIL": "e-Posta"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index a4bc31746..2fa32372e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Додати мітки",
         "PLACEHOLDER": "Пошук міток",
-        "NO_RESULT": "Міток не знайдено"
+        "NO_RESULT": "Міток не знайдено",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Об'єднати",
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index fc0686e2b..a2bc2eacf 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Налаштування облікового запису",
     "SUBMIT": "Оновити налаштування",
     "BACK": "Назад",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Не вдалося оновити налаштування, спробуйте ще раз!",
       "SUCCESS": "Налаштування облікового запису успішно оновлено"
diff --git a/app/javascript/dashboard/i18n/locale/uk/search.json b/app/javascript/dashboard/i18n/locale/uk/search.json
index 8875bb8ed..d9c90c366 100644
--- a/app/javascript/dashboard/i18n/locale/uk/search.json
+++ b/app/javascript/dashboard/i18n/locale/uk/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Пошук бесід по id, email, тел. номеру, повідомлень для кращого пошуку результатів. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Детальніше",
-    "WROTE": "написав(ла):"
+    "WROTE": "написав(ла):",
+    "FROM": "від",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index 37d1b9564..49a5cf943 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "لیبلز شامل کریں۔",
         "PLACEHOLDER": "لیبل تلاش کریں۔",
-        "NO_RESULT": "کوئی لیبل نہیں ملے"
+        "NO_RESULT": "کوئی لیبل نہیں ملے",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "کانٹیکٹ ضم کریں۔",
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 585485618..5357ed9b1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/ur/search.json b/app/javascript/dashboard/i18n/locale/ur/search.json
index 70e76b0d2..deec7dfd7 100644
--- a/app/javascript/dashboard/i18n/locale/ur/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index feb6f0595..b96b76fb0 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Add Labels",
         "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "NO_RESULT": "No labels found",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index de41110c0..349d840e2 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
     "BACK": "Back",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/search.json b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 4bfc409f1..75586d3dd 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "Thêm nhãn",
         "PLACEHOLDER": "Tìm nhãn",
-        "NO_RESULT": "Không tìm thấy nhãn"
+        "NO_RESULT": "Không tìm thấy nhãn",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Hợp nhất liên hệ",
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index f2db5fd33..b392920a5 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "Cài đặt tài khoản",
     "SUBMIT": "Cập nhật cài đặt",
     "BACK": "Trờ về",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "Không thể cập nhật cài đặt, hãy thử lại!",
       "SUCCESS": "Đã cập nhật thành công cài đặt tài khoản"
diff --git a/app/javascript/dashboard/i18n/locale/vi/search.json b/app/javascript/dashboard/i18n/locale/vi/search.json
index d36731de7..7cb7aef71 100644
--- a/app/javascript/dashboard/i18n/locale/vi/search.json
+++ b/app/javascript/dashboard/i18n/locale/vi/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "từ",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 1cf2f2bdb..e2956dd59 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "添加标签",
         "PLACEHOLDER": "搜索标签",
-        "NO_RESULT": "未找到标签"
+        "NO_RESULT": "未找到标签",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "合并联系人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 5d5f02d59..bc27cf5c9 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "帐户设置",
     "SUBMIT": "更新设置",
     "BACK": "后退",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "无法更新设置，请重试！",
       "SUCCESS": "已成功更新账户设置"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
index bc2db4e70..b8bd13bb4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "机器人",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "发自",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index d7c08c7b1..34810ea0c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -33,7 +33,8 @@
       "LABEL_SELECT": {
         "TITLE": "新增標籤",
         "PLACEHOLDER": "搜尋標籤",
-        "NO_RESULT": "查無標籤"
+        "NO_RESULT": "查無標籤",
+        "CREATE_LABEL": "Create new label"
       }
     },
     "MERGE_CONTACT": "Merge contact",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 4d3a5c308..dae183feb 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -3,6 +3,7 @@
     "TITLE": "帳戶設定",
     "SUBMIT": "更新設定",
     "BACK": "返回",
+    "DISMISS": "Dismiss",
     "UPDATE": {
       "ERROR": "無法更新設定，請重試！",
       "SUCCESS": "已成功更新帳戶設定"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/search.json b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
index fe5bb472c..eba9aee8e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "機器人",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index 1248dc308..479ea496f 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -252,7 +252,7 @@ export default {
 .context-menu--delete-modal {
   ::v-deep {
     .modal-container {
-      max-width: 48rem;
+      max-width: 30rem;
 
       h2 {
         font-weight: var(--font-weight-medium);
diff --git a/app/javascript/dashboard/modules/notes/components/AddNote.vue b/app/javascript/dashboard/modules/notes/components/AddNote.vue
index 86f046a13..0ebeb2fba 100644
--- a/app/javascript/dashboard/modules/notes/components/AddNote.vue
+++ b/app/javascript/dashboard/modules/notes/components/AddNote.vue
@@ -72,7 +72,7 @@ export default {
   }
 
   &::v-deep .ProseMirror-woot-style {
-    max-height: 36rem;
+    max-height: 22.5rem;
   }
 }
 
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index cd72625fd..9ccc79ea8 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -222,8 +222,8 @@ export default {
 }
 .search-root {
   margin: 0 auto;
-  max-width: 72rem;
-  min-height: 32rem;
+  max-width: 45rem;
+  min-height: 20rem;
   width: 100%;
   height: 100%;
   padding: var(--space-normal);
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
index d1bddeb6f..c5229ce56 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
@@ -129,13 +129,13 @@ export default {
         max-width: 100%;
 
         .chat-bubble {
-          border-radius: 2rem;
+          border-radius: 1.25rem;
           box-shadow: var(--shadow-medium);
           color: var(--white);
           display: inline-block;
           font-size: var(--font-size-nano);
           line-height: 1.5;
-          padding: 1.3rem 1.75rem;
+          padding: 0.8125rem 1.09375rem;
           text-align: left;
 
           p {
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
index f74b1e349..3f01e0a9e 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
@@ -70,7 +70,7 @@ export default {
     background: white;
 
     &.is-focused {
-      box-shadow: 0 0 0 0.1rem var(--color-woot), 0 0 0.2rem 0.2rem var(--w-100);
+      box-shadow: 0 0 0 1px var(--color-woot), 0 0 2px 2px var(--w-100);
     }
   }
 
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index edd090626..3f8d6b7ec 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -2,7 +2,7 @@
   <section class="contacts-table-wrap">
     <ve-table
       :fixed-header="true"
-      max-height="calc(100vh - 11.4rem)"
+      max-height="calc(100vh - 7.125rem)"
       scroll-width="187rem"
       :columns="columns"
       :table-data="tableData"
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 4193740be..60c97e738 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -225,24 +225,24 @@ export default {
 
     .search-icon {
       height: var(--font-size-medium);
-      line-height: 3.6rem;
+      line-height: 2.25rem;
       font-size: var(--font-size-small);
       color: var(--b-700);
     }
   }
   .contact-search {
     margin: 0;
-    height: 3.8rem;
+    height: 2.375rem;
     width: 100%;
     font-size: var(--font-size-small);
     padding-left: calc(var(--space-large) + var(--space-smaller));
-    padding-right: 6rem;
+    padding-right: 3.75rem;
     border-color: var(--s-100);
   }
 
   .button {
     margin-left: var(--space-small);
-    height: 3.2rem;
+    height: 2rem;
     right: var(--space-smaller);
     position: absolute;
     padding: 0 var(--space-small);
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index cdbcecdb7..f3f2305e7 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -305,7 +305,7 @@ export default {
 
   .label {
     color: #fff;
-    padding: 0.2rem;
+    padding: 0.125rem;
   }
 }
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
index f31fb505b..15c7ae201 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
@@ -69,9 +69,9 @@ export default {
 <style lang="scss" scoped>
 .macro-preview {
   position: absolute;
-  max-height: 36rem;
+  max-height: 22.5rem;
   min-height: var(--space-jumbo);
-  width: 27.2rem;
+  width: 17rem;
   border-radius: var(--border-radius-normal);
   background-color: var(--white);
   box-shadow: var(--shadow-dropdown-pane);
@@ -93,7 +93,7 @@ export default {
     }
 
     .macro-block-border {
-      top: 0.625rem;
+      top: 0.390625rem;
       position: absolute;
       bottom: var(--space-minus-smaller);
       left: 0;
@@ -103,13 +103,13 @@ export default {
 
     .macro-block-dot {
       position: absolute;
-      left: -0.35rem;
+      left: -0.21875rem;
       height: var(--space-small);
       width: var(--space-small);
       border: 2px solid var(--s-100);
       background-color: var(--white);
       border-radius: var(--border-radius-full);
-      top: 0.4375rem;
+      top: 0.2734375rem;
     }
   }
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 808eb4320..266f49247 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -381,7 +381,7 @@ export default {
 .contact-input {
   display: flex;
   align-items: center;
-  height: 3.9rem;
+  height: 2.4735rem;
   background: var(--color-background-light);
   border: 1px solid var(--color-border);
   padding: var(--space-smaller) var(--space-small);
@@ -395,7 +395,7 @@ export default {
 }
 
 .message-input {
-  min-height: 8rem;
+  min-height: 5rem;
 }
 
 .row.gutter-small {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributeDropDown.vue b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributeDropDown.vue
index 19a17c15f..be976b2a6 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributeDropDown.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributeDropDown.vue
@@ -105,7 +105,7 @@ export default {
   display: flex;
   flex-direction: column;
   width: 100%;
-  max-height: 20rem;
+  max-height: 12.5rem;
 
   .search-wrap {
     margin-bottom: var(--space-small);
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
index 72a83cce6..2fece6f33 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
@@ -156,7 +156,7 @@ export default {
   display: flex;
 
   .name-wrap {
-    max-width: 20rem;
+    max-width: 12.5rem;
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
index 172c8f250..35f208341 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
@@ -118,7 +118,7 @@ export default {
 
 .name-wrap {
   display: flex;
-  max-width: 22rem;
+  max-width: 13.75rem;
 
   .text-block-title {
     font-weight: var(--font-weight-bold);
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
index 30c67fb73..81a531751 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
@@ -80,7 +80,7 @@ export default {
 .edit-article--container {
   margin: var(--space-large) auto;
   padding: 0 var(--space-medium);
-  max-width: 89.6rem;
+  max-width: 56rem;
   width: 100%;
 }
 
@@ -89,7 +89,7 @@ export default {
   font-weight: var(--font-weight-bold);
   width: 100%;
   min-height: var(--space-jumbo);
-  max-height: 64rem;
+  max-height: 40rem;
   height: auto;
   margin-bottom: var(--space-small);
   border: 0px solid transparent;
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 0f148211a..c6b8011ef 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -180,7 +180,7 @@ export default {
 }
 .dropdown-pane--open {
   top: var(--space-larger);
-  right: 14.8rem;
+  right: 9.25rem;
 }
 .selected-value {
   display: inline-flex;
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
index 729c641e7..aa57f47c0 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
@@ -92,7 +92,7 @@ export default {
   background-color: var(--white);
   border-radius: var(--border-radius-normal);
   box-shadow: var(--shadow-large);
-  max-width: 48rem;
+  max-width: 30rem;
   z-index: var(--z-index-high);
 
   header {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
index a8de55770..f437ec176 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
@@ -227,7 +227,7 @@ export default {
 .article-settings--container {
   flex: 0.3;
   min-width: var(--space-giga);
-  max-width: 36rem;
+  max-width: 22.5rem;
   overflow-y: auto;
   border-left: 1px solid var(--color-border-light);
   margin-left: var(--space-normal);
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index 7b5340a65..19a4c7818 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -248,7 +248,7 @@ export default {
 .notification-wrap {
   flex-direction: column;
   height: 90vh;
-  width: 52rem;
+  width: 32.5rem;
   background-color: var(--white);
   border-radius: var(--border-radius-medium);
   position: absolute;
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
index 0c9553275..63c20b4a8 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
@@ -195,17 +195,17 @@ export default {
 }
 
 .thumbnail--column {
-  width: 5.2rem;
+  width: 3.25rem;
 }
 
 .timestamp--column {
-  min-width: 13rem;
+  min-width: 8.125rem;
   text-align: right;
 }
 
 .notification-contant--wrap {
   flex-direction: column;
-  max-width: 50rem;
+  max-width: 31.25rem;
 }
 
 .notification--message-title {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue
index 838a599f6..a4710815a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue
@@ -110,11 +110,11 @@ export default {
   position: absolute;
   bottom: 0;
   width: 100%;
-  padding: 1rem;
+  padding: 0.625rem;
   background-color: #e0bbbb;
   display: flex;
   align-items: center;
-  font-size: 1.2rem;
+  font-size: 0.75rem;
   justify-content: center;
   flex-shrink: 0;
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
index 15073e76e..0d3bdb1e0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
@@ -228,14 +228,14 @@ export default {
 
 .item {
   padding-left: 0;
-  max-width: 10rem;
-  min-width: 8rem;
+  max-width: 6.25rem;
+  min-width: 5rem;
 }
 
 .item-description {
   padding-left: 0;
-  max-width: 16rem;
-  min-width: 10rem;
+  max-width: 10rem;
+  min-width: 6.25rem;
 }
 
 .key {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index 997317515..bf9753599 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -141,7 +141,7 @@ export default {
   flex-direction: column;
 
   .remote-address {
-    width: 14rem;
+    width: 8.75rem;
   }
 
   .wrap-break-words {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
index b09b23f24..56493f2b2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
@@ -365,6 +365,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .ProseMirror-woot-style {
-  height: 8rem;
+  height: 5rem;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
index bd7b43aec..d1d84c5a5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
@@ -314,6 +314,6 @@ export default {
   justify-content: space-evenly;
   display: flex;
   flex-direction: row;
-  min-width: 20rem;
+  min-width: 12.5rem;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
index af17dc079..952fb4368 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
@@ -281,6 +281,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .ProseMirror-woot-style {
-  height: 8rem;
+  height: 5rem;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index 10c17a003..058b74ec6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -141,7 +141,7 @@ export default {
   }
 
   .ProseMirror-woot-style {
-    min-height: 20rem;
+    min-height: 12.5rem;
 
     p {
       font-size: var(--font-size-default);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 063fba23b..8e08f0f87 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -145,7 +145,7 @@ export default {
   }
 
   .ProseMirror-woot-style {
-    min-height: 20rem;
+    min-height: 12.5rem;
 
     p {
       font-size: var(--font-size-default);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 4912ea03f..c4043386b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -209,7 +209,7 @@ export default {
 </script>
 <style scoped>
 .short-code {
-  width: 14rem;
+  width: 8.75rem;
 }
 .wrap-break-words {
   word-break: break-all;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 5e1e55cff..be6792f32 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -23,6 +23,7 @@
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_UPDATE_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_UPDATE_SUB_TEXT')"
+        :show-border="false"
       >
         <woot-avatar-uploader
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AVATAR.LABEL')"
@@ -258,7 +259,7 @@
             }}
           </p>
         </label>
-        <div class="medium-9 settings-item settings-item">
+        <div class="medium-9 settings-item">
           <label>
             {{ $t('INBOX_MGMT.HELP_CENTER.LABEL') }}
           </label>
@@ -313,7 +314,7 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_FILE_PICKER') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="settings-item settings-item">
+        <div v-if="isAWebWidgetInbox" class="settings-item">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -324,7 +325,7 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_EMOJI_PICKER') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="settings-item settings-item">
+        <div v-if="isAWebWidgetInbox" class="settings-item">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -335,7 +336,7 @@
             {{ $t('INBOX_MGMT.FEATURES.ALLOW_END_CONVERSATION') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="settings-item settings-item">
+        <div v-if="isAWebWidgetInbox" class="settings-item">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -346,7 +347,54 @@
             {{ $t('INBOX_MGMT.FEATURES.USE_INBOX_AVATAR_FOR_BOT') }}
           </label>
         </div>
-
+      </settings-section>
+      <settings-section
+        v-if="isAWebWidgetInbox || isAnEmailChannel"
+        :title="$t('INBOX_MGMT.EDIT.SENDER_NAME_SECTION.TITLE')"
+        :sub-title="$t('INBOX_MGMT.EDIT.SENDER_NAME_SECTION.SUB_TEXT')"
+        :show-border="false"
+      >
+        <div class="medium-9 settings-item">
+          <sender-name-example-preview
+            :sender-name-type="senderNameType"
+            :business-name="businessName"
+            @update="toggleSenderNameType"
+          />
+          <div class="business-section">
+            <woot-button
+              variant="clear"
+              color-scheme="primary"
+              @click="onClickShowBusinessNameInput"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.BUSINESS_NAME.BUTTON_TEXT'
+                )
+              }}
+            </woot-button>
+            <div v-if="showBusinessNameInput" class="business-name-input">
+              <input
+                ref="businessNameInput"
+                v-model="businessName"
+                :placeholder="
+                  $t(
+                    'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.BUSINESS_NAME.PLACEHOLDER'
+                  )
+                "
+                type="text"
+              />
+              <woot-button color-scheme="primary" @click="updateInbox">
+                {{
+                  $t(
+                    'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.BUSINESS_NAME.SAVE_BUTTON_TEXT'
+                  )
+                }}
+              </woot-button>
+            </div>
+          </div>
+        </div>
+      </settings-section>
+      <settings-section :show-border="false">
         <woot-submit-button
           v-if="isAPIInbox"
           type="submit"
@@ -405,6 +453,7 @@ import CollaboratorsPage from './settingsPage/CollaboratorsPage';
 import WidgetBuilder from './WidgetBuilder';
 import BotConfiguration from './components/BotConfiguration';
 import { FEATURE_FLAGS } from '../../../../featureFlags';
+import SenderNameExamplePreview from './components/SenderNameExamplePreview';
 
 export default {
   components: {
@@ -418,6 +467,7 @@ export default {
     SettingsSection,
     WeeklyAvailability,
     WidgetBuilder,
+    SenderNameExamplePreview,
   },
   mixins: [alertMixin, configMixin, inboxMixin],
   data() {
@@ -429,6 +479,8 @@ export default {
       greetingMessage: '',
       emailCollectEnabled: false,
       csatSurveyEnabled: false,
+      senderNameType: 'friendly',
+      businessName: '',
       locktoSingleConversation: false,
       allowMessagesAfterResolved: true,
       continuityViaEmail: true,
@@ -441,6 +493,7 @@ export default {
       replyTime: '',
       selectedTabIndex: 0,
       selectedPortalSlug: '',
+      showBusinessNameInput: false,
     };
   },
   computed: {
@@ -621,6 +674,8 @@ export default {
         this.greetingMessage = this.inbox.greeting_message || '';
         this.emailCollectEnabled = this.inbox.enable_email_collect;
         this.csatSurveyEnabled = this.inbox.csat_survey_enabled;
+        this.senderNameType = this.inbox.sender_name_type;
+        this.businessName = this.inbox.business_name;
         this.allowMessagesAfterResolved = this.inbox.allow_messages_after_resolved;
         this.continuityViaEmail = this.inbox.continuity_via_email;
         this.channelWebsiteUrl = this.inbox.website_url;
@@ -650,6 +705,8 @@ export default {
               ).id
             : null,
           lock_to_single_conversation: this.locktoSingleConversation,
+          sender_name_type: this.senderNameType,
+          business_name: this.businessName || null,
           channel: {
             widget_color: this.inbox.widget_color,
             website_url: this.channelWebsiteUrl,
@@ -694,6 +751,17 @@ export default {
         );
       }
     },
+    toggleSenderNameType(key) {
+      this.senderNameType = key;
+    },
+    onClickShowBusinessNameInput() {
+      this.showBusinessNameInput = !this.showBusinessNameInput;
+      if (this.showBusinessNameInput) {
+        this.$nextTick(() => {
+          this.$refs.businessNameInput.focus();
+        });
+      }
+    },
   },
   validations: {
     webhookUrl: {
@@ -717,12 +785,6 @@ export default {
     }
   }
 
-  .settings--content {
-    div:last-child {
-      border-bottom: 0;
-    }
-  }
-
   .tabs {
     padding: 0;
     margin-bottom: -1px;
@@ -742,4 +804,22 @@ export default {
     padding-bottom: var(--space-smaller);
   }
 }
+
+.business-section {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: var(--space-small);
+  margin-top: var(--space-small);
+
+  .business-name-input {
+    display: flex;
+    gap: var(--space-small);
+    width: 80%;
+
+    input {
+      margin-bottom: 0;
+    }
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
index 5fd351053..a7e760cc3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
@@ -456,7 +456,7 @@ export default {
     flex-direction: column;
     align-items: center;
     justify-content: flex-end;
-    min-height: 65rem;
+    min-height: 40.625rem;
     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);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
index 119dd149a..c40ae3393 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
@@ -204,7 +204,7 @@ export default {
 <style lang="scss" scoped>
 .day-wrap::v-deep .multiselect {
   margin: 0;
-  width: 12rem;
+  width: 7.5rem;
 
   > .multiselect__tags {
     padding-left: var(--space-slab);
@@ -266,7 +266,7 @@ export default {
 .day {
   font-size: var(--font-size-small);
   font-weight: var(--font-weight-medium);
-  width: 13rem;
+  width: 8.125rem;
 }
 
 .label {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
new file mode 100644
index 000000000..33d3e4749
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
@@ -0,0 +1,161 @@
+<template>
+  <div class="sender-name--preview-container">
+    <button
+      v-for="keyOption in senderNameKeyOptions"
+      :key="keyOption.key"
+      class="preview-button"
+      @click="toggleSenderNameType(keyOption.key)"
+    >
+      <preview-card
+        :heading="keyOption.heading"
+        :content="keyOption.content"
+        :active="keyOption.key === senderNameType"
+      >
+        <div class="sender-name--preview-content">
+          <span class="text">
+            {{ $t('INBOX_MGMT.EDIT.SENDER_NAME_SECTION.FOR_EG') }}
+          </span>
+          <div class="sender-name--preview">
+            <thumbnail :username="userName(keyOption)" size="32px" />
+            <div class="preview-card--content">
+              <div class="sender-name--preview">
+                <span v-if="isKeyOptionFriendly(keyOption.key)" class="name">
+                  {{ keyOption.preview.senderName }}
+                </span>
+                <span v-if="isKeyOptionFriendly(keyOption.key)" class="text">
+                  {{ $t('INBOX_MGMT.EDIT.SENDER_NAME_SECTION.FRIENDLY.FROM') }}
+                </span>
+                <span class="name text-truncate">
+                  {{ businessName || keyOption.preview.businessName }}
+                </span>
+              </div>
+              <span class="text">{{ keyOption.preview.email }}</span>
+            </div>
+          </div>
+        </div>
+      </preview-card>
+    </button>
+  </div>
+</template>
+
+<script>
+import PreviewCard from 'dashboard/components/ui/PreviewCard';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail';
+
+export default {
+  components: {
+    PreviewCard,
+    Thumbnail,
+  },
+  props: {
+    senderNameType: {
+      type: String,
+      default: 'friendly',
+    },
+    businessName: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      senderNameKeyOptions: [
+        {
+          key: 'friendly',
+          heading: this.$t(
+            'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.FRIENDLY.TITLE'
+          ),
+          content: this.$t(
+            'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.FRIENDLY.SUBTITLE'
+          ),
+          preview: {
+            senderName: 'Smith',
+            businessName: 'Chatwoot',
+            email: '<support@yourbusiness.com>',
+          },
+        },
+        {
+          key: 'professional',
+          heading: this.$t(
+            'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.PROFESSIONAL.TITLE'
+          ),
+          content: this.$t(
+            'INBOX_MGMT.EDIT.SENDER_NAME_SECTION.PROFESSIONAL.SUBTITLE'
+          ),
+          preview: {
+            senderName: '',
+            businessName: 'Chatwoot',
+            email: '<support@yourbusiness.com>',
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    isKeyOptionFriendly(key) {
+      return key === 'friendly';
+    },
+    userName(keyOption) {
+      return this.isKeyOptionFriendly(keyOption.key)
+        ? keyOption.preview.senderName
+        : keyOption.preview.businessName;
+    },
+    toggleSenderNameType(key) {
+      this.$emit('update', key);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.sender-name--preview-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: var(--space-normal);
+
+  .sender-name--preview-content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    padding: var(--space-slab);
+    gap: var(--space-small);
+  }
+}
+
+.preview-button {
+  color: var(--s-700);
+
+  .text {
+    font-size: var(--font-size-mini);
+  }
+
+  .sender-name--preview {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: var(--space-small);
+
+    .preview-card--content {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      gap: var(--space-smaller);
+
+      .sender-name--preview {
+        align-items: center;
+        display: flex;
+        flex-direction: row;
+        gap: var(--space-micro);
+        max-width: 18rem;
+
+        .name {
+          font-size: var(--font-size-mini);
+          font-weight: var(--font-weight-bold);
+          line-height: 1.2;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
index 533a514f7..4dc886cdd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
@@ -188,7 +188,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .timezone-input-wrap {
-  max-width: 60rem;
+  max-width: 37.5rem;
 
   &::v-deep .multiselect {
     margin-top: var(--space-small);
@@ -196,7 +196,7 @@ export default {
 }
 
 .unavailable-input-wrap {
-  max-width: 60rem;
+  max-width: 37.5rem;
 
   textarea {
     min-height: var(--space-jumbo);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
index c16e95e67..c76c68665 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
@@ -138,13 +138,13 @@ export default {
     transform: translateX(0);
   }
   25% {
-    transform: translateX(0.375rem);
+    transform: translateX(0.234375rem);
   }
   50% {
-    transform: translateX(-0.375rem);
+    transform: translateX(-0.234375rem);
   }
   75% {
-    transform: translateX(0.375rem);
+    transform: translateX(0.234375rem);
   }
   100% {
     transform: translateX(0);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
index 076dad07b..d7b203487 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
@@ -101,7 +101,7 @@ export default {
   padding: var(--space-slab);
   background-color: var(--white);
   // full screen height subtracted by the height of the header
-  height: calc(100vh - 5.6rem);
+  height: calc(100vh - 3.5rem);
   display: flex;
   flex-direction: column;
   border-left: 1px solid var(--s-50);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
index 557f239dc..67fd0d378 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
@@ -112,7 +112,7 @@ export default {
 <style lang="scss">
 .profile--settings--row {
   .ProseMirror-woot-style {
-    height: 8rem;
+    height: 5rem;
   }
 
   .editor-root {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
index 1f1a0da94..b7ba18157 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="csat--table-container">
     <ve-table
-      max-height="calc(100vh - 35rem)"
+      max-height="calc(100vh - 21.875rem)"
       :fixed-header="true"
       :columns="columns"
       :table-data="tableData"
@@ -194,7 +194,7 @@ export default {
   color: var(--b-600);
   display: flex;
   font-size: var(--font-size-small);
-  height: 20rem;
+  height: 12.5rem;
   justify-content: center;
   margin-top: -1px;
   width: 100%;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
index a856dbe88..802e2ee5c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
@@ -160,7 +160,7 @@ $heatmap-hover-border-color: (
   level-6: var(--w-700),
 );
 
-$tile-height: 3rem;
+$tile-height: 1.875rem;
 $tile-gap: var(--space-smaller);
 $container-gap-row: var(--space-one);
 $container-gap-column: var(--space-two);
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 8f4866ddb..03506fb01 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
@@ -1,7 +1,7 @@
 <template>
   <div class="agent-table-container">
     <ve-table
-      max-height="calc(100vh - 35rem)"
+      max-height="calc(100vh - 21.875rem)"
       :fixed-header="true"
       :columns="columns"
       :table-data="tableData"
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 026d51d55..96f431cbe 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -90,7 +90,9 @@ export const mutations = {
     { lastActivityAt, conversationId }
   ) {
     const [chat] = _state.allConversations.filter(c => c.id === conversationId);
-    Vue.set(chat, 'last_activity_at', lastActivityAt);
+    if (chat) {
+      Vue.set(chat, 'last_activity_at', lastActivityAt);
+    }
   },
   [types.ASSIGN_PRIORITY](_state, { priority, conversationId }) {
     const [chat] = _state.allConversations.filter(c => c.id === conversationId);
diff --git a/app/javascript/shared/assets/stylesheets/border-radius.scss b/app/javascript/shared/assets/stylesheets/border-radius.scss
index 76ea3c731..5fefbb5ac 100644
--- a/app/javascript/shared/assets/stylesheets/border-radius.scss
+++ b/app/javascript/shared/assets/stylesheets/border-radius.scss
@@ -1,8 +1,8 @@
 :root {
-  --border-radius-small: 0.3rem;
-  --border-radius-normal: 0.5rem;
-  --border-radius-medium: 0.7rem;
-  --border-radius-large: 0.9rem;
-  --border-radius-full: 10rem;
+  --border-radius-small: 0.1875rem;
+  --border-radius-normal: 0.3125rem;
+  --border-radius-medium: 0.4375rem;
+  --border-radius-large: 0.5625rem;
+  --border-radius-full: 6.25rem;
   --border-radius-rounded: 50%;
 }
diff --git a/app/javascript/shared/assets/stylesheets/font-size.scss b/app/javascript/shared/assets/stylesheets/font-size.scss
index d431abb8c..77406a5ca 100644
--- a/app/javascript/shared/assets/stylesheets/font-size.scss
+++ b/app/javascript/shared/assets/stylesheets/font-size.scss
@@ -1,14 +1,14 @@
 :root {
-  --font-size-nano: 0.8rem;
-  --font-size-micro: 1rem;
-  --font-size-mini: 1.2rem;
-  --font-size-small: 1.4rem;
-  --font-size-default: 1.6rem;
-  --font-size-medium: 1.8rem;
-  --font-size-two: 2rem;
-  --font-size-large: 2.2rem;
-  --font-size-big: 2.4rem;
-  --font-size-bigger: 3rem;
-  --font-size-mega: 3.4rem;
-  --font-size-giga: 4rem;
+  --font-size-nano: 0.5rem;
+  --font-size-micro: 0.625rem;
+  --font-size-mini: 0.75rem;
+  --font-size-small: 0.875rem;
+  --font-size-default: 1rem;
+  --font-size-medium: 1.125rem;
+  --font-size-two: 1.25rem;
+  --font-size-large: 1.375rem;
+  --font-size-big: 1.5rem;
+  --font-size-bigger: 1.875rem;
+  --font-size-mega: 2.125rem;
+  --font-size-giga: 2.5rem;
 }
diff --git a/app/javascript/shared/assets/stylesheets/shadows.scss b/app/javascript/shared/assets/stylesheets/shadows.scss
index 1fe65aa20..ef086f93d 100644
--- a/app/javascript/shared/assets/stylesheets/shadows.scss
+++ b/app/javascript/shared/assets/stylesheets/shadows.scss
@@ -9,8 +9,8 @@
     --shadow-larger: 0 20px 25px -5px rgba(0, 0, 0, 0.1),
         0 10px 10px -5px rgba(0, 0, 0, 0.04);
     --shadow-dropdown-pane:
-        0 0.8rem 1.6rem rgb(50 50 93 / 8%),
-        0 0.4rem 1.2rem rgb(0 0 0 / 7%);
+        0 0.5rem 1rem rgb(50 50 93 / 8%),
+        0 0.25rem 0.75rem 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 / 30%) 0px 10px 38px -10px,
diff --git a/app/javascript/shared/assets/stylesheets/spacing.scss b/app/javascript/shared/assets/stylesheets/spacing.scss
index e593e1338..aad1e5b27 100644
--- a/app/javascript/shared/assets/stylesheets/spacing.scss
+++ b/app/javascript/shared/assets/stylesheets/spacing.scss
@@ -1,33 +1,33 @@
 :root {
   // spaces
   --space-zero: 0;
-  --space-micro: 0.2rem;
-  --space-smaller: 0.4rem;
-  --space-small: 0.8rem;
-  --space-one: 1rem;
-  --space-slab: 1.2rem;
-  --space-snug: 1.4rem;
-  --space-normal: 1.6rem;
-  --space-two: 2rem;
-  --space-medium: 2.4rem;
-  --space-large: 3.2rem;
-  --space-larger: 4.8rem;
-  --space-jumbo: 6.4rem;
-  --space-mega: 10rem;
-  --space-giga: 24rem;
+  --space-micro: 0.125rem;
+  --space-smaller: 0.25rem;
+  --space-small: 0.5rem;
+  --space-one: 0.625rem;
+  --space-slab: 0.75rem;
+  --space-snug: 0.875rem;
+  --space-normal: 1rem;
+  --space-two: 1.25rem;
+  --space-medium: 1.5rem;
+  --space-large: 2rem;
+  --space-larger: 3rem;
+  --space-jumbo: 4rem;
+  --space-mega: 6.25rem;
+  --space-giga: 15rem;
 
-  --space-minus-micro: -0.2rem;
-  --space-minus-smaller: -0.4rem;
-  --space-minus-half: -0.5rem;
-  --space-minus-small: -0.8rem;
-  --space-minus-one: -1rem;
-  --space-minus-slab: -1.2rem;
-  --space-minus-snug: -1.4rem;
-  --space-minus-normal: -1.6rem;
-  --space-minus-two: -2rem;
-  --space-minus-medium: -2.4rem;
-  --space-minus-large: -3.2rem;
-  --space-minus-larger: -4.8rem;
-  --space-minus-jumbo: -6.4rem;
-  --space-minus-mega: -10rem;
+  --space-minus-micro: -0.125rem;
+  --space-minus-smaller: -0.25rem;
+  --space-minus-half: -0.3125rem;
+  --space-minus-small: -0.5rem;
+  --space-minus-one: -0.625rem;
+  --space-minus-slab: -0.75rem;
+  --space-minus-snug: -0.875rem;
+  --space-minus-normal: -1rem;
+  --space-minus-two: -1.25rem;
+  --space-minus-medium: -1.5rem;
+  --space-minus-large: -2rem;
+  --space-minus-larger: -3rem;
+  --space-minus-jumbo: -4rem;
+  --space-minus-mega: -6.25rem;
 }
diff --git a/app/javascript/shared/components/ui/MultiselectDropdown.vue b/app/javascript/shared/components/ui/MultiselectDropdown.vue
index ed2f2da4d..c6bb5e187 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdown.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdown.vue
@@ -177,7 +177,7 @@ export default {
 
   .dropdown-pane {
     box-sizing: border-box;
-    top: 4.2rem;
+    top: 2.625rem;
     width: 100%;
   }
 }
diff --git a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
index 1990388b7..130e63ad9 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
@@ -131,7 +131,7 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
-  max-height: 20rem;
+  max-height: 12.5rem;
 }
 
 .search-wrap {
@@ -164,7 +164,7 @@ export default {
 
 .multiselect-dropdown--list {
   width: 100%;
-  max-height: 16rem;
+  max-height: 10rem;
 }
 
 .multiselect-dropdown--item {
diff --git a/app/javascript/shared/components/ui/label/LabelDropdown.vue b/app/javascript/shared/components/ui/label/LabelDropdown.vue
index e15c93714..c5a98d56e 100644
--- a/app/javascript/shared/components/ui/label/LabelDropdown.vue
+++ b/app/javascript/shared/components/ui/label/LabelDropdown.vue
@@ -191,7 +191,7 @@ export default {
   display: flex;
   flex-direction: column;
   width: 100%;
-  max-height: 20rem;
+  max-height: 12.5rem;
 
   .search-wrap {
     margin-bottom: var(--space-small);
diff --git a/app/javascript/shared/mixins/specs/automationFixtures.js b/app/javascript/shared/mixins/specs/automationFixtures.js
index 99bb9fd9d..81a53ad25 100644
--- a/app/javascript/shared/mixins/specs/automationFixtures.js
+++ b/app/javascript/shared/mixins/specs/automationFixtures.js
@@ -390,6 +390,7 @@ export const inboxes = [
     working_hours_enabled: false,
     enable_email_collect: true,
     csat_survey_enabled: true,
+    sender_name_type: 0,
     enable_auto_assignment: true,
     out_of_office_message:
       'We are unavailable at the moment. Leave a message we will respond once we are back.',
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 9dc2825b2..bc63d8e2a 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -66,7 +66,9 @@
         "LABEL": "رقم الهاتف",
         "PLACEHOLDER": "الرجاء إدخال رقم الهاتف الخاص بك",
         "REQUIRED_ERROR": "رقم الهاتف مطلوب",
-        "VALID_ERROR": "يجب أن يكون رقم الهاتف من E.164 مثال: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "لم يتم العثور على النتائج"
       },
       "MESSAGE": {
         "LABEL": "رسالة",
diff --git a/app/javascript/widget/i18n/locale/bg.json b/app/javascript/widget/i18n/locale/bg.json
index 0751d48a8..86287ce58 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -66,7 +66,9 @@
         "LABEL": "Телефон",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Няма намерени резултати"
       },
       "MESSAGE": {
         "LABEL": "Съобщение",
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 96b2c5c5d..dc4a0c727 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -66,7 +66,9 @@
         "LABEL": "Número de telèfon",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No s'ha trobat agents"
       },
       "MESSAGE": {
         "LABEL": "Missatge",
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index acaf7a805..9da127d20 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonní číslo",
         "PLACEHOLDER": "Zadejte prosím Vaše telefonní číslo",
         "REQUIRED_ERROR": "Telefonní číslo je vyžadováno",
-        "VALID_ERROR": "Telefonní číslo by mělo být ve formátu E.164, např.: +141555555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Žádné výsledky"
       },
       "MESSAGE": {
         "LABEL": "Zpráva",
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 6ba026f0f..926efa5d0 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonnummer",
         "PLACEHOLDER": "Indtast venligst dit telefonnummer",
         "REQUIRED_ERROR": "Telefonnummer er påkrævet",
-        "VALID_ERROR": "Telefonnummer skal være i E.164 format fx: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Ingen resultater fundet"
       },
       "MESSAGE": {
         "LABEL": "Besked",
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index fa0fa7529..b30cad52a 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonnummer",
         "PLACEHOLDER": "Bitte geben Sie ihre Telefonnummer ein",
         "REQUIRED_ERROR": "Telefonnummer ist erforderlich",
-        "VALID_ERROR": "Die Telefonnummer sollte im E.164-Format vorliegen, z. B.: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Keine Ergebnisse gefunden"
       },
       "MESSAGE": {
         "LABEL": "Nachricht",
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index 4ac6f2907..a0fd2cefa 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -66,7 +66,9 @@
         "LABEL": "Αριθμός Τηλεφώνου",
         "PLACEHOLDER": "Παρακαλώ εισάγετε τον αριθμό του τηλεφώνου σας",
         "REQUIRED_ERROR": "Απαιτείται ο αριθμός τηλεφώνου",
-        "VALID_ERROR": "Ο αριθμός τηλεφώνου πρέπει να έχει μορφή E.164 π.χ.: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Δεν βρέθηκαν αποτελέσματα"
       },
       "MESSAGE": {
         "LABEL": "Μήνυμα",
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index a2271d939..35963fe78 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -66,7 +66,9 @@
         "LABEL": "Número telefónico",
         "PLACEHOLDER": "Por favor ingrese su número de teléfono",
         "REQUIRED_ERROR": "El número de teléfono es obligatorio",
-        "VALID_ERROR": "El número de teléfono debe ser de formato E.164 por ejemplo: +5493995777777"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No se encontraron resultados"
       },
       "MESSAGE": {
         "LABEL": "Mensaje",
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 67ab75c88..79e8330e3 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -66,7 +66,9 @@
         "LABEL": "شماره تلفن",
         "PLACEHOLDER": "لطفا شماره تلفن خود را وارد کنید",
         "REQUIRED_ERROR": "شماره تلفن مورد نیاز است",
-        "VALID_ERROR": "شماره تلفن باید با فرمت E.164 باشد، به عنوان مثال: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "نتیجه‌ای یافت نشد"
       },
       "MESSAGE": {
         "LABEL": "پیام",
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index 0070ad3b1..7bd82b403 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -66,7 +66,9 @@
         "LABEL": "Puhelinnumero",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 11b40d846..bb80b8b33 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -66,7 +66,9 @@
         "LABEL": "Numéro de téléphone",
         "PLACEHOLDER": "Veuillez saisir votre numéro de téléphone",
         "REQUIRED_ERROR": "Le numéro de téléphone est obligatoire",
-        "VALID_ERROR": "Le numéro de téléphone doit être au format E.164. Ex : +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Aucun résultat trouvé"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/he.json b/app/javascript/widget/i18n/locale/he.json
index 62a78a62d..52ed2c82f 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -66,7 +66,9 @@
         "LABEL": "מספר טלפון",
         "PLACEHOLDER": "אנא הזן את מספר הטלפון שלך",
         "REQUIRED_ERROR": "נדרש מספר טלפון",
-        "VALID_ERROR": "מספר הטלפון צריך להיות בפורמט E.164, למשל: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "לא נמצאו תוצאות"
       },
       "MESSAGE": {
         "LABEL": "הודעה",
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index de94b33a3..67843ddda 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/hr.json b/app/javascript/widget/i18n/locale/hr.json
index de94b33a3..c32cb40bb 100644
--- a/app/javascript/widget/i18n/locale/hr.json
+++ b/app/javascript/widget/i18n/locale/hr.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Nisu pronađeni rezultati"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 36aa980d5..2158d57ca 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonszám",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Nincs találat"
       },
       "MESSAGE": {
         "LABEL": "Üzenet",
diff --git a/app/javascript/widget/i18n/locale/hy.json b/app/javascript/widget/i18n/locale/hy.json
index de94b33a3..67843ddda 100644
--- a/app/javascript/widget/i18n/locale/hy.json
+++ b/app/javascript/widget/i18n/locale/hy.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index aa37d5ec0..0df8126d7 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -66,7 +66,9 @@
         "LABEL": "Nomor Telpon",
         "PLACEHOLDER": "Masukan Nomor Telepon",
         "REQUIRED_ERROR": "Nomor Telepon Dibutuhkan",
-        "VALID_ERROR": "Nomor telepon harus dalam format E.164 misalnya: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Tidak ada hasil ditemukan"
       },
       "MESSAGE": {
         "LABEL": "Pesan",
diff --git a/app/javascript/widget/i18n/locale/is.json b/app/javascript/widget/i18n/locale/is.json
index 77a62efc8..8ad4ee1a8 100644
--- a/app/javascript/widget/i18n/locale/is.json
+++ b/app/javascript/widget/i18n/locale/is.json
@@ -66,7 +66,9 @@
         "LABEL": "Símanúmer",
         "PLACEHOLDER": "Vinsamlegast sláðu inn símanúmerið þitt",
         "REQUIRED_ERROR": "Það verður að skrifa símanúmer",
-        "VALID_ERROR": "Símanúmerið þarf að vera á E.164 sniðmáti, t.d. +3547776666"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Engar niðurstöður fundust"
       },
       "MESSAGE": {
         "LABEL": "Skilaboð",
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 75a1cbb24..05fdf0fc3 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -66,7 +66,9 @@
         "LABEL": "Numero di telefono",
         "PLACEHOLDER": "Inserisci il tuo numero di telefono",
         "REQUIRED_ERROR": "Il numero di telefono è obbligatorio",
-        "VALID_ERROR": "Il numero di telefono deve essere nel formato E.164 es.: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Nessun risultato trovato"
       },
       "MESSAGE": {
         "LABEL": "Messaggio",
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 50e865fbd..2579c1b5a 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -66,7 +66,9 @@
         "LABEL": "電話番号",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "メッセージ",
diff --git a/app/javascript/widget/i18n/locale/ka.json b/app/javascript/widget/i18n/locale/ka.json
index de94b33a3..67843ddda 100644
--- a/app/javascript/widget/i18n/locale/ka.json
+++ b/app/javascript/widget/i18n/locale/ka.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index a8344abc0..93ed1ee64 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -66,7 +66,9 @@
         "LABEL": "전화 번호",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "검색 결과가 없습니다"
       },
       "MESSAGE": {
         "LABEL": "메시지",
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index f6377ac17..4b650f45d 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefono numeris",
         "PLACEHOLDER": "Prašau įveskite jūsų telefono numerį",
         "REQUIRED_ERROR": "Telefono Numeris yra reikalingas",
-        "VALID_ERROR": "Telefono numeris turi būti E.164 formato pvz: +3705555555"
+        "DIAL_CODE_VALID_ERROR": "Prašome pasirinkti šalies kodą",
+        "VALID_ERROR": "Prašau įveskite teisingą telefono numerį",
+        "DROPDOWN_EMPTY": "Nieko nerasta"
       },
       "MESSAGE": {
         "LABEL": "Žinutė",
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
index aa9f0e196..a88b9b26c 100644
--- a/app/javascript/widget/i18n/locale/lv.json
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefona numurs",
         "PLACEHOLDER": "Lūdzu, ievadiet savu tālruņa numuru",
         "REQUIRED_ERROR": "Nepieciešams tālruņa numurs",
-        "VALID_ERROR": "Tālruņa numuram ir jābūt E.164 formātā, piemēram: +37155555555"
+        "DIAL_CODE_VALID_ERROR": "Lūdzu, izvēlieties valsts kodu",
+        "VALID_ERROR": "Lūdzu ievadiet derīgu telefona numuru",
+        "DROPDOWN_EMPTY": "Nav atrasts"
       },
       "MESSAGE": {
         "LABEL": "Ziņojums",
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index e93c18845..46f9b7a57 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -66,7 +66,9 @@
         "LABEL": "ഫോൺ നമ്പർ",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "ഒരു ഫലവും കണ്ടെത്താനായില്ല"
       },
       "MESSAGE": {
         "LABEL": "സന്ദേശം",
diff --git a/app/javascript/widget/i18n/locale/ms.json b/app/javascript/widget/i18n/locale/ms.json
index f60b4550a..2c7111058 100644
--- a/app/javascript/widget/i18n/locale/ms.json
+++ b/app/javascript/widget/i18n/locale/ms.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Tiada dijumpa"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index 10a9191ea..e20a895c3 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 2afdf44d3..1402f420a 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefoonnummer",
         "PLACEHOLDER": "Vul je telefoonnummer in",
         "REQUIRED_ERROR": "Telefoon nummer is vereist",
-        "VALID_ERROR": "Telefoonnummer moet van E.164-formaat zijn: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Geen resultaten gevonden"
       },
       "MESSAGE": {
         "LABEL": "Bericht",
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 903c53c80..f3993a170 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonnummer",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Melding",
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 56b60a309..5ca82100d 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -66,7 +66,9 @@
         "LABEL": "Numer telefonu",
         "PLACEHOLDER": "Wprowadź numer telefonu",
         "REQUIRED_ERROR": "Numer telefonu jest wymagany",
-        "VALID_ERROR": "Numer telefonu powinien być w formacie E.164 tj. +48123456789"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Brak wyników"
       },
       "MESSAGE": {
         "LABEL": "Wiadomość",
@@ -85,8 +87,8 @@
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Wyszukaj emoji",
+    "NOT_FOUND": "Nie znaleziono emoji pasującego do wyszukiwania"
   },
   "CSAT": {
     "TITLE": "Oceń udzielone Ci wsparcie",
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 33f2ebd66..2dd283fef 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -66,7 +66,9 @@
         "LABEL": "Número de telefone",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Nenhum resultado encontrado"
       },
       "MESSAGE": {
         "LABEL": "Messagem",
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 7f82eb4b8..0281ea3e4 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -66,7 +66,9 @@
         "LABEL": "Número de Telefone",
         "PLACEHOLDER": "Por favor, digite seu número de telefone",
         "REQUIRED_ERROR": "O número de telefone é obrigatório",
-        "VALID_ERROR": "Número de telefone deve ser do formato E.164, por exemplo: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Nenhum resultado encontrado"
       },
       "MESSAGE": {
         "LABEL": "Messagem",
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index b6000ea01..8e026088d 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -66,7 +66,9 @@
         "LABEL": "Număr de telefon",
         "PLACEHOLDER": "Te rugăm să introduci numărul de telefon",
         "REQUIRED_ERROR": "Numărul de telefon este obligatoriu",
-        "VALID_ERROR": "Numărul de telefon trebuie să aibă formatul E.164, ex. +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Niciun rezultat găsit"
       },
       "MESSAGE": {
         "LABEL": "Mesaj",
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 03a251f41..b5fcadd9d 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -66,7 +66,9 @@
         "LABEL": "Номер телефона",
         "PLACEHOLDER": "Пожалуйста, введите ваш номер телефона",
         "REQUIRED_ERROR": "Требуется указать номер телефона",
-        "VALID_ERROR": "Номер телефона должен быть в формате E.164, например: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Пожалуйста выберите код страны",
+        "VALID_ERROR": "Пожалуйста, введите действительный номер телефона",
+        "DROPDOWN_EMPTY": "Результаты не найдены"
       },
       "MESSAGE": {
         "LABEL": "Сообщение",
diff --git a/app/javascript/widget/i18n/locale/sh.json b/app/javascript/widget/i18n/locale/sh.json
index de94b33a3..67843ddda 100644
--- a/app/javascript/widget/i18n/locale/sh.json
+++ b/app/javascript/widget/i18n/locale/sh.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 2f14d9c58..077d4f782 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefónne číslo",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Žiadne výsledky neboli nájdené"
       },
       "MESSAGE": {
         "LABEL": "Správa",
diff --git a/app/javascript/widget/i18n/locale/sr.json b/app/javascript/widget/i18n/locale/sr.json
index 7ca065584..5cf5f78eb 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -66,7 +66,9 @@
         "LABEL": "Broj telefona",
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Ništa nije pronađeno"
       },
       "MESSAGE": {
         "LABEL": "Poruka",
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 156590515..129cf1a26 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefonnummer",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Inga resultat hittades"
       },
       "MESSAGE": {
         "LABEL": "Meddelande",
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index f3f10df86..ce767ca79 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index e697dc928..ad5bb3a43 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -66,7 +66,9 @@
         "LABEL": "หมายเลขโทรศัพท์",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "ข้อความ",
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index 57e641761..e72b66a0c 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -66,7 +66,9 @@
         "LABEL": "Telefon numarası",
         "PLACEHOLDER": "Lütfen telefon numaranızı yazınız",
         "REQUIRED_ERROR": "Telefon numarası zorunludur",
-        "VALID_ERROR": "Telefon numarası E.164 formatında olmalıdır örn: +905555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Sonuç bulunamadı"
       },
       "MESSAGE": {
         "LABEL": "Mesaj",
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index dff144f3f..20118b2ce 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -66,7 +66,9 @@
         "LABEL": "Номер телефону",
         "PLACEHOLDER": "Будь ласка, введіть номер телефону",
         "REQUIRED_ERROR": "Номер телефону є обов'язковим",
-        "VALID_ERROR": "Номер телефону має бути в форматі E.164; наприклад: + 1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Результатів не знайдено"
       },
       "MESSAGE": {
         "LABEL": "Текст повідомлення",
diff --git a/app/javascript/widget/i18n/locale/ur.json b/app/javascript/widget/i18n/locale/ur.json
index 170b1971a..2e20bead2 100644
--- a/app/javascript/widget/i18n/locale/ur.json
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "کوئی نتیجہ نہیں"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/ur_IN.json b/app/javascript/widget/i18n/locale/ur_IN.json
index de94b33a3..67843ddda 100644
--- a/app/javascript/widget/i18n/locale/ur_IN.json
+++ b/app/javascript/widget/i18n/locale/ur_IN.json
@@ -66,7 +66,9 @@
         "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"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "Message",
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index ff58cbaa2..5df2fca00 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -66,7 +66,9 @@
         "LABEL": "Số điện thoại",
         "PLACEHOLDER": "\u001dVui lòng nhập số điện thoại của bạn",
         "REQUIRED_ERROR": "Cần phải nhập số điện thoại",
-        "VALID_ERROR": "Số điện thoại nên theo định dạng E.164, ví dụ: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "Không tìm thấy kết quả"
       },
       "MESSAGE": {
         "LABEL": "Tin nhắn",
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index fe04b9a81..2013a8cf5 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -66,7 +66,9 @@
         "LABEL": "电话号码",
         "PLACEHOLDER": "Please enter your phone number",
         "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "消息",
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index ee09cb9b5..a81640d27 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -66,7 +66,9 @@
         "LABEL": "聯絡人電話",
         "PLACEHOLDER": "請輸入您的電話號碼",
         "REQUIRED_ERROR": "電話號碼為必填",
-        "VALID_ERROR": "電話號碼應為 E.164  格式，如：+1415555555"
+        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "VALID_ERROR": "Please enter a valid phone number",
+        "DROPDOWN_EMPTY": "No results found"
       },
       "MESSAGE": {
         "LABEL": "訊息",
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index d1b185dd1..99749ea95 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -79,14 +79,31 @@ class ConversationReplyMailer < ApplicationMailer
     @conversation.messages.chat.where.not(message_type: :incoming)&.last
   end
 
-  def sender_name
-    @sender_name ||= current_message&.sender&.available_name || @agent&.available_name || 'Notifications'
+  def sender_name(sender_email)
+    if @inbox.friendly?
+      I18n.t('conversations.reply.email.header.friendly_name', sender_name: custom_sender_name, business_name: business_name,
+                                                               from_email: sender_email)
+    else
+      I18n.t('conversations.reply.email.header.professional_name', business_name: business_name, from_email: sender_email)
+    end
   end
 
   def current_message
     @message || @conversation.messages.outgoing.last
   end
 
+  def custom_sender_name
+    current_message&.sender&.available_name || @agent&.available_name || 'Notifications'
+  end
+
+  def business_name
+    @inbox.business_name || @inbox.name
+  end
+
+  def from_email
+    should_use_conversation_email_address? ? parse_email(@account.support_email) : parse_email(inbox_from_email_address)
+  end
+
   def mail_subject
     subject = @conversation.additional_attributes['mail_subject']
     return "[##{@conversation.display_id}] #{I18n.t('conversations.reply.email_subject')}" if subject.nil?
@@ -101,26 +118,18 @@ class ConversationReplyMailer < ApplicationMailer
 
   def reply_email
     if should_use_conversation_email_address?
-      I18n.t('conversations.reply.email.header.reply_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
-                                                                 reply_email: "#{@conversation.uuid}@#{@account.inbound_email_domain}")
+      sender_name("reply+#{@conversation.uuid}@#{@account.inbound_email_domain}")
     else
       @inbox.email_address || @agent&.email
     end
   end
 
   def from_email_with_name
-    if should_use_conversation_email_address?
-      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
-                                                                from_email: parse_email(@account.support_email))
-    else
-      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
-                                                                from_email: parse_email(inbox_from_email_address))
-    end
+    sender_name(from_email)
   end
 
   def channel_email_with_name
-    I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
-                                                                       from_email: @channel.email)
+    sender_name(@channel.email)
   end
 
   def parse_email(email_string)
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 592ac0923..fcafc2ff0 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -7,6 +7,7 @@
 #  id                            :integer          not null, primary key
 #  allow_messages_after_resolved :boolean          default(TRUE)
 #  auto_assignment_config        :jsonb
+#  business_name                 :string
 #  channel_type                  :string
 #  csat_survey_enabled           :boolean          default(FALSE)
 #  email_address                 :string
@@ -17,6 +18,7 @@
 #  lock_to_single_conversation   :boolean          default(FALSE), not null
 #  name                          :string           not null
 #  out_of_office_message         :string
+#  sender_name_type              :integer          default("friendly"), not null
 #  timezone                      :string           default("UTC")
 #  working_hours_enabled         :boolean          default(FALSE)
 #  created_at                    :datetime         not null
@@ -69,6 +71,8 @@ class Inbox < ApplicationRecord
   has_many :webhooks, dependent: :destroy_async
   has_many :hooks, dependent: :destroy_async, class_name: 'Integrations::Hook'
 
+  enum sender_name_type: { friendly: 0, professional: 1 }
+
   after_destroy :delete_round_robin_agents
 
   scope :order_by_name, -> { order('lower(name) ASC') }
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index a82e63bc9..09db8fdc4 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -16,6 +16,8 @@ json.timezone resource.timezone
 json.callback_webhook_url resource.callback_webhook_url
 json.allow_messages_after_resolved resource.allow_messages_after_resolved
 json.lock_to_single_conversation resource.lock_to_single_conversation
+json.sender_name_type resource.sender_name_type
+json.business_name resource.business_name
 
 if resource.portal.present?
   json.help_center do
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b4ea686d9..c83718201 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -160,6 +160,8 @@ en:
         header:
           from_with_name: "%{assignee_name} from %{inbox_name} <%{from_email}>"
           reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
+          friendly_name: "%{sender_name} from %{business_name} <%{from_email}>"
+          professional_name: "%{business_name} <%{from_email}>"
       channel_email:
         header:
           reply_with_name: "%{assignee_name} from %{inbox_name} <%{from_email}>"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 98d1618cd..ae4606f96 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -21,12 +21,12 @@ pl:
   messages:
     reset_password_success: Woot! Prośba o zresetowanie hasła zakończona pomyślnie. Sprawdź swoją pocztę, aby uzyskać instrukcje.
     reset_password_failure: Ups! Nie mogliśmy znaleźć żadnego użytkownika z podanym adresem e-mail.
-    inbox_deletetion_response: Your inbox deletion request will be processed in some time.
+    inbox_deletetion_response: Żądanie usunięcia skrzynki odbiorczej zostanie rozpatrzone za jakiś czas.
   errors:
     validations:
-      presence: must not be blank
+      presence: nie może być puste
     webhook:
-      invalid: Invalid events
+      invalid: Nieprawidłowe zdarzenia
     signup:
       disposable_email: Nie zezwalamy na jednorazowe konta e-mail
       invalid_email: Wprowadzono nieprawidłowy adres e-mail
@@ -34,35 +34,35 @@ pl:
       failed: Rejestracja nie powiodła się
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Nieprawidłowy typ danych
     contacts:
       import:
         failed: Plik jest pusty
       export:
-        success: We will notify you once contacts export file is ready to view.
+        success: Powiadomimy Cię, gdy plik eksportu kontaktów będzie gotowy do wyświetlenia.
       email:
-        invalid: Invalid email
+        invalid: Nieprawidłowy adres e-mail
       phone_number:
-        invalid: should be in e164 format
+        invalid: powinno być w formacie e164
     categories:
       locale:
-        unique: should be unique in the category and portal
+        unique: powinno być unikalne w kategorii i portalu
     dyte:
-      invalid_message_type: "Invalid message type. Action not permitted"
+      invalid_message_type: "Nieprawidłowy typ wiadomości. Niedozwolone działanie."
     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: Sprawdź połączenie sieciowe, adres IMAP i spróbuj ponownie.
+        no_response_error: Sprawdź poświadczenia IMAP i spróbuj ponownie.
+        host_unreachable_error: Host nieosiągalny, sprawdź adres IMAP, port IMAP i spróbuj ponownie.
+        connection_timed_out_error: Limit czasu połączenia dla %{address}:%{port}
+        connection_closed_error: Połączenie zakończone.
       validations:
-        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+        name: nie powinno zaczynać się ani kończyć symbolami i nie powinno zawierać znaków < > / \ @.
     custom_filters:
-      number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
+      number_of_records: Osiągnięto limit. Maksymalna liczba dozwolonych filtrów niestandardowych dla użytkownika na konto wynosi 50.
   reports:
     period: Okres raportowania od %{since} do %{until}
-    utc_warning: The report generated is in UTC timezone
+    utc_warning: Generowany raport jest w strefie czasowej UTC
     agent_csv:
       agent_name: Nazwa agenta
       conversations_count: Liczba rozmów
@@ -85,7 +85,7 @@ pl:
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     conversation_traffic_csv:
-      timezone: Timezone
+      timezone: Strefa czasowa
     default_group_by: dnia
     csat:
       headers:
@@ -106,21 +106,21 @@ pl:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} wspomniał o Tobie w historii: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: Ta historia już nie jest dostępna.
       deleted: Ta wiadomość została usunięta
     activity:
       status:
         resolved: "Rozmowa została oznaczona przez %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "Rozmowa została rozwiązana przez %{contact_name}"
         open: "Rozmowa została ponownie otwarta przez %{user_name}"
         pending: "Rozmowa została oznaczona jako oczekująca przez %{user_name}"
         snoozed: "Rozmowa została uśpiona przez %{user_name}"
         auto_resolved: "Rozmowa została oznaczona przez system jako rozwiązana z powodu %{duration} dni bezczynności"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: System otworzył ponownie rozmowę z powodu nowej wiadomości przychodzącej.
       priority:
-        added: '%{user_name} set the priority to %{new_priority}'
-        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
-        removed: '%{user_name} removed the priority'
+        added: '%{user_name} ustawił priorytet na %{new_priority}'
+        updated: '%{user_name} zmienił priorytet z %{old_priority} na %{new_priority}'
+        removed: '%{user_name} usunął priorytet'
       assignee:
         self_assigned: "%{user_name} przypisał się do tej rozmowy"
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
@@ -158,8 +158,8 @@ pl:
   integration_apps:
     dyte:
       name: "Dyte"
-      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
-      meeting_name: "%{agent_name} has started a meeting"
+      description: "Dyte to narzędzie, które pomaga dodać dźwięk i wideo na żywo do aplikacji za pomocą zaledwie kilku linijek kodu. Ta integracja pozwala dać agentom możliwość prowadzenia rozmów wideo lub głosowych z klientami bez opuszczania Chatwoot."
+      meeting_name: "%{agent_name} rozpoczął spotkanie"
     slack:
       name: "Slack"
       description: "Slack to narzędzie czatu, które łączy całą Twoją komunikację w jednym miejscu. Integrując Slack, możesz otrzymywać powiadomienia o wszystkich nowych rozmowach na swoim koncie bezpośrednio wewnątrz Slack."
@@ -167,34 +167,34 @@ pl:
       name: "Webhooki"
       description: "Webhooki dostarczają informacji o tym, co dzieje się na Twoim koncie do usług zewnętrznych. Możesz wykorzystać webhooki do przekazywania wydarzeń do ulubionych aplikacji, takich jak Slack lub Github. Kliknij na Konfiguruj, aby skonfigurować webhooki."
     dialogflow:
-      name: "Przepływ Dialogu"
-      description: "Zbuduj czatboty używając Dialogflow i szybko podłącz je do skrzynki odbiorczej. Pozwól botom na obsługę zapytań przed oddaniem ich agentowi obsługi klienta."
+      name: "Dialogflow"
+      description: "Twórz czatboty za pomocą Dialogflow i szybko łącz je ze swoją skrzynką odbiorczą. Pozwól botom obsługiwać zapytania, zanim przekażesz je agentowi obsługi klienta."
     fullcontact:
       name: "Pełny kontakt"
-      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: "Integracja FullContact pomaga wzbogacić profile odwiedzających. Zidentyfikuj użytkowników, gdy tylko udostępnią swój adres e-mail i zaoferuj im dostosowaną obsługę klienta. Połącz FullContact ze swoim kontem, udostępniając klucz API FullContact."
     google_translate:
-      name: "Google Translate"
-      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+      name: "Tłumacz Google"
+      description: "Ułatw agentom tłumaczenie wiadomości, dodając integrację z Tłumaczem Google. Tłumacz Google pomaga automatycznie zidentyfikować język i przekonwertować go na język wybrany przez agenta / administratora konta."
     openai:
       name: "OpenAI"
-      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
+      description: "Zintegruj potężne funkcje AI z Chatwoot, wykorzystując modele GPT od OpenAI."
   public_portal:
     search:
-      search_placeholder: Search for article by title or body...
+      search_placeholder: Wyszukaj artykuł według tytułu lub treści...
       empty_placeholder: Brak wyników.
-      loading_placeholder: Searching...
-      results_title: Search results
-    toc_header: 'On this page'
+      loading_placeholder: Wyszukiwanie...
+      results_title: Wyniki wyszukiwania
+    toc_header: 'Na tej stronie'
     hero:
-      sub_title: Search for the articles here or browse the categories below.
+      sub_title: Szukaj artykułów tutaj lub przeglądaj kategorie poniżej.
     common:
-      home: Home
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
-      articles: articles
-      no_articles: There are no articles here
+      home: Strona główna
+      last_updated_on: Ostatnia aktualizacja %{last_updated_on}
+      view_all_articles: Zobacz wszystkie artykuły
+      article: artykuł
+      articles: artykuły
+      no_articles: Nie ma tu żadnych artykułów
     footer:
-      made_with: Made with
+      made_with: Wykonane z
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Przejdź do strony głównej
diff --git a/db/migrate/20230525085402_add_custom_sender_name_toggle.rb b/db/migrate/20230525085402_add_custom_sender_name_toggle.rb
new file mode 100644
index 000000000..1491ee2b8
--- /dev/null
+++ b/db/migrate/20230525085402_add_custom_sender_name_toggle.rb
@@ -0,0 +1,5 @@
+class AddCustomSenderNameToggle < ActiveRecord::Migration[7.0]
+  def change
+    add_column :inboxes, :sender_name_type, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20230614044633_add_sender_name_to_in.rb b/db/migrate/20230614044633_add_sender_name_to_in.rb
new file mode 100644
index 000000000..a0dc3331f
--- /dev/null
+++ b/db/migrate/20230614044633_add_sender_name_to_in.rb
@@ -0,0 +1,5 @@
+class AddSenderNameToIn < ActiveRecord::Migration[7.0]
+  def change
+    add_column :inboxes, :business_name, :string, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 595604d2b..b8c552ab4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -584,6 +584,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_20_212340) do
     t.jsonb "auto_assignment_config", default: {}
     t.boolean "lock_to_single_conversation", default: false, null: false
     t.bigint "portal_id"
+    t.string "business_name"
+    t.integer "sender_name_type", default: 0, null: false
     t.index ["account_id"], name: "index_inboxes_on_account_id"
     t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
     t.index ["portal_id"], name: "index_inboxes_on_portal_id"
diff --git a/package.json b/package.json
index 63c61d01f..9b96b9018 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "md5": "^2.3.0",
     "ninja-keys": "^1.1.9",
     "opus-recorder": "^8.0.5",
+    "pinia": "^2.1.4",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.2.0",
     "semver": "7.3.5",
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 77f993cc2..e4bfac413 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -44,6 +44,7 @@ RSpec.describe ConversationReplyMailer do
                  bcc_emails: 'agent_bcc1@example.com'
                })
       end
+
       let(:private_message) { create(:message, account: account, content: 'This is a private message', conversation: conversation) }
       let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
       let(:cc_mail) { described_class.reply_with_summary(cc_message.conversation, message.id).deliver_now }
@@ -186,13 +187,84 @@ RSpec.describe ConversationReplyMailer do
         expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
-      it 'renders inbox name as sender and assignee not present' do
+      it 'renders inbox name as sender and assignee or business_name not present' do
         message.update(sender_id: nil)
         conversation.update(assignee_id: nil)
 
         mail = described_class.email_reply(message)
         expect(mail['from'].value).to eq "Notifications from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
+
+      context 'when friendly name enabled' do
+        before do
+          conversation.inbox.update(sender_name_type: 0)
+          conversation.inbox.update(business_name: 'Business Name')
+        end
+
+        it 'renders sender name as sender and assignee and business_name not present' do
+          message.update(sender_id: nil)
+          conversation.update(assignee_id: nil)
+          conversation.inbox.update(business_name: nil)
+
+          mail = described_class.email_reply(message)
+
+          expect(mail['from'].value).to eq "Notifications from #{conversation.inbox.name} <#{smtp_email_channel.email}>"
+        end
+
+        it 'renders sender name as sender and assignee nil and business_name present' do
+          message.update(sender_id: nil)
+          conversation.update(assignee_id: nil)
+
+          mail = described_class.email_reply(message)
+
+          expect(mail['from'].value).to eq(
+            "Notifications from #{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
+          )
+        end
+
+        it 'renders sender name as sender nil and assignee and business_name present' do
+          message.update(sender_id: nil)
+          conversation.update(assignee_id: agent.id)
+
+          mail = described_class.email_reply(message)
+          expect(mail['from'].value).to eq "#{agent.available_name} from #{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
+        end
+
+        it 'renders sender name as sender and assignee and business_name present' do
+          agent_2 = create(:user, email: 'agent2@example.com', account: account)
+          message.update(sender_id: agent_2.id)
+          conversation.update(assignee_id: agent.id)
+
+          mail = described_class.email_reply(message)
+          expect(mail['from'].value).to eq "#{agent_2.available_name} from #{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
+        end
+      end
+
+      context 'when friendly name disabled' do
+        before do
+          conversation.inbox.update(sender_name_type: 1)
+          conversation.inbox.update(business_name: 'Business Name')
+        end
+
+        it 'renders sender name as business_name not present' do
+          message.update(sender_id: nil)
+          conversation.update(assignee_id: nil)
+          conversation.inbox.update(business_name: nil)
+
+          mail = described_class.email_reply(message)
+
+          expect(mail['from'].value).to eq "#{conversation.inbox.name} <#{smtp_email_channel.email}>"
+        end
+
+        it 'renders sender name as business_name present' do
+          message.update(sender_id: nil)
+          conversation.update(assignee_id: nil)
+
+          mail = described_class.email_reply(message)
+
+          expect(mail['from'].value).to eq "#{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
+        end
+      end
     end
 
     context 'when smtp enabled for microsoft email channel' do
diff --git a/yarn.lock b/yarn.lock
index 2d70d93bf..c1dff2b95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6455,6 +6455,11 @@
   optionalDependencies:
     prettier "^1.18.2"
 
+"@vue/devtools-api@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07"
+  integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
+
 "@vue/reactivity-transform@3.3.4":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929"
@@ -15606,6 +15611,14 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
+pinia@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.4.tgz#a642adfe6208e10c36d3dc16184a91064788142a"
+  integrity sha512-vYlnDu+Y/FXxv1ABo1vhjC+IbqvzUdiUC3sfDRrRyY2CQSrqqaa+iiHmqtARFxJVqWQMCJfXx1PBvFs9aJVLXQ==
+  dependencies:
+    "@vue/devtools-api" "^6.5.0"
+    vue-demi ">=0.14.5"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -20215,6 +20228,11 @@ vue-color@2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
+vue-demi@>=0.14.5:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.5.tgz#676d0463d1a1266d5ab5cba932e043d8f5f2fbd9"
+  integrity sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==
+
 vue-docgen-api@^4.44.15:
   version "4.73.0"
   resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.73.0.tgz#13ef47c349374f5fd375093199085bd83e6b096c"