diff --git a/src/componentconfig/config-table.js b/src/componentconfig/config-table.js
index a43f811..b711ab5 100644
--- a/src/componentconfig/config-table.js
+++ b/src/componentconfig/config-table.js
@@ -309,6 +309,7 @@ class ConfigTable extends Component {
             onClick={() => this.addConfig()}
             icon='plus'
             disabled={this.props.locked}
+            hidetooltip={this.props.locked}
           />
           <IconButton
             ikey={1}
@@ -316,6 +317,7 @@ class ConfigTable extends Component {
             onClick={() => this.setState({ importConfigModal: true })}
             icon='upload'
             disabled={this.props.locked}
+            hidetooltip={this.props.locked}
           />
         </span>
         </h2>
diff --git a/src/dashboard/dashboard-table.js b/src/dashboard/dashboard-table.js
index 7728d78..9c76270 100644
--- a/src/dashboard/dashboard-table.js
+++ b/src/dashboard/dashboard-table.js
@@ -149,6 +149,7 @@ class DashboardTable extends Component {
                 onClick={() => this.setState({newDashboardModal: true})}
                 icon='plus'
                 disabled={this.props.locked}
+                hidetooltip={this.props.locked}
               />
               <IconButton
                 ikey={1}
@@ -156,6 +157,7 @@ class DashboardTable extends Component {
                 onClick={() => this.setState({importDashboardModal: true})}
                 icon='upload'
                 disabled={this.props.locked}
+                hidetooltip={this.props.locked}
               />
             </span>
         </h2>
diff --git a/src/result/result-table.js b/src/result/result-table.js
index 4b81427..d8aba2e 100644
--- a/src/result/result-table.js
+++ b/src/result/result-table.js
@@ -159,15 +159,14 @@ class ResultTable extends Component {
       <div>
         {/*Result table*/}
         <h2 style={this.props.tableHeadingStyle}>Results
-          <span className='icon-button'>
           <IconButton
             ikey={1}
             tooltip='Add Result'
             onClick={() => this.setState({ newResultModal: true })}
             icon='plus'
             disabled={this.props.locked}
+            hidetooltip={this.props.locked}
           />
-        </span>
         </h2>
 
         <Table data={this.props.results}>