diff --git a/frontend/src/features/lists/SharedListsView.tsx b/frontend/src/features/lists/SharedListsView.tsx
index 4f3853c..7605cc7 100644
--- a/frontend/src/features/lists/SharedListsView.tsx
+++ b/frontend/src/features/lists/SharedListsView.tsx
@@ -837,11 +837,11 @@ export const SharedListsView: React.FC<SharedListsViewProps> = ({ onRefreshGloba
               <div key={lst.id} className="relative group flex items-center">
                 <button
                   onClick={() => setActiveListId(lst.id)}
-                  className={`h-8 px-3 text-xs font-medium border rounded-btn flex items-center gap-1.5 transition-colors ${
+                  className={`h-8 px-3 text-xs font-medium border flex items-center gap-1.5 transition-colors ${
                     isSelected
                       ? 'bg-panel border-accent text-main'
                       : 'bg-canvas border-border text-muted hover:text-main'
-                  }`}
+                  } ${isSelected && lists.length > 1 ? 'rounded-l-btn rounded-r-none border-r-0' : 'rounded-btn'}`}
                 >
                   <span>{lst.icon}</span>
                   <span>{lst.title}</span>
@@ -853,7 +853,7 @@ export const SharedListsView: React.FC<SharedListsViewProps> = ({ onRefreshGloba
                   <button
                     onClick={() => handleDeleteList(lst.id)}
                     title="Liste löschen"
-                    className="h-8 px-1.5 bg-panel border-y border-r border-accent text-faint hover:text-status-err"
+                    className="h-8 px-2 bg-panel border-y border-r border-accent text-faint hover:text-status-err hover:bg-status-err/10 rounded-r-btn flex items-center justify-center transition-colors cursor-pointer"
                   >
                     <X className="w-3 h-3" />
                   </button>
diff --git a/frontend/src/features/triage/TasksView.tsx b/frontend/src/features/triage/TasksView.tsx
index f198564..24767db 100644
--- a/frontend/src/features/triage/TasksView.tsx
+++ b/frontend/src/features/triage/TasksView.tsx
@@ -1230,10 +1230,10 @@ export const TasksView: React.FC<TasksViewProps> = ({
             <div key={tl.id} className="relative group flex items-center">
               <button
                 onClick={() => setSelectedListId(tl.id)}
-                className={`h-8 px-3 text-xs font-medium border rounded-btn flex items-center gap-1.5 transition-colors ${
+                className={`h-8 px-3 text-xs font-medium border flex items-center gap-1.5 transition-colors ${
                   selectedListId === tl.id
-                    ? 'bg-panel border-accent text-main'
-                    : 'bg-canvas border-border text-muted hover:text-main'
+                    ? 'bg-panel border-accent text-main rounded-l-btn rounded-r-none border-r-0'
+                    : 'bg-canvas border-border text-muted hover:text-main rounded-btn'
                 }`}
               >
                 <span>{tl.icon}</span>
@@ -1271,7 +1271,7 @@ export const TasksView: React.FC<TasksViewProps> = ({
                 <button
                   onClick={() => handleDeleteTaskList(tl.id)}
                   title="Liste löschen"
-                  className="h-8 px-1.5 bg-panel border-y border-r border-accent text-faint hover:text-status-err"
+                  className="h-8 px-2 bg-panel border-y border-r border-accent text-faint hover:text-status-err hover:bg-status-err/10 rounded-r-btn flex items-center justify-center transition-colors cursor-pointer"
                 >
                   <X className="w-3 h-3" />
                 </button>