diff --git a/app/mail/page.tsx b/app/mail/page.tsx
index 78a6ff8..d3f6667 100644
--- a/app/mail/page.tsx
+++ b/app/mail/page.tsx
@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
-import { Mail, Inbox, Send, Star, Trash, Settings, Plus, Menu, Search, User, X } from 'lucide-react';
+import { Mail, Inbox, Send, Star, Trash, Plus, ChevronLeft, ChevronRight, Search, ChevronDown } from 'lucide-react';
 
 interface Account {
   id: number;
@@ -141,31 +141,41 @@ export default function MailPage() {
                     ${mobileSidebarOpen ? 'fixed inset-y-0 left-0 z-40' : 'hidden'} md:block`}>
         {/* Logo and toggle */}
         <div className="p-3 flex items-center justify-between border-b border-gray-100">
-          {sidebarOpen && (
-            <div className="flex items-center justify-between w-full">
-              <h1 className="text-lg font-semibold text-gray-800">Mail</h1>
-              <Button 
-                variant="ghost"
-                size="sm"
-                className="text-gray-600"
-              >
-                <div className="flex items-center gap-2">
-                  <div className="w-2.5 h-2.5 rounded-full bg-blue-500"></div>
-                  <span className="text-sm">All accounts</span>
-                </div>
-              </Button>
-            </div>
-          )}
+          {sidebarOpen && <h1 className="text-lg font-semibold text-gray-800">Mail</h1>}
           <Button 
             variant="ghost"
             size="icon"
             className="hidden md:flex text-gray-600"
             onClick={() => setSidebarOpen(!sidebarOpen)}
           >
-            {sidebarOpen ? <X className="h-4 w-4" /> : <Menu className="h-4 w-4" />}
+            {sidebarOpen ? <ChevronLeft className="h-4 w-4" /> : <ChevronRight className="h-4 w-4" />}
           </Button>
         </div>
 
+        {/* Account Selection */}
+        <div className="p-3 border-b border-gray-100">
+          {sidebarOpen ? (
+            <Button 
+              variant="ghost"
+              className="w-full justify-between text-gray-600 hover:text-gray-900"
+            >
+              <div className="flex items-center gap-2">
+                <div className="w-2.5 h-2.5 rounded-full bg-blue-500"></div>
+                <span>All accounts</span>
+              </div>
+              <ChevronDown className="h-4 w-4" />
+            </Button>
+          ) : (
+            <Button
+              variant="ghost"
+              size="icon"
+              className="w-full aspect-square"
+            >
+              <div className="w-2.5 h-2.5 rounded-full bg-blue-500"></div>
+            </Button>
+          )}
+        </div>
+
         {/* Compose button */}
         <Button 
           className={`mx-3 mt-3 mb-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 flex items-center justify-center transition-all ${sidebarOpen ? 'py-2 px-4' : 'p-2'}`}
@@ -243,9 +253,6 @@ export default function MailPage() {
                 <Search className="absolute left-3 top-2.5 h-4 w-4 text-gray-400" />
               </div>
             </div>
-            <Button variant="ghost" size="icon" className="ml-4 text-gray-600">
-              <User className="h-4 w-4" />
-            </Button>
           </div>
         </header>
 
@@ -361,10 +368,11 @@ export default function MailPage() {
               </div>
             </div>
           ) : (
-            <div className="hidden md:flex flex-1 items-center justify-center bg-gray-50 text-gray-500">
+            <div className="hidden md:flex flex-1 items-center justify-center bg-gray-50">
               <div className="text-center">
-                <Mail className="h-16 w-16 mx-auto mb-4 opacity-30" />
-                <p>Select an email to read</p>
+                <Mail className="h-16 w-16 mx-auto mb-4 text-gray-300" />
+                <p className="text-gray-500">No email selected</p>
+                <p className="text-sm text-gray-400">Choose an email from the list to read its contents</p>
               </div>
             </div>
           )}