diff --git a/chrome/global/global.css b/chrome/global/global.css
index 240ed304..67064052 100755
--- a/chrome/global/global.css
+++ b/chrome/global/global.css
@@ -68,8 +68,8 @@
 	fill-opacity: 0 !important;
 
 	background-image:
-		url(circle.svg),
-		url(circle.svg) !important;
+		url(../icons/circle.svg),
+		url(../icons/circle.svg) !important;
 	background-size: 25% !important;
 	background-repeat: no-repeat !important;
 	background-position: center !important;
diff --git a/chrome/popup/checkmark-18dp.svg b/chrome/icons/checkmark-18dp.svg
similarity index 100%
rename from chrome/popup/checkmark-18dp.svg
rename to chrome/icons/checkmark-18dp.svg
diff --git a/chrome/global/circle.svg b/chrome/icons/circle.svg
similarity index 100%
rename from chrome/global/circle.svg
rename to chrome/icons/circle.svg
diff --git a/chrome/tabbar/close-tab.svg b/chrome/icons/close-tab.svg
similarity index 100%
rename from chrome/tabbar/close-tab.svg
rename to chrome/icons/close-tab.svg
diff --git a/chrome/navbar/connection-1x.svg b/chrome/icons/connection-1x.svg
similarity index 100%
rename from chrome/navbar/connection-1x.svg
rename to chrome/icons/connection-1x.svg
diff --git a/chrome/navbar/connection-2x.svg b/chrome/icons/connection-2x.svg
similarity index 100%
rename from chrome/navbar/connection-2x.svg
rename to chrome/icons/connection-2x.svg
diff --git a/chrome/navbar/connection-warning-1x.svg b/chrome/icons/connection-warning-1x.svg
similarity index 100%
rename from chrome/navbar/connection-warning-1x.svg
rename to chrome/icons/connection-warning-1x.svg
diff --git a/chrome/navbar/connection-warning-2x.svg b/chrome/icons/connection-warning-2x.svg
similarity index 100%
rename from chrome/navbar/connection-warning-2x.svg
rename to chrome/icons/connection-warning-2x.svg
diff --git a/chrome/navbar/go.svg b/chrome/icons/go.svg
similarity index 100%
rename from chrome/navbar/go.svg
rename to chrome/icons/go.svg
diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css
index 3e2e5ac7..cc667131 100755
--- a/chrome/icons/icons.css
+++ b/chrome/icons/icons.css
@@ -297,4 +297,4 @@
 	{
 		list-style-image: url(library-2x.svg) !important;
 	}
-}
\ No newline at end of file
+}
diff --git a/chrome/navbar/identity-icons-brand.svg b/chrome/icons/identity-icons-brand.svg
similarity index 100%
rename from chrome/navbar/identity-icons-brand.svg
rename to chrome/icons/identity-icons-brand.svg
diff --git a/chrome/navbar/info-1x.svg b/chrome/icons/info-1x.svg
similarity index 100%
rename from chrome/navbar/info-1x.svg
rename to chrome/icons/info-1x.svg
diff --git a/chrome/navbar/info-2x.svg b/chrome/icons/info-2x.svg
similarity index 100%
rename from chrome/navbar/info-2x.svg
rename to chrome/icons/info-2x.svg
diff --git a/chrome/popup/menu-right-1x.svg b/chrome/icons/menu-right-1x.svg
similarity index 100%
rename from chrome/popup/menu-right-1x.svg
rename to chrome/icons/menu-right-1x.svg
diff --git a/chrome/popup/menu-right-2x.svg b/chrome/icons/menu-right-2x.svg
similarity index 100%
rename from chrome/popup/menu-right-2x.svg
rename to chrome/icons/menu-right-2x.svg
diff --git a/chrome/navbar/naughty-shield-1x.svg b/chrome/icons/naughty-shield-1x.svg
similarity index 100%
rename from chrome/navbar/naughty-shield-1x.svg
rename to chrome/icons/naughty-shield-1x.svg
diff --git a/chrome/navbar/naughty-shield-2x.svg b/chrome/icons/naughty-shield-2x.svg
similarity index 100%
rename from chrome/navbar/naughty-shield-2x.svg
rename to chrome/icons/naughty-shield-2x.svg
diff --git a/chrome/tabbar/spinner-busy.svg b/chrome/icons/spinner-busy.svg
similarity index 100%
rename from chrome/tabbar/spinner-busy.svg
rename to chrome/icons/spinner-busy.svg
diff --git a/chrome/tabbar/spinner-progress.svg b/chrome/icons/spinner-progress.svg
similarity index 100%
rename from chrome/tabbar/spinner-progress.svg
rename to chrome/icons/spinner-progress.svg
diff --git a/chrome/navbar/navbar.css b/chrome/navbar/navbar.css
index dabe7596..3f4818f5 100644
--- a/chrome/navbar/navbar.css
+++ b/chrome/navbar/navbar.css
@@ -398,23 +398,23 @@
 /* icons */
 #urlbar[pageproxystate=valid] > #identity-icon
 {
-	list-style-image: url(info-1x.svg) !important;
+	list-style-image: url(../icons/info-1x.svg) !important;
 }
 
 #urlbar[pageproxystate=valid] > #identity-box:-moz-any(.verifiedDomain, .verifiedIdentity) > #identity-icon
 {
-	list-style-image: url(connection-1x.svg) !important;
+	list-style-image: url(../icons/connection-1x.svg) !important;
 }
 
 #urlbar[pageproxystate=valid] > #identity-box.chromeUI > #identity-icon
 {
-	list-style-image: url(identity-icons-brand.svg) !important;
+	list-style-image: url(../icons/identity-icons-brand.svg) !important;
 }
 
 /* no longer used as a connection icon */
 #connection-icon
 {
-	list-style-image: url(naughty-shield-1x.svg) !important;
+	list-style-image: url(../icons/naughty-shield-1x.svg) !important;
 }
 
 #urlbar[pageproxystate=valid] > #identity-box:-moz-any(
@@ -424,13 +424,13 @@
 	.insecureLoginForms
 ) > #identity-icon
 {
-	list-style-image: url(connection-warning-1x.svg) !important;
+	list-style-image: url(../icons/connection-warning-1x.svg) !important;
 }
 
 .urlbar-go-button,
 .search-go-button
 {
-	list-style-image: url(go.svg) !important;
+	list-style-image: url(../icons/go.svg) !important;
 }
 
 /* high DPI adjustments */
@@ -443,13 +443,13 @@
 	
 	#urlbar[pageproxystate=valid] > #identity-box:-moz-any(.unknownIdentity, .notSecure) > #identity-icon
 	{
-		list-style-image: url(info-2x.svg) !important;
+		list-style-image: url(../icons/info-2x.svg) !important;
 		transform: translate(.5px, .5px) !important;
 	}
 	
 	#urlbar[pageproxystate=valid] > #identity-box:-moz-any(.verifiedDomain, .verifiedIdentity) > #identity-icon
 	{
-		list-style-image: url(connection-2x.svg) !important;
+		list-style-image: url(../icons/connection-2x.svg) !important;
 	}
 	
 	#urlbar[pageproxystate=valid] > #identity-box:-moz-any(
@@ -459,12 +459,12 @@
 		.insecureLoginForms
 	) > #identity-icon
 	{
-		list-style-image: url(connection-warning-2x.svg) !important;
+		list-style-image: url(../icons/connection-warning-2x.svg) !important;
 	}
 	
 	#connection-icon
 	{
-		list-style-image: url(naughty-shield-2x.svg) !important;
+		list-style-image: url(../icons/naughty-shield-2x.svg) !important;
 	}
 	
 	#identity-icon-labels,
diff --git a/chrome/popup/popup.css b/chrome/popup/popup.css
index 3c53f4e2..308fe046 100755
--- a/chrome/popup/popup.css
+++ b/chrome/popup/popup.css
@@ -131,7 +131,7 @@ menupopup .scrollbutton-down
 	-moz-appearance: none !important;
 	-moz-context-properties: fill !important;
 	fill: currentColor !important;
-	list-style-image: url(menu-right-2x.svg) !important;
+	list-style-image: url(../icons/menu-right-2x.svg) !important;
 	margin-inline-end: 0 !important;
 	margin-inline-start: 16px !important;
 }
@@ -147,7 +147,7 @@ menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon
 menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon
 {
 	/* checkmark is 18px, not 16px, hence reduced padding */
-	list-style-image: url(checkmark-18dp.svg) !important;
+	list-style-image: url(../icons/checkmark-18dp.svg) !important;
 }
 
 #context-navigation
@@ -350,7 +350,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
 .PanelUI-subView .subviewbutton-nav::after
 {
 	transform: none !important;
-	content: url(menu-right-1x.svg) !important;
+	content: url(../icons/menu-right-1x.svg) !important;
 	fill-opacity: 1 !important;
 }
 
@@ -519,7 +519,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
 .identity-popup-content-blocking-category::after
 {
 	transform: translateY(1px) !important;
-	content: url(menu-right-1x.svg) !important;
+	content: url(../icons/menu-right-1x.svg) !important;
 	margin: 0 !important;
 }
 
@@ -776,7 +776,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
 .customization-lwtheme-menu-theme[active]::after,
 .customization-uidensity-menuitem[active]::after
 {
-	content: url(checkmark-18dp.svg) !important;
+	content: url(../icons/checkmark-18dp.svg) !important;
 	-moz-context-properties: fill, fill-opacity !important;
 	fill: currentColor !important;
 	display: -moz-box !important;
@@ -876,6 +876,6 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
 	.PanelUI-subView .subviewbutton-nav::after,
 	.identity-popup-content-blocking-category::after
 	{
-		content: url(menu-right-2x.svg) !important;
+		content: url(../icons/menu-right-2x.svg) !important;
 	}
 }
\ No newline at end of file
diff --git a/chrome/tabbar/tabbar.css b/chrome/tabbar/tabbar.css
index ef0703cb..27c9bb92 100755
--- a/chrome/tabbar/tabbar.css
+++ b/chrome/tabbar/tabbar.css
@@ -308,7 +308,7 @@
 
 .tab-close-button
 {
-	list-style-image: url(close-tab.svg) !important;
+	list-style-image: url(../icons/close-tab.svg) !important;
 	width: 16px !important;
 	height: 16px !important;
 	margin: 0 !important;
@@ -340,7 +340,7 @@
 {
 	-moz-context-properties: fill !important;
 	fill: currentColor !important;
-	background-image: url(spinner-busy.svg) !important;
+	background-image: url(../icons/spinner-busy.svg) !important;
 	margin: 0 !important;
 	transform-origin: center !important;
 	animation: rotate-360 1.333s linear infinite reverse !important;
@@ -349,7 +349,7 @@
 
 .tab-throbber[progress]
 {
-	background-image: url(spinner-progress.svg) !important;
+	background-image: url(../icons/spinner-progress.svg) !important;
 	animation-direction: normal !important;
 }