Fix merge conflicts from uat-next

1 files changed, 22 insertions, 3 deletions

diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index 5837a80bb..119d5c479 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -56,11 +56,17 @@
 }
 
 .new-account-import-form {
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+  padding: 0 30px;
+
   &__select-section {
     display: flex;
-    justify-content: space-evenly;
+    justify-content: space-between;
     align-items: center;
     margin-top: 29px;
+    width: 100%;
   }
 
   &__select-label {
@@ -92,19 +98,25 @@
     }
   }
 
+  &__private-key-password-container {
+    display: flex;
+    flex-flow: column;
+    align-items: center;
+    width: 100%;
+  }
+
   &__instruction {
     color: $scorpion;
     font-family: Roboto;
     font-size: 16px;
     line-height: 21px;
     align-self: flex-start;
-    margin-left: 30px;
   }
 
   &__private-key {
     display: flex;
     flex-flow: column;
-    align-items: center;
+    align-items: flex-start;
     margin-top: 34px;
   }
 
@@ -127,6 +139,13 @@
     align-items: center;
     margin-top: 29px;
   }
+
+  &__buttons {
+    margin-top: 39px;
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+  }
 }
 
 .new-account-create-form {