diff --git a/app/public/css/buttons.css b/app/public/css/buttons.css
index e7a7b8a9..b8c2d957 100644
--- a/app/public/css/buttons.css
+++ b/app/public/css/buttons.css
@@ -1,7 +1,7 @@
 /* Button Styles and Interactive Elements */
 
 .input-button {
-  background: var(--falkor-quaternary);
+  background: var(--falkor-primary);
   cursor: pointer;
   transition: all 0.2s ease;
   border: none;
@@ -48,7 +48,7 @@
 
 .action-button:hover {
   box-shadow: 0 4px 12px rgba(0,0,0,0.25);
-  background: var(--falkor-accent);
+  background: var(--falkor-primary);
   transform: translateY(-1px);
 }
 
@@ -179,7 +179,7 @@
 
 #github-link-btn:hover {
   box-shadow: 0 4px 12px rgba(0,0,0,0.25);
-  background: var(--falkor-accent);
+  background: var(--falkor-primary);
   transform: translateY(-1px);
   color: var(--text-primary);
 }
diff --git a/app/templates/components/chat_input.j2 b/app/templates/components/chat_input.j2
index b7fa6ea4..67b1447e 100644
--- a/app/templates/components/chat_input.j2
+++ b/app/templates/components/chat_input.j2
@@ -3,7 +3,14 @@
     <div class="input-container" id="input-container">
         <input type="text" id="message-input" placeholder="Describe the SQL query you want..." />
         <button class="input-button" title="Submit" id="submit-button">
-            <img src="/static/icons/submit.svg" alt="Submit">
+            <svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <!-- Rounded rectangle background -->
+                <rect x="2" y="2" width="50" height="50" rx="6" ry="6" fill="none" />
+                <!-- Submit arrow icon -->
+                <path
+                    d="M24.332 26.4667V35C24.332 35.7555 24.588 36.3893 25.1 36.9013C25.612 37.4133 26.2449 37.6684 26.9987 37.6667C27.7525 37.6649 28.3863 37.4089 28.9 36.8987C29.4138 36.3884 29.6689 35.7555 29.6654 35V26.4667L32.0654 28.8666C32.5543 29.3555 33.1765 29.6 33.932 29.6C34.6876 29.6 35.3098 29.3555 35.7987 28.8666C36.2876 28.3778 36.532 27.7555 36.532 27C36.532 26.2444 36.2876 25.6222 35.7987 25.1333L28.8654 18.2C28.332 17.6666 27.7098 17.4 26.9987 17.4C26.2876 17.4 25.6654 17.6666 25.132 18.2L18.1987 25.1333C17.7098 25.6222 17.4654 26.2444 17.4654 27C17.4654 27.7555 17.7098 28.3778 18.1987 28.8666C18.6876 29.3555 19.3098 29.6 20.0654 29.6C20.8209 29.6 21.4431 29.3555 21.932 28.8666L24.332 26.4667Z"
+                    fill="white" />
+            </svg>
         </button>
         <button class="input-button" title="Pause" id="pause-button">
             <img src="/static/icons/pause.svg" alt="Pause">