diff --git a/images/blocklywhitesprites.png b/images/blocklywhitesprites.png
new file mode 100644
index 00000000..d89b7cbd
Binary files /dev/null and b/images/blocklywhitesprites.png differ
diff --git a/main/themes.js b/main/themes.js
index 999b5eed..82061b39 100644
--- a/main/themes.js
+++ b/main/themes.js
@@ -104,6 +104,29 @@ function setLogos(themeName) {
         }
 }
 
+function setIconImage(htmlCollectionIcons, imageURL) {
+        for (const icon of htmlCollectionIcons) {
+                for (const image of icon.getElementsByTagName("image")) {
+                        image.setAttribute("xlink:href", imageURL);
+                }
+        }
+}
+
+function setBinAndZoomIcons(themeName) {
+        const binIcon = document.getElementsByClassName("blocklyTrash");
+        const zoomIcons = document.getElementsByClassName("blocklyZoom");
+
+        if (themeName == "contrast") {
+                const iconsURL = "./images/blocklywhitesprites.png";
+                setIconImage(binIcon, iconsURL);
+                setIconImage(zoomIcons, iconsURL);
+        } else {
+                const iconsURL = "/blockly/media/sprites.png";
+                setIconImage(binIcon, iconsURL);
+                setIconImage(zoomIcons, iconsURL);
+        }
+}
+
 // Function to call when switching themes
 function switchTheme(themeName) {
         console.log(`Switching to theme: ${themeName}`);
@@ -129,6 +152,7 @@ function switchTheme(themeName) {
         // }
 
         setLogos(themeName);
+        setBinAndZoomIcons(themeName);
 
         // Create custom theme for all themes
         const themeConfig = createThemeConfig(themeName);
diff --git a/style/blockly.css b/style/blockly.css
index 3fa4b395..e62ccc3f 100644
--- a/style/blockly.css
+++ b/style/blockly.css
@@ -136,7 +136,7 @@ textarea.blocklyCommentText.blocklyTextarea.blocklyText {
 }
 
 [data-theme="contrast"] .blocklyMainWorkspaceScrollbar .blocklyScrollbarHandle {
-  fill: rgba(255, 255, 255, 0.5) !important;
+  fill: rgba(255, 255, 255, 0.85) !important;
 }
 
 body[data-theme="contrast"] {