diff --git a/lib/gui/app/components/image-selector/image-selector.jsx b/lib/gui/app/components/image-selector/image-selector.jsx
index c91d5e34..c8cfedb1 100644
--- a/lib/gui/app/components/image-selector/image-selector.jsx
+++ b/lib/gui/app/components/image-selector/image-selector.jsx
@@ -65,7 +65,6 @@ const SelectImageButton = (props) => {
     <Provider>
       <StepSelection>
         <StepButton
-          primary
           onClick={props.openImageSelector}
         >
           Select image
diff --git a/lib/gui/app/components/progress-button/progress-button.jsx b/lib/gui/app/components/progress-button/progress-button.jsx
index 49bf4d23..2eab3e3b 100644
--- a/lib/gui/app/components/progress-button/progress-button.jsx
+++ b/lib/gui/app/components/progress-button/progress-button.jsx
@@ -138,7 +138,6 @@ class ProgressButton extends React.Component {
       <Provider>
         <StepSelection>
           <StepButton
-            primary
             onClick= { this.props.callback }
             disabled= { this.props.disabled }
           >
diff --git a/lib/gui/app/pages/main/styles/_main.scss b/lib/gui/app/pages/main/styles/_main.scss
index f45cf1e4..795443b1 100644
--- a/lib/gui/app/pages/main/styles/_main.scss
+++ b/lib/gui/app/pages/main/styles/_main.scss
@@ -46,12 +46,6 @@ svg-icon > img[disabled] {
   position: relative;
 }
 
-.page-main .button-brick {
-  width: 200px;
-  height: 48px;
-  font-size: 16px;
-}
-
 .page-main .button-abort-write {
   width: 20px;
   height: 20px;
@@ -67,6 +61,7 @@ svg-icon > img[disabled] {
   width: 200px;
   height: 48px;
   font-size: 16px;
+  font-weight: 300;
 }
 
 %step-border {
diff --git a/lib/gui/app/styled-components.js b/lib/gui/app/styled-components.js
index 0560bf2f..04e2e758 100644
--- a/lib/gui/app/styled-components.js
+++ b/lib/gui/app/styled-components.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 resin.io
+ * Copyright 2018 resin.io
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,31 +16,50 @@
 
 'use strict'
 
+// eslint-disable-next-line no-unused-vars
+const React = require('react')
 const { default: styled } = require('styled-components')
 const { colors } = require('./theme')
 const {
-  Button, Txt, Flex
+  Button, Txt, Flex, Provider
 } = require('rendition')
 
-exports.StepButton = styled(Button) `
-  width: 200px;
-  height: 48px;
-  font-size: 16px;
-  margin: auto;
-  overflow: hidden;
-  border: none;
-  border-radius: 2px;
+const theme = {
+  button: {
+    border: {
+      width: '0',
+      radius: '2px'
+    },
+    disabled: {
+      opacity: 1
+    },
+    extend: (props) => `
+      width: 200px;
+      min-height: 48px;
+      font-size: 16px;
 
-  &:disabled {
-    background-color: ${colors.dark.disabled.background};
-    color: ${colors.dark.disabled.foreground};
-    opacity: 1;
-    &:hover {
-      background-color: ${colors.dark.disabled.background};
-      color: ${colors.dark.disabled.foreground};
-    }
+      &:disabled {
+        background-color: ${colors.dark.disabled.background};
+        color: ${colors.dark.disabled.foreground};
+        opacity: 1;
+
+        &:hover {
+          background-color: ${colors.dark.disabled.background};
+          color: ${colors.dark.disabled.foreground};
+        }
+      }
+    `
   }
-`
+}
+
+exports.StepButton = (props) => {
+  return (
+    <Provider theme={theme}>
+      <Button primary {...props}>
+      </Button>
+    </Provider>
+  )
+}
 
 exports.ChangeButton = styled(Button) `
   color: ${colors.primary.background};
diff --git a/lib/gui/app/theme.js b/lib/gui/app/theme.js
index 206dcf51..ed4d4791 100644
--- a/lib/gui/app/theme.js
+++ b/lib/gui/app/theme.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 resin.io
+ * Copyright 2018 resin.io
  *
  * Licensed under the Apache License, Version 2.0 (the "License"),
  * you may not use this file except in compliance with the License.
diff --git a/lib/gui/css/main.css b/lib/gui/css/main.css
index 458784db..28512d65 100644
--- a/lib/gui/css/main.css
+++ b/lib/gui/css/main.css
@@ -6388,11 +6388,6 @@ svg-icon > img[disabled] {
 .page-main .relative {
   position: relative; }
 
-.page-main .button-brick {
-  width: 200px;
-  height: 48px;
-  font-size: 16px; }
-
 .page-main .button-abort-write {
   width: 20px;
   height: 20px;
@@ -6406,7 +6401,8 @@ svg-icon > img[disabled] {
 .button-brick {
   width: 200px;
   height: 48px;
-  font-size: 16px; }
+  font-size: 16px;
+  font-weight: 300; }
 
 .page-main .step-border-left, .page-main .step-border-right {
   height: 2px;