diff --git a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
index 37adbf11d..19f2e18f0 100644
--- a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
+++ b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
@@ -3,7 +3,7 @@ import { ToolbarSection } from 'react-viewerbase';
 import OHIF from 'ohif-core';
 
 const { setToolActive } = OHIF.redux.actions;
-const Icons = `${window.config.routerBasename}/icons.svg`;
+const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/');
 
 const mapStateToProps = state => {
   const activeButton = state.tools.buttons.find(tool => tool.active === true);
diff --git a/src/components/OHIFLogo/OHIFLogo.js b/src/components/OHIFLogo/OHIFLogo.js
index abbb524f8..08d60eadd 100644
--- a/src/components/OHIFLogo/OHIFLogo.js
+++ b/src/components/OHIFLogo/OHIFLogo.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import './OHIFLogo.css'
 
-const Icons = `${window.config.routerBasename}/icons.svg`
+const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
 
 function OHIFLogo() {
   return (
diff --git a/src/connectedComponents/ConnectedPluginSwitch.js b/src/connectedComponents/ConnectedPluginSwitch.js
index f22fb2787..1b22767a4 100644
--- a/src/connectedComponents/ConnectedPluginSwitch.js
+++ b/src/connectedComponents/ConnectedPluginSwitch.js
@@ -36,7 +36,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
 
   // TODO: Do not display certain options if the current display set
   // cannot be displayed using these view types
-  const Icons = `${window.config.routerBasename}/icons.svg`
+  const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
   const buttons = [
     {
       text: 'Acquired',
diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js
index e7f57d65e..d0a504146 100644
--- a/src/connectedComponents/ToolbarRow.js
+++ b/src/connectedComponents/ToolbarRow.js
@@ -6,7 +6,7 @@ import ConnectedLayoutButton from './ConnectedLayoutButton'
 import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
 import './ToolbarRow.css'
 
-const Icons = `${window.config.routerBasename}/icons.svg`
+const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
 
 class ToolbarRow extends Component {
   static propTypes = {
diff --git a/src/utils/getDefaultToolbarButtons.js b/src/utils/getDefaultToolbarButtons.js
index 93ca8bd15..7c7d584fd 100644
--- a/src/utils/getDefaultToolbarButtons.js
+++ b/src/utils/getDefaultToolbarButtons.js
@@ -8,7 +8,10 @@ export default function(baseDirectory = '/') {
     baseDirectory[baseDirectory.length - 1] === '/'
       ? baseDirectory
       : `${baseDirectory}/`
-  const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}`
+  const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}`.replace(
+    '//',
+    '/'
+  )
 
   return [
     {