diff --git a/src/common/icon-button.js b/src/common/icon-button.js
index a3dd0b3..a905dd1 100644
--- a/src/common/icon-button.js
+++ b/src/common/icon-button.js
@@ -35,7 +35,7 @@ class IconButton extends React.Component {
     }
 
     return <OverlayTrigger
-      key={this.props.key}
+      key={this.props.ikey}
       placement={'top'}
       overlay={<Tooltip id={`tooltip-${"add"}`}>{this.props.tooltip}</Tooltip>} >
       <Button
diff --git a/src/componentconfig/config-table.js b/src/componentconfig/config-table.js
index 082caa2..f18fb6d 100644
--- a/src/componentconfig/config-table.js
+++ b/src/componentconfig/config-table.js
@@ -304,13 +304,13 @@ class ConfigTable extends Component {
         <h2 style={this.props.tableHeadingStyle}>Component Configurations
           <span className='icon-button'>
           <IconButton
-            key={0}
+            ikey={0}
             tooltip='Add Component Configuration'
             onClick={() => this.addConfig()}
             icon='plus'
           />
           <IconButton
-            key={1}
+            ikey={1}
             tooltip='Import Component Configuration'
             onClick={() => this.setState({ importConfigModal: true })}
             icon='upload'
diff --git a/src/dashboard/dashboard-table.js b/src/dashboard/dashboard-table.js
index 89f5bf0..cb96fdb 100644
--- a/src/dashboard/dashboard-table.js
+++ b/src/dashboard/dashboard-table.js
@@ -144,13 +144,13 @@ class DashboardTable extends Component {
         <h2 style={this.props.tableHeadingStyle}>Dashboards
           <span className='icon-button'>
               <IconButton
-                key={0}
+                ikey={0}
                 tooltip='Add Dashboard'
                 onClick={() => this.setState({newDashboardModal: true})}
                 icon='plus'
               />
               <IconButton
-                key={1}
+                ikey={1}
                 tooltip='Import Dashboard'
                 onClick={() => this.setState({importDashboardModal: true})}
                 icon='upload'
diff --git a/src/ic/ics.js b/src/ic/ics.js
index e753656..7698317 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -472,13 +472,13 @@ class InfrastructureComponents extends Component {
           {this.state.currentUser.role === "Admin" ?
             <span className='icon-button'>
               <IconButton
-                alt={1}
+                ikey={1}
                 tooltip='Add Infrastructure Component'
                 onClick={() => this.setState({newModal: true})}
                 icon='plus'
               />
               <IconButton
-                alt={1}
+                ikey={1}
                 tooltip='Import Infrastructure Component'
                 onClick={() => this.setState({importModal: true})}
                 icon='upload'
diff --git a/src/result/result-table.js b/src/result/result-table.js
index cac8ab5..92b8b62 100644
--- a/src/result/result-table.js
+++ b/src/result/result-table.js
@@ -161,7 +161,7 @@ class ResultTable extends Component {
         <h2 style={this.props.tableHeadingStyle}>Results
           <span className='icon-button'>
           <IconButton
-            key={1}
+            ikey={1}
             tooltip='Add Result'
             onClick={() => this.setState({ newResultModal: true })}
             icon='plus'
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 01dfd60..1e1033c 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -129,7 +129,7 @@ class Scenario extends React.Component {
     return <div className='section'>
       <div className='section-buttons-group-right'>
         <IconButton
-          key="0"
+          ikey="0"
           tooltip="Add, edit or delete files of scenario"
           onClick={this.onEditFiles.bind(this)}
           icon="file"
diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js
index afd10f2..9d81a74 100644
--- a/src/scenario/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -236,13 +236,13 @@ class Scenarios extends Component {
         <h1>Scenarios
           <span className='icon-button'>
             <IconButton
-              key={0}
+              ikey={0}
               tooltip='Add Scenario'
               onClick={() => this.setState({ newModal: true })}
               icon='plus'
             />
             <IconButton
-              key={1}
+              ikey={1}
               tooltip='Import Scenario'
               onClick={() => this.setState({ importModal: true })}
               icon='upload'
diff --git a/src/user/users.js b/src/user/users.js
index ca68323..5d97e68 100644
--- a/src/user/users.js
+++ b/src/user/users.js
@@ -119,7 +119,7 @@ class Users extends Component {
         <h1>Users
           <span className='icon-button'>
             <IconButton
-              key={0}
+              ikey={0}
               tooltip='Add User'
               onClick={() => this.setState({ newModal: true })}
               icon='plus'