diff --git a/src/ic/ics.js b/src/ic/ics.js
index 0144b5d..2bfea75 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -17,7 +17,7 @@
 
 import React, { Component } from 'react';
 import { Container } from 'flux/utils';
-import { Button, Badge } from 'react-bootstrap';
+import {Button, Badge, Tooltip, OverlayTrigger} from 'react-bootstrap';
 import FileSaver from 'file-saver';
 import _ from 'lodash';
 import moment from 'moment'
@@ -388,10 +388,20 @@ class InfrastructureComponents extends Component {
         <h1>Infrastructure Components
           {this.state.currentUser.role === "Admin" ?
             (<span>
-              <Button onClick={() => this.setState({newModal: true})} style={buttonStyle}><Icon icon="plus"
+              <OverlayTrigger
+                key={1}
+                placement={'top'}
+                overlay={<Tooltip id={`tooltip-${"add"}`}> Add Infrastructure Component </Tooltip>} >
+                <Button onClick={() => this.setState({newModal: true})} style={buttonStyle}><Icon icon="plus"
                                                                                                 /></Button>
-              <Button onClick={() => this.setState({importModal: true})} style={buttonStyle}><Icon icon="upload"
+              </OverlayTrigger>
+              <OverlayTrigger
+                key={2}
+                placement={'top'}
+                overlay={<Tooltip id={`tooltip-${"import"}`}> Import Infrastructure Component </Tooltip>} >
+                <Button onClick={() => this.setState({importModal: true})} style={buttonStyle}><Icon icon="upload"
                                                                                                    /></Button>
+              </OverlayTrigger>
               </span>)
             :
             (<span> </span>)
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index e65b2e6..01045fe 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -800,8 +800,18 @@ class Scenario extends React.Component {
 
       {/*Component Configurations table*/}
       <h2 style={tableHeadingStyle}>Component Configurations
-        <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /></Button>
-        <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        <OverlayTrigger
+          key={1}
+          placement={'top'}
+          overlay={<Tooltip id={`tooltip-${"add"}`}> Add Component Configuration </Tooltip>} >
+          <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /></Button>
+        </OverlayTrigger>
+        <OverlayTrigger
+          key={2}
+          placement={'top'}
+          overlay={<Tooltip id={`tooltip-${"import"}`}> Import Component Configuration </Tooltip>} >
+          <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        </OverlayTrigger>
       </h2>
       <Table data={this.state.configs}>
         <TableColumn
@@ -898,8 +908,18 @@ class Scenario extends React.Component {
 
       {/*Dashboard table*/}
       <h2 style={tableHeadingStyle}>Dashboards
-        <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
-        <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        <OverlayTrigger
+          key={1}
+          placement={'top'}
+          overlay={<Tooltip id={`tooltip-${"add"}`}> Add Dashboard </Tooltip>} >
+          <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        </OverlayTrigger>
+        <OverlayTrigger
+          key={2}
+          placement={'top'}
+          overlay={<Tooltip id={`tooltip-${"import"}`}> Import Dashboard </Tooltip>} >
+          <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        </OverlayTrigger>
       </h2>
       <Table data={this.state.dashboards}>
         <TableColumn title='Name' dataKey='name' link='/dashboards/' linkKey='id' />
@@ -926,7 +946,12 @@ class Scenario extends React.Component {
 
       {/*Result table*/}
       <h2 style={tableHeadingStyle}>Results
-        <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        <OverlayTrigger
+          key={1}
+          placement={'top'}
+          overlay={<Tooltip id={`tooltip-${"add"}`}> Add Result </Tooltip>} >
+          <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        </OverlayTrigger>
       </h2>
       {resulttable}
       <NewResultDialog show={this.state.newResultModal} onClose={data => this.closeNewResultModal(data)} />
diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js
index fb56da6..8158af8 100644
--- a/src/scenario/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -17,7 +17,7 @@
 
 import React, { Component } from 'react';
 import { Container } from 'flux/utils';
-import { Button } from 'react-bootstrap';
+import {Button, OverlayTrigger, Tooltip} from 'react-bootstrap';
 import FileSaver from 'file-saver';
 
 import AppDispatcher from '../common/app-dispatcher';
@@ -242,8 +242,18 @@ class Scenarios extends Component {
     return (
       <div className='section'>
         <h1>Scenarios
-          <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+          <OverlayTrigger
+            key={1}
+            placement={'top'}
+            overlay={<Tooltip id={`tooltip-${"add"}`}> Add Scenario </Tooltip>} >
+              <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+          </OverlayTrigger>
+          <OverlayTrigger
+            key={2}
+            placement={'top'}
+            overlay={<Tooltip id={`tooltip-${"import"}`}> Import Scenario </Tooltip>} >
           <Button onClick={() => this.setState({ importModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+          </OverlayTrigger>
         </h1>
 
         <Table data={this.state.scenarios}>
diff --git a/src/user/users.js b/src/user/users.js
index af4fbaa..d577462 100644
--- a/src/user/users.js
+++ b/src/user/users.js
@@ -17,7 +17,7 @@
 
 import React, { Component } from 'react';
 import { Container } from 'flux/utils';
-import { Button } from 'react-bootstrap';
+import {Button, OverlayTrigger, Tooltip} from 'react-bootstrap';
 
 import AppDispatcher from '../common/app-dispatcher';
 import UsersStore from './users-store';
@@ -130,9 +130,22 @@ class Users extends Component {
 
   render() {
 
+    const buttonStyle = {
+      marginLeft: '10px'
+    };
+
     return (
       <div>
-        <h1>Users</h1>
+        <h1>Users
+
+          <OverlayTrigger
+            key={1}
+            placement={'top'}
+            overlay={<Tooltip id={`tooltip-${"add"}`}> Add User </Tooltip>} >
+            <Button style={buttonStyle} onClick={() => this.setState({ newModal: true })}><Icon icon='plus' /> </Button>
+          </OverlayTrigger>
+
+        </h1>
 
         <Table data={this.state.users}>
           <TableColumn title='Username' width='150' dataKey='username' />
@@ -143,7 +156,7 @@ class Users extends Component {
           <TableColumn width='200' editButton deleteButton onEdit={index => this.setState({ editModal: true, modalData: this.state.users[index] })} onDelete={index => this.setState({ deleteModal: true, modalData: this.state.users[index] })} />
         </Table>
 
-        <Button onClick={() => this.setState({ newModal: true })}><Icon icon='plus' /> User</Button>
+
 
         <NewUserDialog show={this.state.newModal} onClose={(data) => this.closeNewModal(data)} />
         <EditUserDialog show={this.state.editModal} onClose={(data) => this.closeEditModal(data)} user={this.state.modalData} />