diff --git a/src/qiskit_sphinx_theme/assets/styles/_scaffold.scss b/src/qiskit_sphinx_theme/assets/styles/_scaffold.scss
new file mode 100644
index 00000000..8bbe766c
--- /dev/null
+++ b/src/qiskit_sphinx_theme/assets/styles/_scaffold.scss
@@ -0,0 +1,22 @@
+/* This code is a Qiskit project.
+ *
+ * (C) Copyright IBM 2024.
+ *
+ * This code is licensed under the Apache License, Version 2.0. You may
+ * obtain a copy of this license in the LICENSE.txt file in the root directory
+ * of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Any modifications or derivative works of this code must retain this
+ * copyright notice, and modified files need to carry a notice indicating
+ * that they have been altered from the originals.
+ */
+
+body {
+  // Make navigation and toc icons primary instead of secondary color
+  .toc-overlay-icon,
+  .nav-overlay-icon {
+    .icon {
+      color: var(--color-foreground-primary);
+    }
+  }
+}
diff --git a/src/qiskit_sphinx_theme/assets/styles/qiskit-sphinx-theme.scss b/src/qiskit_sphinx_theme/assets/styles/qiskit-sphinx-theme.scss
index 250cc1c0..a9576cfd 100644
--- a/src/qiskit_sphinx_theme/assets/styles/qiskit-sphinx-theme.scss
+++ b/src/qiskit_sphinx_theme/assets/styles/qiskit-sphinx-theme.scss
@@ -19,6 +19,7 @@
 @import "icons";
 @import "layout";
 @import "left-sidebar";
+@import "scaffold";
 @import "sphinx-extensions";
 @import "tables";
 @import "typography";
diff --git a/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/partials/icons.html b/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/partials/icons.html
index 7646727f..0a2a6b6f 100644
--- a/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/partials/icons.html
+++ b/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/partials/icons.html
@@ -2,14 +2,18 @@
   This file is vendored from Furo (created by Pradyun Gedam) and used under the MIT license.
 
   We've made substantial changes to comply with IBM Carbon requirements
-  (https://carbondesignsystem.com/guidelines/icons/library/). These
-  have all been replaced with Carbon icons:
+  (https://carbondesignsystem.com/). These have all been replaced with Carbon icons:
 
     * svg-menu
     * svg-toc
     * svg-arrow-right
     * svg-pencil
     * svg-eye
+
+  We obtained the icons from Figma and made the following edits to the SVG:
+
+    * Deleted the transparent `rect` element that was present.
+    * Replaced the value of the `fill` property with "currentColor".
 -#}
 <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
   <symbol id="svg-toc" viewBox="0 0 24 24">
diff --git a/tests/js/tests.js-snapshots/Jupyter-works-with-copybutton-1-linux.png b/tests/js/tests.js-snapshots/Jupyter-works-with-copybutton-1-linux.png
index 155f7470..4733fbe2 100644
Binary files a/tests/js/tests.js-snapshots/Jupyter-works-with-copybutton-1-linux.png and b/tests/js/tests.js-snapshots/Jupyter-works-with-copybutton-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/Sphinx-Design-elements-have-no-shadows-1-linux.png b/tests/js/tests.js-snapshots/Sphinx-Design-elements-have-no-shadows-1-linux.png
index 7077cfc3..2255d030 100644
Binary files a/tests/js/tests.js-snapshots/Sphinx-Design-elements-have-no-shadows-1-linux.png and b/tests/js/tests.js-snapshots/Sphinx-Design-elements-have-no-shadows-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/api-docs-class-page-1-linux.png b/tests/js/tests.js-snapshots/api-docs-class-page-1-linux.png
index b5f04626..7385f539 100644
Binary files a/tests/js/tests.js-snapshots/api-docs-class-page-1-linux.png and b/tests/js/tests.js-snapshots/api-docs-class-page-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/api-docs-function-page-1-linux.png b/tests/js/tests.js-snapshots/api-docs-function-page-1-linux.png
index a88764ec..4f933584 100644
Binary files a/tests/js/tests.js-snapshots/api-docs-function-page-1-linux.png and b/tests/js/tests.js-snapshots/api-docs-function-page-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/api-docs-inline-classes-1-linux.png b/tests/js/tests.js-snapshots/api-docs-inline-classes-1-linux.png
index 93eaf932..515150e0 100644
Binary files a/tests/js/tests.js-snapshots/api-docs-inline-classes-1-linux.png and b/tests/js/tests.js-snapshots/api-docs-inline-classes-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/api-docs-module-page-1-linux.png b/tests/js/tests.js-snapshots/api-docs-module-page-1-linux.png
index 7c1fb6af..f0c79802 100644
Binary files a/tests/js/tests.js-snapshots/api-docs-module-page-1-linux.png and b/tests/js/tests.js-snapshots/api-docs-module-page-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/custom-directives-4-linux.png b/tests/js/tests.js-snapshots/custom-directives-4-linux.png
index ed852124..bfe492c3 100644
Binary files a/tests/js/tests.js-snapshots/custom-directives-4-linux.png and b/tests/js/tests.js-snapshots/custom-directives-4-linux.png differ
diff --git a/tests/js/tests.js-snapshots/inline-table-of-contents-have-correct-fonts-1-linux.png b/tests/js/tests.js-snapshots/inline-table-of-contents-have-correct-fonts-1-linux.png
index b07107a2..fb828dcd 100644
Binary files a/tests/js/tests.js-snapshots/inline-table-of-contents-have-correct-fonts-1-linux.png and b/tests/js/tests.js-snapshots/inline-table-of-contents-have-correct-fonts-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png b/tests/js/tests.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png
index c3cad5d1..2df6c721 100644
Binary files a/tests/js/tests.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png and b/tests/js/tests.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/left-side-bar-renders-correctly-1-linux.png b/tests/js/tests.js-snapshots/left-side-bar-renders-correctly-1-linux.png
index fb084ed1..71bfd334 100644
Binary files a/tests/js/tests.js-snapshots/left-side-bar-renders-correctly-1-linux.png and b/tests/js/tests.js-snapshots/left-side-bar-renders-correctly-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-icons-on-mobile-1-linux.png b/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-icons-on-mobile-1-linux.png
index 64762bb0..db6196b4 100644
Binary files a/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-icons-on-mobile-1-linux.png and b/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-icons-on-mobile-1-linux.png differ
diff --git a/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-page-ToC-icon-on-tablet-1-linux.png b/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-page-ToC-icon-on-tablet-1-linux.png
index daac22f7..b544f723 100644
Binary files a/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-page-ToC-icon-on-tablet-1-linux.png and b/tests/js/tests.js-snapshots/top-nav-bar-uses-custom-page-ToC-icon-on-tablet-1-linux.png differ