3 files changed, 20 insertions, 5 deletions
diff --git a/ui/app/components/app/app-header/index.scss b/ui/app/components/app/app-header/index.scss
index 325844af5..d46b16f25 100644
--- a/ui/app/components/app/app-header/index.scss
+++ b/ui/app/components/app/app-header/index.scss
@@ -48,7 +48,6 @@
 
   &__contents {
     display: flex;
-    justify-content: space-between;
     flex-flow: row nowrap;
     width: 100%;
 
@@ -74,17 +73,33 @@
     flex-direction: row;
     align-items: center;
     cursor: pointer;
+    flex: 0 0 auto;
   }
 
   &__account-menu-container {
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
+    flex: 1 1 auto;
+    width: 0;
+    flex-flow: row nowrap;
+    justify-content: flex-end;
   }
 
   &__network-component-wrapper {
     display: flex;
     flex-direction: row;
     align-items: center;
+    flex: 1 0 auto;
+    width: 0;
+    justify-content: flex-end;
+
+    .network-component.pointer {
+      max-width: 200px;
+    }
+
+    .network-indicator {
+      width: 100%;
+    }
   }
 }
diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js
index 783fb36df..9ee0a1e17 100644
--- a/ui/app/components/app/network.js
+++ b/ui/app/components/app/network.js
@@ -41,9 +41,6 @@ Network.prototype.render = function () {
   } else if (providerName === 'ropsten') {
     hoverText = context.t('ropsten')
     iconName = 'ropsten-test-network'
-  } else if (parseInt(networkNumber) === 3) {
-    hoverText = context.t('ropsten')
-    iconName = 'ropsten-test-network'
   } else if (providerName === 'kovan') {
     hoverText = context.t('kovan')
     iconName = 'kovan-test-network'
@@ -63,7 +60,7 @@ Network.prototype.render = function () {
       className: classnames({
         'network-component--disabled': this.props.disabled,
         'ethereum-network': providerName === 'mainnet',
-        'ropsten-test-network': providerName === 'ropsten' || parseInt(networkNumber) === 3,
+        'ropsten-test-network': providerName === 'ropsten',
         'kovan-test-network': providerName === 'kovan',
         'rinkeby-test-network': providerName === 'rinkeby',
         'goerli-test-network': providerName === 'goerli',
diff --git a/ui/app/components/ui/button/buttons.scss b/ui/app/components/ui/button/buttons.scss
index 0fc87415b..f1366cffe 100644
--- a/ui/app/components/ui/button/buttons.scss
+++ b/ui/app/components/ui/button/buttons.scss
@@ -70,6 +70,7 @@ $hover-orange: #FFD3B5;
 .btn-secondary {
   color: $Blue-500;
   border: 2px solid $hover-secondary;
+  background-color: $white;
 
   &:hover {
     border-color: $Blue-500;
@@ -90,6 +91,7 @@ $hover-orange: #FFD3B5;
 .btn-warning {
   color: $Orange-500;
   border: 2px solid $hover-orange;
+  background-color: $white;
 
   &:hover {
     border-color: $Orange-500;
@@ -110,6 +112,7 @@ $hover-orange: #FFD3B5;
 .btn-danger {
   color: $Red-500;
   border: 2px solid $hover-red;
+  background-color: $white;
 
   &:hover {
     border-color: $Red-500;