diff --git a/__tests__/src/components/WindowTopBar.test.js b/__tests__/src/components/WindowTopBar.test.js
index d2ac3dc29544199061879245ac58c7cdd2da3756..7a50a7c62ca366c8cf2ef8f2904b0709ce152073 100644
--- a/__tests__/src/components/WindowTopBar.test.js
+++ b/__tests__/src/components/WindowTopBar.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 
 import Typography from '@material-ui/core/Typography';
 import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
+import MenuIcon from '@material-ui/icons/MenuSharp';
 import Toolbar from '@material-ui/core/Toolbar';
 import AppBar from '@material-ui/core/AppBar';
 
diff --git a/__tests__/src/components/WindowTopMenuButton.test.js b/__tests__/src/components/WindowTopMenuButton.test.js
index 498a65f0d97d8e180b45ba97ab7bdd4f8f4cd396..e4848f5a7d311c8e5de355b0296cc4485844b05e 100644
--- a/__tests__/src/components/WindowTopMenuButton.test.js
+++ b/__tests__/src/components/WindowTopMenuButton.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import IconButton from '@material-ui/core/IconButton';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import MoreVertIcon from '@material-ui/icons/MoreVertSharp';
 import WindowTopMenu from '../../../src/containers/WindowTopMenu';
 import { WindowTopMenuButton } from '../../../src/components/WindowTopMenuButton';
 
diff --git a/__tests__/src/components/WorkspaceAddButton.test.js b/__tests__/src/components/WorkspaceAddButton.test.js
index 2e1df73ef446d0d5018bd6e14736b74d78678874..9d20b9fd0cd6beef780ad0c419c880565775b85f 100644
--- a/__tests__/src/components/WorkspaceAddButton.test.js
+++ b/__tests__/src/components/WorkspaceAddButton.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import Fab from '@material-ui/core/Fab';
-import AddIcon from '@material-ui/icons/Add';
-import ClearIcon from '@material-ui/icons/Clear';
+import AddIcon from '@material-ui/icons/AddSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
 import { WorkspaceAddButton } from '../../../src/components/WorkspaceAddButton';
 
 /** create wrapper */
@@ -31,7 +31,7 @@ describe('WorkspaceAddButton', () => {
     const setWorkspaceAddVisibility = jest.fn();
     const wrapper = createWrapper({ isWorkspaceAddVisible: true, setWorkspaceAddVisibility });
 
-    expect(wrapper.find(ClearIcon).length).toBe(1);
+    expect(wrapper.find(CloseIcon).length).toBe(1);
 
     wrapper.find(Fab).simulate('click');
     expect(setWorkspaceAddVisibility).toHaveBeenCalledWith(false);
diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 5ec80ef2d9e5a598a0e8bc1071bd6aded9918749..95d064f7d7ff7c5eab2bfcae5df9ad73f99ad8e7 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import CloseIcon from '@material-ui/icons/Close';
+import CloseIcon from '@material-ui/icons/CloseSharp';
 import IconButton from '@material-ui/core/IconButton';
 import Paper from '@material-ui/core/Paper';
 import ns from '../config/css-ns';
diff --git a/src/components/ManifestListItemError.js b/src/components/ManifestListItemError.js
index 03842737051355c7366a61e47d7b53db71fad209..9488ad293cdaa1af60de4982da4a847cc9da0010 100644
--- a/src/components/ManifestListItemError.js
+++ b/src/components/ManifestListItemError.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Button from '@material-ui/core/Button';
-import ErrorIcon from '@material-ui/icons/ErrorOutline';
+import ErrorIcon from '@material-ui/icons/ErrorOutlineSharp';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 
diff --git a/src/components/ViewerNavigation.js b/src/components/ViewerNavigation.js
index 3d5ed7a0669aa29267825bbadbcb63164fcb10db..f3272c3b7b47435fdd2edee9d3349bc1b0f5b9e6 100644
--- a/src/components/ViewerNavigation.js
+++ b/src/components/ViewerNavigation.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import IconButton from '@material-ui/core/IconButton';
-import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
-import ChevronRightIcon from '@material-ui/icons/ChevronRight';
+import NavigationIcon from '@material-ui/icons/PlayCircleOutlineSharp';
 import PropTypes from 'prop-types';
 import ns from '../config/css-ns';
 
@@ -56,14 +55,14 @@ export class ViewerNavigation extends Component {
           disabled={!this.hasPreviousCanvas()}
           onClick={this.previousCanvas}
         >
-          <ChevronLeftIcon />
+          <NavigationIcon style={{ transform: 'rotate(180deg)' }} />
         </IconButton>
         <IconButton
           className={ns('next-canvas-button')}
           disabled={!this.hasNextCanvas()}
           onClick={this.nextCanvas}
         >
-          <ChevronRightIcon />
+          <NavigationIcon />
         </IconButton>
       </div>
     );
diff --git a/src/components/WindowSideBarButtons.js b/src/components/WindowSideBarButtons.js
index 80ba4886cf152a36fefcc47b5af38c76d8fa4958..6eb26ea7c4d71227557ad5cdaba866d935a2bd51 100644
--- a/src/components/WindowSideBarButtons.js
+++ b/src/components/WindowSideBarButtons.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import IconButton from '@material-ui/core/IconButton';
-import InfoIcon from '@material-ui/icons/Info';
+import InfoIcon from '@material-ui/icons/InfoSharp';
 import ListIcon from '@material-ui/icons/FormatAlignJustify';
 
 /**
diff --git a/src/components/WindowSideBarPanel.js b/src/components/WindowSideBarPanel.js
index 659e484d683f51ccdc55a9c6f59f8e552e219fb9..d7d94b6249e7974ed8c95e29151a3254df629740 100644
--- a/src/components/WindowSideBarPanel.js
+++ b/src/components/WindowSideBarPanel.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import IconButton from '@material-ui/core/IconButton';
-import OpenInNewIcon from '@material-ui/icons/OpenInNew';
+import OpenInNewIcon from '@material-ui/icons/OpenInNewSharp';
 import WindowSideBarInfoPanel from '../containers/WindowSideBarInfoPanel';
 import WindowSideBarCanvasPanel from '../containers/WindowSideBarCanvasPanel';
 
diff --git a/src/components/WindowThumbnailSettings.js b/src/components/WindowThumbnailSettings.js
index 7f2a84520c948d8e1c628b904238e0b245ef02e9..7ed18f974912488231d590ce0556be2094c60c58 100644
--- a/src/components/WindowThumbnailSettings.js
+++ b/src/components/WindowThumbnailSettings.js
@@ -3,7 +3,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
 import Radio from '@material-ui/core/Radio';
 import RadioGroup from '@material-ui/core/RadioGroup';
 import Typography from '@material-ui/core/Typography';
-import CancelPresentationIcon from '@material-ui/icons/CancelPresentation';
+import ThumbnailsOffIcon from '@material-ui/icons/CropDinSharp';
 import VideoLabelIcon from '@material-ui/icons/VideoLabel';
 import PropTypes from 'prop-types';
 
@@ -42,7 +42,7 @@ export class WindowThumbnailSettings extends Component {
         <RadioGroup aria-label={t('position')} name="position" value={thumbnailNavigationPosition} onChange={this.handleChange} row>
           <FormControlLabel
             value="off"
-            control={<Radio color="primary" icon={<CancelPresentationIcon />} checkedIcon={<CancelPresentationIcon />} />}
+            control={<Radio color="primary" icon={<ThumbnailsOffIcon />} checkedIcon={<ThumbnailsOffIcon />} />}
             label={t('off')}
             labelPlacement="bottom"
           />
diff --git a/src/components/WindowTopBar.js b/src/components/WindowTopBar.js
index bab19df9f06ca0bd8854787d3d4e20ff4948d7e0..1eb134694654b38970223baaa06f01a2ef3fb229 100644
--- a/src/components/WindowTopBar.js
+++ b/src/components/WindowTopBar.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
 import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
-import CloseIcon from '@material-ui/icons/Close';
+import MenuIcon from '@material-ui/icons/MenuSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
 import Toolbar from '@material-ui/core/Toolbar';
 import AppBar from '@material-ui/core/AppBar';
 import classNames from 'classnames';
diff --git a/src/components/WindowTopMenuButton.js b/src/components/WindowTopMenuButton.js
index 4af5dc32d779556fab6feb42cc85decce7790166..52ca4e0b149840cae4d44eeab2fc9b99fa0ee3fc 100644
--- a/src/components/WindowTopMenuButton.js
+++ b/src/components/WindowTopMenuButton.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import IconButton from '@material-ui/core/IconButton';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import MoreVertIcon from '@material-ui/icons/MoreVertSharp';
 import PropTypes from 'prop-types';
 import WindowTopMenu from '../containers/WindowTopMenu';
 
diff --git a/src/components/WindowViewSettings.js b/src/components/WindowViewSettings.js
index 61f5d899e84095f7b0259673bab703563bcfae63..f2efa7015d2183c3e2558f3eb80fc67f94fe359b 100644
--- a/src/components/WindowViewSettings.js
+++ b/src/components/WindowViewSettings.js
@@ -3,7 +3,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
 import Radio from '@material-ui/core/Radio';
 import RadioGroup from '@material-ui/core/RadioGroup';
 import Typography from '@material-ui/core/Typography';
-import PhotoIcon from '@material-ui/icons/Photo';
+import SingleIcon from '@material-ui/icons/CropOriginalSharp';
 import ViewAgendaIcon from '@material-ui/icons/ViewAgenda';
 import PropTypes from 'prop-types';
 
@@ -42,7 +42,7 @@ export class WindowViewSettings extends Component {
         <RadioGroup aria-label={t('position')} name="position" value={windowViewType} onChange={this.handleChange} row>
           <FormControlLabel
             value="single"
-            control={<Radio color="primary" icon={<PhotoIcon />} checkedIcon={<PhotoIcon />} />}
+            control={<Radio color="primary" icon={<SingleIcon />} checkedIcon={<SingleIcon />} />}
             label={t('single')}
             labelPlacement="bottom"
           />
diff --git a/src/components/WorkspaceAdd.js b/src/components/WorkspaceAdd.js
index 8be99d0023d2c89461e0403a4a93cd242a4ea44f..20c8c96bfeaad837014c34216adf563ed2d05e64 100644
--- a/src/components/WorkspaceAdd.js
+++ b/src/components/WorkspaceAdd.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import AddIcon from '@material-ui/icons/Add';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import AddIcon from '@material-ui/icons/AddSharp';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMoreSharp';
 import AppBar from '@material-ui/core/AppBar';
 import Drawer from '@material-ui/core/Drawer';
 import Fab from '@material-ui/core/Fab';
diff --git a/src/components/WorkspaceAddButton.js b/src/components/WorkspaceAddButton.js
index 12dd32b8646b866609e45343f87cd10b2674fd28..9fe12fef28889d93de10ceea74f270742390363f 100644
--- a/src/components/WorkspaceAddButton.js
+++ b/src/components/WorkspaceAddButton.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ListItem from '@material-ui/core/ListItem';
 import Fab from '@material-ui/core/Fab';
-import AddIcon from '@material-ui/icons/Add';
-import ClearIcon from '@material-ui/icons/Clear';
+import AddIcon from '@material-ui/icons/AddSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
 
 /**
  */
@@ -27,7 +27,7 @@ export class WorkspaceAddButton extends Component {
         >
           {
             isWorkspaceAddVisible
-              ? <ClearIcon />
+              ? <CloseIcon />
               : <AddIcon />
           }
         </Fab>
diff --git a/src/components/WorkspaceFullScreenButton.js b/src/components/WorkspaceFullScreenButton.js
index 008de38d39e18b8ef8a1ebd88f090c23a8a74ca2..0f12ac23f1295111f1aa41b10f357d77453efe4d 100644
--- a/src/components/WorkspaceFullScreenButton.js
+++ b/src/components/WorkspaceFullScreenButton.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import IconButton from '@material-ui/core/IconButton';
-import FullscreenIcon from '@material-ui/icons/Fullscreen';
+import FullscreenIcon from '@material-ui/icons/FullscreenSharp';
 import ListItem from '@material-ui/core/ListItem';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
index 361a213379a5ea4e7dad0e8af79cc677bb79a731..5019f94da0d444a2c6fb873b3f2b78ef4b770b62 100644
--- a/src/components/WorkspaceMenu.js
+++ b/src/components/WorkspaceMenu.js
@@ -6,8 +6,8 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
 import LoupeIcon from '@material-ui/icons/Loupe';
 import MenuItem from '@material-ui/core/MenuItem';
 import Typography from '@material-ui/core/Typography';
-import SaveAltIcon from '@material-ui/icons/SaveAlt';
-import SettingsIcon from '@material-ui/icons/Settings';
+import SaveAltIcon from '@material-ui/icons/SaveAltSharp';
+import SettingsIcon from '@material-ui/icons/SettingsSharp';
 import ViewHeadlineIcon from '@material-ui/icons/ViewHeadline';
 import PropTypes from 'prop-types';
 import LanguageSettings from '../containers/LanguageSettings';
diff --git a/src/components/WorkspaceMenuButton.js b/src/components/WorkspaceMenuButton.js
index 43948b5170a07563cd17558588d29c24b24971c0..56b8317692ef6e132eaaef5643de874eace0c9eb 100644
--- a/src/components/WorkspaceMenuButton.js
+++ b/src/components/WorkspaceMenuButton.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
+import MenuIcon from '@material-ui/icons/MenuSharp';
 import ListItem from '@material-ui/core/ListItem';
 import PropTypes from 'prop-types';
 import WorkspaceMenu from '../containers/WorkspaceMenu';
diff --git a/src/components/ZoomControls.js b/src/components/ZoomControls.js
index b50db069448a6bf17f1e94669743aaed89f07379..7edb6342060a082d76d6246e2ffbe9cf4300aa7d 100644
--- a/src/components/ZoomControls.js
+++ b/src/components/ZoomControls.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import IconButton from '@material-ui/core/IconButton';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
-import AddCircleIcon from '@material-ui/icons/AddCircle';
-import RemoveCircleIcon from '@material-ui/icons/RemoveCircle';
+import AddCircleIcon from '@material-ui/icons/AddCircleOutlineSharp';
+import RemoveCircleIcon from '@material-ui/icons/RemoveCircleOutlineSharp';
 import RefreshIcon from '@material-ui/icons/Refresh';
 import PropTypes from 'prop-types';