diff --git a/src/vs/platform/severityIcon/common/severityIcon.ts b/src/vs/platform/severityIcon/common/severityIcon.ts
index b415e5d8786..946313a389e 100644
--- a/src/vs/platform/severityIcon/common/severityIcon.ts
+++ b/src/vs/platform/severityIcon/common/severityIcon.ts
@@ -30,7 +30,8 @@ registerThemingParticipant((theme, collector) => {
 	if (errorIconForeground) {
 		collector.addRule(`
 			.monaco-workbench .zone-widget .codicon-error,
-			.monaco-workbench .markers-panel .marker-icon.codicon-error {
+			.monaco-workbench .markers-panel .marker-icon.codicon-error,
+			.monaco-workbench .extensions-viewlet > .extensions .codicon-error {
 				color: ${errorIconForeground};
 			}
 		`);
@@ -40,7 +41,8 @@ registerThemingParticipant((theme, collector) => {
 	if (errorIconForeground) {
 		collector.addRule(`
 			.monaco-workbench .zone-widget .codicon-warning,
-			.monaco-workbench .markers-panel .marker-icon.codicon-warning {
+			.monaco-workbench .markers-panel .marker-icon.codicon-warning,
+			.monaco-workbench .extensions-viewlet > .extensions .codicon-warning {
 				color: ${warningIconForeground};
 			}
 		`);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 9230ee1708c..ba71b25d71a 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -708,10 +708,10 @@ export class ExtensionsListView extends ViewletPanel {
 				if (count === 0 && this.isBodyVisible()) {
 					if (error) {
 						if (error instanceof ExtensionListViewWarning) {
-							this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Warning);
+							this.bodyTemplate.messageSeverityIcon.className = 'codicon ' + SeverityIcon.className(Severity.Warning);
 							this.bodyTemplate.messageBox.textContent = getErrorMessage(error);
 						} else {
-							this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Error);
+							this.bodyTemplate.messageSeverityIcon.className = 'codicon ' + SeverityIcon.className(Severity.Error);
 							this.bodyTemplate.messageBox.textContent = localize('error', "Error while loading extensions. {0}", getErrorMessage(error));
 						}
 					} else {