diff --git a/src/vs/workbench/parts/preferences/browser/media/preferences.css b/src/vs/workbench/parts/preferences/browser/media/preferences.css
index 9876f32575775bc7089a2b0846f9e17d0c9c5a70..bf328728027491fa2d81db1f562124bf21e5f6d0 100644
--- a/src/vs/workbench/parts/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/parts/preferences/browser/media/preferences.css
@@ -10,12 +10,6 @@
 	padding-top: 11px;
 }
 
-.preferences-editor > .preferences-header > .new-settings-ad > .open-settings2-button {
-	padding: 0;
-	text-decoration: underline;
-	display: inline;
-}
-
 .preferences-editor > .preferences-editors-container.side-by-side-preferences-editor {
 	position: relative;
 }
@@ -96,12 +90,6 @@
 	align-self: stretch;
 }
 
-.settings-header-widget > .settings-header-container {
-	padding-top: 8px;
-	padding-left: 27px;
-	padding-right: 32px;
-}
-
 .settings-header-widget > .settings-search-controls > .settings-count-widget {
 	margin: 6px 0px;
 	padding: 0px 8px;
@@ -168,16 +156,6 @@
 	white-space: nowrap;
 }
 
-.monaco-editor .settings-header-widget .title-container .settings-header-natural-language-link {
-	margin-left: 4px;
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-.monaco-editor .settings-header-widget .title-container .settings-header-natural-language-link.hidden {
-	display: none;
-}
-
 .monaco-editor .settings-group-title-widget {
 	z-index: 1;
 }
diff --git a/src/vs/workbench/parts/preferences/browser/tocTree.ts b/src/vs/workbench/parts/preferences/browser/tocTree.ts
index 9fdc825a093d1d0c7fe417eb713b8fdffdf76aad..a30929be24b994ad4596d03a48aa473410723feb 100644
--- a/src/vs/workbench/parts/preferences/browser/tocTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/tocTree.ts
@@ -103,7 +103,6 @@ export class TOCRenderer implements ITreeRenderer<SettingsTreeGroupElement, neve
 		const count = element.count;
 		const label = element.label;
 
-		DOM.toggleClass(template.labelElement, 'no-results', count === 0);
 		template.labelElement.textContent = label;
 
 		if (count) {
diff --git a/src/vs/workbench/parts/preferences/electron-browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/electron-browser/media/settingsEditor2.css
index 47ca9d0586a3b4e1309fd3bd23110384479da5a4..5acd2d73baf085781af80bfde256b81508250eb4 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/electron-browser/media/settingsEditor2.css
@@ -236,18 +236,14 @@
 	display: block;
 }
 
-.settings-editor > .settings-body .settings-toc-container .monaco-list-row.has-children > .content::before {
+.settings-editor > .settings-body .settings-toc-container .monaco-list-row .monaco-tl-twistie {
 	opacity: 0.9;
 }
 
-.settings-editor > .settings-body .settings-toc-container .monaco-list-row.has-children.selected > .content::before {
+.settings-editor > .settings-body .settings-toc-container .monaco-list-row.selected .monaco-tl-twistie {
 	opacity: 1;
 }
 
-.settings-editor > .settings-body .settings-toc-container .monaco-list-row .settings-toc-entry.no-results {
-	opacity: 0.5;
-}
-
 .settings-editor > .settings-body .settings-toc-container .monaco-list-row.selected .settings-toc-entry {
 	font-weight: bold;
 	opacity: 1;
@@ -408,26 +404,11 @@
 	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-measure-container {
-	position: absolute;
-	visibility: hidden;
-}
-
-.settings-editor > .settings-body .settings-tree-container .setting-measure-container .monaco-list-row {
-	padding-left: 20px;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-measure-container .setting-item-description.measure-bool-description {
-	/* Allocate space for the checkbox control */
-	margin-left: 27px;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-enumDescription {
 	display: none;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-enumDescription,
-.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-measure-helper .setting-item-enumDescription {
+.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-enumDescription {
 	display: block;
 }