diff --git a/sim/app/(auth)/components/emails/email-icons.tsx b/sim/app/(auth)/components/emails/email-icons.tsx
deleted file mode 100644
index ae068cbbd4..0000000000
--- a/sim/app/(auth)/components/emails/email-icons.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from 'react'
-
-export const XIcon: React.FC<{ color?: string }> = ({ color = '#666666' }) => (
-  <svg width="24" height="24" viewBox="0 0 16 16" style={{ color }}>
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M0.5 0.5H5.75L9.48421 5.71053L14 0.5H16L10.3895 6.97368L16.5 15.5H11.25L7.51579 10.2895L3 15.5H1L6.61053 9.02632L0.5 0.5ZM12.0204 14L3.42043 2H4.97957L13.5796 14H12.0204Z"
-      fill="currentColor"
-    />
-  </svg>
-)
-
-export const DiscordIcon: React.FC<{ color?: string }> = ({ color = '#666666' }) => (
-  <svg width="24" height="24" viewBox="0 0 16 16" style={{ color }}>
-    <path
-      d="M13.5535 3.01557C12.5023 2.5343 11.3925 2.19287 10.2526 2C10.0966 2.27886 9.95547 2.56577 9.82976 2.85952C8.6155 2.67655 7.38067 2.67655 6.16641 2.85952C6.04063 2.5658 5.89949 2.27889 5.74357 2C4.60289 2.1945 3.4924 2.53674 2.44013 3.01809C0.351096 6.10885 -0.215207 9.12285 0.0679444 12.0941C1.29133 12.998 2.66066 13.6854 4.11639 14.1265C4.44417 13.6856 4.73422 13.2179 4.98346 12.7283C4.51007 12.5515 4.05317 12.3334 3.61804 12.0764C3.73256 11.9934 3.84456 11.9078 3.95279 11.8248C5.21891 12.4202 6.60083 12.7289 7.99997 12.7289C9.39912 12.7289 10.781 12.4202 12.0472 11.8248C12.1566 11.9141 12.2686 11.9997 12.3819 12.0764C11.9459 12.3338 11.4882 12.5524 11.014 12.7296C11.2629 13.2189 11.553 13.6862 11.881 14.1265C13.338 13.6872 14.7084 13.0001 15.932 12.0953C16.2642 8.64968 15.3644 5.66336 13.5535 3.01557ZM5.34212 10.2668C4.55307 10.2668 3.90119 9.55073 3.90119 8.66981C3.90119 7.78889 4.53042 7.06654 5.3396 7.06654C6.14879 7.06654 6.79563 7.78889 6.78179 8.66981C6.76795 9.55073 6.14627 10.2668 5.34212 10.2668ZM10.6578 10.2668C9.86752 10.2668 9.21815 9.55073 9.21815 8.66981C9.21815 7.78889 9.84738 7.06654 10.6578 7.06654C11.4683 7.06654 12.1101 7.78889 12.0962 8.66981C12.0824 9.55073 11.462 10.2668 10.6578 10.2668Z"
-      fill="currentColor"
-    />
-  </svg>
-)
diff --git a/sim/app/(auth)/components/emails/base-styles.ts b/sim/components/emails/base-styles.ts
similarity index 100%
rename from sim/app/(auth)/components/emails/base-styles.ts
rename to sim/components/emails/base-styles.ts
diff --git a/sim/app/(auth)/components/emails/otp-verification-email.tsx b/sim/components/emails/otp-verification-email.tsx
similarity index 66%
rename from sim/app/(auth)/components/emails/otp-verification-email.tsx
rename to sim/components/emails/otp-verification-email.tsx
index fe0208988f..7944484a44 100644
--- a/sim/app/(auth)/components/emails/otp-verification-email.tsx
+++ b/sim/components/emails/otp-verification-email.tsx
@@ -12,8 +12,6 @@ import {
   Section,
   Text,
 } from '@react-email/components'
-import { XIcon } from 'lucide-react'
-import { DiscordIcon } from '@/components/icons'
 import { baseStyles } from './base-styles'
 
 interface OTPVerificationEmailProps {
@@ -48,15 +46,19 @@ export const OTPVerificationEmail = ({
       <Body style={baseStyles.main}>
         <Preview>{getSubjectByType(type)}</Preview>
         <Container style={baseStyles.container}>
-          <Section style={{ ...baseStyles.header, textAlign: 'center' }}>
+          <Section
+            style={{
+              ...baseStyles.header,
+              textAlign: 'center',
+              padding: '30px',
+            }}
+          >
             <Img
               src={`${baseUrl}/sim.png`}
-              width="120"
-              height="40"
+              width="114"
               alt="Sim Studio"
               style={{
-                display: 'block',
-                objectFit: 'contain',
+                display: 'inline-block',
                 margin: '0 auto',
               }}
             />
@@ -94,23 +96,46 @@ export const OTPVerificationEmail = ({
         </Container>
 
         <Section style={baseStyles.footer}>
-          <Row style={{ marginBottom: '10px' }}>
-            <Column align="center">
-              <Link
-                href="https://x.com/simstudioai"
-                style={{ textDecoration: 'none', margin: '0 8px' }}
-              >
-                <XIcon />
+          <Row>
+            <Column align="right" style={{ width: '50%', paddingRight: '8px' }}>
+              <Link href="https://x.com/simstudioai" style={{ textDecoration: 'none' }}>
+                <Img
+                  src={`${baseUrl}/x-icon.png`}
+                  width="20"
+                  height="20"
+                  alt="X"
+                  style={{
+                    display: 'block',
+                    marginLeft: 'auto',
+                    filter: 'grayscale(100%)',
+                    opacity: 0.7,
+                  }}
+                />
               </Link>
-              <Link
-                href="https://discord.gg/crdsGfGk"
-                style={{ textDecoration: 'none', margin: '0 8px' }}
-              >
-                <DiscordIcon />
+            </Column>
+            <Column align="left" style={{ width: '50%', paddingLeft: '8px' }}>
+              <Link href="https://discord.gg/crdsGfGk" style={{ textDecoration: 'none' }}>
+                <Img
+                  src={`${baseUrl}/discord-icon.png`}
+                  width="24"
+                  height="24"
+                  alt="Discord"
+                  style={{
+                    display: 'block',
+                    filter: 'grayscale(100%)',
+                    opacity: 0.9,
+                  }}
+                />
               </Link>
             </Column>
           </Row>
-          <Text style={baseStyles.footerText}>
+          <Text
+            style={{
+              ...baseStyles.footerText,
+              textAlign: 'center',
+              color: '#706a7b',
+            }}
+          >
             © {new Date().getFullYear()} Sim Studio, All Rights Reserved
             <br />
             If you have any questions, please contact us at support@simstudio.ai
diff --git a/sim/app/(auth)/components/emails/render-email.ts b/sim/components/emails/render-email.ts
similarity index 100%
rename from sim/app/(auth)/components/emails/render-email.ts
rename to sim/components/emails/render-email.ts
diff --git a/sim/app/(auth)/components/emails/reset-password-email.tsx b/sim/components/emails/reset-password-email.tsx
similarity index 65%
rename from sim/app/(auth)/components/emails/reset-password-email.tsx
rename to sim/components/emails/reset-password-email.tsx
index 5468616ae3..fba65f95a1 100644
--- a/sim/app/(auth)/components/emails/reset-password-email.tsx
+++ b/sim/components/emails/reset-password-email.tsx
@@ -13,7 +13,6 @@ import {
   Text,
 } from '@react-email/components'
 import { baseStyles } from './base-styles'
-import { DiscordIcon, XIcon } from './email-icons'
 
 interface ResetPasswordEmailProps {
   username?: string
@@ -39,15 +38,19 @@ export const ResetPasswordEmail = ({
       <Body style={baseStyles.main}>
         <Preview>Reset your Sim Studio password</Preview>
         <Container style={baseStyles.container}>
-          <Section style={{ ...baseStyles.header, textAlign: 'center' }}>
+          <Section
+            style={{
+              ...baseStyles.header,
+              textAlign: 'center',
+              padding: '30px',
+            }}
+          >
             <Img
               src={`${baseUrl}/sim.png`}
-              width="120"
-              height="40"
+              width="114"
               alt="Sim Studio"
               style={{
-                display: 'block',
-                objectFit: 'contain',
+                display: 'inline-block',
                 margin: '0 auto',
               }}
             />
@@ -86,23 +89,46 @@ export const ResetPasswordEmail = ({
         </Container>
 
         <Section style={baseStyles.footer}>
-          <Row style={{ marginBottom: '10px' }}>
-            <Column align="center">
-              <Link
-                href="https://x.com/simstudioai"
-                style={{ textDecoration: 'none', margin: '0 8px' }}
-              >
-                <XIcon />
+          <Row>
+            <Column align="right" style={{ width: '50%', paddingRight: '8px' }}>
+              <Link href="https://x.com/simstudioai" style={{ textDecoration: 'none' }}>
+                <Img
+                  src={`${baseUrl}/x-icon.png`}
+                  width="20"
+                  height="20"
+                  alt="X"
+                  style={{
+                    display: 'block',
+                    marginLeft: 'auto',
+                    filter: 'grayscale(100%)',
+                    opacity: 0.7,
+                  }}
+                />
               </Link>
-              <Link
-                href="https://discord.gg/crdsGfGk"
-                style={{ textDecoration: 'none', margin: '0 8px' }}
-              >
-                <DiscordIcon />
+            </Column>
+            <Column align="left" style={{ width: '50%', paddingLeft: '8px' }}>
+              <Link href="https://discord.gg/crdsGfGk" style={{ textDecoration: 'none' }}>
+                <Img
+                  src={`${baseUrl}/discord-icon.png`}
+                  width="24"
+                  height="24"
+                  alt="Discord"
+                  style={{
+                    display: 'block',
+                    filter: 'grayscale(100%)',
+                    opacity: 0.9,
+                  }}
+                />
               </Link>
             </Column>
           </Row>
-          <Text style={baseStyles.footerText}>
+          <Text
+            style={{
+              ...baseStyles.footerText,
+              textAlign: 'center',
+              color: '#706a7b',
+            }}
+          >
             © {new Date().getFullYear()} Sim Studio, All Rights Reserved
             <br />
             If you have any questions, please contact us at support@simstudio.ai
diff --git a/sim/lib/auth.ts b/sim/lib/auth.ts
index 44dd3f0c79..5569c13ea7 100644
--- a/sim/lib/auth.ts
+++ b/sim/lib/auth.ts
@@ -4,12 +4,12 @@ import { drizzleAdapter } from 'better-auth/adapters/drizzle'
 import { nextCookies } from 'better-auth/next-js'
 import { emailOTP, genericOAuth } from 'better-auth/plugins'
 import { Resend } from 'resend'
-import { createLogger } from '@/lib/logs/console-logger'
 import {
   getEmailSubject,
   renderOTPEmail,
   renderPasswordResetEmail,
-} from '@/app/(auth)/components/emails/render-email'
+} from '@/components/emails/render-email'
+import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
 import * as schema from '@/db/schema'
 
diff --git a/sim/package.json b/sim/package.json
index d546e6ba23..a7d7050424 100644
--- a/sim/package.json
+++ b/sim/package.json
@@ -17,7 +17,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "email:dev": "email dev --dir app/emails",
+    "email:dev": "email dev --dir components/emails",
     "cli:build": "npm run build -w packages/simstudio",
     "cli:dev": "npm run build -w packages/simstudio && cd packages/simstudio && node ./dist/index.js",
     "cli:publish": "cd packages/simstudio && npm publish",
diff --git a/sim/public/discord-icon.png b/sim/public/discord-icon.png
new file mode 100644
index 0000000000..45547f7c04
Binary files /dev/null and b/sim/public/discord-icon.png differ
diff --git a/sim/public/x-icon.png b/sim/public/x-icon.png
new file mode 100644
index 0000000000..dbf2e17734
Binary files /dev/null and b/sim/public/x-icon.png differ