diff --git a/.env.example b/.env.example
index 7c5299bad..624a44a7b 100644
--- a/.env.example
+++ b/.env.example
@@ -39,17 +39,24 @@ POSTGRES_PASSWORD=
 RAILS_ENV=development
 RAILS_MAX_THREADS=5
 
-# Mail outgoing
-MAILER_SENDER_EMAIL=accounts@chatwoot.com
-SMTP_PORT=1025
+# The email from which all outgoing emails are sent
+# could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
+MAILER_SENDER_EMAIL=Chatwoot <accounts@chatwoot.com>
+
+
+#SMTP domain key is set up for HELO checking
 SMTP_DOMAIN=chatwoot.com
-# if you are running docker-compose, set SMTP_ADDRESS value as "mailhog",
-# else set the value as "localhost"
+# the default value is set "mailhog" and is used by docker-compose for development environments,
+# Set the value as "localhost" or your SMTP address in other environments
 SMTP_ADDRESS=mailhog
+SMTP_PORT=1025
 SMTP_USERNAME=
 SMTP_PASSWORD=
+# plain,login,cram_md5
 SMTP_AUTHENTICATION=
-SMTP_ENABLE_STARTTLS_AUTO=
+SMTP_ENABLE_STARTTLS_AUTO=true
+# Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
+SMTP_OPENSSL_VERIFY_MODE=peer
 
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
diff --git a/Gemfile.lock b/Gemfile.lock
index 5dbad5245..f235fe683 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,7 +133,7 @@ GEM
     bootsnap (1.4.8)
       msgpack (~> 1.0)
     brakeman (4.9.0)
-    browser (4.2.0)
+    browser (5.3.1)
     builder (3.2.4)
     bullet (6.1.0)
       activesupport (>= 3.0.0)
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 6c078d28f..7928a3d41 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -23,6 +23,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def update
     @inbox.update(inbox_update_params.except(:channel))
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
     return unless @inbox.channel.is_a?(Channel::WebWidget) && inbox_update_params[:channel].present?
 
     @inbox.channel.update!(inbox_update_params[:channel])
@@ -80,7 +81,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def inbox_update_params
     params.permit(:enable_auto_assignment, :name, :avatar, :greeting_message, :greeting_enabled,
-                  :working_hours_enabled, :out_of_office_message,
+                  :working_hours_enabled, :out_of_office_message, :timezone,
                   channel: [
                     :website_url,
                     :widget_color,
diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index 81b526c8e..b6e9237b9 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -10,20 +10,16 @@ class Platform::Api::V1::UsersController < PlatformController
     @resource.confirm
     @resource.save!
     @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
-    render json: @resource
   end
 
   def login
     render json: { url: "#{ENV['FRONTEND_URL']}/app/login?email=#{@resource.email}&sso_auth_token=#{@resource.generate_sso_auth_token}" }
   end
 
-  def show
-    render json: @resource
-  end
+  def show; end
 
   def update
     @resource.update!(user_params)
-    render json: @resource
   end
 
   def destroy
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index da634875a..44a23568e 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -6,8 +6,6 @@ class WidgetsController < ActionController::Base
   before_action :build_contact
   after_action :allow_iframe_requests
 
-  def index; end
-
   private
 
   def set_global_config
diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 159e77f0e..b520156a4 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -33,12 +33,17 @@ class ConversationApi extends ApiClient {
   }
 
   assignAgent({ conversationId, agentId }) {
-    axios.post(
+    return axios.post(
       `${this.url}/${conversationId}/assignments?assignee_id=${agentId}`,
       {}
     );
   }
 
+  assignTeam({ conversationId, teamId }) {
+    const params = { team_id: teamId };
+    return axios.post(`${this.url}/${conversationId}/assignments`, params);
+  }
+
   markMessageRead({ id }) {
     return axios.post(`${this.url}/${id}/update_last_seen`);
   }
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
index 31be5e87e..6d4cdeec4 100644
--- a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -11,6 +11,7 @@ describe('#ConversationAPI', () => {
     expect(conversationAPI).toHaveProperty('delete');
     expect(conversationAPI).toHaveProperty('toggleStatus');
     expect(conversationAPI).toHaveProperty('assignAgent');
+    expect(conversationAPI).toHaveProperty('assignTeam');
     expect(conversationAPI).toHaveProperty('markMessageRead');
     expect(conversationAPI).toHaveProperty('toggleTyping');
     expect(conversationAPI).toHaveProperty('mute');
diff --git a/app/javascript/dashboard/api/specs/teams.spec.js b/app/javascript/dashboard/api/specs/teams.spec.js
index 7622a5417..6b01ab359 100644
--- a/app/javascript/dashboard/api/specs/teams.spec.js
+++ b/app/javascript/dashboard/api/specs/teams.spec.js
@@ -11,5 +11,6 @@ describe('#TeamsAPI', () => {
     expect(teams).toHaveProperty('delete');
     expect(teams).toHaveProperty('getAgents');
     expect(teams).toHaveProperty('addAgents');
+    expect(teams).toHaveProperty('updateAgents');
   });
 });
diff --git a/app/javascript/dashboard/api/teams.js b/app/javascript/dashboard/api/teams.js
index 9c117c71b..ba202dff2 100644
--- a/app/javascript/dashboard/api/teams.js
+++ b/app/javascript/dashboard/api/teams.js
@@ -15,6 +15,12 @@ export class TeamsAPI extends ApiClient {
       user_ids: agentsList,
     });
   }
+
+  updateAgents({ teamId, agentsList }) {
+    return axios.patch(`${this.url}/${teamId}/team_members`, {
+      user_ids: agentsList,
+    });
+  }
 }
 
 export default new TeamsAPI();
diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index d76fef07d..d93c60aa4 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -44,3 +44,7 @@ code {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+.cursor-pointer {
+  cursor: pointer;
+}
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 79bc1ae29..e8862b5bf 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -89,7 +89,9 @@ $breakpoints: (small: 0,
   medium: 640px,
   large: 1024px,
   xlarge: 1200px,
-  xxlarge: 1440px);
+  xxlarge: 1400px,
+  xxxlarge: 1600px,
+);
 $print-breakpoint: large;
 $breakpoint-classes: (small medium large);
 
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index 480e31c61..36df6af14 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -13,17 +13,16 @@
 }
 
 .multiselect {
-  margin-bottom: $space-normal;
-  min-height: 38px;
+  margin-bottom: var(--space-normal);
 
-  &.multiselect--active {
+  .multiselect--active {
     >.multiselect__tags {
       border-color: $color-woot;
     }
   }
 
   .multiselect__select {
-    min-height: 44px;
+    min-height: 4.6rem;
     padding: 0;
     right: 0;
     top: 0;
@@ -39,16 +38,51 @@
     font-weight: $font-weight-normal;
 
     &.multiselect__option--highlight {
-      font-weight: $font-weight-medium;
+      background: var(--white);
+      color: var(--color-body);
+    }
+
+    &.multiselect__option--highlight:hover {
+      background: var(--w-50);
+      color: var(--color-body);
+
+      &::after {
+        background: var(--w-50);
+        color: var(--s-600);
+      }
+    }
+
+    &.multiselect__option--highlight::after {
+      background: transparent;
+    }
+
+    &.multiselect__option--selected {
+      background: var(--w-400);
+      color: var(--white);
+
+      &.multiselect__option--highlight:hover {
+        background: var(--w-600);
+        color: var(--white);
+
+        &::after {
+          background: transparent;
+          color: var(--white);
+
+          &:hover {
+            color: var(--color-body);
+          }
+        }
+      }
     }
   }
-}
 
-.multiselect>.multiselect__tags {
-  @include margin(0);
-  border: 1px solid $color-border;
-  min-height: 44px;
-  padding-top: $zero;
+  .multiselect__tags {
+    @include margin(0);
+    border: 1px solid $color-border;
+    border-color: $color-border;
+    min-height: 4.4rem;
+    padding-top: $zero;
+  }
 
   .multiselect__tags-wrap {
     display: inline-block;
@@ -59,7 +93,7 @@
   .multiselect__placeholder {
     color: $color-gray;
     font-weight: $font-weight-normal;
-    padding-top: $space-small;
+    padding-top: var(--space-slab);
   }
 
   .multiselect__tag {
@@ -79,31 +113,23 @@
     @include ghost-input;
     @include padding($zero);
     font-size: $font-size-small;
-
+    height: 4.4rem;
     margin-bottom: $zero;
   }
 
   .multiselect__single {
-    @include padding($space-one);
-
     margin-bottom: 0;
+    padding: var(--space-slab) var(--space-one);
   }
 }
 
 .sidebar-labels-wrap {
+
   &.has-edited,
   &:hover {
     .multiselect {
       cursor: pointer;
     }
-
-    .multiselect>.multiselect__tags {
-      border-color: $color-border;
-    }
-
-    .multiselect>.multiselect__select {
-      visibility: visible;
-    }
   }
 
   .multiselect {
@@ -120,3 +146,35 @@
     }
   }
 }
+
+
+.multiselect-wrap--small {
+  $multiselect-height: 3.8rem;
+
+  .multiselect__tags,
+  .multiselect__input,
+  .multiselect {
+    background: var(--white);
+    font-size: var(--font-size-small);
+    height: $multiselect-height;
+    min-height: $multiselect-height;
+  }
+
+  .multiselect__input {
+    height: $multiselect-height - $space-micro;
+    min-height: $multiselect-height - $space-micro;
+  }
+
+  .multiselect__single {
+    font-size: var(--font-size-small);
+    padding: var(--space-small) 0;
+  }
+
+  .multiselect__placeholder {
+    padding: var(--space-small) 0;
+  }
+
+  .multiselect__select {
+    min-height: $multiselect-height;
+  }
+}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 07089b399..a599721c2 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -2,12 +2,17 @@
   margin-bottom: 0;
 
   &.button--emoji {
+    align-items: center;
     background: var(--b-50);
     border: 1px solid var(--color-border-light);
     border-radius: var(--border-radius-large);
+    display: flex;
     font-size: var(--font-size-small);
-    margin-right: var(--space-small);
-    padding: var(--space-small);
+    height: var(--space-large);
+    justify-content: center;
+    padding: var(--space-micro);
+    text-align: center;
+    width: var(--space-large);
 
     &:hover {
       background: var(--b-200);
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index c6cc66c96..69363e542 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -43,10 +43,6 @@ $resolve-button-width: 13.2rem;
     @include flex;
     @include flex-align($x: center, $y: middle);
 
-    &.hide {
-      visibility: hidden;
-    }
-
     .user--name {
       @include margin(0);
       font-size: $font-size-medium;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 06749c99d..11394f032 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -14,7 +14,6 @@
   @include flex;
   @include flex-shrink;
   @include padding(0 0 0 $space-normal);
-  align-items: center;
   border-bottom: 1px solid transparent;
   border-left: $space-micro solid transparent;
   border-top: 1px solid transparent;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index d518812f1..297166b66 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -42,7 +42,7 @@
   }
 }
 
-.conversations-sidebar {
+.conversations-list-wrap {
   @include flex;
   flex-direction: column;
 
@@ -92,44 +92,6 @@
   }
 }
 
-.conversation-wrap {
-  @include margin(0);
-  @include border-normal-left;
-  background: var(--color-background-light);
-
-  .current-chat {
-    @include flex;
-    @include full-height;
-    @include flex-align(center, middle);
-    flex-direction: column;
-
-    div {
-      @include flex;
-      @include full-height;
-      @include flex-align(center, middle);
-      flex-direction: column;
-
-      img {
-        @include margin($space-normal);
-        width: 10rem;
-      }
-
-      span {
-        font-size: $font-size-small;
-        font-weight: $font-weight-medium;
-        text-align: center;
-      }
-    }
-  }
-
-  .conv-empty-state {
-    @include flex;
-    @include full-height;
-    @include flex-align(center, middle);
-    flex-direction: column;
-  }
-}
-
 .conversation-panel {
   @include flex;
   @include flex-weight(1);
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index d91e192d2..c09812527 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -61,9 +61,7 @@
   }
 
   .bottom-box .button--emoji.button--upload {
-    height: var(--space-large);
     padding: 0;
-    width: var(--space-large);
 
     .file-uploads {
       height: 100%;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
index 344317735..65abd09c7 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
@@ -49,10 +49,8 @@
       margin-top: $space-micro;
 
       .inbox-icon {
-        $icon-top-space: -1px;
         display: inline-block;
         margin-right: $space-micro;
-        margin-top: $icon-top-space;
         min-width: $space-normal;
         text-align: center;
       }
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 8637c071a..6603a25c6 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="conversations-sidebar  medium-4 columns">
+  <div class="conversations-list-wrap">
     <slot></slot>
     <div class="chat-list__top">
       <h1 class="page-title text-truncate" :title="pageTitle">
@@ -218,9 +218,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '~dashboard/assets/scss/variables';
+@import '~dashboard/assets/scss/app.scss';
 .spinner {
-  margin-top: $space-normal;
-  margin-bottom: $space-normal;
+  margin-top: var(--space-normal);
+  margin-bottom: var(--space-normal);
+}
+
+.conversations-list-wrap {
+  flex-shrink: 0;
+  width: 34rem;
+
+  @include breakpoint(large up) {
+    width: 36rem;
+  }
+  @include breakpoint(xlarge up) {
+    width: 35rem;
+  }
+  @include breakpoint(xxlarge up) {
+    width: 38rem;
+  }
+  @include breakpoint(xxxlarge up) {
+    flex-basis: 46rem;
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue
index 88138cf86..6332bd118 100644
--- a/app/javascript/dashboard/components/Modal.vue
+++ b/app/javascript/dashboard/components/Modal.vue
@@ -2,7 +2,7 @@
   <transition name="modal-fade">
     <div
       v-if="show"
-      class="modal-mask"
+      :class="modalClassName"
       transition="modal"
       @click="onBackDropClick"
     >
@@ -30,6 +30,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    modalType: {
+      type: String,
+      default: 'centered',
+    },
   },
   computed: {
     modalContainerClassName() {
@@ -39,6 +43,14 @@ export default {
       }
       return className;
     },
+    modalClassName() {
+      const modalClassNameMap = {
+        centered: '',
+        'right-aligned': 'right-aligned',
+      };
+
+      return `modal-mask ${modalClassNameMap[this.modalType] || ''}`;
+    },
   },
   mounted() {
     document.addEventListener('keydown', e => {
@@ -60,7 +72,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .modal-container--full-width {
   align-items: center;
   border-radius: 0;
@@ -69,4 +81,14 @@ export default {
   justify-content: center;
   width: 100%;
 }
+
+.modal-mask.right-aligned {
+  justify-content: flex-end;
+
+  .modal-container {
+    border-radius: 0;
+    height: 100%;
+    width: 48rem;
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 19c56c2af..59d0c67cb 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -178,7 +178,6 @@ export default {
         icon: 'ion-ios-people',
         label: 'TEAMS',
         hasSubMenu: true,
-        newLink: true,
         key: 'team',
         cssClass: 'menu-title align-justify teams-sidebar-menu',
         toState: frontendURL(`accounts/${this.accountId}/settings/teams`),
diff --git a/app/javascript/dashboard/components/layout/SidebarItem.vue b/app/javascript/dashboard/components/layout/SidebarItem.vue
index 7a3394fce..f00753497 100644
--- a/app/javascript/dashboard/components/layout/SidebarItem.vue
+++ b/app/javascript/dashboard/components/layout/SidebarItem.vue
@@ -60,35 +60,7 @@ import { mapGetters } from 'vuex';
 
 import router from '../../routes';
 import adminMixin from '../../mixins/isAdmin';
-import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
-
-const getInboxClassByType = (type, phoneNumber) => {
-  switch (type) {
-    case INBOX_TYPES.WEB:
-      return 'ion-earth';
-
-    case INBOX_TYPES.FB:
-      return 'ion-social-facebook';
-
-    case INBOX_TYPES.TWITTER:
-      return 'ion-social-twitter';
-
-    case INBOX_TYPES.TWILIO:
-      return phoneNumber.startsWith('whatsapp')
-        ? 'ion-social-whatsapp-outline'
-        : 'ion-android-textsms';
-
-    case INBOX_TYPES.API:
-      return 'ion-cloud';
-
-    case INBOX_TYPES.EMAIL:
-      return 'ion-email';
-
-    default:
-      return '';
-  }
-};
-
+import { getInboxClassByType } from 'dashboard/helper/inbox';
 export default {
   mixins: [adminMixin],
   props: {
@@ -155,6 +127,7 @@ export default {
 
 .wrap {
   display: flex;
+  align-items: center;
 }
 
 .label-color--display {
@@ -164,4 +137,12 @@ export default {
   min-width: $space-normal;
   width: $space-normal;
 }
+
+.inbox-icon {
+  position: relative;
+  top: -1px;
+  &.ion-ios-email {
+    font-size: var(--font-size-medium);
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 1040107cc..28289472f 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -160,9 +160,9 @@ export default {
 }
 
 .button {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+  &.button--emoji {
+    margin-right: var(--space-small);
+  }
 
   &.is-active {
     background: white;
@@ -221,6 +221,7 @@ export default {
 
     label {
       color: var(--s-500);
+      font-size: var(--font-size-mini);
     }
   }
 }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 2e0a89cb2..d6d5bbd85 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -1,16 +1,34 @@
 <template>
-  <div :class="conversationClass">
-    <messages-view
+  <div class="conversation-details-wrap">
+    <conversation-header
       v-if="currentChat.id"
-      :inbox-id="inboxId"
+      :chat="currentChat"
       :is-contact-panel-open="isContactPanelOpen"
       @contact-panel-toggle="onToggleContactPanel"
     />
-    <empty-state v-else />
+    <div class="messages-and-sidebar">
+      <messages-view
+        v-if="currentChat.id"
+        :inbox-id="inboxId"
+        :is-contact-panel-open="isContactPanelOpen"
+        @contact-panel-toggle="onToggleContactPanel"
+      />
+      <empty-state v-else />
+
+      <div v-show="showContactPanel" class="conversation-sidebar-wrap">
+        <contact-panel
+          v-if="showContactPanel"
+          :conversation-id="currentChat.id"
+          :on-toggle="onToggleContactPanel"
+        />
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import ContactPanel from 'dashboard/routes/dashboard/conversation/ContactPanel';
+import ConversationHeader from './ConversationHeader';
 import EmptyState from './EmptyState';
 import MessagesView from './MessagesView';
 
@@ -18,6 +36,8 @@ export default {
   components: {
     EmptyState,
     MessagesView,
+    ContactPanel,
+    ConversationHeader,
   },
 
   props: {
@@ -35,10 +55,8 @@ export default {
     ...mapGetters({
       currentChat: 'getSelectedChat',
     }),
-    conversationClass() {
-      return `medium-${
-        this.isContactPanelOpen ? '5' : '8'
-      } columns conversation-wrap`;
+    showContactPanel() {
+      return this.isContactPanelOpen && this.currentChat.id;
     },
   },
   methods: {
@@ -48,3 +66,52 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/app.scss';
+
+.conversation-details-wrap {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  border-left: 1px solid var(--color-border);
+  background: var(--color-background-light);
+}
+
+.messages-and-sidebar {
+  display: flex;
+  background: var(--color-background-light);
+  margin: 0;
+  height: calc(100vh - var(--space-jumbo));
+}
+
+.conversation-sidebar-wrap {
+  height: auto;
+  flex: 0 0;
+  overflow: hidden;
+  overflow: auto;
+  background: white;
+  flex-basis: 28rem;
+
+  @include breakpoint(large up) {
+    flex-basis: 30em;
+  }
+
+  @include breakpoint(xlarge up) {
+    flex-basis: 31em;
+  }
+
+  @include breakpoint(xxlarge up) {
+    flex-basis: 33rem;
+  }
+
+  @include breakpoint(xxxlarge up) {
+    flex-basis: 40rem;
+  }
+
+  &::v-deep .contact--panel {
+    width: 100%;
+    height: 100%;
+    max-width: 100%;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 0b39013bf..4b8193699 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -1,7 +1,11 @@
 <template>
   <div
     class="conversation"
-    :class="{ active: isActiveChat, 'unread-chat': hasUnread }"
+    :class="{
+      active: isActiveChat,
+      'unread-chat': hasUnread,
+      'has-inbox-name': showInboxName,
+    }"
     @click="cardClick(chat)"
   >
     <Thumbnail
@@ -14,15 +18,12 @@
       size="40px"
     />
     <div class="conversation--details columns">
+      <span v-if="showInboxName" v-tooltip.bottom="inboxName" class="label">
+        <i :class="computedInboxClass" />
+        {{ inboxName }}
+      </span>
       <h4 class="conversation--user">
         {{ currentContact.name }}
-        <span
-          v-if="!hideInboxName && isInboxNameVisible"
-          v-tooltip.bottom="inboxName(chat.inbox_id)"
-          class="label"
-        >
-          {{ inboxName(chat.inbox_id) }}
-        </span>
       </h4>
       <p v-if="lastMessageInChat" class="conversation--message">
         <i v-if="messageByAgent" class="ion-ios-undo message-from-agent"></i>
@@ -54,7 +55,7 @@
 import { mapGetters } from 'vuex';
 import { MESSAGE_TYPE } from 'widget/helpers/constants';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-
+import { getInboxClassByType } from 'dashboard/helper/inbox';
 import Thumbnail from '../Thumbnail';
 import conversationMixin from '../../../mixins/conversations';
 import timeMixin from '../../../mixins/time';
@@ -140,6 +141,26 @@ export default {
     parsedLastMessage() {
       return this.getPlainText(this.lastMessageInChat.content);
     },
+
+    chatInbox() {
+      const { inbox_id: inboxId } = this.chat;
+      const stateInbox = this.$store.getters['inboxes/getInbox'](inboxId);
+      return stateInbox;
+    },
+
+    computedInboxClass() {
+      const { phone_number: phoneNumber, channel_type: type } = this.chatInbox;
+      const classByType = getInboxClassByType(type, phoneNumber);
+      return classByType;
+    },
+
+    showInboxName() {
+      return !this.hideInboxName && this.isInboxNameVisible;
+    },
+    inboxName() {
+      const stateInbox = this.chatInbox;
+      return stateInbox.name || '';
+    },
   },
 
   methods: {
@@ -153,10 +174,43 @@ export default {
       });
       router.push({ path: frontendURL(path) });
     },
-    inboxName(inboxId) {
-      const stateInbox = this.$store.getters['inboxes/getInbox'](inboxId);
-      return stateInbox.name || '';
-    },
   },
 };
 </script>
+<style lang="scss" scoped>
+.conversation {
+  align-items: center;
+}
+
+.has-inbox-name {
+  &::v-deep .user-thumbnail-box {
+    margin-top: var(--space-normal);
+    align-items: flex-start;
+  }
+  .conversation--meta {
+    margin-top: var(--space-normal);
+  }
+}
+
+.conversation--details .label {
+  padding: var(--space-micro) 0 var(--space-micro) 0;
+  line-height: var(--space-slab);
+  font-weight: var(--font-weight-medium);
+  background: none;
+  color: var(--s-500);
+  font-size: var(--font-size-mini);
+}
+
+.conversation--details {
+  .conversation--user {
+    padding-top: var(--space-micro);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 60%;
+  }
+  .ion-earth {
+    font-size: var(--font-size-mini);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index ca6f7d5a3..e8f032a36 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="conv-header">
-    <div class="user" :class="{ hide: isContactPanelOpen }">
+    <div class="user">
       <Thumbnail
         :src="currentContact.thumbnail"
         size="40px"
@@ -9,7 +9,7 @@
         :status="currentContact.availability_status"
       />
       <div class="user--profile__meta">
-        <h3 v-if="!isContactPanelOpen" class="user--name text-truncate">
+        <h3 class="user--name text-truncate">
           {{ currentContact.name }}
         </h3>
         <button
@@ -17,9 +17,11 @@
           @click="$emit('contact-panel-toggle')"
         >
           {{
-            `${$t('CONVERSATION.HEADER.OPEN')} ${$t(
-              'CONVERSATION.HEADER.DETAILS'
-            )}`
+            `${
+              isContactPanelOpen
+                ? $t('CONVERSATION.HEADER.CLOSE')
+                : $t('CONVERSATION.HEADER.OPEN')
+            } ${$t('CONVERSATION.HEADER.DETAILS')}`
           }}
         </button>
       </div>
@@ -131,4 +133,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.conv-header {
+  flex: 0 0 var(--space-jumbo);
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
index 958e1b9da..bafceb688 100644
--- a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
@@ -1,28 +1,31 @@
 <template>
-  <div class="columns full-height conv-empty-state">
+  <div :class="emptyClassName">
     <woot-loading-state
       v-if="uiFlags.isFetching || loadingChatList"
       :message="loadingIndicatorMessage"
     />
-    <!-- Show empty state images if not loading -->
-    <div v-if="!uiFlags.isFetching && !loadingChatList" class="current-chat">
-      <!-- No inboxes attached -->
-      <div v-if="!inboxesList.length">
-        <img src="~dashboard/assets/images/inboxes.svg" alt="No Inboxes" />
-        <span v-if="isAdmin">
-          {{ $t('CONVERSATION.NO_INBOX_1') }}
-          <br />
-          <router-link :to="newInboxURL">
-            {{ $t('CONVERSATION.CLICK_HERE') }}
-          </router-link>
-          {{ $t('CONVERSATION.NO_INBOX_2') }}
-        </span>
-        <span v-if="!isAdmin">
-          {{ $t('CONVERSATION.NO_INBOX_AGENT') }}
-        </span>
+    <!-- No inboxes attached -->
+    <div
+      v-if="!inboxesList.length && !uiFlags.isFetching && !loadingChatList"
+      class="clearfix"
+    >
+      <onboarding-view v-if="isAdmin" />
+      <div v-else class="current-chat">
+        <div>
+          <img src="~dashboard/assets/images/inboxes.svg" alt="No Inboxes" />
+          <span>
+            {{ $t('CONVERSATION.NO_INBOX_AGENT') }}
+          </span>
+        </div>
       </div>
+    </div>
+    <!-- Show empty state images if not loading -->
+    <div
+      v-else-if="!uiFlags.isFetching && !loadingChatList"
+      class="current-chat"
+    >
       <!-- No conversations available -->
-      <div v-else-if="!allConversations.length">
+      <div v-if="!allConversations.length">
         <img src="~dashboard/assets/images/chat.svg" alt="No Chat" />
         <span>
           {{ $t('CONVERSATION.NO_MESSAGE_1') }}
@@ -41,10 +44,13 @@
 import { mapGetters } from 'vuex';
 import adminMixin from '../../../mixins/isAdmin';
 import accountMixin from '../../../mixins/account';
+import OnboardingView from './OnboardingView';
 
 export default {
+  components: {
+    OnboardingView,
+  },
   mixins: [accountMixin, adminMixin],
-
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
@@ -62,6 +68,58 @@ export default {
     newInboxURL() {
       return this.addAccountScoping('settings/inboxes/new');
     },
+    emptyClassName() {
+      if (
+        !this.inboxesList.length &&
+        !this.uiFlags.isFetching &&
+        !this.loadingChatList &&
+        this.isAdmin
+      ) {
+        return 'inbox-empty-state';
+      }
+      return 'columns conv-empty-state';
+    },
   },
 };
 </script>
+<style lang="scss" scoped>
+.inbox-empty-state {
+  height: 100%;
+  overflow: auto;
+}
+
+.current-chat {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+
+  div {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    img {
+      margin: var(--space-normal);
+      width: 10rem;
+    }
+
+    span {
+      font-size: var(--font-size-small);
+      font-weight: var(--font-weight-medium);
+      text-align: center;
+    }
+  }
+}
+
+.conv-empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 133261e54..da31bf55b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -1,10 +1,5 @@
 <template>
-  <div class="view-box columns">
-    <conversation-header
-      :chat="currentChat"
-      :is-contact-panel-open="isContactPanelOpen"
-      @contact-panel-toggle="onToggleContactPanel"
-    />
+  <div class="view-box fill-height">
     <div v-if="!currentChat.can_reply" class="banner messenger-policy--banner">
       <span>
         {{ $t('CONVERSATION.CANNOT_REPLY') }}
@@ -86,7 +81,6 @@
 <script>
 import { mapGetters } from 'vuex';
 
-import ConversationHeader from './ConversationHeader';
 import ReplyBox from './ReplyBox';
 import Message from './Message';
 import conversationMixin from '../../../mixins/conversations';
@@ -95,7 +89,6 @@ import { BUS_EVENTS } from 'shared/constants/busEvents';
 
 export default {
   components: {
-    ConversationHeader,
     Message,
     ReplyBox,
   },
@@ -316,4 +309,9 @@ export default {
 .spinner--container {
   min-height: var(--space-jumbo);
 }
+
+.view-box.fill-height {
+  height: auto;
+  flex-grow: 1;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
new file mode 100644
index 000000000..fbdd284a2
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="columns onboarding-wrap">
+    <div class="onboarding">
+      <div class="scroll-wrap">
+        <div class="features-item">
+          <h1 class="page-title">
+            <span>{{
+              $t('ONBOARDING.TITLE', {
+                installationName: globalConfig.installationName,
+              })
+            }}</span>
+          </h1>
+          <p class="intro-body">
+            {{
+              $t('ONBOARDING.DESCRIPTION', {
+                installationName: globalConfig.installationName,
+              })
+            }}
+          </p>
+          <p>
+            <a
+              href="https://changelog.chatwoot.com"
+              target="_blank"
+              rel="noopener nofollow noreferrer"
+              class="onboarding--link"
+            >
+              {{ $t('ONBOARDING.READ_LATEST_UPDATES') }}
+            </a>
+            <span>🎉</span>
+          </p>
+        </div>
+        <div class="features-item">
+          <h2 class="block-title">
+            <span class="emoji">💬</span>
+            <span class="conversation--title">{{
+              $t('ONBOARDING.ALL_CONVERSATION.TITLE')
+            }}</span>
+          </h2>
+          <p class="intro-body">
+            {{ $t('ONBOARDING.ALL_CONVERSATION.DESCRIPTION') }}
+          </p>
+        </div>
+        <div class="features-item">
+          <h2 class="block-title">
+            <span class="emoji">👥</span
+            >{{ $t('ONBOARDING.TEAM_MEMBERS.TITLE') }}
+          </h2>
+          <p class="intro-body">
+            {{ $t('ONBOARDING.TEAM_MEMBERS.DESCRIPTION') }}
+          </p>
+          <router-link :to="newAgentURL" class="onboarding--link">
+            {{ $t('ONBOARDING.TEAM_MEMBERS.NEW_LINK') }}
+          </router-link>
+        </div>
+        <div class="features-item">
+          <h2 class="block-title">
+            <span class="emoji">📥</span>{{ $t('ONBOARDING.INBOXES.TITLE') }}
+          </h2>
+          <p class="intro-body ">
+            {{ $t('ONBOARDING.INBOXES.DESCRIPTION') }}
+          </p>
+          <router-link :to="newInboxURL" class="onboarding--link">
+            {{ $t('ONBOARDING.INBOXES.NEW_LINK') }}
+          </router-link>
+        </div>
+        <div class="features-item">
+          <h2 class="block-title">
+            <span class="emoji">🏷</span>{{ $t('ONBOARDING.LABELS.TITLE') }}
+          </h2>
+          <p class="intro-body ">
+            {{ $t('ONBOARDING.LABELS.DESCRIPTION') }}
+          </p>
+          <router-link :to="newLabelsURL" class="onboarding--link">
+            {{ $t('ONBOARDING.LABELS.NEW_LINK') }}
+          </router-link>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import accountMixin from '../../../mixins/account';
+
+export default {
+  mixins: [accountMixin],
+  computed: {
+    ...mapGetters({ globalConfig: 'globalConfig/get' }),
+    newInboxURL() {
+      return this.addAccountScoping('settings/inboxes/new');
+    },
+    newAgentURL() {
+      return this.addAccountScoping('settings/agents/list');
+    },
+    newLabelsURL() {
+      return this.addAccountScoping('settings/labels/list');
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.onboarding-wrap {
+  display: flex;
+  font-size: var(--font-size-small);
+  justify-content: center;
+  overflow: auto;
+  text-align: left;
+}
+.onboarding {
+  height: 100vh;
+  overflow: auto;
+}
+
+.scroll-wrap {
+  padding: var(--space-larger) 13.6rem;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.features-item {
+  margin-bottom: var(--space-large);
+}
+
+.conversation--title {
+  margin-left: var(--space-minus-smaller);
+}
+
+.page-title {
+  font-size: var(--font-size-big);
+  font-weight: var(--font-weight-bold);
+  margin-bottom: var(--space-one);
+}
+
+.block-title {
+  font-weight: var(--font-weight-bold);
+  margin-bottom: var(--space-smaller);
+  margin-left: var(--space-minus-large);
+}
+
+.intro-body {
+  margin-bottom: var(--space-small);
+  line-height: 1.5;
+}
+
+.onboarding--link {
+  color: var(--w-500);
+  font-weight: var(--font-weight-medium);
+  text-decoration: underline;
+}
+
+.emoji {
+  width: var(--space-large);
+  display: inline-block;
+}
+</style>
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 1fb9961dc..9bed8e7d5 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -1,5 +1,6 @@
 import AuthAPI from '../api/auth';
 import BaseActionCableConnector from '../../shared/helpers/BaseActionCableConnector';
+import { newMessageNotification } from 'shared/helpers/AudioNotificationHelper';
 
 class ActionCableConnector extends BaseActionCableConnector {
   constructor(app, pubsubToken) {
@@ -63,6 +64,7 @@ class ActionCableConnector extends BaseActionCableConnector {
   onLogout = () => AuthAPI.logout();
 
   onMessageCreated = data => {
+    newMessageNotification(data);
     this.app.$store.dispatch('addMessage', data);
   };
 
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
new file mode 100644
index 000000000..af8917dab
--- /dev/null
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -0,0 +1,28 @@
+import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
+
+export const getInboxClassByType = (type, phoneNumber) => {
+  switch (type) {
+    case INBOX_TYPES.WEB:
+      return 'ion-earth';
+
+    case INBOX_TYPES.FB:
+      return 'ion-social-facebook';
+
+    case INBOX_TYPES.TWITTER:
+      return 'ion-social-twitter';
+
+    case INBOX_TYPES.TWILIO:
+      return phoneNumber.startsWith('whatsapp')
+        ? 'ion-social-whatsapp-outline'
+        : 'ion-android-textsms';
+
+    case INBOX_TYPES.API:
+      return 'ion-cloud';
+
+    case INBOX_TYPES.EMAIL:
+      return 'ion-ios-email';
+
+    default:
+      return '';
+  }
+};
diff --git a/app/javascript/dashboard/helper/specs/inbox.spec.js b/app/javascript/dashboard/helper/specs/inbox.spec.js
new file mode 100644
index 000000000..54c3cefad
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/inbox.spec.js
@@ -0,0 +1,35 @@
+import { getInboxClassByType } from '../inbox';
+
+describe('#Inbox Helpers', () => {
+  describe('getInboxClassByType', () => {
+    it('should return correct class for web widget', () => {
+      expect(getInboxClassByType('Channel::WebWidget')).toEqual('ion-earth');
+    });
+    it('should return correct class for fb page', () => {
+      expect(getInboxClassByType('Channel::FacebookPage')).toEqual(
+        'ion-social-facebook'
+      );
+    });
+    it('should return correct class for  twitter profile', () => {
+      expect(getInboxClassByType('Channel::TwitterProfile')).toEqual(
+        'ion-social-twitter'
+      );
+    });
+    it('should return correct class for twilio sms', () => {
+      expect(getInboxClassByType('Channel::TwilioSms', '')).toEqual(
+        'ion-android-textsms'
+      );
+    });
+    it('should return correct class for whatsapp', () => {
+      expect(getInboxClassByType('Channel::TwilioSms', 'whatsapp')).toEqual(
+        'ion-social-whatsapp-outline'
+      );
+    });
+    it('should return correct class for Api', () => {
+      expect(getInboxClassByType('Channel::Api')).toEqual('ion-cloud');
+    });
+    it('should return correct class for Email', () => {
+      expect(getInboxClassByType('Channel::Email')).toEqual('ion-ios-email');
+    });
+  });
+});
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index c4074e433..7faa7d2e8 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -75,6 +75,13 @@ export const getSidebarItems = accountId => ({
       'settings_integrations_integration',
       'general_settings',
       'general_settings_index',
+      'settings_teams_list',
+      'settings_teams_new',
+      'settings_teams_add_agents',
+      'settings_teams_finish',
+      'settings_teams_edit',
+      'settings_teams_edit_members',
+      'settings_teams_edit_finish',
     ],
     menuItems: {
       back: {
@@ -91,6 +98,13 @@ export const getSidebarItems = accountId => ({
         toState: frontendURL(`accounts/${accountId}/settings/agents/list`),
         toStateName: 'agent_list',
       },
+      teams: {
+        icon: 'ion-ios-people',
+        label: 'TEAMS',
+        hasSubMenu: false,
+        toState: frontendURL(`accounts/${accountId}/settings/teams/list`),
+        toStateName: 'settings_teams_list',
+      },
       inboxes: {
         icon: 'ion-archive',
         label: 'INBOXES',
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 2a22cbb3c..19d696c41 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "تعديل جهة الاتصال",
     "TITLE": "تعديل جهة الاتصال",
-    "DESC": "تعديل تفاصيل جهة الاتصال",
+    "DESC": "تعديل تفاصيل جهة الاتصال"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "إرسال",
       "CANCEL": "إلغاء",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "تم تحديث جهة الاتصال بنجاح",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "عنوان البريد الإلكتروني هذا مستخدم لجهة اتصال أخرى.",
-    "ERROR_MESSAGE": "حدث خطأ أثناء تحديث جهة الاتصال، الرجاء المحاولة مرة أخرى"
+    "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "الاسم",
-        "رقم الهاتف",
-        "المحادثات",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "الاسم",
+        "PHONE_NUMBER": "رقم الهاتف",
+        "CONVERSATIONS": "المحادثات",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "الشركة",
+        "EMAIL_ADDRESS": "عنوان البريد الإلكتروني"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index b880b6b8c..db8d2c0c0 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "ملاحظة خاصة: مرئية فقط لأعضاء فريق العمل والموظفين",
     "CHANGE_STATUS": "تم تغيير حالة المحادثة",
     "CHANGE_AGENT": "تم تغيير الموظف الذي تم إحالة المحادثة إليه",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "الرجاء إدخال عنوان بريد إلكتروني صحيح"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 36c75a3a9..69830e754 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "اختر قيمة"
       },
       "TWITTER": {
-        "HELP": "لإضافة حساب تويتر الخاص بك كقناة تواصل، تحتاج إلى مصادقة حسابك على تويتر بك بالنقر على زر \"تسجيل الدخول باستخدام تويتر\" "
+        "HELP": "لإضافة حساب تويتر الخاص بك كقناة تواصل، تحتاج إلى مصادقة حسابك على تويتر بك بالنقر على زر \"تسجيل الدخول باستخدام تويتر\" ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "قناة الموقع",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "الإعدادات",
       "COLLABORATORS": "المتعاونون",
-      "CONFIGURATION": "الإعدادات"
+      "CONFIGURATION": "الإعدادات",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "الإعدادات",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json
index caf74b78a..93db65575 100644
--- a/app/javascript/dashboard/i18n/locale/ar/login.json
+++ b/app/javascript/dashboard/i18n/locale/ar/login.json
@@ -1,6 +1,6 @@
 {
   "LOGIN": {
-    "TITLE": "تسجيل الدخول إلى Chatwoot",
+    "TITLE": "تسجيل الدخول إلى شات ووت",
     "EMAIL": {
       "LABEL": "البريد الإلكتروني",
       "PLACEHOLDER": "مثال: someone@example.com"
diff --git a/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json
new file mode 100644
index 000000000..3e0c02b59
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "إنشاء",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "إضافة موظفين",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "أصبح كل شيء جاهزاً الآن!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "أصبح كل شيء جاهزاً الآن!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "البريد الإلكتروني",
+      "BUTTON_TEXT": "إضافة موظفين",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "إضافة موظفين",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "حذف ",
+        "NO": "إلغاء"
+      }
+    },
+    "SETTINGS": "الإعدادات",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 045aa0f20..e9de0955e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edita el contacte",
     "TITLE": "Edita el contacte",
-    "DESC": "Edita els detalls de contacte",
+    "DESC": "Edita els detalls de contacte"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Nou Contacte",
+    "TITLE": "Crear un nou contacte",
+    "DESC": "Afegir informació bàsica sobre el contacte."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Envia",
       "CANCEL": "Cancel·la",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "S'ha actualitzat correctament el contacte",
+    "SUCCESS_MESSAGE": "Contacte guardat correctament",
     "CONTACT_ALREADY_EXIST": "Aquesta adreça de correu electrònic s’utilitza per a un altre contacte.",
-    "ERROR_MESSAGE": "S'ha produït un error en actualitzar el contacte. Tornau-ho a provar"
+    "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contactes",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Carregant contactes...",
       "404": "No hi ha cap contacte que coincideixi amb la vostra cerca 🔍",
-      "TABLE_HEADER": [
-        "Nom",
-        "Número de telèfon",
-        "Converses",
-        "Darrer contacte"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nom",
+        "PHONE_NUMBER": "Número de telèfon",
+        "CONVERSATIONS": "Converses",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Companyia",
+        "EMAIL_ADDRESS": "Adreça de correu electrònic"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index a8dd8529b..686232e4c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Cerca missatges",
       "LOADING_MESSAGE": "S'estan restringint les dades...",
       "PLACEHOLDER": "Escriu qualsevol text per cercar missatges",
-      "NO_MATCHING_RESULTS": "No hi ha missatges que coincideixin amb els paràmetres de cerca."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Missatges no Llegits",
     "UNREAD_MESSAGE": "Missatge no Llegit",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Nota privada: Només és visible per tu i el vostre equip",
     "CHANGE_STATUS": "Estat de la conversa canviat",
     "CHANGE_AGENT": "Assignació de la conversa canviat",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Enviat per:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Seleccionar Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Introduïu una adreça de correu electrònic vàlida"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index c12d86b3b..c3111f212 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Tria un valor"
       },
       "TWITTER": {
-        "HELP": "Per afegir el teu perfil de Twitter com a canal, has d'autentificar el vostre perfil de Twitter fent clic a 'Inicieu la sessió amb Twitter' "
+        "HELP": "Per afegir el teu perfil de Twitter com a canal, has d'autentificar el vostre perfil de Twitter fent clic a 'Inicieu la sessió amb Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal Web",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Configuracions",
       "COLLABORATORS": "Col·laboradors",
-      "CONFIGURATION": "Configuració"
+      "CONFIGURATION": "Configuració",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Configuracions",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis",
       "MESSAGE_SUCCESS": "La reconnexió s'ha realitzat correctament",
       "MESSAGE_ERROR": "S'ha produït un error; tornau-ho a provar"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Si",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hores",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Tria"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index d624f7674..f34a290e8 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Integracions",
     "ACCOUNT_SETTINGS": "Configuració del compte",
     "LABELS": "Etiquetes",
-    "TEAMS": "Teams"
+    "TEAMS": "Equips"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Compte nou",
diff --git a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
new file mode 100644
index 000000000..136f082d3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Equips",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Crear",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Afegir agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Ja estàs preparat!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Ja estàs preparat!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Correu electrònic",
+      "BUTTON_TEXT": "Afegir agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Afegir agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Esborrar",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Suprimeix ",
+        "NO": "Cancel·la"
+      }
+    },
+    "SETTINGS": "Configuracions",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index c7af0ddad..1a58ba906 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Upravit kontakt",
     "TITLE": "Upravit kontakt",
-    "DESC": "Upravit kontaktní údaje",
+    "DESC": "Upravit kontaktní údaje"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Odeslat",
       "CANCEL": "Zrušit",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontakt byl úspěšně aktualizován",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Tuto e-mailovou adresu již používá jiný kontakt.",
-    "ERROR_MESSAGE": "Při aktualizaci kontaktu se vyskytla chyba, zkuste to prosím znovu"
+    "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakty",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Načítání kontaktů...",
       "404": "Vašemu hledání neodpovídají žádné kontakty 🔍",
-      "TABLE_HEADER": [
-        "Název",
-        "Telefonní číslo",
-        "Konverzace",
-        "Naposledy kontaktováno"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Název",
+        "PHONE_NUMBER": "Telefonní číslo",
+        "CONVERSATIONS": "Konverzace",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Společnost",
+        "EMAIL_ADDRESS": "E-mailová adresa"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index d965aef4e..2afa5acf6 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Hledat zprávy",
       "LOADING_MESSAGE": "Načítám data...",
       "PLACEHOLDER": "Zadejte jakýkoli text k hledání",
-      "NO_MATCHING_RESULTS": "Vašemu vyhledávání neodpovídají žádné zprávy."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Nepřečtené zprávy",
     "UNREAD_MESSAGE": "Nepřečtená zpráva",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Odstranit výběr",
     "DOWNLOAD": "Stáhnout",
     "UPLOADING_ATTACHMENTS": "Nahrávání příloh...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Bez odpovědi",
     "HEADER": {
       "RESOLVE_ACTION": "Vyřešit",
       "REOPEN_ACTION": "Znovu otevřít",
@@ -43,14 +43,15 @@
       "SEND": "Poslat",
       "CREATE": "Přidat poznámku",
       "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
+      "TIP_FORMAT_ICON": "Zobrazit formátovaný textový editor",
+      "TIP_EMOJI_ICON": "Zobrazit výběr emoji",
+      "TIP_ATTACH_ICON": "Přiložit soubory",
       "ENTER_TO_SEND": "Enter to send"
     },
     "VISIBLE_TO_AGENTS": "Soukromá poznámka: Viditelné pouze pro vás a váš tým",
     "CHANGE_STATUS": "Stav konverzace byl změněn",
     "CHANGE_AGENT": "Konverzace pověřená osoba změněna",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Odeslal:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Vybrat agenta",
@@ -74,5 +75,37 @@
         "ERROR": "Zadejte prosím platnou e-mailovou adresu"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Připojit schránky",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Klikněte zde pro vytvoření štítků"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 146b737c4..1e3a89e1e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -1,6 +1,6 @@
 {
   "INBOX_MGMT": {
-    "HEADER": "Krabice",
+    "HEADER": "Schránky",
     "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
     "LIST": {
       "404": "K tomuto účtu nejsou připojeny žádné doručené schránky."
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Vyberte hodnotu"
       },
       "TWITTER": {
-        "HELP": "Chcete-li přidat svůj Twitter profil jako kanál, musíte ověřit svůj Twitter profil kliknutím na tlačítko 'Přihlásit se přes Twitter' "
+        "HELP": "Chcete-li přidat svůj Twitter profil jako kanál, musíte ověřit svůj Twitter profil kliknutím na tlačítko 'Přihlásit se přes Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Kanál webové stránky",
@@ -223,12 +224,14 @@
     },
     "TABS": {
       "SETTINGS": "Nastavení",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "COLLABORATORS": "Spolupracující",
+      "CONFIGURATION": "Nastavení",
+      "PRE_CHAT_FORM": "Formulář před chatem",
+      "BUSINESS_HOURS": "Pracovní doba"
     },
     "SETTINGS": "Nastavení",
     "FEATURES": {
-      "LABEL": "Features",
+      "LABEL": "Funkce",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
       "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
     },
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Ano",
+          "DISABLED": "Ne"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Zpráva před chatem",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Vyberte časové pásmo",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Nedostupný",
+        "HOURS": "hodiny",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/login.json b/app/javascript/dashboard/i18n/locale/cs/login.json
index f5453b5e3..767b0793a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/login.json
+++ b/app/javascript/dashboard/i18n/locale/cs/login.json
@@ -16,6 +16,6 @@
     },
     "FORGOT_PASSWORD": "Zapomněli jste heslo?",
     "CREATE_NEW_ACCOUNT": "Vytvořit nový účet",
-    "SUBMIT": "Login"
+    "SUBMIT": "Přihlásit se"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index de8c5977b..79244041f 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -5,7 +5,7 @@
     "BTN_TEXT": "Aktualizovat profil",
     "AFTER_EMAIL_CHANGED": "Váš profil byl úspěšně aktualizován, přihlaste se prosím znovu, protože se vaše přihlašovací údaje změnily",
     "FORM": {
-      "AVATAR": "Profil obrázek",
+      "AVATAR": "Profilový obrázek",
       "ERROR": "Opravte chyby formuláře",
       "REMOVE_IMAGE": "Odebrat",
       "UPLOAD_IMAGE": "Nahrát obrázek",
@@ -27,41 +27,41 @@
         "NOTE": "Zde aktualizujte nastavení e-mailových oznámení",
         "CONVERSATION_ASSIGNMENT": "Odeslat e-mailová oznámení, když je mi přiřazena konverzace",
         "CONVERSATION_CREATION": "Odeslat oznámení e-mailem při vytváření nové konverzace",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "CONVERSATION_MENTION": "Odeslat oznámení e-mailem, pokud jste zmíněni v konverzaci",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odeslat oznámení e-mailem, když je nová zpráva vytvořena v přiřazené konverzaci"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "Vaše předvolby oznámení byly úspěšně aktualizovány",
+        "UPDATE_ERROR": "Při aktualizaci nastavení došlo k chybě, zkuste to prosím znovu"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "Push oznámení",
+        "NOTE": "Zde aktualizujte předvolby push oznámení",
+        "CONVERSATION_ASSIGNMENT": "Odeslat push oznámení, když je mi přiřazena konverzace",
+        "CONVERSATION_CREATION": "Odeslat push oznámení při vytváření nové konverzace",
+        "CONVERSATION_MENTION": "Poslat push oznámení, když jste zmíněni v konverzaci",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odeslat push oznámení, když je nová zpráva vytvořena v přiřazené konverzaci",
+        "HAS_ENABLED_PUSH": "Povolili jste push pro tento prohlížeč.",
+        "REQUEST_PUSH": "Povolit push oznámení"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Profil obrázek"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "Vaše celé jméno",
+        "ERROR": "Zadejte prosím platné celé jméno",
+        "PLACEHOLDER": "Zadejte své celé jméno"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Zobrazované jméno",
+        "ERROR": "Zadejte prosím platné zobrazované jméno",
+        "PLACEHOLDER": "Zadejte prosím zobrazované jméno, bude zobrazeno v konverzacích"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Dostupnost",
         "STATUSES_LIST": [
           "Online",
-          "Busy",
+          "Zaneprázdněn",
           "Offline"
         ]
       },
@@ -84,19 +84,19 @@
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Změnit",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "CHANGE_ACCOUNTS": "Přepnout účet",
+    "SELECTOR_SUBTITLE": "Vyberte účet z následujícího seznamu",
     "PROFILE_SETTINGS": "Nastavení profilu",
     "LOGOUT": "Odhlásit se"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now"
+    "TRIAL_MESSAGE": "dní zbývá zkušební verze.",
+    "TRAIL_BUTTON": "Koupit nyní"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Kopírovat",
+      "COPY_SUCCESSFUL": "Kód byl úspěšně zkopírován do schránky"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Stáhnout",
@@ -106,10 +106,10 @@
       "SUBMIT": "Odeslat"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Ověřování...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "Přidat schránku"
     }
   },
   "SIDEBAR": {
@@ -117,22 +117,22 @@
     "REPORTS": "Zprávy",
     "CONTACTS": "Kontakty",
     "SETTINGS": "Nastavení",
-    "HOME": "Home",
+    "HOME": "Domů",
     "AGENTS": "Agenti",
-    "INBOXES": "Krabice",
-    "NOTIFICATIONS": "Notifications",
+    "INBOXES": "Schránky",
+    "NOTIFICATIONS": "Oznámení",
     "CANNED_RESPONSES": "Konzervované odpovědi",
     "INTEGRATIONS": "Integrace",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "LABELS": "Labels",
-    "TEAMS": "Teams"
+    "ACCOUNT_SETTINGS": "Nastavení účtu",
+    "LABELS": "Štítky",
+    "TEAMS": "Týmy"
   },
   "CREATE_ACCOUNT": {
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NEW_ACCOUNT": "Nový účet",
+    "SELECTOR_SUBTITLE": "Vytvořit nový účet",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "Účet byl úspěšně vytvořen",
+      "EXIST_MESSAGE": "Účet již existuje",
       "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
     },
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
new file mode 100644
index 000000000..10288a6fb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Týmy",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Přidat agenty",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Vše je nastaveno!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Vše je nastaveno!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-MAIL",
+      "BUTTON_TEXT": "Přidat agenty",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Přidat agenty",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Vymazat",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Vymazat ",
+        "NO": "Zrušit"
+      }
+    },
+    "SETTINGS": "Nastavení",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index bf22980e5..41664a54c 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Rediger Kontakt",
     "TITLE": "Rediger Kontakt",
-    "DESC": "Rediger kontaktoplysninger",
+    "DESC": "Rediger kontaktoplysninger"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Send",
       "CANCEL": "Annuller",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontakt opdateret",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Denne e-mail adresse er i brug for en anden kontakt.",
-    "ERROR_MESSAGE": "Der opstod en fejl under opdatering af kontakten. Prøv igen"
+    "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakter",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Indlæser kontakter...",
       "404": "Ingen kontakter matcher din søgning 🔍",
-      "TABLE_HEADER": [
-        "Navn",
-        "Telefonnummer",
-        "Samtaler",
-        "Sidst Kontaktet"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Navn",
+        "PHONE_NUMBER": "Telefonnummer",
+        "CONVERSATIONS": "Samtaler",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Virksomhed",
+        "EMAIL_ADDRESS": "E-Mail Adresse"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index d1288f6d1..f16a58cf2 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Søg efter beskeder",
       "LOADING_MESSAGE": "Behandler data...",
       "PLACEHOLDER": "Skriv tekst for at søge i beskeder",
-      "NO_MATCHING_RESULTS": "Der er ingen meddelelser, der matcher søgeparametrene."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Privat Note: Kun synlig for dig og dit team",
     "CHANGE_STATUS": "Samtalestatus ændret",
     "CHANGE_AGENT": "Samtaleansvarlig ændret",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Indtast venligst en gyldig e-mailadresse"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 6f49a8b26..e0da23264 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Vælg en værdi"
       },
       "TWITTER": {
-        "HELP": "For at tilføje din Twitter-profil som en kanal, skal du godkende din Twitter-profil ved at klikke på 'Log ind med Twitter' "
+        "HELP": "For at tilføje din Twitter-profil som en kanal, skal du godkende din Twitter-profil ved at klikke på 'Log ind med Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Hjemmesidekanal",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Indstillinger",
       "COLLABORATORS": "Samarbejdspartnere",
-      "CONFIGURATION": "Konfiguration"
+      "CONFIGURATION": "Konfiguration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Indstillinger",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Din Facebook-forbindelse er udløbet, tilslut venligst din Facebook-side igen for at fortsætte tjenesterne",
       "MESSAGE_SUCCESS": "Genoprettelse lykkedes",
       "MESSAGE_ERROR": "Der opstod en fejl, prøv igen"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
new file mode 100644
index 000000000..b58c532b8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Opret",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Tilføj Agenter",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Så er alt klart!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Så er alt klart!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-MAIL",
+      "BUTTON_TEXT": "Tilføj agenter",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Tilføj agenter",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Slet",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Slet ",
+        "NO": "Annuller"
+      }
+    },
+    "SETTINGS": "Indstillinger",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index 4be11b63f..9dd61e3aa 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -48,7 +48,7 @@
       },
       {
         "TEXT": "Bot",
-        "VALUE": "bot"
+        "VALUE": "Bot"
       }
     ],
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 0333afa03..e5086c6e2 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Kontakt bearbeiten",
     "TITLE": "Kontakt bearbeiten",
-    "DESC": "Kontaktdetails bearbeiten",
+    "DESC": "Kontaktdetails bearbeiten"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Einreichen",
       "CANCEL": "Stornieren",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontakt erfolgreich aktualisiert",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Diese E-Mail-Adresse wird bereits für einen anderen Kontakt verwendet.",
-    "ERROR_MESSAGE": "Beim Aktualisieren des Kontakts ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut"
+    "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuche es erneut"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakte",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Kontakte werden geladen...",
       "404": "Keine Kontakte entsprechend Deiner Suche gefunden 🔍",
-      "TABLE_HEADER": [
-        "Name",
-        "Telefonnummer",
-        "Gespräche",
-        "Letzter Kontakt"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Telefonnummer",
+        "CONVERSATIONS": "Gespräche",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Firma",
+        "EMAIL_ADDRESS": "E-Mail-Addresse"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index c6015c0ac..5f87f9114 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Nachrichten durchsuchen",
       "LOADING_MESSAGE": "Daten werden geladen...",
       "PLACEHOLDER": "Geben Sie einen Text ein, um danach zu suchen",
-      "NO_MATCHING_RESULTS": "Keine passenden Nachrichten gefunden."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Ungelesene Nachrichten",
     "UNREAD_MESSAGE": "Ungelesene Nachricht",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Privater Hinweis: Nur für Sie und Ihr Team sichtbar",
     "CHANGE_STATUS": "Gesprächsstatus geändert",
     "CHANGE_AGENT": "Konversationsempfänger geändert",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Gesendet von:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Agent auswählen",
@@ -74,5 +75,37 @@
         "ERROR": "Bitte geben Sie eine gültige E-Mail-Adresse ein"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 64b8135cc..575e2ccca 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Wähle einen Wert"
       },
       "TWITTER": {
-        "HELP": "Um Ihr Twitter-Profil als Kanal hinzuzufügen, müssen Sie Ihr Twitter-Profil authentifizieren, indem Sie auf 'Mit Twitter anmelden' klicken."
+        "HELP": "Um Ihr Twitter-Profil als Kanal hinzuzufügen, müssen Sie Ihr Twitter-Profil authentifizieren, indem Sie auf 'Mit Twitter anmelden' klicken.",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website-Kanal",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "die Einstellungen",
       "COLLABORATORS": "Mitarbeitende",
-      "CONFIGURATION": "Konfiguration"
+      "CONFIGURATION": "Konfiguration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "die Einstellungen",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Ihre Facebook-Verbindung ist abgelaufen, bitte verbinden Sie sich neu, um die Dienste fortzuführen",
       "MESSAGE_SUCCESS": "Wiederverbindung erfolgreich",
       "MESSAGE_ERROR": "Es ist ein Fehler aufgetreten, bitte versuche es erneut"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
new file mode 100644
index 000000000..b83544eff
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Agenten hinzufügen",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Sie sind bereit zu gehen!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Sie sind bereit zu gehen!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-Mail",
+      "BUTTON_TEXT": "Agenten hinzufügen",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Agenten hinzufügen",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Löschen",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Löschen ",
+        "NO": "Stornieren"
+      }
+    },
+    "SETTINGS": "die Einstellungen",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 1b4fd37ea..4312d3902 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Επεξεργασία Επαφής",
     "TITLE": "Επεξεργασία επαφής",
-    "DESC": "Επεξεργασία λεπτομερειών επαφής",
+    "DESC": "Επεξεργασία λεπτομερειών επαφής"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Νέα Επαφή",
+    "TITLE": "Δημιουργία νέας επαφής",
+    "DESC": "Προσθήκη βασικών πληροφοριών για την επαφή."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Καταχώρηση",
       "CANCEL": "Άκυρο",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Η επαφή ενημερώθηκε επιτυχώς",
+    "SUCCESS_MESSAGE": "Η επαφή αποθηκεύτηκε με επιτυχία",
     "CONTACT_ALREADY_EXIST": "Η διεύθυνση email είναι σε χρήση από άλλη επαφή.",
-    "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση της επαφής, παρακαλώ προσπαθήστε ξανά"
+    "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Επαφές",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Φόρτωση επαφών...",
       "404": "Δεν υπάρχουν επαφές που να αντιστοιχούν με την αναζήτησή σας 🔍",
-      "TABLE_HEADER": [
-        "Όνομα",
-        "Αριθμός Τηλεφώνου",
-        "Συζητήσεις",
-        "Τελευταία επικοινωνία"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Όνομα",
+        "PHONE_NUMBER": "Αριθμός Τηλεφώνου",
+        "CONVERSATIONS": "Συζητήσεις",
+        "LAST_ACTIVITY": "Τελευταία Δραστηριότητα",
+        "COUNTRY": "Χώρα",
+        "CITY": "Πόλη",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Εταιρία",
+        "EMAIL_ADDRESS": "Διεύθυνση Email"
+      },
+      "VIEW_DETAILS": "Προβολή λεπτομεριών"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index e09b90ceb..66f3affae 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Αναζήτηση μηνυμάτων",
       "LOADING_MESSAGE": "Σύμπτυξη δεδομένων...",
       "PLACEHOLDER": "Εισάγετε κείμενο για αναζήτηση μηνυμάτων",
-      "NO_MATCHING_RESULTS": "Δεν βρέθηκαν μηνύματα που να ταιριάζουν με τους όρους αναζήτησης."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Μη αναγνωσμένα μηνύματα",
     "UNREAD_MESSAGE": "Μη αναγνωσμένο μήνυμα",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Ιδιωτική Σημείωση: Ορατή μόνο σε σας και την ομάδα σας",
     "CHANGE_STATUS": "Η κατάσταση της συνομιλίας άλλαξε",
     "CHANGE_AGENT": "Η εκπροσώπηση για την συνομιλία άλλαξε",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Αποστολή από:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Επιλογή πράκτορα",
@@ -74,5 +75,37 @@
         "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Γεια σας 👋, Καλώς ήρθατε στο %{installationName}!",
+    "DESCRIPTION": "Ευχαριστούμε για την εγγραφή. Θέλουμε να αξιοποιήσετε στο έπακρο το %{installationName}. Εδώ είναι μερικά πράγματα που μπορείτε να κάνετε στο %{installationName} για να έχετε μια ευχάριστη εμπειρία.",
+    "READ_LATEST_UPDATES": "Διαβάστε τις πρόσφατες ενημερώσεις μας",
+    "ALL_CONVERSATION": {
+      "TITLE": "Όλες οι συνομιλίες σας σε ένα μέρος",
+      "DESCRIPTION": "Δείτε όλες τις συνομιλίες από τους πελάτες σας σε ένα μόνο ταμπλό. Μπορείτε να φιλτράρετε τις συνομιλίες κατά εισερχόμενο κανάλι, ετικέτα και κατάσταση."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Προσκαλέστε τα μέλη της ομάδας σας",
+      "DESCRIPTION": "Δεδομένου ότι ετοιμάζεστε να μιλήσετε με τον πελάτη σας, φέρτε τους συνάδελφους σας για να σας βοηθήσουν. Μπορείτε να προσκαλέσετε τους συνάδελφους σας προσθέτοντας τη διεύθυνση email τους στη λίστα αντιπροσώπων.",
+      "NEW_LINK": "Κάντε κλικ εδώ για να καλέσετε ένα μέλος της ομάδας"
+    },
+    "INBOXES": {
+      "TITLE": "Σύνδεση Εισερχομένων",
+      "DESCRIPTION": "Συνδέστε διάφορα κανάλια μέσω των οποίων οι πελάτες σας θα μιλούν μαζί σας. Μπορεί να είναι μια ιστοσελίδα live-chat, το Facebook ή το Twitter σελίδα σας ή ακόμα και ο αριθμός σας WhatsApp.",
+      "NEW_LINK": "Κάντε κλικ εδώ για δημιουργία εισερχόμενων"
+    },
+    "LABELS": {
+      "TITLE": "Οργάνωση συνομιλιών με ετικέτες",
+      "DESCRIPTION": "Οι ετικέτες παρέχουν έναν ευκολότερο τρόπο για να κατηγοριοποιήσετε τη συνομιλία σας. Δημιουργήστε μερικές ετικέτες όπως το #support-quiry, #billing-question κλπ., έτσι ώστε να μπορείτε να τις χρησιμοποιήσετε σε μια συζήτηση αργότερα.",
+      "NEW_LINK": "Κάντε κλικ εδώ για δημιουργία ετικετών (tags)"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index b8b06e7ee..b08032106 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Επιλέξτε τιμή"
       },
       "TWITTER": {
-        "HELP": "Για να προσθέσετε το Προφίλ Twitter ως κανάλι, πρέπει να επικυρώστε το Προφίλ σας στο Twiter κάνοντας click στο 'Είσοδος με το Twitter' "
+        "HELP": "Για να προσθέσετε το Προφίλ Twitter ως κανάλι, πρέπει να επικυρώστε το Προφίλ σας στο Twiter κάνοντας click στο 'Είσοδος με το Twitter' ",
+        "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα σύνδεσης στο Twitter, παρακαλώ προσπαθήστε ξανά"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Κανάλι Ιστοσελίδας",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Ρυθμίσεις",
       "COLLABORATORS": "Συνεργάτες",
-      "CONFIGURATION": "Διαμόρφωση"
+      "CONFIGURATION": "Διαμόρφωση",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Ώρες Εργασίας"
     },
     "SETTINGS": "Ρυθμίσεις",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε",
       "MESSAGE_SUCCESS": "Επιτυχής επανασύνδεση",
       "MESSAGE_ERROR": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Ορίστε τη διαθεσιμότητά σας",
+      "SUBTITLE": "Ορίστε τη διαθεσιμότητα στο livechat widget σας",
+      "WEEKLY_TITLE": "Ορίστε τις εβδομαδιαίες ώρες σας",
+      "TIMEZONE_LABEL": "Επιλέξτε ζώνη ώρας",
+      "UPDATE": "Ενημέρωση ρυθμίσεων ωραρίου",
+      "TOGGLE_AVAILABILITY": "Ενεργοποίηση διαθεσιμότητας ωραρίου για αυτό το κιβώτιο εισερχομένων",
+      "UNAVAILABLE_MESSAGE_LABEL": "Μήνυμα μη διαθεσιμότητας για τους επισκέπτες",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Δεν είμαστε διαθέσιμοι αυτή τη στιγμή. Αφήστε ένα μήνυμα που θα απαντήσουμε όταν επιστρέψουμε.",
+      "TOGGLE_HELP": "Η ενεργοποίηση της διαθεσιμότητας ωραρίου θα δείξει τις διαθέσιμες ώρες στο widget συνομιλίας ακόμα και αν όλοι οι πράκτορες είναι εκτός σύνδεσης. Εκτός των διαθέσιμων ωρών οι επισκέπτες μπορούν να προειδοποιηθούν με ένα μήνυμα και μια φόρμα προ-συνομιλίας.",
+      "DAY": {
+        "ENABLE": "Ενεργοποιήσετε τη διαθεσιμότητα για αυτήν την ημέρα",
+        "UNAVAILABLE": "Μη διαθέσιμος",
+        "HOURS": "ώρες",
+        "VALIDATION_ERROR": "Ο χρόνος έναρξης πρέπει να είναι πριν το χρόνο λήξης.",
+        "CHOOSE": "Επιλέξτε"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index e00652101..489752e63 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Ενοποιήσεις",
     "ACCOUNT_SETTINGS": "Ρυθμίσεις Λογαριασμού",
     "LABELS": "Ετικέτες",
-    "TEAMS": "Teams"
+    "TEAMS": "Ομάδες"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Νέος Λογαριασμός",
diff --git a/app/javascript/dashboard/i18n/locale/el/teamsSettings.json b/app/javascript/dashboard/i18n/locale/el/teamsSettings.json
new file mode 100644
index 000000000..66e6c6c77
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Ομάδες",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Δημιουργία",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Προσθήκη Πρακτόρων",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Είσαστε έτοιμοι να ξεκινήσετε!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Είσαστε έτοιμοι να ξεκινήσετε!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Προσθήκη πρακτόρων",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Προσθήκη πρακτόρων",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Διαγραφή",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Διαγραφή ",
+        "NO": "Άκυρο"
+      }
+    },
+    "SETTINGS": "Ρυθμίσεις",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index cc4e20bb5..d6cc103ca 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -45,6 +45,11 @@
     "TITLE": "Edit contact",
     "DESC": "Edit contact details"
   },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
   "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Submit",
@@ -95,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -106,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Name",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 967378552..91247105d 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,38 @@
         "ERROR": "Please enter a valid email address"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
+
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 16217e5ae..e63a40656 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -5,8 +5,7 @@
     "LIST": {
       "404": "There are no inboxes attached to this account."
     },
-    "CREATE_FLOW": [
-      {
+    "CREATE_FLOW": [{
         "title": "Choose Channel",
         "route": "settings_inbox_new",
         "body": "Choose the provider you want to integrate with Chatwoot."
@@ -226,7 +225,8 @@
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
       "CONFIGURATION": "Configuration",
-      "PRE_CHAT_FORM": "Pre Chat Form"
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -269,6 +269,24 @@
       "REQUIRE_EMAIL": {
         "LABEL": "Visitors should provide their name and email address before starting the chat"
       }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 5dfc44e4b..53d1438c2 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -13,6 +13,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _integrations } from './integrations.json';
 import { default as _generalSettings } from './generalSettings.json';
+import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
   ..._agentMgmt,
@@ -30,4 +31,5 @@ export default {
   ..._signup,
   ..._integrations,
   ..._generalSettings,
+  ..._teamsSettings,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 6b42cf3f2..fd915fb0c 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -22,6 +22,11 @@
         "TITLE": "Access Token",
         "NOTE": "This token can be used if you are building an API based integration"
       },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ENABLE_AUDIO": "Play audio notification when a new conversation is created or new messages arrives"
+      },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
diff --git a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
new file mode 100644
index 000000000..a836134df
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
@@ -0,0 +1,123 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [{
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [{
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
index 0aeecb916..767b0acde 100644
--- a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
@@ -10,8 +10,8 @@
     },
     "LIST": {
       "404": "No hay agentes asociados a esta cuenta",
-      "TITLE": "Administrar agentes en tu equipo",
-      "DESC": "Puedes añadir/eliminar agentes a/en tu equipo.",
+      "TITLE": "Administrar agentes en su equipo",
+      "DESC": "Puede añadir/eliminar agentes a/en su equipo.",
       "NAME": "Nombre",
       "EMAIL": "Correo electrónico",
       "STATUS": "Estado",
@@ -20,22 +20,22 @@
       "VERIFICATION_PENDING": "Verificación pendiente"
     },
     "ADD": {
-      "TITLE": "Añadir agente a tu equipo",
-      "DESC": "Puedes añadir personas que podrán manejar el soporte para tus bandejas de entrada.",
+      "TITLE": "Añadir agente a su equipo",
+      "DESC": "Puede añadir personas que podrán manejar el soporte para sus bandejas de entrada.",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "FORM": {
         "NAME": {
           "LABEL": "Nombre del agente",
-          "PLACEHOLDER": "Introduce el nombre del agente"
+          "PLACEHOLDER": "Introduzca el nombre del agente"
         },
         "AGENT_TYPE": {
           "LABEL": "Tipo de agente",
-          "PLACEHOLDER": "Por favor, seleccione un rol",
-          "ERROR": "Rol es requerido"
+          "PLACEHOLDER": "Seleccione un tipo",
+          "ERROR": "El tipo de agente es obligatorio"
         },
         "EMAIL": {
           "LABEL": "Dirección de correo",
-          "PLACEHOLDER": "Por favor, introduzca una dirección de correo electrónico del agente"
+          "PLACEHOLDER": "Por favor, introduzca la dirección de correo electrónico del agente"
         },
         "SUBMIT": "Añadir agente"
       },
@@ -63,16 +63,16 @@
       "FORM": {
         "NAME": {
           "LABEL": "Nombre del agente",
-          "PLACEHOLDER": "Por favor, introduzca un nombre del agente"
+          "PLACEHOLDER": "Por favor, introduzca el nombre del agente"
         },
         "AGENT_TYPE": {
           "LABEL": "Tipo de agente",
           "PLACEHOLDER": "Por favor, seleccione un rol",
-          "ERROR": "Rol es requerido"
+          "ERROR": "El tipo de agente es obligatorio"
         },
         "EMAIL": {
           "LABEL": "Dirección de email",
-          "PLACEHOLDER": "Por favor, introduzca una dirección de correo electrónico del agente"
+          "PLACEHOLDER": "Por favor, introduzca la dirección de correo electrónico del agente"
         },
         "SUBMIT": "Editar agente"
       },
diff --git a/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
index ecfdfb326..9bb940b4e 100644
--- a/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
@@ -6,7 +6,7 @@
     "SEARCH_404": "No hay elementos que coincidan con esta consulta",
     "SIDEBAR_TXT": "<p><b>Respuestas predefinidas</b> </p><p> Respuestas predefinidas son plantillas de respuesta guardadas que pueden utilizarse para enviar rápidamente una respuesta a una conversación. </p><p> Para crear una respuesta predefinida, simplemente haga clic en <b>Añadir respuesta predefinida</b>. También puede editar o eliminar una respuesta predefinida haciendo clic en el botón Editar o Borrar </p><p> Las respuestas predefinidas se utilizan con la ayuda de <b>Códigos cortos</b>. Los agentes pueden acceder a las respuestas predefinidas mientras están en un chat escribiendo <b>'/'</b> seguido del código corto. </p>",
     "LIST": {
-      "404": "No hay respuestas enlatadas disponibles en esta cuenta.",
+      "404": "No hay respuestas predefinidas disponibles en esta cuenta.",
       "TITLE": "Administrar respuestas predefinidas",
       "DESC": "Las respuestas predefinidas son plantillas de respuesta predefinidas que se pueden utilizar para enviar rápidamente respuestas a los Tickets.",
       "TABLE_HEADER": [
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index cdbf8853a..6186d0d26 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -12,17 +12,17 @@
     },
     "STATUS_TABS": [
       {
-        "NAME": "Abrir",
+        "NAME": "Abiertas",
         "KEY": "openCount"
       },
       {
-        "NAME": "Resuelto",
+        "NAME": "Resueltas",
         "KEY": "allConvCount"
       }
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Mina",
+        "NAME": "Mías",
         "KEY": "me",
         "COUNT_KEY": "mineCount"
       },
@@ -39,11 +39,11 @@
     ],
     "CHAT_STATUS_ITEMS": [
       {
-        "TEXT": "Abrir",
+        "TEXT": "Abiertas",
         "VALUE": "open"
       },
       {
-        "TEXT": "Resuelto",
+        "TEXT": "Resueltas",
         "VALUE": "resolved"
       },
       {
@@ -77,9 +77,9 @@
         "CONTENT": "ha compartido una url"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Recibido por email",
-    "VIEW_TWEET_IN_TWITTER": "Ver tweet en Twitter",
-    "REPLY_TO_TWEET": "Responder a este tweet",
-    "NO_MESSAGES": "No Messages"
+    "RECEIVED_VIA_EMAIL": "Recibido por correo electrónico",
+    "VIEW_TWEET_IN_TWITTER": "Ver trino en Twitter",
+    "REPLY_TO_TWEET": "Responder a éste trino",
+    "NO_MESSAGES": "No hay mensajes"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 6558a906c..fbee25e61 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -11,7 +11,7 @@
     "OS": "Sistema operativo",
     "INITIATED_FROM": "Iniciado desde",
     "INITIATED_AT": "Iniciado el",
-    "IP_ADDRESS": "IP Address",
+    "IP_ADDRESS": "Dirección IP",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "No hay conversaciones previas asociadas a este contacto.",
       "TITLE": "Conversaciones anteriores"
@@ -34,7 +34,7 @@
       "NO_AVAILABLE_LABELS": "No hay etiquetas añadidas a esta conversación."
     },
     "MUTE_CONTACT": "Silenciar Conversación",
-    "UNMUTE_CONTACT": "Dessilenciar conversación",
+    "UNMUTE_CONTACT": "Des silenciar conversación",
     "MUTED_SUCCESS": "Ésta conversación está silenciada por 6 horas",
     "UNMUTED_SUCCESS": "Ésta conversación ya no está silenciada",
     "SEND_TRANSCRIPT": "Enviar Transcripción",
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Editar Contacto",
     "TITLE": "Editar Contacto",
-    "DESC": "Editar detalles del contacto",
+    "DESC": "Editar detalles del contacto"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Nuevo contacto",
+    "TITLE": "Crear un contacto nuevo",
+    "DESC": "Añadir información básica sobre el contacto."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Enviar",
       "CANCEL": "Cancelar",
@@ -93,23 +100,29 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "El contacto se actualizó",
+    "SUCCESS_MESSAGE": "Contacto guardado correctamente",
     "CONTACT_ALREADY_EXIST": "Ésta dirección de correo está siendo utilizada por otro contacto.",
-    "ERROR_MESSAGE": "Se presento un error actualizando el contacto. Por favor inténtelo nuevamente"
+    "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "HEADER": "Contactos",
+    "SEARCH_BUTTON": "Buscar",
+    "SEARCH_INPUT_PLACEHOLDER": "Buscar contactos",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Nombre",
-        "Número telefónico",
-        "Conversaciones",
-        "Last Contacted"
-      ]
+      "LOADING_MESSAGE": "Cargando contactos...",
+      "404": "No hay contactos que coincidan con tu búsqueda 🔍",
+      "TABLE_HEADER": {
+        "NAME": "Nombre",
+        "PHONE_NUMBER": "Número telefónico",
+        "CONVERSATIONS": "Conversaciones",
+        "LAST_ACTIVITY": "Última actividad",
+        "COUNTRY": "País",
+        "CITY": "Ciudad",
+        "SOCIAL_PROFILES": "Perfiles Sociales",
+        "COMPANY": "Empresa",
+        "EMAIL_ADDRESS": "Dirección de correo"
+      },
+      "VIEW_DETAILS": "Ver detalles"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 18ee43f10..7fc278e0f 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -1,20 +1,20 @@
 {
   "CONVERSATION": {
     "404": "Por favor, selecciona una conversación del panel izquierdo",
-    "NO_MESSAGE_1": "¡Oh oh! Parece que no hay mensajes de los clientes en tu bandeja de entrada.",
-    "NO_MESSAGE_2": " para enviar un mensaje a tu página!",
+    "NO_MESSAGE_1": "¡Oh oh! Parece que no hay mensajes de los clientes en su bandeja de entrada.",
+    "NO_MESSAGE_2": " para enviar un mensaje a su página!",
     "NO_INBOX_1": "¡Hola! Parece que aún no has añadido ninguna bandeja de entrada.",
     "NO_INBOX_2": " para empezar",
-    "NO_INBOX_AGENT": "¡Uh Oh! Parece que no eres parte de ninguna bandeja de entrada. Por favor, contacta con tu administrador",
+    "NO_INBOX_AGENT": "¡Uh Oh! Parece que no es parte de ninguna bandeja de entrada. Por favor, contacte a su administrador",
     "SEARCH_MESSAGES": "Buscar mensajes en conversaciones",
     "SEARCH": {
       "TITLE": "Buscar mensajes",
       "LOADING_MESSAGE": "Cruzando datos...",
       "PLACEHOLDER": "Escriba cualquier texto para buscar mensajes",
-      "NO_MATCHING_RESULTS": "No hay mensajes que coincidan con los parámetros de búsqueda."
+      "NO_MATCHING_RESULTS": "No results found."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Mensajes no leídos",
+    "UNREAD_MESSAGE": "Mensaje sin leer",
     "CLICK_HERE": "Haz clic aquí",
     "LOADING_INBOXES": "Cargando bandeja de entrada",
     "LOADING_CONVERSATIONS": "Cargando conversaciones",
@@ -24,8 +24,8 @@
     "REPLYING_TO": "Esta respondiendo a:",
     "REMOVE_SELECTION": "Eliminar selección",
     "DOWNLOAD": "Descargar",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "NO_RESPONSE": "No response",
+    "UPLOADING_ATTACHMENTS": "Subiendo archivos adjuntos...",
+    "NO_RESPONSE": "No hay respuesta",
     "HEADER": {
       "RESOLVE_ACTION": "Resolver",
       "REOPEN_ACTION": "Reabrir",
@@ -34,7 +34,7 @@
       "DETAILS": "detalles"
     },
     "FOOTER": {
-      "MSG_INPUT": "Shift + enter for new line. Comience con '/' para seleccionar una respuesta predefinida.",
+      "MSG_INPUT": "Shift + enter para nueva línea. Comience con '/' para seleccionar una respuesta predefinida.",
       "PRIVATE_MSG_INPUT": "Mayús + entrar para una nueva línea. Esto será visible sólo para los agentes"
     },
     "REPLYBOX": {
@@ -43,19 +43,20 @@
       "SEND": "Enviar",
       "CREATE": "Añadir nota",
       "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "ENTER_TO_SEND": "Enter to send"
+      "TIP_FORMAT_ICON": "Mostrar editor de textos",
+      "TIP_EMOJI_ICON": "Mostrar selector de emoji",
+      "TIP_ATTACH_ICON": "Adjuntar archivos",
+      "ENTER_TO_SEND": "Ingresar para enviar"
     },
-    "VISIBLE_TO_AGENTS": "Nota privada: solo visible para ti y tu equipo",
+    "VISIBLE_TO_AGENTS": "Nota privada: solo visible para usted y su equipo",
     "CHANGE_STATUS": "Estado de la conversación cambiado",
     "CHANGE_AGENT": "Conversación cambiada de asignatario",
-    "SENT_BY": "Sent by:",
+    "CHANGE_TEAM": "Conversation team changed",
+    "SENT_BY": "Enviado por:",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
+      "SELECT_AGENT": "Seleccionar agente",
       "REMOVE": "Eliminar",
-      "ASSIGN": "Assign"
+      "ASSIGN": "Asignar"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -74,5 +75,37 @@
         "ERROR": "Por favor, introduzca una dirección de correo válida"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hola 👋, ¡Bienvenido a %{installationName}!",
+    "DESCRIPTION": "Gracias por registrarse. Queremos que saque el máximo provecho de %{installationName}. Aquí hay algunas cosas que puede hacer en %{installationName} para hacer que la experiencia sea agradable.",
+    "READ_LATEST_UPDATES": "Leer nuestras últimas actualizaciones",
+    "ALL_CONVERSATION": {
+      "TITLE": "Todas sus conversaciones en un solo lugar",
+      "DESCRIPTION": "Ver todas las conversaciones de sus clientes en un solo panel de control. Puede filtrar las conversaciones por el canal entrante, etiqueta y estado."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite a los miembros de su equipo",
+      "DESCRIPTION": "Ya que usted se está preparando para hablar con su cliente, traiga a sus compañeros para asistirle. Puedes invitar a sus compañeros de equipo añadiendo su dirección de correo electrónico a la lista de agentes.",
+      "NEW_LINK": "Haga clic aquí para invitar a un miembro del equipo"
+    },
+    "INBOXES": {
+      "TITLE": "Conectar bandejas de entrada",
+      "DESCRIPTION": "Conecte varios canales a través de los cuales sus clientes le hablarían. Puede ser un sitio web en vivo, su página de Facebook o Twitter o incluso su número de WhatsApp.",
+      "NEW_LINK": "Haga clic aquí para crear una bandeja de entrada"
+    },
+    "LABELS": {
+      "TITLE": "Organice las conversaciones con etiquetas",
+      "DESCRIPTION": "Las etiquetas proporcionan una forma fácil de clasificar su conversación. Cree algunas etiquetas como #pregunta-soporte, #pregunta-dacturación etc., para que pueda usarlas en una conversación más tarde.",
+      "NEW_LINK": "Haga clic aquí para crear etiquetas"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 205f371d2..69c93be5e 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -4,7 +4,7 @@
     "SUBMIT": "Actualizar ajustes",
     "BACK": "Atrás",
     "UPDATE": {
-      "ERROR": "No se pudo actualizar la configuración, ¡inténtalo de nuevo!",
+      "ERROR": "No se pudo actualizar la configuración, ¡inténtelo de nuevo!",
       "SUCCESS": "Configuración de cuenta actualizada correctamente"
     },
     "FORM": {
@@ -15,16 +15,16 @@
       },
       "NAME": {
         "LABEL": "Nombre de cuenta",
-        "PLACEHOLDER": "Tu nombre de cuenta",
+        "PLACEHOLDER": "Su nombre de cuenta",
         "ERROR": "Por favor, introduzca un nombre de cuenta válido"
       },
       "LANGUAGE": {
         "LABEL": "Idioma del sitio (Beta)",
-        "PLACEHOLDER": "Tu nombre de cuenta",
+        "PLACEHOLDER": "Su nombre de cuenta",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Dominio de email entrante",
+        "LABEL": "Dominio",
         "PLACEHOLDER": "El dominio donde recibirá los emails",
         "ERROR": ""
       },
@@ -43,33 +43,34 @@
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Ahora puede recibir emails en su dominio personalizado."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance."
+    "UPDATE_CHATWOOT": "Hay una actualización %{latestChatwootVersion} para Chatwoot disponible. Por favor, actualiza tu instancia."
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Pulse Enter para seleccionar",
+      "ENTER_TO_REMOVE": "Presione Enter para eliminar",
+      "SELECT_ONE": "Seleccione uno"
     }
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificaciones",
-    "MARK_ALL_DONE": "Mark All Done",
+    "MARK_ALL_DONE": "Marcar Todo Hecho",
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Cargando notificaciones...",
+      "404": "Aún no hay notificaciones",
       "TABLE_HEADER": [
         "Nombre",
         "Número telefónico",
         "Conversaciones",
-        "Last Contacted"
+        "Último Contactado"
+
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Nueva conversación",
+      "conversation_assignment": "Conversación asignada",
+      "assigned_conversation_new_message": "Nuevo mensaje",
+      "conversation_mention": "Mención"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index d9fa13c8d..fa853e0b3 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Entradas",
-    "SIDEBAR_TXT": "<p><b>Bandeja de entrada</b></p> <p> Cuando conecta un sitio web o una página de Facebook a Chatwoot, se llama una <b>Bandeja de entrada</b>. Puede tener bandejas de entrada ilimitadas en su cuenta de Chatwoot. </p><p> Haga clic en <b>Añadir bandeja de entrada</b> para conectar un sitio web o una página de Facebook. </p><p> en el panel, puede ver todas las conversaciones de todas su bandejas de entrada en un solo lugar y responder a ellas en la pestaña `Conversaciones`. </p><p> También puede ver conversaciones específicas de una bandeja de entrada haciendo clic en el nombre de la bandeja de entrada en el menú izquierdo del panel. </p>",
+    "SIDEBAR_TXT": "<p><b>Bandeja de entrada</b></p> <p> Cuando conecta un sitio web o una página de Facebook a Chatwoot, se llama una <b>Bandeja de entrada</b>. Puede tener bandejas de entrada ilimitadas en su cuenta de Chatwoot. </p><p> Haga clic en <b>Añadir bandeja de entrada</b> para conectar un sitio web o una página de Facebook. </p><p> en el panel, puede ver todas las conversaciones de todas sus bandejas de entrada en un solo lugar y responder a ellas en la pestaña `Conversaciones`. </p><p> También puede ver conversaciones específicas de una bandeja de entrada haciendo clic en el nombre de la bandeja de entrada en el menú izquierdo del panel. </p>",
     "LIST": {
       "404": "No hay entradas adjuntas a esta cuenta."
     },
@@ -14,7 +14,7 @@
       {
         "title": "Crear bandeja de entrada",
         "route": "settings_inboxes_page_channel",
-        "body": "Autenticar tu cuenta y crear una bandeja de entrada."
+        "body": "Autenticar su cuenta y crear una bandeja de entrada."
       },
       {
         "title": "Añadir agentes",
@@ -29,7 +29,7 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: Al iniciar sesión, sólo tenemos acceso a los mensajes de tu Página. Tus mensajes privados nunca pueden ser accedidos por Chatwoot.",
+        "HELP": "PS: Al iniciar sesión, sólo tenemos acceso a los mensajes de su Página. Sus mensajes privados nunca pueden ser accedidos por Chatwoot.",
         "CHOOSE_PAGE": "Elegir página",
         "CHOOSE_PLACEHOLDER": "Seleccione una página de la lista",
         "INBOX_NAME": "Nombre de la bandeja de entrada",
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Elija un valor"
       },
       "TWITTER": {
-        "HELP": "Para añadir tu perfil de Twitter como un canal, necesitas autenticar tu perfil de Twitter haciendo clic en 'Iniciar sesión con Twitter' "
+        "HELP": "Para añadir tu perfil de Twitter como un canal, necesitas autenticar tu perfil de Twitter haciendo clic en 'Iniciar sesión con Twitter' ",
+        "ERROR_MESSAGE": "Se ha producido un error al conectar a Twitter, por favor inténtelo nuevamente"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal del sitio web",
@@ -61,7 +62,7 @@
         },
         "CHANNEL_WELCOME_TAGLINE": {
           "LABEL": "Bienvenido Tagline",
-          "PLACEHOLDER": "Facilitamos la conexión con nosotros. Pídanos cualquier cosa o comparte tus comentarios."
+          "PLACEHOLDER": "Facilitamos la conexión con nosotros. Pídanos cualquier cosa o comparte sus comentarios."
         },
         "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mensaje de bienvenida del canal",
@@ -91,7 +92,7 @@
         "DESC": "Integre Twilio y comienze a darle soporte a sus clientes a través de SMS o WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "Cuenta SID",
-          "PLACEHOLDER": "Introduce tu SID de cuenta de Twilio",
+          "PLACEHOLDER": "Introduzca su SID de cuenta de Twilio",
           "ERROR": "Este campo es obligatorio"
         },
         "CHANNEL_TYPE": {
@@ -166,34 +167,34 @@
       "AGENTS": {
         "TITLE": "Agentes",
         "DESC": "Aquí puede agregar agentes para administrar su recién creada bandeja de entrada. Sólo estos agentes seleccionados tendrán acceso a su bandeja de entrada. Los agentes que no forman parte de esta bandeja de entrada no podrán ver o responder a los mensajes de esta bandeja de entrada cuando inicien sesión. <br> <b>PS:</b> Como administrador, si necesita acceso a todas las bandejas, debes añadirte como agente a todas las bandejas de entrada que crees.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "VALIDATION_ERROR": "Añadir al menos un agente a su nueva bandeja de entrada",
+        "PICK_AGENTS": "Elegir agentes para la bandeja de entrada"
       },
       "DETAILS": {
         "TITLE": "Detalles de la bandeja de entrada",
-        "DESC": "En el menú desplegable de abajo, selecciona la página de Facebook que quieres conectar a Chatwoot. También puede dar un nombre personalizado a su bandeja de entrada para una mejor identificación."
+        "DESC": "En el menú desplegable de abajo, seleccione la página de Facebook que quiere conectar a Chatwoot. También puede dar un nombre personalizado a su bandeja de entrada para una mejor identificación."
       },
       "FINISH": {
         "TITLE": "¡Se ha clavado!",
-        "DESC": "Has terminado de integrar correctamente tu página de Facebook con Chatwoot. La próxima vez que un cliente envíe un mensaje a tu Página, la conversación aparecerá automáticamente en tu bandeja de entrada.<br>También le estamos proporcionando un script de widget que puede agregar fácilmente a su sitio web. Una vez que esto está en vivo en tu sitio web, los clientes pueden enviarle mensajes directamente desde su sitio web sin la ayuda de ninguna herramienta externa y la conversación aparecerá aquí, en Chatwoot.<br>¿Genial, eh? Bueno, estamos seguros de que intentaremos ser :)"
+        "DESC": "Ha terminado de integrar correctamente su página de Facebook con Chatwoot. La próxima vez que un cliente envíe un mensaje a su Página, la conversación aparecerá automáticamente en su bandeja de entrada.<br>También le estamos proporcionando un script de widget que puede agregar fácilmente a su sitio web. Una vez que esto está en vivo en su sitio web, los clientes pueden enviarle mensajes directamente desde su sitio web sin la ayuda de ninguna herramienta externa y la conversación aparecerá aquí, en Chatwoot.<br>¿Genial, eh? Bueno, estamos seguros de que intentaremos ser :)"
       }
     },
     "DETAILS": {
       "LOADING_FB": "Autenticándote con Facebook...",
-      "ERROR_FB_AUTH": "Algo salió mal, Por favor actualiza la página...",
-      "CREATING_CHANNEL": "Creando tu bandeja de entrada...",
+      "ERROR_FB_AUTH": "Algo salió mal, Por favor actualice la página...",
+      "CREATING_CHANNEL": "Creando su bandeja de entrada...",
       "TITLE": "Configurar detalles de la Bandeja de Entrada",
       "DESC": ""
     },
     "AGENTS": {
       "BUTTON_TEXT": "Añadir agentes",
-      "ADD_AGENTS": "Añadiendo agentes a tu bandeja de entrada..."
+      "ADD_AGENTS": "Añadiendo agentes a su bandeja de entrada..."
     },
     "FINISH": {
-      "TITLE": "¡Tu bandeja de entrada está lista!",
-      "MESSAGE": "Ahora puedes colaborar con tus clientes a través de tu nuevo canal. Feliz soporte ",
-      "BUTTON_TEXT": "Llévame allí",
-      "WEBSITE_SUCCESS": "Has terminado de crear un canal del sitio web. Copia el código que se muestra a continuación y pégalo en tu sitio web. La próxima vez que un cliente use el chat en vivo, la conversación aparecerá automáticamente en su bandeja de entrada."
+      "TITLE": "¡Su bandeja de entrada está lista!",
+      "MESSAGE": "Ahora puede colaborar con sus clientes a través de su nuevo canal. Feliz soporte ",
+      "BUTTON_TEXT": "Lléveme allí",
+      "WEBSITE_SUCCESS": "Ha terminado de crear un canal del sitio web. Copie el código que se muestra a continuación y pégelo en su sitio web. La próxima vez que un cliente use el chat en vivo, la conversación aparecerá automáticamente en su bandeja de entrada."
     },
     "REAUTH": "Reautorizar",
     "VIEW": "Ver",
@@ -201,7 +202,7 @@
       "API": {
         "SUCCESS_MESSAGE": "Configuración de bandeja de entrada actualizada correctamente",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto-asignación actualizada correctamente",
-        "ERROR_MESSAGE": "No se pudo actualizar el color del widget. Inténtalo de nuevo más tarde."
+        "ERROR_MESSAGE": "No se pudo actualizar el color del widget. Inténtelo de nuevo más tarde."
       },
       "AUTO_ASSIGNMENT": {
         "ENABLED": "Activado",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Ajustes",
       "COLLABORATORS": "Colaboradores",
-      "CONFIGURATION": "Configuración"
+      "CONFIGURATION": "Configuración",
+      "PRE_CHAT_FORM": "Pre-formulario de chat",
+      "BUSINESS_HOURS": "Horarios"
     },
     "SETTINGS": "Ajustes",
     "FEATURES": {
@@ -234,22 +237,57 @@
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script de Messenger",
-      "MESSENGER_SUB_HEAD": "Coloca este botón dentro de tu etiqueta cuerpo",
+      "MESSENGER_SUB_HEAD": "Coloque este botón dentro de su etiqueta cuerpo",
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Añadir o quitar agentes de esta bandeja de entrada",
       "UPDATE": "Actualizar",
       "AUTO_ASSIGNMENT": "Activar asignación automática",
       "INBOX_UPDATE_TITLE": "Ajustes de la Bandeja de Entrada",
-      "INBOX_UPDATE_SUB_TEXT": "Actualizar la configuración de tu bandeja de entrada",
+      "INBOX_UPDATE_SUB_TEXT": "Actualizar la configuración de su bandeja de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activar o desactivar la asignación automática de nuevas conversaciones a los agentes añadidos a esta bandeja de entrada.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder validate the users identity, the SDK allows you to pass an `identity_hash` for each user. You can generate HMAC using 'sha256' with the key shown here."
+      "HMAC_VERIFICATION": "Validación de identidad de usuario",
+      "HMAC_DESCRIPTION": "Con el fin de validar la identidad de los usuarios, el SDK le permite pasar un `identity_hash` por cada usuario. Puede generar HMAC usando 'sha256' con la clave que se muestra aquí."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizar",
-      "SUBTITLE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio",
+      "SUBTITLE": "Su conexión de Facebook expiró, por favor reconecte su página de Facebook para continuar con el servicio",
       "MESSAGE_SUCCESS": "Reconección satisfactoria",
       "MESSAGE_ERROR": "Se presento un error, por favor inténtelo de nuevo"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Los formularios de Pre Chat le permiten capturar la información del usuario antes de que comiencen la conversación con usted.",
+      "ENABLE": {
+        "LABEL": "Activar formulario de pre-chat",
+        "OPTIONS": {
+          "ENABLED": "Si",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Mensaje del Pre Chat",
+        "PLACEHOLDER": "Este mensaje sería visible para los usuarios junto con el formulario"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Los visitantes deben proporcionar su nombre y dirección de correo electrónico antes de iniciar el chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Establecer su disponibilidad",
+      "SUBTITLE": "Establezca su disponibilidad en su widget de livechat",
+      "WEEKLY_TITLE": "Establecer sus horas semanales",
+      "TIMEZONE_LABEL": "Seleccione la zona horaria",
+      "UPDATE": "Actualice las horas de atención",
+      "TOGGLE_AVAILABILITY": "Habilite la disponibilidad de atención para esta bandeja de entrada",
+      "UNAVAILABLE_MESSAGE_LABEL": "Mensajes de no atención disponible para los visitantes",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "No estamos disponibles en este momento. Déjenos un mensaje y le responderemos tan pronto estemos de regreso.",
+      "TOGGLE_HELP": "Al habilitar el horario de atención se mostraran las horas disponibles en el \"widget\" del chat en vivo si todos los agentes están fuera de línea. Fuera de las horas disponibles los visitantes pueden ser notificado con un mensaje y una forma PreChat.",
+      "DAY": {
+        "ENABLE": "Activar la disponibilidad para este día",
+        "UNAVAILABLE": "No disponible",
+        "HOURS": "horas",
+        "VALIDATION_ERROR": "La hora de inicio debe ser antes de la hora de cierre.",
+        "CHOOSE": "Elegir"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 8290ff360..8a785c628 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -8,7 +8,7 @@
       "HEADER_BTN_TXT": "Añadir nuevo webhook",
       "LOADING": "Obteniendo webhooks adjuntos",
       "SEARCH_404": "No hay elementos que coincidan con esta consulta",
-      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks son callbacks HTTP que se pueden definir para cada cuenta. Son activados por eventos como la creación de mensajes en Chatwoot. Puede crear más de un webhook para esta cuenta. <br /><br /> Para crear un webhook <b></b>, haga clic en el <b>Añadir un nuevo webhook</b> botón. También puede eliminar cualquier webhook existente haciendo clic en el botón Borrar.</p>",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks son callbacks HTTP que se pueden definir para cada cuenta. Son activados por eventos como la creación de mensajes en Chatwoot. Puede crear más de un webhook para esta cuenta. <br /><br /> Para crear un webhook <b></b>, haga clic en el botón <b>Añadir un nuevo webhook</b>. También puede eliminar cualquier webhook existente haciendo clic en el botón Borrar.</p>",
       "LIST": {
         "404": "No hay webhooks configurados para esta cuenta.",
         "TITLE": "Administrar webhooks",
@@ -20,7 +20,7 @@
       "ADD": {
         "CANCEL": "Cancelar",
         "TITLE": "Añadir nuevo webhook",
-        "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un callback.",
+        "DESC": "Los eventos Webhook le proporcionan la información en tiempo real sobre lo que está sucediendo en su cuenta de Chatwoot. Por favor, introduzca una URL válida para configurar un callback.",
         "FORM": {
           "END_POINT": {
             "LABEL": "URL de Webhook",
@@ -31,14 +31,14 @@
         },
         "API": {
           "SUCCESS_MESSAGE": "Webhook añadido correctamente",
-          "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+          "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtelo de nuevo más tarde"
         }
       },
       "DELETE": {
         "BUTTON_TEXT": "Eliminar",
         "API": {
           "SUCCESS_MESSAGE": "Webhook eliminado correctamente",
-          "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+          "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtelo de nuevo más tarde"
         },
         "CONFIRM": {
           "TITLE": "Confirmar eliminación",
diff --git a/app/javascript/dashboard/i18n/locale/es/login.json b/app/javascript/dashboard/i18n/locale/es/login.json
index d4aa6f422..6dd846644 100644
--- a/app/javascript/dashboard/i18n/locale/es/login.json
+++ b/app/javascript/dashboard/i18n/locale/es/login.json
@@ -14,7 +14,7 @@
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde",
       "UNAUTH": "Nombre de usuario / Contraseña incorrecto. Inténtelo de nuevo"
     },
-    "FORGOT_PASSWORD": "¿Olvidaste tu contraseña?",
+    "FORGOT_PASSWORD": "¿Olvidó su contraseña?",
     "CREATE_NEW_ACCOUNT": "Crear nueva cuenta",
     "SUBMIT": "Iniciar sesión"
   }
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index 1506917ef..df62659a1 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -3,7 +3,7 @@
     "HEADER": "Informes",
     "LOADING_CHART": "Cargando datos del gráfico...",
     "NO_ENOUGH_DATA": "No hemos recibido suficientes puntos de datos para generar el informe. Inténtalo de nuevo más tarde.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "Descargar reportes de agente",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversaciones",
diff --git a/app/javascript/dashboard/i18n/locale/es/resetPassword.json b/app/javascript/dashboard/i18n/locale/es/resetPassword.json
index 60ff9b8d4..6c5a0729b 100644
--- a/app/javascript/dashboard/i18n/locale/es/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/es/resetPassword.json
@@ -7,7 +7,7 @@
       "ERROR": "Por favor ingrese un email válido"
     },
     "API": {
-      "SUCCESS_MESSAGE": "El enlace para restablecer la contraseña ha sido enviado a tu correo electrónico",
+      "SUCCESS_MESSAGE": "El enlace para restablecer la contraseña ha sido enviado a su correo electrónico",
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
     },
     "SUBMIT": "Enviar"
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index d109c8d99..de424195a 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -16,18 +16,18 @@
       },
       "PASSWORD_SECTION": {
         "TITLE": "Contraseña",
-        "NOTE": "Actualizar tu contraseña restablecería tus entradas en varios dispositivos."
+        "NOTE": "Actualizar su contraseña restablecería sus entradas en varios dispositivos."
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token de acceso",
         "NOTE": "Este token puede ser usado si estás construyendo una integración basada en API"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Notificaciones por email",
-        "NOTE": "Actualiza tus preferencias de notificación por correo electrónico aquí",
+        "TITLE": "Notificaciones por correo",
+        "NOTE": "Actualice sus preferencias de notificación por correo electrónico aquí",
         "CONVERSATION_ASSIGNMENT": "Enviar notificaciones por correo electrónico cuando se me ha asignado una conversación",
         "CONVERSATION_CREATION": "Enviar notificaciones por correo electrónico cuando se crea una nueva conversación",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "Enviar notificaciones por correo electrónico cuando sea mencionado en una conversación",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envirar notificaciones por correo electrónico cuando un nuevo mensaje es creado en una conversación asignada"
       },
       "API": {
@@ -39,7 +39,7 @@
         "NOTE": "Actualize sus preferencias de notificaciones push aquí",
         "CONVERSATION_ASSIGNMENT": "Enviar notificaciones push cuando se me ha asignado una conversación",
         "CONVERSATION_CREATION": "Enviar notificaciones push cuando se crea una nueva conversación",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "Enviar notificaciones push cuando sea mencionado en una conversación",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones push cuando un nuevo mensaja es creadao en una conversación asignada",
         "HAS_ENABLED_PUSH": "Has habilitado notificaciones push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificaciones push"
@@ -66,7 +66,7 @@
         ]
       },
       "EMAIL": {
-        "LABEL": "Tu dirección de correo",
+        "LABEL": "Su dirección de correo",
         "ERROR": "Por favor, introduzca una dirección de correo válida",
         "PLACEHOLDER": "Por favor, introduzca su dirección de correo electrónico, esto se mostrará en las conversaciones"
       },
@@ -115,7 +115,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversaciones",
     "REPORTS": "Informes",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "Contactos",
     "SETTINGS": "Ajustes",
     "HOME": "Inicio",
     "AGENTS": "Agentes",
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Integraciones",
     "ACCOUNT_SETTINGS": "Configuración de la cuenta",
     "LABELS": "Etiquetas",
-    "TEAMS": "Teams"
+    "TEAMS": "Equipos"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Nueva cuenta",
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index ea5a28555..d1f7b6ef6 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -2,21 +2,21 @@
   "REGISTER": {
     "TRY_WOOT": "Registrar una cuenta",
     "TITLE": "Registrarse",
-    "TERMS_ACCEPT": "Al registrarte, aceptas nuestra <a href=\"https://www.chatwoot.com/terms\">T & C</a> y nuestra <a href=\"https://www.chatwoot.com/privacy-policy\">política de privacidad</a>",
+    "TERMS_ACCEPT": "Al registrarse, acepta nuestra <a href=\"https://www.chatwoot.com/terms\">T & C</a> y nuestra <a href=\"https://www.chatwoot.com/privacy-policy\">política de privacidad</a>",
     "ACCOUNT_NAME": {
       "LABEL": "Nombre de cuenta",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "PLACEHOLDER": "Empresas de Wayne",
+      "ERROR": "El nombre de la cuenta es demasiado corto"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Nombre completo",
+      "PLACEHOLDER": "Introduce tu nombre completo, por ejemplo: Bruce Wayne",
+      "ERROR": "El nombre completo es demasiado corto"
     },
     "EMAIL": {
-      "LABEL": "Email de trabajo",
-      "PLACEHOLDER": "Introduzca su dirección de correo electrónico de trabajo. Ejemplo: bruce@wayne.enterprises",
-      "ERROR": "Dirección de correo no válida"
+      "LABEL": "E-mail",
+      "PLACEHOLDER": "bruce@wayne.empresas",
+      "ERROR": "El correo no es válido"
     },
     "PASSWORD": {
       "LABEL": "Contraseña",
@@ -33,6 +33,6 @@
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
     },
     "SUBMIT": "Enviar",
-    "HAVE_AN_ACCOUNT": "¿Ya tienes una cuenta?"
+    "HAVE_AN_ACCOUNT": "¿Ya tiene una cuenta?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
new file mode 100644
index 000000000..8ba5d9433
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Equipos",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Crear",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Añadir agentes",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "¡Todo está listo!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "¡Todo está listo!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Correo electrónico",
+      "BUTTON_TEXT": "Añadir agentes",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Añadir agentes",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Eliminar",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Eliminar ",
+        "NO": "Cancelar"
+      }
+    },
+    "SETTINGS": "Ajustes",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 6a87edfe5..db6231e3b 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "ویرایش مخاطب",
     "TITLE": "ویرایش مخاطب",
-    "DESC": "ویرایش اطلاعات مخاطب",
+    "DESC": "ویرایش اطلاعات مخاطب"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "ثبت",
       "CANCEL": "انصراف",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "مخاطب با موفقیت به روز شد",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "این آدرس ایمیل برای مخاطب دیگری در حال استفاده است.",
-    "ERROR_MESSAGE": "خطایی در به‌روزرسانی مخاطب رخ داده، لطفا دوباره امتحان کنید"
+    "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
   },
   "CONTACTS_PAGE": {
     "HEADER": "مخاطبین",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "در حال بارگذاری مخاطبین...",
       "404": "هیچ مخاطبی با جستجوی شما مطابقت ندارد 🔍",
-      "TABLE_HEADER": [
-        "نام",
-        "شماره تلفن",
-        "گفتگوها",
-        "آخرین تماس"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "نام",
+        "PHONE_NUMBER": "شماره تلفن",
+        "CONVERSATIONS": "گفتگوها",
+        "LAST_ACTIVITY": "آخرین فعالیت",
+        "COUNTRY": "کشور",
+        "CITY": "شهر",
+        "SOCIAL_PROFILES": "پروفایل‌های اجتماعی",
+        "COMPANY": "شرکت",
+        "EMAIL_ADDRESS": "ایمیل"
+      },
+      "VIEW_DETAILS": "مشاهده جزئیات"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index fb720345b..3a757b71e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "جستجو پیام‌ها",
       "LOADING_MESSAGE": "درحال پردازش داده...",
       "PLACEHOLDER": "متنی برای جستجو پیام تایپ کنید",
-      "NO_MATCHING_RESULTS": "گفتگویی با مشخصات ورودی یافت نشد."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "پیام‌های خوانده نشده",
     "UNREAD_MESSAGE": "پیام خوانده نشده",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "یادداشت خصوصی: فقط برای شما و تیم شما قابل مشاهده است",
     "CHANGE_STATUS": "وضعیت گفتگو تغییر کرد",
     "CHANGE_AGENT": "مسول گفتگو تغییر کرد",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "ارسال شده توسط:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "انتخاب ایجنت",
@@ -74,5 +75,37 @@
         "ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index f809aa345..d925db6cb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "یک مقدار انتخاب کنید"
       },
       "TWITTER": {
-        "HELP": "برای اضافه کردن امکان گفتگو از صفحه پروفایل توییترتان، لازم است با زدن دکمه `ورود با توییتر` پروفایل توییتر خود را شناسایی کنید' "
+        "HELP": "برای اضافه کردن امکان گفتگو از صفحه پروفایل توییترتان، لازم است با زدن دکمه `ورود با توییتر` پروفایل توییتر خود را شناسایی کنید' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "کانال وب سایت",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "تنظیمات",
       "COLLABORATORS": "همکاران",
-      "CONFIGURATION": "پیکربندی"
+      "CONFIGURATION": "پیکربندی",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "ساعت کاری"
     },
     "SETTINGS": "تنظیمات",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "اتصال فیس بوک شما منقضی شده است ، لطفاً برای ادامه خدمات دوباره صفحه فیس بوک خود را متصل کنید",
       "MESSAGE_SUCCESS": "اتصال مجدد موفقیت آمیز بود",
       "MESSAGE_ERROR": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "ساعت",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "انتخاب کنید"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 39ad6c770..9f5cfee84 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "برنامه‌های تلفیق شده",
     "ACCOUNT_SETTINGS": "تنظیمات حساب",
     "LABELS": "برچسب‌ها",
-    "TEAMS": "Teams"
+    "TEAMS": "تیم‌ها"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "حساب‌کاربری جدید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
new file mode 100644
index 000000000..35c837717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "تیم‌ها",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "ايجاد كردن",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "معرفی اپراتور",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "دیگه می‌تونی بترکونی"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "دیگه می‌تونی بترکونی"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "ایمیل",
+      "BUTTON_TEXT": "اضافه کردن اپراتور",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "اضافه کردن اپراتور",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "حذف ",
+        "NO": "انصراف"
+      }
+    },
+    "SETTINGS": "تنظیمات",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 9ecd98b47..1c87b0862 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Muokkaa yhteystietoa",
     "TITLE": "Muokkaa yhteystietoa",
-    "DESC": "Muokkaa yhteystietoja",
+    "DESC": "Muokkaa yhteystietoja"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Lähetä",
       "CANCEL": "Peruuta",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Yhteystiedon päivitys onnistui",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Tämä sähköpostiosoite on käytössä toiselle yhteyshenkilölle.",
-    "ERROR_MESSAGE": "Yhteystiedon päivityksessä tapahtui virhe. Ole hyvä ja yritä uudelleen"
+    "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Yhteystiedot",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Ladataan yhteystietoja...",
       "404": "Ei hakua vastaavia yhteystietoja 🔍",
-      "TABLE_HEADER": [
-        "Nimi",
-        "Puhelinnumero",
-        "Keskustelut",
-        "Viimeksi otettu yhteyttä"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nimi",
+        "PHONE_NUMBER": "Puhelinnumero",
+        "CONVERSATIONS": "Keskustelut",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Yritys",
+        "EMAIL_ADDRESS": "Sähköpostiosoite"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index a0e283db2..eb890f647 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Etsi viestejä",
       "LOADING_MESSAGE": "Rouskutetaan dataa...",
       "PLACEHOLDER": "Kirjoita mikä tahansa teksti etsiäksesi viestejä",
-      "NO_MATCHING_RESULTS": "Hakuparametreja vastaavia viestejä ei ole."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Lukemattomat viestit",
     "UNREAD_MESSAGE": "Lukematon viesti",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Yksityinen huomautus: Näkyy vain sinulle ja tiimillesi",
     "CHANGE_STATUS": "Keskustelun tila muutettu",
     "CHANGE_AGENT": "Keskustelun vastaanottaja vaihdettu",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Lähettäjä:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Valitse edustaja",
@@ -74,5 +75,37 @@
         "ERROR": "Ole hyvä ja syötä validi sähköposti"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 708c8bf6b..112ae43b6 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Valitse arvo"
       },
       "TWITTER": {
-        "HELP": "Lisätäksesi twitter-profiilin kanavaksesi, sinun tulee autentikoida twitter-tilisi klikkaamalla \"Kirjaudu sisään Twitterillä\" "
+        "HELP": "Lisätäksesi twitter-profiilin kanavaksesi, sinun tulee autentikoida twitter-tilisi klikkaamalla \"Kirjaudu sisään Twitterillä\" ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Sivuston chat",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Asetukset",
       "COLLABORATORS": "Yhteistyökumppanit",
-      "CONFIGURATION": "Määritykset"
+      "CONFIGURATION": "Määritykset",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Asetukset",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Facebook-yhteytesi on vanhentunut, ole hyvä ja yhdistä uudelleen Facebook-sivusi jatkaaksesi palveluita",
       "MESSAGE_SUCCESS": "Uudelleenyhdistäminen onnistui",
       "MESSAGE_ERROR": "Tapahtui virhe, yritä uudelleen"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
new file mode 100644
index 000000000..a7b26e1e8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Luo",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Lisää edustaja",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Kaikki valmiina!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Kaikki valmiina!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Sähköposti",
+      "BUTTON_TEXT": "Lisää edustaja",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Lisää edustaja",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Poista",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Poista ",
+        "NO": "Peruuta"
+      }
+    },
+    "SETTINGS": "Asetukset",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/chatlist.json b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
index d1ad57afa..9dc4e14bf 100644
--- a/app/javascript/dashboard/i18n/locale/fr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
@@ -80,6 +80,6 @@
     "RECEIVED_VIA_EMAIL": "Reçu par courriel",
     "VIEW_TWEET_IN_TWITTER": "Voir le tweet sur Twitter",
     "REPLY_TO_TWEET": "Répondre à ce tweet",
-    "NO_MESSAGES": "No Messages"
+    "NO_MESSAGES": "Pas de messages"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 0e8308310..05970cde8 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Modifier le contact",
     "TITLE": "Modifier le contact",
-    "DESC": "Modifier les informations de contact",
+    "DESC": "Modifier les informations de contact"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Nouveau contact",
+    "TITLE": "Créer un nouveau contact",
+    "DESC": "Ajouter des informations de base à propos du contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Envoyer",
       "CANCEL": "Annuler",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contact mis à jour avec succès",
+    "SUCCESS_MESSAGE": "Contact enregistré avec succès",
     "CONTACT_ALREADY_EXIST": "Cette adresse de courriel est déjà utilisée pour un autre contact.",
-    "ERROR_MESSAGE": "Une erreur s'est produite lors de la mise à jour du contact, veuillez réessayer"
+    "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Chargement des contacts...",
       "404": "Aucun contact ne correspond à votre recherche 🔍",
-      "TABLE_HEADER": [
-        "Nom",
-        "Numéro de téléphone",
-        "Conversations",
-        "Dernièrement contacté"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nom",
+        "PHONE_NUMBER": "Numéro de téléphone",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Dernière activité",
+        "COUNTRY": "Pays",
+        "CITY": "Ville",
+        "SOCIAL_PROFILES": "Comptes réseaux sociaux",
+        "COMPANY": "Société",
+        "EMAIL_ADDRESS": "Adresse de courriel"
+      },
+      "VIEW_DETAILS": "Voir les détails"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 9fe75bf12..9ff0cfa62 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Rechercher des messages",
       "LOADING_MESSAGE": "Traitement des données ...",
       "PLACEHOLDER": "Saisissez n'importe quel texte pour rechercher des messages",
-      "NO_MATCHING_RESULTS": "Aucun message ne correspond aux paramètres de recherche."
+      "NO_MATCHING_RESULTS": "Aucun résultat trouvé."
     },
     "UNREAD_MESSAGES": "Messages non lus",
     "UNREAD_MESSAGE": "Message non lu",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Supprimer la sélection",
     "DOWNLOAD": "Télécharger",
     "UPLOADING_ATTACHMENTS": "Envoi des pièces jointes...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Pas de réponse",
     "HEADER": {
       "RESOLVE_ACTION": "Résoudre",
       "REOPEN_ACTION": "Ré-ouvrir",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Note privée : uniquement visible par vous et votre équipe",
     "CHANGE_STATUS": "Statut de la conversation modifié",
     "CHANGE_AGENT": "Responsable de la conversation modifié",
+    "CHANGE_TEAM": "L'équipe de conversation a été modifiée",
     "SENT_BY": "Envoyé par:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Sélectionner un agent",
@@ -74,5 +75,37 @@
         "ERROR": "Veuillez saisir une adresse de courriel valide"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Salut 👋, Bienvenue sur %{installationName}!",
+    "DESCRIPTION": "Merci pour votre inscription. Nous souhaitons que vous tiriez le meilleur parti de %{installationName}. Voici quelques actions que vous pouvez effectuer dans %{installationName} pour rendre votre expérience agréable.",
+    "READ_LATEST_UPDATES": "Consultez nos dernières mises à jour",
+    "ALL_CONVERSATION": {
+      "TITLE": "Toutes vos conversations en un seul lieu",
+      "DESCRIPTION": "Visualisez toutes les conversations de vos clients dans un seul tableau de bord. Vous pouvez filtrer les conversations par le canal entrant, l'étiquette et le statut."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invitez les membres de votre équipe",
+      "DESCRIPTION": "Puisque vous vous apprêtez à parler à votre client, faites venir vos coéquipiers pour vous aider. Vous pouvez inviter vos coéquipiers en ajoutant leur adresse email à la liste des agents.",
+      "NEW_LINK": "Cliquez ici pour inviter un membre de l'équipe"
+    },
+    "INBOXES": {
+      "TITLE": "Connecter les boîtes de réception",
+      "DESCRIPTION": "Connectez différents canaux à travers lesquels vos clients vous parleraient. Il peut s'agir d'un chat de site internet, de votre page Facebook ou Twitter ou même de votre numéro WhatsApp.",
+      "NEW_LINK": "Cliquez ici pour créer une boîte de réception"
+    },
+    "LABELS": {
+      "TITLE": "Organiser les conversations avec des labels",
+      "DESCRIPTION": "Les labels fournissent un moyen plus facile de catégoriser votre conversation. Créez des étiquettes comme #demande-support, #question-facturation etc., afin que vous puissiez les utiliser dans une conversation plus tard.",
+      "NEW_LINK": "Cliquez ici pour créer des tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Détails de la conversation",
+    "ASSIGNEE_LABEL": "Agent Assigné",
+    "TEAM_LABEL": "Équipe assignée",
+    "SELECT": {
+      "PLACEHOLDER": "Aucun"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index 117d509ea..ddfa37b2f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -54,10 +54,10 @@
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "MARK_ALL_DONE": "Tout marquer comme terminé",
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Chargement des notifications...",
+      "404": "Aucune notification",
       "TABLE_HEADER": [
         "Nom",
         "Numéro de téléphone",
@@ -66,9 +66,9 @@
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
+      "conversation_creation": "Nouvelle conversation",
+      "conversation_assignment": "Conversation assignée",
+      "assigned_conversation_new_message": "Nouveau message",
       "conversation_mention": "Mention"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index cc596263e..527cf3dc4 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Choisir une valeur"
       },
       "TWITTER": {
-        "HELP": "Pour ajouter votre profil Twitter en tant que canal, vous devez lier votre profil Twitter en cliquant sur 'Se connecter avec Twitter' "
+        "HELP": "Pour ajouter votre profil Twitter en tant que canal, vous devez lier votre profil Twitter en cliquant sur 'Se connecter avec Twitter' ",
+        "ERROR_MESSAGE": "Une erreur s'est produite lors de la connexion à Twitter, veuillez réessayer"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal site Web",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Paramètres",
       "COLLABORATORS": "Collaborateurs",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Formulaire avant chat",
+      "BUSINESS_HOURS": "Heures de bureau"
     },
     "SETTINGS": "Paramètres",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services",
       "MESSAGE_SUCCESS": "Reconnexion réussie",
       "MESSAGE_ERROR": "Une erreur est survenue, veuillez réessayer"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Les formulaires précédant le chat vous permettent de saisir les informations de l'utilisateur avant qu'ils ne commencent à discuter avec vous.",
+      "ENABLE": {
+        "LABEL": "Activer le formulaire précédant le chat",
+        "OPTIONS": {
+          "ENABLED": "Oui",
+          "DISABLED": "Non"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Message avant le chat",
+        "PLACEHOLDER": "Ce message serait visible pour les utilisateurs avec le formulaire"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Les visiteurs doivent indiquer leur nom et leur courriel avant de commencer le chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Définissez votre disponibilité",
+      "SUBTITLE": "Définissez votre disponibilité sur votre widget livechat",
+      "WEEKLY_TITLE": "Définissez vos horaires de travail",
+      "TIMEZONE_LABEL": "Sélectionnez le fuseau horaire",
+      "UPDATE": "Mettre à jour les paramètres des heures de bureau",
+      "TOGGLE_AVAILABILITY": "Activer la disponibilité aux heures de bureau pour cette boîte de réception",
+      "UNAVAILABLE_MESSAGE_LABEL": "Message indisponible pour les visiteurs",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Nous ne sommes pas disponibles pour le moment. Laissez-nous un message, et nous répondrons dès notre retour.",
+      "TOGGLE_HELP": "Activer la disponibilité aux heures de bureau montrera les heures disponibles sur le widget chat en direct même si tous les agents sont hors ligne. En dehors des heures disponibles, les visiteurs peuvent être avertis avec un message et un formulaire de préconversation.",
+      "DAY": {
+        "ENABLE": "Activer la disponibilité pour ce jour",
+        "UNAVAILABLE": "Non disponible",
+        "HOURS": "heures",
+        "VALIDATION_ERROR": "L'heure de début doit être avant l'heure de fermeture.",
+        "CHOOSE": "Sélectionner"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index bcd44ad6f..d529db83d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -27,7 +27,7 @@
         "NOTE": "Mettez à jour vos préférences de notification par courriel ici",
         "CONVERSATION_ASSIGNMENT": "Envoyer des notifications par courriel lorsqu'une conversation m'est assignée",
         "CONVERSATION_CREATION": "Envoyer des notifications par courriel quand une nouvelle conversation est créée",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "Envoyer des notifications par courriel lorsque vous êtes mentionné dans une conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications par courriel lorsqu'un nouveau message est créé dans une conversation assignée"
       },
       "API": {
@@ -39,7 +39,7 @@
         "NOTE": "Mettez à jour vos préférences de notification push ici",
         "CONVERSATION_ASSIGNMENT": "Envoyer des notifications push lorsqu'une conversation m'est assignée",
         "CONVERSATION_CREATION": "Envoyer des notifications push quand une nouvelle conversation est créée",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "Envoyer des notifications push lorsque vous êtes mentionné dans une conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications push lorsqu'un nouveau message est créé dans une conversation assignée",
         "HAS_ENABLED_PUSH": "Vous avez activé les notifications pour ce navigateur.",
         "REQUEST_PUSH": "Activer les notifications push"
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Intégrations",
     "ACCOUNT_SETTINGS": "Paramètres du compte",
     "LABELS": "Étiquettes",
-    "TEAMS": "Teams"
+    "TEAMS": "Équipes"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Nouveau compte",
diff --git a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
new file mode 100644
index 000000000..7e81d9ed0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Créer une nouvelle équipe",
+    "HEADER": "Équipes",
+    "SIDEBAR_TXT": "<p><b>Équipes</b></p> <p>Les équipes vous permettent d'organiser vos agents en groupes en fonction de leurs responsabilités. <br /> Un utilisateur peut faire partie de plusieurs équipes. Vous pouvez assigner des conversations à une équipe lorsque vous travaillez en collaboration. </p>",
+    "LIST": {
+      "404": "Il n'y a aucune équipe créée sur ce compte.",
+      "EDIT_TEAM": "Modifier l'équipe"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Créer une nouvelle équipe",
+        "DESC": "Ajoutez un titre et une description à votre nouvelle équipe."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Ajouter un agent à votre équipe",
+        "TITLE": "Ajouter des agents à l'équipe - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Créer",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Ajouter des agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Vous êtes paré !"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Ajouter des agents à l'équipe - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Vous êtes paré !"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "COURRIEL",
+      "BUTTON_TEXT": "Ajouter des agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Ajouter des agents à l'équipe - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Ajouter des agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Supprimer",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Supprimer ",
+        "NO": "Annuler"
+      }
+    },
+    "SETTINGS": "Paramètres",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index da85ffab8..d6cc103ca 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Submit",
       "CANCEL": "Cancel",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Name",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 967378552..da1192e84 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Please enter a valid email address"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index db2e6cea8..42bc5f592 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' "
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website channel",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
new file mode 100644
index 000000000..5ba108626
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
index abe7eec3f..e5a65c807 100644
--- a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
@@ -3,15 +3,15 @@
     "HEADER": "Ügynökök",
     "HEADER_BTN_TXT": "Ügynök Hozzádása",
     "LOADING": "Ügynökök Listájának Lekérése",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "SIDEBAR_TXT": "<p><b>Ügynökök</b></p> <p> Egy <b>Ügynök</b> tagja a terméktámogatási csapatodnak.</p> <p>Az ügynökök láthatják és válaszolhatnak a felhasználóid üzeneteire. A lista minden jelenleg a fiókodban található ügynököt mutatja.</p><p> Kattints az <b>Ügynök hozzáadásra</b> új ügynök hozzáadásához. Az ügynök amelyet hozzáadsz e-mailt fog kapni egy megerősítő linkkel, mellyel aktiválhatják a fiókjukat, mely után hozzáférést kapnak a Chatwoot-hoz és válaszolhatnak üzenetekre. </p><p>A Chatwoot lehetőségeihez a következő szerepkörök alapján férhet hozzá.</p><p><b>Ügynökök</b> - Ezzel a szerepkörrel rendelkező ügynökök hozzáférhetnek az inboxokhoz, jelentésekhez és beszélgetésekhez. Hozzárendelhetnek beszélgetéseket más ügynökökhöz vagy saját magukhoz és lezárhatnak beszélgetéseket.</p><p> <b>Adminisztrátor</b> - Az Adminisztrátor felhasználók hozzáférhetnek minden Chatwoot funkcióhoz mely a fiókhoz tartozik, beleértve a beállításokat, illetve a normális ügynöki felhasználói jogosultságokkal is bírnak.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Adminisztrátor",
       "AGENT": "Ügynök"
     },
     "LIST": {
-      "404": "There are no agents associated to this account",
-      "TITLE": "Manage agents in your team",
-      "DESC": "You can add/remove agents to/in your team.",
+      "404": "Ehhez a fiókhoz nincs ügynök rendelve",
+      "TITLE": "A csapatod ügynökeinek kezelése",
+      "DESC": "Hozzáadhatsz és törölhetsz ügynököket a csapatodban.",
       "NAME": "Név",
       "EMAIL": "EMAIL",
       "STATUS": "Státusz",
@@ -42,24 +42,24 @@
       "API": {
         "SUCCESS_MESSAGE": "Ügynök sikeresen hozzáadva",
         "EXIST_MESSAGE": "Az ügynök email cím már használatban van, kérjük próbálkozzon újra másik email címmel",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Törlés",
       "API": {
-        "SUCCESS_MESSAGE": "Agent deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "Ügynök sikeresen hozzáadva",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Törlés megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli ",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
       }
     },
     "EDIT": {
-      "TITLE": "Edit agent",
+      "TITLE": "Ügynök szerkesztése",
       "FORM": {
         "NAME": {
           "LABEL": "Ügynök neve",
@@ -74,23 +74,23 @@
           "LABEL": "Email cím",
           "PLACEHOLDER": "Kérjük adja meg az ügynök email címét"
         },
-        "SUBMIT": "Edit Agent"
+        "SUBMIT": "Ügynök szerkesztése"
       },
-      "BUTTON_TEXT": "Edit",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "BUTTON_TEXT": "Szerkesztés",
+      "CANCEL_BUTTON_TEXT": "Mégse",
       "API": {
-        "SUCCESS_MESSAGE": "Agent updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "Ügynök sikeresen frissítve",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       },
       "PASSWORD_RESET": {
-        "ADMIN_RESET_BUTTON": "Reset Password",
-        "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
-        "SUCCESS_MESSAGE": "Agent password reset successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ADMIN_RESET_BUTTON": "Új jelszó kérése",
+        "ADMIN_SUCCESS_MESSAGE": "Egy e-mail a jelszófrissítési utasításokkal sikeresen kiküldve az ügynöknek",
+        "SUCCESS_MESSAGE": "Ügynök jelszó sikeresen frissítve",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No agents found."
+      "NO_RESULTS": "Nem találunk ügynököt."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
index 2d8e45217..2e3e5313c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Canned Responses",
-    "HEADER_BTN_TXT": "Add Canned Response",
-    "LOADING": "Fetching Canned Responses",
-    "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation . </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "HEADER": "Mentett válaszok",
+    "HEADER_BTN_TXT": "Mentett válasz hozzáadása",
+    "LOADING": "Mentett válaszok letöltése",
+    "SEARCH_404": "Nincs megfelelő elem",
+    "SIDEBAR_TXT": "<p><b>Mentett válaszok</b> </p><p>  A mentett válaszok sablonok, melyeket gyors válaszok kiküldésére használhatsz.  </p><p> Mentett válasz létrehozásához kattints a <b>Mentett válasz létrehozása</b>-ra. Szerkesztheted vagy törölheted is a mentett válaszokat a Szerkesztés és Törlés gombokkal. A mentett válaszokat <b>rövidkódok</b> segítéségével használhatod. Az ügynökök a <b>'/'</b> jel begépelésével és a megfelelő rövidkód begépelésével férhetnek hozzá a válaszokhoz.</p>",
     "LIST": {
-      "404": "There are no canned responses available in this account.",
-      "TITLE": "Manage canned responses",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "404": "Nincs megfelelő mentett válasz ebben a fiókban.",
+      "TITLE": "Mentett válaszok kezelése",
+      "DESC": "A mentett válaszok előre meghatározott sablonok, melyeket gyors válaszok kiküldésére használhatsz.",
       "TABLE_HEADER": [
-        "Short Code",
-        "Content",
+        "Rövidkód",
+        "Tartalom",
         "Műveletek"
       ]
     },
     "ADD": {
-      "TITLE": "Add Canned Response",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "Mentett válasz hozzáadása",
+      "DESC": "A mentett válaszok előre meghatározott sablonok, melyeket gyors válaszok kiküldésére használhatsz .",
+      "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "Rövidkód",
+          "PLACEHOLDER": "Kérjük adj meg egy Rövidkódot",
+          "ERROR": "Rövidkód szükséges"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "Tartalom",
+          "PLACEHOLDER": "Kérjük adj meg tartalmat",
+          "ERROR": "Tartalom szükséges"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "Elküldés"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "A mentett válasz sikeresen hozzáadva",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Canned Response",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "Mentett válasz szerkesztése",
+      "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "Rövidkód",
+          "PLACEHOLDER": "Kérjük adj meg egy Rövidkódot",
+          "ERROR": "Rövidkód szükséges"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "Tartalom",
+          "PLACEHOLDER": "Kérjük adj meg tartalmat",
+          "ERROR": "Tartalom szükséges"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "Elküldés"
       },
-      "BUTTON_TEXT": "Edit",
+      "BUTTON_TEXT": "Szerkesztés",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "A mentett válasz sikeresen frissítve",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Törlés",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "A mentett válasz sikeresen törölve",
+        "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Törlés megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli ",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 228554789..ad92ed50a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -1,49 +1,49 @@
 {
   "CHAT_LIST": {
-    "LOADING": "Fetching conversations",
-    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
-    "EOF": "All conversations loaded 🎉",
+    "LOADING": "Beszélgetések betöltése",
+    "LOAD_MORE_CONVERSATIONS": "További beszélgetések betöltése",
+    "EOF": "Minden beszélgetés betöltve 🎉",
     "LIST": {
-      "404": "There are no active conversations in this group."
+      "404": "Nincs aktív üzenetváltás ebben a csoportban."
     },
-    "TAB_HEADING": "Conversations",
+    "TAB_HEADING": "Beszélgetések",
     "SEARCH": {
-      "INPUT": "Search for People, Chats, Saved Replies .."
+      "INPUT": "Keresés: emberek, beszélgetése, mentett válaszok .."
     },
     "STATUS_TABS": [
       {
-        "NAME": "Open",
+        "NAME": "Megnyitás",
         "KEY": "openCount"
       },
       {
-        "NAME": "Resolved",
+        "NAME": "Megoldva",
         "KEY": "allConvCount"
       }
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Mine",
+        "NAME": "Enyém",
         "KEY": "me",
         "COUNT_KEY": "mineCount"
       },
       {
-        "NAME": "Unassigned",
+        "NAME": "Gazdátlan",
         "KEY": "unassigned",
         "COUNT_KEY": "unAssignedCount"
       },
       {
-        "NAME": "All",
+        "NAME": "Mind",
         "KEY": "all",
         "COUNT_KEY": "allCount"
       }
     ],
     "CHAT_STATUS_ITEMS": [
       {
-        "TEXT": "Open",
+        "TEXT": "Megnyitás",
         "VALUE": "open"
       },
       {
-        "TEXT": "Resolved",
+        "TEXT": "Megoldva",
         "VALUE": "resolved"
       },
       {
@@ -54,32 +54,32 @@
     "ATTACHMENTS": {
       "image": {
         "ICON": "ion-image",
-        "CONTENT": "Picture message"
+        "CONTENT": "Képüzenet"
       },
       "audio": {
         "ICON": "ion-volume-high",
-        "CONTENT": "Audio message"
+        "CONTENT": "Hangüzenet"
       },
       "video": {
         "ICON": "ion-ios-videocam",
-        "CONTENT": "Video message"
+        "CONTENT": "Videoüzenet"
       },
       "file": {
         "ICON": "ion-document",
-        "CONTENT": "File Attachment"
+        "CONTENT": "Csatolt file"
       },
       "location": {
         "ICON": "ion-ios-location",
-        "CONTENT": "Location"
+        "CONTENT": "Hely"
       },
       "fallback": {
         "ICON": "ion-link",
-        "CONTENT": "has shared a url"
+        "CONTENT": "megosztott URL-t tartalmaz"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Received via email",
-    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
-    "REPLY_TO_TWEET": "Reply to this tweet",
-    "NO_MESSAGES": "No Messages"
+    "RECEIVED_VIA_EMAIL": "E-mailen keresztül érkezett",
+    "VIEW_TWEET_IN_TWITTER": "Üzenet megtekintése Twitteren",
+    "REPLY_TO_TWEET": "Válasz",
+    "NO_MESSAGES": "Nincs üzenet"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index b4ce90f6e..13f39fdbb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -1,115 +1,128 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
+    "NOT_AVAILABLE": "Nem elérhető",
     "EMAIL_ADDRESS": "Email cím",
-    "PHONE_NUMBER": "Phone number",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
-    "COMPANY": "Company",
-    "LOCATION": "Location",
-    "CONVERSATION_TITLE": "Conversation Details",
-    "BROWSER": "Browser",
-    "OS": "Operating System",
-    "INITIATED_FROM": "Initiated from",
-    "INITIATED_AT": "Initiated at",
-    "IP_ADDRESS": "IP Address",
+    "PHONE_NUMBER": "Telefonszám",
+    "COPY_SUCCESSFUL": "Vágólapra másolva",
+    "COMPANY": "Cég",
+    "LOCATION": "Hely",
+    "CONVERSATION_TITLE": "Beszélgetés részletei",
+    "BROWSER": "Böngésző",
+    "OS": "Operációs rendszer",
+    "INITIATED_FROM": "Kezdeményezve",
+    "INITIATED_AT": "Kezdeményezve",
+    "IP_ADDRESS": "IP cím",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
-      "TITLE": "Previous Conversations"
+      "NO_RECORDS_FOUND": "Nincs megelőző beszélgetés ezzel a kontakttal.",
+      "TITLE": "Korábbi beszélgetések"
     },
     "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
+      "TITLE": "Egyedi atribútumok"
     },
     "LABELS": {
-      "TITLE": "Conversation Labels",
+      "TITLE": "Beszélgetés cimkék",
       "MODAL": {
-        "TITLE": "Labels for",
-        "ACTIVE_LABELS": "Labels added to the conversation",
-        "INACTIVE_LABELS": "Labels available in the account",
-        "REMOVE": "Click on X icon to remove the label",
-        "ADD": "Click on + icon to add the label",
-        "UPDATE_BUTTON": "Update labels",
-        "UPDATE_ERROR": "Couldn't update labels, try again."
+        "TITLE": "Kapcsolódó cimkék",
+        "ACTIVE_LABELS": "A beszélgetéshez hozzáadott cimkék",
+        "INACTIVE_LABELS": "A fiókhoz tartozó cimkék",
+        "REMOVE": "Kattints az X ikonra a cimke eltávolításához",
+        "ADD": "Kattints a + ikonra a cimke hozzáadásához",
+        "UPDATE_BUTTON": "Cimkék frissítése",
+        "UPDATE_ERROR": "Cimke frissítés sikertelen, kérjük próbáld később."
       },
-      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
-      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+      "NO_LABELS_TO_ADD": "Ebben a fiókban már nincsenek további cimkék.",
+      "NO_AVAILABLE_LABELS": "Nincs több cimke ehhez a beszélgetéshez."
     },
-    "MUTE_CONTACT": "Mute Conversation",
-    "UNMUTE_CONTACT": "Unmute Conversation",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
-    "SEND_TRANSCRIPT": "Send Transcript",
-    "EDIT_LABEL": "Edit"
+    "MUTE_CONTACT": "Beszélgetés elnémítása",
+    "UNMUTE_CONTACT": "Beszélgetés elnémításának feloldása",
+    "MUTED_SUCCESS": "A beszélgetés 6 órára elnémítva",
+    "UNMUTED_SUCCESS": "A beszélgetés elnémítása megszűntetve",
+    "SEND_TRANSCRIPT": "Jegyzetek elküldése",
+    "EDIT_LABEL": "Szerkesztés"
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "BUTTON_LABEL": "Jegyzetek szerkesztése",
+    "TITLE": "Kontakt szerkesztése",
+    "DESC": "Kontakt részletek szerkesztése"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Új kontakt",
+    "TITLE": "Új kontakt létrehozása",
+    "DESC": "Alapvető információ a kontaktról."
+  },
+  "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Submit",
-      "CANCEL": "Cancel",
+      "SUBMIT": "Elküldés",
+      "CANCEL": "Mégse",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Kontakt avatarja"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "A kontakt teljes nevének megadása",
+        "LABEL": "Teljes név"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "A kontakt önéletrajzának megadása",
+        "LABEL": "Önéletrajz"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "A kontakt e-mailjének megadása",
         "LABEL": "Email cím"
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "PLACEHOLDER": "A kontakt telefonszámának megadása",
+        "LABEL": "Telefonszám"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
-        "LABEL": "Location"
+        "PLACEHOLDER": "A kontakt helyének megadása",
+        "LABEL": "Hely"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Cégnév megadása",
+        "LABEL": "Cégnév"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Facebook felhasználó megadása",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Twitter felhasználó megadása",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Linkedin usernév hozzáadása",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Github felhasználó megadása",
           "LABEL": "Github"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
-    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "SUCCESS_MESSAGE": "Kontakt mentés sikeres",
+    "CONTACT_ALREADY_EXIST": "Az e-mailcím már egy másik kontakthoz tartozik.",
+    "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "HEADER": "Kontaktok",
+    "SEARCH_BUTTON": "Keresés",
+    "SEARCH_INPUT_PLACEHOLDER": "Kontaktok keresése",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Név",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ]
+      "LOADING_MESSAGE": "Kontaktok betöltése...",
+      "404": "Nincs a keresésnek megfelelő kontakt 🔍",
+      "TABLE_HEADER": {
+        "NAME": "Név",
+        "PHONE_NUMBER": "Telefonszám",
+        "CONVERSATIONS": "Beszélgetések",
+        "LAST_ACTIVITY": "Utolsó aktivitás",
+        "COUNTRY": "Ország",
+        "CITY": "Város",
+        "SOCIAL_PROFILES": "Social media profilok",
+        "COMPANY": "Cég",
+        "EMAIL_ADDRESS": "Email cím"
+      },
+      "VIEW_DETAILS": "Részletek megtekintése"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 967378552..df102b2ba 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -1,78 +1,111 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
-    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
-    "NO_MESSAGE_2": " to send a message to your page!",
-    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
-    "NO_INBOX_2": " to get started",
-    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "404": "Kérjük válassz egy beszélgetést a bal sávból",
+    "NO_MESSAGE_1": "Jajj ne! Úgy tűnik, hogy nincs több ügyfélbeszélgetés az inboxodban.",
+    "NO_MESSAGE_2": "egy üzenet küldéséhez az oldaladra!",
+    "NO_INBOX_1": "Hola! Úgy tűnik, hogy még nem adtál hozzá fiókokat.",
+    "NO_INBOX_2": " Első lépések",
+    "NO_INBOX_AGENT": "O-Ó! Úgy tűnik, hogy egyetlen fióknak sem vagy tagja. Kérjük lépj kapcsolatba az adminisztrátoroddal",
+    "SEARCH_MESSAGES": "Üzenetek keresése a beszélgetésekben",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "TITLE": "Üzenetekben keresés",
+      "LOADING_MESSAGE": "Adatelemzés...",
+      "PLACEHOLDER": "Írj be szöveget hogy keress az üzenetek közt",
+      "NO_MATCHING_RESULTS": "No results found."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
-    "CLICK_HERE": "Click here",
-    "LOADING_INBOXES": "Loading inboxes",
-    "LOADING_CONVERSATIONS": "Loading Conversations",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "LAST_INCOMING_TWEET": "You are replying to the last incoming tweet",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "NO_RESPONSE": "No response",
+    "UNREAD_MESSAGES": "Olvasatlan üzenetek",
+    "UNREAD_MESSAGE": "Olvasatlan üzenet",
+    "CLICK_HERE": "Kattints ide",
+    "LOADING_INBOXES": "Postaládák betöltése",
+    "LOADING_CONVERSATIONS": "Beszélgetések betöltése",
+    "CANNOT_REPLY": "Nem tudunk válaszolni, mivel",
+    "24_HOURS_WINDOW": "24 órás üzeneti ablak megkötés",
+    "LAST_INCOMING_TWEET": "Az utolsó beérkező tweetre válaszolsz",
+    "REPLYING_TO": "Neki válaszolsz:",
+    "REMOVE_SELECTION": "Kijelölés törlése",
+    "DOWNLOAD": "Letöltés",
+    "UPLOADING_ATTACHMENTS": "Csatolt fileok feltöltése...",
+    "NO_RESPONSE": "Nincs válasz",
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
-      "OPEN": "More",
-      "CLOSE": "Close",
-      "DETAILS": "details"
+      "RESOLVE_ACTION": "Megoldva",
+      "REOPEN_ACTION": "Újranyitás",
+      "OPEN": "Tovább",
+      "CLOSE": "Bezárás",
+      "DETAILS": "részletek"
     },
     "FOOTER": {
-      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
-      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+      "MSG_INPUT": "Shift + enter új sorért. Kezdj a '/'-el mentett válasz kiválasztásához.",
+      "PRIVATE_MSG_INPUT": "Shift + enter új sorért. Ezt csak ügynökök láthatják"
     },
     "REPLYBOX": {
-      "REPLY": "Reply",
-      "PRIVATE_NOTE": "Private Note",
-      "SEND": "Send",
-      "CREATE": "Add Note",
+      "REPLY": "Válasz",
+      "PRIVATE_NOTE": "Privát üzenet",
+      "SEND": "Elküldés",
+      "CREATE": "Megjegyzés hozzáadása",
       "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "ENTER_TO_SEND": "Enter to send"
+      "TIP_FORMAT_ICON": "Rich szövegszerkesztő mutatása",
+      "TIP_EMOJI_ICON": "Emoji választó mutatása",
+      "TIP_ATTACH_ICON": "Fileok csatolása",
+      "ENTER_TO_SEND": "Enter-rel elküld"
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
-    "CHANGE_AGENT": "Conversation Assignee changed",
-    "SENT_BY": "Sent by:",
+    "VISIBLE_TO_AGENTS": "Privát megjegyzés: csak Neked és a csapat tagjainak látható",
+    "CHANGE_STATUS": "A beszélgetés státusza megváltozott",
+    "CHANGE_AGENT": "Hozzárendelt ügynök megváltoztatva",
+    "CHANGE_TEAM": "Conversation team changed",
+    "SENT_BY": "Küldő:",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
-      "REMOVE": "Remove",
-      "ASSIGN": "Assign"
+      "SELECT_AGENT": "Ügynök kiválasztása",
+      "REMOVE": "Eltávolítás",
+      "ASSIGN": "Hozzárendelés"
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
-    "SUBMIT": "Submit",
-    "CANCEL": "Cancel",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "TITLE": "Beszélgetés kivonat elküldése",
+    "DESC": "A beszélgetés másolatának elküldése egy megadott e-mailcímre",
+    "SUBMIT": "Elküldés",
+    "CANCEL": "Mégse",
+    "SEND_EMAIL_SUCCESS": "A beszélgetés jegyzet sikeresen elküldve",
+    "SEND_EMAIL_ERROR": "Hiba történt, kérjük próbáld újra",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "A beszélgetés jegyzet elküldése az ügyfélnek",
+      "SEND_TO_AGENT": "A beszélgetés jegyzet elküldése a hozzárendelt ügynöknek",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Küldj jegyzetet egy másik e-mailcímre",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
-        "ERROR": "Please enter a valid email address"
+        "PLACEHOLDER": "E-mailcím megadása",
+        "ERROR": "Kérjük helyes e-mailcímet adj meg"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hello 👋, köszöntünk a %{installationName}!",
+    "DESCRIPTION": "Köszönjük, hogy feliratkoztál. Segíteni akarunk, hogy a legtöbbet hozd ki a %{installationName}. Itt találsz egy pár dolgot, amit a %{installationName} lehetővé tesz.",
+    "READ_LATEST_UPDATES": "Olvasd el legfrissebbeket",
+    "ALL_CONVERSATION": {
+      "TITLE": "Minden beszélgetésed egy helyen",
+      "DESCRIPTION": "Kövesd az összes ügyfélbeszélgetésedet egy felületről. Szűrheted a beszélgetéseket csatorna, cimke vagy státusz alapján."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Hívd meg csapattagjaidat",
+      "DESCRIPTION": "Mivel éppen ügyféllel készülsz beszélni, hívd meg a csapattagjaidat, hogy segítségül legyenek. Az e-mailcímük ügynöklistába való megadásával tudod meghívni őket.",
+      "NEW_LINK": "Kattints ide csapattag meghívásához"
+    },
+    "INBOXES": {
+      "TITLE": "Inboxok összekötése",
+      "DESCRIPTION": "Különböző csatornákat használva kapcsolódj az ügyfeleidhez. Weboldal chateden, a Facebook vagy Twitter fiókodon, vagy akár WhatsApp számodon keresztül.",
+      "NEW_LINK": "Kattints ide postaláda létrehozásához"
+    },
+    "LABELS": {
+      "TITLE": "Rendezd a beszélgetéseket cimkékkel",
+      "DESCRIPTION": "A cimkék egyszerű módot biztosítanak hogy kategorizáld a beszélgetést. Hozz létre cimkéket, mint például a #támogatás vagy a #számlázás, stb... későbbi használatra.",
+      "NEW_LINK": "Kattints ide cimkék létrehozásához"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index cb1ecc865..1b2839b38 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -1,75 +1,75 @@
 {
   "GENERAL_SETTINGS": {
-    "TITLE": "Account settings",
-    "SUBMIT": "Update settings",
-    "BACK": "Back",
+    "TITLE": "Fiókbeállítások",
+    "SUBMIT": "Beállítások frissítése",
+    "BACK": "Vissza",
     "UPDATE": {
-      "ERROR": "Could not update settings, try again!",
-      "SUCCESS": "Successfully updated account settings"
+      "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"
     },
     "FORM": {
-      "ERROR": "Please fix form errors",
+      "ERROR": "Kérjük javítsd ki az űrlaphibákat",
       "GENERAL_SECTION": {
-        "TITLE": "General settings",
+        "TITLE": "Általános beállítások",
         "NOTE": ""
       },
       "NAME": {
-        "LABEL": "Account name",
-        "PLACEHOLDER": "Your account name",
-        "ERROR": "Please enter a valid account name"
+        "LABEL": "Fióknév",
+        "PLACEHOLDER": "A fiókneved",
+        "ERROR": "Kérjük helyes fióknevet adj meg"
       },
       "LANGUAGE": {
-        "LABEL": "Site language (Beta)",
-        "PLACEHOLDER": "Your account name",
+        "LABEL": "Oldal nyelve (Béta)",
+        "PLACEHOLDER": "A fiókneved",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "Beérkező e-mail domain",
+        "PLACEHOLDER": "A domain melyen az e-maileket fogadod",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "Támogatási e-mail",
+        "PLACEHOLDER": "A vállalati támogatási e-mailcímed",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "A napok száma, mely után a ticketek automatikusan megoldódnak, ha nincs aktivitás",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Kérjük helyes auto megoldási időszakot adj meg (minimum 1 nap)"
       },
       "FEATURES": {
-        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
-        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+        "INBOUND_EMAIL_ENABLED": "A beszélgetésfolytonosság e-maillel már elérhető a fiókodban.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "Most már goadhatsz e-maileket az egyedi domaineden."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance."
+    "UPDATE_CHATWOOT": "Egy frissítés elérhető a Chatwoothoz %{latestChatwootVersion}. Kérjük frissítsd a telepítésed."
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Enter-rel válaszd ki",
+      "ENTER_TO_REMOVE": "Enter-rel távolítsd el",
+      "SELECT_ONE": "Válassz egyet"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "Értesítések",
+    "MARK_ALL_DONE": "Mind kész",
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Értesítések betöltése...",
+      "404": "Nincs értesítés",
       "TABLE_HEADER": [
         "Név",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
+        "Telefonszám",
+        "Beszélgetések",
+        "Utoljára kapcsolatban"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Új beszélgetés",
+      "conversation_assignment": "Beszélgetés hozzárendelve",
+      "assigned_conversation_new_message": "Új üzenet",
+      "conversation_mention": "Megemlítés"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 02f61b7f6..be90c02f9 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -1,255 +1,293 @@
 {
   "INBOX_MGMT": {
-    "HEADER": "Inboxes",
-    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "HEADER": "Fiókok",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p><p>Amikor egy weboldalt vagy facebook oldalt összekötsz a Chatwoottal, <b>inbox</b>-nak vagy fióknak hívjuk. Korlátlan inboxod lehet a Chatwoot fiókodban. </p><p>Kattints a <b>Inbox hozzáadása</b> gombra hogy összekapcsold a weboldaladdal vagy Facebook oldaladdal.</p><p>A műszerfaladon láthatod az összes beszélgetésedet az összes fiókodból egy helyen és válszolhatsz a 'Beszélgetések' fülön.</p><p>Láthatsz továbbá fiókhoz kapcsolódó beszélgetéseket a fiók nevére kattintva a műszerfal bal sávjában.</p>",
     "LIST": {
-      "404": "There are no inboxes attached to this account."
+      "404": "Nincs Inbox kapcsolva ehhez a fiókhoz."
     },
     "CREATE_FLOW": [
       {
-        "title": "Choose Channel",
+        "title": "Csatorna kiválasztása",
         "route": "settings_inbox_new",
-        "body": "Choose the provider you want to integrate with Chatwoot."
+        "body": "Válasz egy szolgáltatót, melyet össze akarsz integrálni a Chatwoottal."
       },
       {
-        "title": "Create Inbox",
+        "title": "Fiók létrehozása",
         "route": "settings_inboxes_page_channel",
-        "body": "Authenticate your account and create an inbox."
+        "body": "Hitelesítsd a fiókod és hozz létre egy inboxot."
       },
       {
-        "title": "Add Agents",
+        "title": "Ügynök Hozzádása",
         "route": "settings_inboxes_add_agents",
-        "body": "Add agents to the created inbox."
+        "body": "Adj hozzá ügynököket a létrehozott inboxhoz."
       },
       {
-        "title": "Voila!",
+        "title": "Tadaaam!",
         "route": "settings_inbox_finish",
-        "body": "You are all set to go!"
+        "body": "Mindennel készen állsz!"
       }
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
-        "CHOOSE_PAGE": "Choose Page",
-        "CHOOSE_PLACEHOLDER": "Select a page from the list",
-        "INBOX_NAME": "Inbox Name",
-        "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
-        "PICK_A_VALUE": "Pick a value"
+        "HELP": "UI: A bejelentkezéseddel csak az oldalad üzeneteihez kapunk hozzáférést. Privát üzeneteidhez sosem férhet hozzá a Chatwoot.",
+        "CHOOSE_PAGE": "Oldal kiválasztása",
+        "CHOOSE_PLACEHOLDER": "Válaszd ki az oldalt a listából",
+        "INBOX_NAME": "Fiók név",
+        "ADD_NAME": "Adj nevet a fiókodnak",
+        "PICK_NAME": "Válassz nevet az inboxodnak",
+        "PICK_A_VALUE": "Válassz értéket"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' "
+        "HELP": "Ahhoz hogy hozzáadd a twitter profilodat egy csatornaként, azonosítanod kell a Twitter fiókodat a 'Belépés Twitterrel' gomb megnyomásával ",
+        "ERROR_MESSAGE": "Hiba történt a Twitterrel való csatlakozáskor, kérjük próbáld később"
       },
       "WEBSITE_CHANNEL": {
-        "TITLE": "Website channel",
-        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
-        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "TITLE": "Website csatorna",
+        "DESC": "Hozz létre egy csatornát a websiteodnak és kezdd el az ügyfeleid támogatását a website widgeten keresztül.",
+        "LOADING_MESSAGE": "Website támogatási csatorna létrehozása",
         "CHANNEL_AVATAR": {
-          "LABEL": "Channel Avatar"
+          "LABEL": "Csatorna avatar"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+          "LABEL": "Website név",
+          "PLACEHOLDER": "Add meg weboldalad nevét (pl.: Példa Kft.)"
         },
         "CHANNEL_DOMAIN": {
-          "LABEL": "Website Domain",
-          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+          "LABEL": "Website domain",
+          "PLACEHOLDER": "Add meg weboldalad domainjét (pl.: példa.hu)"
         },
         "CHANNEL_WELCOME_TITLE": {
-          "LABEL": "Welcome Heading",
-          "PLACEHOLDER": "Hi there !"
+          "LABEL": "Köszöntő fejléc üzenet",
+          "PLACEHOLDER": "Szia!"
         },
         "CHANNEL_WELCOME_TAGLINE": {
-          "LABEL": "Welcome Tagline",
-          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+          "LABEL": "Köszöntő üzenet",
+          "PLACEHOLDER": "Könnyűvé tesszük, hogy kapcsolatba kerülj velünk. Kérdezz bármit, vagy oszd meg véleményed."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Channel greeting message",
-          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+          "LABEL": "Csatorna köszöntő üzenet",
+          "PLACEHOLDER": "Példa Kft. általában néhány órán belül válaszol."
         },
         "CHANNEL_GREETING_TOGGLE": {
-          "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
-          "ENABLED": "Enabled",
-          "DISABLED": "Disabled"
+          "LABEL": "Csatorna köszöntés engedélyezése",
+          "HELP_TEXT": "Üdvözlő üzenet küldése a felhasználónak, amikor beszélgetést indít.",
+          "ENABLED": "Engedélyezve",
+          "DISABLED": "Letiltva"
         },
         "REPLY_TIME": {
-          "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "TITLE": "Válaszadási idő megadása",
+          "IN_A_FEW_MINUTES": "Néhány percen belül",
+          "IN_A_FEW_HOURS": "Néhány órán belül",
+          "IN_A_DAY": "Egy napon belül",
+          "HELP_TEXT": "Ezen válaszidő ki lesz írva az élő chat widgeten"
         },
         "WIDGET_COLOR": {
-          "LABEL": "Widget Color",
-          "PLACEHOLDER": "Update the widget color used in widget"
+          "LABEL": "Widget szín",
+          "PLACEHOLDER": "Frissítsd a widget színét"
         },
-        "SUBMIT_BUTTON": "Create inbox"
+        "SUBMIT_BUTTON": "Fiók létrehozása"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/Whatsapp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "TITLE": "Twilio SMS/Whatsapp csatorna",
+        "DESC": "Integráld a Twiliot és kezdd el támogatni az ügyfeleidet SMS-en vagy Whatsappon.",
         "ACCOUNT_SID": {
-          "LABEL": "Account SID",
-          "PLACEHOLDER": "Please enter your Twilio Account SID",
-          "ERROR": "This field is required"
+          "LABEL": "Fiók SID",
+          "PLACEHOLDER": "Kérjük add meg a Twilio fiók SID-t",
+          "ERROR": "Ez a mező kötelező"
         },
         "CHANNEL_TYPE": {
-          "LABEL": "Channel Type",
-          "ERROR": "Please select your Channel Type"
+          "LABEL": "Csatorna típusa",
+          "ERROR": "Kérjük válaszd ki a csatorna típusát"
         },
         "AUTH_TOKEN": {
-          "LABEL": "Auth Token",
-          "PLACEHOLDER": "Please enter your Twilio Auth Token",
-          "ERROR": "This field is required"
+          "LABEL": "Auth token",
+          "PLACEHOLDER": "Kérjük add meg a Twilio auth tokened",
+          "ERROR": "Ez a mező kötelező"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Csatorna neve",
+          "PLACEHOLDER": "Kérjük adj meg csatorna nevet",
+          "ERROR": "Ez a mező kötelező"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
-          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
-          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          "LABEL": "Telefonszám",
+          "PLACEHOLDER": "Kérjük add meg a telefonszámot, amire az üzeneteket küldjük.",
+          "ERROR": "Kérjük helyes értéket adj meg. A telefonszám a '+' jellel kezdődjön."
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+          "TITLE": "Visszahívás URL",
+          "SUBTITLE": "Be kell állítanod az üzenet visszahívás URL-t a Twilion az itt megadott URL alapján."
         },
-        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "SUBMIT_BUTTON": "Twilio csatorna létrehozása",
         "API": {
-          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+          "ERROR_MESSAGE": "Nem tudtuk hitelesíteni a Twilio fiókodat, kérjük próbáld később"
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "TITLE": "API csatorna",
+        "DESC": "API-val integrálj és láss neki az ügyfeleid támogatásának.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Csatorna neve",
+          "PLACEHOLDER": "Kérjük adj meg csatorna nevet",
+          "ERROR": "Ez a mező kötelező"
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Állítsd be az URL-t melyről fogadni szeretnéd a visszahívásokat az eseményekről.",
           "PLACEHOLDER": "Webhook URL"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "API csatorna létrehozása",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the api channel"
+          "ERROR_MESSAGE": "Nem tudtuk elmenteni az API csatornát"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "E-mail csatorna",
+        "DESC": "Inbox-al való integrálás.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "Csatorna neve",
+          "PLACEHOLDER": "Kérjük adj meg csatorna nevet",
+          "ERROR": "Ez a mező kötelező"
         },
         "EMAIL": {
-          "LABEL": "Email",
-          "SUBTITLE": "Email where your customers sends you support tickets",
-          "PLACEHOLDER": "Email"
+          "LABEL": "E-mail",
+          "SUBTITLE": "Az e-mail ahova az ügyfeled a támogatási kérelmeit küldi",
+          "PLACEHOLDER": "E-mail"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "E-mail csatorna létrehozása",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "Nem tudtuk elmenteni az e-mail csatornát"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Kezdd el továbbítani az e-maileket a következő e-mail címekre."
       },
       "AUTH": {
-        "TITLE": "Channels",
+        "TITLE": "Csatornák",
         "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
       },
       "AGENTS": {
         "TITLE": "Ügynökök",
-        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "DESC": "Itt hozzáadhatsz ügynököket az újonan létrehooztt inboxodhoz. Csak ezek a kiválasztott ügynökök fognak hozzáférni az inboxodhoz. Az ügynökök akik nem részei az inboxnak, nem látják és nem tudnak válaszolni az üzenetekre belépésük után. <br><b>UI:</b>Adminisztrátorként hozzáférésed van az összes inboxhoz, add hozzá magad az összes inboxhoz ügynökként.",
+        "VALIDATION_ERROR": "Adj legalább egy ügynököt az új inboxodhoz",
+        "PICK_AGENTS": "Válaszd ki az inboxhoz hozzárendelt ügynököket"
       },
       "DETAILS": {
-        "TITLE": "Inbox Details",
-        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+        "TITLE": "Fiók részletek",
+        "DESC": "A legördülő listából kérjük válaszd ki hogy melyik Facebook oldalt szeretnéd a Chatwoothoz kötni. Egyedi nevet is adhatsz az Inboxnak a jobb azonosíthatóság érdekében."
       },
       "FINISH": {
-        "TITLE": "Nailed It!",
-        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+        "TITLE": "Sikerült!",
+        "DESC": "Sikeresen integráltad a Facebook oldaladat a Chatwoottal. Legközelebb amikor egy ügyfél üzenetet ír az oldaladra, a beszélgetés automatiksuan megjelenik az inboxodban.<br> Ezen kívül egy widget kódot biztosítunk számodra, amelyet könnyen hozzáadhatsz a weboldaladhoz. Amint ez kiélesítésre kerül, az ügyfelek üzenetet küldhetnek Neked a weboldaladról bármilyen külső eszköz igénybevétele nélkül és ez a beszélgetés itt a Chatwootban fog megjelenni. <br>Menő, nem? Hát megpróbáljuk :)"
       }
     },
     "DETAILS": {
-      "LOADING_FB": "Authenticating you with Facebook...",
-      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
-      "CREATING_CHANNEL": "Creating your Inbox...",
-      "TITLE": "Configure Inbox Details",
+      "LOADING_FB": "Facebookkal azonosítunk...",
+      "ERROR_FB_AUTH": "Valami elromlott, kérjük töltsd újra az oldalt...",
+      "CREATING_CHANNEL": "Inbox létrehozása...",
+      "TITLE": "Inbox részletek beállítása",
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Add agents",
-      "ADD_AGENTS": "Adding Agents to your Inbox..."
+      "BUTTON_TEXT": "Ügynök Hozzádása",
+      "ADD_AGENTS": "Ügynökök hozzáadása a fiókhoz..."
     },
     "FINISH": {
-      "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
-      "BUTTON_TEXT": "Take me there",
-      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+      "TITLE": "A fiókod elkészült!",
+      "MESSAGE": "Most már tudsz egyeztetni az ügyfeleiddel az új csatornán. Boldog támgoatást ",
+      "BUTTON_TEXT": "Vigyél oda",
+      "WEBSITE_SUCCESS": "Sikeresen létrehoztad a website csatornát. Másold az itt látható kódot és helyezd el a weboldaladon. Legközelebb, mikor egy ügyfél az élő chatben van, a beszélgetés automatikusan megjelenik az inboxodban."
     },
-    "REAUTH": "Reauthorize",
-    "VIEW": "View",
+    "REAUTH": "Újraengedélyezés",
+    "VIEW": "Megtekintés",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
-        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
-        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+        "SUCCESS_MESSAGE": "Inbox beállítások sikeresen frissítve",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatikus hozzárendelés sikeresen frissítve",
+        "ERROR_MESSAGE": "Nem sikerült a widget szín változtatása. Kérjük próbáld később."
       },
       "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Engedélyezve",
+        "DISABLED": "Letiltva"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Törlés",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Törlés megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli ",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Inbox deleted successfully",
-        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+        "SUCCESS_MESSAGE": "Inbox sikeresen törölve",
+        "ERROR_MESSAGE": "Nem sikerült a fiók törlése. Kérjük próbáld később."
       }
     },
     "TABS": {
-      "SETTINGS": "Settings",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "SETTINGS": "Beállítások",
+      "COLLABORATORS": "Csapattagok",
+      "CONFIGURATION": "Beállítások",
+      "PRE_CHAT_FORM": "Chat előtti űrlap",
+      "BUSINESS_HOURS": "Nyitvatartás"
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "Beállítások",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "Lehetőségek",
+      "DISPLAY_FILE_PICKER": "File választó megjelenítése a widgeten",
+      "DISPLAY_EMOJI_PICKER": "Emoji választó megjelenítése a widgeten"
     },
     "SETTINGS_POPUP": {
-      "MESSENGER_HEADING": "Messenger Script",
-      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "MESSENGER_HEADING": "Messenger szkript",
+      "MESSENGER_SUB_HEAD": "Ezt a gombot a body tag-en belül helyezd el",
       "INBOX_AGENTS": "Ügynökök",
-      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
-      "UPDATE": "Update",
-      "AUTO_ASSIGNMENT": "Enable auto assignment",
-      "INBOX_UPDATE_TITLE": "Inbox Settings",
-      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
-      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder validate the users identity, the SDK allows you to pass an `identity_hash` for each user. You can generate HMAC using 'sha256' with the key shown here."
+      "INBOX_AGENTS_SUB_TEXT": "Ügynökök hosszáadása vagy eltávolítása az inboxból",
+      "UPDATE": "Frissítés",
+      "AUTO_ASSIGNMENT": "Automata hozzárendelés engedélyezése",
+      "INBOX_UPDATE_TITLE": "Fiókbeállítások",
+      "INBOX_UPDATE_SUB_TEXT": "Frissítsd az inbox beállításaidat",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Bekapcsolása vagy kikapcsolása az inboxhoz kapcsolódó automatikus ügynökhozzárendelésnek új beszélgetések esetén.",
+      "HMAC_VERIFICATION": "Felhasználói fiók validálás",
+      "HMAC_DESCRIPTION": "A felhasználói fiók ellenőrzése céljából az SDK lehetőséget ad egy 'identity_hash' kódra minden felhasználónak. Ezt HMAC-al tudod generálni 'sha256'-t használva, az itt látható kóddal."
     },
     "FACEBOOK_REAUTHORIZE": {
-      "TITLE": "Reauthorize",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
-      "MESSAGE_ERROR": "There was an error, please try again"
+      "TITLE": "Újraengedélyezés",
+      "SUBTITLE": "A Facebook kapcsolatod lejárt, kérjük kapcsold össze oldalad újra a szolgáltatás folytatásához",
+      "MESSAGE_SUCCESS": "Újrakapcsolódás sikeres",
+      "MESSAGE_ERROR": "Hiba történt, kérjük próbáld újra"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "A chat előtti űrlapok lehetővé teszik hogy felhasználói adatokat gyűjts mielőtt a beszélgetés megkezdődik.",
+      "ENABLE": {
+        "LABEL": "Chat előtti űrlap engedélyezése",
+        "OPTIONS": {
+          "ENABLED": "Igen",
+          "DISABLED": "Nem"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Chat előtti üzenet",
+        "PLACEHOLDER": "Ez az üzenet látható lesz a felhasználók számára az űrlappal együtt"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "A látogatóknak nevük és e-mailcímük megadása szükséges a beszélgetés megkezdése előtt"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Elérhetőség beállítása",
+      "SUBTITLE": "Állításd be az elérhetőséged idejét a chat widgeten",
+      "WEEKLY_TITLE": "Heti órák beállítása",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Elérhetőség bekapcsolása erre a napra",
+        "UNAVAILABLE": "Nem elérhető",
+        "HOURS": "óra",
+        "VALIDATION_ERROR": "A kezés idejének a zárás ideje előttinek kell lennie.",
+        "CHOOSE": "Kiválasztás"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 4a81e393e..a381ebf74 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -1,61 +1,61 @@
 {
   "INTEGRATION_SETTINGS": {
-    "HEADER": "Integrations",
+    "HEADER": "Integrációk",
     "WEBHOOK": {
       "TITLE": "Webhook",
-      "CONFIGURE": "Configure",
-      "HEADER": "Webhook settings",
-      "HEADER_BTN_TXT": "Add new webhook",
-      "LOADING": "Fetching attached webhooks",
-      "SEARCH_404": "There are no items matching this query",
-      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
+      "CONFIGURE": "Beállítások",
+      "HEADER": "Webhook beállítások",
+      "HEADER_BTN_TXT": "Új webhook hozzáadása",
+      "LOADING": "Kapcsolódó Webhookok betöltése",
+      "SEARCH_404": "Nincs megfelelő elem",
+      "SIDEBAR_TXT": "<p><b>Webhook</b>-ok</p><p>A Webhook-ok HTTP visszahívások, melyek minden fiókhoz bállíthatóak. Chatwoot események, például beérkező üzenetek aktiválhatják a webhookokat. Több webhookot is beállíthatsz a fiókodhoz. <br /><br /> Egy <b>webhook</b> létrehozásához kattints a <b>Webhook hozzáadása</b> gombra. Le is törölheted a létrejött webhookokat a Törlés gombra kattintva.</p>",
       "LIST": {
-        "404": "There are no webhooks configured for this account.",
-        "TITLE": "Manage webhooks",
+        "404": "Nincs a fiókhoz rendelt Webhook.",
+        "TITLE": "Webhook kezelés",
         "TABLE_HEADER": [
-          "Webhook endpoint",
+          "Webhook végpont",
           "Műveletek"
         ]
       },
       "ADD": {
-        "CANCEL": "Cancel",
-        "TITLE": "Add new webhook",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "CANCEL": "Mégse",
+        "TITLE": "Új webhook hozzáadása",
+        "DESC": "Webhook események valós idejű információt adnak arról, hogy mi történik a Chatwoot fiókodban. Kérünk a visszahívás beállításánál egy helyes URL-t adj meg.",
         "FORM": {
           "END_POINT": {
             "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
+            "PLACEHOLDER": "Például: https://példa.com/api/webhook",
+            "ERROR": "Kérjük helyes URL-t adj meg"
           },
-          "SUBMIT": "Create webhook"
+          "SUBMIT": "Webhook létrehozása"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "SUCCESS_MESSAGE": "Webhook sikeresen hozzáadva",
+          "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
         }
       },
       "DELETE": {
-        "BUTTON_TEXT": "Delete",
+        "BUTTON_TEXT": "Törlés",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook deleted successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "SUCCESS_MESSAGE": "Webhook sikeresen törölve",
+          "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
         },
         "CONFIRM": {
-          "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
-          "YES": "Yes, Delete ",
-          "NO": "No, Keep it"
+          "TITLE": "Törlés megerősítése",
+          "MESSAGE": "Biztos abban, hogy törli ",
+          "YES": "Igen, Törlés ",
+          "NO": "Nem, tartsa meg"
         }
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Törlés",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "Integráció sikeresen törölve"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "Kapcsolódás"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
index 306deffea..74384ebbf 100644
--- a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
@@ -1,61 +1,61 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
-    "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "HEADER": "Cimkék",
+    "HEADER_BTN_TXT": "Cimke hozzáadása",
+    "LOADING": "Cimkék letöltése",
+    "SEARCH_404": "Nincs megfelelő elem",
+    "SIDEBAR_TXT": "<p><b>Cimkék</b><p>A cimkék segítenek kategorizálni és priorizálni a beszélgetéseket. A beszélgetésekhez cimkét rendelhetsz az oldalpanelben <br /><br />A cimkék a fiókodhoz vannak kötve. A cimkékkel egyedi munkameneteket hozhatsz létre a szervezetedben. Egyedi színt adhatsz a cimkéknek a könnyű azonosíthatóság érdekében. Az oldalsávban meg tudod majd jeleníteni a cimkéket hogy könnyen szűrhesd a beszélgetéseket</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "Nincs megfelelő cimke ebben a fiókban.",
+      "TITLE": "Cimkék kezelése",
+      "DESC": "A cimkék a beszélgetések csoportokba rendezését segítik.",
       "TABLE_HEADER": [
         "Név",
-        "Description",
-        "Color"
+        "Leírás",
+        "Szín"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "LABEL": "Cimke neve",
+        "PLACEHOLDER": "Cimke neve",
+        "ERROR": "A cimke nevének megadása kötelező"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "Leírás",
+        "PLACEHOLDER": "Cimke leírás"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "Szín"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "Cimke megjelenítése az oldalsávban"
       },
-      "EDIT": "Edit",
-      "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel"
+      "EDIT": "Szerkesztés",
+      "CREATE": "Létrehozás",
+      "DELETE": "Törlés",
+      "CANCEL": "Mégse"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Cimke hozzáadása",
+      "DESC": "A cimkék a beszélgetések csoportokba rendezését segítik.",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Cimke sikeresen hozzáadva",
+        "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "Cimke szerkesztése",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Cimke sikeresen frissítve",
+        "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Törlés",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "Cimke sikeresen törölve",
+        "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
       },
       "CONFIRM": {
         "TITLE": "Törlés Megerősítése",
diff --git a/app/javascript/dashboard/i18n/locale/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json
index 30f667052..b7b89e493 100644
--- a/app/javascript/dashboard/i18n/locale/hu/login.json
+++ b/app/javascript/dashboard/i18n/locale/hu/login.json
@@ -1,21 +1,21 @@
 {
   "LOGIN": {
-    "TITLE": "Login to Chatwoot",
+    "TITLE": "Chatwoot belépés",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "LABEL": "E-mail",
+      "PLACEHOLDER": "E-mail pl.: valaki@példa.hu"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password"
+      "LABEL": "Jelszó",
+      "PLACEHOLDER": "Jelszó"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Bejelentkezés sikeres",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később",
+      "UNAUTH": "A felhasználó / jelszó helytelen. Kérjük próbálja újra"
     },
-    "FORGOT_PASSWORD": "Forgot your password?",
-    "CREATE_NEW_ACCOUNT": "Create new account",
-    "SUBMIT": "Login"
+    "FORGOT_PASSWORD": "Elfelejtetted a jelszavad?",
+    "CREATE_NEW_ACCOUNT": "Új fiók létrehozása",
+    "SUBMIT": "Bejelentkezés"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index 22e4a1c75..c039c0d82 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -1,43 +1,43 @@
 {
   "REPORT": {
-    "HEADER": "Reports",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "HEADER": "Jelentések",
+    "LOADING_CHART": "Táblázat adatok betöltése...",
+    "NO_ENOUGH_DATA": "Nem érkezett elég adat hogy jelentést generáljunk, kérjük próbáld később.",
+    "DOWNLOAD_AGENT_REPORTS": "Ügynök jelentések letöltése",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
-        "DESC": "( Total )"
+        "NAME": "Beszélgetések",
+        "DESC": "( Teljes )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "Beérkező üznetek",
+        "DESC": "( Teljes )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "Kimenő üzenetek",
+        "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "Első reakció idő",
+        "DESC": "( Átlag )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "Megoldási idő",
+        "DESC": "( Átlag )"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "Megoldások száma",
+        "DESC": "( Teljes )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "Utolsó 7 nap"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "Utolsó 30 nap"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
index bb678e809..6303f19fb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
@@ -1,15 +1,15 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Új jelszó kérése",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "LABEL": "E-mail",
+      "PLACEHOLDER": "Add meg az e-mailed",
+      "ERROR": "Kérjük helyes e-mailcímet adj meg"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "A jelszó helyreállító linket e-mailben elküldtük",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "Elküldés"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
index 94a3fd2e1..86d8293de 100644
--- a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
@@ -1,20 +1,20 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Új jelszó megadása",
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "Jelszó",
+      "PLACEHOLDER": "Jelszó",
+      "ERROR": "A jelszó túl rövid"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "LABEL": "Jelszó megerősítése",
+      "PLACEHOLDER": "Jelszó megerősítése",
+      "ERROR": "A jelszavak nem egyeznek"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Jelszó sikeresen megváltoztatva",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "Elküldés"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index b7f6c3e85..96bc55212 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -1,146 +1,146 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profile Settings",
-    "TITLE": "Profile Settings",
-    "BTN_TEXT": "Update Profile",
-    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "LINK": "Profilbeállítások",
+    "TITLE": "Profilbeállítások",
+    "BTN_TEXT": "Profil frissítése",
+    "AFTER_EMAIL_CHANGED": "A profilod sikeresen frissítésre került, kérjük lépj be újra, mivel megváltoztak a belépési adataid",
     "FORM": {
-      "AVATAR": "Profile Image",
-      "ERROR": "Please fix form errors",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "AVATAR": "Profilkép",
+      "ERROR": "Kérjük javítsd ki az űrlaphibákat",
+      "REMOVE_IMAGE": "Eltávolítás",
+      "UPLOAD_IMAGE": "Kép feltöltése",
+      "UPDATE_IMAGE": "Kép frissítése",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
-        "NOTE": "Your email address is your identity and is used to log in."
+        "TITLE": "Profil",
+        "NOTE": "Az e-mailcímed az identitásod és a belépésre használhatod."
       },
       "PASSWORD_SECTION": {
-        "TITLE": "Password",
-        "NOTE": "Updating your password would reset your logins in multiple devices."
+        "TITLE": "Jelszó",
+        "NOTE": "A jelszó frissítása minden beléptetett eszközt kiléptet."
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "TITLE": "Hozzáférési kulcs",
+        "NOTE": "Ez a kulcs akkor használható, ha API-alapú integrációt építesz"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Email Notifications",
-        "NOTE": "Update your email notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "TITLE": "E-mail értesítések",
+        "NOTE": "Frissítsd az e-mail értesítési beállításaidat itt",
+        "CONVERSATION_ASSIGNMENT": "Küldj e-mail értesítéseket, amikor a beszélgetést hozzám rendelik",
+        "CONVERSATION_CREATION": "Küldj e-mail értesítéseket, amikor egy új beszélgetés létrejön",
+        "CONVERSATION_MENTION": "Küldj e-mail értesítéseket, amikor egy beszélgetésben megemlítenek",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Küldj e-mail értesítéseket, amikor egy hozzám rendelt beszélgetésben új üzenet érkezik"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "Az értesítési beállításaid sikeresen frissítve",
+        "UPDATE_ERROR": "Egy hiba lépett fel a beállítások frissítése során, kérjük próbáld újra"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "Push üzenetek",
+        "NOTE": "Frissítsd az push üzenet beállításaidat itt",
+        "CONVERSATION_ASSIGNMENT": "Küldj push üzeneteket, amikor a beszélgetést hozzám rendelik",
+        "CONVERSATION_CREATION": "Küldj push üzeneteket, amikor egy új beszélgetés létrejön",
+        "CONVERSATION_MENTION": "Küldj push üzeneteket, amikor egy beszélgetésben megemlítenek",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Küldj push üzeneteket, amikor egy hozzám rendelt beszélgetésben új üzenet érkezik",
+        "HAS_ENABLED_PUSH": "Engedélyezted a push üzeneteket ezen a böngészőn.",
+        "REQUEST_PUSH": "Push üznetek engedélyezése"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "Profilkép"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "A teljes neved",
+        "ERROR": "Kérjük helyes nevet adj meg",
+        "PLACEHOLDER": "Kérjük a teljes nevedet add meg"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Rövidnév",
+        "ERROR": "Kérjük helyes rövidnevet adj meg",
+        "PLACEHOLDER": "Kérjük add meg a rövidnevet amit a beszélgetésekben szeretnél megjeleníteni"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Elérhetőség",
         "STATUSES_LIST": [
           "Online",
-          "Busy",
+          "Foglalt",
           "Offline"
         ]
       },
       "EMAIL": {
-        "LABEL": "Your email address",
-        "ERROR": "Please enter a valid email address",
-        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+        "LABEL": "Az e-mailcímed",
+        "ERROR": "Kérjük helyes e-mailcímet adj meg",
+        "PLACEHOLDER": "Kérjük add meg az e-mailcímet amit a beszélgetésekben szeretnél megjeleníteni"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "ERROR": "Please enter a password of length 6 or more",
-        "PLACEHOLDER": "Please enter a new password"
+        "LABEL": "Jelszó",
+        "ERROR": "Kérjük 6 karakternél hosszabb jelszót adj meg",
+        "PLACEHOLDER": "Kérjük adj meg egy új jelszót"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
-        "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "LABEL": "Jelszó megerősítése",
+        "ERROR": "A két jelszónak egyeznie kell",
+        "PLACEHOLDER": "Kérjük add meg egy ismét a jelszót"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Change",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "LOGOUT": "Logout"
+    "CHANGE_AVAILABILITY_STATUS": "Megváltoztatás",
+    "CHANGE_ACCOUNTS": "Fiókváltás",
+    "SELECTOR_SUBTITLE": "Fiók kiválasztása az alábbi listából",
+    "PROFILE_SETTINGS": "Profilbeállítások",
+    "LOGOUT": "Kilépés"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now"
+    "TRIAL_MESSAGE": "nap van hátra a próbaidőszakból.",
+    "TRAIL_BUTTON": "Előfizetés"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Másolás",
+      "COPY_SUCCESSFUL": "Vágólapra másolva"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
-      "UPLOADING": "Uploading..."
+      "DOWNLOAD": "Letöltés",
+      "UPLOADING": "Feltöltés..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Elküldés"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Ellenőrzés...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "Inboxhoz adás"
     }
   },
   "SIDEBAR": {
-    "CONVERSATIONS": "Conversations",
-    "REPORTS": "Reports",
-    "CONTACTS": "Contacts",
-    "SETTINGS": "Settings",
-    "HOME": "Home",
+    "CONVERSATIONS": "Beszélgetések",
+    "REPORTS": "Jelentések",
+    "CONTACTS": "Kontaktok",
+    "SETTINGS": "Beállítások",
+    "HOME": "Nyitólap",
     "AGENTS": "Ügynökök",
-    "INBOXES": "Inboxes",
-    "NOTIFICATIONS": "Notifications",
-    "CANNED_RESPONSES": "Canned Responses",
-    "INTEGRATIONS": "Integrations",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "LABELS": "Labels",
-    "TEAMS": "Teams"
+    "INBOXES": "Bejövők",
+    "NOTIFICATIONS": "Értesítések",
+    "CANNED_RESPONSES": "Mentett válaszok",
+    "INTEGRATIONS": "Integrációk",
+    "ACCOUNT_SETTINGS": "Fiókbeállítások",
+    "LABELS": "Cimkék",
+    "TEAMS": "Csapatok"
   },
   "CREATE_ACCOUNT": {
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NEW_ACCOUNT": "Új fiók",
+    "SELECTOR_SUBTITLE": "Új fiók létrehozása",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Ügynök sikeresen létrehozva",
+      "EXIST_MESSAGE": "A fiók már létezik",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Account Name",
-        "PLACEHOLDER": "Wayne Enterprises"
+        "LABEL": "Fióknév",
+        "PLACEHOLDER": "Kovács Kft."
       },
-      "SUBMIT": "Submit"
+      "SUBMIT": "Elküldés"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
index 6eaa5d646..a9449382f 100644
--- a/app/javascript/dashboard/i18n/locale/hu/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -1,38 +1,38 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Register an account",
-    "TITLE": "Register",
-    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TRY_WOOT": "Fiók létrehozása",
+    "TITLE": "Regisztrálás",
+    "TERMS_ACCEPT": "A feliratkozással megerősíted, hogy egyetértesz a <a href=\"https://www.chatwoot.com/terms\"> Felhasználói feltételekkel</a> és az <a href=\"https://www.chatwoot.com/privacy-policy\">Adatkezelési politikával</a>",
     "ACCOUNT_NAME": {
-      "LABEL": "Account name",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "LABEL": "Fióknév",
+      "PLACEHOLDER": "Fióknév hozzáadása. Pl.: Wayne Kft.",
+      "ERROR": "A fióknév túl rövid"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Teljes név",
+      "PLACEHOLDER": "Add meg a teljes neved. Pl.: Kovács János",
+      "ERROR": "A teljes név túl rövid"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "Munkahelyi e-mail",
+      "PLACEHOLDER": "Add meg munkahelyi e-mailcímed. Pl. kovacs.janos@email.hu",
+      "ERROR": "Az e-mailcím helytelen"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "Jelszó",
+      "PLACEHOLDER": "Jelszó",
+      "ERROR": "A jelszó túl rövid"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Jelszó megerősítése",
+      "PLACEHOLDER": "Jelszó megerősítése",
+      "ERROR": "A jelszavak nem egyeznek"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Sikeres regisztráció",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
-    "SUBMIT": "Submit",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "SUBMIT": "Elküldés",
+    "HAVE_AN_ACCOUNT": "Már van fiókod?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
new file mode 100644
index 000000000..86a6bcdca
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Csapatok",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Létrehozás",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Ügynök Hozzádása",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Mindennel készen állsz!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Mindennel készen állsz!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Ügynök Hozzádása",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Ügynök Hozzádása",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Törlés",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Törlés ",
+        "NO": "Mégse"
+      }
+    },
+    "SETTINGS": "Beállítások",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/webhooks.json b/app/javascript/dashboard/i18n/locale/hu/webhooks.json
index 347c96893..17d5d8b47 100644
--- a/app/javascript/dashboard/i18n/locale/hu/webhooks.json
+++ b/app/javascript/dashboard/i18n/locale/hu/webhooks.json
@@ -1,5 +1,5 @@
 {
   "WEBHOOKS_SETTINGS": {
-    "HEADER": "Webhook Settings"
+    "HEADER": "Webhook beállítások"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index cb8ba9d5b..841a14593 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Kontak",
     "TITLE": "Edit kontak",
-    "DESC": "Edit detail kontak",
+    "DESC": "Edit detail kontak"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Kontak Baru",
+    "TITLE": "Buat kontak baru",
+    "DESC": "Tambahkan detail informasi dasar tentang kontak tersebut."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Kirim",
       "CANCEL": "Batalkan",
@@ -60,7 +67,7 @@
       },
       "EMAIL_ADDRESS": {
         "PLACEHOLDER": "Masukkan alamat email kontak",
-        "LABEL": "Alamat Email"
+        "LABEL": "Alamat email"
       },
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Masukkan nomor telepon kontak tersebut",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontak berhasil diperbaharui",
+    "SUCCESS_MESSAGE": "Kontak berhasil disimpan",
     "CONTACT_ALREADY_EXIST": "Alamat email ini digunakan untuk kontak lain.",
-    "ERROR_MESSAGE": "Terjadi kesalahan saat memperbarui kontak, coba lagi"
+    "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontak",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Memuat kontak...",
       "404": "Tidak ada kontak yang cocok dengan pencarian Anda 🔍",
-      "TABLE_HEADER": [
-        "Nama",
-        "Nomor Telpon",
-        "Percakapan",
-        "Terakhir Dihubungi"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nama",
+        "PHONE_NUMBER": "Nomor Telpon",
+        "CONVERSATIONS": "Percakapan",
+        "LAST_ACTIVITY": "Aktivitas Terakhir",
+        "COUNTRY": "Negara",
+        "CITY": "Kota",
+        "SOCIAL_PROFILES": "Profil Sosial",
+        "COMPANY": "Perusahaan",
+        "EMAIL_ADDRESS": "Alamat email"
+      },
+      "VIEW_DETAILS": "Lihat detail"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 1d9b1aea6..5811baa27 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Mencari pesan",
       "LOADING_MESSAGE": "Mengolah data...",
       "PLACEHOLDER": "Ketik teks apa saja untuk mencari pesan",
-      "NO_MATCHING_RESULTS": "Tidak ada pesan yang cocok dengan parameter pencarian."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Pesan Belum Terbaca",
     "UNREAD_MESSAGE": "Pesan Belum Terbaca",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Catatan Pribadi: Hanya terlihat oleh Anda dan tim Anda",
     "CHANGE_STATUS": "Status percakapan berubah",
     "CHANGE_AGENT": "Petugas Percakapan berubah",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Dikirim oleh:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Pilih Agen",
@@ -74,5 +75,37 @@
         "ERROR": "Mohon masukkan alamat email yang valid"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hai 👋, Selamat datang di %{installationName}!",
+    "DESCRIPTION": "Terima kasih telah mendaftar. Kami ingin Anda mendapatkan hasil maksimal dari %{installationName}. Berikut beberapa hal yang dapat Anda lakukan di %{installationName} untuk membuat pengalaman menyenangkan.",
+    "READ_LATEST_UPDATES": "Baca pembaruan terbaru kami",
+    "ALL_CONVERSATION": {
+      "TITLE": "Semua percakapan Anda di satu tempat",
+      "DESCRIPTION": "Lihat semua percakapan dari pelanggan Anda dalam satu dasbor. Anda dapat memfilter percakapan berdasarkan saluran masuk, label, dan status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Undang anggota tim Anda",
+      "DESCRIPTION": "Saat Anda bersiap untuk berbicara dengan pelanggan Anda, bawa rekan satu tim untuk membantu Anda. Anda dapat mengundang rekan tim Anda dengan menambahkan alamat email mereka ke daftar agen.",
+      "NEW_LINK": "Klik di sini untuk mengundang anggota tim"
+    },
+    "INBOXES": {
+      "TITLE": "Hubungkan Kotak Masuk",
+      "DESCRIPTION": "Hubungkan berbagai saluran yang akan digunakan pelanggan untuk berbicara dengan Anda. Ini bisa berupa obrolan langsung situs web, halaman Facebook atau Twitter Anda atau bahkan nomor WhatsApp Anda.",
+      "NEW_LINK": "Klik di sini untuk membuat kotak masuk"
+    },
+    "LABELS": {
+      "TITLE": "Atur percakapan dengan label",
+      "DESCRIPTION": "Label memberikan cara yang lebih mudah untuk mengkategorikan percakapan Anda. Buat beberapa label seperti #support-inquiry, #billing-question, dll., Sehingga Anda dapat menggunakannya dalam percakapan nanti.",
+      "NEW_LINK": "Klik di sini untuk membuat tag"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index cec58c2fb..c3137e769 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pilih"
       },
       "TWITTER": {
-        "HELP": "Untuk menambahkan profil Twitter Anda sebagai saluran, Anda perlu mengautentikasi Profil Twitter Anda dengan mengklik 'Masuk dengan Twitter' "
+        "HELP": "Untuk menambahkan profil Twitter Anda sebagai saluran, Anda perlu mengautentikasi Profil Twitter Anda dengan mengklik 'Masuk dengan Twitter' ",
+        "ERROR_MESSAGE": "Terjadi kesalahan saat menghubungkan ke Twitter, harap coba lagi"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Channel Website",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Pengaturan",
       "COLLABORATORS": "Kolaborator",
-      "CONFIGURATION": "Konfigurasi"
+      "CONFIGURATION": "Konfigurasi",
+      "PRE_CHAT_FORM": "Formulir Pra Obrolan",
+      "BUSINESS_HOURS": "Jam Kerja"
     },
     "SETTINGS": "Pengaturan",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Koneksi Facebook Anda telah kedaluwarsa, hubungkan kembali halaman Facebook Anda untuk melanjutkan layanan",
       "MESSAGE_SUCCESS": "Berhasil menghubungkan kembali",
       "MESSAGE_ERROR": "Terjadi kesalahan, harap coba lagi"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Formulir pra-obrolan memungkinkan Anda untuk menangkap informasi pengguna sebelum mereka memulai percakapan dengan Anda.",
+      "ENABLE": {
+        "LABEL": "Aktifkan formulir pra obrolan",
+        "OPTIONS": {
+          "ENABLED": "Ya",
+          "DISABLED": "Tidak"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pesan Pra Obrolan",
+        "PLACEHOLDER": "Pesan ini akan terlihat oleh pengguna bersama dengan formulir"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Pengunjung harus memberikan nama dan alamat email mereka sebelum memulai obrolan"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Atur ketersediaan Anda",
+      "SUBTITLE": "Atur ketersediaan Anda di widget livechat",
+      "WEEKLY_TITLE": "Tetapkan jam mingguan Anda",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Aktifkan ketersediaan untuk hari ini",
+        "UNAVAILABLE": "Tidak tersedia",
+        "HOURS": "jam",
+        "VALIDATION_ERROR": "Waktu mulai harus sebelum waktu tutup.",
+        "CHOOSE": "Pilih"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 8e52f7600..3f274730a 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Integrasi",
     "ACCOUNT_SETTINGS": "Pengaturan Akun",
     "LABELS": "Label",
-    "TEAMS": "Teams"
+    "TEAMS": "Tim"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Akun Baru",
diff --git a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
new file mode 100644
index 000000000..29a6e89e7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Tim",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Buat",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Tambahkan Agen",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Kotak masuk Anda sudah siap!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Kotak masuk Anda sudah siap!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Email",
+      "BUTTON_TEXT": "Tambahkan Agen",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Tambahkan Agen",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Hapus",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Hapus ",
+        "NO": "Batalkan"
+      }
+    },
+    "SETTINGS": "Pengaturan",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 6773d5510..bbc780a43 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Invia",
       "CANCEL": "annulla",
@@ -52,7 +59,7 @@
       },
       "NAME": {
         "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "LABEL": "Nome Completo"
       },
       "BIO": {
         "PLACEHOLDER": "Enter the bio of the contact",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "nome",
-        "Phone Number",
-        "Conversazioni",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "nome",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversazioni",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Indirizzo email"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index e95c60922..caf826121 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Nota privata: visibile solo a te e al tuo team",
     "CHANGE_STATUS": "Stato conversazione cambiato",
     "CHANGE_AGENT": "Modifica conversazione assegnatario",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Inserisci un indirizzo email valido"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index be0526aa5..d7f8d5eb8 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Scegli un valore"
       },
       "TWITTER": {
-        "HELP": "Per aggiungere il tuo profilo Twitter come canale, devi autenticare il tuo profilo Twitter cliccando su 'Accedi con Twitter' "
+        "HELP": "Per aggiungere il tuo profilo Twitter come canale, devi autenticare il tuo profilo Twitter cliccando su 'Accedi con Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canale sito web",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Impostazioni",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Impostazioni",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
new file mode 100644
index 000000000..dcda354f0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Aggiungi Agenti",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Sei pronto per iniziare!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Sei pronto per iniziare!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Aggiungi agenti",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Aggiungi agenti",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Cancellare",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Cancellare ",
+        "NO": "annulla"
+      }
+    },
+    "SETTINGS": "Impostazioni",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index a00c1208c..eb1a3051b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "連絡先を編集",
     "TITLE": "連絡先を編集",
-    "DESC": "連絡先の詳細を編集",
+    "DESC": "連絡先の詳細を編集"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "送信",
       "CANCEL": "キャンセル",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "連絡先を正常に更新しました",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "このメールアドレスは別の連絡先に使用されています。",
-    "ERROR_MESSAGE": "連絡先の更新中にエラーが発生しました。もう一度やり直してください。"
+    "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "名前",
-        "電話番号",
-        "会話データ",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "名前",
+        "PHONE_NUMBER": "電話番号",
+        "CONVERSATIONS": "会話データ",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "企業",
+        "EMAIL_ADDRESS": "Eメールアドレス"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 2fc7732e3..11abdad84 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "非公開設定の注意：あなたとあなたのチームのみに表示されます",
     "CHANGE_STATUS": "会話の状態が変更されました",
     "CHANGE_AGENT": "会話の担当者が変更されました",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "正しいメールアドレスを入力してください"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 8f3a3a48d..e531512d4 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "値を選択"
       },
       "TWITTER": {
-        "HELP": "Twitterプロフィールをチャンネルとして追加するには、「Twitterでサインイン」をクリックしてTwitterプロフィールを認証する必要があります。 "
+        "HELP": "Twitterプロフィールをチャンネルとして追加するには、「Twitterでサインイン」をクリックしてTwitterプロフィールを認証する必要があります。 ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "ウェブサイトのチャンネル",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "設定",
       "COLLABORATORS": "共同編集者",
-      "CONFIGURATION": "設定"
+      "CONFIGURATION": "設定",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。",
       "MESSAGE_SUCCESS": "再接続に成功しました",
       "MESSAGE_ERROR": "エラーが発生しました。もう一度お試しください。"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
new file mode 100644
index 000000000..5bf46ce54
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "作成",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "担当者を追加",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "すべての準備が完了しました！"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "すべての準備が完了しました！"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Eメール",
+      "BUTTON_TEXT": "担当者を追加",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "担当者を追加",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "削除",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "削除 ",
+        "NO": "キャンセル"
+      }
+    },
+    "SETTINGS": "設定",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 0c39505ac..08841149d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "연락처 수정",
     "TITLE": "연락처 수정",
-    "DESC": "연락처 수정 자세히",
+    "DESC": "연락처 수정 자세히"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "보내기",
       "CANCEL": "취소",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "연락처 업데이트 완료",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "이 이메일 주소는 다른 연락처에 사용 중입니다.",
-    "ERROR_MESSAGE": "연락처를 업데이트하는 동안 오류가 발생했습니다. 다시 시도하십시오."
+    "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
   },
   "CONTACTS_PAGE": {
     "HEADER": "연락처",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "연락처를 불러오는 중...",
       "404": "검색과 일치하는 연락처 없음 🔍",
-      "TABLE_HEADER": [
-        "이름",
-        "전화 번호",
-        "대화",
-        "마지막으로 연락한 사람"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "이름",
+        "PHONE_NUMBER": "전화 번호",
+        "CONVERSATIONS": "대화",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "회사",
+        "EMAIL_ADDRESS": "이메일 주소"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index accee1e2c..00d5a78e3 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "메시지 검색",
       "LOADING_MESSAGE": "데이터 처리 중...",
       "PLACEHOLDER": "메시지를 검색할 텍스트 입력",
-      "NO_MATCHING_RESULTS": "검색 매개 변수와 일치하는 메시지가 없음"
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "안 읽은 메시지",
     "UNREAD_MESSAGE": "안 읽은 메시지",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "개인 노트: 귀하와 귀하의 팀만 볼 수 있음",
     "CHANGE_STATUS": "대화 상태가 변경됨",
     "CHANGE_AGENT": "대화 담당자가 변경됨",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "보낸 사람:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "에이전트 선택",
@@ -74,5 +75,37 @@
         "ERROR": "올바른 전자 메일 주소를 입력하십시오."
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index ec6186cdd..985751cb9 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "값 선택"
       },
       "TWITTER": {
-        "HELP": "트위터 프로필을 채널로 추가하려면 '트위터로 로그인'을 클릭하여 트위터 프로필을 인증해야 합니다. "
+        "HELP": "트위터 프로필을 채널로 추가하려면 '트위터로 로그인'을 클릭하여 트위터 프로필을 인증해야 합니다. ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "웹사이트 채널",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "설정",
       "COLLABORATORS": "협력자",
-      "CONFIGURATION": "설치"
+      "CONFIGURATION": "설치",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "설정",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "페이스북 연결이 만료되었습니다. 서비스를 계속하려면 페이스북 페이지를 다시 연결하십시오.",
       "MESSAGE_SUCCESS": "다시 연결 성공",
       "MESSAGE_ERROR": "오류가 발생했습니다. 다시 시도하십시오."
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
new file mode 100644
index 000000000..8dbb7bc44
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "만들기",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "에이전트 추가",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "준비가 완료되었습니다."
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "준비가 완료되었습니다."
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "이메일",
+      "BUTTON_TEXT": "에이전트 추가",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "에이전트 추가",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "삭제",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "삭제 ",
+        "NO": "취소"
+      }
+    },
+    "SETTINGS": "설정",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 9f92886b2..51709576e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "കോൺ‌ടാക്റ്റ് എഡിറ്റുചെയ്യുക",
     "TITLE": "കോൺ‌ടാക്റ്റ് എഡിറ്റുചെയ്യുക",
-    "DESC": "കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ‌ എഡിറ്റുചെയ്യുക",
+    "DESC": "കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ‌ എഡിറ്റുചെയ്യുക"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "സമർപ്പിക്കുക",
       "CANCEL": "റദ്ദാക്കുക",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "കോൺ‌ടാക്റ്റ് വിജയകരമായി അപ്‌ഡേറ്റുചെയ്‌തു",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "ഈ ഇമെയിൽ വിലാസം മറ്റൊരു കോൺ‌ടാക്റ്റിനായി ഉപയോഗത്തിലാണ്.",
-    "ERROR_MESSAGE": "കോൺ‌ടാക്റ്റ് അപ്‌ഡേറ്റ് ചെയ്യുന്നതിൽ ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+    "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
   },
   "CONTACTS_PAGE": {
     "HEADER": "കോൺ‌ടാക്റ്റുകൾ",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "കോൺ‌ടാക്റ്റുകൾ‌ ലോഡുചെയ്യുന്നു...",
       "404": "കോൺ‌ടാക്റ്റുകളൊന്നും നിങ്ങളുടെ തിരയലുമായി പൊരുത്തപ്പെടുന്നില്ല",
-      "TABLE_HEADER": [
-        "പേര്",
-        "ഫോൺ നമ്പർ",
-        "സംഭാഷണങ്ങൾ",
-        "അവസാനം കോൺടാക്റ്റുചെയ്തത്"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "പേര്",
+        "PHONE_NUMBER": "ഫോൺ നമ്പർ",
+        "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "കമ്പനി",
+        "EMAIL_ADDRESS": "ഇമെയിൽ വിലാസം"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 5a5b39642..b4494ea22 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "സന്ദേശങ്ങൾ തിരയുക",
       "LOADING_MESSAGE": "ഡാറ്റ ലോഡുചെയ്യുന്നു...",
       "PLACEHOLDER": "സന്ദേശങ്ങൾ തിരയാൻ ഏതെങ്കിലും വാചകം ടൈപ്പുചെയ്യുക",
-      "NO_MATCHING_RESULTS": "തിരയൽ പാരാമീറ്ററുകളുമായി പൊരുത്തപ്പെടുന്ന സന്ദേശങ്ങളൊന്നുമില്ല."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "വായിക്കാത്ത സന്ദേശങ്ങൾ",
     "UNREAD_MESSAGE": "വായിക്കാത്ത സന്ദേശം",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "സ്വകാര്യ കുറിപ്പ്: നിങ്ങൾക്കും നിങ്ങളുടെ ടീമിനും മാത്രം ദൃശ്യമാണ്",
     "CHANGE_STATUS": "സംഭാഷണ നില മാറ്റി",
     "CHANGE_AGENT": "സംഭാഷണ നിയുക്തനെ മാറ്റി",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "അയച്ചത്:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "ഏജന്റ് തിരഞ്ഞെടുക്കുക",
@@ -74,5 +75,37 @@
         "ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ വിലാസം നൽകുക"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 87d31a925..5b728ab6f 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക"
       },
       "TWITTER": {
-        "HELP": "നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ ഒരു ചാനലായി ചേർക്കുന്നതിന്, 'ട്വിറ്ററിനൊപ്പം പ്രവേശിക്കുക' ക്ലിക്കുചെയ്ത് നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ പ്രാമാണീകരിക്കേണ്ടതുണ്ട് "
+        "HELP": "നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ ഒരു ചാനലായി ചേർക്കുന്നതിന്, 'ട്വിറ്ററിനൊപ്പം പ്രവേശിക്കുക' ക്ലിക്കുചെയ്ത് നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ പ്രാമാണീകരിക്കേണ്ടതുണ്ട് ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "വെബ്‌സൈറ്റ് ചാനൽ",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "ക്രമീകരണങ്ങൾ",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
new file mode 100644
index 000000000..0e9a63213
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "സൃഷ്ടിക്കുക",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "ഏജന്റുമാരെ ചേർക്കുക",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "എല്ലാം ഭംഗിയായി പാപര്യവസാനിച്ചിരിക്കുന്നു. വരൂ നമുക്ക്‌ പോകാം!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "എല്ലാം ഭംഗിയായി പാപര്യവസാനിച്ചിരിക്കുന്നു. വരൂ നമുക്ക്‌ പോകാം!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "ഇമെയിൽ",
+      "BUTTON_TEXT": "ഏജന്റുമാരെ ചേർക്കുക",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "ഏജന്റുമാരെ ചേർക്കുക",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "ഇല്ലാതാക്കുക",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "ഇല്ലാതാക്കുക ",
+        "NO": "റദ്ദാക്കുക"
+      }
+    },
+    "SETTINGS": "ക്രമീകരണങ്ങൾ",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index da85ffab8..effbc1a74 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -43,9 +43,16 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Submit",
+      "SUBMIT": "बुझाउनुहोस्",
       "CANCEL": "Cancel",
       "AVATAR": {
         "LABEL": "Contact Avatar"
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Name",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 967378552..da1192e84 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Please enter a valid email address"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 8c3f5624b..56aa98404 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' "
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website channel",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
new file mode 100644
index 000000000..5ba108626
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 25f08e41c..742a861f7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Contact bewerken",
     "TITLE": "Contact bewerken",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Bevestigen",
       "CANCEL": "Annuleren",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Naam",
-        "Phone Number",
-        "Gesprekken",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Naam",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Gesprekken",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Bedrijfsnaam",
+        "EMAIL_ADDRESS": "Uw e-mailadres"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 0b53c985c..945661be3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Privéopmerking: alleen zichtbaar voor jou en je team",
     "CHANGE_STATUS": "Gespreksstatus veranderd",
     "CHANGE_AGENT": "Toegewezen persoon voor dit gesprek is veranderd",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Voer een geldig e-mailadres in"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 9f6d2a142..c73669dd4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "Om uw Twitterprofiel als kanaal toe te voegen moet u uw Twitterprofiel verifiëren door te klikken op 'Meld je aan met Twitter' "
+        "HELP": "Om uw Twitterprofiel als kanaal toe te voegen moet u uw Twitterprofiel verifiëren door te klikken op 'Meld je aan met Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website kanaal",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Instellingen",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Instellingen",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "Er is een fout opgetreden, probeer het opnieuw"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
new file mode 100644
index 000000000..464a03940
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Aanmaken",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Agenten toevoegen",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Je bent helemaal klaar om te beginnen!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Je bent helemaal klaar om te beginnen!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-mailadres",
+      "BUTTON_TEXT": "Voeg agenten toe",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Voeg agenten toe",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Verwijderen",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Verwijderen ",
+        "NO": "Annuleren"
+      }
+    },
+    "SETTINGS": "Instellingen",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index a44e2ac23..2a068385d 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Rediger kontakt",
     "TITLE": "Rediger kontakt",
-    "DESC": "Rediger kontaktopplysninger",
+    "DESC": "Rediger kontaktopplysninger"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Send",
       "CANCEL": "Avbryt",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontakten er oppdatert",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Denne e-postadressen er allerede i bruk av en annen kontakt.",
-    "ERROR_MESSAGE": "Det oppstod en feil under oppdatering av kontakten. Prøv igjen"
+    "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakter",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Laster inn kontakter...",
       "404": "Ingen kontakter samsvarer med søket ditt 🔍",
-      "TABLE_HEADER": [
-        "Navn",
-        "Telefonnummer",
-        "Samtaler",
-        "Siste kontakt"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Navn",
+        "PHONE_NUMBER": "Telefonnummer",
+        "CONVERSATIONS": "Samtaler",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Firma",
+        "EMAIL_ADDRESS": "E-postadresse"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index c0c523a73..19d6cf7d5 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Søk i meldinger",
       "LOADING_MESSAGE": "Knuser data...",
       "PLACEHOLDER": "Skriv tekst for å søke etter meldinger",
-      "NO_MATCHING_RESULTS": "Det finnes ingen meldinger som samsvarer med søket."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Uleste meldinger",
     "UNREAD_MESSAGE": "Ulest melding",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Privat notat: bare synlig for deg og ditt team",
     "CHANGE_STATUS": "Samtalestatus er endret",
     "CHANGE_AGENT": "Tildelt agent er endret",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sendt av:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Velg agent",
@@ -74,5 +75,37 @@
         "ERROR": "Vennligst skriv inn en gyldig e-postadresse"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 5f68c594d..8c5607991 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Velg en verdi"
       },
       "TWITTER": {
-        "HELP": "For å legge til din Twitter-profil som kanal, må du autorisere din Twitter-profil ved å klikke på 'Logg inn med Twitter' "
+        "HELP": "For å legge til din Twitter-profil som kanal, må du autorisere din Twitter-profil ved å klikke på 'Logg inn med Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Nettsidekanal",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Innstillinger",
       "COLLABORATORS": "Samarbeidspartnere",
-      "CONFIGURATION": "Konfigurasjon"
+      "CONFIGURATION": "Konfigurasjon",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Innstillinger",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Facebook-tilkoblingen din er utløpt, koble til Facebook-siden din for å fortsette tjenester",
       "MESSAGE_SUCCESS": "Ny tilkobling vellykket",
       "MESSAGE_ERROR": "Det oppstod en feil. Prøv igjen"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
new file mode 100644
index 000000000..b168e3678
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Opprett",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Legg til agenter",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Klar - ferdig - gå!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Klar - ferdig - gå!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-POST",
+      "BUTTON_TEXT": "Legg til agenter",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Legg til agenter",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Slett",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Slett ",
+        "NO": "Avbryt"
+      }
+    },
+    "SETTINGS": "Innstillinger",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 852b25a7b..dd4cda95f 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edytuj Kontakt",
     "TITLE": "Edytuj kontakt",
-    "DESC": "Edytuj dane kontaktowe",
+    "DESC": "Edytuj dane kontaktowe"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Prześlij",
       "CANCEL": "Anuluj",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Pomyślnie zaktualizowano kontakt",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Ten adres e-mail jest już zajęty przez inny kontakt.",
-    "ERROR_MESSAGE": "Podczas aktualizowania kontaktu wystąpił błąd. Spróbuj ponownie"
+    "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakty",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Ładowanie kontaktów...",
       "404": "Brak kontaktów pasujących do Twojego wyszukiwania 🔍",
-      "TABLE_HEADER": [
-        "Nazwisko",
-        "Numer telefonu",
-        "Rozmowy",
-        "Ostatnio nawiązano kontakt"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nazwisko",
+        "PHONE_NUMBER": "Numer telefonu",
+        "CONVERSATIONS": "Rozmowy",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Firma",
+        "EMAIL_ADDRESS": "Adres e-mail"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 45a15cbb7..cdeb15a20 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Szukaj wiadomości",
       "LOADING_MESSAGE": "Trwa przetwarzanie danych...",
       "PLACEHOLDER": "Wpisz dowolny tekst, aby wyszukać wiadomości",
-      "NO_MATCHING_RESULTS": "Brak wiadomości pasujących do parametrów wyszukiwania."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Prywatna uwaga: widoczne tylko dla Ciebie i twojego zespołu",
     "CHANGE_STATUS": "Status konwersacji zmieniony",
     "CHANGE_AGENT": "Osoba przypisana do konwersacji zmieniona",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Wprowadź poprawny adres e-mail"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index fd0a241ab..9b8e3aabf 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "Aby dodać swój profil na Twitterze jako kanał, musisz uwierzytelnić swój profil Twitter klikając na 'Zaloguj się przez Twittera' "
+        "HELP": "Aby dodać swój profil na Twitterze jako kanał, musisz uwierzytelnić swój profil Twitter klikając na 'Zaloguj się przez Twittera' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Kanał strony internetowej",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Ustawienia",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Ustawienia",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
new file mode 100644
index 000000000..cf83e4bc7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Dodaj agentów",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Wszystko jest gotowe!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Wszystko jest gotowe!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Dodaj agentów",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Dodaj agentów",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Usuń",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Usuń ",
+        "NO": "Anuluj"
+      }
+    },
+    "SETTINGS": "Ustawienia",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 03a38712e..9b9668f22 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "submeter",
       "CANCEL": "cancelar",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Nome:",
-        "Phone Number",
-        "Conversas",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nome:",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversas",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Endereço de e-mail"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 9ebad3489..f9e220f51 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Nota Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa alterado",
     "CHANGE_AGENT": "Responsável da conversa alterado",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Por favor, insira um endereço de e-mail válido"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index b236751c9..b6c3994b1 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' "
+        "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal do site",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Confirgurações",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Confirgurações",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "Ocorreu um erro, por favor tente novamente"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
new file mode 100644
index 000000000..7b4e18024
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Criar",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Adicionar Agentes",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Está tudo pronto para começar!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Está tudo pronto para começar!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-mail:",
+      "BUTTON_TEXT": "Adicionar agentes",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Adicionar agentes",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "excluir ",
+        "NO": "cancelar"
+      }
+    },
+    "SETTINGS": "Confirgurações",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index e4461ac76..0f4f84f16 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Alterar Contato",
     "TITLE": "Alterar contato",
-    "DESC": "Alterar detalhes do contato",
+    "DESC": "Alterar detalhes do contato"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Novo contato",
+    "TITLE": "Criar novo contato",
+    "DESC": "Adicione informações básicas sobre o contato."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Enviar",
       "CANCEL": "Cancelar",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contato atualizado com sucesso",
+    "SUCCESS_MESSAGE": "Contato salvo com sucesso",
     "CONTACT_ALREADY_EXIST": "Esse endereço de e-mail já está sendo usado para outro contato.",
-    "ERROR_MESSAGE": "Ocorreu um erro ao atualizar o contato, por favor, tente novamente"
+    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contato",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Carregando contatos...",
       "404": "Nenhum contato corresponde à sua pesquisa 🔍",
-      "TABLE_HEADER": [
-        "Nome",
-        "Número de Telefone",
-        "Conversas",
-        "Último contato"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nome",
+        "PHONE_NUMBER": "Número de Telefone",
+        "CONVERSATIONS": "Conversas",
+        "LAST_ACTIVITY": "Última atividade",
+        "COUNTRY": "País/região",
+        "CITY": "Cidade",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Empresa",
+        "EMAIL_ADDRESS": "Endereço de e-mail"
+      },
+      "VIEW_DETAILS": "Ver detalhes"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index ffc5ebbe0..9ad9966b2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Procurar mensagens",
       "LOADING_MESSAGE": "Preparando dados...",
       "PLACEHOLDER": "Digite qualquer texto para pesquisar mensagens",
-      "NO_MATCHING_RESULTS": "Não há mensagens que correspondam aos parâmetros de pesquisa."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Mensagens não lidas",
     "UNREAD_MESSAGE": "Mensagem não lida",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Remover Seleção",
     "DOWNLOAD": "Baixar",
     "UPLOADING_ATTACHMENTS": "Enviando anexos...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Sem resposta",
     "HEADER": {
       "RESOLVE_ACTION": "Resolver",
       "REOPEN_ACTION": "Reabrir",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Mensagem Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa mudou",
     "CHANGE_AGENT": "Responsável da conversa alterado",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Enviado por:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Selecione Agente",
@@ -74,5 +75,37 @@
         "ERROR": "Por favor, insira um endereço de e-mail válido"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Olá, 👋. Bem-vindo ao %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Leia as últimas atualizações",
+    "ALL_CONVERSATION": {
+      "TITLE": "Todas as suas conversas em um só lugar",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Conectar caixas de entrada",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Clique aqui para criar uma caixa de entrada"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 5d98fbda3..3954d9745 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Escolha um valor"
       },
       "TWITTER": {
-        "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' "
+        "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal do website",
@@ -224,9 +225,11 @@
     "TABS": {
       "SETTINGS": "Configurações",
       "COLLABORATORS": "Colaboradores",
-      "CONFIGURATION": "Configuração"
+      "CONFIGURATION": "Configuração",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
-    "SETTINGS": "Confirgurações",
+    "SETTINGS": "Configurações",
     "FEATURES": {
       "LABEL": "Funcionalidades",
       "DISPLAY_FILE_PICKER": "Exibir seletor de arquivos no widget",
@@ -250,6 +253,41 @@
       "SUBTITLE": "Sua conexão com o Facebook expirou, reconecte sua página do Facebook para continuar",
       "MESSAGE_SUCCESS": "Reconexão bem sucedida",
       "MESSAGE_ERROR": "Ocorreu um erro, por favor tente novamente"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Sim",
+          "DISABLED": "Não"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Indisponível",
+        "HOURS": "horas",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Selecione"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 3b5a94f44..8add4f307 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -125,7 +125,7 @@
     "INTEGRATIONS": "Integrações",
     "ACCOUNT_SETTINGS": "Configurações da conta",
     "LABELS": "Marcadores",
-    "TEAMS": "Teams"
+    "TEAMS": "Times"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Nova conta",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
new file mode 100644
index 000000000..369427293
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Times",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Criar",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Adicionar Agentes",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Está tudo pronto para começar!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Está tudo pronto para começar!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-mail",
+      "BUTTON_TEXT": "Adicionar agentes",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Adicionar agentes",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Excluir ",
+        "NO": "Cancelar"
+      }
+    },
+    "SETTINGS": "Confirgurações",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index a5f27ea52..fa4cd3478 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Trimite",
       "CANCEL": "Renunță",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Nume",
-        "Phone Number",
-        "Conversații",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Nume",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversații",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Adresa Email"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index f903efd09..13e78fdb8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Notă privată: vizibilă doar pentru tine și echipa ta",
     "CHANGE_STATUS": "Stare conversație schimbată",
     "CHANGE_AGENT": "Persoana căreia i-a fost ateribuită conversația a fost schimbată",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index aec8b3c9b..eaba4c89a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Alege o valoare"
       },
       "TWITTER": {
-        "HELP": "Pentru a vă adăuga profilul de Twitter ca si canal, trebuie să vă autentificați profilul de Twitter făcând clic pe \"Conectați-vă cu Twitter\" "
+        "HELP": "Pentru a vă adăuga profilul de Twitter ca si canal, trebuie să vă autentificați profilul de Twitter făcând clic pe \"Conectați-vă cu Twitter\" ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Canal web",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Setări",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Setări",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "A apărut o eroare, încercați din nou"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
new file mode 100644
index 000000000..095643bd7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Creeaza",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Adaugă Agent",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Toate setarile sunt facute!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Toate setarile sunt facute!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-MAIL",
+      "BUTTON_TEXT": "Adaugă Agent",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Adaugă Agent",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Şterge",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Şterge ",
+        "NO": "Renunță"
+      }
+    },
+    "SETTINGS": "Setări",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 9fdca975f..44c00ceb4 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -80,6 +80,6 @@
     "RECEIVED_VIA_EMAIL": "Получено по электронной почте",
     "VIEW_TWEET_IN_TWITTER": "Просмотреть твит в Twitter",
     "REPLY_TO_TWEET": "Ответить на этот твит",
-    "NO_MESSAGES": "No Messages"
+    "NO_MESSAGES": "Нет сообщений"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index 11e42012f..082f0a15e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Изменить контакт",
     "TITLE": "Изменить контакт",
-    "DESC": "Изменить контактные данные",
+    "DESC": "Изменить контактные данные"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Новый контакт",
+    "TITLE": "Создать новый контакт",
+    "DESC": "Добавить основную информацию о контакте."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Отправить",
       "CANCEL": "Отменить",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Контакт успешно обновлен",
+    "SUCCESS_MESSAGE": "Контакт успешно сохранен",
     "CONTACT_ALREADY_EXIST": "Этот адрес электронной почты используется для другого контакта.",
-    "ERROR_MESSAGE": "При сохранении настроек произошла ошибка, пожалуйста, попробуйте еще раз"
+    "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Контакты",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Загрузка контактов...",
       "404": "Нет контактов по вашему запросу 🔍",
-      "TABLE_HEADER": [
-        "Имя",
-        "Номер телефона",
-        "Диалоги",
-        "Последний Контакт"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Имя",
+        "PHONE_NUMBER": "Номер телефона",
+        "CONVERSATIONS": "Диалоги",
+        "LAST_ACTIVITY": "Последние действия",
+        "COUNTRY": "Страна",
+        "CITY": "Город",
+        "SOCIAL_PROFILES": "Профили в соц. сетях",
+        "COMPANY": "Компания",
+        "EMAIL_ADDRESS": "Email"
+      },
+      "VIEW_DETAILS": "Просмотреть подробности"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index aad9b5f13..3d11237da 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -3,7 +3,7 @@
     "404": "Пожалуйста, выберите диалог из левой панели",
     "NO_MESSAGE_1": "Ой! Похоже, сообщений от клиентов нет.",
     "NO_MESSAGE_2": " чтобы отправить сообщение на вашу страницу!",
-    "NO_INBOX_1": "Хола! Похоже, вы еще не добавили ни одного источника.",
+    "NO_INBOX_1": "Алоха! Похоже, вы еще не добавили ни одного источника.",
     "NO_INBOX_2": " для начала",
     "NO_INBOX_AGENT": "Ой! Похоже, вы не добавлены ни к одному источнику сообщений. Обратитесь к администратору",
     "SEARCH_MESSAGES": "Поиск по сообщениям в диалогах",
@@ -11,7 +11,7 @@
       "TITLE": "Поиск сообщений",
       "LOADING_MESSAGE": "Сохранение данных...",
       "PLACEHOLDER": "Введите любой текст для поиска сообщений",
-      "NO_MATCHING_RESULTS": "Нет сообщений, соответствующих параметрам поиска."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Непрочитанные сообщения",
     "UNREAD_MESSAGE": "Непрочитанное сообщение",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Удалить выделенное",
     "DOWNLOAD": "Скачать",
     "UPLOADING_ATTACHMENTS": "Загрузка вложений...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Нет ответа",
     "HEADER": {
       "RESOLVE_ACTION": "Завершить",
       "REOPEN_ACTION": "Открыть заново",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Приватная заметка: видна только вам и вашей команде",
     "CHANGE_STATUS": "Статус разговора изменен",
     "CHANGE_AGENT": "Назначенный оператор изменен",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Отправитель:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Выбрать Агента",
@@ -74,5 +75,37 @@
         "ERROR": "Пожалуйста, введите действительный адрес электронной почты"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Привет 👋, добро пожаловать в %{installationName}!",
+    "DESCRIPTION": "Спасибо за регистрацию. Мы хотим, чтобы вы получили максимум от %{installationName}. Вот несколько вещей, которые вы можете сделать в %{installationName}, чтобы получить ещё больше приятных впечатлений.",
+    "READ_LATEST_UPDATES": "Читайте о наших последних обновлениях",
+    "ALL_CONVERSATION": {
+      "TITLE": "Все ваши диалоги в одном месте",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 3426f2897..ecf2f1f33 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -53,7 +53,7 @@
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
+    "HEADER": "Уведомления",
     "MARK_ALL_DONE": "Mark All Done",
     "LIST": {
       "LOADING_MESSAGE": "Loading notifications...",
@@ -68,8 +68,8 @@
     "TYPE_LABEL": {
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "assigned_conversation_new_message": "Новое сообщение",
+      "conversation_mention": "Упоминание"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 1716e6e8d..145c2908f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Выберите значение"
       },
       "TWITTER": {
-        "HELP": "Чтобы добавить свой Twitter профиль в качестве источника, вам нужно авторизоваться при помощи входа через Twitter "
+        "HELP": "Чтобы добавить свой Twitter профиль в качестве источника, вам нужно авторизоваться при помощи входа через Twitter ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Сайт",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Настройки",
       "COLLABORATORS": "Соавторы",
-      "CONFIGURATION": "Настройки"
+      "CONFIGURATION": "Настройки",
+      "PRE_CHAT_FORM": "Форма, показываемая перед стартом диалога",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Настройки",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Ваше подключение к Facebook истекло. Пожалуйста, переподключитесь к Facebook для продолжения работы",
       "MESSAGE_SUCCESS": "Переподключение выполнено",
       "MESSAGE_ERROR": "Произошла ошибка, попробуйте еще раз"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Да",
+          "DISABLED": "Нет"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Сообщение для формы, показываемой перед стартом диалога",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Настройте ваши рабочие часы",
+      "SUBTITLE": "Настройте ваши рабочие часы для общения через виджет на сайте",
+      "WEEKLY_TITLE": "Укажите ваши рабочие часы",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Я работаю в этот день",
+        "UNAVAILABLE": "Я не работаю в этот день",
+        "HOURS": "часы",
+        "VALIDATION_ERROR": "Время начала должно предшествовать времени окончания.",
+        "CHOOSE": "Выбрать"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index a17b3c83c..08222f69a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -120,12 +120,12 @@
     "HOME": "Главная",
     "AGENTS": "Операторы",
     "INBOXES": "Источники",
-    "NOTIFICATIONS": "Notifications",
+    "NOTIFICATIONS": "Уведомления",
     "CANNED_RESPONSES": "Шаблонные ответы",
     "INTEGRATIONS": "Интеграции",
     "ACCOUNT_SETTINGS": "Настройки аккаунта",
     "LABELS": "Категории",
-    "TEAMS": "Teams"
+    "TEAMS": "Команды"
   },
   "CREATE_ACCOUNT": {
     "NEW_ACCOUNT": "Новый аккаунт",
diff --git a/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json
new file mode 100644
index 000000000..32bc187b6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Команды",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Создать",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Добавить операторов",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Все готово!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Все готово!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "Email",
+      "BUTTON_TEXT": "Добавить операторов",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Добавить операторов",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Удалить",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Удалить ",
+        "NO": "Отменить"
+      }
+    },
+    "SETTINGS": "Настройки",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index da85ffab8..d6cc103ca 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Submit",
       "CANCEL": "Cancel",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Name",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 967378552..da1192e84 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
     "CHANGE_STATUS": "Conversation status changed",
     "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Please enter a valid email address"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index db2e6cea8..42bc5f592 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' "
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website channel",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
new file mode 100644
index 000000000..5ba108626
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
index 4a07de96c..3a24ba227 100644
--- a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
@@ -67,7 +67,7 @@
         },
         "AGENT_TYPE": {
           "LABEL": "Roll",
-          "PLACEHOLDER": "Välj en typ",
+          "PLACEHOLDER": "Välj en roll",
           "ERROR": "Roll krävs"
         },
         "EMAIL": {
@@ -85,7 +85,7 @@
       "PASSWORD_RESET": {
         "ADMIN_RESET_BUTTON": "Återställ lösenord",
         "ADMIN_SUCCESS_MESSAGE": "Ett e-postmeddelande med instruktioner för att återställa lösenordet har skickats till agenten",
-        "SUCCESS_MESSAGE": "Agentlösenordet återställt",
+        "SUCCESS_MESSAGE": "Agentens lösenord återställd",
         "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sv/chatlist.json b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
index 5add8aadf..673e34ad5 100644
--- a/app/javascript/dashboard/i18n/locale/sv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
@@ -8,7 +8,7 @@
     },
     "TAB_HEADING": "Konversationer",
     "SEARCH": {
-      "INPUT": "Sök efter människor, chattar, sparade svar .."
+      "INPUT": "Sök efter personer, chattar, sparade svar .."
     },
     "STATUS_TABS": [
       {
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 2898e0f50..02d4366a6 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -6,7 +6,7 @@
     "COPY_SUCCESSFUL": "Kopierat till urklipp",
     "COMPANY": "Företag",
     "LOCATION": "Plats",
-    "CONVERSATION_TITLE": "Konversation Detaljer",
+    "CONVERSATION_TITLE": "Konversationsdetaljer",
     "BROWSER": "Webbläsare",
     "OS": "Operativsystem",
     "INITIATED_FROM": "Initierad från",
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Redigera kontakt",
     "TITLE": "Redigera kontakt",
-    "DESC": "Redigera kontaktuppgifter",
+    "DESC": "Redigera kontaktuppgifter"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Skicka",
       "CANCEL": "Avbryt",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kontakten har uppdaterats",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Den här e-postadressen används för en annan kontakt.",
-    "ERROR_MESSAGE": "Ett fel uppstod vid uppdateringen av kontakten, vänligen försök igen"
+    "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontakter",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Laddar kontakter...",
       "404": "Inga kontakter matchar din sökning 🔍",
-      "TABLE_HEADER": [
-        "Namn",
-        "Telefonnummer",
-        "Konversationer",
-        "Senast kontaktad"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Namn",
+        "PHONE_NUMBER": "Telefonnummer",
+        "CONVERSATIONS": "Konversationer",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Företag",
+        "EMAIL_ADDRESS": "E-postadress"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index afd4dbf74..eee9e7b4a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -5,13 +5,13 @@
     "NO_MESSAGE_2": " för att skicka ett meddelande till din sida!",
     "NO_INBOX_1": "Hola! Ser ut som om du inte har lagt till några inkorgar än.",
     "NO_INBOX_2": " för att komma igång",
-    "NO_INBOX_AGENT": "Oh Oh! Ser ut som om du inte är en del av någon inkorg. Kontakta administratören",
+    "NO_INBOX_AGENT": "Oj då! Ser ut som om du inte är del av någon inkorg. Kontakta administratören",
     "SEARCH_MESSAGES": "Sök meddelanden i konversationer",
     "SEARCH": {
       "TITLE": "Sök meddelanden",
       "LOADING_MESSAGE": "Tuggar data...",
       "PLACEHOLDER": "Skriv valfri text för att söka efter meddelanden",
-      "NO_MATCHING_RESULTS": "Det finns inga meddelanden som motsvarar sökparametrarna."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Olästa meddelanden",
     "UNREAD_MESSAGE": "Oläst meddelande",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Ta bort urval",
     "DOWNLOAD": "Hämta",
     "UPLOADING_ATTACHMENTS": "Laddar upp bilagor...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Inget svar",
     "HEADER": {
       "RESOLVE_ACTION": "Lös",
       "REOPEN_ACTION": "Återöppna",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Privat anteckning: Endast synlig för dig och ditt team",
     "CHANGE_STATUS": "Konversationsstatus ändrad",
     "CHANGE_AGENT": "Konversationstilldelning ändrad",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Skickat av:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Välj agent",
@@ -74,5 +75,37 @@
         "ERROR": "Ange en giltig e-postadress"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 7afa2f9e1..a60559588 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -38,10 +38,11 @@
         "PICK_A_VALUE": "Välj ett värde"
       },
       "TWITTER": {
-        "HELP": "För att lägga till din Twitter-profil som en kanal måste du autentisera din Twitter-profil genom att klicka på \"Logga in med Twitter\" "
+        "HELP": "För att lägga till din Twitter-profil som en kanal måste du autentisera din Twitter-profil genom att klicka på \"Logga in med Twitter\" ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
-        "TITLE": "Webbplatsens kanal",
+        "TITLE": "Webbplatskanal",
         "DESC": "Skapa en kanal för din webbplats och börja stödja dina kunder via vår hemsida widget.",
         "LOADING_MESSAGE": "Skapar supportkanal för webbplats",
         "CHANNEL_AVATAR": {
@@ -49,7 +50,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Webbplatsens namn",
-          "PLACEHOLDER": "Ange ditt webbplatsnamn (t.ex. Acme Inc)"
+          "PLACEHOLDER": "Ange namnet på din webbplats (t.ex. Acme Inc)"
         },
         "CHANNEL_DOMAIN": {
           "LABEL": "Webbplatsens domän",
@@ -61,7 +62,7 @@
         },
         "CHANNEL_WELCOME_TAGLINE": {
           "LABEL": "Välkomsttagline",
-          "PLACEHOLDER": "Vi gör det enkelt att få kontakt med oss. Fråga oss något, eller dela din feedback."
+          "PLACEHOLDER": "Vi gör det enkelt att ta kontakt med oss. Fråga oss något, eller dela din feedback."
         },
         "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Kanalhälsningsmeddelande",
@@ -81,8 +82,8 @@
           "HELP_TEXT": "Den här svarstiden kommer att visas på livechattswidgeten"
         },
         "WIDGET_COLOR": {
-          "LABEL": "Widget färg",
-          "PLACEHOLDER": "Uppdatera widgetens färg som används i widget"
+          "LABEL": "Widgetfärg",
+          "PLACEHOLDER": "Uppdatera den widgetfärg som används i widget"
         },
         "SUBMIT_BUTTON": "Skapa inkorg"
       },
@@ -90,23 +91,23 @@
         "TITLE": "Twilio SMS/Whatsapp-kanal",
         "DESC": "Integrera Twilio och börja supporta dina kunder via SMS eller Whatsapp.",
         "ACCOUNT_SID": {
-          "LABEL": "Konto SID",
-          "PLACEHOLDER": "Ange ditt Twilio-konto SID",
-          "ERROR": "Detta fält är tvingande"
+          "LABEL": "Kontots SID",
+          "PLACEHOLDER": "Ange SID för ditt Twilio-konto",
+          "ERROR": "Detta fält är obligatoriskt"
         },
         "CHANNEL_TYPE": {
           "LABEL": "Kanaltyp",
           "ERROR": "Var god välj din kanaltyp"
         },
         "AUTH_TOKEN": {
-          "LABEL": "Auth token",
-          "PLACEHOLDER": "Ange din Twilio Auth Token",
-          "ERROR": "Detta fält är tvingande"
+          "LABEL": "Auth-token",
+          "PLACEHOLDER": "Ange din Auth-token för Twilio",
+          "ERROR": "Detta fält är obligatoriskt"
         },
         "CHANNEL_NAME": {
           "LABEL": "Kanalnamn",
           "PLACEHOLDER": "Ange ett kanalnamn",
-          "ERROR": "Detta fält är tvingande"
+          "ERROR": "Detta fält är obligatoriskt"
         },
         "PHONE_NUMBER": {
           "LABEL": "Telefonnummer",
@@ -117,9 +118,9 @@
           "TITLE": "Callback-URL",
           "SUBTITLE": "Du måste konfigurera meddelande-callback-URL i Twilio med den URL som nämns här."
         },
-        "SUBMIT_BUTTON": "Skapa Twilio kanal",
+        "SUBMIT_BUTTON": "Skapa Twiliokanal",
         "API": {
-          "ERROR_MESSAGE": "Vi kunde inte autentisera Twilio autentiseringsuppgifter, försök igen"
+          "ERROR_MESSAGE": "Vi kunde inte autentisera Twilio-uppgifterna, försök igen"
         }
       },
       "API_CHANNEL": {
@@ -128,7 +129,7 @@
         "CHANNEL_NAME": {
           "LABEL": "Kanalnamn",
           "PLACEHOLDER": "Ange ett kanalnamn",
-          "ERROR": "Detta fält är tvingande"
+          "ERROR": "Detta fält är obligatoriskt"
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
@@ -146,7 +147,7 @@
         "CHANNEL_NAME": {
           "LABEL": "Kanalnamn",
           "PLACEHOLDER": "Ange ett kanalnamn",
-          "ERROR": "Detta fält är tvingande"
+          "ERROR": "Detta fält är obligatoriskt"
         },
         "EMAIL": {
           "LABEL": "E-post",
@@ -170,19 +171,19 @@
         "PICK_AGENTS": "Välj agenter för inkorgen"
       },
       "DETAILS": {
-        "TITLE": "Inkorg Detaljer",
+        "TITLE": "Inkorgsdetaljer",
         "DESC": "Från rullgardinsmenyn nedan, välj den Facebook-sida du vill ansluta till Chatwoot. Du kan också ge ett anpassat namn till din inkorg för bättre identifiering."
       },
       "FINISH": {
-        "TITLE": "Spikade det!",
+        "TITLE": "Där satt den!",
         "DESC": "Du har framgångsrikt integrerat din Facebook-sida med Chatwoot. Nästa gång en kund meddelar din sida kommer konversationen automatiskt att visas på din inkorg.<br>Vi ger dig också en widget skript som du enkelt kan lägga till din webbplats. När detta är live på din webbplats, kunder kan meddela dig direkt från din webbplats utan hjälp av något externt verktyg och konversationen kommer att visas här på Chatwoot.<br>Cool, va? Tja, vi försöker säkert att vara :)"
       }
     },
     "DETAILS": {
       "LOADING_FB": "Autentiserar dig med Facebook...",
-      "ERROR_FB_AUTH": "Något gick fel, vänligen uppdatera sidan...",
+      "ERROR_FB_AUTH": "Något gick fel, vänligen ladda om sidan...",
       "CREATING_CHANNEL": "Skapar din inkorg...",
-      "TITLE": "Konfigurera Inkorg Detaljer",
+      "TITLE": "Konfigurera Inkorgsdetaljer",
       "DESC": ""
     },
     "AGENTS": {
@@ -191,9 +192,9 @@
     },
     "FINISH": {
       "TITLE": "Din inkorg är redo!",
-      "MESSAGE": "Du kan nu samarbeta med dina kunder genom din nya kanal. ",
+      "MESSAGE": "Du kan nu interagera med dina kunder genom din nya kanal. Supporta glatt ",
       "BUTTON_TEXT": "Ta mig dit",
-      "WEBSITE_SUCCESS": "Du har lyckats skapa en webbplats kanal. Kopiera koden som visas nedan och klistra in den på din webbplats. Nästa gång en kund använder livechatten visas konversationen automatiskt på din inkorg."
+      "WEBSITE_SUCCESS": "Du har skapat en webbplatskanal. Kopiera koden som visas nedan och klistra in den på din webbplats. Nästa gång en kund använder livechatten visas konversationen automatiskt i din inkorg."
     },
     "REAUTH": "Återauktorisera",
     "VIEW": "Visa",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Inställningar",
       "COLLABORATORS": "Medarbetare",
-      "CONFIGURATION": "Konfiguration"
+      "CONFIGURATION": "Konfiguration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Inställningar",
     "FEATURES": {
@@ -233,13 +236,13 @@
       "DISPLAY_EMOJI_PICKER": "Visa emoji-väljare på widgeten"
     },
     "SETTINGS_POPUP": {
-      "MESSENGER_HEADING": "Skript för budbärare",
-      "MESSENGER_SUB_HEAD": "Placera denna knapp i din kroppstagg",
+      "MESSENGER_HEADING": "Skript för Messenger",
+      "MESSENGER_SUB_HEAD": "Placera denna knapp i din body-tagg",
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Lägg till eller ta bort agenter från denna inkorg",
       "UPDATE": "Uppdatera",
       "AUTO_ASSIGNMENT": "Aktivera automatisk tilldelning",
-      "INBOX_UPDATE_TITLE": "Inkorg inställningar",
+      "INBOX_UPDATE_TITLE": "Inkorgsinställningar",
       "INBOX_UPDATE_SUB_TEXT": "Uppdatera inställningarna för din inkorg",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivera eller inaktivera automatisk tilldelning av nya konversationer till de agenter som lagts till den här inkorgen.",
       "HMAC_VERIFICATION": "Validering av användaridentitet",
@@ -250,6 +253,41 @@
       "SUBTITLE": "Din Facebook-anslutning har löpt ut, vänligen återanslut din Facebook-sida för att fortsätta med tjänsterna",
       "MESSAGE_SUCCESS": "Återanslutning lyckades",
       "MESSAGE_ERROR": "Ett fel uppstod, vänligen försök igen"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
index 0a1b49798..224786c1a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
@@ -12,7 +12,7 @@
       "ERROR": "Lösenorden matchar inte"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Lösenordet ändrades framgångsrikt",
+      "SUCCESS_MESSAGE": "Lösenordet ändrat",
       "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
     },
     "SUBMIT": "Skicka"
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index e6be52419..025037e21 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -1,9 +1,9 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profilens inställningar",
-    "TITLE": "Profilens inställningar",
+    "LINK": "Profilinställningar",
+    "TITLE": "Profilinställningar",
     "BTN_TEXT": "Uppdatera profil",
-    "AFTER_EMAIL_CHANGED": "Din profil har uppdaterats framgångsrikt, vänligen logga in igen eftersom dina inloggningsuppgifter har ändrats",
+    "AFTER_EMAIL_CHANGED": "Din profil har uppdaterats. Vänligen logga in på nytt eftersom dina inloggningsuppgifter har ändrats",
     "FORM": {
       "AVATAR": "Profilbild",
       "ERROR": "Vänligen åtgärda formulärfel",
diff --git a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
new file mode 100644
index 000000000..1e4a7c6e7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Skapa",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Lägg till agenter",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Ni är redo att köra!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Ni är redo att köra!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-POST",
+      "BUTTON_TEXT": "Lägg till agenter",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Lägg till agenter",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Radera",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Radera ",
+        "NO": "Avbryt"
+      }
+    },
+    "SETTINGS": "Inställningar",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 402bdad3d..ea4136a0c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "சமர்பிக்கவும்",
       "CANCEL": "ரத்துசெய்",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "பெயர்",
-        "Phone Number",
-        "உரையாடல்கள்",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "பெயர்",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "உரையாடல்கள்",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "ஈ-மெயில் முகவரி"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 00b97388b..7fd16b708 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "தனிப்பட்ட குறிப்பு: உங்களுக்கும் உங்கள் குழுவினருக்கும் மட்டுமே தெரியும்",
     "CHANGE_STATUS": "உரையாடலின் நிலை மாற்றப்பட்டது",
     "CHANGE_AGENT": "உரையாடல் ஒதுக்கீட்டாளர் மாற்றப்பட்டார்",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "சரியான ஈமெயில் முகவரியை பதிவிடவும்"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 9d2fc3108..9e8414833 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "மதிப்பைத் தேர்ந்தெடுங்கள்"
       },
       "TWITTER": {
-        "HELP": "உங்கள் ட்விட்டர் சுயவிவரத்தை ஒரு சேனலாக சேர்க்க, 'ட்விட்டருடன் உள்நுழைக' என்பதைக் கிளிக் செய்யாவும், இதன் மூலம் உங்கள் சுயவிவரத்தை ட்விட்டர் வாயிலாக அங்கீகரிக்கிறீர்கள் "
+        "HELP": "உங்கள் ட்விட்டர் சுயவிவரத்தை ஒரு சேனலாக சேர்க்க, 'ட்விட்டருடன் உள்நுழைக' என்பதைக் கிளிக் செய்யாவும், இதன் மூலம் உங்கள் சுயவிவரத்தை ட்விட்டர் வாயிலாக அங்கீகரிக்கிறீர்கள் ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "வலைத்தள சேனல்",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "அமைப்புகள்",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "அமைப்புகள்",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
new file mode 100644
index 000000000..1efb008b8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "ஏஜென்ட்களைச் சேர்க்கவும்",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "நீங்கள் மேற்கொண்டு பயன்படுத்தலாம்!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "நீங்கள் மேற்கொண்டு பயன்படுத்தலாம்!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "ஈ-மெயில்",
+      "BUTTON_TEXT": "ஏஜென்ட்களைச் சேர்க்க",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "ஏஜென்ட்களைச் சேர்க்க",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "ரத்துசெய்"
+      }
+    },
+    "SETTINGS": "அமைப்புகள்",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 3ffd3a65d..9c9ae7228 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "เเก้ไขผู้ติดต่อ",
     "TITLE": "เเก้ไขผู้ติดต่อ",
-    "DESC": "เเห้ไขรายละเอียดผู้ติดต่อ",
+    "DESC": "เเห้ไขรายละเอียดผู้ติดต่อ"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "ส่ง",
       "CANCEL": "ยกเลิก",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "อัพเดทเนื้อหาเสร็จสิ้น",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "อีเมล์นี้ถูกใช้ในผู้ติดต่อคนอื่นเเล้ว",
-    "ERROR_MESSAGE": "มีปัญหาในการอัพเดทผู้ติดต่อ กรุณาลองใหม่อีกครั้ง"
+    "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "ชื่อ",
-        "หมายเลขโทรศัพท์",
-        "การสนทนา",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "ชื่อ",
+        "PHONE_NUMBER": "หมายเลขโทรศัพท์",
+        "CONVERSATIONS": "การสนทนา",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "บริษัท",
+        "EMAIL_ADDRESS": "ที่อยู่อีเมล์"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 25e0ccbaa..d65f81b4b 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "โน้ตส่วนตัว: มีเพียงคุณและทีมเท่านั้นที่มองเห็นได้",
     "CHANGE_STATUS": "สถานะการสนทนามีการเปลี่ยนเเปลง",
     "CHANGE_AGENT": "ผู้ได้รับมอบหมายการสนทนานี้มีการเปลี่ยนแปลง",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "กรุณากรอกที่อยู่อีเมล์ให้ถูกต้อง"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index e355fa6ff..337deedb9 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "เลือกค่า"
       },
       "TWITTER": {
-        "HELP": "ในการเพิ่มโปรไฟล์ Twitter ของคุณเป็นช่องคุณต้องตรวจสอบสิทธิ์โปรไฟล์ Twitter ของคุณโดยคลิกที่ \"ลงชื่อเข้าใช้ด้วย Twitter\" "
+        "HELP": "ในการเพิ่มโปรไฟล์ Twitter ของคุณเป็นช่องคุณต้องตรวจสอบสิทธิ์โปรไฟล์ Twitter ของคุณโดยคลิกที่ \"ลงชื่อเข้าใช้ด้วย Twitter\" ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "ช่องเว็บไซต์",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Settings",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Settings",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
new file mode 100644
index 000000000..b8163924b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "เพิ่มพนักงาน",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "คุณพร้อมเเล้ว"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "คุณพร้อมเเล้ว"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "อีเมล์",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "ลบ",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "ลบ ",
+        "NO": "ยกเลิก"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index b7d2f2889..0068db064 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -80,6 +80,6 @@
     "RECEIVED_VIA_EMAIL": "E-posta ile alındı",
     "VIEW_TWEET_IN_TWITTER": "Twitter'da tweet'i görüntüleyin",
     "REPLY_TO_TWEET": "Bu tweet'i yanıtla",
-    "NO_MESSAGES": "No Messages"
+    "NO_MESSAGES": "Mesaj yok"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 0b54caad6..a01f0dc05 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Kişiyi Düzenle",
     "TITLE": "Kişiyi Düzenle",
-    "DESC": "İletişim bilgilerini düzenleyin",
+    "DESC": "İletişim bilgilerini düzenleyin"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "Yeni Kişi",
+    "TITLE": "Yeni kişi oluştur",
+    "DESC": "Kişi hakkındaki temel bilgileri giriniz."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Yolla",
       "CANCEL": "İptal Et",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Kişi başarıyla güncellendi",
+    "SUCCESS_MESSAGE": "Kişi bilgileri başarıyla kaydedildi",
     "CONTACT_ALREADY_EXIST": "Bu e-posta adresi başka bir kişi için kullanılıyor.",
-    "ERROR_MESSAGE": "Kişi güncellenirken bir hata oluştu, lütfen tekrar deneyin"
+    "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kişiler",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Kişiler yükleniyor ...",
       "404": "Aramanızla eşleşen kişi yok 🔍",
-      "TABLE_HEADER": [
-        "İsim",
-        "Telefon numarası",
-        "Konuşmalar",
-        "Son Görüşülen"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "İsim",
+        "PHONE_NUMBER": "Telefon numarası",
+        "CONVERSATIONS": "Konuşmalar",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Şirket",
+        "EMAIL_ADDRESS": "E-posta adresi"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index adc62a1e1..b23dddd5a 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -11,10 +11,10 @@
       "TITLE": "Mesajları ara",
       "LOADING_MESSAGE": "Veriler işleniyor ...",
       "PLACEHOLDER": "Mesajları aramak için herhangi bir metin yazın",
-      "NO_MATCHING_RESULTS": "Arama parametreleriyle eşleşen mesaj yok."
+      "NO_MATCHING_RESULTS": "No results found."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Okunmamış Mesajlar",
+    "UNREAD_MESSAGE": "Okunmamış Mesaj",
     "CLICK_HERE": "Buraya Tıkla",
     "LOADING_INBOXES": "Gelen kutuları yükleniyor",
     "LOADING_CONVERSATIONS": "Loading Conversations\n",
@@ -25,7 +25,7 @@
     "REMOVE_SELECTION": "Seçimi Kaldır",
     "DOWNLOAD": "İndir",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "NO_RESPONSE": "No response",
+    "NO_RESPONSE": "Cevap Yok",
     "HEADER": {
       "RESOLVE_ACTION": "Çözüldü",
       "REOPEN_ACTION": "Yeniden aç",
@@ -43,7 +43,7 @@
       "SEND": "Gönder",
       "CREATE": "Not ekle",
       "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
+      "TIP_FORMAT_ICON": "Metin Düzenlemeyi Göster",
       "TIP_EMOJI_ICON": "Show emoji selector",
       "TIP_ATTACH_ICON": "Attach files",
       "ENTER_TO_SEND": "Enter to send"
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Özel Not: Yalnızca siz ve ekibiniz tarafından görülebilir",
     "CHANGE_STATUS": "Görüşme durumu değişti",
     "CHANGE_AGENT": "Görüşme Atanan kişiyi değiştirildi",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Tarafından gönderildi:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Temsilci Seçin",
@@ -74,5 +75,37 @@
         "ERROR": "Lütfen geçerli bir tam e-posta adresi"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 144a35c5c..429f9eca3 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Bir değer seçin"
       },
       "TWITTER": {
-        "HELP": "Twitter profilinizi bir kanal olarak eklemek için, 'Twitter ile Giriş Yap'ı tıklayarak Twitter Profilinizi doğrulamanız gerekir."
+        "HELP": "Twitter profilinizi bir kanal olarak eklemek için, 'Twitter ile Giriş Yap'ı tıklayarak Twitter Profilinizi doğrulamanız gerekir.",
+        "ERROR_MESSAGE": "Twitter'a bağlanırken bir hata oluştu, lütfen daha sonra tekrar deneyin"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Website channel",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Ayarlar",
       "COLLABORATORS": "Ortak çalışanlar",
-      "CONFIGURATION": "Yapılandırma"
+      "CONFIGURATION": "Yapılandırma",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Ayarlar",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Facebook bağlantınızın süresi doldu, hizmetlere devam etmek için lütfen Facebook sayfanızı yeniden bağlayın",
       "MESSAGE_SUCCESS": "Yeniden bağlantı başarılı",
       "MESSAGE_ERROR": "Bir hata oluştu, lütfen tekrar deneyin"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Görüşme öncesi formu aktif et",
+        "OPTIONS": {
+          "ENABLED": "Evet",
+          "DISABLED": "Hayır"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Görüşme öncesi mesaj",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
new file mode 100644
index 000000000..cd2a73fea
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Yarat",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Kullanıcı Ekle",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Hepiniz gitmeye hazırsınız!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Hepiniz gitmeye hazırsınız!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "E-Posta",
+      "BUTTON_TEXT": "Kullanıcı Ekle",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Kullanıcı Ekle",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Sil",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Sil ",
+        "NO": "İptal Et"
+      }
+    },
+    "SETTINGS": "Ayarlar",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 146663f13..8218763f0 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Edit Contact",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Додати",
       "CANCEL": "Скасувати",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Ім'я",
-        "Phone Number",
-        "Бесіди",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Ім'я",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Бесіди",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Адреса електронної пошти"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 97d7930b9..c71f92f92 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Приватна нотатка: видима тільки вам та вашій команді",
     "CHANGE_STATUS": "Статус бесіди змінено",
     "CHANGE_AGENT": "Оператора бесіди змінено",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Будь ласка, введіть коректну адресу електронної пошти"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index fb488a413..b0168c300 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
-        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' "
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Канал Веб-сайт",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Налаштування",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Налаштування",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
new file mode 100644
index 000000000..c44ee6a70
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Додати агентів",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Все готово!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Все готово!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "ПОШТА",
+      "BUTTON_TEXT": "Додати агентів",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Додати агентів",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Видалити ",
+        "NO": "Скасувати"
+      }
+    },
+    "SETTINGS": "Налаштування",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 624511e03..4663d24dc 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "Chỉnh sửa liên hệ",
     "TITLE": "Chỉnh sửa liên hệ",
-    "DESC": "Chỉnh sửa liên hệ chi tiết",
+    "DESC": "Chỉnh sửa liên hệ chi tiết"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Gửi",
       "CANCEL": "Huỷ",
@@ -68,7 +75,7 @@
       },
       "LOCATION": {
         "PLACEHOLDER": "Nhập vị trí của liên hệ",
-        "LABEL": "Vị trí"
+        "LABEL": "Địa điểm"
       },
       "COMPANY_NAME": {
         "PLACEHOLDER": "Nhập tên công ty",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Đã cập nhật liên hệ thành công",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "Địa chỉ email này đang được sử dụng cho một liên hệ khác.",
-    "ERROR_MESSAGE": "Đã xảy ra lỗi khi cập nhật địa chỉ liên hệ, vui lòng thử lại"
+    "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "Tên",
-        "Số điện thoại",
-        "Các cuộc hội thoại",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "Tên",
+        "PHONE_NUMBER": "Số điện thoại",
+        "CONVERSATIONS": "Các cuộc hội thoại",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Công ty",
+        "EMAIL_ADDRESS": "Email"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 2f3362aef..86bddaaac 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "Lưu ý riêng: Chỉ hiển thị với bạn và nhóm của bạn",
     "CHANGE_STATUS": "Trạng thái cuộc trò chuyện đã thay đổi",
     "CHANGE_AGENT": "Người Được Chỉ Định Cuộc Hội Thoại đã thay đổi",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "Vui lòng nhập một địa chỉ email hợp lệ"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 66f9582b7..3ac45829c 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "Chọn một giá trị"
       },
       "TWITTER": {
-        "HELP": "Để thêm hồ sơ Twitter của bạn làm kênh, bạn cần xác thực Hồ sơ Twitter của mình bằng cách nhấp vào 'Đăng nhập bằng Twitter"
+        "HELP": "Để thêm hồ sơ Twitter của bạn làm kênh, bạn cần xác thực Hồ sơ Twitter của mình bằng cách nhấp vào 'Đăng nhập bằng Twitter",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "Kênh trang web",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "Cài đặt",
       "COLLABORATORS": "Cộng tác viên",
-      "CONFIGURATION": "Cấu hình"
+      "CONFIGURATION": "Cấu hình",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "Cài đặt",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "Đã có lỗi, vui lòng thử lại"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
new file mode 100644
index 000000000..75217c0ce
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Tạo",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Thêm đại lý",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "Bạn đã sẵn sàng để đi!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "Bạn đã sẵn sàng để đi!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Thêm các nhà cung cấp",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Thêm các nhà cung cấp",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Xoá",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Xoá ",
+        "NO": "Huỷ"
+      }
+    },
+    "SETTINGS": "Cài đặt",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index dce3b86b8..3daf9f43a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -43,10 +43,17 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "编辑联系人",
     "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "提交",
-      "CANCEL": "取消操作",
+      "CANCEL": "取消",
       "AVATAR": {
         "LABEL": "Contact Avatar"
       },
@@ -64,7 +71,7 @@
       },
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "LABEL": "电话号码"
       },
       "LOCATION": {
         "PLACEHOLDER": "Enter the location of the contact",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "ERROR_MESSAGE": "出现错误，请重试"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "正在加载联系人列表...",
       "404": "没有搜索到联系人🔍",
-      "TABLE_HEADER": [
-        "姓名：",
-        "电话号码",
-        "会话",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "姓名：",
+        "PHONE_NUMBER": "电话号码",
+        "CONVERSATIONS": "会话",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "公司",
+        "EMAIL_ADDRESS": "电子邮件地址"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 684739937..21b817014 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "私人便签：仅对您和您的团队可见",
     "CHANGE_STATUS": "对话状态已更改",
     "CHANGE_AGENT": "对话分配人已更改",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "请输入一个有效的电子邮件"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 180cb54c9..8fe0460d7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -60,7 +60,7 @@
       "404": "No Notifications",
       "TABLE_HEADER": [
         "姓名：",
-        "Phone Number",
+        "电话号码",
         "会话",
         "Last Contacted"
       ]
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 42019fca2..eca7d9d31 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "选择一个数值"
       },
       "TWITTER": {
-        "HELP": "若要将您的Twitter个人资料添加为频道，您需要通过点击“使用Twitter登录”来验证您的Twitter个人资料。 "
+        "HELP": "若要将您的Twitter个人资料添加为频道，您需要通过点击“使用Twitter登录”来验证您的Twitter个人资料。 ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "网站频道",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "设置",
       "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "CONFIGURATION": "Configuration",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "设置",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务",
       "MESSAGE_SUCCESS": "重新连接成功",
       "MESSAGE_ERROR": "出现错误，请重试"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
new file mode 100644
index 000000000..cb7659ae6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "创建",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "添加客服代理",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "你已设定状态为离开"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "你已设定状态为离开"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "电子邮件",
+      "BUTTON_TEXT": "添加客服代理",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "添加客服代理",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "删除",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "删除 ",
+        "NO": "取消"
+      }
+    },
+    "SETTINGS": "设置",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index dc0bfbbbb..306780c2c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -43,7 +43,14 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "編輯聯絡人",
     "TITLE": "編輯聯絡人",
-    "DESC": "編輯聯絡人資訊",
+    "DESC": "編輯聯絡人資訊"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "送出",
       "CANCEL": "取消操作",
@@ -93,9 +100,9 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "成功更新聯絡人資訊",
+    "SUCCESS_MESSAGE": "Contact saved successfully",
     "CONTACT_ALREADY_EXIST": "這個電子信箱已經被其他聯絡人使用了。",
-    "ERROR_MESSAGE": "更新聯絡人資訊發生錯誤，請重試"
+    "ERROR_MESSAGE": "出現錯誤，請重試"
   },
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
@@ -104,12 +111,18 @@
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
-      "TABLE_HEADER": [
-        "姓名：",
-        "聯絡人電話",
-        "會話",
-        "Last Contacted"
-      ]
+      "TABLE_HEADER": {
+        "NAME": "姓名：",
+        "PHONE_NUMBER": "聯絡人電話",
+        "CONVERSATIONS": "會話",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "電子信箱地址"
+      },
+      "VIEW_DETAILS": "View details"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 1a59cb094..b36d7a229 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -11,7 +11,7 @@
       "TITLE": "Search messages",
       "LOADING_MESSAGE": "Crunching data...",
       "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+      "NO_MATCHING_RESULTS": "No results found."
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
@@ -51,6 +51,7 @@
     "VISIBLE_TO_AGENTS": "私人筆記：僅對您和您的團隊可以看見",
     "CHANGE_STATUS": "對話狀態已更改",
     "CHANGE_AGENT": "對話分配人已更改",
+    "CHANGE_TEAM": "Conversation team changed",
     "SENT_BY": "Sent by:",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
@@ -74,5 +75,37 @@
         "ERROR": "請輸入一個有效的電子信箱"
       }
     }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "DETAILS_TITLE": "Conversations Details",
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index a261c2d05..775fd7441 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -38,7 +38,8 @@
         "PICK_A_VALUE": "選擇一個數值"
       },
       "TWITTER": {
-        "HELP": "若要將您的 Twitter 個人資料建立為頻道，您需要通過點擊“使用 Twitter 登入”來驗證您的 Twitter 個人資料。 "
+        "HELP": "若要將您的 Twitter 個人資料建立為頻道，您需要通過點擊“使用 Twitter 登入”來驗證您的 Twitter 個人資料。 ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again"
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "網站頻道",
@@ -224,7 +225,9 @@
     "TABS": {
       "SETTINGS": "設定",
       "COLLABORATORS": "客服人員",
-      "CONFIGURATION": "組態"
+      "CONFIGURATION": "組態",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -250,6 +253,41 @@
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "出現錯誤，請重試"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for vistors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
new file mode 100644
index 000000000..41485acd6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
@@ -0,0 +1,124 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "建立",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "建立客服代理",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "您已設定狀態為離開"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "您已設定狀態為離開"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "電子信箱",
+      "BUTTON_TEXT": "建立客服代理",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "建立客服代理",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "刪除",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "刪除 ",
+        "NO": "取消操作"
+      }
+    },
+    "SETTINGS": "設定",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index c0c32440e..5e0085680 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -1,53 +1,14 @@
 <template>
   <section class="contacts-table-wrap">
-    <table class="woot-table contacts-table">
-      <thead>
-        <th
-          v-for="thHeader in $t('CONTACTS_PAGE.LIST.TABLE_HEADER')"
-          :key="thHeader"
-        >
-          {{ thHeader }}
-        </th>
-      </thead>
-      <tbody v-show="showTableData">
-        <tr
-          v-for="contactItem in contacts"
-          :key="contactItem.id"
-          :class="{ 'is-active': contactItem.id === activeContactId }"
-          @click="() => onClickContact(contactItem.id)"
-        >
-          <td>
-            <div class="row-main-info">
-              <thumbnail
-                :src="contactItem.thumbnail"
-                size="36px"
-                :username="contactItem.name"
-                :status="contactItem.availability_status"
-              />
-              <div>
-                <h4 class="sub-block-title user-name">
-                  {{ contactItem.name }}
-                </h4>
-                <p class="user-email">
-                  {{ contactItem.email || '---' }}
-                </p>
-              </div>
-            </div>
-          </td>
-          <td>{{ contactItem.phone_number || '---' }}</td>
-          <td class="conversation-count-item">
-            {{ contactItem.conversations_count }}
-          </td>
-          <td>
-            {{
-              contactItem.last_seen_at
-                ? dynamicTime(contactItem.last_seen_at)
-                : '---'
-            }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
+    <ve-table
+      :fixed-header="true"
+      max-height="calc(100vh - 11.4rem)"
+      scroll-width="187rem"
+      :columns="columns"
+      :table-data="tableData"
+      :border-around="false"
+    />
+
     <empty-state
       v-if="showSearchEmptyState"
       :title="$t('CONTACTS_PAGE.LIST.404')"
@@ -61,6 +22,8 @@
 
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
+import { VeTable } from 'vue-easytable';
+
 import Spinner from 'shared/components/Spinner.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
@@ -68,9 +31,9 @@ import timeMixin from 'dashboard/mixins/time';
 
 export default {
   components: {
-    Thumbnail,
     EmptyState,
     Spinner,
+    VeTable,
   },
   mixins: [clickaway, timeMixin],
   props: {
@@ -95,30 +58,150 @@ export default {
       default: '',
     },
   },
+  data() {
+    return {
+      columns: [
+        {
+          field: 'name',
+          key: 'name',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.NAME'),
+          fixed: 'left',
+          align: 'left',
+          width: 300,
+          renderBodyCell: ({ row }) => (
+            <button
+              class="row--user-block cursor-pointer"
+              onClick={() => this.onClickContact(row.id)}
+            >
+              <Thumbnail
+                src={row.thumbnail}
+                size="36px"
+                username={row.name}
+                status={row.availability_status}
+              />
+              <div>
+                <h6 class="sub-block-title user-name text-truncate">
+                  {row.name}
+                </h6>
+                <button class="button clear small">
+                  {this.$t('CONTACTS_PAGE.LIST.VIEW_DETAILS')}
+                </button>
+              </div>
+            </button>
+          ),
+        },
+        {
+          field: 'email',
+          key: 'email',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.EMAIL_ADDRESS'),
+          align: 'left',
+          width: 240,
+          renderBodyCell: ({ row }) => {
+            if (row.email)
+              return (
+                <div class="text-truncate">
+                  <a
+                    target="_blank"
+                    rel="noopener noreferrer nofollow"
+                    href={`mailto:${row.email}`}
+                  >
+                    {row.email}
+                  </a>
+                </div>
+              );
+            return '---';
+          },
+        },
+        {
+          field: 'phone',
+          key: 'phone',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.PHONE_NUMBER'),
+          align: 'left',
+        },
+        {
+          field: 'company',
+          key: 'company',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.COMPANY'),
+          align: 'left',
+        },
+        {
+          field: 'city',
+          key: 'city',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.CITY'),
+          align: 'left',
+        },
+        {
+          field: 'country',
+          key: 'country',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.COUNTRY'),
+          align: 'left',
+        },
+        {
+          field: 'profiles',
+          key: 'profiles',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.SOCIAL_PROFILES'),
+          align: 'left',
+          renderBodyCell: ({ row }) => {
+            const { profiles } = row;
+
+            const items = Object.keys(profiles);
+
+            if (!items.length) return '---';
+
+            return (
+              <div class="cell--social-profiles">
+                {items.map(
+                  profile =>
+                    profiles[profile] && (
+                      <a
+                        target="_blank"
+                        rel="noopener noreferrer nofollow"
+                        href={`https://${profile}.com/${profiles[profile]}`}
+                      >
+                        <i class={`ion-social-${profile}`} />
+                      </a>
+                    )
+                )}
+              </div>
+            );
+          },
+        },
+        {
+          field: 'lastSeen',
+          key: 'lastSeen',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.LAST_ACTIVITY'),
+          align: 'left',
+        },
+        {
+          field: 'conversationsCount',
+          key: 'conversationsCount',
+          title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.CONVERSATIONS'),
+          width: 150,
+          align: 'left',
+        },
+      ],
+    };
+  },
   computed: {
-    currentRoute() {
-      return ' ';
-    },
-    sidebarClassName() {
-      if (this.isOnDesktop) {
-        return '';
+    tableData() {
+      if (this.isLoading) {
+        return [];
       }
-      if (this.isSidebarOpen) {
-        return 'off-canvas is-open ';
-      }
-      return 'off-canvas position-left is-transition-push is-closed';
-    },
-    contentClassName() {
-      if (this.isOnDesktop) {
-        return '';
-      }
-      if (this.isSidebarOpen) {
-        return 'off-canvas-content is-open-left has-transition-push has-position-left';
-      }
-      return 'off-canvas-content';
-    },
-    showTableData() {
-      return !this.showSearchEmptyState && !this.isLoading;
+      return this.contacts.map(item => {
+        const additional = item.additional_attributes || {};
+        const { last_seen_at: lastSeenAt } = item;
+        return {
+          ...item,
+          phone: item.phone_number || '---',
+          company: additional.company_name || '---',
+          location: additional.location || '---',
+          profiles: additional.social_profiles || {},
+          city: additional.city || '---',
+          country: additional.country || '---',
+          conversationsCount: item.conversations_count || '---',
+          lastSeen: lastSeenAt ? this.dynamicTime(lastSeenAt) : '---',
+        };
+      });
     },
   },
 };
@@ -128,52 +211,19 @@ export default {
 @import '~dashboard/assets/scss/mixins';
 
 .contacts-table-wrap {
-  @include scroll-on-hover;
   flex: 1 1;
   height: 100%;
+  overflow: hidden;
 }
 
-.contacts-table {
-  margin-top: -1px;
-
-  > thead {
-    border-bottom: 1px solid var(--color-border);
-    background: white;
-
-    > th:first-child {
-      padding-left: var(--space-medium);
-      width: 30%;
-    }
+.contacts-table-wrap::v-deep {
+  .ve-table {
+    padding-bottom: var(--space-large);
   }
-
-  > tbody {
-    > tr {
-      cursor: pointer;
-
-      &:hover {
-        background: var(--b-50);
-      }
-
-      &.is-active {
-        background: var(--b-100);
-      }
-
-      > td {
-        padding: var(--space-slab);
-
-        &:first-child {
-          padding-left: var(--space-medium);
-        }
-
-        &.conversation-count-item {
-          padding-left: var(--space-medium);
-        }
-      }
-    }
-  }
-  .row-main-info {
-    display: flex;
+  .row--user-block {
     align-items: center;
+    display: flex;
+    text-align: left;
 
     .user-thumbnail-box {
       margin-right: var(--space-small);
@@ -189,13 +239,35 @@ export default {
       margin: 0;
     }
   }
+
+  .ve-table-header-th {
+    padding: var(--space-small) var(--space-two) !important;
+  }
+
+  .ve-table-body-td {
+    padding: var(--space-slab) var(--space-two) !important;
+  }
+
+  .ve-table-header-th {
+    font-size: var(--font-size-mini) !important;
+  }
 }
 
 .contacts--loader {
-  font-size: var(--font-size-default);
-  display: flex;
   align-items: center;
+  display: flex;
+  font-size: var(--font-size-default);
   justify-content: center;
   padding: var(--space-big);
 }
+
+.cell--social-profiles {
+  a {
+    color: var(--s-300);
+    display: inline-block;
+    font-size: var(--font-size-medium);
+    min-width: var(--space-large);
+    text-align: center;
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index b55efcf31..af99e088e 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -6,6 +6,7 @@
         :on-search-submit="onSearchSubmit"
         this-selected-contact-id=""
         :on-input-search="onInputSearch"
+        :on-toggle-create="onToggleCreate"
       />
       <contacts-table
         :contacts="records"
@@ -25,6 +26,7 @@
       :contact="selectedContact"
       :on-close="closeContactInfoPanel"
     />
+    <create-contact :show="showCreateModal" @cancel="onToggleCreate" />
   </div>
 </template>
 
@@ -34,6 +36,7 @@ import { mapGetters } from 'vuex';
 import ContactsHeader from './Header';
 import ContactsTable from './ContactsTable';
 import ContactInfoPanel from './ContactInfoPanel';
+import CreateContact from 'dashboard/routes/dashboard/conversation/contact/CreateContact';
 import TableFooter from 'dashboard/components/widgets/TableFooter';
 
 export default {
@@ -42,11 +45,12 @@ export default {
     ContactsTable,
     TableFooter,
     ContactInfoPanel,
+    CreateContact,
   },
   data() {
     return {
       searchQuery: '',
-      showEditModal: false,
+      showCreateModal: false,
       selectedContactId: '',
     };
   },
@@ -123,6 +127,9 @@ export default {
       this.selectedContactId = '';
       this.showContactInfoPanelPane = false;
     },
+    onToggleCreate() {
+      this.showCreateModal = !this.showCreateModal;
+    },
   },
 };
 </script>
@@ -134,7 +141,6 @@ export default {
 .left-wrap {
   display: flex;
   flex-direction: column;
-  padding-top: var(--space-normal);
   height: 100%;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index b8ca4c64a..2c6b2d63b 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -24,6 +24,11 @@
             @click="onSearchSubmit"
           />
         </div>
+
+        <button class="button success icon" @click="onToggleCreate">
+          <i class="icon ion-android-add-circle" />
+          {{ $t('CREATE_CONTACT.BUTTON_LABEL') }}
+        </button>
       </div>
     </div>
   </header>
@@ -45,6 +50,15 @@ export default {
       type: Function,
       default: () => {},
     },
+    onToggleCreate: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      showCreateModal: false,
+    };
   },
   computed: {
     searchButtonClass() {
@@ -55,11 +69,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/* TODO-REM; Change variables sizing to rem after html font size change from 1.0 t0 1.6 */
-
-.header {
-  padding: 0 var(--space-medium);
-}
 .page-title {
   margin: 0;
 }
@@ -67,37 +76,50 @@ export default {
   display: flex;
   justify-content: space-between;
   width: 100%;
-  margin-bottom: var(--space-slab);
+  padding: var(--space-small) var(--space-small) var(--space-small)
+    var(--space-normal);
 }
+
+.left-aligned-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.right-aligned-wrap {
+  display: flex;
+}
+
 .search-wrap {
   width: 400px;
-  height: 3.6rem;
+  height: 3.8rem;
   display: flex;
   align-items: center;
   position: relative;
+  margin-right: var(--space-small);
 
   .search-icon {
     position: absolute;
     top: 1px;
     left: var(--space-one);
-    height: 3.6rem;
+    height: 3.8rem;
     line-height: 3.6rem;
     font-size: var(--font-size-medium);
     color: var(--b-700);
   }
   .contact-search {
     margin: 0;
-    height: 3.6rem;
+    height: 3.8rem;
     width: 100%;
     padding-left: var(--space-large);
     padding-right: 6rem;
+    border-color: var(--s-100);
   }
 
   .button {
     margin-left: var(--space-small);
     height: 3.2rem;
-    top: var(--space-micro);
-    right: var(--space-micro);
+    right: var(--space-smaller);
     position: absolute;
     padding: 0 var(--space-small);
     transition: transform 100ms linear;
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index ccf65f329..9939b80dd 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -4,6 +4,43 @@
       <i class="ion-chevron-right" />
     </span>
     <contact-info :contact="contact" :channel-type="channelType" />
+    <div class="conversation--actions">
+      <h4 class="sub-block-title">
+        {{ $t('CONVERSATION_SIDEBAR.DETAILS_TITLE') }}
+      </h4>
+      <div class="multiselect-wrap--small">
+        <label class="multiselect__label">
+          {{ $t('CONVERSATION_SIDEBAR.ASSIGNEE_LABEL') }}
+        </label>
+        <multiselect
+          v-model="assignedAgent"
+          :options="agentsList"
+          label="name"
+          track-by="id"
+          deselect-label=""
+          select-label=""
+          selected-label=""
+          :placeholder="$t('CONVERSATION_SIDEBAR.SELECT.PLACEHOLDER')"
+          :allow-empty="true"
+        />
+      </div>
+      <div class="multiselect-wrap--small">
+        <label class="multiselect__label">
+          {{ $t('CONVERSATION_SIDEBAR.TEAM_LABEL') }}
+        </label>
+        <multiselect
+          v-model="assignedTeam"
+          :options="teamsList"
+          label="name"
+          track-by="id"
+          deselect-label=""
+          select-label=""
+          selected-label=""
+          :placeholder="$t('CONVERSATION_SIDEBAR.SELECT.PLACEHOLDER')"
+          :allow-empty="true"
+        />
+      </div>
+    </div>
     <div v-if="browser.browser_name" class="conversation--details">
       <contact-details-item
         v-if="location"
@@ -67,6 +104,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
 
 import ContactConversations from './ContactConversations.vue';
 import ContactDetailsItem from './ContactDetailsItem.vue';
@@ -83,6 +121,7 @@ export default {
     ContactInfo,
     ConversationLabels,
   },
+  mixins: [alertMixin],
   props: {
     conversationId: {
       type: [Number, String],
@@ -96,6 +135,8 @@ export default {
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
+      agents: 'agents/getVerifiedAgents',
+      teams: 'teams/getTeams',
     }),
     currentConversationMetaData() {
       return this.$store.getters[
@@ -159,6 +200,46 @@ export default {
     contact() {
       return this.$store.getters['contacts/getContact'](this.contactId);
     },
+    agentsList() {
+      return [{ id: 0, name: 'None' }, ...this.agents];
+    },
+    teamsList() {
+      return [{ id: 0, name: 'None' }, ...this.teams];
+    },
+    assignedAgent: {
+      get() {
+        return this.currentChat.meta.assignee;
+      },
+      set(agent) {
+        const agentId = agent ? agent.id : 0;
+        this.$store.dispatch('setCurrentChatAssignee', agent);
+        this.$store
+          .dispatch('assignAgent', {
+            conversationId: this.currentChat.id,
+            agentId,
+          })
+          .then(() => {
+            this.showAlert(this.$t('CONVERSATION.CHANGE_AGENT'));
+          });
+      },
+    },
+    assignedTeam: {
+      get() {
+        return this.currentChat.meta.team;
+      },
+      set(team) {
+        const teamId = team ? team.id : 0;
+        this.$store.dispatch('setCurrentChatTeam', team);
+        this.$store
+          .dispatch('assignTeam', {
+            conversationId: this.currentChat.id,
+            teamId,
+          })
+          .then(() => {
+            this.showAlert(this.$t('CONVERSATION.CHANGE_TEAM'));
+          });
+      },
+    },
   },
   watch: {
     conversationId(newConversationId, prevConversationId) {
@@ -191,12 +272,10 @@ export default {
 
 <style lang="scss" scoped>
 @import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
 
 .contact--panel {
-  @include border-normal-left;
-
   background: white;
+  border-left: 1px solid var(--color-border);
   font-size: $font-size-small;
   overflow-y: auto;
   overflow: auto;
@@ -246,4 +325,16 @@ export default {
   flex-direction: column;
   justify-content: center;
 }
+
+.sub-block-title {
+  margin-bottom: var(--space-small);
+}
+
+.conversation--actions {
+  padding: 0 var(--space-normal) var(--space-small);
+}
+
+.multiselect__label {
+  margin-bottom: var(--space-smaller);
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index b6a7b6703..0e1bfd464 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -1,22 +1,12 @@
 <template>
-  <section class="app-content columns">
+  <section class="conversation-page">
     <chat-list
       :conversation-inbox="inboxId"
       :label="label"
       :active-team="activeTeam"
       @conversation-load="onConversationLoad"
     >
-      <button class="search--button" @click="onSearch">
-        <i class="ion-ios-search-strong search--icon" />
-        <div class="text-truncate">
-          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
-        </div>
-      </button>
-      <search
-        v-if="showSearchModal"
-        :show="showSearchModal"
-        :on-close="closeSearch"
-      />
+      <pop-over-search />
     </chat-list>
     <conversation-box
       :inbox-id="inboxId"
@@ -24,29 +14,21 @@
       @contact-panel-toggle="onToggleContactPanel"
     >
     </conversation-box>
-    <contact-panel
-      v-if="isContactPanelOpen"
-      :conversation-id="conversationId"
-      :on-toggle="onToggleContactPanel"
-    />
   </section>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-
 import ChatList from '../../../components/ChatList';
-import ContactPanel from './ContactPanel';
 import ConversationBox from '../../../components/widgets/conversation/ConversationBox';
-import Search from './search/Search.vue';
+import PopOverSearch from './search/PopOverSearch';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 
 export default {
   components: {
     ChatList,
-    ContactPanel,
     ConversationBox,
-    Search,
+    PopOverSearch,
   },
   mixins: [uiSettingsMixin],
   props: {
@@ -153,28 +135,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.search--button {
-  align-items: center;
-  border: 0;
-  color: var(--s-400);
-  cursor: pointer;
+.conversation-page {
   display: flex;
-  font-size: var(--font-size-small);
-  font-weight: 400;
-  padding: var(--space-normal) var(--space-normal) var(--space-slab);
-  text-align: left;
-  line-height: var(--font-size-large);
-
-  &:hover {
-    .search--icon {
-      color: var(--w-500);
-    }
-  }
-}
-
-.search--icon {
-  color: var(--s-600);
-  font-size: var(--font-size-large);
-  padding-right: var(--space-small);
+  width: 100%;
+  height: 100%;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
index 66f0e399f..a1beaa13e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
@@ -1,7 +1,7 @@
 <template>
   <form class="contact--form" @submit.prevent="handleSubmit">
     <div class="row">
-      <div class="medium-9 columns">
+      <div class="columns">
         <label :class="{ error: $v.name.$error }">
           {{ $t('CONTACT_FORM.FORM.NAME.LABEL') }}
           <input
@@ -37,14 +37,14 @@
     <div class="row">
       <woot-input
         v-model.trim="phoneNumber"
-        class="medium-6 columns"
+        class="columns"
         :label="$t('CONTACT_FORM.FORM.PHONE_NUMBER.LABEL')"
         :placeholder="$t('CONTACT_FORM.FORM.PHONE_NUMBER.PLACEHOLDER')"
       />
     </div>
     <woot-input
       v-model.trim="companyName"
-      class="medium-6 columns"
+      class="columns"
       :label="$t('CONTACT_FORM.FORM.COMPANY_NAME.LABEL')"
       :placeholder="$t('CONTACT_FORM.FORM.COMPANY_NAME.PLACEHOLDER')"
     />
@@ -81,7 +81,10 @@
 
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
-import { DuplicateContactException } from 'shared/helpers/CustomErrors';
+import {
+  DuplicateContactException,
+  ExceptionWithMessage,
+} from 'shared/helpers/CustomErrors';
 import { required } from 'vuelidate/lib/validators';
 
 export default {
@@ -144,6 +147,9 @@ export default {
     onCancel() {
       this.$emit('cancel');
     },
+    onSuccess() {
+      this.$emit('success');
+    },
     setContactObject() {
       const { email: email, phone_number: phoneNumber, name } = this.contact;
       const additionalAttributes = this.contact.additional_attributes || {};
@@ -189,12 +195,15 @@ export default {
       }
       try {
         await this.onSubmit(this.getContactObject());
+        this.onSuccess();
         this.showAlert(this.$t('CONTACT_FORM.SUCCESS_MESSAGE'));
       } catch (error) {
         if (error instanceof DuplicateContactException) {
           this.hasADuplicateContact = true;
           this.duplicateContact = error.data;
           this.showAlert(this.$t('CONTACT_FORM.CONTACT_ALREADY_EXIST'));
+        } else if (error instanceof ExceptionWithMessage) {
+          this.showAlert(error.data);
         } else {
           this.showAlert(this.$t('CONTACT_FORM.ERROR_MESSAGE'));
         }
@@ -212,4 +221,8 @@ export default {
     padding: 0 var(--space-smaller);
   }
 }
+
+.input-group-label {
+  font-size: var(--font-size-small);
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/CreateContact.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/CreateContact.vue
new file mode 100644
index 000000000..27cca73a4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/CreateContact.vue
@@ -0,0 +1,55 @@
+<template>
+  <woot-modal :show.sync="show" :on-close="onCancel" modal-type="right-aligned">
+    <div class="column content-box">
+      <woot-modal-header
+        :header-title="$t('CREATE_CONTACT.TITLE')"
+        :header-content="$t('CREATE_CONTACT.DESC')"
+      />
+      <contact-form
+        :in-progress="uiFlags.isCreating"
+        :on-submit="onSubmit"
+        @success="onSuccess"
+        @cancel="onCancel"
+      />
+    </div>
+  </woot-modal>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import ContactForm from './ContactForm';
+
+export default {
+  components: {
+    ContactForm,
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    contact: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+
+  computed: {
+    ...mapGetters({
+      uiFlags: 'contacts/getUIFlags',
+    }),
+  },
+
+  methods: {
+    onCancel() {
+      this.$emit('cancel');
+    },
+    onSuccess() {
+      this.$emit('cancel');
+    },
+    async onSubmit(contactItem) {
+      await this.$store.dispatch('contacts/create', contactItem);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
index 9d9569f62..afb2144ec 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
@@ -1,5 +1,5 @@
 <template>
-  <woot-modal :show.sync="show" :on-close="onCancel">
+  <woot-modal :show.sync="show" :on-close="onCancel" modal-type="right-aligned">
     <div class="column content-box">
       <woot-modal-header
         :header-title="
@@ -11,6 +11,8 @@
         :contact="contact"
         :in-progress="uiFlags.isUpdating"
         :on-submit="onSubmit"
+        @success="onSuccess"
+        @cancel="onCancel"
       />
     </div>
   </woot-modal>
@@ -45,6 +47,9 @@ export default {
     onCancel() {
       this.$emit('cancel');
     },
+    onSuccess() {
+      this.$emit('cancel');
+    },
     async onSubmit(contactItem) {
       await this.$store.dispatch('contacts/update', contactItem);
     },
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
new file mode 100644
index 000000000..fd97c371d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -0,0 +1,228 @@
+<template>
+  <div v-on-clickaway="closeSearch" class="search-wrap">
+    <div class="search" :class="{ 'is-active': showSearchBox }">
+      <div class="icon">
+        <i class="ion-ios-search-strong search--icon" />
+      </div>
+      <input
+        v-model="searchTerm"
+        class="search--input"
+        :placeholder="$t('CONVERSATION.SEARCH_MESSAGES')"
+        @focus="onSearch"
+      />
+    </div>
+    <div v-if="showSearchBox" class="results-wrap">
+      <div class="show-results">
+        <div>
+          <div class="result-view">
+            <div class="result">
+              Search Results
+              <span v-if="resultsCount" class="message-counter">
+                ({{ resultsCount }})
+              </span>
+            </div>
+            <div v-if="uiFlags.isFetching" class="search--activity-message">
+              <woot-spinner size="" />
+              {{ $t('CONVERSATION.SEARCH.LOADING_MESSAGE') }}
+            </div>
+          </div>
+
+          <div v-if="showSearchResult" class="search-results--container">
+            <result-item
+              v-for="conversation in conversations"
+              :key="conversation.messageId"
+              :conversation-id="conversation.id"
+              :user-name="conversation.contact.name"
+              :timestamp="conversation.created_at"
+              :messages="conversation.messages"
+              :search-term="searchTerm"
+              :inbox-name="conversation.inbox.name"
+            />
+          </div>
+          <div v-else-if="showEmptyResult" class="search--activity-no-message">
+            {{ $t('CONVERSATION.SEARCH.NO_MATCHING_RESULTS') }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import { mapGetters } from 'vuex';
+import timeMixin from '../../../../mixins/time';
+import ResultItem from './ResultItem';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+
+export default {
+  components: {
+    ResultItem,
+  },
+
+  directives: {
+    focus: {
+      inserted(el) {
+        el.focus();
+      },
+    },
+  },
+
+  mixins: [timeMixin, messageFormatterMixin, clickaway],
+
+  data() {
+    return {
+      searchTerm: '',
+      showSearchBox: false,
+    };
+  },
+
+  computed: {
+    ...mapGetters({
+      conversations: 'conversationSearch/getConversations',
+      uiFlags: 'conversationSearch/getUIFlags',
+    }),
+    resultsCount() {
+      return this.conversations.length;
+    },
+    showSearchResult() {
+      return (
+        this.searchTerm && this.conversations.length && !this.uiFlags.isFetching
+      );
+    },
+    showEmptyResult() {
+      return (
+        this.searchTerm &&
+        !this.conversations.length &&
+        !this.uiFlags.isFetching
+      );
+    },
+  },
+
+  watch: {
+    searchTerm(newValue) {
+      if (this.typingTimer) {
+        clearTimeout(this.typingTimer);
+      }
+
+      this.typingTimer = setTimeout(() => {
+        this.hasSearched = true;
+        this.$store.dispatch('conversationSearch/get', { q: newValue });
+      }, 1000);
+    },
+  },
+
+  mounted() {
+    this.$store.dispatch('conversationSearch/get', { q: '' });
+  },
+
+  methods: {
+    onSearch() {
+      this.showSearchBox = true;
+    },
+    closeSearch() {
+      this.showSearchBox = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search-wrap {
+  position: relative;
+}
+
+.search {
+  display: flex;
+  padding: 0;
+  border-bottom: 1px solid transparent;
+  padding: var(--space-one) var(--space-normal) var(--space-smaller)
+    var(--space-normal);
+
+  &:hover {
+    .search--icon {
+      color: var(--w-500);
+    }
+  }
+}
+
+.search--input {
+  align-items: center;
+  border: 0;
+  color: var(--color-body);
+  cursor: pointer;
+  width: 100%;
+  display: flex;
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-normal);
+  text-align: left;
+  line-height: var(--font-size-large);
+}
+
+.search--icon {
+  color: var(--s-600);
+  font-size: var(--font-size-large);
+  padding: 0 var(--space-small) 0 0;
+}
+
+.icon {
+  display: flex;
+}
+
+input::placeholder {
+  color: var(--color-body);
+  font-size: var(--font-size-small);
+}
+
+.results-wrap {
+  position: absolute;
+  z-index: 9999;
+  box-shadow: var(--shadow-large);
+  background: white;
+  width: 100%;
+  max-height: 70vh;
+  overflow: auto;
+}
+
+.show-results {
+  list-style-type: none;
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-normal);
+}
+
+.result-view {
+  display: flex;
+  justify-content: space-between;
+}
+
+.result {
+  padding: var(--space-smaller) var(--space-smaller) var(--space-smaller)
+    var(--space-normal);
+  color: var(--s-700);
+  font-size: var(--font-size-medium);
+  font-weight: var(--font-weight-bold);
+
+  .message-counter {
+    color: var(--s-500);
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-bold);
+  }
+}
+
+.search--activity-message {
+  padding: var(--space-small) var(--space-normal) var(--space-small)
+    var(--space-zero);
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-medium);
+  color: var(--s-500);
+}
+
+.search--activity-no-message {
+  display: flex;
+  justify-content: center;
+  padding: var(--space-one) var(--space-zero) var(--space-two) var(--space-zero);
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-medium);
+  color: var(--s-500);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
new file mode 100644
index 000000000..20bb34cc9
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="search-result" @click="onClick">
+    <div class="result-header">
+      <div class="message">
+        <i class="ion-ios-chatboxes-outline" />
+        <div class="conversation">
+          <div class="name-wrap">
+            <span class="user-name">{{ userName }}</span>
+            <div>
+              <span class="conversation-id"># {{ conversationId }}</span>
+            </div>
+          </div>
+          <span class="inbox-name">{{ inboxName }}</span>
+        </div>
+      </div>
+      <span class="timestamp">{{ readableTime }} </span>
+    </div>
+    <search-message-item
+      v-for="message in messages"
+      :key="message.created_at"
+      :user-name="message.sender_name"
+      :timestamp="message.created_at"
+      :message-type="message.message_type"
+      :content="message.content"
+      :search-term="searchTerm"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
+import timeMixin from 'dashboard/mixins/time';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+import SearchMessageItem from './SearchMessageItem.vue';
+
+export default {
+  components: { SearchMessageItem },
+  mixins: [timeMixin, messageFormatterMixin],
+
+  props: {
+    conversationId: {
+      type: Number,
+      default: 0,
+    },
+    userName: {
+      type: String,
+      default: '',
+    },
+    inboxName: {
+      type: String,
+      default: '',
+    },
+    timestamp: {
+      type: Number,
+      default: 0,
+    },
+    messages: {
+      type: Array,
+      default: () => [],
+    },
+    searchTerm: {
+      type: String,
+      default: '',
+    },
+  },
+
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+    readableTime() {
+      if (!this.timestamp) {
+        return '';
+      }
+
+      return this.dynamicTime(this.timestamp);
+    },
+  },
+
+  methods: {
+    onClick() {
+      const path = conversationUrl({
+        accountId: this.accountId,
+        id: this.conversationId,
+      });
+      window.location = frontendURL(path);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search-result {
+  display: block;
+  align-items: center;
+  cursor: pointer;
+  color: var(--color-body);
+  padding: var(--space-smaller) var(--space-two) 0 var(--space-normal);
+
+  &:last-child {
+    border-bottom: none;
+    padding-bottom: var(--space-normal);
+  }
+}
+
+.result-header {
+  display: flex;
+  justify-content: space-between;
+  background: var(--color-background);
+  padding: var(--space-smaller) var(--space-slab);
+  margin-bottom: var(--space-small);
+  border-radius: var(--border-radius-medium);
+
+  &:hover {
+    background: var(--w-400);
+    color: var(--white);
+    .inbox-name {
+      color: var(--white);
+    }
+    .timestamp {
+      color: var(--white);
+    }
+    .ion-ios-chatboxes-outline {
+      color: var(--white);
+    }
+    .conversation-id {
+      background: var(--w-50);
+      color: var(--s-500);
+    }
+  }
+}
+
+.message {
+  display: flex;
+}
+
+.ion-ios-chatboxes-outline {
+  align-items: center;
+  display: flex;
+  font-size: var(--font-size-large);
+  color: var(--w-500);
+}
+
+.conversation {
+  align-items: flex-start;
+  display: flex;
+  flex-direction: column;
+  padding: var(--space-smaller) var(--space-one);
+}
+
+.name-wrap {
+  display: flex;
+  width: 20rem;
+
+  .user-name {
+    font-size: var(--font-size-default);
+    font-weight: var(--font-weight-bold);
+    margin-right: var(--space-micro);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  .conversation-id {
+    background: var(--w-400);
+    border-radius: var(--border-radius-normal);
+    color: var(--w-50);
+    align-items: center;
+    font-size: var(--font-size-mini);
+    font-weight: var(--font-weight-bold);
+    padding: 0 var(--space-smaller);
+    white-space: nowrap;
+  }
+}
+
+.inbox-name {
+  border-radius: var(--border-radius-normal);
+  color: var(--s-500);
+  font-size: var(--font-size-normal);
+  font-weight: var(--font-weight-medium);
+}
+
+.timestamp {
+  color: var(--s-500);
+  font-weight: var(--font-weight-medium);
+  font-size: var(--font-size-mini);
+  margin-top: var(--space-smaller);
+  text-align: right;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue
deleted file mode 100644
index 611e77968..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <woot-modal
-    class="message-search--modal"
-    :show.sync="show"
-    :on-close="onClose"
-  >
-    <woot-modal-header :header-title="$t('CONVERSATION.SEARCH.TITLE')" />
-    <div class="search--container">
-      <input
-        v-model="searchTerm"
-        v-focus
-        :placeholder="$t('CONVERSATION.SEARCH.PLACEHOLDER')"
-        type="text"
-      />
-
-      <div v-if="uiFlags.isFetching" class="search--activity-message">
-        <woot-spinner size="" />
-        {{ $t('CONVERSATION.SEARCH.LOADING_MESSAGE') }}
-      </div>
-
-      <div
-        v-if="searchTerm && conversations.length && !uiFlags.isFetching"
-        class="search-results--container"
-      >
-        <div v-for="conversation in conversations" :key="conversation.id">
-          <button
-            v-for="message in conversation.messages"
-            :key="message.id"
-            class="search--messages"
-            @click="() => onClick(conversation)"
-          >
-            <div class="search--messages__metadata">
-              <span>#{{ conversation.id }}</span>
-              <span>{{ dynamicTime(message.created_at) }}</span>
-            </div>
-            <div v-html="prepareContent(message.content)" />
-          </button>
-        </div>
-      </div>
-
-      <div
-        v-else-if="
-          searchTerm &&
-            !conversations.length &&
-            !uiFlags.isFetching &&
-            hasSearched
-        "
-        class="search--activity-message"
-      >
-        {{ $t('CONVERSATION.SEARCH.NO_MATCHING_RESULTS') }}
-      </div>
-    </div>
-  </woot-modal>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { frontendURL, conversationUrl } from '../../../../helper/URLHelper';
-import timeMixin from '../../../../mixins/time';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-
-export default {
-  directives: {
-    focus: {
-      inserted(el) {
-        el.focus();
-      },
-    },
-  },
-  mixins: [timeMixin, messageFormatterMixin],
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    onClose: {
-      type: Function,
-      default: () => {},
-    },
-  },
-  data() {
-    return {
-      searchTerm: '',
-      hasSearched: false,
-    };
-  },
-  computed: {
-    ...mapGetters({
-      conversations: 'conversationSearch/getConversations',
-      uiFlags: 'conversationSearch/getUIFlags',
-      accountId: 'getCurrentAccountId',
-    }),
-  },
-  watch: {
-    searchTerm(newValue) {
-      if (this.typingTimer) {
-        clearTimeout(this.typingTimer);
-      }
-
-      this.typingTimer = setTimeout(() => {
-        this.hasSearched = true;
-        this.$store.dispatch('conversationSearch/get', { q: newValue });
-      }, 1000);
-    },
-  },
-  mounted() {
-    this.$store.dispatch('conversationSearch/get', { q: '' });
-  },
-  methods: {
-    prepareContent(content = '') {
-      const plainTextContent = this.getPlainText(content);
-      return plainTextContent.replace(
-        new RegExp(`(${this.searchTerm})`, 'ig'),
-        '<span class="searchkey--highlight">$1</span>'
-      );
-    },
-    onClick(conversation) {
-      const path = conversationUrl({
-        accountId: this.accountId,
-        id: conversation.id,
-      });
-      window.location = frontendURL(path);
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.search--container {
-  font-size: var(--font-size-default);
-  padding: var(--space-normal) var(--space-large);
-}
-
-.search-results--container {
-  max-height: 300px;
-  overflow: scroll;
-}
-
-.searchkey--highlight {
-  background: var(--w-500);
-  color: var(--white);
-}
-
-.search--activity-message {
-  color: var(--s-800);
-  text-align: center;
-}
-
-.search--messages {
-  border-bottom: 1px solid var(--b-100);
-  color: var(--color-body);
-  cursor: pointer;
-  font-size: var(--font-size-small);
-  line-height: 1.5;
-  padding: var(--space-normal);
-  text-align: left;
-  width: 100%;
-
-  &:hover {
-    background: var(--w-50);
-  }
-}
-
-.message-search--modal .modal-container {
-  width: 800px;
-  min-height: 460px;
-}
-
-.search--messages__metadata {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: var(--space-small);
-  color: var(--s-500);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
new file mode 100644
index 000000000..40da05e99
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="message-item">
+    <div class="search-message">
+      <div class="user-wrap">
+        <div class="name-wrap">
+          <span class="user-name">{{ userName }}</span>
+          <div>
+            <i v-if="isOutgoingMessage" class="ion-headphone" />
+          </div>
+        </div>
+        <span class="timestamp">{{ readableTime }} </span>
+      </div>
+      <p class="message-content" v-html="prepareContent(content)"></p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { MESSAGE_TYPE } from 'shared/constants/messages';
+import timeMixin from 'dashboard/mixins/time';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+
+export default {
+  mixins: [timeMixin, messageFormatterMixin],
+
+  props: {
+    userName: {
+      type: String,
+      default: '',
+    },
+    timestamp: {
+      type: Number,
+      default: 0,
+    },
+    messageType: {
+      type: Number,
+      default: 0,
+    },
+    content: {
+      type: String,
+      default: '',
+    },
+    searchTerm: {
+      type: String,
+      default: '',
+    },
+  },
+
+  computed: {
+    isOutgoingMessage() {
+      return this.messageType === MESSAGE_TYPE.OUTGOING;
+    },
+    readableTime() {
+      if (!this.timestamp) {
+        return '';
+      }
+      return this.dynamicTime(this.timestamp);
+    },
+  },
+  methods: {
+    prepareContent(content = '') {
+      const plainTextContent = this.getPlainText(content);
+      return plainTextContent.replace(
+        new RegExp(`(${this.searchTerm})`, 'ig'),
+        '<span class="searchkey--highlight">$1</span>'
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.message-item {
+  background: var(--color-background-light);
+  border-radius: var(--border-radius-medium);
+  color: var(--color-body);
+  margin-bottom: var(--space-small);
+  margin-left: var(--space-one);
+  padding: 0 var(--space-small);
+
+  &:hover {
+    background: var(--w-400);
+    color: var(--white);
+    .message-content::v-deep .searchkey--highlight {
+      color: var(--white);
+      text-decoration: underline;
+    }
+    .ion-headphone {
+      color: var(--white);
+    }
+  }
+  &:last-child {
+    .search-message {
+      border-bottom: none;
+    }
+  }
+}
+
+.search-message {
+  padding: var(--space-smaller) var(--space-smaller);
+  &:hover {
+    color: var(--white);
+  }
+}
+
+.user-wrap {
+  display: flex;
+  justify-content: space-between;
+}
+
+.name-wrap {
+  display: flex;
+  width: 22rem;
+
+  .user-name {
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-bold);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+}
+
+.ion-headphone {
+  color: var(--w-500);
+  font-size: var(--font-size-mini);
+  padding: var(--space-micro);
+  padding-right: var(--space-smaller);
+}
+
+.timestamp {
+  font-size: var(--font-size-mini);
+  top: var(--space-micro);
+  position: relative;
+  text-align: right;
+}
+
+p {
+  max-width: 100%;
+}
+
+.message-content {
+  font-size: var(--font-size-small);
+  margin-bottom: var(--space-micro);
+  padding: 0;
+  line-height: 1.35;
+  overflow-wrap: break-word;
+}
+
+.message-content::v-deep .searchkey--highlight {
+  color: var(--w-600);
+  font-weight: var(--font-weight-bold);
+  font-size: var(--font-size-small);
+  padding: (var(--space-zero) var(--space-zero));
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 95065f547..c3f192c3b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -40,7 +40,9 @@
               :key="cannedItem.short_code"
             >
               <!-- Short Code  -->
-              <td>{{ cannedItem.short_code }}</td>
+              <td class="short-code">
+                {{ cannedItem.short_code }}
+              </td>
               <!-- Content -->
               <td>{{ cannedItem.content }}</td>
               <!-- Action Buttons -->
@@ -99,9 +101,7 @@
   </div>
 </template>
 <script>
-/* global bus */
 import { mapGetters } from 'vuex';
-
 import AddCanned from './AddCanned';
 import EditCanned from './EditCanned';
 
@@ -201,3 +201,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.short-code {
+  width: 14rem;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index 0c19df46e..630bc0652 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -25,7 +25,7 @@
           <woot-code
             v-if="isAEmailInbox"
             lang="html"
-            :script="currentInbox.forward_to_address"
+            :script="currentInbox.forward_to_email"
           >
           </woot-code>
         </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 81ea650d7..93820a9ac 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -254,6 +254,9 @@
     <div v-if="selectedTabKey === 'preChatForm'">
       <pre-chat-form-settings :inbox="inbox" />
     </div>
+    <div v-if="selectedTabKey === 'businesshours'">
+      <weekly-availability :inbox="inbox" />
+    </div>
   </div>
 </template>
 
@@ -266,12 +269,14 @@ import SettingsSection from '../../../../components/SettingsSection';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import FacebookReauthorize from './facebook/Reauthorize';
 import PreChatFormSettings from './PreChatForm/Settings';
+import WeeklyAvailability from './components/WeeklyAvailability';
 
 export default {
   components: {
     SettingsSection,
     FacebookReauthorize,
     PreChatFormSettings,
+    WeeklyAvailability,
   },
   mixins: [alertMixin, configMixin, inboxMixin],
   data() {
@@ -329,6 +334,10 @@ export default {
             key: 'preChatForm',
             name: this.$t('INBOX_MGMT.TABS.PRE_CHAT_FORM'),
           },
+          {
+            key: 'businesshours',
+            name: this.$t('INBOX_MGMT.TABS.BUSINESS_HOURS'),
+          },
           {
             key: 'configuration',
             name: this.$t('INBOX_MGMT.TABS.CONFIGURATION'),
@@ -395,6 +404,7 @@ export default {
       this.selectedTabIndex = 0;
       this.selectedAgents = [];
       this.$store.dispatch('agents/get');
+      this.$store.dispatch('teams/get');
       this.$store.dispatch('inboxes/get').then(() => {
         this.fetchAttachedAgents();
         this.avatarUrl = this.inbox.avatar_url;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
new file mode 100644
index 000000000..9e6338605
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="day-wrap">
+    <div class="checkbox-wrap">
+      <input
+        v-model="isDayEnabled"
+        name="enable-day"
+        class="enable-day"
+        type="checkbox"
+        :title="$t('INBOX_MGMT.BUSINESS_HOURS.DAY.ENABLE')"
+      />
+    </div>
+    <div class="day">
+      <span>{{ dayName }}</span>
+    </div>
+    <div v-if="isDayEnabled" class="hours-select-wrap">
+      <div class="hours-range">
+        <multiselect
+          v-model="fromTime"
+          :options="timeSlots"
+          deselect-label=""
+          select-label=""
+          selected-label=""
+          :placeholder="$t('INBOX_MGMT.BUSINESS_HOURS.DAY.CHOOSE')"
+          :allow-empty="false"
+        />
+        <div class="separator-icon">
+          <i class="ion-minus-round" />
+        </div>
+        <multiselect
+          v-model="toTime"
+          :options="timeSlots"
+          deselect-label=""
+          select-label=""
+          selected-label=""
+          :placeholder="$t('INBOX_MGMT.BUSINESS_HOURS.DAY.CHOOSE')"
+          :allow-empty="false"
+        />
+      </div>
+      <div v-if="hasError" class="date-error">
+        <span class="error">{{
+          $t('INBOX_MGMT.BUSINESS_HOURS.DAY.VALIDATION_ERROR')
+        }}</span>
+      </div>
+    </div>
+    <div v-else class="day-unavailable">
+      <span>
+        {{ $t('INBOX_MGMT.BUSINESS_HOURS.DAY.UNAVAILABLE') }}
+      </span>
+    </div>
+    <div>
+      <span v-if="isDayEnabled && !hasError" class="label">
+        {{ totalHours }} {{ $t('INBOX_MGMT.BUSINESS_HOURS.DAY.HOURS') }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+import parse from 'date-fns/parse';
+import differenceInMinutes from 'date-fns/differenceInMinutes';
+import { generateTimeSlots } from '../helpers/businessHour';
+
+const timeSlots = generateTimeSlots(30);
+
+export default {
+  components: {},
+  props: {
+    dayName: {
+      type: String,
+      default: '',
+      required: true,
+    },
+    timeSlot: {
+      type: Object,
+      default: () => ({
+        from: '',
+        to: '',
+      }),
+    },
+  },
+  computed: {
+    timeSlots() {
+      return timeSlots;
+    },
+    isDayEnabled: {
+      get() {
+        return this.timeSlot.from && this.timeSlot.to;
+      },
+      set(value) {
+        const newSlot = value
+          ? {
+              ...this.timeSlot,
+              from: timeSlots[0],
+              to: timeSlots[16],
+              valid: true,
+            }
+          : {
+              ...this.timeSlot,
+              from: '',
+              to: '',
+              valid: false,
+            };
+        this.$emit('update', newSlot);
+      },
+    },
+    fromTime: {
+      get() {
+        return this.timeSlot.from;
+      },
+      set(value) {
+        const fromDate = parse(value, 'hh:mm a', new Date());
+        const valid = differenceInMinutes(this.toDate, fromDate) / 60 > 0;
+        this.$emit('update', {
+          ...this.timeSlot,
+          from: value,
+          valid,
+        });
+      },
+    },
+    toTime: {
+      get() {
+        return this.timeSlot.to;
+      },
+      set(value) {
+        const toDate = parse(value, 'hh:mm a', new Date());
+        if (value === '12:00 AM') {
+          this.$emit('update', {
+            ...this.timeSlot,
+            to: value,
+            valid: true,
+          });
+        } else {
+          const valid = differenceInMinutes(toDate, this.fromDate) / 60 > 0;
+          this.$emit('update', {
+            ...this.timeSlot,
+            to: value,
+            valid,
+          });
+        }
+      },
+    },
+    fromDate() {
+      return parse(this.fromTime, 'hh:mm a', new Date());
+    },
+    toDate() {
+      return parse(this.toTime, 'hh:mm a', new Date());
+    },
+    totalHours() {
+      const totalHours = differenceInMinutes(this.toDate, this.fromDate) / 60;
+      if (this.toTime === '12:00 AM') {
+        return 24 + totalHours;
+      }
+      return totalHours;
+    },
+    hasError() {
+      return !this.timeSlot.valid;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.day-wrap::v-deep .multiselect {
+  margin: 0;
+  width: 12rem;
+
+  > .multiselect__tags {
+    padding-left: var(--space-slab);
+
+    .multiselect__single {
+      font-size: var(--font-size-small);
+      line-height: var(--space-medium);
+      padding: var(--space-small) 0;
+    }
+  }
+}
+.day-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: var(--space-small) 0;
+  min-height: var(--space-larger);
+  box-sizing: content-box;
+  border-bottom: 1px solid var(--color-border-light);
+}
+.enable-day {
+  margin: 0;
+}
+
+.hours-select-wrap {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 1;
+  position: relative;
+}
+
+.hours-range,
+.day-unavailable {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+  flex-grow: 1;
+}
+
+.day-unavailable {
+  font-size: var(--font-size-small);
+  color: var(--s-500);
+}
+
+.checkbox-wrap {
+  display: flex;
+  align-items: center;
+}
+
+.separator-icon,
+.day {
+  display: flex;
+  align-items: center;
+  padding: 0 var(--space-slab);
+  height: 100%;
+}
+
+.day {
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-medium);
+  width: 13rem;
+}
+
+.label {
+  font-size: var(--font-size-mini);
+  color: var(--w-700);
+  background: var(--w-50);
+}
+
+.date-error {
+  padding-top: var(--space-smaller);
+}
+
+.error {
+  font-size: var(--font-size-mini);
+  color: var(--r-300);
+}
+</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
new file mode 100644
index 000000000..4107c5151
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
@@ -0,0 +1,193 @@
+<template>
+  <div class="settings--content">
+    <settings-section
+      :title="$t('INBOX_MGMT.BUSINESS_HOURS.TITLE')"
+      :sub-title="$t('INBOX_MGMT.BUSINESS_HOURS.SUBTITLE')"
+    >
+      <form @submit.prevent="updateInbox">
+        <label for="toggle-business-hours" class="toggle-input-wrap">
+          <input
+            v-model="isBusinessHoursEnabled"
+            type="checkbox"
+            name="toggle-business-hours"
+          />
+          {{ $t('INBOX_MGMT.BUSINESS_HOURS.TOGGLE_AVAILABILITY') }}
+        </label>
+        <p>{{ $t('INBOX_MGMT.BUSINESS_HOURS.TOGGLE_HELP') }}</p>
+        <div v-if="isBusinessHoursEnabled" class="business-hours-wrap">
+          <label class="unavailable-input-wrap">
+            {{ $t('INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_LABEL') }}
+            <textarea v-model="unavailableMessage" type="text" />
+          </label>
+          <div class="timezone-input-wrap">
+            <label>
+              {{ $t('INBOX_MGMT.BUSINESS_HOURS.TIMEZONE_LABEL') }}
+            </label>
+            <multiselect
+              v-model="timeZone"
+              :options="timeZones"
+              deselect-label=""
+              select-label=""
+              selected-label=""
+              track-by="value"
+              label="label"
+              :close-on-select="true"
+              :placeholder="$t('INBOX_MGMT.BUSINESS_HOURS.DAY.CHOOSE')"
+              :allow-empty="false"
+            />
+          </div>
+
+          <label>
+            {{ $t('INBOX_MGMT.BUSINESS_HOURS.WEEKLY_TITLE') }}
+          </label>
+          <business-day
+            v-for="timeSlot in timeSlots"
+            :key="timeSlot.day"
+            :day-name="dayNames[timeSlot.day]"
+            :time-slot="timeSlot"
+            @update="data => onSlotUpdate(timeSlot.day, data)"
+          />
+        </div>
+        <woot-submit-button
+          :button-text="$t('INBOX_MGMT.BUSINESS_HOURS.UPDATE')"
+          :loading="uiFlags.isUpdatingInbox"
+          :disabled="hasError"
+        />
+      </form>
+    </settings-section>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import SettingsSection from 'dashboard/components/SettingsSection';
+import BusinessDay from './BusinessDay';
+import {
+  timeSlotParse,
+  timeSlotTransform,
+  defaultTimeSlot,
+  timeZoneOptions,
+} from '../helpers/businessHour';
+
+const DEFAULT_TIMEZONE = {
+  label: 'America/Los_Angeles',
+  key: 'America/Los_Angeles',
+};
+
+export default {
+  components: {
+    SettingsSection,
+    BusinessDay,
+  },
+  mixins: [alertMixin],
+  props: {
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      isBusinessHoursEnabled: false,
+      unavailableMessage: this.$t(
+        'INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_DEFAULT'
+      ),
+      timeZone: DEFAULT_TIMEZONE,
+      dayNames: {
+        0: 'Sunday',
+        1: 'Monday',
+        2: 'Tuesday',
+        3: 'Wednesday',
+        4: 'Thursday',
+        5: 'Friday',
+        6: 'Saturday',
+      },
+      timeSlots: [...defaultTimeSlot],
+    };
+  },
+  computed: {
+    ...mapGetters({ uiFlags: 'inboxes/getUIFlags' }),
+    hasError() {
+      if (!this.isBusinessHoursEnabled) return false;
+      return this.timeSlots.filter(slot => slot.from && !slot.valid).length > 0;
+    },
+    timeZones() {
+      return [...timeZoneOptions()];
+    },
+  },
+  watch: {
+    inbox() {
+      this.setDefaults();
+    },
+  },
+  mounted() {
+    this.setDefaults();
+  },
+  methods: {
+    setDefaults() {
+      const {
+        working_hours_enabled: isEnabled = false,
+        out_of_office_message: unavailableMessage,
+        working_hours: timeSlots = [],
+        timezone: timeZone,
+      } = this.inbox;
+      const slots = timeSlotParse(timeSlots).length
+        ? timeSlotParse(timeSlots)
+        : defaultTimeSlot;
+      this.isBusinessHoursEnabled = isEnabled;
+      this.unavailableMessage =
+        unavailableMessage ||
+        this.$t('INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_DEFAULT');
+      this.timeSlots = slots;
+      this.timeZone =
+        this.timeZones.find(item => timeZone === item.value) ||
+        DEFAULT_TIMEZONE;
+    },
+    onSlotUpdate(slotIndex, slotData) {
+      this.timeSlots = this.timeSlots.map(item =>
+        item.day === slotIndex ? slotData : item
+      );
+    },
+    async updateInbox() {
+      try {
+        const payload = {
+          id: this.inbox.id,
+          formData: false,
+          working_hours_enabled: this.isBusinessHoursEnabled,
+          out_of_office_message: this.unavailableMessage,
+          working_hours: timeSlotTransform(this.timeSlots),
+          timezone: this.timeZone.value,
+          channel: {},
+        };
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.timezone-input-wrap {
+  max-width: 60rem;
+
+  &::v-deep .multiselect {
+    margin-top: var(--space-small);
+  }
+}
+
+.unavailable-input-wrap {
+  max-width: 60rem;
+
+  textarea {
+    min-height: var(--space-jumbo);
+    margin-top: var(--space-small);
+  }
+}
+
+.business-hours-wrap {
+  margin-bottom: var(--space-medium);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/businessHour.js b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/businessHour.js
new file mode 100644
index 000000000..2bd9a281a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/businessHour.js
@@ -0,0 +1,137 @@
+import parse from 'date-fns/parse';
+import getHours from 'date-fns/getHours';
+import getMinutes from 'date-fns/getMinutes';
+import timeZoneData from './timezones.json';
+
+export const defaultTimeSlot = [
+  {
+    day: 0,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 1,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 2,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 3,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 4,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 5,
+    to: '',
+    from: '',
+    valid: false,
+  },
+  {
+    day: 6,
+    to: '',
+    from: '',
+    valid: false,
+  },
+];
+
+export const generateTimeSlots = (step = 15) => {
+  /* 
+    Generates a list of time strings from 12:00 AM to next 24 hours. Each new string
+     will be generated by adding `step` minutes to the previous one.
+    The list is generated by starting with a random day and adding step minutes till end of the same day.
+  */
+  const date = new Date(1970, 1, 1);
+  const slots = [];
+  while (date.getDate() === 1) {
+    slots.push(
+      date.toLocaleTimeString('en-US', {
+        hour: '2-digit',
+        minute: '2-digit',
+        hour12: true,
+      })
+    );
+    date.setMinutes(date.getMinutes() + step);
+  }
+  return slots;
+};
+
+export const getTime = (hour, minute) => {
+  const merdian = hour > 11 ? 'PM' : 'AM';
+  const modHour = hour > 12 ? hour % 12 : hour || 12;
+  const parsedHour = modHour < 10 ? `0${modHour}` : modHour;
+  const parsedMinute = minute < 10 ? `0${minute}` : minute;
+  return `${parsedHour}:${parsedMinute} ${merdian}`;
+};
+
+export const timeSlotParse = timeSlots => {
+  return timeSlots.map(slot => {
+    const {
+      day_of_week: day,
+      open_hour: openHour,
+      open_minutes: openMinutes,
+      close_hour: closeHour,
+      close_minutes: closeMinutes,
+      closed_all_day: closedAllDay,
+    } = slot;
+    const from = closedAllDay ? '' : getTime(openHour, openMinutes);
+    const to = closedAllDay ? '' : getTime(closeHour, closeMinutes);
+
+    return {
+      day,
+      to,
+      from,
+      valid: !closedAllDay,
+    };
+  });
+};
+
+export const timeSlotTransform = timeSlots => {
+  return timeSlots.map(slot => {
+    const closed = !(slot.to && slot.from);
+    let fromDate = '';
+    let toDate = '';
+    let openHour = '';
+    let openMinutes = '';
+    let closeHour = '';
+    let closeMinutes = '';
+
+    if (!closed) {
+      fromDate = parse(slot.from, 'hh:mm a', new Date());
+      toDate = parse(slot.to, 'hh:mm a', new Date());
+      openHour = getHours(fromDate);
+      openMinutes = getMinutes(fromDate);
+      closeHour = getHours(toDate);
+      closeMinutes = getMinutes(toDate);
+    }
+
+    return {
+      day_of_week: slot.day,
+      closed_all_day: closed,
+      open_hour: openHour,
+      open_minutes: openMinutes,
+      close_hour: closeHour,
+      close_minutes: closeMinutes,
+    };
+  });
+};
+
+export const timeZoneOptions = () => {
+  return Object.keys(timeZoneData).map(key => ({
+    label: key,
+    value: timeZoneData[key],
+  }));
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/specs/businessHour.spec.js b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/specs/businessHour.spec.js
new file mode 100644
index 000000000..62b9b28ac
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/specs/businessHour.spec.js
@@ -0,0 +1,85 @@
+import {
+  generateTimeSlots,
+  getTime,
+  timeSlotParse,
+  timeSlotTransform,
+  timeZoneOptions,
+} from '../businessHour';
+
+describe('#generateTimeSlots', () => {
+  it('returns correct number of time slots', () => {
+    expect(generateTimeSlots(15).length).toStrictEqual((60 / 15) * 24);
+  });
+  it('returns correct time slots', () => {
+    expect(generateTimeSlots(240)).toStrictEqual([
+      '12:00 AM',
+      '04:00 AM',
+      '08:00 AM',
+      '12:00 PM',
+      '04:00 PM',
+      '08:00 PM',
+    ]);
+  });
+});
+
+describe('#getTime', () => {
+  it('returns parses 24 hour time correctly', () => {
+    expect(getTime(15, 30)).toStrictEqual('03:30 PM');
+  });
+  it('returns parses 12 hour time correctly', () => {
+    expect(getTime(12, 30)).toStrictEqual('12:30 PM');
+  });
+});
+
+describe('#timeSlotParse', () => {
+  it('returns parses correctly', () => {
+    const slot = {
+      day_of_week: 1,
+      open_hour: 1,
+      open_minutes: 30,
+      close_hour: 4,
+      close_minutes: 30,
+      closed_all_day: false,
+    };
+
+    expect(timeSlotParse([slot])).toStrictEqual([
+      {
+        day: 1,
+        from: '01:30 AM',
+        to: '04:30 AM',
+        valid: true,
+      },
+    ]);
+  });
+});
+
+describe('#timeSlotTransform', () => {
+  it('returns transforms correctly', () => {
+    const slot = {
+      day: 1,
+      from: '01:30 AM',
+      to: '04:30 AM',
+      valid: true,
+    };
+
+    expect(timeSlotTransform([slot])).toStrictEqual([
+      {
+        day_of_week: 1,
+        open_hour: 1,
+        open_minutes: 30,
+        close_hour: 4,
+        close_minutes: 30,
+        closed_all_day: false,
+      },
+    ]);
+  });
+});
+
+describe('#timeZoneOptions', () => {
+  it('returns transforms correctly', () => {
+    expect(timeZoneOptions()[0]).toStrictEqual({
+      value: 'Etc/GMT+12',
+      label: 'International Date Line West',
+    });
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json
new file mode 100644
index 000000000..8cfe6f882
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json
@@ -0,0 +1,153 @@
+{
+    "International Date Line West": "Etc/GMT+12",
+    "Midway Island": "Pacific/Midway",
+    "American Samoa": "Pacific/Pago_Pago",
+    "Hawaii": "Pacific/Honolulu",
+    "Alaska": "America/Juneau",
+    "Pacific Time (US & Canada)": "America/Los_Angeles",
+    "Tijuana": "America/Tijuana",
+    "Mountain Time (US & Canada)": "America/Denver",
+    "Arizona": "America/Phoenix",
+    "Chihuahua": "America/Chihuahua",
+    "Mazatlan": "America/Mazatlan",
+    "Central Time (US & Canada)": "America/Chicago",
+    "Saskatchewan": "America/Regina",
+    "Guadalajara": "America/Mexico_City",
+    "Mexico City": "America/Mexico_City",
+    "Monterrey": "America/Monterrey",
+    "Central America": "America/Guatemala",
+    "Eastern Time (US & Canada)": "America/New_York",
+    "Indiana (East)": "America/Indiana/Indianapolis",
+    "Bogota": "America/Bogota",
+    "Lima": "America/Lima",
+    "Quito": "America/Lima",
+    "Atlantic Time (Canada)": "America/Halifax",
+    "Caracas": "America/Caracas",
+    "La Paz": "America/La_Paz",
+    "Santiago": "America/Santiago",
+    "Newfoundland": "America/St_Johns",
+    "Brasilia": "America/Sao_Paulo",
+    "Buenos Aires": "America/Argentina/Buenos_Aires",
+    "Montevideo": "America/Montevideo",
+    "Georgetown": "America/Guyana",
+    "Puerto Rico": "America/Puerto_Rico",
+    "Greenland": "America/Godthab",
+    "Mid-Atlantic": "Atlantic/South_Georgia",
+    "Azores": "Atlantic/Azores",
+    "Cape Verde Is.": "Atlantic/Cape_Verde",
+    "Dublin": "Europe/Dublin",
+    "Edinburgh": "Europe/London",
+    "Lisbon": "Europe/Lisbon",
+    "London": "Europe/London",
+    "Casablanca": "Africa/Casablanca",
+    "Monrovia": "Africa/Monrovia",
+    "UTC": "Etc/UTC",
+    "Belgrade": "Europe/Belgrade",
+    "Bratislava": "Europe/Bratislava",
+    "Budapest": "Europe/Budapest",
+    "Ljubljana": "Europe/Ljubljana",
+    "Prague": "Europe/Prague",
+    "Sarajevo": "Europe/Sarajevo",
+    "Skopje": "Europe/Skopje",
+    "Warsaw": "Europe/Warsaw",
+    "Zagreb": "Europe/Zagreb",
+    "Brussels": "Europe/Brussels",
+    "Copenhagen": "Europe/Copenhagen",
+    "Madrid": "Europe/Madrid",
+    "Paris": "Europe/Paris",
+    "Amsterdam": "Europe/Amsterdam",
+    "Berlin": "Europe/Berlin",
+    "Bern": "Europe/Zurich",
+    "Zurich": "Europe/Zurich",
+    "Rome": "Europe/Rome",
+    "Stockholm": "Europe/Stockholm",
+    "Vienna": "Europe/Vienna",
+    "West Central Africa": "Africa/Algiers",
+    "Bucharest": "Europe/Bucharest",
+    "Cairo": "Africa/Cairo",
+    "Helsinki": "Europe/Helsinki",
+    "Kyiv": "Europe/Kiev",
+    "Riga": "Europe/Riga",
+    "Sofia": "Europe/Sofia",
+    "Tallinn": "Europe/Tallinn",
+    "Vilnius": "Europe/Vilnius",
+    "Athens": "Europe/Athens",
+    "Istanbul": "Europe/Istanbul",
+    "Minsk": "Europe/Minsk",
+    "Jerusalem": "Asia/Jerusalem",
+    "Harare": "Africa/Harare",
+    "Pretoria": "Africa/Johannesburg",
+    "Kaliningrad": "Europe/Kaliningrad",
+    "Moscow": "Europe/Moscow",
+    "St. Petersburg": "Europe/Moscow",
+    "Volgograd": "Europe/Volgograd",
+    "Samara": "Europe/Samara",
+    "Kuwait": "Asia/Kuwait",
+    "Riyadh": "Asia/Riyadh",
+    "Nairobi": "Africa/Nairobi",
+    "Baghdad": "Asia/Baghdad",
+    "Tehran": "Asia/Tehran",
+    "Abu Dhabi": "Asia/Muscat",
+    "Muscat": "Asia/Muscat",
+    "Baku": "Asia/Baku",
+    "Tbilisi": "Asia/Tbilisi",
+    "Yerevan": "Asia/Yerevan",
+    "Kabul": "Asia/Kabul",
+    "Ekaterinburg": "Asia/Yekaterinburg",
+    "Islamabad": "Asia/Karachi",
+    "Karachi": "Asia/Karachi",
+    "Tashkent": "Asia/Tashkent",
+    "Chennai": "Asia/Kolkata",
+    "Kolkata": "Asia/Kolkata",
+    "Mumbai": "Asia/Kolkata",
+    "New Delhi": "Asia/Kolkata",
+    "Kathmandu": "Asia/Kathmandu",
+    "Astana": "Asia/Dhaka",
+    "Dhaka": "Asia/Dhaka",
+    "Sri Jayawardenepura": "Asia/Colombo",
+    "Almaty": "Asia/Almaty",
+    "Novosibirsk": "Asia/Novosibirsk",
+    "Rangoon": "Asia/Rangoon",
+    "Bangkok": "Asia/Bangkok",
+    "Hanoi": "Asia/Bangkok",
+    "Jakarta": "Asia/Jakarta",
+    "Krasnoyarsk": "Asia/Krasnoyarsk",
+    "Beijing": "Asia/Shanghai",
+    "Chongqing": "Asia/Chongqing",
+    "Hong Kong": "Asia/Hong_Kong",
+    "Urumqi": "Asia/Urumqi",
+    "Kuala Lumpur": "Asia/Kuala_Lumpur",
+    "Singapore": "Asia/Singapore",
+    "Taipei": "Asia/Taipei",
+    "Perth": "Australia/Perth",
+    "Irkutsk": "Asia/Irkutsk",
+    "Ulaanbaatar": "Asia/Ulaanbaatar",
+    "Seoul": "Asia/Seoul",
+    "Osaka": "Asia/Tokyo",
+    "Sapporo": "Asia/Tokyo",
+    "Tokyo": "Asia/Tokyo",
+    "Yakutsk": "Asia/Yakutsk",
+    "Darwin": "Australia/Darwin",
+    "Adelaide": "Australia/Adelaide",
+    "Canberra": "Australia/Melbourne",
+    "Melbourne": "Australia/Melbourne",
+    "Sydney": "Australia/Sydney",
+    "Brisbane": "Australia/Brisbane",
+    "Hobart": "Australia/Hobart",
+    "Vladivostok": "Asia/Vladivostok",
+    "Guam": "Pacific/Guam",
+    "Port Moresby": "Pacific/Port_Moresby",
+    "Magadan": "Asia/Magadan",
+    "Srednekolymsk": "Asia/Srednekolymsk",
+    "Solomon Is.": "Pacific/Guadalcanal",
+    "New Caledonia": "Pacific/Noumea",
+    "Fiji": "Pacific/Fiji",
+    "Kamchatka": "Asia/Kamchatka",
+    "Marshall Is.": "Pacific/Majuro",
+    "Auckland": "Pacific/Auckland",
+    "Wellington": "Pacific/Auckland",
+    "Nuku'alofa": "Pacific/Tongatapu",
+    "Tokelau Is.": "Pacific/Fakaofo",
+    "Chatham Is.": "Pacific/Chatham",
+    "Samoa": "Pacific/Apia"
+}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
index a2d6bf215..38bf2744e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
@@ -1,5 +1,33 @@
 <template>
   <div>
+    <div class="profile--settings--row row">
+      <div class="columns small-3 ">
+        <h4 class="block-title">
+          {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.TITLE') }}
+        </h4>
+        <p>
+          {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.NOTE') }}
+        </p>
+      </div>
+      <div class="columns small-9">
+        <div>
+          <input
+            id="audio_enable_alert"
+            v-model="enableAudioAlerts"
+            class="notification--checkbox"
+            type="checkbox"
+            @input="handleAudioInput"
+          />
+          <label for="audio_enable_alert">
+            {{
+              $t(
+                'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ENABLE_AUDIO'
+              )
+            }}
+          </label>
+        </div>
+      </div>
+    </div>
     <div class="profile--settings--row row">
       <div class="columns small-3 ">
         <h4 class="block-title">
@@ -185,6 +213,7 @@
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import configMixin from 'shared/mixins/configMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import {
   hasPushPermissions,
   requestPushPermissions,
@@ -192,11 +221,12 @@ import {
 } from '../../../../helper/pushHelper';
 
 export default {
-  mixins: [alertMixin, configMixin],
+  mixins: [alertMixin, configMixin, uiSettingsMixin],
   data() {
     return {
       selectedEmailFlags: [],
       selectedPushFlags: [],
+      enableAudioAlerts: false,
       hasEnabledPushPermissions: false,
     };
   },
@@ -204,6 +234,7 @@ export default {
     ...mapGetters({
       emailFlags: 'userNotificationSettings/getSelectedEmailFlags',
       pushFlags: 'userNotificationSettings/getSelectedPushFlags',
+      uiSettings: 'getUISettings',
     }),
     isBrowserSafari() {
       if (window.browserConfig) {
@@ -219,6 +250,10 @@ export default {
     pushFlags(value) {
       this.selectedPushFlags = value;
     },
+    uiSettings(value) {
+      const { enable_audio_alerts: enableAudio = false } = value;
+      this.enableAudioAlerts = enableAudio;
+    },
   },
   mounted() {
     if (hasPushPermissions()) {
@@ -226,6 +261,8 @@ export default {
     }
 
     this.$store.dispatch('userNotificationSettings/get');
+    const { enable_audio_alerts: enableAudio = false } = this.uiSettings;
+    this.enableAudioAlerts = enableAudio;
   },
   methods: {
     onRegistrationSuccess() {
@@ -277,6 +314,13 @@ export default {
 
       this.updateNotificationSettings();
     },
+    handleAudioInput(e) {
+      this.enableAudioAlerts = e.target.checked;
+      this.updateUISettings({
+        enable_audio_alerts: this.enableAudioAlerts,
+      });
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
     toggleInput(selected, current) {
       if (selected.includes(current)) {
         const newSelectedFlags = selected.filter(flag => flag !== current);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index c82f5dfe4..46617349c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -7,6 +7,7 @@ import integrations from './integrations/integrations.routes';
 import labels from './labels/labels.routes';
 import profile from './profile/profile.routes';
 import reports from './reports/reports.routes';
+import teams from './teams/teams.routes';
 import store from '../../../store';
 
 export default {
@@ -30,5 +31,6 @@ export default {
     ...labels.routes,
     ...profile.routes,
     ...reports.routes,
+    ...teams.routes,
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
new file mode 100644
index 000000000..6a0bb7e21
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+    <div class="add-agents__header"></div>
+    <table class="woot-table">
+      <thead>
+        <tr>
+          <td>
+            <div class="checkbox-wrap">
+              <input
+                name="select-all-agents"
+                type="checkbox"
+                :checked="allAgentsSelected ? 'checked' : ''"
+                :title="$t('TEAMS_SETTINGS.AGENTS.SELECT_ALL')"
+                @click.self="selectAllAgents"
+              />
+            </div>
+          </td>
+          <td>{{ $t('TEAMS_SETTINGS.AGENTS.AGENT') }}</td>
+          <td>{{ $t('TEAMS_SETTINGS.AGENTS.EMAIL') }}</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          v-for="agent in agentList"
+          :key="agent.id"
+          :class="agentRowClass(agent.id)"
+        >
+          <td class="checkbox-cell">
+            <div class="checkbox-wrap">
+              <input
+                type="checkbox"
+                :checked="isAgentSelected(agent.id)"
+                @click.self="() => handleSelectAgent(agent.id)"
+              />
+            </div>
+          </td>
+          <td>
+            <div class="user-info-wrap">
+              <thumbnail
+                :src="agent.thumbnail"
+                size="24px"
+                :username="agent.name"
+                :status="agent.availability_status"
+              />
+              <h4 class="sub-block-title user-name">
+                {{ agent.name }}
+              </h4>
+            </div>
+          </td>
+          <td>
+            {{ agent.email || '---' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <div class="add-agents__footer">
+      <p>
+        {{
+          $t('TEAMS_SETTINGS.AGENTS.SELECTED_COUNT', {
+            selected: selectedAgents.length,
+            total: agentList.length,
+          })
+        }}
+      </p>
+      <woot-submit-button
+        :button-text="submitButtonText"
+        :loading="isWorking"
+        :disabled="disableSubmitButton"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+
+export default {
+  components: {
+    Thumbnail,
+  },
+  props: {
+    agentList: {
+      type: Array,
+      default: () => [],
+    },
+    selectedAgents: {
+      type: Array,
+      default: () => [],
+    },
+    updateSelectedAgents: {
+      type: Function,
+      default: () => {},
+    },
+    isWorking: {
+      type: Boolean,
+      default: false,
+    },
+    submitButtonText: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    selectedAgentCount() {
+      return this.selectedAgents.length;
+    },
+    allAgentsSelected() {
+      return this.selectedAgents.length === this.agentList.length;
+    },
+    disableSubmitButton() {
+      return this.selectedAgentCount === 0;
+    },
+  },
+  methods: {
+    isAgentSelected(agentId) {
+      return this.selectedAgents.includes(agentId);
+    },
+    handleSelectAgent(agentId) {
+      const shouldRemove = this.isAgentSelected(agentId);
+
+      let result = [];
+      if (shouldRemove) {
+        result = this.selectedAgents.filter(item => item !== agentId);
+      } else {
+        result = [...this.selectedAgents, agentId];
+      }
+
+      this.updateSelectedAgents(result);
+    },
+    selectAllAgents() {
+      const result = this.agentList.map(item => item.id);
+      this.updateSelectedAgents(result);
+    },
+    agentRowClass(agentId) {
+      return { 'is-active': this.isAgentSelected(agentId) };
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.table__meta {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--space-small);
+}
+
+.user-info-wrap {
+  display: flex;
+  align-items: center;
+}
+
+.user-name {
+  margin-bottom: 0;
+  margin-left: var(--space-small);
+}
+
+.add-agents__footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.checkbox-wrap {
+  display: flex;
+  align-items: center;
+
+  input {
+    margin: 0;
+  }
+}
+.checkbox-cell {
+  width: var(--space-larger);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
new file mode 100644
index 000000000..ec59c6b94
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="wizard-body columns content-box small-9">
+    <form class="row" @submit.prevent="addAgents">
+      <div class="medium-12 columns">
+        <page-header
+          :header-title="headerTitle"
+          :header-content="$t('TEAMS_SETTINGS.ADD.DESC')"
+        />
+      </div>
+
+      <div class="medium-12 columns">
+        <div v-if="$v.selectedAgents.$error">
+          <p class="error-message">
+            {{ $t('TEAMS_SETTINGS.ADD.AGENT_VALIDATION_ERROR') }}
+          </p>
+        </div>
+        <agent-selector
+          :agent-list="agentList"
+          :selected-agents="selectedAgents"
+          :update-selected-agents="updateSelectedAgents"
+          :is-working="isCreating"
+          :submit-button-text="$t('TEAMS_SETTINGS.ADD.BUTTON_TEXT')"
+        />
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+
+import alertMixin from 'shared/mixins/alertMixin';
+import router from '../../../../index';
+import PageHeader from '../../SettingsSubPageHeader';
+import AgentSelector from '../AgentSelector';
+
+export default {
+  components: {
+    PageHeader,
+    AgentSelector,
+  },
+  mixins: [alertMixin],
+  props: {
+    team: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations: {
+    selectedAgents: {
+      isEmpty() {
+        return !!this.selectedAgents.length;
+      },
+    },
+  },
+
+  data() {
+    return {
+      selectedAgents: [],
+      isCreating: false,
+    };
+  },
+
+  computed: {
+    ...mapGetters({
+      agentList: 'agents/getAgents',
+    }),
+
+    teamId() {
+      return this.$route.params.teamId;
+    },
+    headerTitle() {
+      return this.$t('TEAMS_SETTINGS.ADD.TITLE', {
+        teamName: this.currentTeam.name,
+      });
+    },
+    currentTeam() {
+      return this.$store.getters['teams/getTeam'](this.teamId);
+    },
+  },
+
+  mounted() {
+    this.$store.dispatch('agents/get');
+  },
+
+  methods: {
+    updateSelectedAgents(newAgentList) {
+      this.$v.selectedAgents.$touch();
+      this.selectedAgents = [...newAgentList];
+    },
+    selectAllAgents() {
+      this.selectedAgents = this.agentList.map(agent => agent.id);
+    },
+    async addAgents() {
+      this.isCreating = true;
+      const { teamId, selectedAgents } = this;
+
+      try {
+        await this.$store.dispatch('teamMembers/create', {
+          teamId,
+          agentsList: selectedAgents,
+        });
+        router.replace({
+          name: 'settings_teams_finish',
+          params: {
+            page: 'new',
+            teamId,
+          },
+        });
+      } catch (error) {
+        this.showAlert(error.message);
+      }
+      this.isCreating = false;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue
new file mode 100644
index 000000000..ff596a953
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="wizard-body small-9 columns">
+    <page-header
+      :header-title="$t('TEAMS_SETTINGS.CREATE_FLOW.CREATE.TITLE')"
+      :header-content="$t('TEAMS_SETTINGS.CREATE_FLOW.CREATE.DESC')"
+    />
+    <div class="row channels">
+      <team-form
+        :on-submit="createTeam"
+        :submit-in-progress="false"
+        :submit-button-text="$t('TEAMS_SETTINGS.FORM.SUBMIT_CREATE')"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import TeamForm from '../TeamForm';
+import router from '../../../../index';
+import PageHeader from '../../SettingsSubPageHeader';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    TeamForm,
+    PageHeader,
+  },
+  mixins: [alertMixin],
+  data() {
+    return {
+      enabledFeatures: {},
+    };
+  },
+  methods: {
+    async createTeam(data) {
+      try {
+        const team = await this.$store.dispatch('teams/create', {
+          ...data,
+        });
+
+        router.replace({
+          name: 'settings_teams_add_agents',
+          params: {
+            page: 'new',
+            teamId: team.id,
+          },
+        });
+      } catch (error) {
+        this.showAlert(this.$t('TEAMS_SETTINGS.TEAM_FORM.ERROR_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
new file mode 100644
index 000000000..33f6b3c3f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="row content-box full-height">
+    <woot-wizard class="small-3 columns" :items="items" />
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  computed: {
+    items() {
+      const data = this.$t('TEAMS_SETTINGS.CREATE_FLOW.WIZARD');
+      return data;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
new file mode 100644
index 000000000..e99384dff
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
@@ -0,0 +1,139 @@
+<template>
+  <div class="wizard-body columns content-box small-9">
+    <form class="row" @submit.prevent="addAgents">
+      <div class="medium-12 columns">
+        <page-header
+          :header-title="headerTitle"
+          :header-content="$t('TEAMS_SETTINGS.EDIT_FLOW.AGENTS.DESC')"
+        />
+      </div>
+
+      <div class="medium-12 columns">
+        <div v-if="$v.selectedAgents.$error">
+          <p class="error-message">
+            {{ $t('TEAMS_SETTINGS.ADD.AGENT_VALIDATION_ERROR') }}
+          </p>
+        </div>
+        <agent-selector
+          v-if="showAgentsList"
+          :agent-list="agentList"
+          :selected-agents="selectedAgents"
+          :update-selected-agents="updateSelectedAgents"
+          :is-working="isCreating"
+          :submit-button-text="
+            $t('TEAMS_SETTINGS.EDIT_FLOW.AGENTS.BUTTON_TEXT')
+          "
+        />
+        <spinner v-else />
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import Spinner from 'shared/components/Spinner';
+import alertMixin from 'shared/mixins/alertMixin';
+
+import router from '../../../../index';
+import PageHeader from '../../SettingsSubPageHeader';
+import AgentSelector from '../AgentSelector';
+
+export default {
+  components: {
+    Spinner,
+    PageHeader,
+    AgentSelector,
+  },
+  mixins: [alertMixin],
+
+  props: {
+    team: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations: {
+    selectedAgents: {
+      isEmpty() {
+        return !!this.selectedAgents.length;
+      },
+    },
+  },
+
+  data() {
+    return {
+      selectedAgents: [],
+      isCreating: false,
+    };
+  },
+
+  computed: {
+    ...mapGetters({
+      agentList: 'agents/getAgents',
+      uiFlags: 'teamMembers/getUIFlags',
+    }),
+
+    teamId() {
+      return this.$route.params.teamId;
+    },
+    headerTitle() {
+      return this.$t('TEAMS_SETTINGS.EDIT_FLOW.AGENTS.TITLE', {
+        teamName: this.currentTeam.name,
+      });
+    },
+    currentTeam() {
+      return this.$store.getters['teams/getTeam'](this.teamId);
+    },
+    teamMembers() {
+      return this.$store.getters['teamMembers/getTeamMembers'](this.teamId);
+    },
+    showAgentsList() {
+      const { id } = this.currentTeam;
+      return id && !this.uiFlags.isFetching;
+    },
+  },
+
+  async mounted() {
+    const { teamId } = this.$route.params;
+    this.$store.dispatch('agents/get');
+    try {
+      await this.$store.dispatch('teamMembers/get', {
+        teamId,
+      });
+      const members = this.teamMembers.map(item => item.id);
+      this.updateSelectedAgents(members);
+    } catch {
+      this.updateSelectedAgents([]);
+    }
+  },
+
+  methods: {
+    updateSelectedAgents(newAgentList) {
+      this.$v.selectedAgents.$touch();
+      this.selectedAgents = [...newAgentList];
+    },
+    async addAgents() {
+      this.isCreating = true;
+      const { teamId, selectedAgents } = this;
+
+      try {
+        await this.$store.dispatch('teamMembers/update', {
+          teamId,
+          agentsList: selectedAgents,
+        });
+        router.replace({
+          name: 'settings_teams_edit_finish',
+          params: {
+            page: 'edit',
+            teamId,
+          },
+        });
+      } catch (error) {
+        this.showAlert(error.message);
+      }
+      this.isCreating = false;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue
new file mode 100644
index 000000000..fc795fab6
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="wizard-body small-9 columns">
+    <page-header
+      :header-title="$t('TEAMS_SETTINGS.EDIT_FLOW.CREATE.TITLE')"
+      :header-content="$t('TEAMS_SETTINGS.EDIT_FLOW.CREATE.DESC')"
+    />
+    <div class="row channels">
+      <team-form
+        v-if="showTeamForm"
+        :on-submit="updateTeam"
+        :submit-in-progress="false"
+        :submit-button-text="$t('TEAMS_SETTINGS.EDIT_FLOW.CREATE.BUTTON_TEXT')"
+        :form-data="teamData"
+      />
+      <spinner v-else />
+    </div>
+  </div>
+</template>
+
+<script>
+import TeamForm from '../TeamForm';
+import router from '../../../../index';
+import PageHeader from '../../SettingsSubPageHeader';
+import alertMixin from 'shared/mixins/alertMixin';
+
+import { mapGetters } from 'vuex';
+import Spinner from 'shared/components/Spinner';
+
+export default {
+  components: {
+    TeamForm,
+    PageHeader,
+    Spinner,
+  },
+  mixins: [alertMixin],
+  data() {
+    return {
+      enabledFeatures: {},
+    };
+  },
+  computed: {
+    teamData() {
+      const { teamId } = this.$route.params;
+      return this.$store.getters['teams/getTeam'](teamId);
+    },
+    showTeamForm() {
+      const { id } = this.teamData;
+      return id && !this.uiFlags.isFetching;
+    },
+    ...mapGetters({
+      uiFlags: 'teams/getUIFlags',
+    }),
+  },
+  methods: {
+    async updateTeam(data) {
+      try {
+        const { teamId } = this.$route.params;
+
+        await this.$store.dispatch('teams/update', {
+          id: teamId,
+          ...data,
+        });
+
+        router.replace({
+          name: 'settings_teams_edit_members',
+          params: {
+            page: 'edit',
+            teamId,
+          },
+        });
+      } catch (error) {
+        this.showAlert(this.$t('TEAMS_SETTINGS.TEAM_FORM.ERROR_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
new file mode 100644
index 000000000..f85042003
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="row content-box full-height">
+    <woot-wizard class="small-3 columns" :items="items" />
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  computed: {
+    items() {
+      const data = this.$t('TEAMS_SETTINGS.EDIT_FLOW.WIZARD');
+      return data;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue
new file mode 100644
index 000000000..5290c369e
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="wizard-body columns content-box small-9">
+    <empty-state
+      :title="$t('TEAMS_SETTINGS.FINISH.TITLE')"
+      :message="$t('TEAMS_SETTINGS.FINISH.MESSAGE')"
+      :button-text="$t('TEAMS_SETTINGS.FINISH.BUTTON_TEXT')"
+    >
+      <div class="medium-12 columns text-center">
+        <router-link
+          class="button success nice"
+          :to="{
+            name: 'settings_teams_list',
+          }"
+        >
+          {{ $t('TEAMS_SETTINGS.FINISH.BUTTON_TEXT') }}
+        </router-link>
+      </div>
+    </empty-state>
+  </div>
+</template>
+
+<script>
+import EmptyState from '../../../../components/widgets/EmptyState';
+
+export default {
+  components: {
+    EmptyState,
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/variables';
+
+.website--code {
+  margin: $space-normal auto;
+  max-width: 70%;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
new file mode 100644
index 000000000..ac74ed1ae
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="column content-box">
+    <div class="row">
+      <div class="small-8 columns">
+        <p v-if="!teamsList.length" class="no-items-error-message">
+          {{ $t('TEAMS_SETTINGS.LIST.404') }}
+          <router-link
+            v-if="isAdmin"
+            :to="addAccountScoping('settings/teams/new')"
+          >
+            {{ $t('TEAMS_SETTINGS.NEW_TEAM') }}
+          </router-link>
+        </p>
+
+        <table v-if="teamsList.length" class="woot-table">
+          <tbody>
+            <tr v-for="item in teamsList" :key="item.id">
+              <td>
+                <span class="agent-name">{{ item.name }}</span>
+                <p>{{ item.description }}</p>
+              </td>
+
+              <td>
+                <div class="button-wrapper">
+                  <router-link
+                    :to="addAccountScoping(`settings/teams/${item.id}/edit`)"
+                  >
+                    <woot-submit-button
+                      v-if="isAdmin"
+                      :button-text="$t('TEAMS_SETTINGS.LIST.EDIT_TEAM')"
+                      icon-class="ion-gear-b"
+                      button-class="link hollow grey-btn"
+                    />
+                  </router-link>
+
+                  <woot-submit-button
+                    v-if="isAdmin"
+                    :button-text="$t('TEAMS_SETTINGS.DELETE.BUTTON_TEXT')"
+                    :loading="loading[item.id]"
+                    icon-class="ion-close-circled"
+                    button-class="link hollow grey-btn"
+                    @click="openDelete(item)"
+                  />
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div class="small-4 columns">
+        <span
+          v-html="
+            $t('TEAMS_SETTINGS.SIDEBAR_TXT', {
+              installationName: globalConfig.installationName,
+            })
+          "
+        />
+      </div>
+    </div>
+
+    <woot-delete-modal
+      :show.sync="showDeletePopup"
+      :on-close="closeDelete"
+      :on-confirm="confirmDeletion"
+      :title="deleteTitle"
+      :message="$t('TEAMS_SETTINGS.DELETE.CONFIRM.MESSAGE')"
+      :confirm-text="deleteConfirmText"
+      :reject-text="deleteRejectText"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import adminMixin from '../../../../mixins/isAdmin';
+import accountMixin from '../../../../mixins/account';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {},
+  mixins: [adminMixin, accountMixin, alertMixin],
+  data() {
+    return {
+      loading: {},
+      showSettings: false,
+      showDeletePopup: false,
+      selectedTeam: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      teamsList: 'teams/getTeams',
+      globalConfig: 'globalConfig/get',
+    }),
+    deleteConfirmText() {
+      return `${this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.YES')} ${
+        this.selectedTeam.name
+      }`;
+    },
+    deleteRejectText() {
+      return this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.NO');
+    },
+    deleteTitle() {
+      return this.$t('TEAMS_SETTINGS.DELETE.CONFIRM.TITLE', {
+        teamName: this.selectedTeam.name,
+      });
+    },
+  },
+  methods: {
+    async deleteTeam({ id }) {
+      try {
+        await this.$store.dispatch('teams/delete', id);
+        this.showAlert(this.$t('TEAMS_SETTINGS.DELETE.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('TEAMS_SETTINGS.DELETE.API.ERROR_MESSAGE'));
+      }
+    },
+
+    confirmDeletion() {
+      this.deleteTeam(this.selectedTeam);
+      this.closeDelete();
+    },
+    openDelete(team) {
+      this.showDeletePopup = true;
+      this.selectedTeam = team;
+    },
+    closeDelete() {
+      this.showDeletePopup = false;
+      this.selectedTeam = {};
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.button-wrapper {
+  min-width: unset;
+  justify-content: flex-end;
+  padding-right: var(--space-large);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue
new file mode 100644
index 000000000..7f388c734
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="row">
+    <div class="small-12 medium-8 columns">
+      <form class="row" @submit.prevent="handleSubmit">
+        <woot-input
+          v-model.trim="title"
+          :class="{ error: $v.title.$error }"
+          class="medium-12 columns"
+          :label="$t('TEAMS_SETTINGS.FORM.NAME.LABEL')"
+          :placeholder="$t('TEAMS_SETTINGS.FORM.NAME.PLACEHOLDER')"
+          @input="$v.title.$touch"
+        />
+
+        <woot-input
+          v-model.trim="description"
+          :class="{ error: $v.description.$error }"
+          class="medium-12 columns"
+          :label="$t('TEAMS_SETTINGS.FORM.DESCRIPTION.LABEL')"
+          :placeholder="$t('TEAMS_SETTINGS.FORM.DESCRIPTION.PLACEHOLDER')"
+          @input="$v.description.$touch"
+        />
+
+        <div class="medium-12">
+          <input v-model="allowAutoAssign" type="checkbox" :value="true" />
+          <label for="conversation_creation">
+            {{ $t('TEAMS_SETTINGS.FORM.AUTO_ASSIGN.LABEL') }}
+          </label>
+        </div>
+        <div class="modal-footer">
+          <div class="medium-12 columns">
+            <woot-submit-button
+              :disabled="$v.title.$invalid || submitInProgress"
+              :button-text="submitButtonText"
+              :loading="submitInProgress"
+            />
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import validations from './helpers/validations';
+
+export default {
+  components: {
+    WootSubmitButton,
+  },
+
+  props: {
+    onSubmit: {
+      type: Function,
+      default: () => {},
+    },
+    submitInProgress: {
+      type: Boolean,
+      default: false,
+    },
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+    submitButtonText: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    const formData = this.formData || {};
+    const {
+      description = '',
+      name: title = '',
+      allow_auto_assign: allowAutoAssign = true,
+    } = formData;
+
+    return {
+      description,
+      title,
+      allowAutoAssign,
+    };
+  },
+  validations,
+  methods: {
+    handleSubmit() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        return;
+      }
+      this.onSubmit({
+        description: this.description,
+        name: this.title,
+        allow_auto_assign: this.allowAutoAssign,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/helpers/validations.js b/app/javascript/dashboard/routes/dashboard/settings/teams/helpers/validations.js
new file mode 100644
index 000000000..3f063a0c4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/helpers/validations.js
@@ -0,0 +1,10 @@
+import { required, minLength } from 'vuelidate/lib/validators';
+
+export default {
+  title: {
+    required,
+    minLength: minLength(2),
+  },
+  description: {},
+  showOnSidebar: {},
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/teams.routes.js b/app/javascript/dashboard/routes/dashboard/settings/teams/teams.routes.js
new file mode 100644
index 000000000..95429bd46
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/teams.routes.js
@@ -0,0 +1,91 @@
+/* eslint arrow-body-style: 0 */
+import SettingsContent from '../Wrapper';
+import TeamsHome from './Index';
+import CreateStepWrap from './Create/Index';
+import EditStepWrap from './Edit/Index';
+import CreateTeam from './Create/CreateTeam';
+import EditTeam from './Edit/EditTeam';
+import AddAgents from './Create/AddAgents';
+import EditAgents from './Edit/EditAgents';
+import FinishSetup from './FinishSetup';
+import { frontendURL } from '../../../../helper/URLHelper';
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/teams'),
+      component: SettingsContent,
+      props: params => {
+        const showBackButton = params.name !== 'settings_teams_list';
+        return {
+          headerTitle: 'TEAMS_SETTINGS.HEADER',
+          headerButtonText: 'TEAMS_SETTINGS.NEW_TEAM',
+          icon: 'ion-ios-people',
+          newButtonRoutes: ['settings_teams_new'],
+          showBackButton,
+        };
+      },
+      children: [
+        {
+          path: '',
+          name: 'settings_teams',
+          redirect: 'list',
+        },
+        {
+          path: 'list',
+          name: 'settings_teams_list',
+          component: TeamsHome,
+          roles: ['administrator'],
+        },
+        {
+          path: 'new',
+          component: CreateStepWrap,
+          children: [
+            {
+              path: '',
+              name: 'settings_teams_new',
+              component: CreateTeam,
+              roles: ['administrator'],
+            },
+            {
+              path: ':teamId/finish',
+              name: 'settings_teams_finish',
+              component: FinishSetup,
+              roles: ['administrator'],
+            },
+            {
+              path: ':teamId/agents',
+              name: 'settings_teams_add_agents',
+              roles: ['administrator'],
+              component: AddAgents,
+            },
+          ],
+        },
+        {
+          path: ':teamId/edit',
+          component: EditStepWrap,
+          children: [
+            {
+              path: '',
+              name: 'settings_teams_edit',
+              component: EditTeam,
+              roles: ['administrator'],
+            },
+            {
+              path: 'agents',
+              name: 'settings_teams_edit_members',
+              component: EditAgents,
+              roles: ['administrator'],
+            },
+            {
+              path: 'finish',
+              name: 'settings_teams_edit_finish',
+              roles: ['administrator'],
+              component: FinishSetup,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index fd16a8de6..039b69d2c 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -1,4 +1,7 @@
-import { DuplicateContactException } from 'shared/helpers/CustomErrors';
+import {
+  DuplicateContactException,
+  ExceptionWithMessage,
+} from 'shared/helpers/CustomErrors';
 import types from '../../mutation-types';
 import ContactAPI from '../../../api/contacts';
 
@@ -64,6 +67,22 @@ export const actions = {
     }
   },
 
+  create: async ({ commit }, userObject) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isCreating: true });
+    try {
+      const response = await ContactAPI.create(userObject);
+      commit(types.SET_CONTACT_ITEM, response.data.payload.contact);
+      commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
+      if (error.response?.data?.message) {
+        throw new ExceptionWithMessage(error.response.data.message);
+      } else {
+        throw new Error(error);
+      }
+    }
+  },
+
   updatePresence: ({ commit }, data) => {
     commit(types.UPDATE_CONTACTS_PRESENCE, data);
   },
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 88ca6d710..8e4e20954 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -103,18 +103,38 @@ const actions = {
     }
   },
 
-  assignAgent: async ({ commit }, { conversationId, agentId }) => {
+  assignAgent: async ({ dispatch }, { conversationId, agentId }) => {
     try {
       const response = await ConversationApi.assignAgent({
         conversationId,
         agentId,
       });
-      commit(types.default.ASSIGN_AGENT, response.data);
+      dispatch('setCurrentChatAssignee', response.data);
     } catch (error) {
       // Handle error
     }
   },
 
+  setCurrentChatAssignee({ commit }, assignee) {
+    commit(types.default.ASSIGN_AGENT, assignee);
+  },
+
+  assignTeam: async ({ dispatch }, { conversationId, teamId }) => {
+    try {
+      const response = await ConversationApi.assignTeam({
+        conversationId,
+        teamId,
+      });
+      dispatch('setCurrentChatTeam', response.data);
+    } catch (error) {
+      // Handle error
+    }
+  },
+
+  setCurrentChatTeam({ commit }, team) {
+    commit(types.default.ASSIGN_TEAM, team);
+  },
+
   toggleStatus: async ({ commit }, data) => {
     try {
       const response = await ConversationApi.toggleStatus(data);
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index ae9945bf3..d9721b4fc 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -61,7 +61,12 @@ export const mutations = {
 
   [types.default.ASSIGN_AGENT](_state, assignee) {
     const [chat] = getSelectedChatConversation(_state);
-    chat.meta.assignee = assignee;
+    Vue.set(chat.meta, 'assignee', assignee);
+  },
+
+  [types.default.ASSIGN_TEAM](_state, team) {
+    const [chat] = getSelectedChatConversation(_state);
+    Vue.set(chat.meta, 'team', team);
   },
 
   [types.default.RESOLVE_CONVERSATION](_state, status) {
@@ -145,7 +150,7 @@ export const mutations = {
   // Update assignee on action cable message
   [types.default.UPDATE_ASSIGNEE](_state, payload) {
     const [chat] = _state.allConversations.filter(c => c.id === payload.id);
-    chat.meta.assignee = payload.assignee;
+    Vue.set(chat.meta, 'assignee', payload.assignee);
   },
 
   [types.default.UPDATE_CONVERSATION_CONTACT](
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 70e937b8b..4bc8b6723 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -2,7 +2,10 @@ import axios from 'axios';
 import Contacts from '../../contacts';
 import types from '../../../mutation-types';
 import contactList from './fixtures';
-import { DuplicateContactException } from '../../../../../shared/helpers/CustomErrors';
+import {
+  DuplicateContactException,
+  ExceptionWithMessage,
+} from '../../../../../shared/helpers/CustomErrors';
 
 const { actions } = Contacts;
 
@@ -95,6 +98,47 @@ describe('#actions', () => {
     });
   });
 
+  describe('#create', () => {
+    it('sends correct mutations if API is success', async () => {
+      axios.post.mockResolvedValue({
+        data: { payload: { contact: contactList[0] } },
+      });
+      await actions.create({ commit }, contactList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isCreating: true }],
+        [types.SET_CONTACT_ITEM, contactList[0]],
+        [types.SET_CONTACT_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.create({ commit }, contactList[0])).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isCreating: true }],
+        [types.SET_CONTACT_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+
+    it('sends correct actions if email is already present', async () => {
+      axios.post.mockRejectedValue({
+        response: {
+          data: {
+            message: 'Email exists already',
+          },
+        },
+      });
+      await expect(actions.create({ commit }, contactList[0])).rejects.toThrow(
+        ExceptionWithMessage
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONTACT_UI_FLAG, { isCreating: true }],
+        [types.SET_CONTACT_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
   describe('#setContact', () => {
     it('returns correct mutations', () => {
       const data = { id: 1, name: 'john doe', availability_status: 'online' };
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index 666f5fa4b..a4e59f5c3 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -189,4 +189,52 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([]);
     });
   });
+
+  describe('#assignAgent', () => {
+    it('sends correct mutations if assignment is successful', async () => {
+      axios.post.mockResolvedValue({
+        data: { id: 1, name: 'User' },
+      });
+      await actions.assignAgent({ commit }, { conversationId: 1, agentId: 1 });
+      expect(commit).toHaveBeenCalledTimes(0);
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
+
+  describe('#setCurrentChatAssignee', () => {
+    it('sends correct mutations if assignment is successful', async () => {
+      axios.post.mockResolvedValue({
+        data: { id: 1, name: 'User' },
+      });
+      await actions.setCurrentChatAssignee({ commit }, { id: 1, name: 'User' });
+      expect(commit).toHaveBeenCalledTimes(1);
+      expect(commit.mock.calls).toEqual([
+        ['ASSIGN_AGENT', { id: 1, name: 'User' }],
+      ]);
+    });
+  });
+
+  describe('#assignTeam', () => {
+    it('sends correct mutations if assignment is successful', async () => {
+      axios.post.mockResolvedValue({
+        data: { id: 1, name: 'Team' },
+      });
+      await actions.assignTeam({ commit }, { conversationId: 1, teamId: 1 });
+      expect(commit).toHaveBeenCalledTimes(0);
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
+
+  describe('#setCurrentChatTeam', () => {
+    it('sends correct mutations if assignment is successful', async () => {
+      axios.post.mockResolvedValue({
+        data: { id: 1, name: 'Team' },
+      });
+      await actions.setCurrentChatTeam({ commit }, { id: 1, name: 'Team' });
+      expect(commit).toHaveBeenCalledTimes(1);
+      expect(commit.mock.calls).toEqual([
+        ['ASSIGN_TEAM', { id: 1, name: 'Team' }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/teamMembers/actions.spec.js b/app/javascript/dashboard/store/modules/specs/teamMembers/actions.spec.js
index 07cb244a9..d293a19eb 100644
--- a/app/javascript/dashboard/store/modules/specs/teamMembers/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/teamMembers/actions.spec.js
@@ -56,4 +56,27 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: teamMembers });
+      await actions.update({ commit }, { agentsList: teamMembers, teamId: 1 });
+
+      expect(commit.mock.calls).toEqual([
+        [SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: true }],
+        [ADD_AGENTS_TO_TEAM, { data: teamMembers }],
+        [SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.update({ commit }, { agentsList: teamMembers, teamId: 1 })
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: true }],
+        [SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js b/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js
index 855322105..8c11fb3a7 100644
--- a/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js
@@ -60,7 +60,7 @@ describe('#actions', () => {
 
   describe('#update', () => {
     it('sends correct actions if API is success', async () => {
-      axios.patch.mockResolvedValue({ data: { payload: teamsList[1] } });
+      axios.patch.mockResolvedValue({ data: teamsList[1] });
       await actions.update({ commit }, teamsList[1]);
 
       expect(commit.mock.calls).toEqual([
diff --git a/app/javascript/dashboard/store/modules/teamMembers.js b/app/javascript/dashboard/store/modules/teamMembers.js
index 581cac4f8..d93df1793 100644
--- a/app/javascript/dashboard/store/modules/teamMembers.js
+++ b/app/javascript/dashboard/store/modules/teamMembers.js
@@ -46,6 +46,20 @@ export const actions = {
       commit(SET_TEAM_MEMBERS_UI_FLAG, { isCreating: false });
     }
   },
+  update: async ({ commit }, { agentsList, teamId }) => {
+    commit(SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await TeamsAPI.updateAgents({
+        agentsList,
+        teamId,
+      });
+      commit(ADD_AGENTS_TO_TEAM, response);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(SET_TEAM_MEMBERS_UI_FLAG, { isUpdating: false });
+    }
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/teams/actions.js b/app/javascript/dashboard/store/modules/teams/actions.js
index 39bc38df2..be6b842e2 100644
--- a/app/javascript/dashboard/store/modules/teams/actions.js
+++ b/app/javascript/dashboard/store/modules/teams/actions.js
@@ -56,7 +56,7 @@ export const actions = {
     commit(SET_TEAM_UI_FLAG, { isUpdating: true });
     try {
       const response = await TeamsAPI.update(id, updateObj);
-      commit(EDIT_TEAM, response.data.payload);
+      commit(EDIT_TEAM, response.data);
     } catch (error) {
       throw new Error(error);
     } finally {
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 433c4c6b0..355058cba 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -28,6 +28,7 @@ export default {
   MUTE_CONVERSATION: 'MUTE_CONVERSATION',
   UNMUTE_CONVERSATION: 'UNMUTE_CONVERSATION',
   ASSIGN_AGENT: 'ASSIGN_AGENT',
+  ASSIGN_TEAM: 'ASSIGN_TEAM',
   SET_CHAT_META: 'SET_CHAT_META',
   ADD_MESSAGE: 'ADD_MESSAGE',
   ADD_PENDING_MESSAGE: 'ADD_PENDING_MESSAGE',
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index f8f45624c..b7abc18c2 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -20,6 +20,7 @@ import App from '../dashboard/App';
 import i18n from '../dashboard/i18n';
 import createAxios from '../dashboard/helper/APIHelper';
 import commonHelpers from '../dashboard/helper/commons';
+import { getAlertAudio } from '../shared/helpers/AudioNotificationHelper';
 import router from '../dashboard/routes';
 import store from '../dashboard/store';
 import vueActionCable from '../dashboard/helper/actionCable';
@@ -29,6 +30,7 @@ import {
   registerSubscription,
 } from '../dashboard/helper/pushHelper';
 import * as Sentry from '@sentry/vue';
+import 'vue-easytable/libs/theme-default/index.css';
 
 Vue.config.env = process.env;
 
@@ -69,7 +71,6 @@ window.onload = () => {
   }).$mount('#app');
   vueActionCable.init();
 };
-
 window.addEventListener('load', () => {
   verifyServiceWorkerExistence(registration =>
     registration.pushManager.getSubscription().then(subscription => {
@@ -78,4 +79,5 @@ window.addEventListener('load', () => {
       }
     })
   );
+  getAlertAudio();
 });
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 7094ef67c..037333888 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -79,4 +79,11 @@
 
   --color-background: #f4f6fb;
   --color-background-light: #f9fafc;
+
+	// Social and inboxes brand colors
+	--color-facebook-brand: #3b5998;
+	--color-twitter-brand: #1da1f2;
+	--color-whatsapp-brand: #25d366;
+	--color-sms-twilio: #f42f46;
+	--color-cloud-generic: #18b7b0;
 }
diff --git a/app/javascript/shared/helpers/AudioNotificationHelper.js b/app/javascript/shared/helpers/AudioNotificationHelper.js
index ee9899bf4..90d3bcdaa 100644
--- a/app/javascript/shared/helpers/AudioNotificationHelper.js
+++ b/app/javascript/shared/helpers/AudioNotificationHelper.js
@@ -1,9 +1,78 @@
+import { MESSAGE_TYPE } from 'shared/constants/messages';
 const notificationAudio = require('shared/assets/audio/ding.mp3');
+import axios from 'axios';
 
 export const playNotificationAudio = () => {
   try {
     new Audio(notificationAudio).play();
   } catch (error) {
-    console.log(error);
+    // error
+  }
+};
+
+export const getAlertAudio = async () => {
+  window.playAudioAlert = () => {};
+  const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+  const playsound = audioBuffer => {
+    window.playAudioAlert = () => {
+      const source = audioCtx.createBufferSource();
+      source.buffer = audioBuffer;
+      source.connect(audioCtx.destination);
+      source.loop = false;
+      source.start();
+    };
+  };
+
+  try {
+    const response = await axios.get('/dashboard/audios/ding.mp3', {
+      responseType: 'arraybuffer',
+    });
+
+    audioCtx.decodeAudioData(response.data).then(playsound);
+  } catch (error) {
+    // error
+  }
+};
+
+export const shouldPlayAudio = (
+  message,
+  conversationId,
+  userId,
+  isDocHiddden
+) => {
+  const {
+    conversation_id: incomingConvId,
+    sender_id: senderId,
+    message_type: messageType,
+    private: isPrivate,
+  } = message;
+  const isFromCurrentUser = userId === senderId;
+
+  const playAudio =
+    !isFromCurrentUser && (messageType === MESSAGE_TYPE.INCOMING || isPrivate);
+
+  if (isDocHiddden) return playAudio;
+  if (conversationId !== incomingConvId) return playAudio;
+  return false;
+};
+
+export const newMessageNotification = data => {
+  const { conversation_id: currentConvId } = window.WOOT.$route.params;
+  const currentUserId = window.WOOT.$store.getters.getCurrentUserID;
+  const isDocHiddden = document.hidden;
+
+  const {
+    enable_audio_alerts: enableAudioAlerts = false,
+  } = window.WOOT.$store.getters.getUISettings;
+
+  const playAudio = shouldPlayAudio(
+    data,
+    currentConvId,
+    currentUserId,
+    isDocHiddden
+  );
+
+  if (enableAudioAlerts && playAudio) {
+    window.playAudioAlert();
   }
 };
diff --git a/app/javascript/shared/helpers/CustomErrors.js b/app/javascript/shared/helpers/CustomErrors.js
index b9e74e917..4f31eb291 100644
--- a/app/javascript/shared/helpers/CustomErrors.js
+++ b/app/javascript/shared/helpers/CustomErrors.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 export class DuplicateContactException extends Error {
   constructor(data) {
     super('DUPLICATE_CONTACT');
@@ -5,3 +6,10 @@ export class DuplicateContactException extends Error {
     this.name = 'DuplicateContactException';
   }
 }
+export class ExceptionWithMessage extends Error {
+  constructor(data) {
+    super('ERROR_WITH_MESSAGE');
+    this.data = data;
+    this.name = 'ExceptionWithMessage';
+  }
+}
diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
index c137cee76..6adc36951 100644
--- a/app/javascript/shared/helpers/DateHelper.js
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -2,6 +2,7 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 import isToday from 'date-fns/isToday';
 import isYesterday from 'date-fns/isYesterday';
+import parseISO from 'date-fns/parseISO';
 
 export const formatUnixDate = (date, dateFormat = 'MMM dd, yyyy') => {
   const unixDate = fromUnixTime(date);
@@ -14,3 +15,15 @@ export const formatDate = ({ date, todayText, yesterdayText }) => {
   if (isYesterday(dateValue)) return yesterdayText;
   return date;
 };
+
+export const formatDigitToString = val => {
+  return val > 9 ? `${val}` : `0${val}`;
+};
+
+export const buildDateFromTime = (hr, min, utcOffset, date = new Date()) => {
+  const today = format(date, 'yyyy-MM-dd');
+  const hour = formatDigitToString(hr);
+  const minute = formatDigitToString(min);
+  const timeString = `${today}T${hour}:${minute}:00${utcOffset}`;
+  return parseISO(timeString);
+};
diff --git a/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js b/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js
new file mode 100644
index 000000000..8d2b0f2fe
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js
@@ -0,0 +1,109 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { shouldPlayAudio } from '../AudioNotificationHelper';
+
+describe('shouldPlayAudio', () => {
+  describe('Document active', () => {
+    it('Retuns true if incoming message', () => {
+      const message = {
+        conversation_id: 10,
+        sender_id: 5,
+        message_type: 0,
+        private: false,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, false];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(true);
+    });
+    it('Retuns false if outgoing message', () => {
+      const message = {
+        conversation_id: 10,
+        sender_id: 5,
+        message_type: 1,
+        private: false,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, false];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(false);
+    });
+
+    it('Retuns false if from Same sender', () => {
+      const message = {
+        conversation_id: 1,
+        sender_id: 2,
+        message_type: 0,
+        private: false,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, true];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(false);
+    });
+    it('Retuns true if private message from another agent', () => {
+      const message = {
+        conversation_id: 1,
+        sender_id: 5,
+        message_type: 1,
+        private: true,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, true];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(true);
+    });
+  });
+  describe('Document inactive', () => {
+    it('Retuns true if incoming message', () => {
+      const message = {
+        conversation_id: 1,
+        sender_id: 5,
+        message_type: 0,
+        private: false,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, true];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(true);
+    });
+    it('Retuns false if outgoing message', () => {
+      const message = {
+        conversation_id: 1,
+        sender_id: 5,
+        message_type: 1,
+        private: false,
+      };
+      const [conversationId, userId, isDocHiddden] = [1, 2, true];
+      const result = shouldPlayAudio(
+        message,
+        conversationId,
+        userId,
+        isDocHiddden
+      );
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/app/javascript/shared/helpers/specs/DateHelper.spec.js b/app/javascript/shared/helpers/specs/DateHelper.spec.js
index c89bb3ef1..283950ed1 100644
--- a/app/javascript/shared/helpers/specs/DateHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/DateHelper.spec.js
@@ -1,4 +1,9 @@
-import { formatDate, formatUnixDate } from '../DateHelper';
+import {
+  formatDate,
+  formatUnixDate,
+  buildDateFromTime,
+  formatDigitToString,
+} from '../DateHelper';
 
 describe('#DateHelper', () => {
   it('should format unix date correctly without dateFormat', () => {
@@ -39,4 +44,27 @@ describe('#DateHelper', () => {
       })
     ).toEqual('Yesterday');
   });
+
+  describe('#buildDate', () => {
+    it('returns correctly parsed date', () => {
+      const date = new Date();
+      date.setFullYear(2021);
+      date.setMonth(2);
+      date.setDate(5);
+
+      const result = buildDateFromTime(12, 15, '.465Z', date);
+      expect(result + '').toEqual(
+        'Fri Mar 05 2021 12:15:00 GMT+0000 (Coordinated Universal Time)'
+      );
+    });
+  });
+
+  describe('#formatDigitToString', () => {
+    it('returns date compatabile string from number is less than 9', () => {
+      expect(formatDigitToString(8)).toEqual('08');
+    });
+    it('returns date compatabile string from number is greater than 9', () => {
+      expect(formatDigitToString(11)).toEqual('11');
+    });
+  });
 });
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 1d860e76c..48e89096d 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -13,7 +13,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import { setHeader } from 'widget/helpers/axios';
-import { IFrameHelper } from 'widget/helpers/utils';
+import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 
 import Router from './views/Router';
 import { getLocale } from './helpers/urlParamsHelper';
@@ -45,6 +45,9 @@ export default {
     isIFrame() {
       return IFrameHelper.isIFrame();
     },
+    isRNWebView() {
+      return RNHelper.isRNWebView();
+    },
   },
   mounted() {
     const { websiteToken, locale } = window.chatwootWebChannel;
@@ -59,6 +62,10 @@ export default {
       this.fetchAvailableAgents(websiteToken);
       this.setLocale(getLocale(window.location.search));
     }
+    if (this.isRNWebView) {
+      this.registerListeners();
+      this.sendRNWebViewLoadedEvent();
+    }
     this.$store.dispatch('conversationAttributes/get');
     this.setWidgetColor(window.chatwootWebChannel);
     this.registerUnreadEvents();
@@ -186,6 +193,15 @@ export default {
         },
       });
     },
+    sendRNWebViewLoadedEvent() {
+      RNHelper.sendMessage({
+        event: 'loaded',
+        config: {
+          authToken: window.authToken,
+          channelConfig: window.chatwootWebChannel,
+        },
+      });
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index 9bc830edc..c075222d5 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -13,13 +13,13 @@
           <div
             :class="
               `status-view--badge rounded-full leading-4 ${
-                availableAgents.length ? 'bg-green-500' : 'hidden'
+                isOnline ? 'bg-green-500' : 'hidden'
               }`
             "
           />
         </div>
         <div class="text-xs mt-1 text-black-700">
-          {{ replyTimeStatus }}
+          {{ replyWaitMeessage }}
         </div>
       </div>
     </div>
@@ -30,15 +30,14 @@
 <script>
 import { mapGetters } from 'vuex';
 import HeaderActions from './HeaderActions';
-import configMixin from 'widget/mixins/configMixin';
-import teamAvailabilityMixin from 'widget/mixins/teamAvailabilityMixin';
+import availabilityMixin from 'widget/mixins/availability';
 
 export default {
   name: 'ChatHeader',
   components: {
     HeaderActions,
   },
-  mixins: [configMixin, teamAvailabilityMixin],
+  mixins: [availabilityMixin],
   props: {
     avatarUrl: {
       type: String,
@@ -61,6 +60,20 @@ export default {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
     }),
+    isOnline() {
+      const { workingHoursEnabled } = this.channelConfig;
+      const anyAgentOnline = this.availableAgents.length > 0;
+
+      if (workingHoursEnabled) {
+        return this.isInBetweenTheWorkingHours;
+      }
+      return anyAgentOnline;
+    },
+    replyWaitMeessage() {
+      return this.isOnline
+        ? this.replyTimeStatus
+        : this.$t('TEAM_AVAILABILITY.OFFLINE');
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/HeaderActions.vue b/app/javascript/widget/components/HeaderActions.vue
index 67695f9c0..16ba53a37 100644
--- a/app/javascript/widget/components/HeaderActions.vue
+++ b/app/javascript/widget/components/HeaderActions.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isIframe" class="actions flex items-center">
+  <div v-if="showHeaderActions" class="actions flex items-center">
     <button
       v-if="showPopoutButton"
       class="button transparent compact new-window--button"
@@ -7,13 +7,18 @@
     >
       <span class="ion-android-open"></span>
     </button>
-    <button class="button transparent compact close-button">
+    <button
+      class="button transparent compact close-button"
+      :class="{
+        'rn-close-button': isRNWebView,
+      }"
+    >
       <span class="ion-android-close" @click="closeWindow"></span>
     </button>
   </div>
 </template>
 <script>
-import { IFrameHelper } from 'widget/helpers/utils';
+import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import { buildPopoutURL } from '../helpers/urlParamsHelper';
 
 export default {
@@ -28,6 +33,12 @@ export default {
     isIframe() {
       return IFrameHelper.isIFrame();
     },
+    isRNWebView() {
+      return RNHelper.isRNWebView();
+    },
+    showHeaderActions() {
+      return this.isIframe || this.isRNWebView;
+    },
   },
   methods: {
     popoutWindow() {
@@ -56,6 +67,8 @@ export default {
         IFrameHelper.sendMessage({
           event: 'toggleBubble',
         });
+      } else if (RNHelper.isRNWebView) {
+        RNHelper.sendMessage({ type: 'close-widget' });
       }
     },
   },
@@ -81,5 +94,8 @@ export default {
   .close-button {
     display: none;
   }
+  .rn-close-button {
+    display: block !important;
+  }
 }
 </style>
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 8871bc7da..6c314a1dc 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -85,7 +85,7 @@ export default {
     const messageValidation = {
       message: {
         required,
-        minLength: minLength(10),
+        minLength: minLength(1),
       },
     };
     if (this.options.requireEmail) {
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index 3124cc963..0460161c4 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -3,13 +3,17 @@
     <div class="flex items-center justify-between mb-4">
       <div class="text-black-700">
         <div class="text-base leading-5 font-medium mb-1">
-          {{ teamAvailabilityStatus }}
+          {{
+            isOnline
+              ? $t('TEAM_AVAILABILITY.ONLINE')
+              : $t('TEAM_AVAILABILITY.OFFLINE')
+          }}
         </div>
         <div class="text-xs leading-4 mt-1">
-          {{ replyTimeStatus }}
+          {{ replyWaitMeessage }}
         </div>
       </div>
-      <available-agents :agents="availableAgents" />
+      <available-agents v-if="isOnline" :agents="availableAgents" />
     </div>
     <woot-button
       class="font-medium"
@@ -29,7 +33,7 @@ import AvailableAgents from 'widget/components/AvailableAgents.vue';
 import { getContrastingTextColor } from 'shared/helpers/ColorHelper';
 import WootButton from 'shared/components/Button';
 import configMixin from 'widget/mixins/configMixin';
-import teamAvailabilityMixin from 'widget/mixins/teamAvailabilityMixin';
+import availabilityMixin from 'widget/mixins/availability';
 
 export default {
   name: 'TeamAvailability',
@@ -37,7 +41,7 @@ export default {
     AvailableAgents,
     WootButton,
   },
-  mixins: [configMixin, teamAvailabilityMixin],
+  mixins: [configMixin, availabilityMixin],
   props: {
     availableAgents: {
       type: Array,
@@ -49,6 +53,26 @@ export default {
     textColor() {
       return getContrastingTextColor(this.widgetColor);
     },
+    isOnline() {
+      const { workingHoursEnabled } = this.channelConfig;
+      const anyAgentOnline = this.availableAgents.length > 0;
+
+      if (workingHoursEnabled) {
+        return this.isInBetweenTheWorkingHours;
+      }
+      return anyAgentOnline;
+    },
+    replyWaitMeessage() {
+      const { workingHoursEnabled } = this.channelConfig;
+
+      if (this.isOnline) {
+        return this.replyTimeStatus;
+      }
+      if (workingHoursEnabled) {
+        return this.outOfOfficeMessage;
+      }
+      return this.$t('TEAM_AVAILABILITY.OFFLINE');
+    },
   },
   methods: {
     startConversation() {
diff --git a/app/javascript/widget/helpers/utils.js b/app/javascript/widget/helpers/utils.js
index 315760696..eadfdc128 100755
--- a/app/javascript/widget/helpers/utils.js
+++ b/app/javascript/widget/helpers/utils.js
@@ -26,3 +26,11 @@ export const IFrameHelper = {
   },
   getMessage: e => JSON.parse(e.data.replace(WOOT_PREFIX, '')),
 };
+export const RNHelper = {
+  isRNWebView: () => window.ReactNativeWebView,
+  sendMessage: msg => {
+    window.ReactNativeWebView.postMessage(
+      `chatwoot-widget:${JSON.stringify({ ...msg })}`
+    );
+  },
+};
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 32f2ba37d..010f3f471 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "الرجاء إدخال بريدك الإلكتروني",
   "CHAT_PLACEHOLDER": "أكتب رسالتك",
   "TODAY": "اليوم",
-  "YESTERDAY": "الأمس"
+  "YESTERDAY": "الأمس",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "الاسم الكامل",
+        "PLACEHOLDER": "الرجاء إدخال اسمك الكامل",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "عنوان البريد الإلكتروني",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index d94a62524..bf71645f3 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Introduïu el correu electrònic",
   "CHAT_PLACEHOLDER": "Escriu el missatge",
   "TODAY": "Avui",
-  "YESTERDAY": "Ahir"
+  "YESTERDAY": "Ahir",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nom complet",
+        "PLACEHOLDER": "Introdueix el vostre nom complet",
+        "ERROR": "El Nom Complert és obligatori"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Adreça de correu electrònic",
+        "PLACEHOLDER": "Si us plau, introdueix la teva adreça email",
+        "ERROR": "Adreça email invàlida"
+      },
+      "MESSAGE": {
+        "LABEL": "Missatge",
+        "PLACEHOLDER": "Si us plau, introdueix el teu missatge",
+        "ERROR": "Missatge massa curt"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index b5595ad5f..dc717febf 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Prosím, zadejte svůj e-mail",
   "CHAT_PLACEHOLDER": "Zde začněte psát",
   "TODAY": "Dnes",
-  "YESTERDAY": "Včera"
+  "YESTERDAY": "Včera",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Celé jméno",
+        "PLACEHOLDER": "Zadejte své celé jméno",
+        "ERROR": "Je vyžadováno celé jméno"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-mailová adresa",
+        "PLACEHOLDER": "Zadejte prosím Váš e-mail",
+        "ERROR": "Neplatná e-mailová adresa"
+      },
+      "MESSAGE": {
+        "LABEL": "Zpráva",
+        "PLACEHOLDER": "Zadejte prosím Vaši zprávu",
+        "ERROR": "Zpráva je příliš krátká"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 35f10eb49..8e28799d3 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Indtast venligst din e-mail",
   "CHAT_PLACEHOLDER": "Skriv din besked",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Fulde Navn",
+        "PLACEHOLDER": "Indtast venligst dit fulde navn",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-Mail Adresse",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index a4f015d9c..b3bddba3c 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Bitte geben Sie ihre E-Mail-Adresse ein",
   "CHAT_PLACEHOLDER": "Schreiben Sie Ihre Nachricht",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Vollständiger Name",
+        "PLACEHOLDER": "Bitte geben Sie Ihren Namen ein, dies wird in Gesprächen angezeigt",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-Mail-Addresse",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index ab66f4c6e..fe563fb9b 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Παρακαλώ εισάγετε το email σας",
   "CHAT_PLACEHOLDER": "Πληκτρολογήστε το μήνυμά σας",
   "TODAY": "Σήμερα",
-  "YESTERDAY": "Χτες"
+  "YESTERDAY": "Χτες",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Πλήρες Όνομα",
+        "PLACEHOLDER": "Παρακαλώ συμπληρώστε το πλήρες όνομα σας",
+        "ERROR": "Απαιτείται πλήρες όνομα"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Διεύθυνση Email",
+        "PLACEHOLDER": "Παρακαλούμε εισάγετε τη διεύθυνση email σας",
+        "ERROR": "Μη έγκυρη διεύθυνση email"
+      },
+      "MESSAGE": {
+        "LABEL": "Μήνυμα",
+        "PLACEHOLDER": "Παρακαλώ εισάγετε το μήνυμά σας",
+        "ERROR": "Πολύ σύντομο μήνυμα"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index a4947f5de..6b4fce59d 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Por favor ingrese su email",
   "CHAT_PLACEHOLDER": "Escribe tu mensaje",
   "TODAY": "Hoy",
-  "YESTERDAY": "Ayer"
+  "YESTERDAY": "Ayer",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nombre completo",
+        "PLACEHOLDER": "Introduzca su nombre completo por favor",
+        "ERROR": "Nombre completo es obligatorio"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Dirección de correo",
+        "PLACEHOLDER": "Introduzca su dirección de correo electrónico",
+        "ERROR": "Dirección de correo no válida"
+      },
+      "MESSAGE": {
+        "LABEL": "Mensaje",
+        "PLACEHOLDER": "Introduzca su mensaje",
+        "ERROR": "Mensaje demasiado corto"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 45b924276..8bddde322 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
   "CHAT_PLACEHOLDER": "پیام خود را وارد کنید",
   "TODAY": "امروز",
-  "YESTERDAY": "دیروز"
+  "YESTERDAY": "دیروز",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "نام کامل",
+        "PLACEHOLDER": "لطفا نام کامل خود را وارد کنید",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "ایمیل",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index aa86977e5..86c438ab7 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Ole hyvä ja syötä sähköpostiosoitteesi",
   "CHAT_PLACEHOLDER": "Kirjoita viestisi",
   "TODAY": "Tänään",
-  "YESTERDAY": "Eilen"
+  "YESTERDAY": "Eilen",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Koko nimi",
+        "PLACEHOLDER": "Syötä koko nimesi",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Sähköpostiosoite",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 5e807222d..0b57b85d9 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Veuillez saisir votre adresse de courriel",
   "CHAT_PLACEHOLDER": "Tapez votre message",
   "TODAY": "Aujourd'hui",
-  "YESTERDAY": "Hier"
+  "YESTERDAY": "Hier",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nom complet",
+        "PLACEHOLDER": "Veuillez entrer votre nom complet",
+        "ERROR": "Le nom complet est requis"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Adresse de courriel",
+        "PLACEHOLDER": "Veuillez saisir votre adresse de courriel",
+        "ERROR": "Adresse e-mail invalide"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Veuillez entrer votre message",
+        "ERROR": "Message trop court"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 2498c74e5..47d68c31d 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Please enter your email",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 2498c74e5..c62e888e3 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -1,33 +1,52 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
-      "UPLOADING": "Uploading..."
+      "DOWNLOAD": "Letöltés",
+      "UPLOADING": "Frissítés..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Elküldés"
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are offline"
+    "ONLINE": "Online vagyunk",
+    "OFFLINE": "Offilne vagyunk"
   },
   "REPLY_TIME": {
-    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
-    "IN_A_FEW_HOURS": "Typically replies in a few hours",
-    "IN_A_DAY": "Typically replies in a day"
+    "IN_A_FEW_MINUTES": "Néhány percen belül válaszol",
+    "IN_A_FEW_HOURS": "Néhány órán belül válaszol",
+    "IN_A_DAY": "Általánban egy napon belül válaszol"
   },
-  "START_CONVERSATION": "Start Conversation",
+  "START_CONVERSATION": "Beszélgetés megkezdése",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close"
+    "VIEW_MESSAGES_BUTTON": "Új üzenetek",
+    "CLOSE_MESSAGES_BUTTON": "Bezárás"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Chatelj velünk"
   },
-  "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
-  "CHAT_PLACEHOLDER": "Type your message",
-  "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "POWERED_BY": "Chatwoot",
+  "EMAIL_PLACEHOLDER": "Add meg az e-mailed",
+  "CHAT_PLACEHOLDER": "Gépeld be üzeneted",
+  "TODAY": "Ma",
+  "YESTERDAY": "Tegnap",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Teljes név",
+        "PLACEHOLDER": "Kérjük a teljes nevedet add meg",
+        "ERROR": "A teljes név megadása kötelező"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email cím",
+        "PLACEHOLDER": "Kérjük helyes e-mailcímet adj meg",
+        "ERROR": "Helytelen e-mailcím"
+      },
+      "MESSAGE": {
+        "LABEL": "Üzenet",
+        "PLACEHOLDER": "Írd be az üzeneted",
+        "ERROR": "Az üzenet túl rövid"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index 16977699a..34e7f4151 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Masukkan email Anda",
   "CHAT_PLACEHOLDER": "Ketik pesan Anda",
   "TODAY": "Hari ini",
-  "YESTERDAY": "Kemarin"
+  "YESTERDAY": "Kemarin",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nama Lengkap",
+        "PLACEHOLDER": "Harap masukkan nama lengkap anda yang valid",
+        "ERROR": "Nama Lengkap dibutuhkan"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Alamat email",
+        "PLACEHOLDER": "Harap masukkan alamat email Anda",
+        "ERROR": "Alamat email salah"
+      },
+      "MESSAGE": {
+        "LABEL": "Pesan",
+        "PLACEHOLDER": "Harap masukkan pesan Anda",
+        "ERROR": "Pesan terlalu pendek"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 6a951b971..59203a67c 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -1,7 +1,7 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Scaricare",
+      "DOWNLOAD": "Download",
       "UPLOADING": "Caricamento..."
     },
     "FORM_BUBBLE": {
@@ -9,25 +9,44 @@
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are offline"
+    "ONLINE": "Siamo online",
+    "OFFLINE": "Siamo offline"
   },
   "REPLY_TIME": {
-    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
-    "IN_A_FEW_HOURS": "Typically replies in a few hours",
-    "IN_A_DAY": "Typically replies in a day"
+    "IN_A_FEW_MINUTES": "In genere risponde in pochi minuti",
+    "IN_A_FEW_HOURS": "In genere risponde in poche ore",
+    "IN_A_DAY": "In genere le risposte in un giorno"
   },
-  "START_CONVERSATION": "Start Conversation",
+  "START_CONVERSATION": "Avvia Conversazione",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "VIEW_MESSAGES_BUTTON": "Vedi nuovi messaggi",
     "CLOSE_MESSAGES_BUTTON": "Chiudi"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Chatta con noi"
   },
   "POWERED_BY": "Powered by Chatwoot",
   "EMAIL_PLACEHOLDER": "Inserisci la tua email",
   "CHAT_PLACEHOLDER": "Scrivi il tuo messaggio",
-  "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "TODAY": "Oggi",
+  "YESTERDAY": "Ieri",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nome Completo",
+        "PLACEHOLDER": "Per favore inserisci il nome completo",
+        "ERROR": "Nome completo è richiesto"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Indirizzo email",
+        "PLACEHOLDER": "Inserisci il tuo indirizzo e-mail",
+        "ERROR": "Indirizzo email non valido"
+      },
+      "MESSAGE": {
+        "LABEL": "Messaggio",
+        "PLACEHOLDER": "Per favore inserisci il tuo messaggio",
+        "ERROR": "Messaggio troppo corto"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 17ec7585c..48ff980a4 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "メールアドレスを入力してください。",
   "CHAT_PLACEHOLDER": "メッセージを入力してください。",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "フルネーム",
+        "PLACEHOLDER": "氏名を入力してください。",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Eメールアドレス",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index b7f676914..15e51b452 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "이메일을 입력해주세요.",
   "CHAT_PLACEHOLDER": "메시지 입력",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "전체 이름",
+        "PLACEHOLDER": "전체 이름을 입력하십시오.",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "이메일 주소",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index d36dc3ea7..1797f5838 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ നൽകുക",
   "CHAT_PLACEHOLDER": "നിങ്ങളുടെ സന്ദേശം ടൈപ്പുചെയ്യുക",
   "TODAY": "ഇന്ന്",
-  "YESTERDAY": "ഇന്നലെ"
+  "YESTERDAY": "ഇന്നലെ",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "പൂർണ്ണമായ പേര്",
+        "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ മുഴുവൻ പേര് നൽകുക",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "ഇമെയിൽ വിലാസം",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index 86d3edb14..b6a46797c 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "कृपया तपाईंको ईमेल दिनुहोस्",
   "CHAT_PLACEHOLDER": "तपाईंको सन्देश टाइप गर्नुहोस्",
   "TODAY": "आज",
-  "YESTERDAY": "भोली"
+  "YESTERDAY": "भोली",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 3e6515e21..19129c4bc 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Voer uw e-mailadres in",
   "CHAT_PLACEHOLDER": "Typ uw bericht",
   "TODAY": "Vandaag",
-  "YESTERDAY": "Gisteren"
+  "YESTERDAY": "Gisteren",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Uw e-mailadres",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 5aab92aa2..22ff35c6f 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Skriv inn din e-post",
   "CHAT_PLACEHOLDER": "Skriv inn meldingen",
   "TODAY": "I dag",
-  "YESTERDAY": "I går"
+  "YESTERDAY": "I går",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Fullt navn",
+        "PLACEHOLDER": "Skriv inn fullt navn",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-postadresse",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 782e09a48..5ae8452cf 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Wprowadź swój adres e-mail",
   "CHAT_PLACEHOLDER": "Wpisz treść wiadomości",
   "TODAY": "Dzisiaj",
-  "YESTERDAY": "Wczoraj"
+  "YESTERDAY": "Wczoraj",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Pełna nazwa (imię i nazwisko)",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Adres e-mail",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index ee78794b5..4e659acba 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Por favor, digite seu e-mail",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Endereço de e-mail",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 5b0a4faa8..0a5c7ca89 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -1,7 +1,7 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Baixar",
+      "DOWNLOAD": "Download",
       "UPLOADING": "Enviando..."
     },
     "FORM_BUBBLE": {
@@ -13,7 +13,7 @@
     "OFFLINE": "Não estamos conectados"
   },
   "REPLY_TIME": {
-    "IN_A_FEW_MINUTES": "Responde normalmente em alguns minutos",
+    "IN_A_FEW_MINUTES": "Normalmente responde em alguns minutos",
     "IN_A_FEW_HOURS": "Responde normalmente em algumas horas",
     "IN_A_DAY": "Responde normalmente em um dia"
   },
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Por favor, insira seu e-mail",
   "CHAT_PLACEHOLDER": "Digite sua mensagem",
   "TODAY": "Hoje",
-  "YESTERDAY": "Ontem"
+  "YESTERDAY": "Ontem",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Nome Completo",
+        "PLACEHOLDER": "Por favor, digite seu nome completo",
+        "ERROR": "Nome Completo é mandatório"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Endereço de e-mail",
+        "PLACEHOLDER": "Por favor, digite seu e-mail",
+        "ERROR": "Endereço de e-mail inválido"
+      },
+      "MESSAGE": {
+        "LABEL": "Messagem",
+        "PLACEHOLDER": "Por favor, digite sua mensagem",
+        "ERROR": "Mensagem muito curta"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 977d36565..ce3481fb2 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Te rugăm să introduci adresa de e-mail",
   "CHAT_PLACEHOLDER": "Scrie mesajul tău",
   "TODAY": "Astăzi",
-  "YESTERDAY": "Ieri"
+  "YESTERDAY": "Ieri",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Te rugăm să introduci un nume valid",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Adresa Email",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 90d74a3cf..ced3a2452 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Пожалуйста, введите ваш email",
   "CHAT_PLACEHOLDER": "Введите сообщение",
   "TODAY": "Сегодня",
-  "YESTERDAY": "Вчера"
+  "YESTERDAY": "Вчера",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Полное имя",
+        "PLACEHOLDER": "Пожалуйста, введите ваше ФИО",
+        "ERROR": "Необходимо указать имя"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email",
+        "PLACEHOLDER": "Пожалуйста, введите ваш адрес электронной почты",
+        "ERROR": "Неправильный адрес электронной почты"
+      },
+      "MESSAGE": {
+        "LABEL": "Сообщение",
+        "PLACEHOLDER": "Пожалуйста, введите ваше сообщение здесь",
+        "ERROR": "Сообщение слишком короткое"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 2498c74e5..47d68c31d 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Please enter your email",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 45ad529f0..fd2d59742 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Ange din e-postadress",
   "CHAT_PLACEHOLDER": "Skriv ditt meddelande",
   "TODAY": "Idag",
-  "YESTERDAY": "Igår"
+  "YESTERDAY": "Igår",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Fullständigt namn",
+        "PLACEHOLDER": "Vänligen ange ditt fullständiga namn",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-postadress",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index d2eb172c4..2dbf6ee32 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "உங்கள் ஈ-மெயில் முகவரியை பதிவிடவும்",
   "CHAT_PLACEHOLDER": "உங்கள் செய்தியை உள்ளிடவும்",
   "TODAY": "இன்று",
-  "YESTERDAY": "நேற்று"
+  "YESTERDAY": "நேற்று",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "ஈ-மெயில் முகவரி",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 00543f584..a0fc139b0 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "กรุณากรอกอีเมล์ของคุณ",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "ชื่อเต็ม",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "ที่อยู่อีเมล์",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index ee75efc75..337a1d01e 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Lütfen E-postanızı Girin",
   "CHAT_PLACEHOLDER": "Mesajınız",
   "TODAY": "Bugün",
-  "YESTERDAY": "Dün"
+  "YESTERDAY": "Dün",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Ad Soyad",
+        "PLACEHOLDER": "lütfen tam adınızı giriniz",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "E-posta adresi",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index 69d004e62..3dad81c90 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Введіть адресу електронної пошти",
   "CHAT_PLACEHOLDER": "Введіть Ваше повідомлення",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Адреса електронної пошти",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index e277bb4f4..d6454dfbe 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "Vui lòng nhập email",
   "CHAT_PLACEHOLDER": "Gõ tin nhắn của bạn",
   "TODAY": "Hôm nay",
-  "YESTERDAY": "Hôm qua"
+  "YESTERDAY": "Hôm qua",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Tên đầy đủ",
+        "PLACEHOLDER": "Vui lòng nhập tên đầy đủ của bạn",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index c3dc89a8b..92b43bd4e 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "请输入您的电子邮件",
   "CHAT_PLACEHOLDER": "输入您的消息",
   "TODAY": "今日",
-  "YESTERDAY": "昨日"
+  "YESTERDAY": "昨日",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "名字",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "电子邮件地址",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index 8cfed21ea..3fadcb85e 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -29,5 +29,24 @@
   "EMAIL_PLACEHOLDER": "請輸入您的電子信箱",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Today",
-  "YESTERDAY": "Yesterday"
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "聯絡人姓名",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "電子信箱地址",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    }
+  }
 }
diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js
new file mode 100644
index 000000000..1508a825d
--- /dev/null
+++ b/app/javascript/widget/mixins/availability.js
@@ -0,0 +1,62 @@
+import compareAsc from 'date-fns/compareAsc';
+import { buildDateFromTime } from 'shared/helpers/DateHelper';
+
+export default {
+  computed: {
+    channelConfig() {
+      return window.chatwootWebChannel;
+    },
+    replyTime() {
+      return window.chatwootWebChannel.replyTime;
+    },
+    replyTimeStatus() {
+      switch (this.replyTime) {
+        case 'in_a_few_minutes':
+          return this.$t('REPLY_TIME.IN_A_FEW_MINUTES');
+        case 'in_a_few_hours':
+          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
+        case 'in_a_day':
+          return this.$t('REPLY_TIME.IN_A_DAY');
+        default:
+          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
+      }
+    },
+    outOfOfficeMessage() {
+      return this.channelConfig.outOfOfficeMessage;
+    },
+    isInBetweenTheWorkingHours() {
+      const {
+        openHour,
+        openMinute,
+        closeHour,
+        closeMinute,
+        closedAllDay,
+      } = this.currentDayAvailability;
+      const { utcOffset } = this.channelConfig;
+
+      if (closedAllDay) return false;
+
+      const startTime = buildDateFromTime(openHour, openMinute, utcOffset);
+      const endTime = buildDateFromTime(closeHour, closeMinute, utcOffset);
+      const isBetween =
+        compareAsc(new Date(), startTime) === 1 &&
+        compareAsc(endTime, new Date()) === 1;
+
+      if (isBetween) return true;
+      return false;
+    },
+    currentDayAvailability() {
+      const dayOfTheWeek = new Date().getDay();
+      const [workingHourConfig = {}] = this.channelConfig.workingHours.filter(
+        workingHour => workingHour.day_of_week === dayOfTheWeek
+      );
+      return {
+        closedAllDay: workingHourConfig.closed_all_day,
+        openHour: workingHourConfig.open_hour,
+        openMinute: workingHourConfig.open_minutes,
+        closeHour: workingHourConfig.close_hour,
+        closeMinute: workingHourConfig.close_minutes,
+      };
+    },
+  },
+};
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index da4b16c35..df26add3b 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -21,9 +21,6 @@ export default {
     hasAttachmentsEnabled() {
       return this.channelConfig.enabledFeatures.includes('attachments');
     },
-    replyTime() {
-      return window.chatwootWebChannel.replyTime;
-    },
     preChatFormEnabled() {
       return window.chatwootWebChannel.preChatFormEnabled;
     },
@@ -34,17 +31,5 @@ export default {
         preChatMessage: options.pre_chat_message,
       };
     },
-    replyTimeStatus() {
-      switch (this.replyTime) {
-        case 'in_a_few_minutes':
-          return this.$t('REPLY_TIME.IN_A_FEW_MINUTES');
-        case 'in_a_few_hours':
-          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
-        case 'in_a_day':
-          return this.$t('REPLY_TIME.IN_A_DAY');
-        default:
-          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
-      }
-    },
   },
 };
diff --git a/app/javascript/widget/mixins/teamAvailabilityMixin.js b/app/javascript/widget/mixins/teamAvailabilityMixin.js
deleted file mode 100644
index 9981cf9a0..000000000
--- a/app/javascript/widget/mixins/teamAvailabilityMixin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  computed: {
-    teamAvailabilityStatus() {
-      if (this.availableAgents.length) {
-        return this.$t('TEAM_AVAILABILITY.ONLINE');
-      }
-      return this.$t('TEAM_AVAILABILITY.OFFLINE');
-    },
-  },
-};
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 94a0828c4..8ce2461a8 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -90,6 +90,13 @@ class ActionCableListener < BaseListener
     broadcast(account, tokens, ASSIGNEE_CHANGED, conversation.push_event_data)
   end
 
+  def team_changed(event)
+    conversation, account = extract_conversation_and_account(event)
+    tokens = user_tokens(account, conversation.inbox.members)
+
+    broadcast(account, tokens, TEAM_CHANGED, conversation.push_event_data)
+  end
+
   def conversation_contact_changed(event)
     conversation, account = extract_conversation_and_account(event)
     tokens = user_tokens(account, conversation.inbox.members)
diff --git a/app/listeners/notification_listener.rb b/app/listeners/notification_listener.rb
index bfa2ec99f..ad7bf2d14 100644
--- a/app/listeners/notification_listener.rb
+++ b/app/listeners/notification_listener.rb
@@ -56,6 +56,8 @@ class NotificationListener < BaseListener
   def generate_notifications_for_mentions(message, account)
     return unless message.private?
 
+    return if message.content.blank?
+
     mentioned_ids = message.content.scan(%r{\(mention://(user|team)/(\d+)/(.+)\)}).map(&:second).uniq
 
     return if mentioned_ids.blank?
diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index 041e534db..a13110dfe 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -22,7 +22,7 @@ class ApplicationMailbox < ActionMailbox::Base
     proc do |inbound_mail_obj|
       is_a_support_email = false
       inbound_mail_obj.mail.to.each do |email|
-        channel = Channel::Email.find_by(email: email)
+        channel = Channel::Email.find_by('email = ? OR forward_to_email = ?', email, email)
         if channel.present?
           is_a_support_email = true
           break
@@ -37,7 +37,10 @@ class ApplicationMailbox < ActionMailbox::Base
   end
 
   # routing should be defined below the referenced procs
+
+  # routes as a reply to existing conversations
   routing(reply_mail? => :reply)
+  # routes as a new conversation in email channel
   routing(support_mail? => :support)
   routing(catch_all_mail? => :default)
 end
diff --git a/app/mailboxes/support_mailbox.rb b/app/mailboxes/support_mailbox.rb
index ac63d23ba..dad8b4bb1 100644
--- a/app/mailboxes/support_mailbox.rb
+++ b/app/mailboxes/support_mailbox.rb
@@ -19,7 +19,7 @@ class SupportMailbox < ApplicationMailbox
 
   def find_channel
     mail.to.each do |email|
-      @channel = Channel::Email.find_by(email: email)
+      @channel = Channel::Email.find_by('email = ? OR forward_to_email = ?', email, email)
       break if @channel.present?
     end
     raise 'Email channel/inbox not found' if @channel.nil?
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index 165e9cff7..ea21cbb2d 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -1,5 +1,5 @@
 class ConversationReplyMailer < ApplicationMailer
-  default from: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
+  default from: ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')
   layout :choose_layout
 
   def reply_with_summary(conversation, message_queued_time)
@@ -99,7 +99,7 @@ class ConversationReplyMailer < ApplicationMailer
 
   def reply_email
     if should_use_conversation_email_address?
-      "#{assignee_name} <reply+#{@conversation.uuid}@#{current_domain}>"
+      "#{assignee_name} <reply+#{@conversation.uuid}@#{@account.inbound_email_domain}>"
     else
       @inbox.email_address || @agent&.email
     end
@@ -107,24 +107,28 @@ class ConversationReplyMailer < ApplicationMailer
 
   def from_email_with_name
     if should_use_conversation_email_address?
-      "#{assignee_name} <#{account_support_email}>"
+      "#{assignee_name} from #{@inbox.name} <#{parse_email(@account.support_email)}>"
     else
-      "#{assignee_name} <#{from_email_address}>"
+      "#{assignee_name} from #{@inbox.name} <#{parse_email(inbox_from_email_address)}>"
     end
   end
 
-  def from_email_address
+  def parse_email(email_string)
+    Mail::Address.new(email_string).address
+  end
+
+  def inbox_from_email_address
     return @inbox.email_address if @inbox.email_address
 
-    ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
+    @account.support_email
   end
 
   def custom_message_id
-    "<conversation/#{@conversation.uuid}/messages/#{@messages&.last&.id}@#{current_domain}>"
+    "<conversation/#{@conversation.uuid}/messages/#{@messages&.last&.id}@#{@account.inbound_email_domain}>"
   end
 
   def in_reply_to_email
-    conversation_reply_email_id || "<account/#{@account.id}/conversation/#{@conversation.uuid}@#{current_domain}>"
+    conversation_reply_email_id || "<account/#{@account.id}/conversation/#{@conversation.uuid}@#{@account.inbound_email_domain}>"
   end
 
   def conversation_reply_email_id
@@ -138,23 +142,8 @@ class ConversationReplyMailer < ApplicationMailer
   end
 
   def inbound_email_enabled?
-    @inbound_email_enabled ||= @account.feature_enabled?('inbound_emails') && current_domain.present? && account_support_email.present?
-  end
-
-  def current_domain
-    @current_domain ||= begin
-      @account.domain ||
-        ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', false) ||
-        GlobalConfig.get('MAILER_INBOUND_EMAIL_DOMAIN')['MAILER_INBOUND_EMAIL_DOMAIN']
-    end
-  end
-
-  def account_support_email
-    @account_support_email ||= begin
-      @account.support_email ||
-        GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] ||
-        ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
-    end
+    @inbound_email_enabled ||= @account.feature_enabled?('inbound_emails') && @account.inbound_email_domain
+                                                                                      .present? && @account.support_email.present?
   end
 
   def choose_layout
diff --git a/app/models/account.rb b/app/models/account.rb
index 1bb9f1a19..35a731aba 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -10,7 +10,6 @@
 #  name                  :string           not null
 #  settings_flags        :integer          default(0), not null
 #  support_email         :string(100)
-#  timezone              :string           default("UTC")
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #
@@ -88,6 +87,14 @@ class Account < ApplicationRecord
     }
   end
 
+  def inbound_email_domain
+    domain || GlobalConfig.get('MAILER_INBOUND_EMAIL_DOMAIN')['MAILER_INBOUND_EMAIL_DOMAIN'] || ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', false)
+  end
+
+  def support_email
+    super || GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] || ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')
+  end
+
   private
 
   def notify_creation
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 33e11e5e8..d68136b76 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -2,17 +2,17 @@
 #
 # Table name: channel_email
 #
-#  id                 :bigint           not null, primary key
-#  email              :string           not null
-#  forward_to_address :string           not null
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  account_id         :integer          not null
+#  id               :bigint           not null, primary key
+#  email            :string           not null
+#  forward_to_email :string           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  account_id       :integer          not null
 #
 # Indexes
 #
-#  index_channel_email_on_email               (email) UNIQUE
-#  index_channel_email_on_forward_to_address  (forward_to_address) UNIQUE
+#  index_channel_email_on_email             (email) UNIQUE
+#  index_channel_email_on_forward_to_email  (forward_to_email) UNIQUE
 #
 
 class Channel::Email < ApplicationRecord
@@ -21,10 +21,10 @@ class Channel::Email < ApplicationRecord
   validates :account_id, presence: true
   belongs_to :account
   validates :email, uniqueness: true
-  validates :forward_to_address, uniqueness: true
+  validates :forward_to_email, uniqueness: true
 
   has_one :inbox, as: :channel, dependent: :destroy
-  before_validation :ensure_forward_to_address, on: :create
+  before_validation :ensure_forward_to_email, on: :create
 
   def name
     'Email'
@@ -36,8 +36,7 @@ class Channel::Email < ApplicationRecord
 
   private
 
-  def ensure_forward_to_address
-    email_domain = InstallationConfig.find_by(name: 'MAILER_INBOUND_EMAIL_DOMAIN')&.value
-    self.forward_to_address ||= "#{SecureRandom.hex}@#{email_domain}"
+  def ensure_forward_to_email
+    self.forward_to_email ||= "#{SecureRandom.hex}@#{account.inbound_email_domain}"
   end
 end
diff --git a/app/models/concerns/assignment_handler.rb b/app/models/concerns/assignment_handler.rb
new file mode 100644
index 000000000..c206289d4
--- /dev/null
+++ b/app/models/concerns/assignment_handler.rb
@@ -0,0 +1,77 @@
+module AssignmentHandler
+  extend ActiveSupport::Concern
+  include Events::Types
+
+  included do
+    before_save :ensure_assignee_is_from_team
+    after_update :notify_assignment_change, :process_assignment_activities
+  end
+
+  private
+
+  def ensure_assignee_is_from_team
+    return unless team_id_changed?
+
+    ensure_current_assignee_team
+    self.assignee_id ||= find_team_assignee_id_for_inbox if team&.allow_auto_assign.present?
+  end
+
+  def ensure_current_assignee_team
+    self.assignee_id = nil if team&.members&.exclude?(assignee)
+  end
+
+  def find_team_assignee_id_for_inbox
+    members = inbox.members.ids & team.members.ids
+    # TODO: User round robin to determine the next agent instead of using sample
+    members.sample
+  end
+
+  def notify_assignment_change
+    {
+      ASSIGNEE_CHANGED => -> { saved_change_to_assignee_id? },
+      TEAM_CHANGED => -> { saved_change_to_team_id? }
+    }.each do |event, condition|
+      condition.call && dispatcher_dispatch(event)
+    end
+  end
+
+  def process_assignment_activities
+    user_name = Current.user.name if Current.user.present?
+    if saved_change_to_team_id?
+      create_team_change_activity(user_name)
+    elsif saved_change_to_assignee_id?
+      create_assignee_change_activity(user_name)
+    end
+  end
+
+  def generate_team_change_activity_key
+    key = team_id ? 'assigned' : 'removed'
+    key += '_with_assignee' if key == 'assigned' && saved_change_to_assignee_id? && assignee
+    key
+  end
+
+  def create_team_change_activity(user_name)
+    return unless user_name
+
+    key = generate_team_change_activity_key
+    params = { assignee_name: assignee&.name, team_name: team&.name, user_name: user_name }
+    if key == 'removed'
+      previous_team_id = previous_changes[:team_id][0]
+      params[:team_name] = Team.find_by(id: previous_team_id)&.name if previous_team_id.present?
+    end
+    content = I18n.t("conversations.activity.team.#{key}", **params)
+
+    messages.create(activity_message_params(content))
+  end
+
+  def create_assignee_change_activity(user_name)
+    return unless user_name
+
+    params = { assignee_name: assignee&.name, user_name: user_name }.compact
+    key = assignee_id ? 'assigned' : 'removed'
+    key = 'self_assigned' if self_assign? assignee_id
+    content = I18n.t("conversations.activity.assignee.#{key}", **params)
+
+    messages.create(activity_message_params(content))
+  end
+end
diff --git a/app/models/concerns/out_of_offisable.rb b/app/models/concerns/out_of_offisable.rb
index 0bfcbde32..53b466cdf 100644
--- a/app/models/concerns/out_of_offisable.rb
+++ b/app/models/concerns/out_of_offisable.rb
@@ -3,6 +3,8 @@
 module OutOfOffisable
   extend ActiveSupport::Concern
 
+  OFFISABLE_ATTRS = %w[day_of_week closed_all_day open_hour open_minutes close_hour close_minutes].freeze
+
   included do
     has_many :working_hours, dependent: :destroy
     after_create :create_default_working_hours
@@ -16,15 +18,35 @@ module OutOfOffisable
     !out_of_office?
   end
 
+  def weekly_schedule
+    working_hours.order(day_of_week: :asc).select(*OFFISABLE_ATTRS).as_json(except: :id)
+  end
+
+  # accepts an array of hashes similiar to the format of weekly_schedule
+  #  [
+  #    { "day_of_week"=>1,
+  #      "closed_all_day"=>false,
+  #      "open_hour"=>9,
+  #      "open_minutes"=>0,
+  #      "close_hour"=>17,
+  #      "close_minutes"=>0},...]
+  def update_working_hours(params)
+    ActiveRecord::Base.transaction do
+      params.each do |working_hour|
+        working_hours.find_by(day_of_week: working_hour['day_of_week']).update(working_hour.slice(*OFFISABLE_ATTRS))
+      end
+    end
+  end
+
   private
 
   def create_default_working_hours
+    working_hours.create!(day_of_week: 0, closed_all_day: true)
     working_hours.create!(day_of_week: 1, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
     working_hours.create!(day_of_week: 2, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
     working_hours.create!(day_of_week: 3, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
     working_hours.create!(day_of_week: 4, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
     working_hours.create!(day_of_week: 5, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
     working_hours.create!(day_of_week: 6, closed_all_day: true)
-    working_hours.create!(day_of_week: 7, closed_all_day: true)
   end
 end
diff --git a/app/models/concerns/round_robin_handler.rb b/app/models/concerns/round_robin_handler.rb
new file mode 100644
index 000000000..80865acd7
--- /dev/null
+++ b/app/models/concerns/round_robin_handler.rb
@@ -0,0 +1,26 @@
+module RoundRobinHandler
+  extend ActiveSupport::Concern
+  include Events::Types
+
+  included do
+    after_save :run_round_robin
+  end
+
+  private
+
+  def run_round_robin
+    # Round robin kicks in on conversation create & update
+    # run it only when conversation status changes to open
+    return unless conversation_status_changed_to_open?
+    return unless should_round_robin?
+
+    ::RoundRobin::AssignmentService.new(conversation: self).perform
+  end
+
+  def should_round_robin?
+    return false unless inbox.enable_auto_assignment?
+
+    # run only if assignee is blank or doesn't have access to inbox
+    assignee.blank? || inbox.members.exclude?(assignee)
+  end
+end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index e51291a34..bb210f6bc 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -36,6 +36,8 @@
 
 class Conversation < ApplicationRecord
   include Labelable
+  include AssignmentHandler
+  include RoundRobinHandler
 
   validates :account_id, presence: true
   validates :inbox_id, presence: true
@@ -62,7 +64,6 @@ class Conversation < ApplicationRecord
   # reinvestigate in future and identity the implications
   after_update :notify_status_change, :create_activity
   after_create_commit :notify_conversation_creation, :queue_conversation_auto_resolution_job
-  after_save :run_round_robin
   after_commit :set_display_id, unless: :display_id?
 
   delegate :auto_resolve_duration, to: :account
@@ -170,7 +171,6 @@ class Conversation < ApplicationRecord
   def create_activity
     user_name = Current.user.name if Current.user.present?
     status_change_activity(user_name) if saved_change_to_status?
-    create_assignee_change(user_name) if saved_change_to_assignee_id?
     create_label_change(user_name) if saved_change_to_label_list?
   end
 
@@ -189,7 +189,6 @@ class Conversation < ApplicationRecord
       CONVERSATION_RESOLVED => -> { saved_change_to_status? && resolved? },
       CONVERSATION_READ => -> { saved_change_to_contact_last_seen_at? },
       CONVERSATION_LOCK_TOGGLE => -> { saved_change_to_locked? },
-      ASSIGNEE_CHANGED => -> { saved_change_to_assignee_id? },
       CONVERSATION_CONTACT_CHANGED => -> { saved_change_to_contact_id? }
     }.each do |event, condition|
       condition.call && dispatcher_dispatch(event)
@@ -200,28 +199,12 @@ class Conversation < ApplicationRecord
     Rails.configuration.dispatcher.dispatch(event_name, Time.zone.now, conversation: self)
   end
 
-  def should_round_robin?
-    return false unless inbox.enable_auto_assignment?
-
-    # run only if assignee is blank or doesn't have access to inbox
-    assignee.blank? || inbox.members.exclude?(assignee)
-  end
-
   def conversation_status_changed_to_open?
     return false unless open?
     # saved_change_to_status? method only works in case of update
     return true if previous_changes.key?(:id) || saved_change_to_status?
   end
 
-  def run_round_robin
-    # Round robin kicks in on conversation create & update
-    # run it only when conversation status changes to open
-    return unless conversation_status_changed_to_open?
-    return unless should_round_robin?
-
-    ::RoundRobin::AssignmentService.new(conversation: self).perform
-  end
-
   def create_status_change_message(user_name)
     content = if user_name
                 I18n.t("conversations.activity.status.#{status}", user_name: user_name)
@@ -232,17 +215,6 @@ class Conversation < ApplicationRecord
     messages.create(activity_message_params(content)) if content
   end
 
-  def create_assignee_change(user_name)
-    return unless user_name
-
-    params = { assignee_name: assignee&.name, user_name: user_name }.compact
-    key = assignee_id ? 'assigned' : 'removed'
-    key = 'self_assigned' if self_assign? assignee_id
-    content = I18n.t("conversations.activity.assignee.#{key}", **params)
-
-    messages.create(activity_message_params(content))
-  end
-
   def create_label_change(user_name)
     return unless user_name
 
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 0e5fd490f..398af0352 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -12,6 +12,7 @@
 #  greeting_message       :string
 #  name                   :string           not null
 #  out_of_office_message  :string
+#  timezone               :string           default("UTC")
 #  working_hours_enabled  :boolean          default(FALSE)
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
@@ -29,6 +30,7 @@ class Inbox < ApplicationRecord
   include OutOfOffisable
 
   validates :account_id, presence: true
+  validates :timezone, inclusion: { in: TZInfo::Timezone.all_identifiers }
 
   belongs_to :account
 
diff --git a/app/models/working_hour.rb b/app/models/working_hour.rb
index e73759ac0..5874af20d 100644
--- a/app/models/working_hour.rb
+++ b/app/models/working_hour.rb
@@ -37,7 +37,7 @@ class WorkingHour < ApplicationRecord
   validate :close_after_open, unless: :closed_all_day?
 
   def self.today
-    find_by(day_of_week: Date.current.cwday)
+    find_by(day_of_week: Date.current.wday)
   end
 
   def open_at?(time)
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 40070fd04..5e92ba528 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -91,13 +91,13 @@ class MailPresenter < SimpleDelegator
   end
 
   def quoted_text_regexes
-    return sender_agnostic_regexes if @account.nil? || account_support_email.blank?
+    return sender_agnostic_regexes if @account.nil? || @account.support_email.blank?
 
     [
-      Regexp.new("From:\s* #{Regexp.escape(account_support_email)}", Regexp::IGNORECASE),
-      Regexp.new("<#{Regexp.escape(account_support_email)}>", Regexp::IGNORECASE),
-      Regexp.new("#{Regexp.escape(account_support_email)}\s+wrote:", Regexp::IGNORECASE),
-      Regexp.new("On(.*)#{Regexp.escape(account_support_email)}(.*)wrote:", Regexp::IGNORECASE)
+      Regexp.new("From:\s* #{Regexp.escape(@account.support_email)}", Regexp::IGNORECASE),
+      Regexp.new("<#{Regexp.escape(@account.support_email)}>", Regexp::IGNORECASE),
+      Regexp.new("#{Regexp.escape(@account.support_email)}\s+wrote:", Regexp::IGNORECASE),
+      Regexp.new("On(.*)#{Regexp.escape(@account.support_email)}(.*)wrote:", Regexp::IGNORECASE)
     ] + sender_agnostic_regexes
   end
 
@@ -109,12 +109,4 @@ class MailPresenter < SimpleDelegator
       Regexp.new("from:\s*$", Regexp::IGNORECASE)
     ]
   end
-
-  def account_support_email
-    @account_support_email ||= begin
-      @account.support_email ||
-        GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] ||
-        ENV.fetch('MAILER_SENDER_EMAIL', nil)
-    end
-  end
 end
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index f8371aad9..6d4c9ddd7 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -4,7 +4,8 @@ class MessageTemplates::HookExecutionService
   def perform
     return if inbox.agent_bot_inbox&.active?
 
-    ::MessageTemplates::Template::OutOfOffice.new(conversation: conversation).perform if should_send_out_of_office_message?
+    # TODO: let's see whether this is needed and remove this and related logic if not
+    # ::MessageTemplates::Template::OutOfOffice.new(conversation: conversation).perform if should_send_out_of_office_message?
     ::MessageTemplates::Template::Greeting.new(conversation: conversation).perform if should_send_greeting?
     ::MessageTemplates::Template::EmailCollect.new(conversation: conversation).perform if should_send_email_collect?
   end
@@ -30,8 +31,9 @@ class MessageTemplates::HookExecutionService
     conversation.messages.where(content_type: 'input_email').present?
   end
 
+  # TODO: we should be able to reduce this logic once we have a toggle for email collect messages
   def should_send_email_collect?
-    !contact_has_email? && inbox.web_widget? && !email_collect_was_sent?
+    !contact_has_email? && inbox.web_widget? && !inbox.channel.pre_chat_form_enabled? && !email_collect_was_sent?
   end
 
   def contact_has_email?
diff --git a/app/views/api/v1/accounts/conversations/search.json.jbuilder b/app/views/api/v1/accounts/conversations/search.json.jbuilder
index 9193b0e48..ab9114ad7 100644
--- a/app/views/api/v1/accounts/conversations/search.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/search.json.jbuilder
@@ -6,9 +6,22 @@ end
 json.payload do
   json.array! @conversations do |conversation|
     json.id conversation.display_id
+    json.created_at conversation.created_at.to_i
+    json.contact do
+      json.id conversation.contact.id
+      json.name conversation.contact.name
+    end
+    json.inbox do
+      json.id conversation.inbox.id
+      json.name conversation.inbox.name
+      json.channel_type conversation.inbox.channel_type
+    end
     json.messages do
       json.array! conversation.messages do |message|
         json.content message.content
+        json.id message.id
+        json.sender_name message.sender.name if message.sender
+        json.message_type message.message_type_before_type_cast
         json.created_at message.created_at.to_i
       end
     end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 50afe3b44..12879b3d5 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -8,6 +8,11 @@ json.meta do
       json.partial! 'api/v1/models/agent.json.jbuilder', resource: conversation.assignee
     end
   end
+  if conversation.team.present?
+    json.team do
+      json.partial! 'api/v1/models/team.json.jbuilder', resource: conversation.team
+    end
+  end
 end
 
 json.id conversation.display_id
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 0ceaf8c5b..db122de37 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -4,6 +4,10 @@ json.name resource.name
 json.channel_type resource.channel_type
 json.greeting_enabled resource.greeting_enabled
 json.greeting_message resource.greeting_message
+json.working_hours_enabled resource.working_hours_enabled
+json.out_of_office_message resource.out_of_office_message
+json.working_hours resource.weekly_schedule
+json.timezone resource.timezone
 json.avatar_url resource.try(:avatar_url)
 json.page_id resource.channel.try(:page_id)
 json.widget_color resource.channel.try(:widget_color)
@@ -13,7 +17,7 @@ json.welcome_tagline resource.channel.try(:welcome_tagline)
 json.enable_auto_assignment resource.enable_auto_assignment
 json.web_widget_script resource.channel.try(:web_widget_script)
 json.website_token resource.channel.try(:website_token)
-json.forward_to_address resource.channel.try(:forward_to_address)
+json.forward_to_email resource.channel.try(:forward_to_email)
 json.phone_number resource.channel.try(:phone_number)
 json.selected_feature_flags resource.channel.try(:selected_feature_flags)
 json.reply_time resource.channel.try(:reply_time)
diff --git a/app/views/platform/api/v1/models/_user.json.jbuilder b/app/views/platform/api/v1/models/_user.json.jbuilder
new file mode 100644
index 000000000..8f7922aad
--- /dev/null
+++ b/app/views/platform/api/v1/models/_user.json.jbuilder
@@ -0,0 +1,23 @@
+json.access_token resource.access_token.token
+json.account_id resource.active_account_user&.account_id
+json.availability_status resource.availability_status
+json.available_name resource.available_name
+json.avatar_url resource.avatar_url
+json.confirmed resource.confirmed?
+json.display_name resource.display_name
+json.email resource.email
+json.id resource.id
+json.name resource.name
+json.provider resource.provider
+json.pubsub_token resource.pubsub_token
+json.role resource.active_account_user&.role
+json.ui_settings resource.ui_settings
+json.uid resource.uid
+json.accounts do
+  json.array! resource.account_users do |account_user|
+    json.id account_user.account_id
+    json.name account_user.account.name
+    json.active_at account_user.active_at
+    json.role account_user.role
+  end
+end
diff --git a/app/views/platform/api/v1/users/create.json.jbuilder b/app/views/platform/api/v1/users/create.json.jbuilder
new file mode 100644
index 000000000..46d8b6d34
--- /dev/null
+++ b/app/views/platform/api/v1/users/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/user.json.jbuilder', resource: @resource
diff --git a/app/views/platform/api/v1/users/show.json.jbuilder b/app/views/platform/api/v1/users/show.json.jbuilder
new file mode 100644
index 000000000..46d8b6d34
--- /dev/null
+++ b/app/views/platform/api/v1/users/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/user.json.jbuilder', resource: @resource
diff --git a/app/views/platform/api/v1/users/update.json.jbuilder b/app/views/platform/api/v1/users/update.json.jbuilder
new file mode 100644
index 000000000..46d8b6d34
--- /dev/null
+++ b/app/views/platform/api/v1/users/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'platform/api/v1/models/user.json.jbuilder', resource: @resource
diff --git a/app/views/widgets/show.html.erb b/app/views/widgets/show.html.erb
index 2f8287bc5..85297111a 100644
--- a/app/views/widgets/show.html.erb
+++ b/app/views/widgets/show.html.erb
@@ -21,7 +21,11 @@
         enabledLanguages: <%= available_locales_with_name.to_json.html_safe %>,
         replyTime: '<%= @web_widget.reply_time %>',
         preChatFormEnabled: <%= @web_widget.pre_chat_form_enabled %>,
-        preChatFormOptions: <%= @web_widget.pre_chat_form_options.to_json.html_safe %>
+        preChatFormOptions: <%= @web_widget.pre_chat_form_options.to_json.html_safe %>,
+        workingHoursEnabled: <%= @web_widget.inbox.working_hours_enabled %>,
+        workingHours: <%= @web_widget.inbox.working_hours.to_json.html_safe %>,
+        outOfOfficeMessage: <%= @web_widget.inbox.out_of_office_message.to_json.html_safe %>,
+        utcOffset: '<%= ActiveSupport::TimeZone[@web_widget.inbox.timezone].formatted_offset %>'
       }
       window.chatwootWidgetDefaults = {
         useInboxAvatarForBot: <%= ActiveModel::Type::Boolean.new.cast(ENV.fetch('USE_INBOX_AVATAR_FOR_BOT', false)) %>,
diff --git a/config/app.yml b/config/app.yml
index f036cc9b1..1d82a9db3 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '1.13.1'
+  version: '1.14.0'
 
 development:
   <<: *shared
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3bdc26c99..557000065 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,40 +34,6 @@ Rails.application.configure do
 
   config.active_job.queue_adapter = :sidekiq
 
-  # Email related config
-  config.action_mailer.perform_caching = false
-  config.action_mailer.perform_deliveries = true
-  config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.default_url_options = { host: ENV['FRONTEND_URL'] }
-
-  smtp_settings = {
-    port: ENV['SMTP_PORT'] || 25,
-    domain: ENV['SMTP_DOMAIN'] || 'localhost',
-    address: ENV['SMTP_ADDRESS'] || 'chatwoot.com'
-  }
-
-  if ENV['SMTP_AUTHENTICATION'].present?
-    smtp_settings[:user_name] = ENV['SMTP_USERNAME']
-    smtp_settings[:password] = ENV['SMTP_PASSWORD']
-    smtp_settings[:authentication] = ENV['SMTP_AUTHENTICATION']
-    smtp_settings[:enable_starttls_auto] = ENV['SMTP_ENABLE_STARTTLS_AUTO'] if ENV['SMTP_ENABLE_STARTTLS_AUTO'].present?
-  end
-
-  if ENV['LETTER_OPENER']
-    config.action_mailer.delivery_method = :letter_opener
-  else
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = smtp_settings
-  end
-
-  # Set this to appropriate ingress service for which the options are :
-  # :relay for Exim, Postfix, Qmail
-  # :mailgun for Mailgun
-  # :mandrill for Mandrill
-  # :postmark for Postmark
-  # :sendgrid for Sendgrid
-  config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
-
   Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
 
   # Print deprecation notices to the Rails logger.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5b9acb497..f30ee2239 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -77,7 +77,7 @@ Rails.application.configure do
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
-  if ENV['RAILS_LOG_TO_STDOUT'].present?
+  if ActiveModel::Type::Boolean.new.cast(ENV.fetch('RAILS_LOG_TO_STDOUT', true))
     logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
@@ -98,17 +98,6 @@ Rails.application.configure do
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Chatwoot production settings
-  config.action_mailer.default_url_options = { host: ENV['FRONTEND_URL'] }
-  config.action_mailer.smtp_settings = {
-    address: ENV['SMTP_ADDRESS'],
-    port: ENV['SMTP_PORT'] || 587,
-    user_name: ENV['SMTP_USERNAME'],
-    password: ENV['SMTP_PASSWORD'],
-    authentication: :login,
-    enable_starttls_auto: true
-  }
-
   # Set this to appropriate ingress service for which the options are :
   # :relay for Exim, Postfix, Qmail
   # :mailgun for Mailgun
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 5243a2d59..36efcc171 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -54,31 +54,9 @@ Rails.application.configure do
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "chatwoot_#{Rails.env}"
-  config.action_mailer.perform_caching = false
-  config.action_mailer.default_url_options = { host: ENV['FRONTEND_URL'] }
-  config.action_mailer.smtp_settings = {
-    address: ENV['SMTP_ADDRESS'],
-    port: 587,
-    user_name: ENV['SMTP_USERNAME'], # Your SMTP user
-    password: ENV['SMTP_PASSWORD'], # Your SMTP password
-    authentication: :login,
-    enable_starttls_auto: true
-  }
 
   Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
 
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Set this to appropriate ingress service for which the options are :
-  # :relay for Exim, Postfix, Qmail
-  # :mailgun for Mailgun
-  # :mandrill for Mandrill
-  # :postmark for Postmark
-  # :sendgrid for Sendgrid
-  config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = [I18n.default_locale]
@@ -94,7 +72,7 @@ Rails.application.configure do
   # require 'syslog/logger'
   config.logger = ActiveSupport::Logger.new(Rails.root.join("log/#{Rails.env}.log"), 1, ENV.fetch('LOG_SIZE', '1024').to_i.megabytes)
 
-  if ENV['RAILS_LOG_TO_STDOUT'].present?
+  if ActiveModel::Type::Boolean.new.cast(ENV.fetch('RAILS_LOG_TO_STDOUT', true))
     logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger = ActiveSupport::TaggedLogging.new(logger)
diff --git a/config/features.yml b/config/features.yml
index 54dd79f33..912b4c235 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -1,8 +1,8 @@
 # DO NOT change the order of features EVER
 - name: inbound_emails
-  enabled: false
+  enabled: true
 - name: channel_email
-  enabled: false
+  enabled: true
 - name: channel_facebook
   enabled: true
 - name: channel_twitter
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 80eb40433..134005945 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,7 +12,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
+  config.mailer_sender = ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb
new file mode 100644
index 000000000..2ed599105
--- /dev/null
+++ b/config/initializers/mailer.rb
@@ -0,0 +1,45 @@
+Rails.application.configure do
+  #########################################
+  # Configuration Related to Action Mailer
+  #########################################
+
+  config.action_mailer.delivery_method = :smtp
+  # We need the application frontend url to be used in our emails
+  config.action_mailer.default_url_options = { host: ENV['FRONTEND_URL'] } if ENV['FRONTEND_URL'].present?
+  # We load certain mailer templates from our database. This ensures changes to it is reflected immediately
+  config.action_mailer.perform_caching = false
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.raise_delivery_errors = true
+
+  # Config related to smtp
+  smtp_settings = {
+    domain: ENV.fetch('SMTP_DOMAIN', ''),
+    address: ENV.fetch('SMTP_ADDRESS', 'localhost'),
+    port: ENV.fetch('SMTP_PORT', 587)
+  }
+
+  smtp_settings[:authentication] = ENV.fetch('SMTP_AUTHENTICATION', 'login').to_sym if ENV.fetch('SMTP_AUTHENTICATION', '').present?
+  smtp_settings[:user_name] = ENV['SMTP_USERNAME']
+  smtp_settings[:password] = ENV['SMTP_PASSWORD']
+  smtp_settings[:enable_starttls_auto] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_ENABLE_STARTTLS_AUTO', true))
+  smtp_settings[:openssl_verify_mode] = ENV.fetch('SMTP_OPENSSL_VERIFY_MODE', 'peer')
+  smtp_settings[:ssl] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_SSL', true)) if ENV['SMTP_SSL']
+  smtp_settings[:tls] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_TLS', true)) if ENV['SMTP_TLS']
+
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = smtp_settings
+  # You can use letter opener for your local development by setting the environment variable
+  config.action_mailer.delivery_method = :letter_opener if Rails.env.development? && ENV['LETTER_OPENER']
+
+  #########################################
+  # Configuration Related to Action MailBox
+  #########################################
+
+  # Set this to appropriate ingress service for which the options are :
+  # :relay for Exim, Postfix, Qmail
+  # :mailgun for Mailgun
+  # :mandrill for Mandrill
+  # :postmark for Postmark
+  # :sendgrid for Sendgrid
+  config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
+end
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index bc47cd202..6d3514185 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -47,6 +47,10 @@ ar:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "تم إسنادها إلى %{assignee_name} بواسطة %{user_name}"
         removed: "المحادثة غير مسندة بواسطة %{user_name}"
+      team:
+        assigned: "تم إسنادها إلى %{team_name} بواسطة %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1bc5cb8ce..493dba972 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -31,10 +31,10 @@ ca:
     period: Període d'informes %{since} a %{until}
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Nova conversació] - #%{display_id} ha estat creada a %{inbox_name}"
+      conversation_assignment: "[Assignada a tu] - #%{display_id} t'ha sigut assignada"
+      assigned_conversation_new_message: "[Nou missatge] - #%{display_id} %{content}"
+      conversation_mention: "Has sigut esmentat a la conversació [ID - %{display_id} per %{name}"
   conversations:
     messages:
       deleted: Aquest missatge a sigut eliminat
@@ -47,6 +47,10 @@ ca:
         self_assigned: "%{user_name} s'ha auto assignat aquesta conversa"
         assigned: "Assignada a %{assignee_name} per %{user_name}"
         removed: "%{user_name} ha tret l'assignació de la conversa"
+      team:
+        assigned: "Assignada a %{team_name} per %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} ha afegit %{labels}"
         removed: "%{user_name} ha eliminat %{labels}"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 63123e136..753cb7e04 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -37,7 +37,7 @@ cs:
       conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: Tato zpráva byla smazána
     activity:
       status:
         resolved: "Konverzace byla vyřešena uživatelem %{user_name}"
@@ -47,6 +47,10 @@ cs:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
         removed: "Konverzace zrušena uživatelem %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
@@ -58,11 +62,11 @@ cs:
       email_input_box_message_body: "Dostat upozornění e-mailem"
     reply:
       email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+      transcript_subject: "Přepis konverzace"
   integration_apps:
     slack:
       name: "Slack"
       description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
     webhooks:
-      name: "Webhooks"
+      name: "Webhooky"
       description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
diff --git a/config/locales/da.yml b/config/locales/da.yml
index b7d1dc9e9..bd5988ac3 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -47,6 +47,10 @@ da:
         self_assigned: "%{user_name} selv-tildelte denne samtale"
         assigned: "Tildelt %{assignee_name} af %{user_name}"
         removed: "Samtale fjernet tildeling af %{user_name}"
+      team:
+        assigned: "Tildelt %{team_name} af %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} tilføjede %{labels}"
         removed: "%{user_name} fjernede %{labels}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 01487d4f3..c743803d1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -47,6 +47,10 @@ de:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} von %{assignee_name} zugewiesen"
         removed: "Gespräch nicht zugewiesen von %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 2953246ad..a5f0d17e7 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -3,18 +3,18 @@ es:
   devise:
     confirmations:
       confirmed: "Su dirección de correo electrónico ha sido confirmada con éxito."
-      send_instructions: "Recibirás un correo electrónico con instrucciones para confirmar tu dirección de correo electrónico en unos minutos."
-      send_paranoid_instructions: "Si tu dirección de correo electrónico existe en nuestra base de datos, recibirás un correo electrónico con instrucciones para confirmar tu dirección de correo electrónico en unos minutos."
+      send_instructions: "Recibirá un correo electrónico con instrucciones para confirmar su dirección de correo electrónico en unos minutos."
+      send_paranoid_instructions: "Si su dirección de correo electrónico existe en nuestra base de datos, recibirá un correo electrónico con instrucciones para confirmar su dirección de correo electrónico en unos minutos."
     failure:
-      already_authenticated: "Ya has iniciado sesión."
-      inactive: "Tu cuenta aún no está activada."
-      invalid: "%{authentication_keys}/password o cuenta no válida aún no está verificada."
-      locked: "Tu cuenta está bloqueada."
-      last_attempt: "Tienes un intento más antes de que tu cuenta esté bloqueada."
+      already_authenticated: "Ya ha iniciado sesión."
+      inactive: "Su cuenta aún no está activada."
+      invalid: "%{authentication_keys}/password o cuenta no válida o aún no está verificada."
+      locked: "Su cuenta está bloqueada."
+      last_attempt: "Tiene un intento más antes de que su cuenta esté bloqueada."
       not_found_in_database: "%{authentication_keys} o contraseña no válida."
       timeout: "Su sesión ha caducado. Por favor, inicie sesión de nuevo para continuar."
-      unauthenticated: "Necesitas iniciar sesión o registrarte antes de continuar."
-      unconfirmed: "Tienes que confirmar tu dirección de correo electrónico antes de continuar."
+      unauthenticated: "Necesita iniciar sesión o registrarse antes de continuar."
+      unconfirmed: "Tiene que confirmar su dirección de correo electrónico antes de continuar."
     mailer:
       confirmation_instructions:
         subject: "Instrucciones de confirmación"
@@ -29,31 +29,31 @@ es:
       success: "Autenticado correctamente desde la cuenta de %{kind}."
     passwords:
       no_token: "No puede acceder a esta página sin proceder de un correo electrónico de restablecimiento de contraseña. Si viene de un correo electrónico de restablecimiento de contraseña, por favor asegúrese de utilizar la URL completa proporcionada."
-      send_instructions: "Recibirás un correo electrónico con instrucciones sobre cómo restablecer tu contraseña en unos minutos."
-      send_paranoid_instructions: "Si tu dirección de correo electrónico existe en nuestra base de datos, recibirás un enlace de recuperación de contraseña en tu dirección de correo electrónico en unos minutos."
-      updated: "Tu contraseña ha sido cambiada con éxito. Ahora estás conectado."
+      send_instructions: "Recibirá un correo electrónico con instrucciones sobre cómo restablecer su contraseña en unos minutos."
+      send_paranoid_instructions: "Si su dirección de correo electrónico existe en nuestra base de datos, recibirá un enlace de recuperación de contraseña en su dirección de correo electrónico en unos minutos."
+      updated: "Su contraseña ha sido cambiada con éxito. Ahora está conectado."
       updated_not_active: "Su contraseña se ha cambiado correctamente."
     registrations:
-      destroyed: "¡Por! Tu cuenta ha sido cancelada con éxito. Esperamos verte de nuevo pronto."
-      signed_up: "¡Bienvenido! Te has registrado correctamente."
-      signed_up_but_inactive: "Te has registrado correctamente. Sin embargo, no pudimos iniciar sesión porque tu cuenta aún no está activada."
-      signed_up_but_locked: "Te has registrado correctamente. Sin embargo, no pudimos iniciar sesión porque tu cuenta está bloqueada."
+      destroyed: "¡Su cuenta ha sido cancelada con éxito!. Esperamos verle de nuevo pronto."
+      signed_up: "¡Bienvenido! Se ha registrado correctamente."
+      signed_up_but_inactive: "Se ha registrado correctamente. Sin embargo, no pudimos iniciar sesión porque su cuenta aún no está activada."
+      signed_up_but_locked: "Se ha registrado correctamente. Sin embargo, no pudimos iniciar sesión porque su cuenta está bloqueada."
       signed_up_but_unconfirmed: "Se ha enviado un mensaje con un enlace de confirmación a su dirección de correo electrónico. Por favor, siga el enlace para activar su cuenta."
-      update_needs_confirmation: "Has actualizado tu cuenta con éxito, pero necesitamos verificar tu nueva dirección de correo electrónico. Por favor, comprueba tu correo electrónico y sigue el enlace de confirmación para confirmar tu nueva dirección de correo electrónico."
-      updated: "Tu cuenta se ha actualizado correctamente."
+      update_needs_confirmation: "Ha actualizado su cuenta con éxito, pero necesitamos verificar su nueva dirección de correo electrónico. Por favor, compruebe su correo electrónico y siga el enlace de confirmación para confirmar su nueva dirección de correo electrónico."
+      updated: "Su cuenta se ha actualizada correctamente."
     sessions:
       signed_in: "Sesión iniciada correctamente."
       signed_out: "Cerrado con éxito."
       already_signed_out: "Cerrado con éxito."
     unlocks:
-      send_instructions: "Recibirás un correo electrónico con instrucciones para desbloquear tu cuenta en unos minutos."
-      send_paranoid_instructions: "Si tu cuenta existe, recibirás un correo electrónico con instrucciones sobre cómo desbloquearla en unos minutos."
-      unlocked: "Tu cuenta ha sido desbloqueada con éxito. Por favor, inicia sesión para continuar."
+      send_instructions: "Recibirá un correo electrónico con instrucciones para desbloquear su cuenta en unos minutos."
+      send_paranoid_instructions: "Si su cuenta existe, recibirá un correo electrónico con instrucciones sobre cómo desbloquearla en unos minutos."
+      unlocked: "Su cuenta ha sido desbloqueada con éxito. Por favor, inicia sesión para continuar."
   errors:
     messages:
-      already_confirmed: "ya ha sido confirmado, por favor intenta iniciar sesión"
+      already_confirmed: "ya ha sido confirmado, por favor intente iniciar sesión"
       confirmation_period_expired: "necesita ser confirmado dentro de %{period}, por favor solicite una nueva"
-      expired: "ha expirado, por favor solicita uno nuevo"
+      expired: "ha expirado, por favor solicita uno nueva"
       not_found: "no encontrado"
       not_locked: "no se ha bloqueado"
       not_saved:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index bc4277617..b45a484ea 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -2,60 +2,60 @@
 hu:
   devise:
     confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+      confirmed: "Az email címed megerősítése sikerült."
+      send_instructions: "Néhány percen belül egy emailt fogsz kapni az email címed megerősítéséhez szükséges teendőkkel."
+      send_paranoid_instructions: "Ha az email címed már regisztrálva van a rendszerünkben, hamarosan egy emailt fogsz kapni a megerősítéshez szükséges teendőkkel."
     failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
-      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
+      already_authenticated: "Már be vagy jelentkezve."
+      inactive: "A fiókod még nincs aktiválva."
+      invalid: "Hibás %{authentication_keys}/jelszó vagy a fiók még nincs visszaigazolva."
+      locked: "A fiókod zárolva van."
+      last_attempt: "Egy próbálkozásod van a fiók zárolása előtt."
+      not_found_in_database: "Hibás %{authentication_keys} vagy jelszó."
+      timeout: "Időtúllépés. Kérlek jelentkezz be újra a folytatáshoz."
+      unauthenticated: "Lépj be vagy iratkozz fel mielőtt folytatnád."
+      unconfirmed: "A folytatás előtt meg kell erősítened e-mailcímed."
     mailer:
       confirmation_instructions:
-        subject: "Confirmation Instructions"
+        subject: "Megerősítési instrukciók"
       reset_password_instructions:
-        subject: "Reset password instructions"
+        subject: "Jelszó változtatási instrukciók"
       unlock_instructions:
-        subject: "Unlock instructions"
+        subject: "Feloldási instrukciók"
       password_change:
-        subject: "Password Changed"
+        subject: "Jelszó megváltoztatva"
     omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
+      failure: "Nem tudunk authentikálni a %{kind} mert %{reason}."
+      success: "Sikeresen authentikált a %{kind} fiókról."
     passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
+      no_token: "Nem tudod elérni az oldalt, csak ha jelszóváltó e-mailről érkezel. Ha onnan érkezel, akkor kérjük bizonyosodj meg róla, hogy a teljes megadott URL-t használod."
+      send_instructions: "Néhány percen belül egy e-mailt fogsz kapni a jelszavad megváltoztatásához szükséges teendőkkel."
+      send_paranoid_instructions: "Ha az email címed már regisztrálva van a rendszerünkben, néhány percen belül egy emailt fogsz kapni a jelszavad megváltoztatásához szükséges linkkel."
+      updated: "A jelszavad sikeresen megváltoztattad. Most már be vagy jelentkezve."
+      updated_not_active: "A jelszavad sikeresen megváltoztattad."
     registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated successfully."
+      destroyed: "Viszlát! A fiókod sikeresen megszüntetted. Reméljük hamarosan viszontláthatunk."
+      signed_up: "Köszöntünk! Sikeresen feliratkoztál."
+      signed_up_but_inactive: "Sikeresen feliratkoztál. Viszont nem tudsz még belépni, mivel a fiókod nincs aktiválva."
+      signed_up_but_locked: "Sikeresen feliratkoztál. Viszont még nem tudsz belépni, mivel a fiókod zárolva van."
+      signed_up_but_unconfirmed: "Egy jóváhagyó linket tartalmazó e-mailt elküldünk az e-mailcímedre. Kérjük kövesd a linket a fiókod aktiválásához."
+      update_needs_confirmation: "A fiókod sikeresen frissítetted de még ellenőriznünk kell az e-mailcímed. Kérjük ellenőrizd az e-mail fiókod és kövesd a benne található ellenörző linked az új e-mailcímed megerősítéséhez."
+      updated: "A fiókod sikeresen frissítetted."
     sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
+      signed_in: "Sikeresen belépett."
+      signed_out: "Sikeresen kilépett."
+      already_signed_out: "Sikeresen kilépett."
     unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+      send_instructions: "Néhány percen belül egy emailt fogsz kapni a fiókod zárolásának feloldásához szükséges teendőkkel."
+      send_paranoid_instructions: "Ha létezik a fiókod, fogsz kapni egy e-mailt a fiókod zárolásának feloldásához szükséges teendőkkel."
+      unlocked: "A fiókod zárolását sikeresen feloldottad. Kérjük lépj be a folytatáshoz."
   errors:
     messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
+      already_confirmed: "már megerősítve, kérjük próbálj meg belépni"
+      confirmation_period_expired: "a következő %{period} szükséges megerősíteni, kérjük kérvényezz egy újat"
+      expired: "lejárt, kérjük kérvényezz egy újat"
+      not_found: "nem található"
+      not_locked: "nem volt zárolva"
       not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+        one: "Egy hiba miatt nem lehetett elmenteni az alábbit: %{resource}"
+        other: "%{count} hiba miatt nem lehetett elmenteni az alábbit: %{resource}"
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index 31fa3ad96..7b934eb24 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -8,9 +8,9 @@ sv:
     failure:
       already_authenticated: "Du är redan inloggad."
       inactive: "Ditt konto är inte aktiverat ännu."
-      invalid: "Ogiltigt %{authentication_keys}/lösenord eller konto är inte verifierat ännu."
+      invalid: "Ogiltigt %{authentication_keys}/lösenord eller så är kontot inte verifierat ännu."
       locked: "Ditt konto är låst."
-      last_attempt: "Du har ett försök till innan ditt konto är låst."
+      last_attempt: "Du har ett försök till innan ditt konto blir låst."
       not_found_in_database: "Ogiltigt %{authentication_keys} eller lösenord."
       timeout: "Din session har löpt ut. Logga in igen för att fortsätta."
       unauthenticated: "Du måste logga in eller registrera dig innan du fortsätter."
@@ -28,13 +28,13 @@ sv:
       failure: "Kunde inte autentisera dig från %{kind} eftersom \"%{reason}\"."
       success: "Lyckad autentisering från %{kind} -konto."
     passwords:
-      no_token: "Du kan inte komma åt denna sida utan att komma från en lösenordsåterställning e-post. Om du kommer från ett e-postmeddelande för återställning av lösenord, se till att du använde hela URL:en."
+      no_token: "Du kan inte komma åt denna sida utan att komma från ett lösenordsåterställningsmejl. Om du kommer från ett e-postmeddelande för återställning av lösenord, se till att du använde hela URL:en."
       send_instructions: "Du kommer att få ett e-postmeddelande med instruktioner om hur du återställer ditt lösenord inom några minuter."
       send_paranoid_instructions: "Om din e-postadress finns i vår databas kommer du att få en länk för återställning av lösenord på din e-postadress om några minuter."
       updated: "Ditt lösenord har ändrats. Du är nu inloggad."
       updated_not_active: "Ditt lösenord har ändrats."
     registrations:
-      destroyed: "Hej då! Ditt konto har avbrutits. Vi hoppas att se dig igen snart."
+      destroyed: "Hej då! Ditt konto har sagts upp. Vi hoppas att se dig igen snart."
       signed_up: "Välkommen! Du har registrerat dig."
       signed_up_but_inactive: "Du har registrerat dig. Vi kunde dock inte logga in dig eftersom ditt konto ännu inte är aktiverat."
       signed_up_but_locked: "Du har registrerat dig. Vi kunde dock inte logga in dig eftersom ditt konto är låst."
@@ -42,9 +42,9 @@ sv:
       update_needs_confirmation: "Du har uppdaterat ditt konto, men vi måste verifiera din nya e-postadress. Kontrollera din e-post och följ bekräftelselänken för att bekräfta din nya e-postadress."
       updated: "Ditt konto har uppdaterats."
     sessions:
-      signed_in: "Inloggad framgångsrikt."
-      signed_out: "Utloggad framgångsrikt."
-      already_signed_out: "Utloggad framgångsrikt."
+      signed_in: "Inloggad."
+      signed_out: "Utloggad."
+      already_signed_out: "Utloggad."
     unlocks:
       send_instructions: "Du kommer att få ett e-postmeddelande med instruktioner för hur du låser upp ditt konto inom några minuter."
       send_paranoid_instructions: "Om ditt konto finns får du ett e-postmeddelande med instruktioner för hur du låser upp det inom några minuter."
diff --git a/config/locales/devise.zh_CN.yml b/config/locales/devise.zh_CN.yml
index 2bf2831a8..f8613c84c 100644
--- a/config/locales/devise.zh_CN.yml
+++ b/config/locales/devise.zh_CN.yml
@@ -1,5 +1,5 @@
 #Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-zh_CN:
+zh-CN:
   devise:
     confirmations:
       confirmed: "您的电子邮件地址已成功确认。"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4a3622f9a..bc02b9e0b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -47,6 +47,10 @@ el:
         self_assigned: "Ο χρήστης %{user_name} ανέλαβε αυτήν την συνομιλία"
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
         removed: "Η συνομιλία σημάνθηκε ως μη ανατεθειμένη από τον %{user_name}"
+      team:
+        assigned: "Ανατέθηκε στον %{team_name} από τον %{user_name}"
+        assigned_with_assignee: "Ανατέθηκε στον %{assignee_name} μέσω %{team_name} από %{user_name}"
+        removed: "Από-ανατέθηκε στον %{team_name} από %{user_name}"
       labels:
         added: "Ο %{user_name} πρόσθεσε ετικέτες %{labels}"
         removed: "Ο %{user_name} αφαίρεσε τις ετικέτες %{labels}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b8e0952d9..a344118a0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -63,6 +63,10 @@ en:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5d605772e..50c981abe 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -28,16 +28,16 @@ es:
       email_already_exists: "Ya te has registrado en una cuenta con %{email}"
       failed: Registro fallido
   reports:
-    period: Reporting period %{since} to %{until}
+    period: Reportando el periodo desde %{since} hasta %{until}
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Nueva conversación] - #%{display_id} ha sido creado en %{inbox_name}"
+      conversation_assignment: "[Asignado a usted] - #%{display_id} le ha sido asignado a usted"
+      assigned_conversation_new_message: "[Nuevo mensaje] - #%{display_id} %{content}"
+      conversation_mention: "Ha sido mencionado en la conversación [ID - %{display_id}] por %{name}"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: Este mensaje se ha eliminado
     activity:
       status:
         resolved: "La conversación fue marcada por %{user_name}"
@@ -47,11 +47,15 @@ es:
         self_assigned: "%{user_name} auto-asignado a esta conversación"
         assigned: "Asignado a %{assignee_name} por %{user_name}"
         removed: "Conversación no asignada por %{user_name}"
+      team:
+        assigned: "Asignado a %{team_name} por %{user_name}"
+        assigned_with_assignee: "Asignado a %{assignee_name} via %{team_name} por %{user_name}"
+        removed: "Desasignado de %{team_name} por %{user_name}"
       labels:
         added: "%{user_name} agregó %{labels}"
         removed: "%{user_name} eliminó a %{labels}"
       muted: "%{user_name} ha silenciado la conversación"
-      unmuted: "%{user_name} ha dessilenciado la conversación"
+      unmuted: "%{user_name} ha anulado el silenciado de la conversación"
     templates:
       greeting_message_body: "%{account_name} normalmente responde en unas pocas horas."
       ways_to_reach_you_message_body: "Dale al equipo una forma de llegar a ti."
@@ -62,7 +66,7 @@ es:
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "Slack es una herramienta de chat que reúne toda su comunicación en un solo lugar. Al integrar Slack, puede ser notificado de todas las nuevas conversaciones en su cuenta directamente dentro de su Slack."
     webhooks:
-      name: "Webhooks"
-      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+      name: "Webhook"
+      description: "Los eventos Webhook le proporcionan información en tiempo real sobre lo que está sucediendo en su cuenta de Chatwoot. Puede hacer uso de los webhooks para comunicar los eventos a sus aplicaciones favoritas como Slack o Github. Haga clic en Configurar para configurar sus webhooks."
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 603e7693b..1620e71e1 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -32,9 +32,9 @@ fa:
   notifications:
     notification_title:
       conversation_creation: "[گفتگو جدید] - #%{display_id} در %{inbox_name} ایجاد شده است"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_assignment: "[به شما اختصاص داده شده است] - #%{display_id} به شما اختصاص داده شده است"
+      assigned_conversation_new_message: "[پیام جدید] - #%{display_id} %{content}"
+      conversation_mention: "نام شما در مکالمه [ID -%{display_id}] توسط %{name} ذکر شده است"
   conversations:
     messages:
       deleted: این پیام حذف شد
@@ -47,6 +47,10 @@ fa:
         self_assigned: "%{user_name} این مکالمه را به خود اختصاص داد"
         assigned: "%{user_name} گفتگو را به %{assignee_name} اختصاص داد"
         removed: "گفتگو توسط اپراتور %{user_name} به وضعیت اختصاص داده نشده تغییر یافت"
+      team:
+        assigned: "%{user_name} گفتگو را به %{team_name} اختصاص داد"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name}، %{labels} را اضافه کرد"
         removed: "%{user_name}، %{labels} را حذف کرد"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 78f3947df..a9bae6bb4 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -47,6 +47,10 @@ fi:
         self_assigned: "%{user_name} ilmottautui keskusteluun"
         assigned: "Delegoitu edustajalle %{assignee_name} edustajan %{user_name} toimesta"
         removed: "%{user_name} poistui keskustelusta"
+      team:
+        assigned: "Delegoitu edustajalle %{team_name} edustajan %{user_name} toimesta"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} lisäsi tunnisteet %{labels}"
         removed: "%{user_name} poisti tunnisteet %{labels}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 265d8a260..4eb03b7c9 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -31,10 +31,10 @@ fr:
     period: Période de rapport %{since} à %{until}
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Nouvelle conversation] - #%{display_id} a été créé dans %{inbox_name}"
+      conversation_assignment: "[Vous a été assigné] - #%{display_id} vous a été assigné"
+      assigned_conversation_new_message: "[Nouveau message] - #%{display_id} %{content}"
+      conversation_mention: "Vous avez été mentionné dans la conversation [ID - %{display_id}] par %{name}"
   conversations:
     messages:
       deleted: Ce message a été supprimé
@@ -47,6 +47,10 @@ fr:
         self_assigned: "%{user_name} s'est auto-assigné cette conversation"
         assigned: "Assigné à %{assignee_name} par %{user_name}"
         removed: "Responsable de la conversation supprimé par %{user_name}"
+      team:
+        assigned: "Assigné à %{team_name} par %{user_name}"
+        assigned_with_assignee: "Assigné à %{assignee_name} via %{team_name} par %{user_name}"
+        removed: "Non assigné de %{team_name} par %{user_name}"
       labels:
         added: "%{user_name} a ajouté %{labels}"
         removed: "%{user_name} a supprimé %{labels}"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index f2f5a0e0d..0ad911385 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -47,6 +47,10 @@ hi:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 9469a16d7..7fbd3e374 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -17,52 +17,56 @@
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
 hu:
-  hello: "Hello world"
+  hello: "Szia világ"
   messages:
-    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
-    reset_password_failure: Uh ho! We could not find any user with the specified email.
+    reset_password_success: Mi?! A jelszóvisszaállítási kérésed sikeres volt. Nézd meg az e-mailed a részletekért.
+    reset_password_failure: Jajj ne! Nem találtunk felhasználót ezzel az e-mailcímmel.
   errors:
     signup:
-      disposable_email: We do not allow disposable emails
-      invalid_email: You have entered an invalid email
-      email_already_exists: "You have already signed up for an account with %{email}"
-      failed: Signup failed
+      disposable_email: Nem támogatjuk az eldobható e-mailcímeket
+      invalid_email: Hibás e-mailcímet adtál meg
+      email_already_exists: "Ezzel az e-mailcímmel már van fiók: %{email}"
+      failed: Feliratkozás sikertelen
   reports:
-    period: Reporting period %{since} to %{until}
+    period: Jelentési időszak %{since}-tól %{until}-ig
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Új beszélgetés] - #%{display_id} létrejött itt:%{inbox_name}"
+      conversation_assignment: "[Hozzád rendelve] - #%{display_id} hozzád lett rendelve"
+      assigned_conversation_new_message: "[Új üzenet] - #%{display_id} %{content}"
+      conversation_mention: "%{name} megemlítet ebben a beszélgetésben [ID - %{display_id}]"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: Az üzenet törölve lett
     activity:
       status:
-        resolved: "Conversation was marked resolved by %{user_name}"
-        open: "Conversation was reopened by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        resolved: "A beszélgetést lezárta %{user_name}"
+        open: "A beszélgetést újranyitotta %{user_name}"
+        auto_resolved: "A beszélgetést lezárta a rendszer mivel %{duration} napja inaktív volt"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
-        assigned: "Assigned to %{assignee_name} by %{user_name}"
-        removed: "Conversation unassigned by %{user_name}"
+        self_assigned: "%{user_name} magára osztotta ezt a beszélgetést"
+        assigned: "%{user_name} ráosztotta a beszélgetést: %{assignee_name}"
+        removed: "A beszélgetést gazdátlanná tette %{user_name}"
+      team:
+        assigned: "%{user_name} ráosztotta a beszélgetést: %{team_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} a következő cimkéket adta hozzá: %{labels}"
+        removed: "%{user_name} leszedte a következő cimkéket %{labels}"
+      muted: "%{user_name} elnémította a beszélgetést"
+      unmuted: "%{user_name} kikapcsolta a beszélgetés elnémítását"
     templates:
-      greeting_message_body: "%{account_name} typically replies in a few hours."
-      ways_to_reach_you_message_body: "Give the team a way to reach you."
-      email_input_box_message_body: "Get notified by email"
+      greeting_message_body: "%{account_name} általában néhány órán belül válaszol."
+      ways_to_reach_you_message_body: "Adj egy elérhetőséget hogy megkereshessenek."
+      email_input_box_message_body: "E-mail értesítés kérése"
     reply:
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+      email_subject: "Új üzenet a beszélgetésben"
+      transcript_subject: "Beszélgetés kivonat"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "A Slack egy chat eszköz mely minden kommunikációdat összehozza. A Slack integrálásával értesítést kaphasz új beszélgetésekről a Slack fiókodban."
     webhooks:
-      name: "Webhooks"
-      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+      name: "Webhook"
+      description: "A Webhook események valós idejű információt adnak arról, hogy mi történik a fiókodban. Webhookokat használhatsz arra, hogy az eseményeket a kedvenc appjaidban, pl. a Slackben vagy a Githubban használd. Kattints hogy beállíthast a Webhookjaidat."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 6628e24b2..faa83cc7a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -47,6 +47,10 @@ id:
         self_assigned: "%{user_name} menetapkan sendiri percakapan ini"
         assigned: "Ditugaskan ke %{assignee_name} oleh %{user_name}"
         removed: "Percakapan batal ditetapkan oleh %{user_name}"
+      team:
+        assigned: "Ditugaskan ke %{team_name} oleh %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} menambahkan %{labels}"
         removed: "%{user_name} menghapus %{labels}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d13111986..6d11c1871 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -47,6 +47,10 @@ it:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 004b130f0..dc4ac73c7 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -47,6 +47,10 @@ ja:
         self_assigned: "%{user_name} がこの会話を自身で割り当てました"
         assigned: "%{assignee_name} によって %{user_name} に割り当てられました"
         removed: "%{user_name} によって割り当てられていない会話です"
+      team:
+        assigned: "%{team_name} によって %{user_name} に割り当てられました"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 04bfb7ecb..e98db0bd5 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -47,6 +47,10 @@ ko:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 799206987..1340afc54 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -47,6 +47,10 @@ ml:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{assignee_name} %{user_name}-നെ നിയുക്തനാക്കി "
         removed: "%{user_name} സംഭാഷണം നിയുക്തമല്ലാതാക്കി"
+      team:
+        assigned: "%{team_name} %{user_name}-നെ നിയുക്തനാക്കി "
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index dabc2b1bc..358764340 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -47,6 +47,10 @@ ne:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 64a4bd8d4..848283e20 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -47,6 +47,10 @@ nl:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Toegewezen aan %{assignee_name} door %{user_name}"
         removed: "Gesprek niet toegewezen door %{user_name}"
+      team:
+        assigned: "Toegewezen aan %{team_name} door %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 2caca2b67..137c05f72 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -47,6 +47,10 @@
         self_assigned: "%{user_name} tilordnet seg denne samtalen"
         assigned: "Tildelt til %{assignee_name} av %{user_name}"
         removed: "%{user_name} fjernet tildelingen til samtalen"
+      team:
+        assigned: "Tildelt til %{team_name} av %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} la til %{labels}"
         removed: "%{user_name} fjernet %{labels}"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 61f2c7d28..2f6206d35 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -47,6 +47,10 @@ pl:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
         removed: "Rozmowa nieprzypisana przez %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index a15e009d0..5152fcd18 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -47,6 +47,10 @@ pt:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
+      team:
+        assigned: "Atribuído a %{team_name} por %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 6e2416759..ef71eb20d 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -31,10 +31,10 @@ pt_BR:
     period: Reportando o período %{since} a %{until}
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Nova conversa] - #%{display_id} foi criado em %{inbox_name}"
+      conversation_assignment: "[Atribuído a você] - #%{display_id} foi atribuído a você"
+      assigned_conversation_new_message: "[Nova mensagem] - #%{display_id} %{content}"
+      conversation_mention: "Você foi mencionado na conversa [ID - %{display_id}] por %{name}"
   conversations:
     messages:
       deleted: Esta mensagem foi apagada
@@ -47,6 +47,10 @@ pt_BR:
         self_assigned: "%{user_name} atribuiu a si mesmo essa conversa"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
+      team:
+        assigned: "Atribuído a %{team_name} por %{user_name}"
+        assigned_with_assignee: "Atribuído a %{assignee_name} via %{team_name} por %{user_name}"
+        removed: "Desatribuído de %{team_name} por %{user_name}"
       labels:
         added: "%{user_name} adicionou %{labels}"
         removed: "%{user_name} removeu %{labels}"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 533c49dfc..5ed6d7d90 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -47,6 +47,10 @@ ro:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
         removed: "Conversație neasociată de %{user_name}"
+      team:
+        assigned: "Atribuit lui %{team_name} de %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b827095ab..469c7e835 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -47,6 +47,10 @@ ru:
         self_assigned: "%{user_name} назначил(а) разговор себе"
         assigned: "%{user_name} назначил %{assignee_name} ответственным"
         removed: "Ответственный снят %{user_name}"
+      team:
+        assigned: "%{user_name} назначил %{team_name} ответственным"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} добавил %{labels}"
         removed: "%{user_name} удалил %{labels}"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ffc53a218..dd95e647f 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -47,6 +47,10 @@ sk:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 2f04bd448..aeb63a7b4 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -20,10 +20,10 @@ sv:
   hello: "Hej världen"
   messages:
     reset_password_success: Woot! Begäran om återställning av lösenord lyckades. Kontrollera din e-post för instruktioner.
-    reset_password_failure: Uh ho! Vi kunde inte hitta någon användare med den angivna e-postadressen.
+    reset_password_failure: Oj då! Vi kunde inte hitta någon användare med den angivna e-postadressen.
   errors:
     signup:
-      disposable_email: Vi tillåter inte engångs e-post
+      disposable_email: Vi tillåter inte engångsadresser
       invalid_email: Du har angett en ogiltig e-postadress
       email_already_exists: "Du har redan registrerat dig för ett konto med %{email}"
       failed: Registrering misslyckades
@@ -31,10 +31,10 @@ sv:
     period: Rapporteringsperiod %{since} till %{until}
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Ny konversation] - #%{display_id} har skapats i %{inbox_name}"
+      conversation_assignment: "[Tilldelad dig] - #%{display_id} har tilldelats dig"
+      assigned_conversation_new_message: "[Nytt meddelande] - #%{display_id} %{content}"
+      conversation_mention: "Du har nämnts i konversationen [ID - %{display_id}] av %{name}"
   conversations:
     messages:
       deleted: Detta meddelande har tagits bort
@@ -47,6 +47,10 @@ sv:
         self_assigned: "%{user_name} har tilldelat sig denna konversation"
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
         removed: "Konversation otilldelad av %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} har lagt till %{labels}"
         removed: "%{user_name} tog bort %{labels}"
@@ -54,7 +58,7 @@ sv:
       unmuted: "%{user_name} har avtystat konversationen"
     templates:
       greeting_message_body: "%{account_name} svarar vanligtvis inom några timmar."
-      ways_to_reach_you_message_body: "Ge laget ett sätt att nå dig."
+      ways_to_reach_you_message_body: "Ge teamet ett sätt att nå dig."
       email_input_box_message_body: "Få meddelande via e-post"
     reply:
       email_subject: "Nya meddelanden i denna konversation"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index a27b41a65..7f1b08bee 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -47,6 +47,10 @@ ta:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} இதை %{assignee_name}க்கு ஒதுக்கியுள்ளார்"
         removed: "%{user_name} இதை ஒதுக்க படாத உரையாடளாக்கியுள்ளார்"
+      team:
+        assigned: "%{user_name} இதை %{team_name}க்கு ஒதுக்கியுள்ளார்"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b9ebb7ab4..6358ac3ca 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -47,6 +47,10 @@ th:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bb2e4b5dd..9170587af 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -47,6 +47,10 @@ tr:
         self_assigned: "%{user_name} bu görüşmeyi kendisi atadı"
         assigned: "%{user_name} tarafından %{assignee_name} adına atandı"
         removed: "Görüşmenin ataması %{user_name} tarafından kaldırıldı"
+      team:
+        assigned: "%{user_name} tarafından %{team_name} adına atandı"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name},%{labels} ekledi"
         removed: "%{user_name} , %{labels} kaldırdı"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 11292f00a..c031cbab8 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -47,6 +47,10 @@ uk:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 64d98e9de..825432ffb 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -47,6 +47,10 @@ vi:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Chỉ định %{assignee_name} bởi %{user_name}"
         removed: "Cuộc hội thoại chưa được chỉ định bởi %{user_name}"
+      team:
+        assigned: "Chỉ định %{team_name} bởi %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 1766b6543..b3ac46b07 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -16,7 +16,7 @@
 #'true': 'foo'
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
-zh_CN:
+zh-CN:
   hello: "您好世界"
   messages:
     reset_password_success: 哇！密码重置请求成功。请检查您的邮件获取说明。
@@ -47,6 +47,10 @@ zh_CN:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "由 %{assignee_name} 分配给 %{user_name}"
         removed: "对话未被 %{user_name} 分配"
+      team:
+        assigned: "由 %{team_name} 分配给 %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index daa570899..00f30baf8 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -47,6 +47,10 @@ zh_TW:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "被%{user_name}分配給%{assignee_name}。"
         removed: "對話被%{user_name}設定成未分配。"
+      team:
+        assigned: "被%{user_name}分配給%{team_name}。"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
diff --git a/config/webpack/resolve.js b/config/webpack/resolve.js
index bfed5b881..8ff805de9 100644
--- a/config/webpack/resolve.js
+++ b/config/webpack/resolve.js
@@ -8,6 +8,10 @@ const resolve = {
     widget: path.resolve('./app/javascript/widget'),
     assets: path.resolve('./app/javascript/dashboard/assets'),
     components: path.resolve('./app/javascript/dashboard/components'),
+    './iconfont.eot': 'vue-easytable/libs/font/iconfont.eot',
+    './iconfont.woff': 'vue-easytable/libs/font/iconfont.woff',
+    './iconfont.ttf': 'vue-easytable/libs/font/iconfont.ttf',
+    './iconfont.svg': 'vue-easytable/libs/font/iconfont.svg',
   },
 };
 
diff --git a/db/migrate/20210222131048_change_working_hours_to_zero.rb b/db/migrate/20210222131048_change_working_hours_to_zero.rb
new file mode 100644
index 000000000..7d163e55e
--- /dev/null
+++ b/db/migrate/20210222131048_change_working_hours_to_zero.rb
@@ -0,0 +1,11 @@
+class ChangeWorkingHoursToZero < ActiveRecord::Migration[6.0]
+  # rubocop:disable Rails/SkipsModelValidations
+  def up
+    WorkingHour.where(day_of_week: 7).update_all(day_of_week: 0)
+  end
+
+  def down
+    WorkingHour.where(day_of_week: 0).update_all(day_of_week: 7)
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+end
diff --git a/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb b/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb
new file mode 100644
index 000000000..b30d3dffc
--- /dev/null
+++ b/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb
@@ -0,0 +1,6 @@
+class SwitchTimeZoneFromAccountToInbox < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :accounts, :timezone, :string, default: 'UTC'
+    add_column :inboxes, :timezone, :string, default: 'UTC'
+  end
+end
diff --git a/db/migrate/20210303192243_rename_channel_email_forward_address.rb b/db/migrate/20210303192243_rename_channel_email_forward_address.rb
new file mode 100644
index 000000000..1ccec24f5
--- /dev/null
+++ b/db/migrate/20210303192243_rename_channel_email_forward_address.rb
@@ -0,0 +1,5 @@
+class RenameChannelEmailForwardAddress < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :channel_email, :forward_to_address, :forward_to_email
+  end
+end
diff --git a/db/migrate/20210315101919_enable_email_channel.rb b/db/migrate/20210315101919_enable_email_channel.rb
new file mode 100644
index 000000000..194a4c5a3
--- /dev/null
+++ b/db/migrate/20210315101919_enable_email_channel.rb
@@ -0,0 +1,17 @@
+class EnableEmailChannel < ActiveRecord::Migration[6.0]
+  def change
+    current_config = InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').last
+    current_config.value.each { |v| v['enabled'] = true if %w[inbound_emails channel_email].include?(v['name']) }
+    current_config.save!
+
+    ConfigLoader.new.process
+
+    Account.find_in_batches do |account_batch|
+      account_batch.each do |account|
+        account.enable_features('inbound_emails')
+        account.enable_features('channel_email')
+        account.save!
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bf0f57714..13c8a69a1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_02_19_085719) do
+ActiveRecord::Schema.define(version: 2021_03_15_101919) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -50,7 +50,6 @@ ActiveRecord::Schema.define(version: 2021_02_19_085719) do
     t.integer "settings_flags", default: 0, null: false
     t.integer "feature_flags", default: 0, null: false
     t.integer "auto_resolve_duration"
-    t.string "timezone", default: "UTC"
   end
 
   create_table "action_mailbox_inbound_emails", force: :cascade do |t|
@@ -132,11 +131,11 @@ ActiveRecord::Schema.define(version: 2021_02_19_085719) do
   create_table "channel_email", force: :cascade do |t|
     t.integer "account_id", null: false
     t.string "email", null: false
-    t.string "forward_to_address", null: false
+    t.string "forward_to_email", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["email"], name: "index_channel_email_on_email", unique: true
-    t.index ["forward_to_address"], name: "index_channel_email_on_forward_to_address", unique: true
+    t.index ["forward_to_email"], name: "index_channel_email_on_forward_to_email", unique: true
   end
 
   create_table "channel_facebook_pages", id: :serial, force: :cascade do |t|
@@ -303,6 +302,7 @@ ActiveRecord::Schema.define(version: 2021_02_19_085719) do
     t.string "email_address"
     t.boolean "working_hours_enabled", default: false
     t.string "out_of_office_message"
+    t.string "timezone", default: "UTC"
     t.index ["account_id"], name: "index_inboxes_on_account_id"
   end
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 60822d7f2..49227aef9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -13,9 +13,7 @@ unless Rails.env.production?
   SuperAdmin.create!(email: 'john@acme.inc', password: '123456')
 
   account = Account.create!(
-    name: 'Acme Inc',
-    domain: 'support.chatwoot.com',
-    support_email: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
+    name: 'Acme Inc'
   )
 
   user = User.new(name: 'John', email: 'john@acme.inc', password: '123456')
diff --git a/lib/current.rb b/lib/current.rb
index 4490932f0..bfa380f43 100644
--- a/lib/current.rb
+++ b/lib/current.rb
@@ -3,11 +3,6 @@ module Current
   thread_mattr_accessor :account
   thread_mattr_accessor :account_user
 
-  def account=(account)
-    super
-    Time.zone = account.timezone
-  end
-
   def self.reset
     Current.user = nil
     Current.account = nil
diff --git a/lib/events/types.rb b/lib/events/types.rb
index d1bc0885b..d63255379 100644
--- a/lib/events/types.rb
+++ b/lib/events/types.rb
@@ -17,6 +17,7 @@ module Events::Types
   CONVERSATION_LOCK_TOGGLE = 'conversation.lock_toggle'
   CONVERSATION_CONTACT_CHANGED = 'conversation.contact_changed'
   ASSIGNEE_CHANGED = 'assignee.changed'
+  TEAM_CHANGED = 'team.changed'
   CONVERSATION_TYPING_ON = 'conversation.typing_on'
   CONVERSATION_TYPING_OFF = 'conversation.typing_off'
 
diff --git a/package.json b/package.json
index 182dba8d1..8257a2b8c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/javascript --fix",
@@ -49,6 +49,7 @@
     "vue-chartjs": "^3.4.2",
     "vue-clickaway": "~2.1.0",
     "vue-color": "^2.7.1",
+    "vue-easytable": "^2.1.2",
     "vue-i18n": "^8.22.1",
     "vue-loader": "^15.7.0",
     "vue-multiselect": "~2.1.6",
diff --git a/public/dashboard/audios/ding.mp3 b/public/dashboard/audios/ding.mp3
new file mode 100644
index 000000000..7c190424b
Binary files /dev/null and b/public/dashboard/audios/ding.mp3 differ
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 3b01c36fc..0c52e869c 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -141,7 +141,18 @@ RSpec.describe 'Inboxes API', type: :request do
       let(:admin) { create(:user, account: account, role: :administrator) }
       let(:valid_params) { {  enable_auto_assignment: false, channel: { website_url: 'test.com' } } }
 
-      it 'updates inbox' do
+      it 'will not update inbox for agent' do
+        agent = create(:user, account: account, role: :agent)
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}",
+              headers: agent.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'updates inbox when administrator' do
         patch "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}",
               headers: admin.create_new_auth_token,
               params: valid_params,
@@ -151,7 +162,7 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(inbox.reload.enable_auto_assignment).to be_falsey
       end
 
-      it 'updates avatar' do
+      it 'updates avatar when administrator' do
         # no avatar before upload
         expect(inbox.avatar.attached?).to eq(false)
         file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
@@ -165,15 +176,19 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(inbox.avatar.attached?).to eq(true)
       end
 
-      it 'will not update inbox for agent' do
-        agent = create(:user, account: account, role: :agent)
-
+      it 'updates working hours when administrator' do
+        params = {
+          working_hours: [{ 'day_of_week' => 0, 'open_hour' => 9, 'open_minutes' => 0, 'close_hour' => 17, 'close_minutes' => 0 }],
+          working_hours_enabled: true,
+          out_of_office_message: 'hello'
+        }
         patch "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}",
-              headers: agent.create_new_auth_token,
-              params: valid_params,
-              as: :json
+              params: valid_params.merge(params),
+              headers: admin.create_new_auth_token
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_http_status(:success)
+        inbox.reload
+        expect(inbox.reload.weekly_schedule.find { |schedule| schedule['day_of_week'] == 0 }['open_hour']).to eq 9
       end
     end
   end
diff --git a/spec/factories/channel/channel_email.rb b/spec/factories/channel/channel_email.rb
index 4af1953fd..6e01dffdd 100644
--- a/spec/factories/channel/channel_email.rb
+++ b/spec/factories/channel/channel_email.rb
@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :channel_email, class: 'Channel::Email' do
     sequence(:email) { |n| "care-#{n}@example.com" }
-    sequence(:forward_to_address) { |n| "forward-#{n}@chatwoot.com" }
+    sequence(:forward_to_email) { |n| "forward-#{n}@chatwoot.com" }
     account
     after(:create) do |channel_email|
       create(:inbox, channel: channel_email, account: channel_email.account)
diff --git a/spec/listeners/notification_listener_spec.rb b/spec/listeners/notification_listener_spec.rb
index 8a80cd82f..4cbf3243d 100644
--- a/spec/listeners/notification_listener_spec.rb
+++ b/spec/listeners/notification_listener_spec.rb
@@ -47,13 +47,15 @@ describe NotificationListener do
   describe 'message_created' do
     let(:event_name) { :'message.created' }
 
+    before do
+      notification_setting = agent_with_notification.notification_settings.find_by(account_id: account.id)
+      notification_setting.selected_email_flags = [:email_conversation_mention]
+      notification_setting.selected_push_flags = []
+      notification_setting.save!
+    end
+
     context 'when message contains mention' do
       it 'creates notifications for inbox member who was mentioned' do
-        notification_setting = agent_with_notification.notification_settings.find_by(account_id: account.id)
-        notification_setting.selected_email_flags = [:email_conversation_mention]
-        notification_setting.selected_push_flags = []
-        notification_setting.save!
-
         builder = double
         allow(NotificationBuilder).to receive(:new).and_return(builder)
         allow(builder).to receive(:perform)
@@ -78,5 +80,28 @@ describe NotificationListener do
                                                                 primary_actor: message)
       end
     end
+
+    context 'when message content is empty' do
+      it 'creates notifications' do
+        builder = double
+        allow(NotificationBuilder).to receive(:new).and_return(builder)
+        allow(builder).to receive(:perform)
+
+        create(:inbox_member, user: agent_with_notification, inbox: inbox)
+        conversation.reload
+
+        message = build(
+          :message,
+          conversation: conversation,
+          account: account,
+          content: nil,
+          private: true
+        )
+
+        event = Events::Base.new(event_name, Time.zone.now, message: message)
+        # want to validate message_created doesnt throw an error
+        expect(listener.message_created(event)).to eq nil
+      end
+    end
   end
 end
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index 54f0b8a44..be33732c4 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -29,13 +29,18 @@ RSpec.describe ApplicationMailbox, type: :mailbox do
     describe 'Support' do
       let!(:channel_email) { create(:channel_email) }
 
-      before do
+      it 'routes support emails to Support Mailbox when mail is to channel email' do
         # this email is hardcoded in the support.eml, that's why we are updating this
-        channel_email.email = 'care@example.com'
-        channel_email.save
+        channel_email.update(email: 'care@example.com')
+        dbl = double
+        expect(SupportMailbox).to receive(:new).and_return(dbl)
+        expect(dbl).to receive(:perform_processing).and_return(true)
+        described_class.route support_mail
       end
 
-      it 'routes support emails to Support Mailbox' do
+      it 'routes support emails to Support Mailbox when mail is to channel forward to email' do
+        # this email is hardcoded in the support.eml, that's why we are updating this
+        channel_email.update(forward_to_email: 'care@example.com')
         dbl = double
         expect(SupportMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 4558c568f..598549708 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
 
       it 'has correct name' do
-        expect(mail[:from].display_names).to eq(['Notifications'])
+        expect(mail[:from].display_names).to eq(['Notifications from Inbox'])
       end
     end
 
@@ -95,7 +95,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       let(:conversation) { create(:conversation, assignee: agent, inbox: inbox_member.inbox, account: account) }
       let!(:message) { create(:message, conversation: conversation, account: account) }
       let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
-      let(:domain) { account.domain || ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', false) }
+      let(:domain) { account.inbound_email_domain }
 
       it 'renders the receiver email' do
         expect(mail.to).to eq([message&.conversation&.contact&.email])
@@ -148,7 +148,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
       end
 
       it 'sets the from email to be the support email' do
-        expect(mail['FROM'].value).to eq("#{agent.available_name} <#{conversation.account.support_email}>")
+        expect(mail['FROM'].value).to eq("#{agent.available_name} from Inbox <#{conversation.account.support_email}>")
         expect(mail.from).to eq([conversation.account.support_email])
       end
 
diff --git a/spec/models/concerns/assignment_handler_spec.rb b/spec/models/concerns/assignment_handler_spec.rb
new file mode 100644
index 000000000..64267a7b4
--- /dev/null
+++ b/spec/models/concerns/assignment_handler_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+shared_examples_for 'assignment_handler' do
+  describe '#update_team' do
+    let(:conversation) { create(:conversation, assignee: create(:user)) }
+    let(:agent) do
+      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
+    end
+    let(:team) do
+      create(:team, account: conversation.account, allow_auto_assign: false)
+    end
+
+    context 'when agent is current user' do
+      before do
+        Current.user = agent
+        create(:team_member, team: team, user: agent)
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+        conversation.inbox.reload
+      end
+
+      it 'creates team assigned and unassigned message activity' do
+        expect(conversation.update(team: team)).to eq true
+        expect(conversation.messages.pluck(:content)).to include("Assigned to #{team.name} by #{agent.name}")
+        expect(conversation.update(team: nil)).to eq true
+        expect(conversation.messages.pluck(:content)).to include("Unassigned from #{team.name} by #{agent.name}")
+      end
+
+      it 'changes assignee to nil if they doesnt belong to the team and allow_auto_assign is false' do
+        expect(team.allow_auto_assign).to eq false
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq nil
+      end
+
+      it 'changes assignee to a team member if allow_auto_assign is enabled' do
+        team.update!(allow_auto_assign: true)
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq agent
+        expect(conversation.messages.pluck(:content)).to include("Assigned to #{conversation.assignee.name} via #{team.name} by #{agent.name}")
+      end
+
+      it 'wont change assignee if he is already a team member' do
+        team.update!(allow_auto_assign: true)
+        assignee = create(:user, account: conversation.account, role: :agent)
+        create(:inbox_member, user: assignee, inbox: conversation.inbox)
+        create(:team_member, team: team, user: assignee)
+        conversation.update(assignee: assignee)
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq assignee
+      end
+    end
+  end
+
+  describe '#update_assignee' do
+    subject(:update_assignee) { conversation.update_assignee(agent) }
+
+    let(:conversation) { create(:conversation, assignee: nil) }
+    let(:agent) do
+      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
+    end
+    let(:assignment_mailer) { instance_double(AgentNotifications::ConversationNotificationsMailer, deliver: true) }
+
+    it 'assigns the agent to conversation' do
+      expect(update_assignee).to eq(true)
+      expect(conversation.reload.assignee).to eq(agent)
+    end
+
+    it 'creates a new notification for the agent' do
+      expect(update_assignee).to eq(true)
+      expect(agent.notifications.count).to eq(1)
+    end
+
+    it 'does not create assignment notification if notification setting is turned off' do
+      notification_setting = agent.notification_settings.first
+      notification_setting.unselect_all_email_flags
+      notification_setting.unselect_all_push_flags
+      notification_setting.save!
+
+      expect(update_assignee).to eq(true)
+      expect(agent.notifications.count).to eq(0)
+    end
+
+    context 'when agent is current user' do
+      before do
+        Current.user = agent
+      end
+
+      it 'creates self-assigned message activity' do
+        expect(update_assignee).to eq(true)
+        expect(conversation.messages.pluck(:content)).to include("#{agent.name} self-assigned this conversation")
+      end
+    end
+  end
+end
diff --git a/spec/models/concerns/out_of_offisable_spec.rb b/spec/models/concerns/out_of_offisable_spec.rb
index cbdef0e81..8f09f0753 100644
--- a/spec/models/concerns/out_of_offisable_spec.rb
+++ b/spec/models/concerns/out_of_offisable_spec.rb
@@ -16,4 +16,10 @@ shared_examples_for 'out_of_offisable' do
     travel_to '01.11.2020 13:00'.to_datetime
     expect(obj.out_of_office?).to be true
   end
+
+  it 'updates the office hours via a hash' do
+    obj.update_working_hours([{ 'day_of_week' => 1, 'open_hour' => 10, 'open_minutes' => 0,
+                                'close_hour' => 17, 'close_minutes' => 0 }])
+    expect(obj.reload.weekly_schedule.find { |schedule| schedule['day_of_week'] == 1 }['open_hour']).to eq 10
+  end
 end
diff --git a/spec/models/concerns/round_robin_handler_spec.rb b/spec/models/concerns/round_robin_handler_spec.rb
new file mode 100644
index 000000000..4c4c654cc
--- /dev/null
+++ b/spec/models/concerns/round_robin_handler_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+shared_examples_for 'round_robin_handler' do
+  describe '#round robin' do
+    let(:account) { create(:account) }
+    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:conversation) do
+      create(
+        :conversation,
+        account: account,
+        contact: create(:contact, account: account),
+        inbox: inbox,
+        assignee: nil
+      )
+    end
+
+    before do
+      create(:inbox_member, inbox: inbox, user: agent)
+      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
+    end
+
+    it 'runs round robin on after_save callbacks' do
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(agent)
+    end
+
+    it 'will not auto assign agent if enable_auto_assignment is false' do
+      inbox.update(enable_auto_assignment: false)
+
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(nil)
+    end
+
+    it 'will not auto assign agent if its a bot conversation' do
+      conversation = create(
+        :conversation,
+        account: account,
+        contact: create(:contact, account: account),
+        inbox: inbox,
+        status: 'bot',
+        assignee: nil
+      )
+
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(nil)
+    end
+
+    it 'gets triggered on update only when status changes to open' do
+      conversation.status = 'resolved'
+      conversation.save!
+      expect(conversation.reload.assignee).to eq(agent)
+      inbox.inbox_members.where(user_id: agent.id).first.destroy!
+
+      # round robin changes assignee in this case since agent doesn't have access to inbox
+      agent2 = create(:user, email: 'agent2@example.com', account: account)
+      create(:inbox_member, inbox: inbox, user: agent2)
+      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
+      conversation.status = 'open'
+      conversation.save!
+      expect(conversation.reload.assignee).to eq(agent2)
+    end
+  end
+end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 806b159a4..f6c6f8f63 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require Rails.root.join 'spec/models/concerns/assignment_handler_spec.rb'
+require Rails.root.join 'spec/models/concerns/round_robin_handler_spec.rb'
 
 RSpec.describe Conversation, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
   end
 
+  describe 'concerns' do
+    it_behaves_like 'assignment_handler'
+    it_behaves_like 'round_robin_handler'
+  end
+
   describe '.before_create' do
     let(:conversation) { build(:conversation, display_id: nil) }
 
@@ -133,108 +140,6 @@ RSpec.describe Conversation, type: :model do
     end
   end
 
-  describe '#round robin' do
-    let(:account) { create(:account) }
-    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
-    let(:inbox) { create(:inbox, account: account) }
-    let(:conversation) do
-      create(
-        :conversation,
-        account: account,
-        contact: create(:contact, account: account),
-        inbox: inbox,
-        assignee: nil
-      )
-    end
-
-    before do
-      create(:inbox_member, inbox: inbox, user: agent)
-      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
-    end
-
-    it 'runs round robin on after_save callbacks' do
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(agent)
-    end
-
-    it 'will not auto assign agent if enable_auto_assignment is false' do
-      inbox.update(enable_auto_assignment: false)
-
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(nil)
-    end
-
-    it 'will not auto assign agent if its a bot conversation' do
-      conversation = create(
-        :conversation,
-        account: account,
-        contact: create(:contact, account: account),
-        inbox: inbox,
-        status: 'bot',
-        assignee: nil
-      )
-
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(nil)
-    end
-
-    it 'gets triggered on update only when status changes to open' do
-      conversation.status = 'resolved'
-      conversation.save!
-      expect(conversation.reload.assignee).to eq(agent)
-      inbox.inbox_members.where(user_id: agent.id).first.destroy!
-
-      # round robin changes assignee in this case since agent doesn't have access to inbox
-      agent2 = create(:user, email: 'agent2@example.com', account: account)
-      create(:inbox_member, inbox: inbox, user: agent2)
-      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
-      conversation.status = 'open'
-      conversation.save!
-      expect(conversation.reload.assignee).to eq(agent2)
-    end
-  end
-
-  describe '#update_assignee' do
-    subject(:update_assignee) { conversation.update_assignee(agent) }
-
-    let(:conversation) { create(:conversation, assignee: nil) }
-    let(:agent) do
-      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
-    end
-    let(:assignment_mailer) { double(deliver: true) }
-
-    it 'assigns the agent to conversation' do
-      expect(update_assignee).to eq(true)
-      expect(conversation.reload.assignee).to eq(agent)
-    end
-
-    it 'creates a new notification for the agent' do
-      expect(update_assignee).to eq(true)
-      expect(agent.notifications.count).to eq(1)
-    end
-
-    it 'does not create assignment notification if notification setting is turned off' do
-      notification_setting = agent.notification_settings.first
-      notification_setting.unselect_all_email_flags
-      notification_setting.unselect_all_push_flags
-      notification_setting.save!
-
-      expect(update_assignee).to eq(true)
-      expect(agent.notifications.count).to eq(0)
-    end
-
-    context 'when agent is current user' do
-      before do
-        Current.user = agent
-      end
-
-      it 'creates self-assigned message activity' do
-        expect(update_assignee).to eq(true)
-        expect(conversation.messages.pluck(:content)).to include("#{agent.name} self-assigned this conversation")
-      end
-    end
-  end
-
   describe '#update_labels' do
     let(:account) { create(:account) }
     let(:conversation) { create(:conversation, account: account) }
diff --git a/spec/models/working_hour_spec.rb b/spec/models/working_hour_spec.rb
index 6222b8f7f..d7c49b0bf 100644
--- a/spec/models/working_hour_spec.rb
+++ b/spec/models/working_hour_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe WorkingHour do
   context 'when on sunday 1pm' do
     before do
       Time.zone = 'UTC'
-      create(:working_hour, day_of_week: 7, closed_all_day: true)
+      create(:working_hour, day_of_week: 0, closed_all_day: true)
       travel_to '01.11.2020 13:00'.to_datetime
     end
 
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index ce64d2bb2..a35ccd25d 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -25,6 +25,20 @@ describe ::MessageTemplates::HookExecutionService do
       expect(email_collect_service).to have_received(:perform)
     end
 
+    it 'doesnot calls ::MessageTemplates::Template::EmailCollect when prechat form is enabled' do
+      contact = create(:contact, email: nil)
+      conversation = create(:conversation, contact: contact)
+
+      # ensure prechat form is enabled
+      conversation.inbox.channel.update(pre_chat_form_enabled: true)
+      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
+
+      # described class gets called in message after commit
+      message = create(:message, conversation: conversation)
+
+      expect(::MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
+    end
+
     it 'doesnot calls ::MessageTemplates::Template::Greeting if greeting_message is empty' do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
@@ -46,24 +60,25 @@ describe ::MessageTemplates::HookExecutionService do
     end
   end
 
-  context 'when it is after working hours' do
-    it 'calls ::MessageTemplates::Template::OutOfOffice' do
-      contact = create :contact
-      conversation = create :conversation, contact: contact
+  # TODO: remove this if this hook is removed
+  # context 'when it is after working hours' do
+  #   it 'calls ::MessageTemplates::Template::OutOfOffice' do
+  #     contact = create :contact
+  #     conversation = create :conversation, contact: contact
 
-      conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
-      conversation.inbox.working_hours.today.update!(closed_all_day: true)
+  #     conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+  #     conversation.inbox.working_hours.today.update!(closed_all_day: true)
 
-      out_of_office_service = double
+  #     out_of_office_service = double
 
-      allow(::MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
-      allow(out_of_office_service).to receive(:perform).and_return(true)
+  #     allow(::MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+  #     allow(out_of_office_service).to receive(:perform).and_return(true)
 
-      # described class gets called in message after commit
-      message = create(:message, conversation: conversation)
+  #     # described class gets called in message after commit
+  #     message = create(:message, conversation: conversation)
 
-      expect(::MessageTemplates::Template::OutOfOffice).to have_received(:new).with(conversation: message.conversation)
-      expect(out_of_office_service).to have_received(:perform)
-    end
-  end
+  #     expect(::MessageTemplates::Template::OutOfOffice).to have_received(:new).with(conversation: message.conversation)
+  #     expect(out_of_office_service).to have_received(:perform)
+  #   end
+  # end
 end
diff --git a/yarn.lock b/yarn.lock
index 6e09300b1..011be7572 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2341,10 +2341,10 @@ bluebird@3.7.2, bluebird@^3.1.1, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -2415,7 +2415,7 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -3972,17 +3972,17 @@ elegant-spinner@^1.0.1:
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
 elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
 emittery@^0.7.1:
   version "0.7.1"
@@ -5267,7 +5267,7 @@ highlight.js@~10.4.1:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
   integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -5563,7 +5563,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -7266,7 +7266,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -9584,6 +9584,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11224,6 +11229,16 @@ vue-color@^2.7.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
+vue-easytable@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/vue-easytable/-/vue-easytable-2.1.2.tgz#6cb22138b588195ee25ad37bfd660b48ce996a3a"
+  integrity sha512-x/88KdYABxbuJJlw6rAz8SAEJwoicOwUCgwubN/ibTuKT4+dDrFJnqW5LJHEhMWa+VIvTZnmBXZTobkyuak7hw==
+  dependencies:
+    lodash "^4.17.20"
+    resize-observer-polyfill "^1.5.1"
+    vue "^2.6.12"
+    vue-template-compiler "^2.6.11"
+
 vue-eslint-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz#a4ed2669f87179dedd06afdd8736acbb3a3864d6"
@@ -11304,6 +11319,14 @@ vue-template-compiler@^2.6.10:
     de-indent "^1.0.2"
     he "^1.1.0"
 
+vue-template-compiler@^2.6.11:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e"
+  integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.1.0"
+
 vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
@@ -11319,6 +11342,11 @@ vue@^2.6.0:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
   integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
 
+vue@^2.6.12:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
+  integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
+
 vuelidate@~0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.5.tgz#ff48c75ae9d24ea24c24e9ea08065eda0a0cba0a"
@@ -11762,4 +11790,4 @@ yauzl@2.10.0, yauzl@^2.10.0:
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
   dependencies:
     buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
+    fd-slicer "~1.1.0"
\ No newline at end of file