diff --git a/apps/browser/src/popup/scss/box.scss b/apps/browser/src/popup/scss/box.scss
index 6e0b6f9356a..3a4dfd5620d 100644
--- a/apps/browser/src/popup/scss/box.scss
+++ b/apps/browser/src/popup/scss/box.scss
@@ -3,7 +3,7 @@
 .box {
   position: relative;
   width: 100%;
-  margin: 10px 0;
+  margin: 10px 0 20px;
 
   &.first {
     margin-top: 0;
@@ -36,7 +36,7 @@
     &:focus-visible,
     &.active {
       @include themify($themes) {
-        background-color: themed("boxBackgroundHoverColor");
+        background-color: themed("backgroundColor");
       }
     }
 
@@ -52,11 +52,11 @@
   }
 
   .box-content {
-    border-top: 1px solid #000000;
-    border-bottom: 1px solid #000000;
+    // border-top: 1px solid #000000;
+    // border-bottom: 1px solid #000000;
 
     @include themify($themes) {
-      background-color: themed("boxBackgroundColor");
+      background-color: themed("backgroundColor");
       border-color: themed("borderColor");
     }
 
@@ -91,11 +91,15 @@
   &.list {
     .box-content {
       .box-content-row {
-        padding: 3px 10px;
+        padding: 10px;
         text-decoration: none;
+        border-radius: 6px;
+        margin: 10px;
+        background-color: $background-color;
 
         @include themify($themes) {
           color: themed("textColor");
+          background-color: themed("boxBackgroundColor");
         }
 
         &.padded {
@@ -150,6 +154,8 @@
           display: flex;
           padding-top: 10px;
           padding-bottom: 10px;
+          margin: 10px;
+          border-radius: 6px;
         }
       }
     }
@@ -191,21 +197,28 @@
   padding: 10px 15px;
   position: relative;
   z-index: 1;
+  background-color: $background-color;
+  border-radius: 6px;
+  margin: 10px;
 
-  &:before {
-    content: "";
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    height: 1px;
-    width: calc(100% - 10px);
-    border-bottom: 1px solid #000000;
-
-    @include themify($themes) {
-      border-bottom-color: themed("boxBorderColor");
-    }
+  @include themify($themes) {
+    background-color: themed("boxBackgroundColor");
   }
 
+  // &:before {
+  //   content: "";
+  //   position: absolute;
+  //   right: 0;
+  //   bottom: 0;
+  //   height: 1px;
+  //   width: calc(100% - 10px);
+  //   border-bottom: 1px solid #000000;
+
+  //   @include themify($themes) {
+  //     border-bottom-color: themed("boxBorderColor");
+  //   }
+  // }
+
   &:last-child {
     &:before {
       border: none;
@@ -449,9 +462,11 @@
   select {
     width: 100%;
     border: 1px solid #000000;
-    border-radius: $border-radius;
+    border-radius: 6px;
+    padding: 7px 4px;
 
     @include themify($themes) {
+      background-color: themed("boxBorderColor");
       border-color: themed("inputBorderColor");
     }
   }
diff --git a/apps/browser/src/popup/scss/buttons.scss b/apps/browser/src/popup/scss/buttons.scss
index c1b30ae5980..40d9dc4efff 100644
--- a/apps/browser/src/popup/scss/buttons.scss
+++ b/apps/browser/src/popup/scss/buttons.scss
@@ -89,8 +89,14 @@
 
 button.box-content-row {
   display: block;
-  width: 100%;
+  // width: 100%;
+  width: calc(100% - 20px);
   text-align: left;
+
+  @include themify($themes) {
+    background-color: themed("boxBackgroundColor");
+    border-color: none;
+  }
 }
 
 button {
diff --git a/apps/browser/src/popup/scss/pages.scss b/apps/browser/src/popup/scss/pages.scss
index 9ff96f048b3..4d0d5d1eef2 100644
--- a/apps/browser/src/popup/scss/pages.scss
+++ b/apps/browser/src/popup/scss/pages.scss
@@ -9,10 +9,17 @@ app-sync {
 }
 
 app-generator .generated-block {
-  font-size: $font-size-large;
+  font-size: $font-size-xlarge;
   font-family: $font-family-monospace;
-  margin: 20px;
+  margin: 10px;
+  padding: 10px;
   display: flex;
+  background-color: $box-background-color;
+  border-radius: 6px;
+
+  @include themify($themes) {
+    background-color: themed("boxBackgroundColor");
+  }
 
   .generated-wrapper {
     text-align: left;
@@ -20,15 +27,28 @@ app-generator .generated-block {
     min-width: 0;
     white-space: pre-wrap;
     word-break: break-all;
+    padding: 15px 30px;
+    border-radius: 6px;
+    background-color: #e6e9ed;
+    border: 1px solid;
+    border-color: #d2d9e6;
+
+    @include themify($themes) {
+      background-color: themed("backgroundColor");
+      border-color: themed("boxBorderColor");
+    }
   }
 
   .action-buttons {
     display: flex;
+    flex-direction: column;
     align-self: center;
+    height: 100%;
+    margin-left: 10px;
 
     button {
       padding: 5px;
-      margin: -5px -5px 5px 5px;
+      margin: 0;
     }
   }
 }
diff --git a/apps/browser/src/popup/scss/variables.scss b/apps/browser/src/popup/scss/variables.scss
index 049954bc335..027fb38f3ed 100644
--- a/apps/browser/src/popup/scss/variables.scss
+++ b/apps/browser/src/popup/scss/variables.scss
@@ -6,6 +6,8 @@ $font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-s
 $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-size-base: 14px;
 $font-size-large: 18px;
+$font-size-xlarge: 22px;
+$font-size-xxlarge: 28px;
 $font-size-small: 12px;
 $text-color: #000000;
 $border-color: #f0f0f0;
diff --git a/apps/desktop/src/scss/box.scss b/apps/desktop/src/scss/box.scss
index 64cbf370abf..5616922efca 100644
--- a/apps/desktop/src/scss/box.scss
+++ b/apps/desktop/src/scss/box.scss
@@ -120,19 +120,19 @@
   z-index: 1;
   text-align: left;
 
-  &:before {
-    content: "";
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    height: 1px;
-    width: calc(100% - 10px);
-    border-bottom: 1px solid #000000;
+  // &:before {
+  //   content: "";
+  //   position: absolute;
+  //   right: 0;
+  //   bottom: 0;
+  //   height: 1px;
+  //   width: calc(100% - 10px);
+  //   border-bottom: 1px solid #000000;
 
-    @include themify($themes) {
-      border-bottom-color: themed("boxBorderColor");
-    }
-  }
+  //   @include themify($themes) {
+  //     border-bottom-color: themed("boxBorderColor");
+  //   }
+  // }
 
   &:first-child,
   &:last-child {