diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/bottom-scroll-indicator.png b/src-svelte/screenshots/baseline/screens/chat/conversation/bottom-scroll-indicator.png
index f5472670..7f8a632d 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/bottom-scroll-indicator.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/bottom-scroll-indicator.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/empty.png b/src-svelte/screenshots/baseline/screens/chat/conversation/empty.png
index 357d16ca..37e21347 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/empty.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/empty.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/extra-long-input.png b/src-svelte/screenshots/baseline/screens/chat/conversation/extra-long-input.png
index 567b2ae3..1044677b 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/extra-long-input.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/extra-long-input.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/full-message-width.png b/src-svelte/screenshots/baseline/screens/chat/conversation/full-message-width.png
index 0ffc9a00..4e338169 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/full-message-width.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/full-message-width.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/new-message-sent.png b/src-svelte/screenshots/baseline/screens/chat/conversation/new-message-sent.png
index 2f7cb919..f7f9b133 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/new-message-sent.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/new-message-sent.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/not-empty.png b/src-svelte/screenshots/baseline/screens/chat/conversation/not-empty.png
index cdc8b8f3..d21a35d3 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/not-empty.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/not-empty.png differ
diff --git a/src-svelte/screenshots/baseline/screens/chat/conversation/typing-indicator-static.png b/src-svelte/screenshots/baseline/screens/chat/conversation/typing-indicator-static.png
index d23a39ad..b7d7d4ef 100644
Binary files a/src-svelte/screenshots/baseline/screens/chat/conversation/typing-indicator-static.png and b/src-svelte/screenshots/baseline/screens/chat/conversation/typing-indicator-static.png differ
diff --git a/src-svelte/src/lib/controls/Button.svelte b/src-svelte/src/lib/controls/Button.svelte
index 870afb9b..8590af94 100644
--- a/src-svelte/src/lib/controls/Button.svelte
+++ b/src-svelte/src/lib/controls/Button.svelte
@@ -3,6 +3,7 @@
 
   export let unwrapped = false;
   export let rightEnd = false;
+  export let ariaLabel: string | undefined = undefined;
   const dispatchClickEvent = createEventDispatcher();
 
   function handleClick() {
@@ -15,6 +16,7 @@
     class="cut-corners inner"
     class:right-end={rightEnd}
     type="submit"
+    aria-label={ariaLabel}
     on:click={handleClick}
   >
     <slot />
@@ -24,6 +26,7 @@
     class="cut-corners outer"
     class:right-end={rightEnd}
     type="submit"
+    aria-label={ariaLabel}
     on:click={handleClick}
   >
     <div class="cut-corners inner" class:right-end={rightEnd}>
diff --git a/src-svelte/src/routes/chat/Form.svelte b/src-svelte/src/routes/chat/Form.svelte
index 66815803..6b950499 100644
--- a/src-svelte/src/routes/chat/Form.svelte
+++ b/src-svelte/src/routes/chat/Form.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import autosize from "autosize";
   import Button from "$lib/controls/Button.svelte";
+  import IconSend from "~icons/gravity-ui/arrow-right";
   import { onMount } from "svelte";
 
   export let sendChatMessage: (message: string) => void;
@@ -51,7 +52,7 @@
     bind:this={textareaInput}
     bind:value={currentMessage}
   />
-  <Button unwrapped rightEnd>Send</Button>
+  <Button ariaLabel="Send" unwrapped rightEnd><IconSend /></Button>
 </form>
 
 <style>
@@ -73,4 +74,12 @@
     max-height: 9.8rem;
     resize: none;
   }
+
+  form :global(button) {
+    width: 4rem;
+    min-height: 2rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>
diff --git a/src-svelte/src/routes/credits/Creditor.svelte b/src-svelte/src/routes/credits/Creditor.svelte
index ba72a2d9..b780a90f 100644
--- a/src-svelte/src/routes/credits/Creditor.svelte
+++ b/src-svelte/src/routes/credits/Creditor.svelte
@@ -99,11 +99,11 @@
 
   img {
     width: 2rem;
+    border-radius: var(--corner-roundness);
   }
 
   img.person {
     width: 2.5rem;
-    border-radius: var(--corner-roundness);
   }
 
   .logo-placeholder,
diff --git a/src-svelte/src/routes/credits/Credits.svelte b/src-svelte/src/routes/credits/Credits.svelte
index 5b5efab8..dbc3ed51 100644
--- a/src-svelte/src/routes/credits/Credits.svelte
+++ b/src-svelte/src/routes/credits/Credits.svelte
@@ -182,6 +182,11 @@
                 logo="vaadin.svg"
                 url="https://vaadin.com/"
               />
+              <Creditor
+                name="Gravity UI"
+                logo="gravity-ui.png"
+                url="https://gravity-ui.com/"
+              />
             </Grid>
           </SubInfoBox>
         </div>
diff --git a/src-svelte/src/routes/storybook.test.ts b/src-svelte/src/routes/storybook.test.ts
index dfb3f9cf..75377edf 100644
--- a/src-svelte/src/routes/storybook.test.ts
+++ b/src-svelte/src/routes/storybook.test.ts
@@ -161,7 +161,7 @@ const components: ComponentTestConfig[] = [
         name: "new-message-sent",
         prefix: "extra-long-input",
         additionalAction: async (frame: Frame) => {
-          await frame.click('button:has-text("Send")');
+          await frame.click('button[aria-label="Send"]');
           await frame.click('button[title="Dismiss"]');
         },
       },
diff --git a/src-svelte/static/logos/gravity-ui.png b/src-svelte/static/logos/gravity-ui.png
new file mode 100644
index 00000000..21ab5f7d
Binary files /dev/null and b/src-svelte/static/logos/gravity-ui.png differ
diff --git a/webdriver/screenshots/baseline/desktop_wry/chat-screen-800x600.png b/webdriver/screenshots/baseline/desktop_wry/chat-screen-800x600.png
index ceb09def..6effe64b 100644
Binary files a/webdriver/screenshots/baseline/desktop_wry/chat-screen-800x600.png and b/webdriver/screenshots/baseline/desktop_wry/chat-screen-800x600.png differ
diff --git a/webdriver/screenshots/baseline/desktop_wry/credits-screen-800x600.png b/webdriver/screenshots/baseline/desktop_wry/credits-screen-800x600.png
index 0be92091..6172d7b5 100644
Binary files a/webdriver/screenshots/baseline/desktop_wry/credits-screen-800x600.png and b/webdriver/screenshots/baseline/desktop_wry/credits-screen-800x600.png differ