diff --git a/src/pages/Clients.tsx b/src/pages/Clients.tsx
index cab433f..035e95f 100644
--- a/src/pages/Clients.tsx
+++ b/src/pages/Clients.tsx
@@ -125,9 +125,12 @@ export default function Clients() {
         </div>
         
         {canCreateClient && (
-          <Button onClick={() => setIsCreateModalOpen(true)} className="flex items-center gap-2">
+          <Button
+            onClick={() => setIsCreateModalOpen(true)}
+            size="icon"
+            title={t.clients.addClient}
+          >
             <Plus className="w-4 h-4" />
-            {t.clients.addClient}
           </Button>
         )}
       </div>
diff --git a/src/pages/Projects.tsx b/src/pages/Projects.tsx
index 489dc19..3f96dec 100644
--- a/src/pages/Projects.tsx
+++ b/src/pages/Projects.tsx
@@ -142,10 +142,11 @@ export const Projects: React.FC = () => {
           {canCreateProject && (
             <Button
               onClick={() => setIsCreateModalOpen(true)}
-              className="gap-2 shadow-sm flex-1 sm:flex-none"
+              size="icon"
+              className="shadow-sm"
+              title={t.projects?.createNew || 'Create New'}
             >
               <Plus className="h-5 w-5" />
-              {t.projects?.createNew || 'Create New'}
             </Button>
           )}
         </div>
diff --git a/src/pages/Tags.tsx b/src/pages/Tags.tsx
index 66215c7..bcb3037 100644
--- a/src/pages/Tags.tsx
+++ b/src/pages/Tags.tsx
@@ -152,9 +152,8 @@ export default function Tags() {
           </p>
         </div>
         {canCreateTag && (
-          <Button onClick={openCreateModal} className="gap-2 shadow-sm">
+          <Button onClick={openCreateModal} size="icon" className="shadow-sm" title={t.tags?.create || "Create Tag"}>
             <Plus className="h-4 w-4" />
-            {t.tags?.create || "Create Tag"}
           </Button>
         )}
       </div>
diff --git a/src/pages/Workspaces.tsx b/src/pages/Workspaces.tsx
index 0520b5c..32dc7c1 100644
--- a/src/pages/Workspaces.tsx
+++ b/src/pages/Workspaces.tsx
@@ -124,10 +124,11 @@ export default function Workspaces() {
         </div>
         <Button
           onClick={() => navigate('/workspaces/create')}
-          className="gap-2 shadow-sm"
+          size="icon"
+          className="shadow-sm"
+          title={t.workspace?.createNew || 'Create New'}
         >
           <Plus className="h-5 w-5" />
-          {t.workspace?.createNew || 'Create New'}
         </Button>
       </div>