diff --git a/src/vs/base/browser/builder.css b/src/vs/base/browser/builder.css
index 1c9feba33d75f9bf083a64ed0080c8573dcf176f..9d428896b673696de866eaa6ce4489756a25f805 100644
--- a/src/vs/base/browser/builder.css
+++ b/src/vs/base/browser/builder.css
@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-/* ---------- Builder ---------- */
-.hidden {
+
+.builder-hidden {
 	display: none !important;
 	visibility: hidden !important;
 }
diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts
index 4f586a24a2ebea9eb9da60a063acc7ca1e6ca74c..0f6307e1d87bffed4ca2fad59295812228e00294 100644
--- a/src/vs/base/browser/builder.ts
+++ b/src/vs/base/browser/builder.ts
@@ -1280,8 +1280,8 @@ export class Builder implements IDisposable {
 	 *  Shows the current element of the builder.
 	 */
 	public show(): Builder {
-		if (this.hasClass('hidden')) {
-			this.removeClass('hidden');
+		if (this.hasClass('builder-hidden')) {
+			this.removeClass('builder-hidden');
 		}
 
 		this.attr('aria-hidden', 'false');
@@ -1319,8 +1319,8 @@ export class Builder implements IDisposable {
 	 *  Hides the current element of the builder.
 	 */
 	public hide(): Builder {
-		if (!this.hasClass('hidden')) {
-			this.addClass('hidden');
+		if (!this.hasClass('builder-hidden')) {
+			this.addClass('builder-hidden');
 		}
 		this.attr('aria-hidden', 'true');
 
@@ -1334,7 +1334,7 @@ export class Builder implements IDisposable {
 	 *  Returns true if the current element of the builder is hidden.
 	 */
 	public isHidden(): boolean {
-		return this.hasClass('hidden') || this.currentElement.style.display === 'none';
+		return this.hasClass('builder-hidden') || this.currentElement.style.display === 'none';
 	}
 
 	/**
@@ -1345,7 +1345,7 @@ export class Builder implements IDisposable {
 		// Cancel any pending showDelayed() invocation
 		this.cancelVisibilityPromise();
 
-		this.swapClass('builder-visible', 'hidden');
+		this.swapClass('builder-visible', 'builder-hidden');
 
 		if (this.isHidden()) {
 			this.attr('aria-hidden', 'true');
diff --git a/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css b/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css
index f94bfa6e862854089b35b0cd11c8b9d525891567..dbece1317f4f6e85c6b94b5940528469c4142034 100644
--- a/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css
+++ b/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-
 .monaco-editor .lightbulb-glyph {
 	display: flex;
 	align-items: center;
@@ -12,6 +11,11 @@
 	width: 16px;
 }
 
+.monaco-editor .lightbulb-glyph.hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .monaco-editor .lightbulb-glyph:hover {
 	cursor: pointer;
 }
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
index 309f8da8801dbe3b41c525a712a13c9593c2255b..42b7830146314d58d6e9a3fb30fc8ab345259bd6 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
@@ -27,6 +27,12 @@
 	height: calc(100% - 38px);
 }
 
+.extensions-viewlet > .extensions.hidden,
+.extensions-viewlet > .message.hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .extensions-viewlet > .message {
 	padding: 5px 9px 5px 16px;
 	cursor: default;
diff --git a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css
index 7429a126d46000ab176428574216412b079b648e..f4eb9b1fdd1ff78ea62d6d35043f4bdf5d016fb4 100644
--- a/src/vs/workbench/parts/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/parts/files/browser/media/explorerviewlet.css
@@ -48,6 +48,11 @@
 	visibility: hidden;
 }
 
+.explorer-viewlet .header .monaco-count-badge.hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .explorer-folders-view .monaco-tree-row > .content {
 	display: inline-block;
 }
diff --git a/src/vs/workbench/parts/markers/browser/media/markers.css b/src/vs/workbench/parts/markers/browser/media/markers.css
index 2cdcded90d2e93f77e4f1eb55f4663e68d4b07a7..b270a4d3e81b0a4d34375008948b189599f765bf 100644
--- a/src/vs/workbench/parts/markers/browser/media/markers.css
+++ b/src/vs/workbench/parts/markers/browser/media/markers.css
@@ -41,6 +41,12 @@
 	height: 100%;
 }
 
+.markers-panel .markers-panel-container .tree-container.hidden,
+.markers-panel .markers-panel-container .message-box-container.hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry {
 	display: flex;
 	line-height: 22px;
diff --git a/src/vs/workbench/parts/preferences/browser/media/preferences.css b/src/vs/workbench/parts/preferences/browser/media/preferences.css
index 6c31b27d5e753665fe9091e3c272681ecc2f432f..b4c418176528d684f6b797f8e96bf0e63d1a8806 100644
--- a/src/vs/workbench/parts/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/parts/preferences/browser/media/preferences.css
@@ -156,6 +156,11 @@
 	cursor: pointer;
 }
 
+.monaco-editor .edit-preferences-widget.hidden {
+	display: none;
+	visibility: hidden;
+}
+
 .monaco-editor.hc-black .edit-preferences-widget,
 .monaco-editor.vs-dark .edit-preferences-widget {
 	background: url('edit_inverse.svg') center center no-repeat;