Use Icon component in place of icons.svg

src/connectedComponents/ConnectedPluginSwitch.js

@@ -125,7 +125,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
     },
     /*{
       text: '3D',
-      icon: `${Icons}#cube`,
+      icon: `#cube`,
       onClick: (click) => {
         console.warn('3D Perspective');
         const data = {

src/connectedComponents/ToolbarRow.js

@@ -1,13 +1,11 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import OHIF from 'ohif-core'
-import { RoundedButtonGroup } from 'react-viewerbase'
+import { RoundedButtonGroup, Icon } from 'react-viewerbase'
 import ConnectedLayoutButton from './ConnectedLayoutButton'
 import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
 import './ToolbarRow.css'
 
-const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
-
 class ToolbarRow extends Component {
   static propTypes = {
     leftSidebarOpen: PropTypes.bool.isRequired,
@@ -34,9 +32,11 @@ class ToolbarRow extends Component {
     const leftSidebarToggle = [
       {
         value: 'studies',
-        svgLink: `${Icons}#icon-studies`,
-        svgWidth: 15,
-        svgHeight: 13,
+        icon: {
+          name: 'studies',
+          width: 15,
+          height: 13,
+        },
         bottomLabel: 'Series',
       },
     ]
@@ -44,9 +44,11 @@ class ToolbarRow extends Component {
     const rightSidebarToggle = [
       {
         value: 'measurements',
-        svgLink: `${Icons}#icon-measurements-lesions`,
-        svgWidth: 15,
-        svgHeight: 13,
+        icon: {
+          name: 'measurement-lesions',
+          width: 15,
+          height: 13,
+        },
         bottomLabel: 'Measurements',
       },
     ]