diff --git a/theme/icons/folder-download-symbolic.svg b/theme/icons/folder-download-symbolic.svg
new file mode 100644
index 0000000..a6c058f
--- /dev/null
+++ b/theme/icons/folder-download-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16.031" height="16.01" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7.031 1v10.086L4.238 8.293A1 1 0 003.531 8h-1.5v1a1 1 0 00.293.707l5 5a1 1 0 001.414 0l5-5A1 1 0 0014.031 9a1 1 0 000-.016V8h-1.5a1 1 0 00-.707.293l-2.793 2.793V1z" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/theme/icons/process-stop-symbolic.svg b/theme/icons/process-stop-symbolic.svg
new file mode 100644
index 0000000..113e3fc
--- /dev/null
+++ b/theme/icons/process-stop-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g color="#bebebe" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
+        <path d="M5.682 2l-.291.29L2 5.647v4.645L5.678 14h4.648L14 10.293V5.648L10.32 2zm.824 2h2.992L12 6.482V9.47L9.492 12H6.51L4 9.469V6.482z" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none"/>
+        <path d="M6.856 5L5 6.84v2.288L6.856 11h2.29L11 9.128V6.84L9.145 5z" overflow="visible"/>
+    </g>
+</svg>
diff --git a/theme/icons/view-refresh-symbolic.svg b/theme/icons/view-refresh-symbolic.svg
new file mode 100644
index 0000000..c50c7d7
--- /dev/null
+++ b/theme/icons/view-refresh-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6.719 2a5.636 5.636 0 00-.563.063 6.03 6.03 0 00-3.968 2.343C.206 7.048.764 10.831 3.405 12.813c2.642 1.98 6.425 1.422 8.406-1.22.123-.17.19-.382.188-.593v-1h-1a1.024 1.024 0 00-.813.406c-1.332 1.777-3.817 2.114-5.593.781-1.777-1.332-2.114-3.816-.782-5.593C5.146 3.817 7.63 3.48 9.407 4.812c.43.323.77.733 1.031 1.188H9a1 1 0 00-1 1v1h6V2h-1a1 1 0 00-1 1v1.688A5.966 5.966 0 006.719 2z" color="#bebebe" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity" font-family="Sans" font-weight="400" overflow="visible" style="text-decoration-line:none;text-indent:0;text-transform:none"/>
+</svg>
diff --git a/theme/parts/buttons-fixes.css b/theme/parts/buttons-fixes.css
index 9f09bc2..bbfbbf5 100644
--- a/theme/parts/buttons-fixes.css
+++ b/theme/parts/buttons-fixes.css
@@ -217,3 +217,44 @@ button.close {
 	outline:  0 !important;
 }
 
+/* Downloads button */
+#downloads-indicator-progress-inner {
+	background: conic-gradient(var(--gnome-toolbar-icon-fill) var(--download-progress-pcent), transparent var(--download-progress-pcent)) !important;
+}
+#downloads-indicator-progress-outer,
+#downloads-indicator-start-image,
+#downloads-indicator-finish-image {
+	border: 0 !important;
+	padding: 0 !important;
+	border-radius: 100% !important;
+}
+#downloads-indicator-progress-outer,
+#downloads-indicator-start-image {
+	background: var(--gnome-toolbar-border-color) !important;
+}
+#downloads-indicator-finish-image {
+	background: var(--gnome-toolbar-icon-fill) !important;
+}
+#downloads-button .toolbarbutton-animatable-box {
+	top: 8px !important;
+    left: 8px !important;
+}
+#downloads-button .toolbarbutton-animatable-box,
+#downloads-button .toolbarbutton-animatable-image,
+#downloads-indicator-progress-inner {
+	height: 16px !important;
+	width: 16px !important;
+}
+#downloads-button .toolbarbutton-animatable-image {
+	--anim-steps: 1 !important;
+	transform: none !important;
+	list-style-image: none !important;
+}
+
+/* Stop/Reload button */
+#stop-reload-button  .toolbarbutton-animatable-image:not(#hack) {
+	--anim-steps: 1 !important;
+	transform: none !important;
+	list-style-image: none !important;
+	display: none !important;
+}
diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index 9fa05af..82651ac 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -5,6 +5,7 @@
 /* Icons color */
 .toolbarbutton-icon,
 .menu-iconic-icon,
+.button-icon:not(#hack),
 .bookmark-item[container],
 .notification-anchor-icon,
 .protections-popup-category::after,
@@ -12,7 +13,6 @@
 #identity-popup-mainView .subviewbutton-nav::after,
 .widget-overflow-list .subviewbutton-nav::after,
 .PanelUI-subView .subviewbutton-nav::after,
-#identity-popup-security-expander .button-icon,
 #identity-popup[connection^="secure"] .identity-popup-security-connection,
 .menu-right,
 .expander-down > .button-box,
@@ -33,12 +33,11 @@ menuitem[type="radio"][checked="true"],
 .tab-icon-overlay,
 .close-icon:not(.tab-close-button),
 button.close::before,
-.identity-popup-permission-remove-button .button-icon,
-.permission-popup-permission-remove-button > .button-box > .button-icon,
 #urlbar-search-mode-indicator-close,
 #tracking-protection-icon,
 #identity-icon,
 #permissions-granted-icon,
+#downloads-indicator-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon,
@@ -410,17 +409,20 @@ button.close::before {
 #nav-bar-overflow-button {
 	list-style-image: url("../icons/pan-down-symbolic.svg") !important;
 }
-/* Glitch - animations (may be possible to fix in about:config)
-#reload-button .toolbarbutton-icon { /* Reload button
+#reload-button,
+.downloadIconRetry > .button-box > .button-icon  {
 	list-style-image: url("../icons/view-refresh-symbolic.svg") !important;
 }
-#stop-button .toolbarbutton-icon { /* Stop button
+/* Stop */
+#stop-button,
+.downloadIconCancel > .button-box > .button-icon  {
 	list-style-image: url("../icons/process-stop-symbolic.svg") !important;
 }
-#downloads-button { /* Downloads button / Glitch - it swaps to the default one anyway
+/* Downlaod */
+#downloads-button,
+#downloads-indicator-icon {
 	list-style-image: url("../icons/folder-download-symbolic.svg") !important;
 }
-*/
 
 /* Url Bar icons */
 #urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon {
@@ -470,7 +472,8 @@ button.close::before {
 	}
 }
 
-/* Bookmarks folder icon */
-.bookmark-item[container] {
+/* Folder icon */
+.bookmark-item[container],
+.downloadIconShow > .button-box > .button-icon {
 	list-style-image: url("../icons/folder-symbolic.svg") !important;
 }