diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 991b2f428..c5492eff9 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -54,7 +54,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   end
 
   def message_update_params
-    params.permit(message: [{ submitted_values: [:name, :title, :value] }])
+    params.permit(message: [{ submitted_values: [:name, :title, :value, { csat_survey_response: [:feedback_text, :rating] }] }])
   end
 
   def permitted_params
diff --git a/app/javascript/shared/components/CustomerSatisfaction.vue b/app/javascript/shared/components/CustomerSatisfaction.vue
index 3a346be18..4a49e8c89 100644
--- a/app/javascript/shared/components/CustomerSatisfaction.vue
+++ b/app/javascript/shared/components/CustomerSatisfaction.vue
@@ -1,21 +1,20 @@
 <template>
   <div class="customer-satisfcation">
-    <div class="title">
-      {{ $t('CSAT.TITLE') }}
-    </div>
+    <h6 class="title">
+      {{ title }}
+    </h6>
     <div class="ratings">
       <button
         v-for="rating in ratings"
         :key="rating.key"
-        class="emoji-button"
-        :class="{ selected: rating.key === selectedRating }"
+        :class="buttonClass(rating)"
         @click="selectRating(rating)"
       >
         {{ rating.emoji }}
       </button>
     </div>
     <form
-      v-if="!hasSubmitted"
+      v-if="!isCSATSubmitted"
       class="feedback-form"
       @submit.prevent="onSubmit()"
     >
@@ -27,7 +26,7 @@
       />
       <button
         class="button"
-        :disabled="!selectedRating"
+        :disabled="isButtonDisabled"
         :style="{ background: widgetColor, borderColor: widgetColor }"
       >
         <i v-if="!isUpdating" class="ion-ios-arrow-forward" />
@@ -46,6 +45,12 @@ export default {
   components: {
     Spinner,
   },
+  props: {
+    messageContentAttributes: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
     return {
       email: '',
@@ -53,19 +58,54 @@ export default {
       selectedRating: null,
       isUpdating: false,
       feedback: '',
-      hasSubmitted: false,
     };
   },
   computed: {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
     }),
+    isCSATSubmitted() {
+      return (
+        this.messageContentAttributes &&
+        this.messageContentAttributes.csat_survey_response
+      );
+    },
+    isButtonDisabled() {
+      return !(this.selectedRating && this.feedback);
+    },
+    title() {
+      return this.isCSATSubmitted
+        ? this.$t('CSAT.SUBMITTED_TITLE')
+        : this.$t('CSAT.TITLE');
+    },
+  },
+
+  mounted() {
+    if (this.isCSATSubmitted) {
+      const {
+        csat_survey_response: { rating },
+      } = this.messageContentAttributes;
+      this.selectedRating = rating;
+    }
   },
 
   methods: {
-    onSubmit() {},
+    buttonClass(rating) {
+      return [
+        { selected: rating.value === this.selectedRating },
+        { disabled: this.isCSATSubmitted },
+        { hover: this.isCSATSubmitted },
+        'emoji-button',
+      ];
+    },
+    onSubmit() {
+      this.$emit('submit', {
+        rating: this.selectedRating,
+        feedback: this.feedback,
+      });
+    },
     selectRating(rating) {
-      this.selectedRating = rating.key;
+      this.selectedRating = rating.value;
     },
   },
 };
@@ -77,54 +117,72 @@ export default {
 
 .customer-satisfcation {
   @include light-shadow;
+
   background: $color-white;
   border-bottom-left-radius: $space-smaller;
-  color: $color-body;
+  border-radius: $space-small;
   border-top: $space-micro solid $color-woot;
-  border-radius: $space-one;
+  color: $color-body;
   display: inline-block;
   line-height: 1.5;
-  width: 75%;
+  margin-top: $space-smaller;
+  width: 80%;
+
   .title {
     font-size: $font-size-default;
     font-weight: $font-weight-medium;
-    padding-top: $space-two;
+    padding: $space-two $space-one 0;
     text-align: center;
   }
+
   .ratings {
     display: flex;
     justify-content: space-around;
     padding: $space-two $space-normal;
 
     .emoji-button {
-      font-size: $font-size-big;
-      outline: none;
       box-shadow: none;
       filter: grayscale(100%);
-      &.selected {
+      font-size: $font-size-big;
+      outline: none;
+
+      &.selected,
+      &:hover,
+      &:focus,
+      &:active {
         filter: grayscale(0%);
         transform: scale(1.32);
       }
+
+      &.disabled {
+        cursor: default;
+        opacity: 0.5;
+        pointer-events: none;
+      }
     }
   }
   .feedback-form {
     display: flex;
+
     input {
-      width: 100%;
-      border: none;
       border-bottom-right-radius: 0;
       border-top-right-radius: 0;
-      padding: $space-one;
+      border-bottom-left-radius: $space-small;
+      border: 0;
       border-top: 1px solid $color-border;
+      padding: $space-one;
+      width: 100%;
     }
 
     .button {
+      appearance: none;
       border-bottom-left-radius: 0;
       border-top-left-radius: 0;
+      border-bottom-right-radius: $space-small;
       font-size: $font-size-large;
       height: auto;
       margin-left: -1px;
-      appearance: none;
+
       .spinner {
         display: block;
         padding: 0;
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index 11614797c..49f6a83cf 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -17,26 +17,26 @@ export const CSAT_RATINGS = [
   {
     key: 'disappointed',
     emoji: '😞',
-    value: 0,
+    value: 1,
   },
   {
     key: 'expressionless',
     emoji: '😑',
-    value: 1,
+    value: 2,
   },
   {
     key: 'neutral',
     emoji: '😐',
-    value: 2,
+    value: 3,
   },
   {
     key: 'grinning',
     emoji: '😀',
-    value: 3,
+    value: 4,
   },
   {
     key: 'smiling',
     emoji: '😍',
-    value: 4,
+    value: 5,
   },
 ];
diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index 86e487c4a..5abe00d69 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -143,7 +143,7 @@ export default {
       return (
         this.messageContentAttributes.submitted_email ||
         (this.messageContentAttributes.submitted_values &&
-          this.contentType !== 'form')
+          !['form', 'input_csat'].includes(this.contentType))
       );
     },
     responseMessage() {
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index 3ed3a2f2b..95921e867 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -44,7 +44,11 @@
     <div v-if="isArticle">
       <chat-article :items="messageContentAttributes.items"></chat-article>
     </div>
-    <customer-satisfaction v-if="isCSAT" />
+    <customer-satisfaction
+      v-if="isCSAT"
+      :message-content-attributes="messageContentAttributes.submitted_values"
+      @submit="onCSATSubmit"
+    />
   </div>
 </template>
 
@@ -121,6 +125,17 @@ export default {
         messageId: this.messageId,
       });
     },
+    onCSATSubmit({ feedback, rating }) {
+      this.onResponse({
+        submittedValues: {
+          csat_survey_response: {
+            rating,
+            feedback_text: feedback,
+          },
+        },
+        messageId: this.messageId,
+      });
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 3cbcd6020..dd114afff 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -59,6 +59,7 @@
   },
   "CSAT": {
     "TITLE": "Rate your conversation",
+    "SUBMITTED_TITLE": "Thank you for submitting the rating",
     "PLACEHOLDER": "Tell us more..."
   }
 }