diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js
index d6ef4c5..1d84c6b 100644
--- a/smart-hut/src/components/HeaderController.js
+++ b/smart-hut/src/components/HeaderController.js
@@ -57,7 +57,9 @@ export class MyHeader extends React.Component {
                   {this.props.username}
                 </Label>
                 <Divider />
-                <Button onClick={this.logout}>Logout</Button>
+                <Button basic inverted onClick={this.logout}>
+                  Logout
+                </Button>
               </Grid.Column>
             </Grid.Row>
           </Grid>
diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 037118a..846e8f0 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -4,7 +4,15 @@ import { connect } from "react-redux";
 import { RemoteService } from "../../../remote";
 
 const DeleteModal = (props) => (
-  <Modal trigger={<Button color="red">Remove</Button>} closeIcon>
+  <Modal
+    trigger={
+      <Button icon labelPosition="left" inverted color="red">
+        <Icon name="trash alternate" />
+        Delete device
+      </Button>
+    }
+    closeIcon
+  >
     <Header icon="archive" content="Are you sure ?" />
     <Modal.Actions>
       <Button color="red">
@@ -44,10 +52,11 @@ const SettingsForm = (props) => {
       </Form.Field>
       <Button
         onClick={() => props.saveFunction(values)}
-        color="blue"
+        color="green"
         type="submit"
       >
-        Save
+        <Icon name="checkmark" />
+        Save changes
       </Button>
     </Form>
   );