diff --git a/src/sql/base/browser/ui/modal/modal.ts b/src/sql/base/browser/ui/modal/modal.ts
index 9f4ed5a0a7..288c4fa52d 100644
--- a/src/sql/base/browser/ui/modal/modal.ts
+++ b/src/sql/base/browser/ui/modal/modal.ts
@@ -217,7 +217,7 @@ export abstract class Modal extends Disposable implements IThemable {
 		if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
 			let builder = errorMessagesInFooter ? this._leftFooter : body;
 			builder.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => {
-				errorMessageContainer.div({ class: 'icon error' }, (iconContainer) => {
+				errorMessageContainer.div({ class: 'sql icon error' }, (iconContainer) => {
 					this._errorIconElement = iconContainer.getHTMLElement();
 					this._errorIconElement.style.visibility = 'hidden';
 				});
diff --git a/src/sql/media/icons/common-icons.css b/src/sql/media/icons/common-icons.css
index 125266d1df..3062a6eee7 100644
--- a/src/sql/media/icons/common-icons.css
+++ b/src/sql/media/icons/common-icons.css
@@ -63,21 +63,21 @@
 	background: url("globalerror.svg") center center no-repeat;
 }
 
-.vs .icon.error,
-.vs-dark .icon.error,
-.hc-black .icon.error {
+.vs .sql.icon.error,
+.vs-dark .sql.icon.error,
+.hc-black .sql.icon.error {
 	content: url("status_error.svg");
 }
 
-.vs .icon.warning,
-.vs-dark .icon.warning,
-.hc-black .icon.warning {
+.vs .sql.icon.warning,
+.vs-dark .sql.icon.warning,
+.hc-black .sql.icon.warning {
 	content: url("status_warning.svg");
 }
 
-.vs .icon.info,
-.vs-dark .icon.info,
-.hc-black .icon.info {
+.vs .sql.icon.info,
+.vs-dark .sql.icon.info,
+.hc-black .sql.icon.info {
 	content: url("status_info.svg");
 }
 
diff --git a/src/sql/parts/accountManagement/accountPicker/accountPicker.ts b/src/sql/parts/accountManagement/accountPicker/accountPicker.ts
index e79f15a31e..bb31cf05be 100644
--- a/src/sql/parts/accountManagement/accountPicker/accountPicker.ts
+++ b/src/sql/parts/accountManagement/accountPicker/accountPicker.ts
@@ -117,7 +117,7 @@ export class AccountPicker extends Disposable {
 
 		// Create refresh account action
 		this._refreshContainer = DOM.append(this._rootElement, DOM.$('div.refresh-container'));
-		DOM.append(this._refreshContainer, DOM.$('div.icon warning'));
+		DOM.append(this._refreshContainer, DOM.$('div.sql icon warning'));
 		let actionBar = new ActionBar(this._refreshContainer, { animated: false });
 		this._refreshAccountAction = this._instantiationService.createInstance(RefreshAccountAction);
 		actionBar.push(this._refreshAccountAction, { icon: false, label: true });
diff --git a/src/sql/parts/disasterRecovery/backup/backup.component.html b/src/sql/parts/disasterRecovery/backup/backup.component.html
index 1f753d2f3f..cb01575b4f 100644
--- a/src/sql/parts/disasterRecovery/backup/backup.component.html
+++ b/src/sql/parts/disasterRecovery/backup/backup.component.html
@@ -65,7 +65,7 @@
 						<div class="option check" #encryptCheckContainer>
 						</div>
 						<div class="option" #encryptWarningContainer>
-							<div class="icon warning">
+							<div class="sql icon warning">
 							</div>
 							<div class="warning-message">
 								{{localizedStrings.NO_ENCRYPTOR_WARNING}}
diff --git a/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts b/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
index 05b4addee8..7e5aa36641 100644
--- a/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
+++ b/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
@@ -108,13 +108,13 @@ export class ErrorMessageDialog extends Modal {
 	private updateIconTitle(): void {
 		switch (this._severity) {
 			case Severity.Error:
-				this.titleIconClassName = 'icon error';
+				this.titleIconClassName = 'sql icon error';
 				break;
 			case Severity.Warning:
-				this.titleIconClassName = 'icon warning';
+				this.titleIconClassName = 'sql icon warning';
 				break;
 			case Severity.Info:
-				this.titleIconClassName = 'icon info';
+				this.titleIconClassName = 'sql icon info';
 				break;
 		}
 	}