diff --git a/src/ts/@overflow/discovery/react/components/Discovery.tsx b/src/ts/@overflow/discovery/react/components/Discovery.tsx
index 44eb989..64deff8 100644
--- a/src/ts/@overflow/discovery/react/components/Discovery.tsx
+++ b/src/ts/@overflow/discovery/react/components/Discovery.tsx
@@ -83,13 +83,13 @@ export class Discovery extends React.Component<Props, State> {
         <DiscoveryTable onProbeChange={this.handleProbeChange.bind(this)} />
 
         <Modal size='small' open={this.state.startPopup} onClose={this.handlePopupClose}>
-          <Modal.Header>Discovery.</Modal.Header>
+          <Modal.Header>Discovery</Modal.Header>
           <Modal.Content >
             <Checkbox label='IP' />
           </Modal.Content>
           <Modal.Actions>
-            <Button onClick={this.handleSubmit.bind(this)} basic color='blue'  >              Submit      </Button>
             <Button onClick={this.handleCancel}>              Cancel      </Button>
+            <Button onClick={this.handleSubmit.bind(this)} primary>              Submit      </Button>
           </Modal.Actions>
         </Modal>
 
diff --git a/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx b/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx
index d359618..e17f74a 100644
--- a/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx
+++ b/src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx
@@ -147,8 +147,8 @@ export class DiscoveryTable extends React.Component<Props, State> {
           <Table.Footer>
             <Table.Row>
               <Table.HeaderCell colSpan='2'>
-                <Button icon='find' floated='right' labelPosition='left'
-                        content='Start' primary onClick={this.discoveryStartHandler.bind(this)} />
+                <Button  icon='checkmark' floated='right' labelPosition='left'
+                        content='Start' positive onClick={this.discoveryStartHandler.bind(this)} />
               </Table.HeaderCell>
             </Table.Row>
           </Table.Footer>
diff --git a/src/ts/@overflow/target/react/components/TargetList.tsx b/src/ts/@overflow/target/react/components/TargetList.tsx
index 9c62742..db74f64 100644
--- a/src/ts/@overflow/target/react/components/TargetList.tsx
+++ b/src/ts/@overflow/target/react/components/TargetList.tsx
@@ -140,8 +140,8 @@ export class TargetList extends React.Component<Props, State> {
             <Discovery />
           </Modal.Content>
           <Modal.Actions>
-            <Button negative onClick={() => this.setState({ openAddTarget: false })}>Cancel</Button>
-            <Button positive labelPosition='right' icon='checkmark' content='Done' />
+            <Button onClick={() => this.setState({ openAddTarget: false })}>Cancel</Button>
+            <Button primary >Done</Button>
           </Modal.Actions>
         </Modal>
       </Container>;