diff --git a/src/lib/components/feedback/evaluation.svelte b/src/lib/components/feedback/evaluation.svelte
index 96956714c4..1e770e900b 100644
--- a/src/lib/components/feedback/evaluation.svelte
+++ b/src/lib/components/feedback/evaluation.svelte
@@ -2,11 +2,13 @@
     export let value: number = null;
 </script>
 
-<fieldset class="u-margin-block-start-8">
+<fieldset class="u-margin-block-start-8 u-min-width-0">
     <legend class="label is-required u-margin-0 u-line-height-1-5 u-bold">
         <slot />
     </legend>
-    <ul class="u-flex u-main-space-between u-margin-block-start-16">
+    <ol
+        class="u-flex u-main-space-between u-margin-block-start-16 u-overflow-x-auto"
+        style="padding-block: 0.13rem">
         {#each Array(11) as _, i}
             <li>
                 <input
@@ -18,9 +20,9 @@
                     checked={value === i} />
             </li>
         {/each}
-    </ul>
+    </ol>
     <div class="u-flex u-main-space-between u-margin-block-start-8">
-        <span>Not at all likely</span>
-        <span>Extremely likely</span>
+        <span class:u-color-text-gray={value === null}>Not at all likely</span>
+        <span class:u-color-text-gray={value === null}>Extremely likely</span>
     </div>
 </fieldset>
diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte
index 98cb759bdb..db063755a7 100644
--- a/src/lib/components/feedback/feedback.svelte
+++ b/src/lib/components/feedback/feedback.svelte
@@ -20,7 +20,7 @@
             );
             addNotification({
                 type: 'success',
-                message: 'Feedback submitted successfully'
+                message: 'Thank you for your feedback'
             });
             feedback.toggleFeedback();
             feedbackData.reset();
@@ -33,15 +33,15 @@
     }
 </script>
 
-<section class="drop-section">
+<section class="drop-section u-padding-24">
     <header class="u-flex u-main-space-between u-gap-16">
-        <h4 class="body-text-1 u-bold">{$selectedFeedback.title}</h4>
+        <h4 class="label u-bold" style:font-size="var(--font-size-1)">{$selectedFeedback.title}</h4>
         <button
             type="button"
             class="button is-text is-only-icon u-margin-inline-start-auto"
             style="--button-size:1.5rem;"
-            aria-label="Close Modal"
-            title="Close Modal"
+            aria-label="Close feedback"
+            title="Close feedback"
             on:click={() => feedback.toggleFeedback()}>
             <span class="icon-x" aria-hidden="true" />
         </button>
diff --git a/src/lib/components/feedback/feedbackNPS.svelte b/src/lib/components/feedback/feedbackNPS.svelte
index 613e10514a..69c37f6e50 100644
--- a/src/lib/components/feedback/feedbackNPS.svelte
+++ b/src/lib/components/feedback/feedbackNPS.svelte
@@ -4,11 +4,11 @@
     import Evaluation from './evaluation.svelte';
 </script>
 
-<Evaluation bind:value={$feedbackData.value}>
-    How likely are you to recommend Appwrite to a friend or colleague?
-</Evaluation>
-{#if $feedbackData.value}
-    <FormList>
+<FormList>
+    <Evaluation bind:value={$feedbackData.value}>
+        How likely are you to recommend Appwrite to a friend or colleague?
+    </Evaluation>
+    {#if $feedbackData.value !== null}
         <InputTextarea
             id="feedback"
             placeholder="Your message here"
@@ -26,5 +26,5 @@
             id="email"
             bind:value={$feedbackData.email}
             placeholder="Enter email" />
-    </FormList>
-{/if}
+    {/if}
+</FormList>
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 14d58eb688..8463f99825 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -124,6 +124,11 @@
         {/if}
         <DropList show={$feedback.show} scrollable on:blur={toggleFeedback}>
             <button class="button is-small is-text" on:click={toggleFeedback}>
+                {#if $feedback.notification}
+                    <span
+                        class="notification u-position-absolute u-inset-block-start-8 u-inset-inline-end-8"
+                    ></span>
+                {/if}
                 <span class="text">Feedback</span>
             </button>
             <svelte:fragment slot="other">
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index 86bf6ccae3..7f9b6b2004 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -30,14 +30,14 @@ export type FeedbackOption = {
 export const feedbackOptions: FeedbackOption[] = [
     {
         type: 'general',
-        title: 'How can we improve?',
-        desc: 'Your feedback is important to us. Please be honest and tell us what you think.',
+        title: 'Help us improve Appwrite',
+        desc: 'Appwrite evolves with your input. Share your thoughts and help us improve Appwrite.',
         component: FeedbackGeneral
     },
     {
         type: 'nps',
-        title: 'How are we doing?',
-        desc: "At Appwrite, we value the feedback of our users. That means you! We'd love to hear what you think.",
+        title: 'Help us improve Appwrite',
+        desc: 'Appwrite evolves with your input. Share your thoughts and help us improve Appwrite. If you would like to be contacted regarding your feedback, please share your contact details below.',
         component: FeedbackNps
     }
 ];
@@ -49,7 +49,7 @@ function createFeedbackDataStore() {
         message: '',
         name: '',
         email: '',
-        value: 0
+        value: null
     });
     return {
         set,
@@ -60,7 +60,7 @@ function createFeedbackDataStore() {
                 feedbackData.message = '';
                 feedbackData.name = '';
                 feedbackData.email = '';
-                feedbackData.value = 0;
+                feedbackData.value = null;
                 return feedbackData;
             });
         }
@@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore();
 
 function createFeedbackStore() {
     const { subscribe, update } = writable<Feedback>({
-        elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) : 0,
-        visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) : 0,
+        elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0,
+        visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0,
         notification: false,
         type: 'general',
         show: false
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index dc8ceeb81e..199daa12c8 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -230,7 +230,9 @@
     let isOpen = false;
     onMount(async () => {
         loading.set(false);
-
+        if (!localStorage.getItem('feedbackElapsed')) {
+            localStorage.setItem('feedbackElapsed', '0');
+        }
         setInterval(() => {
             checkForFeedback(INTERVAL);
         }, INTERVAL);
diff --git a/src/routes/console/wizard/feedback/step1.svelte b/src/routes/console/wizard/feedback/step1.svelte
index c3a6655903..c767a19db1 100644
--- a/src/routes/console/wizard/feedback/step1.svelte
+++ b/src/routes/console/wizard/feedback/step1.svelte
@@ -20,7 +20,7 @@
             );
             addNotification({
                 type: 'success',
-                message: 'Feedback submitted successfully'
+                message: 'Thank you for your feedback'
             });
         } catch (error) {
             addNotification({