diff --git a/src/common/icon-toggle-button.js b/src/common/icon-toggle-button.js
index e4f23d2..e9adc8a 100644
--- a/src/common/icon-toggle-button.js
+++ b/src/common/icon-toggle-button.js
@@ -33,7 +33,7 @@ class IconToggleButton extends React.Component {
       overlay={<Tooltip id={`tooltip-${this.props.ikey}`}>{tooltip}</Tooltip>} >
       <ButtonGroup toggle>
         <ToggleButton
-          variant='light'
+          variant={this.props.variant ? this.props.variant : 'light'}
           type='checkbox'
           onChange={this.props.onChange}
           style={this.props.buttonStyle}
diff --git a/src/common/table.js b/src/common/table.js
index ea6494d..c3daff5 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -179,6 +179,7 @@ class CustomTable extends Component {
           tooltipChecked='Scenario is locked, cannot be edited'
           tooltipUnchecked='Scenario is unlocked, can be edited'
           disabled={false}
+          variant={'table-control-button'}
         />
       );
     }
@@ -217,7 +218,7 @@ class CustomTable extends Component {
           key={childkey++}
           ikey={childkey++}
           icon={'copy'}
-          disabled={child.props.onDuplicate == null || isLocked}
+          disabled={child.props.onDuplicate == null || child.props.locked}
           hidetooltip={isLocked}
           tooltip={"Duplicate"}
           tipPlacement={'bottom'}