diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 576a61198614952aa7d7276fc6a146427c8b8cdc..396ae88f4481427178eea0768117227dffbe7881 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -273,11 +273,11 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
 			}
 		} else {
 			this.fillActionBar(instance, template);
+			label = prefix;
 			// Only add the title if the icon is set, this prevents the title jumping around for
 			// example when launching with a ShellLaunchConfig.name and no icon
 			if (instance.icon) {
-				label = `${prefix}$(${iconId})`;
-				label += ` ${instance.title}`;
+				label += `$(${iconId}) ${instance.title}`;
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index f709c69f394c797a992282280c279c9661781843..6563b12d67d500104d7a7e9297bb427bf8cb3212 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -526,10 +526,11 @@ class TerminalThemeIconStyle extends Themable {
 
 	override updateStyles(): void {
 		super.updateStyles();
-		let css = '';
-		// TODO add a rule collector to avoid duplication
 		const colorTheme = this._themeService.getColorTheme();
 
+		// TODO add a rule collector to avoid duplication
+		let css = '';
+
 		// Add icons
 		for (const instance of this._terminalService.terminalInstances) {
 			const icon = instance.icon;
@@ -557,8 +558,6 @@ class TerminalThemeIconStyle extends Themable {
 			}
 			const color = colorTheme.getColor(instance.color);
 			if (color) {
-				// TODO: Show all colors in change color picker
-				// TODO: Use .terminal-color-...
 				// exclude status icons (file-icon) and inline action icons (trashcan and horizontalSplit)
 				css += `.monaco-workbench .${colorClass} .codicon:not(.codicon-split-horizontal):not(.codicon-trashcan):not(.file-icon) { color: ${color} !important; }`;
 			}