diff --git a/manage.html b/manage.html
index fa5e4a26..6ca13059 100644
--- a/manage.html
+++ b/manage.html
@@ -11,8 +11,6 @@
   <link rel="stylesheet" href="options/onoffswitch.css">
   <link rel="stylesheet" href="vendor-overwrites/colorpicker/colorpicker.css">
 
-  <style id="style-overrides"></style>
-
   <style id="firefox-transitions-bug-suppressor">
     /* restrict to FF */
     @supports (-moz-appearance:none) {
diff --git a/manage/manage.css b/manage/manage.css
index 3056e278..37861b7b 100644
--- a/manage/manage.css
+++ b/manage/manage.css
@@ -18,8 +18,8 @@ body {
   font-weight: normal;
 }
 
-body.all-styles-hidden-by-filters:before,
-body.all-styles-hidden-by-filters:after {
+body.all-styles-hidden-by-filters::before,
+body.all-styles-hidden-by-filters::after {
   position: absolute;
   left: calc(3rem + var(--header-width));
   color: hsla(180, 40%, 45%, .3);
@@ -32,7 +32,8 @@ body.all-styles-hidden-by-filters:before {
   top: 3.5rem;
 }
 
-body.all-styles-hidden-by-filters:after {
+body.all-styles-hidden-by-filters::after {
+  content: var(--filteredStylesAllHidden);
   font-size: 1.5rem;
   position: absolute;
   top: 3rem;
@@ -253,7 +254,11 @@ a:hover {
   vertical-align: text-top;
 }
 
-.disabled h2::after, .entry.usercss .style-name-link::after {
+.disabled h2::after {
+  content: var(--genericDisabledLabel);
+}
+.disabled h2::after,
+.entry.usercss .style-name-link::after {
   font-weight: normal;
   font-size: 11px;
   text-transform: lowercase;
@@ -642,6 +647,7 @@ a:hover {
 
 .newUI .targets {
   overflow: hidden;
+  max-height: calc(var(--num-targets) * 18px);
 }
 
 .newUI .applies-to.expanded .targets {
@@ -687,13 +693,16 @@ a:hover {
   vertical-align: middle;
   margin: -1px 4px 0 -20px;
   transition: opacity .5s, filter .5s;
-  filter: grayscale(1);
   /* workaround for the buggy CSS filter: images in the hidden overflow are shown on Mac */
   backface-visibility: hidden;
-  opacity: .25;
   display: none;
 }
 
+.newUI .favicons-grayed .target img {
+  filter: grayscale(1);
+  opacity: .25;
+}
+
 .newUI .has-favicons .target {
   padding-left: 20px;
 }
@@ -773,6 +782,7 @@ a:hover {
 }
 
 #update-all-no-updates[data-skipped-edited="true"]::after {
+  content: " " var(--updateAllCheckSucceededSomeEdited);
   font-weight: normal;
   display: block;
 }
diff --git a/manage/manage.js b/manage/manage.js
index 0f9b145c..8dc9d79d 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -28,6 +28,7 @@
 */
 'use strict';
 
+/** @type {HTMLElement} */
 let installed;
 
 const ENTRY_ID_PREFIX_RAW = 'style-';
@@ -70,21 +71,22 @@ const AGES = [
 
 const handleEvent = {};
 
-Promise.all([
-  API.getAllStyles(),
-  // FIXME: integrate this into filter.js
-  router.getSearch('search') && API.searchDB({query: router.getSearch('search')}),
-  waitForSelector('#installed'), // needed to avoid flicker due to an extra frame and layout shift
-  prefs.initializing,
-]).then(([styles, ids, el]) => {
+(async () => {
+  const query = router.getSearch('search');
+  const [styles, ids, el] = await Promise.all([
+    API.getAllStyles(),
+    query && API.searchDB({query}), // FIXME: integrate this into filter.js
+    waitForSelector('#installed'), // needed to avoid flicker due to an extra frame and layout shift
+    prefs.initializing,
+  ]);
   installed = el;
   installed.onclick = handleEvent.entryClicked;
   $('#manage-options-button').onclick = () => router.updateHash('#stylus-options');
   $('#sync-styles').onclick = () => router.updateHash('#stylus-options');
   $$('#header a[href^="http"]').forEach(a => (a.onclick = handleEvent.external));
   // show date installed & last update on hover
-  installed.addEventListener('mouseover', handleEvent.lazyAddEntryTitle);
-  installed.addEventListener('mouseout', handleEvent.lazyAddEntryTitle);
+  installed.addEventListener('mouseover', handleEvent.lazyAddEntryTitle, {passive: true});
+  installed.addEventListener('mouseout', handleEvent.lazyAddEntryTitle, {passive: true});
   document.addEventListener('visibilitychange', onVisibilityChange);
   // N.B. triggers existing onchange listeners
   setupLivePrefs();
@@ -92,17 +94,13 @@ Promise.all([
   prefs.subscribe(newUI.ids.map(newUI.prefKeyForId), () => switchUI());
   switchUI({styleOnly: true});
   // translate CSS manually
-  document.head.appendChild($create('style', `
-    .disabled h2::after {
-      content: "${t('genericDisabledLabel')}";
-    }
-    #update-all-no-updates[data-skipped-edited="true"]::after {
-      content: " ${t('updateAllCheckSucceededSomeEdited')}";
-    }
-    body.all-styles-hidden-by-filters::after {
-      content: "${t('filteredStylesAllHidden')}";
-    }
-  `));
+  document.styleSheets[0].insertRule(
+    `:root {${[
+      'genericDisabledLabel',
+      'updateAllCheckSucceededSomeEdited',
+      'filteredStylesAllHidden',
+    ].map(id => `--${id}:"${CSS.escape(t(id))}";`).join('')
+    }}`);
   if (!VIVALDI) {
     $$('#header select').forEach(el => el.adjustWidth());
   }
@@ -113,9 +111,11 @@ Promise.all([
     });
   }
   showStyles(styles, ids);
-});
+})();
 
 msg.onExtension(onRuntimeMessage);
+router.watch({hash: '#stylus-options'}, state => (state ? embedOptions : unembedOptions)());
+window.addEventListener('closeOptions', () => router.updateHash(''));
 
 function onRuntimeMessage(msg) {
   switch (msg.method) {
@@ -673,22 +673,9 @@ function switchUI({styleOnly} = {}) {
 
   Object.assign(newUI, current);
   newUI.renderClass();
-  installed.classList.toggle('has-favicons', newUI.favicons);
-  $('#style-overrides').textContent = `
-    .newUI .targets {
-      max-height: ${newUI.targets * 18}px;
-    }
-  ` + (newUI.faviconsGray ? `
-    .newUI .target img {
-      filter: grayscale(1);
-      opacity: .25;
-    }
-  ` : `
-    .newUI .target img {
-      filter: none;
-      opacity: 1;
-    }
-  `);
+  installed.classList.toggle('has-favicons', newUI.enabled && newUI.favicons);
+  installed.classList.toggle('favicons-grayed', newUI.enabled && newUI.faviconsGray);
+  if (changed.targets) installed.style.setProperty('--num-targets', newUI.targets);
 
   if (styleOnly) {
     return;
@@ -764,13 +751,11 @@ function waitForSelector(selector) {
 }
 
 function embedOptions() {
-  let options = $('#stylus-embedded-options');
-  if (!options) {
-    options = document.createElement('iframe');
-    options.id = 'stylus-embedded-options';
-    options.src = '/options.html';
-    document.documentElement.appendChild(options);
-  }
+  const options = $('#stylus-embedded-options') ||
+    document.documentElement.appendChild($create('iframe', {
+      id: 'stylus-embedded-options',
+      src: '/options.html',
+    }));
   options.focus();
 }
 
@@ -778,20 +763,7 @@ async function unembedOptions() {
   const options = $('#stylus-embedded-options');
   if (options) {
     options.contentWindow.document.body.classList.add('scaleout');
-    options.classList.add('fadeout');
     await animateElement(options, 'fadeout');
     options.remove();
   }
 }
-
-router.watch({hash: '#stylus-options'}, state => {
-  if (state) {
-    embedOptions();
-  } else {
-    unembedOptions();
-  }
-});
-
-window.addEventListener('closeOptions', () => {
-  router.updateHash('');
-});