diff --git a/src/components/WindowSideBarButtons.js b/src/components/WindowSideBarButtons.js
index 011c871088e3c1b80f2fe11a59dce363cfc1478b..190da18eeed13cbe436811e8c92ed38613ae3f78 100644
--- a/src/components/WindowSideBarButtons.js
+++ b/src/components/WindowSideBarButtons.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Badge from '@material-ui/core/Badge';
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
+import Tooltip from '@material-ui/core/Tooltip';
 import InfoIcon from '@material-ui/icons/InfoSharp';
 import AnnotationIcon from '@material-ui/icons/CommentSharp';
 import CanvasIndexIcon from './icons/CanvasIndexIcon';
@@ -50,7 +51,9 @@ export class WindowSideBarButtons extends Component {
             t('openInfoCompanionWindow')
           }
           icon={(
-            <InfoIcon />
+            <Tooltip title={t('openInfoCompanionWindow')}>
+              <InfoIcon />
+            </Tooltip>
           )}
           value="info"
         />
@@ -60,7 +63,9 @@ export class WindowSideBarButtons extends Component {
             t('openCanvasNavigationCompanionWindow')
           }
           icon={(
-            <CanvasIndexIcon />
+            <Tooltip title={t('openCanvasNavigationCompanionWindow')}>
+              <CanvasIndexIcon />
+            </Tooltip>
           )}
           value="canvas_navigation"
         />
@@ -70,9 +75,11 @@ export class WindowSideBarButtons extends Component {
             t('openAnnotationCompanionWindow')
           }
           icon={(
-            <Badge color="error" invisible={!hasAnnotations} variant="dot">
-              <AnnotationIcon />
-            </Badge>
+            <Tooltip title={t('openAnnotationCompanionWindow')}>
+              <Badge color="error" invisible={!hasAnnotations} variant="dot">
+                <AnnotationIcon />
+              </Badge>
+            </Tooltip>
           )}
           value="annotations"
         />
diff --git a/src/components/WorkspaceAddButton.js b/src/components/WorkspaceAddButton.js
index 7f1dc882f26868d6d179ee1be56de96e05b44068..677b8a415222ef50aeb793614f2ef1869bf40689 100644
--- a/src/components/WorkspaceAddButton.js
+++ b/src/components/WorkspaceAddButton.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Fab from '@material-ui/core/Fab';
+import Tooltip from '@material-ui/core/Tooltip';
 import AddIcon from '@material-ui/icons/AddSharp';
 import CloseIcon from '@material-ui/icons/CloseSharp';
 
@@ -16,19 +17,21 @@ export class WorkspaceAddButton extends Component {
       classes, t, setWorkspaceAddVisibility, isWorkspaceAddVisible,
     } = this.props;
     return (
-      <Fab
-        color="secondary"
-        id="addBtn"
-        aria-label={isWorkspaceAddVisible ? t('closeWindow') : t('add')}
-        className={classes.fab}
-        onClick={() => { setWorkspaceAddVisibility(!isWorkspaceAddVisible); }}
-      >
-        {
-          isWorkspaceAddVisible
-            ? <CloseIcon />
-            : <AddIcon />
-        }
-      </Fab>
+      <Tooltip title={isWorkspaceAddVisible ? t('closeWindow') : t('add')}>
+        <Fab
+          color="secondary"
+          id="addBtn"
+          aria-label={isWorkspaceAddVisible ? t('closeWindow') : t('add')}
+          className={classes.fab}
+          onClick={() => { setWorkspaceAddVisibility(!isWorkspaceAddVisible); }}
+        >
+          {
+            isWorkspaceAddVisible
+              ? <CloseIcon />
+              : <AddIcon />
+          }
+        </Fab>
+      </Tooltip>
     );
   }
 }