diff --git a/src/components/LanguageSettings.js b/src/components/LanguageSettings.js
index 29efea8b74975e5143060d4ee13ffb3f57d8d4ff..b23ac7cf4e84181484ba9f17af7f00407e3ca0e8 100644
--- a/src/components/LanguageSettings.js
+++ b/src/components/LanguageSettings.js
@@ -34,7 +34,7 @@ export class LanguageSettings extends Component {
                   && <ListItemIcon><CheckIcon /></ListItemIcon>
               }
               <ListItemText inset>
-                <Typography variant="inherit">
+                <Typography variant="body1">
                   {language.label}
                 </Typography>
               </ListItemText>
diff --git a/src/components/NestedMenu.js b/src/components/NestedMenu.js
index 12ee88dcc1e812e419754788fcd92c09b406eb0b..c178fa00b392aff111422ee437f52ba3b68961c2 100644
--- a/src/components/NestedMenu.js
+++ b/src/components/NestedMenu.js
@@ -53,7 +53,7 @@ export class NestedMenu extends Component {
           }
           {/* ListItemText adds left padding and we want this to line-up with menu items */}
           <ListItemText style={{ paddingLeft: 0 }}>
-            <Typography varient="inherit">{label}</Typography>
+            <Typography variant="body1">{label}</Typography>
           </ListItemText>
           {
             nestedMenuIsOpen
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
index 09dd0eb3b578bca0a4f50a24b0a78d18ae2d3eae..d82c67f27639edcae5ce8e13beb92f804bd26e17 100644
--- a/src/components/WindowList.js
+++ b/src/components/WindowList.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import Menu from '@material-ui/core/Menu';
 import MenuItem from '@material-ui/core/MenuItem';
+import Typography from '@material-ui/core/Typography';
 import ListSubheader from '@material-ui/core/ListSubheader';
 import PropTypes from 'prop-types';
 import ns from '../config/css-ns';
@@ -49,9 +50,11 @@ export class WindowList extends Component {
               selected={i === 0}
               onClick={(e) => { focusWindow(window.id); handleClose(e); }}
             >
-              {
-                this.titleContent(window)
-              }
+              <Typography variant="body1">
+                {
+                  this.titleContent(window)
+                }
+              </Typography>
             </MenuItem>
           ))
         }
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
index 913dfa0a295c25231bf9d0c396733fb07f60e2ac..136341af7396d31160a64712ce7b73ef11172dca 100644
--- a/src/components/WorkspaceMenu.js
+++ b/src/components/WorkspaceMenu.js
@@ -110,14 +110,14 @@ export class WorkspaceMenu extends Component {
             onClick={(e) => { this.handleMenuItemClick('windowList', e); handleClose(e); }}
             aria-owns={windowList.anchorEl ? 'window-list-menu' : undefined}
           >
-            <Typography varient="inherit">{t('listAllOpenWindows')}</Typography>
+            <Typography variant="body1">{t('listAllOpenWindows')}</Typography>
           </MenuItem>
           <MenuItem
             aria-haspopup="true"
             onClick={(e) => { this.handleZoomToggleClick(e); handleClose(e); }}
             aria-owns={toggleZoom.anchorEl ? 'toggle-zoom-menu' : undefined}
           >
-            <Typography varient="inherit">
+            <Typography variant="body1">
               { showZoomControls ? t('hideZoomControls') : t('showZoomControls') }
             </Typography>
           </MenuItem>
@@ -126,7 +126,7 @@ export class WorkspaceMenu extends Component {
             onClick={(e) => { this.handleMenuItemClick('workspaceSelection', e); handleClose(e); }}
             aria-owns={workspaceSelection.anchorEl ? 'workspace-selection' : undefined}
           >
-            <Typography varient="inherit">{t('selectWorkspaceMenu')}</Typography>
+            <Typography variant="body1">{t('selectWorkspaceMenu')}</Typography>
           </MenuItem>
 
           <NestedMenu label={t('language')} divider>
@@ -141,7 +141,7 @@ export class WorkspaceMenu extends Component {
             <ListItemIcon>
               <SettingsIcon />
             </ListItemIcon>
-            <Typography varient="inherit">{t('settings')}</Typography>
+            <Typography variant="body1">{t('settings')}</Typography>
           </MenuItem>
           <MenuItem
             aria-haspopup="true"
@@ -151,7 +151,7 @@ export class WorkspaceMenu extends Component {
             <ListItemIcon>
               <SaveAltIcon />
             </ListItemIcon>
-            <Typography varient="inherit">{t('downloadExportWorkspace')}</Typography>
+            <Typography variant="body1">{t('downloadExportWorkspace')}</Typography>
           </MenuItem>
         </Menu>
         <WindowList