diff --git a/.vscodeignore b/.vscodeignore
index 484b658..279d1bc 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -36,4 +36,7 @@ webview-ui/node_modules/**
 !node_modules/@vscode/codicons/dist/codicon.ttf
 
 # Include default themes JSON files used in getTheme
-!src/utils/default-themes/**
\ No newline at end of file
+!src/utils/default-themes/**
+
+# Include icons
+!icons/**
\ No newline at end of file
diff --git a/icon.png b/icon.png
deleted file mode 100644
index 9f94c25..0000000
Binary files a/icon.png and /dev/null differ
diff --git a/icons/icon.png b/icons/icon.png
new file mode 100644
index 0000000..f981fe0
Binary files /dev/null and b/icons/icon.png differ
diff --git a/icons/robot_panel_dark.png b/icons/robot_panel_dark.png
new file mode 100644
index 0000000..0ed7cc6
Binary files /dev/null and b/icons/robot_panel_dark.png differ
diff --git a/icons/robot_panel_light.png b/icons/robot_panel_light.png
new file mode 100644
index 0000000..bbc7fca
Binary files /dev/null and b/icons/robot_panel_light.png differ
diff --git a/package.json b/package.json
index 5350e1e..57f6fbb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,11 @@
   "displayName": "Claude Dev",
   "description": "Autonomous coding agent right in your IDE, capable of creating/editing files, executing commands, and more with your permission every step of the way.",
   "version": "1.5.34",
-  "icon": "icon.png",
+  "icon": "icons/icon.png",
+  "galleryBanner": {
+    "color": "#C1DCEA",
+    "theme": "light"
+  },
   "engines": {
     "vscode": "^1.84.0"
   },
diff --git a/src/extension.ts b/src/extension.ts
index 3ab6101..0f04812 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -67,7 +67,11 @@ export function activate(context: vscode.ExtensionContext) {
 			localResourceRoots: [context.extensionUri],
 		})
 		// TODO: use better svg icon with light and dark variants (see https://stackoverflow.com/questions/58365687/vscode-extension-iconpath)
-		panel.iconPath = vscode.Uri.joinPath(context.extensionUri, "icon.png")
+
+		panel.iconPath = {
+			light: vscode.Uri.joinPath(context.extensionUri, "icons", "robot_panel_light.png"),
+			dark: vscode.Uri.joinPath(context.extensionUri, "icons", "robot_panel_dark.png"),
+		}
 		tabProvider.resolveWebviewView(panel)
 
 		// Lock the editor group so clicking on files doesn't open them over the panel
diff --git a/src/integrations/TerminalManager.ts b/src/integrations/TerminalManager.ts
index ae11feb..2aaa53c 100644
--- a/src/integrations/TerminalManager.ts
+++ b/src/integrations/TerminalManager.ts
@@ -44,7 +44,6 @@ console.log('Unretrieved output:', unretrievedOutput);
 */
 
 export class TerminalManager {
-	private static readonly TERMINAL_NAME = "Claude Dev"
 	private terminals: TerminalInfo[] = []
 	private processes: Map<number, TerminalProcess> = new Map()
 	private context: vscode.ExtensionContext
@@ -127,8 +126,9 @@ export class TerminalManager {
 		}
 
 		const newTerminal = vscode.window.createTerminal({
-			name: `${TerminalManager.TERMINAL_NAME} ${this.nextTerminalId}`,
+			name: "Claude Dev",
 			cwd: cwd,
+			iconPath: new vscode.ThemeIcon("robot"),
 		})
 		const newTerminalInfo: TerminalInfo = {
 			terminal: newTerminal,