Adopt icon font in activity bar

src/vs/base/browser/ui/codiconLabel/codicon/codicon.css

@@ -5,7 +5,7 @@
 
 @font-face {
 	font-family: "codicon";
-	src: url("./codicon.ttf?3a05fcfc657285cdb4cd3eba790b7462") format("truetype");
+	src: url("./codicon.ttf?a131ba6056e336dfd62f50ba74386e6e") format("truetype");
 }
 
 .codicon[class*='codicon-'] {
@@ -332,52 +332,53 @@
 .codicon-search-stop:before { content: "\f1b7" }
 .codicon-selection:before { content: "\f1b8" }
 .codicon-server:before { content: "\f1b9" }
-.codicon-settings:before { content: "\f1ba" }
-.codicon-shield:before { content: "\f1bb" }
-.codicon-smiley:before { content: "\f1bc" }
-.codicon-sort-precedence:before { content: "\f1bd" }
-.codicon-split-horizontal:before { content: "\f1be" }
-.codicon-split-vertical:before { content: "\f1bf" }
-.codicon-squirrel:before { content: "\f1c0" }
-.codicon-star-full:before { content: "\f1c1" }
-.codicon-star-half:before { content: "\f1c2" }
-.codicon-symbol-class:before { content: "\f1c3" }
-.codicon-symbol-color:before { content: "\f1c4" }
-.codicon-symbol-constant:before { content: "\f1c5" }
-.codicon-symbol-enum-member:before { content: "\f1c6" }
-.codicon-symbol-field:before { content: "\f1c7" }
-.codicon-symbol-file:before { content: "\f1c8" }
-.codicon-symbol-interface:before { content: "\f1c9" }
-.codicon-symbol-keyword:before { content: "\f1ca" }
-.codicon-symbol-misc:before { content: "\f1cb" }
-.codicon-symbol-operator:before { content: "\f1cc" }
-.codicon-symbol-property:before { content: "\f1cd" }
-.codicon-symbol-snippet:before { content: "\f1ce" }
-.codicon-tasklist:before { content: "\f1cf" }
-.codicon-telescope:before { content: "\f1d0" }
-.codicon-text-size:before { content: "\f1d1" }
-.codicon-three-bars:before { content: "\f1d2" }
-.codicon-thumbsdown:before { content: "\f1d3" }
-.codicon-thumbsup:before { content: "\f1d4" }
-.codicon-tools:before { content: "\f1d5" }
-.codicon-triangle-down:before { content: "\f1d6" }
-.codicon-triangle-left:before { content: "\f1d7" }
-.codicon-triangle-right:before { content: "\f1d8" }
-.codicon-triangle-up:before { content: "\f1d9" }
-.codicon-twitter:before { content: "\f1da" }
-.codicon-unfold:before { content: "\f1db" }
-.codicon-unlock:before { content: "\f1dc" }
-.codicon-unmute:before { content: "\f1dd" }
-.codicon-unverified:before { content: "\f1de" }
-.codicon-verified:before { content: "\f1df" }
-.codicon-versions:before { content: "\f1e0" }
-.codicon-vm-active:before { content: "\f1e1" }
-.codicon-vm-outline:before { content: "\f1e2" }
-.codicon-vm-running:before { content: "\f1e3" }
-.codicon-watch:before { content: "\f1e4" }
-.codicon-whitespace:before { content: "\f1e5" }
-.codicon-whole-word:before { content: "\f1e6" }
-.codicon-window:before { content: "\f1e7" }
-.codicon-word-wrap:before { content: "\f1e8" }
-.codicon-zoom-in:before { content: "\f1e9" }
-.codicon-zoom-out:before { content: "\f1ea" }
+.codicon-settings-gear:before { content: "\f1ba" }
+.codicon-settings:before { content: "\f1bb" }
+.codicon-shield:before { content: "\f1bc" }
+.codicon-smiley:before { content: "\f1bd" }
+.codicon-sort-precedence:before { content: "\f1be" }
+.codicon-split-horizontal:before { content: "\f1bf" }
+.codicon-split-vertical:before { content: "\f1c0" }
+.codicon-squirrel:before { content: "\f1c1" }
+.codicon-star-full:before { content: "\f1c2" }
+.codicon-star-half:before { content: "\f1c3" }
+.codicon-symbol-class:before { content: "\f1c4" }
+.codicon-symbol-color:before { content: "\f1c5" }
+.codicon-symbol-constant:before { content: "\f1c6" }
+.codicon-symbol-enum-member:before { content: "\f1c7" }
+.codicon-symbol-field:before { content: "\f1c8" }
+.codicon-symbol-file:before { content: "\f1c9" }
+.codicon-symbol-interface:before { content: "\f1ca" }
+.codicon-symbol-keyword:before { content: "\f1cb" }
+.codicon-symbol-misc:before { content: "\f1cc" }
+.codicon-symbol-operator:before { content: "\f1cd" }
+.codicon-symbol-property:before { content: "\f1ce" }
+.codicon-symbol-snippet:before { content: "\f1cf" }
+.codicon-tasklist:before { content: "\f1d0" }
+.codicon-telescope:before { content: "\f1d1" }
+.codicon-text-size:before { content: "\f1d2" }
+.codicon-three-bars:before { content: "\f1d3" }
+.codicon-thumbsdown:before { content: "\f1d4" }
+.codicon-thumbsup:before { content: "\f1d5" }
+.codicon-tools:before { content: "\f1d6" }
+.codicon-triangle-down:before { content: "\f1d7" }
+.codicon-triangle-left:before { content: "\f1d8" }
+.codicon-triangle-right:before { content: "\f1d9" }
+.codicon-triangle-up:before { content: "\f1da" }
+.codicon-twitter:before { content: "\f1db" }
+.codicon-unfold:before { content: "\f1dc" }
+.codicon-unlock:before { content: "\f1dd" }
+.codicon-unmute:before { content: "\f1de" }
+.codicon-unverified:before { content: "\f1df" }
+.codicon-verified:before { content: "\f1e0" }
+.codicon-versions:before { content: "\f1e1" }
+.codicon-vm-active:before { content: "\f1e2" }
+.codicon-vm-outline:before { content: "\f1e3" }
+.codicon-vm-running:before { content: "\f1e4" }
+.codicon-watch:before { content: "\f1e5" }
+.codicon-whitespace:before { content: "\f1e6" }
+.codicon-whole-word:before { content: "\f1e7" }
+.codicon-window:before { content: "\f1e8" }
+.codicon-word-wrap:before { content: "\f1e9" }
+.codicon-zoom-in:before { content: "\f1ea" }
+.codicon-zoom-out:before { content: "\f1eb" }

src/vs/workbench/browser/parts/activitybar/activitybarActions.ts

@@ -270,11 +270,16 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	const activeForegroundColor = theme.getColor(ACTIVITY_BAR_FOREGROUND);
 	if (activeForegroundColor) {
 		collector.addRule(`
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label {
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label:not(.codicon),
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label:not(.codicon),
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label:not(.codicon) {
 				background-color: ${activeForegroundColor} !important;
 			}
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label.codicon,
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.codicon,
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.codicon {
+				color: ${activeForegroundColor} !important;
+			}
 		`);
 	}
 

src/vs/workbench/browser/parts/activitybar/activitybarPart.ts

@@ -306,7 +306,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.globalActivityAction = new ActivityAction({
 			id: 'workbench.actions.manage',
 			name: nls.localize('manage', "Manage"),
-			cssClass: 'update-activity'
+			cssClass: 'codicon-settings-gear'
 		});
 
 		this.globalActivityActionBar.push(this.globalActivityAction);

src/vs/workbench/browser/parts/activitybar/media/activityaction.css

@@ -8,18 +8,27 @@
 	position: relative;
 	padding: 5px 0;
 }
-
 .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-label {
 	position: relative;
 	z-index: 1;
 	display: flex;
 	overflow: hidden;
 	height: 40px;
-	line-height: 40px;
 	margin-right: 0;
-	padding: 0 0 0 48px;
 	box-sizing: border-box;
+
+}
+
+.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-label:not(.codicon) {
 	font-size: 15px;
+	line-height: 40px;
+	padding: 0 0 0 48px;
+}
+
+.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-label.codicon {
+	font-size: 24px;
+	align-items: center;
+	justify-content: center;
 }
 
 .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before,
@@ -102,7 +111,7 @@
 
 /* Right aligned */
 
-.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-label {
+.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-label:not(.codicon) {
 	margin-left: 0;
 	padding: 0 50px 0 0;
 	background-position: calc(100% - 9px) center;

src/vs/workbench/browser/parts/compositeBarActions.ts

@@ -158,7 +158,15 @@ export class ActivityActionViewItem extends BaseActionViewItem {
 		if (this.label) {
 			if (this.options.icon) {
 				const foreground = this._action.checked ? colors.activeBackgroundColor || colors.activeForegroundColor : colors.inactiveBackgroundColor || colors.inactiveForegroundColor;
-				this.label.style.backgroundColor = foreground ? foreground.toString() : '';
+				const isExtension = this.label.className.indexOf('extensionViewlet-') >= 0;
+				const isRemoteExplorer = this.label.className.indexOf('remote') >= 0;
+				if (!isRemoteExplorer && !isExtension) {
+					// Apply foreground color to activity bar items (codicons)
+					this.label.style.color = foreground ? foreground.toString() : '';
+				} else {
+					// Apply background color to extensions + remote explorer (svgs)
+					this.label.style.backgroundColor = foreground ? foreground.toString() : '';
+				}
 			} else {
 				const foreground = this._action.checked ? colors.activeForegroundColor : colors.inactiveForegroundColor;
 				const borderBottomColor = this._action.checked ? colors.activeBorderBottomColor : null;
@@ -310,6 +318,12 @@ export class ActivityActionViewItem extends BaseActionViewItem {
 		this.label.className = 'action-label';
 
 		if (this.activity.cssClass) {
+			const isExtension = this.activity.cssClass.indexOf('extensionViewlet-') >= 0;
+			const isRemoteExplorer = this.activity.cssClass.indexOf('remote') >= 0;
+			if (this.options.icon && !isRemoteExplorer && !isExtension) {
+				// Only apply icon class to activity bar items (exclude extensions + remote explorer)
+				dom.addClass(this.label, 'codicon');
+			}
 			dom.addClass(this.label, this.activity.cssClass);
 		}
 
@@ -346,7 +360,7 @@ export class CompositeOverflowActivityAction extends ActivityAction {
 		super({
 			id: 'additionalComposites.action',
 			name: nls.localize('additionalViews', "Additional Views"),
-			cssClass: 'toggle-more'
+			cssClass: 'codicon-more'
 		});
 	}
 

src/vs/workbench/contrib/debug/browser/debug.contribution.ts

@@ -84,7 +84,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	DebugViewlet,
 	VIEWLET_ID,
 	nls.localize('debug', "Debug"),
-	'debug',
+	'codicon-debug',
 	3
 ));
 

src/vs/workbench/contrib/debug/browser/media/debug-activity-bar.svg

-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.46279 12.86L3.45815 12.79C3.45964 12.8134 3.46119 12.8367 3.46279 12.86Z" fill="white"/>
-<path d="M10.7275 13.5509L7.69304 10.501L8.70723 9.4868L11.9159 12.7117L15.0789 9.54875L16.0931 10.5629L13.0589 13.5972L16.0934 16.647L15.0792 17.6612L11.8705 14.4362L8.70748 17.5993L7.69329 16.5851L10.7275 13.5509Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9329 5.00286V6H18.2784L21.1205 3.15788L22.1347 4.17207L19.4435 6.86321L19.476 6.94805C20.0424 8.42597 20.3614 10.094 20.3614 11.86C20.3614 12.1955 20.3499 12.5274 20.3274 12.8552L20.3222 12.93H23.8629V14.3643H20.142L20.1315 14.4217C19.8292 16.075 19.2409 17.5825 18.4398 18.851L18.3802 18.9454L21.8027 22.3852L20.7859 23.3968L17.512 20.1063L17.4131 20.2169C15.934 21.8712 14.0177 22.8629 11.93 22.8629C9.81001 22.8629 7.86653 21.8402 6.37842 20.1395L6.27988 20.0268L3.07125 23.2355L2.05706 22.2213L5.42258 18.8558L5.36431 18.7615C4.59172 17.5118 4.02373 16.0363 3.72847 14.4217L3.71797 14.3643H0V12.93H3.53777L3.53262 12.8552C3.51009 12.5274 3.49858 12.1955 3.49858 11.86C3.49858 10.117 3.80935 8.46951 4.36194 7.00599L4.39377 6.92168L1.63228 4.14621L2.64904 3.13457L5.50003 6H6.92715V5.00286C6.92715 2.23986 9.16701 0 11.93 0C14.693 0 16.9329 2.23986 16.9329 5.00286ZM8.36144 5.00286V6H15.4986V5.00286C15.4986 3.03199 13.9009 1.43429 11.93 1.43429C9.95914 1.43429 8.36144 3.03199 8.36144 5.00286ZM18.1609 7.52498L18.1267 7.43429H5.73328L5.69915 7.52498C5.21331 8.81605 4.93286 10.2859 4.93286 11.86C4.93286 14.6199 5.7951 17.061 7.11691 18.7793C8.43755 20.4962 10.1529 21.4286 11.93 21.4286C13.7072 21.4286 15.4225 20.4962 16.7431 18.7793C18.0649 17.061 18.9271 14.6199 18.9271 11.86C18.9271 10.2859 18.6467 8.81605 18.1609 7.52498Z" fill="white"/>
-</svg>

src/vs/workbench/contrib/debug/browser/media/debug.contribution.css

@@ -4,10 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 /* Activity Bar */
-.monaco-workbench .activitybar .monaco-action-bar .action-label.debug {
-	-webkit-mask: url('debug-activity-bar.svg') no-repeat 50% 50%;
-}
-
 .monaco-editor .debug-top-stack-frame-column::before {
 	background: url('current-arrow.svg') center center no-repeat;
 }

src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/extensions';
 import { localize } from 'vs/nls';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -81,7 +80,7 @@ const viewletDescriptor = new ViewletDescriptor(
 	ExtensionsViewlet,
 	VIEWLET_ID,
 	localize('extensions', "Extensions"),
-	'extensions',
+	'codicon-extensions',
 	4
 );
 

src/vs/workbench/contrib/extensions/browser/media/extensions-activity-bar.svg

-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 1.5L15 0H22.5L24 1.5V9L22.5 10.5H15L13.5 9V1.5ZM15 1.5V9H22.5V1.5H15ZM0 15V6L1.5 4.5H9L10.5 6V13.5H18L19.5 15V22.5L18 24H10.5H9H1.5L0 22.5V15ZM9 13.5V6H1.5V13.5H9ZM9 15H1.5V22.5H9V15ZM10.5 22.5H18V15H10.5V22.5Z" fill="white"/>
-</svg>

src/vs/workbench/contrib/extensions/browser/media/extensions.css

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .activitybar > .content .monaco-action-bar .action-label.extensions {
-	-webkit-mask: url('extensions-activity-bar.svg') no-repeat 50% 50%;
-}

src/vs/workbench/contrib/files/browser/files.contribution.ts

@@ -77,7 +77,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	ExplorerViewlet,
 	VIEWLET_ID,
 	nls.localize('explore', "Explorer"),
-	'explore',
+	'codicon-files',
 	0
 ));
 

src/vs/workbench/contrib/files/browser/media/explorerviewlet.css

@@ -3,11 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* Activity Bar */
-.monaco-workbench .activitybar .monaco-action-bar .action-label.explore {
-	-webkit-mask: url('files-activity-bar.svg') no-repeat 50% 50%;
-}
-
 /* --- Explorer viewlet --- */
 .explorer-viewlet,
 .explorer-folders-view {

src/vs/workbench/contrib/files/browser/media/files-activity-bar.svg

-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.50001 0L17.5 3.57628e-07L22 4.5V16.5682L20.7046 18H16V22.5682L14.5682 24H2.5L1 22.5682L1 7.50001L2.5 6.00001L7.00001 5.99999V1.5L8.50001 0ZM16 1.5V6.00001H20.5L20.5 16.5H8.50001L8.50001 1.5L16 1.5ZM19.8787 4.5L17.5 2.12132V4.5H19.8787ZM7.00001 7.50001V16.5682L8.50001 18H14.5V22.5H2.5L2.5 7.50001H7.00001Z" fill="white"/>
-</svg>

src/vs/workbench/contrib/scm/browser/media/scm-activity-bar.svg

-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M21 8.25C21.0035 7.55379 20.8131 6.87035 20.4502 6.27622C20.0872 5.68209 19.566 5.20073 18.945 4.88605C18.3239 4.57137 17.6275 4.4358 16.9338 4.49451C16.24 4.55323 15.5764 4.80392 15.017 5.2185C14.4577 5.63308 14.0248 6.19518 13.7669 6.84186C13.509 7.48854 13.4361 8.19426 13.5566 8.87998C13.6771 9.5657 13.986 10.2044 14.4489 10.7244C14.9118 11.2445 15.5104 11.6254 16.1775 11.8245C15.9312 12.3251 15.5501 12.7472 15.0771 13.0431C14.6041 13.3391 14.058 13.4973 13.5 13.5H10.5C9.3894 13.5039 8.32 13.921 7.5 14.67V7.4235C8.41053 7.23764 9.21962 6.72031 9.7704 5.97181C10.3212 5.22331 10.5744 4.29696 10.481 3.37236C10.3876 2.44776 9.95422 1.59077 9.26486 0.96755C8.57551 0.344328 7.67931 -0.000732422 6.75 -0.000732422C5.82069 -0.000732422 4.92449 0.344328 4.23513 0.96755C3.54578 1.59077 3.11239 2.44776 3.01899 3.37236C2.92558 4.29696 3.17882 5.22331 3.7296 5.97181C4.28038 6.72031 5.08947 7.23764 6 7.4235V16.5735C5.09118 16.7473 4.27737 17.2477 3.71208 17.9802C3.14679 18.7128 2.8691 19.6269 2.93137 20.5501C2.99365 21.4733 3.39159 22.3418 4.05014 22.9917C4.70869 23.6417 5.58233 24.0283 6.50626 24.0785C7.4302 24.1287 8.34056 23.839 9.06564 23.2642C9.79073 22.6894 10.2804 21.8691 10.4423 20.9581C10.6042 20.047 10.4272 19.1083 9.94457 18.3188C9.46196 17.5293 8.70715 16.9437 7.8225 16.6725C8.06925 16.1724 8.4505 15.751 8.92346 15.4556C9.39642 15.1601 9.94236 15.0024 10.5 15H13.5C14.436 14.9957 15.3473 14.6996 16.1071 14.153C16.8669 13.6064 17.4373 12.8365 17.739 11.9505C18.6381 11.8323 19.4639 11.3922 20.0635 10.7118C20.6631 10.0314 20.9958 9.15685 21 8.25ZM4.5 3.75C4.5 3.30499 4.63196 2.86998 4.87919 2.49997C5.12643 2.12996 5.47783 1.84157 5.88896 1.67127C6.3001 1.50098 6.7525 1.45642 7.18895 1.54324C7.62541 1.63005 8.02632 1.84434 8.34099 2.15901C8.65566 2.47368 8.86995 2.87459 8.95677 3.31105C9.04358 3.74751 8.99903 4.19991 8.82873 4.61104C8.65843 5.02217 8.37004 5.37358 8.00003 5.62081C7.63002 5.86804 7.19501 6 6.75 6C6.15326 6 5.58097 5.76295 5.15901 5.34099C4.73705 4.91904 4.5 4.34674 4.5 3.75ZM9 20.25C9 20.695 8.86804 21.13 8.62081 21.5C8.37357 21.87 8.02217 22.1584 7.61104 22.3287C7.1999 22.499 6.7475 22.5436 6.31105 22.4568C5.87459 22.37 5.47368 22.1557 5.15901 21.841C4.84434 21.5263 4.63005 21.1254 4.54323 20.689C4.45642 20.2525 4.50097 19.8001 4.67127 19.389C4.84157 18.9778 5.12996 18.6264 5.49997 18.3792C5.86998 18.132 6.30499 18 6.75 18C7.34674 18 7.91903 18.2371 8.34099 18.659C8.76295 19.081 9 19.6533 9 20.25ZM17.25 10.5C16.805 10.5 16.37 10.368 16 10.1208C15.63 9.87358 15.3416 9.52217 15.1713 9.11104C15.001 8.69991 14.9564 8.24751 15.0432 7.81105C15.13 7.37459 15.3443 6.97368 15.659 6.65901C15.9737 6.34434 16.3746 6.13005 16.811 6.04323C17.2475 5.95642 17.6999 6.00098 18.111 6.17127C18.5222 6.34157 18.8736 6.62996 19.1208 6.99997C19.368 7.36998 19.5 7.80499 19.5 8.25C19.5 8.84674 19.2629 9.41904 18.841 9.84099C18.419 10.2629 17.8467 10.5 17.25 10.5Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/contrib/scm/browser/media/scmViewlet.css

@@ -3,10 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench .activitybar > .content .monaco-action-bar .action-label.scm {
-	-webkit-mask: url('scm-activity-bar.svg') no-repeat 50% 50%;
-}
-
 .monaco-workbench .viewlet.scm-viewlet .collapsible.header .actions {
 	width: initial;
 	flex: 1;

src/vs/workbench/contrib/scm/browser/scm.contribution.ts

@@ -42,7 +42,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	SCMViewlet,
 	VIEWLET_ID,
 	localize('source control', "Source Control"),
-	'scm',
+	'codicon-source-control',
 	2
 ));
 

src/vs/workbench/contrib/search/browser/media/search-activity-bar.svg

-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 8.25C22 11.9779 18.9779 15 15.25 15C11.5221 15 8.5 11.9779 8.5 8.25C8.5 4.52208 11.5221 1.5 15.25 1.5C18.9779 1.5 22 4.52208 22 8.25ZM23.5 8.25C23.5 12.8063 19.8063 16.5 15.25 16.5C13.3323 16.5 11.5674 15.8457 10.1664 14.7481L2.12509 23.8677L1 22.8756L9.07353 13.7195C7.78334 12.2636 7 10.3483 7 8.25C7 3.69365 10.6937 0 15.25 0C19.8063 0 23.5 3.69365 23.5 8.25Z" fill="white"/>
-</svg>

src/vs/workbench/contrib/search/browser/media/search.contribution.css

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/* Activity Bar */
-.monaco-workbench .activitybar .monaco-action-bar .action-label.search {
-	-webkit-mask: url('search-activity-bar.svg') no-repeat 50% 50%;
-}
\ No newline at end of file

src/vs/workbench/contrib/search/browser/search.contribution.ts

@@ -11,7 +11,6 @@ import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import { dirname } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/search.contribution';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { getSelectionSearchString } from 'vs/editor/contrib/find/findController';
@@ -507,7 +506,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	SearchViewlet,
 	VIEWLET_ID,
 	nls.localize('name', "Search"),
-	'search',
+	'codicon-search',
 	1
 ));
 

src/vs/workbench/contrib/search/browser/searchPanel.ts

@@ -67,4 +67,4 @@ export class SearchPanel extends Panel {
 	getSearchView(): SearchView {
 		return this.searchView;
 	}
-}
\ No newline at end of file
+}