diff --git a/chrome/skin/default/zotero/attachment.svg b/chrome/skin/default/zotero/attachment.svg
deleted file mode 100644
index 43d00fbe95..0000000000
--- a/chrome/skin/default/zotero/attachment.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="attachment" clip-path="url(#clip0_3858_2403)">
-<path id="Vector" d="M4.5 10.5L11.25 3.75C11.6642 3.33579 12.3358 3.33579 12.75 3.75V3.75C13.1642 4.16421 13.1642 4.83579 12.75 5.25L4.5 13.5C3.67157 14.3284 2.32843 14.3284 1.5 13.5V13.5C0.671573 12.6716 0.671573 11.3284 1.5 10.5L9.75 2.25C10.9926 1.00736 13.0074 1.00736 14.25 2.25V2.25C15.4926 3.49264 15.4926 5.50736 14.25 6.75L7.5 13.5" stroke="context-fill" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_3858_2403">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/chrome/skin/default/zotero/chevron-8.svg b/chrome/skin/default/zotero/chevron-8.svg
deleted file mode 100644
index 12c9da4bca..0000000000
--- a/chrome/skin/default/zotero/chevron-8.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 2.70711L4 6.70711L8 2.70711L7.29289 2L4 5.29289L0.707107 2L0 2.70711Z" fill="context-fill"/>
-</svg>
diff --git a/chrome/skin/default/zotero/filter.svg b/chrome/skin/default/zotero/filter.svg
deleted file mode 100644
index 4497ea33b0..0000000000
--- a/chrome/skin/default/zotero/filter.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M1.99998 1.70711C1.37001 1.07714 1.81618 0 2.70708 0H14.2929C15.1838 0 15.6299 1.07714 15 1.70711L9.99998 6.70711V12.7071L6.99998 15.7071V6.70711L1.99998 1.70711ZM14.2929 1L2.70708 1L7.99998 6.29289V13.2929L8.99998 12.2929V6.29289L14.2929 1Z" fill="context-fill" />
-</svg>
diff --git a/chrome/skin/default/zotero/note.svg b/chrome/skin/default/zotero/note.svg
deleted file mode 100644
index 7347b34ade..0000000000
--- a/chrome/skin/default/zotero/note.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 0V16H9.707L15 10.707V0H2ZM3 1H14V2H3V1ZM10 14.293V11H13.293L10 14.293ZM14 10H9V15H3V3H14V10Z" fill="context-fill" />
-</svg>
diff --git a/scss/components/_icons.scss b/scss/components/_icons.scss
index 215d400b1a..48adf1c131 100644
--- a/scss/components/_icons.scss
+++ b/scss/components/_icons.scss
@@ -36,17 +36,16 @@
 }
 
 $-icons: (
-	attachment,
-	chevron-6,
-	filter,
-	note,
+	attachment: 16,
+	chevron-6: 8,
+	filter: 16,
+	note: 16,
 );
 
-@each $icon in $-icons {
+@each $icon, $size in $-icons {
 	.icon-#{$icon} {
-		@include color-scheme using($color) {
-			background: url('chrome://zotero/skin/#{$icon}.svg') content-box no-repeat;
-			-moz-context-properties: fill, fill-opacity;
-		}
+		fill: var(--fill-secondary);
+		background: url('chrome://zotero/skin/#{$size}/universal/#{$icon}.svg') content-box no-repeat;
+		-moz-context-properties: fill, fill-opacity;
 	}
 }
\ No newline at end of file
diff --git a/scss/components/_virtualized-table.scss b/scss/components/_virtualized-table.scss
index e3976e2d3d..fd3a6e05bd 100644
--- a/scss/components/_virtualized-table.scss
+++ b/scss/components/_virtualized-table.scss
@@ -177,7 +177,7 @@
 				height: 16px;
 				padding: 4px;
 				box-sizing: border-box;
-				background: url("chrome://zotero/skin/chevron-8.svg") content-box no-repeat;
+				background: url("chrome://zotero/skin/8/universal/chevron-8.svg") content-box no-repeat;
 				-moz-context-properties: fill, fill-opacity;
 
 				@include focus-states using ($color) {
@@ -321,7 +321,7 @@
 			margin-right: 3px; // + 5px padding = 8px total
 			
 			&.icon-css {
-				background: url("chrome://zotero/skin/chevron-8.svg") content-box no-repeat;
+				background: url("chrome://zotero/skin/8/universal/chevron-8.svg") content-box no-repeat;
 				-moz-context-properties: fill, fill-opacity;
 				fill: var(--fill-primary);
 			}