diff --git a/src/app/dashboard/invoices/[id]/send/page.tsx b/src/app/dashboard/invoices/[id]/send/page.tsx
index af496a9..8747774 100644
--- a/src/app/dashboard/invoices/[id]/send/page.tsx
+++ b/src/app/dashboard/invoices/[id]/send/page.tsx
@@ -9,6 +9,14 @@ import { Badge } from "~/components/ui/badge";
 import { Separator } from "~/components/ui/separator";
 import { Alert, AlertDescription } from "~/components/ui/alert";
 import { Label } from "~/components/ui/label";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "~/components/ui/dialog";
 import { PageHeader } from "~/components/layout/page-header";
 import { FloatingActionBar } from "~/components/layout/floating-action-bar";
 import { EmailComposer } from "~/components/forms/email-composer";
@@ -55,6 +63,8 @@ export default function SendEmailPage() {
   const [activeTab, setActiveTab] = useState("compose");
   const [isSending, setIsSending] = useState(false);
   const [isInitialized, setIsInitialized] = useState(false);
+  const [showConfirmDialog, setShowConfirmDialog] = useState(false);
+  const [retryCount, setRetryCount] = useState(0);
 
   // Email content state
   const [subject, setSubject] = useState("");
@@ -87,10 +97,9 @@ export default function SendEmailPage() {
       void utils.invoices.getById.invalidate({ id: invoiceId });
     },
     onError: (error) => {
-      console.error("Email send error:", error);
-
       let errorMessage = "Failed to send invoice email";
       let errorDescription = error.message;
+      let canRetry = false;
 
       if (error.message.includes("Invalid recipient")) {
         errorMessage = "Invalid Email Address";
@@ -102,14 +111,35 @@ export default function SendEmailPage() {
       } else if (error.message.includes("rate limit")) {
         errorMessage = "Too Many Emails";
         errorDescription = "Please wait a moment before sending another email.";
+        canRetry = true;
       } else if (error.message.includes("no email address")) {
         errorMessage = "No Email Address";
         errorDescription = "This client doesn't have an email address on file.";
+      } else if (
+        error.message.includes("unavailable") ||
+        error.message.includes("timeout")
+      ) {
+        errorMessage = "Service Temporarily Unavailable";
+        errorDescription =
+          "The email service is temporarily unavailable. Please try again.";
+        canRetry = true;
+      } else {
+        canRetry = true; // Allow retry for unknown errors
       }
 
       toast.error(errorMessage, {
-        description: errorDescription,
+        description:
+          canRetry && retryCount < 2
+            ? `${errorDescription} You can retry this operation.`
+            : errorDescription,
         duration: 6000,
+        action:
+          canRetry && retryCount < 2
+            ? {
+                label: "Retry",
+                onClick: () => handleRetry(),
+              }
+            : undefined,
       });
 
       setIsSending(false);
@@ -177,8 +207,12 @@ export default function SendEmailPage() {
       return;
     }
 
-    // Email content is now optional since template handles default messaging
+    // Show confirmation dialog
+    setShowConfirmDialog(true);
+  };
 
+  const confirmSendEmail = async () => {
+    setShowConfirmDialog(false);
     setIsSending(true);
 
     try {
@@ -191,9 +225,16 @@ export default function SendEmailPage() {
         ccEmails: ccEmail.trim() || undefined,
         bccEmails: bccEmail.trim() || undefined,
       });
-    } catch (error) {
+      setRetryCount(0); // Reset retry count on success
+    } catch {
       // Error handling is done in the mutation's onError
-      console.error("Send email error:", error);
+    }
+  };
+
+  const handleRetry = () => {
+    if (retryCount < 2) {
+      setRetryCount((prev) => prev + 1);
+      void confirmSendEmail();
     }
   };
 
@@ -490,7 +531,7 @@ export default function SendEmailPage() {
         <Button
           onClick={handleSendEmail}
           disabled={!canSend || isSending}
-          className="bg-gradient-to-r from-emerald-600 to-teal-600 shadow-md transition-all duration-200 hover:from-emerald-700 hover:to-teal-700 hover:shadow-lg"
+          className="bg-gradient-to-r from-emerald-600 to-teal-600 shadow-md transition-colors duration-200 hover:from-emerald-700 hover:to-teal-700"
           size="sm"
         >
           {isSending ? (
@@ -506,6 +547,52 @@ export default function SendEmailPage() {
           )}
         </Button>
       </FloatingActionBar>
+
+      {/* Confirmation Dialog */}
+      <Dialog open={showConfirmDialog} onOpenChange={setShowConfirmDialog}>
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Send Invoice Email?</DialogTitle>
+            <DialogDescription>
+              This will send invoice #{invoice.invoiceNumber} to{" "}
+              <strong>{invoice.client?.email}</strong>
+              {ccEmail && (
+                <>
+                  {" "}
+                  with CC to <strong>{ccEmail}</strong>
+                </>
+              )}
+              {bccEmail && (
+                <>
+                  {" "}
+                  and BCC to <strong>{bccEmail}</strong>
+                </>
+              )}
+              .
+              {retryCount > 0 && (
+                <div className="mt-2 text-sm text-yellow-600">
+                  Retry attempt {retryCount} of 2
+                </div>
+              )}
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button
+              variant="outline"
+              onClick={() => setShowConfirmDialog(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              onClick={confirmSendEmail}
+              className="bg-gradient-to-r from-emerald-600 to-teal-600 hover:from-emerald-700 hover:to-teal-700"
+            >
+              <Send className="mr-2 h-4 w-4" />
+              Send Email
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/src/components/forms/enhanced-send-invoice-button.tsx b/src/components/forms/enhanced-send-invoice-button.tsx
index 33df443..fe3448c 100644
--- a/src/components/forms/enhanced-send-invoice-button.tsx
+++ b/src/components/forms/enhanced-send-invoice-button.tsx
@@ -49,8 +49,8 @@ export function EnhancedSendInvoiceButton({
           !hasClientEmail
             ? "Client has no email address"
             : showResend
-              ? "Resend Invoice"
-              : "Send Invoice"
+              ? "Resend Email"
+              : "Compose Email"
         }
       >
         {invoiceLoading ? (
@@ -90,7 +90,7 @@ export function EnhancedSendInvoiceButton({
           ) : (
             <Send className="mr-2 h-4 w-4" />
           )}
-          <span>{showResend ? "Resend Invoice" : "Send Invoice"}</span>
+          <span>{showResend ? "Resend Email" : "Compose Email"}</span>
         </>
       )}
     </Button>
diff --git a/src/components/layout/floating-action-bar.tsx b/src/components/layout/floating-action-bar.tsx
index 24918ec..70a410c 100644
--- a/src/components/layout/floating-action-bar.tsx
+++ b/src/components/layout/floating-action-bar.tsx
@@ -61,8 +61,8 @@ export function FloatingActionBar({
       {/* Content container - full width when floating, content width when docked */}
       <div
         className={cn(
-          "w-full transition-all duration-300",
-          isDocked ? "mx-auto  px-4 mb-0" : "px-4 mb-4",
+          "w-full transition-transform duration-300",
+          isDocked ? "mx-auto mb-0 px-4" : "mb-4 px-4",
         )}
       >
         <Card className="card-primary">
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 6b479e9..001fc04 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "~/lib/utils";
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors duration-150 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
   {
     variants: {
       variant: {
@@ -16,7 +16,7 @@ const buttonVariants = cva(
         destructive:
           "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:
-          "border border-border/40 bg-background/60 shadow-sm backdrop-blur-sm hover:bg-accent/50 hover:text-accent-foreground hover:border-border/60 transition-all duration-200",
+          "border border-border/40 bg-background/60 shadow-sm backdrop-blur-sm hover:bg-accent/50 hover:text-accent-foreground hover:border-border/60 transition-colors duration-150",
         secondary:
           "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
diff --git a/src/lib/email-templates/invoice-email.ts b/src/lib/email-templates/invoice-email.ts
index 0e8bd31..e3c5255 100644
--- a/src/lib/email-templates/invoice-email.ts
+++ b/src/lib/email-templates/invoice-email.ts
@@ -43,7 +43,7 @@ export function generateInvoiceEmailTemplate({
   customMessage,
   userName,
   userEmail,
-  baseUrl = "https://beenvoice.app",
+  baseUrl: _baseUrl = "https://beenvoice.app",
 }: InvoiceEmailTemplateProps): { html: string; text: string } {
   const formatDate = (date: Date) => {
     return new Intl.DateTimeFormat("en-US", {
@@ -173,44 +173,25 @@ export function generateInvoiceEmailTemplate({
             margin: 24px 0;
         }
 
-        .invoice-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: flex-start;
+        .invoice-summary {
             margin-bottom: 20px;
-            flex-wrap: wrap;
-            gap: 16px;
         }
 
         .invoice-number {
             font-size: 24px;
             font-weight: bold;
             color: #16a34a;
-            margin-bottom: 4px;
+            margin-bottom: 8px;
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
         }
 
         .invoice-date {
             font-size: 14px;
             color: #6b7280;
-        }
-
-        .invoice-amount {
-            text-align: right;
-        }
-
-        .amount-label {
-            font-size: 14px;
-            color: #6b7280;
             margin-bottom: 4px;
         }
 
-        .amount-value {
-            font-size: 28px;
-            font-weight: bold;
-            color: #1f2937;
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
-        }
+
 
         .invoice-details {
             border-top: 1px solid #e5e7eb;
@@ -219,12 +200,14 @@ export function generateInvoiceEmailTemplate({
         }
 
         .detail-row {
-            display: table;
+            border-collapse: separate;
+            border-spacing: 0;
             width: 100%;
-            padding: 8px 0;
             border-bottom: 1px solid #f3f4f6;
         }
 
+
+
         .detail-row:last-child {
             border-bottom: none;
             font-weight: 600;
@@ -234,21 +217,19 @@ export function generateInvoiceEmailTemplate({
         }
 
         .detail-label {
-            display: table-cell;
             font-size: 14px;
             color: #6b7280;
             text-align: left;
-            width: 50%;
+            padding: 8px 0;
         }
 
         .detail-value {
-            display: table-cell;
             font-size: 14px;
             color: #1f2937;
             font-weight: bold;
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
             text-align: right;
-            width: 50%;
+            padding: 8px 0;
         }
 
         .business-info {
@@ -349,11 +330,14 @@ export function generateInvoiceEmailTemplate({
             border-top: 1px solid #e5e7eb;
         }
 
-        .footer-logo {
-            max-width: 80px;
-            height: auto;
+        .footer-brand {
+            font-size: 18px;
+            font-weight: bold;
+            color: #16a34a;
             margin: 0 auto 8px;
             display: block;
+            text-align: center;
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
         }
 
         .footer-text {
@@ -378,6 +362,12 @@ export function generateInvoiceEmailTemplate({
             mso-table-rspace: 0pt;
         }
 
+        /* Gmail specific fixes */
+        .gmail-fix {
+            border-collapse: separate !important;
+            border-spacing: 0 !important;
+        }
+
         /* Apple Mail attachment preview fix */
         .attachment-notice {
             border: 2px dashed #bbf7d0 !important;
@@ -404,15 +394,10 @@ export function generateInvoiceEmailTemplate({
                 text-align: left;
             }
 
-            .detail-row {
-                display: block;
-            }
-
-            .detail-label,
-            .detail-value {
-                display: block;
-                width: 100%;
-                text-align: left;
+            .detail-row td {
+                display: block !important;
+                width: 100% !important;
+                text-align: left !important;
             }
         }
     </style>
@@ -434,39 +419,41 @@ export function generateInvoiceEmailTemplate({
             ${customContent ? `<div class="message custom-content">${customContent}</div>` : ""}
 
             <div class="invoice-card">
-                <div class="invoice-header">
-                    <div>
-                        <div class="invoice-number">#${invoice.invoiceNumber}</div>
-                        <div class="invoice-date">Issue Date: ${formatDate(invoice.issueDate)}</div>
-                        <div class="invoice-date">Due Date: ${formatDate(invoice.dueDate)}</div>
-                    </div>
-                    <div class="invoice-amount">
-                        <div class="amount-label">Total Amount</div>
-                        <div class="amount-value">${formatCurrency(total)}</div>
-                    </div>
+                <div class="invoice-summary">
+                    <div class="invoice-number">#${invoice.invoiceNumber}</div>
+                    <div class="invoice-date">Issue Date: ${formatDate(invoice.issueDate)}</div>
+                    <div class="invoice-date">Due Date: ${formatDate(invoice.dueDate)}</div>
                 </div>
 
                 <div class="invoice-details">
-                    <div class="detail-row">
-                        <span class="detail-label">Client</span>
-                        <span class="detail-value">${invoice.client.name}</span>
-                    </div>
-                    <div class="detail-row">
-                        <span class="detail-label">Subtotal</span>
-                        <span class="detail-value">${formatCurrency(subtotal)}</span>
-                    </div>
+                    <table class="detail-row" cellpadding="0" cellspacing="0" border="0" width="100%" style="border-collapse: separate; border-spacing: 0; width: 100%; border-bottom: 1px solid #f3f4f6;">
+                        <tr>
+                            <td class="detail-label" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: left;">Client</td>
+                            <td class="detail-value" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: right;">${invoice.client.name}</td>
+                        </tr>
+                    </table>
+                    <table class="detail-row" cellpadding="0" cellspacing="0" border="0" width="100%" style="border-collapse: separate; border-spacing: 0; width: 100%; border-bottom: 1px solid #f3f4f6;">
+                        <tr>
+                            <td class="detail-label" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: left;">Subtotal</td>
+                            <td class="detail-value" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: right;">${formatCurrency(subtotal)}</td>
+                        </tr>
+                    </table>
                     ${
                       invoice.taxRate > 0
-                        ? `<div class="detail-row">
-                            <span class="detail-label">Tax (${invoice.taxRate}%)</span>
-                            <span class="detail-value">${formatCurrency(taxAmount)}</span>
-                           </div>`
+                        ? `<table class="detail-row" cellpadding="0" cellspacing="0" border="0" width="100%" style="border-collapse: separate; border-spacing: 0; width: 100%; border-bottom: 1px solid #f3f4f6;">
+                            <tr>
+                                <td class="detail-label" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: left;">Tax (${invoice.taxRate}%)</td>
+                                <td class="detail-value" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: right;">${formatCurrency(taxAmount)}</td>
+                            </tr>
+                           </table>`
                         : ""
                     }
-                    <div class="detail-row">
-                        <span class="detail-label">Total</span>
-                        <span class="detail-value">${formatCurrency(total)}</span>
-                    </div>
+                    <table class="detail-row" cellpadding="0" cellspacing="0" border="0" width="100%" style="border-collapse: separate; border-spacing: 0; width: 100%; border-top: 2px solid #e5e7eb; margin-top: 8px; padding-top: 12px;">
+                        <tr>
+                            <td class="detail-label" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: left; font-weight: bold; font-size: 16px;">Total</td>
+                            <td class="detail-value" style="width: 50%; vertical-align: top; padding: 8px 0; text-align: right; font-weight: bold; font-size: 18px; color: #16a34a;">${formatCurrency(total)}</td>
+                        </tr>
+                    </table>
                 </div>
             </div>
 
@@ -497,7 +484,7 @@ export function generateInvoiceEmailTemplate({
         </div>
 
         <div class="footer">
-            <img src="${baseUrl}/beenvoice-logo.svg" alt="beenvoice" class="footer-logo" />
+            <div class="footer-brand">beenvoice</div>
             ${
               invoice.business
                 ? `<div class="footer-text">
diff --git a/src/lib/pdf-export.tsx b/src/lib/pdf-export.tsx
index 644ee2c..9ef0275 100644
--- a/src/lib/pdf-export.tsx
+++ b/src/lib/pdf-export.tsx
@@ -65,8 +65,7 @@ const registerFonts = () => {
     }
 
     fontsRegistered = true;
-  } catch (error) {
-    console.warn("Font registration failed, using built-in fonts:", error);
+  } catch {
     fontsRegistered = true; // Don't keep trying
   }
 };
@@ -1076,8 +1075,6 @@ export async function generateInvoicePDF(invoice: InvoiceData): Promise<void> {
     // Download the PDF
     saveAs(blob, filename);
   } catch (error) {
-    console.error("PDF generation error:", error);
-
     // Provide more specific error messages
     if (error instanceof Error) {
       if (error.message.includes("timeout")) {
@@ -1102,8 +1099,6 @@ export async function generateInvoicePDF(invoice: InvoiceData): Promise<void> {
 export async function generateInvoicePDFBlob(
   invoice: InvoiceData,
 ): Promise<Blob> {
-  const isServerSide = typeof window === "undefined";
-
   try {
     // Ensure fonts are registered (important for server-side generation)
     registerFonts();
@@ -1121,10 +1116,6 @@ export async function generateInvoicePDFBlob(
       throw new Error("Client information is required");
     }
 
-    console.log(
-      `Generating PDF blob for invoice ${invoice.invoiceNumber} (${isServerSide ? "server-side" : "client-side"})...`,
-    );
-
     // Generate PDF blob with timeout (same as generateInvoicePDF)
     const pdfPromise = pdf(<InvoicePDF invoice={invoice} />).toBlob();
     const timeoutPromise = new Promise<never>((_, reject) =>
@@ -1137,17 +1128,8 @@ export async function generateInvoicePDFBlob(
     if (!blob || blob.size === 0) {
       throw new Error("Generated PDF is empty");
     }
-
-    console.log(
-      `PDF blob generated successfully, size: ${blob.size} bytes (${isServerSide ? "server-side" : "client-side"})`,
-    );
     return blob;
   } catch (error) {
-    console.error(
-      `PDF generation error for email attachment (${isServerSide ? "server-side" : "client-side"}):`,
-      error,
-    );
-
     // Provide more specific error messages (same as generateInvoicePDF)
     if (error instanceof Error) {
       if (error.message.includes("timeout")) {
diff --git a/src/server/api/routers/email.ts b/src/server/api/routers/email.ts
index 6cb2b66..f8996cb 100644
--- a/src/server/api/routers/email.ts
+++ b/src/server/api/routers/email.ts
@@ -119,15 +119,6 @@ export const emailRouter = createTRPCRouter({
       let resendInstance: Resend;
       let fromEmail: string;
 
-      console.log("Email configuration debug:");
-      console.log(
-        "- Business resendApiKey:",
-        invoice.business?.resendApiKey ? "***SET***" : "not set",
-      );
-      console.log("- Business resendDomain:", invoice.business?.resendDomain);
-      console.log("- System RESEND_DOMAIN:", env.RESEND_DOMAIN);
-      console.log("- Business email:", invoice.business?.email);
-
       // Check if business has custom Resend configuration
       if (invoice.business?.resendApiKey && invoice.business?.resendDomain) {
         // Use business's custom Resend setup
@@ -135,21 +126,16 @@ export const emailRouter = createTRPCRouter({
         const fromName =
           invoice.business.emailFromName ?? invoice.business.name ?? userName;
         fromEmail = `${fromName} <noreply@${invoice.business.resendDomain}>`;
-        console.log("- Using business custom Resend configuration");
       } else if (env.RESEND_DOMAIN) {
         // Use system Resend configuration
         resendInstance = defaultResend;
         fromEmail = `noreply@${env.RESEND_DOMAIN}`;
-        console.log("- Using system Resend configuration");
       } else {
         // Fallback to business email if no configured domains
         resendInstance = defaultResend;
         fromEmail = invoice.business?.email ?? "noreply@yourdomain.com";
-        console.log("- Using fallback configuration");
       }
 
-      console.log("- Final fromEmail:", fromEmail);
-
       // Prepare CC and BCC lists
       const ccEmails: string[] = [];
       const bccEmails: string[] = [];
@@ -163,8 +149,6 @@ export const emailRouter = createTRPCRouter({
         for (const email of ccList) {
           if (emailRegex.test(email)) {
             ccEmails.push(email);
-          } else {
-            console.warn("Invalid CC email format, skipping:", email);
           }
         }
       }
@@ -178,8 +162,6 @@ export const emailRouter = createTRPCRouter({
         for (const email of bccList) {
           if (emailRegex.test(email)) {
             bccEmails.push(email);
-          } else {
-            console.warn("Invalid BCC email format, skipping:", email);
           }
         }
       }
@@ -189,11 +171,6 @@ export const emailRouter = createTRPCRouter({
         // Validate business email format before adding to CC
         if (emailRegex.test(invoice.business.email)) {
           ccEmails.push(invoice.business.email);
-        } else {
-          console.warn(
-            "Invalid business email format, skipping CC:",
-            invoice.business.email,
-          );
         }
       }
 
@@ -222,8 +199,7 @@ export const emailRouter = createTRPCRouter({
             },
           ],
         });
-      } catch (sendError) {
-        console.error("Resend API call failed:", sendError);
+      } catch {
         throw new Error(
           "Email service is currently unavailable. Please try again later.",
         );
@@ -231,7 +207,6 @@ export const emailRouter = createTRPCRouter({
 
       // Enhanced error checking
       if (emailResult.error) {
-        console.error("Resend API error:", emailResult.error);
         const errorMsg = emailResult.error.message?.toLowerCase() ?? "";
 
         // Provide more specific error messages based on error type
@@ -287,12 +262,8 @@ export const emailRouter = createTRPCRouter({
               updatedAt: new Date(),
             })
             .where(eq(invoices.id, input.invoiceId));
-        } catch (dbError) {
-          console.error("Failed to update invoice status:", dbError);
+        } catch {
           // Don't throw here - email was sent successfully, status update is secondary
-          console.warn(
-            `Invoice ${invoice.invoiceNumber} sent but status not updated`,
-          );
         }
       }