diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less
index ff90eaed2..5f9eb01a6 100644
--- a/src/routes/Addons/styles.less
+++ b/src/routes/Addons/styles.less
@@ -27,7 +27,7 @@
             display: flex;
             flex-direction: row;
             justify-content: space-between;
-            padding: 1.5rem 3rem;
+            padding: 1.5rem;
             overflow: visible;
 
             .add-button-container {
@@ -141,7 +141,7 @@
         .addons-list-container {
             flex: 1;
             align-self: stretch;
-            padding: 0 3rem;
+            padding: 0 1.5rem;
             overflow-y: auto;
 
             .addon {
diff --git a/src/routes/Discover/styles.less b/src/routes/Discover/styles.less
index 59efec4f9..04f60eed3 100644
--- a/src/routes/Discover/styles.less
+++ b/src/routes/Discover/styles.less
@@ -40,7 +40,7 @@
                 flex-grow: 0;
                 flex-shrink: 1;
                 flex-basis: 15rem;
-                height: 3rem;
+                height: 3.5rem;
                 margin-right: 1.5rem;
 
                 &:nth-child(n+4) {
@@ -62,8 +62,8 @@
                 display: none;
                 align-items: center;
                 justify-content: center;
-                width: 3rem;
-                height: 3rem;
+                width: 3.5rem;
+                height: 3.5rem;
                 background-color: @color-background;
 
                 &:not(:nth-last-child(2)) {
@@ -72,8 +72,8 @@
 
                 .filter-icon {
                     flex: none;
-                    width: 1.2rem;
-                    height: 1.2rem;
+                    width: 1.4rem;
+                    height: 1.4rem;
                     fill: @color-secondaryvariant1;
                 }
             }
@@ -84,11 +84,11 @@
 
             .pagination-input-container {
                 flex: none;
-                height: 3rem;
+                height: 3.5rem;
 
                 .pagination-prev-button-container, .pagination-next-button-container {
-                    width: 3rem;
-                    height: 3rem;
+                    width: 3.5rem;
+                    height: 3.5rem;
 
                     .pagination-button-icon {
                         width: 1rem;
@@ -267,10 +267,9 @@
                 "catalog-content-area";
 
             .catalog-content-container {
-                margin-right: 0;
-
                 .meta-items-container {
                     grid-template-columns: repeat(5, 1fr);
+                    margin-right: 0;
                 }
             }
 
diff --git a/src/routes/Intro/PasswordResetModal/styles.less b/src/routes/Intro/PasswordResetModal/styles.less
index 78d0cd8da..78c5448f0 100644
--- a/src/routes/Intro/PasswordResetModal/styles.less
+++ b/src/routes/Intro/PasswordResetModal/styles.less
@@ -1,24 +1,51 @@
 @import (reference) '~stremio-colors/dist/less/stremio-colors.less';
 
+:import('~stremio/common/ModalDialog/styles.less') {
+    password-reset-modal-content: modal-dialog-content;
+    cancel-button-label: label;
+}
+
 .password-reset-modal-container {
-    .credentials-text-input {
-        width: 25rem;
-        padding: 1rem;
-        border: thin solid @color-surface-dark1-90;
+    .password-reset-modal-content {
+        width: 30rem;
+
+        .credentials-text-input {
+            width: 100%;
+            padding: 1rem;
+            color: @color-surface-dark5;
+            outline: var(--focus-outline-size) solid @color-surface-light2;
+            outline-offset: calc(-1 * var(--focus-outline-size));
+
+            &:hover {
+                outline-color: @color-surface-light4;
+            }
+
+            &:focus {
+                outline-color: @color-background-dark5;
+            }
+        }
     }
 
     .error-message {
         font-size: 1.1rem;
         margin-top: 2rem;
         text-align: center;
-        color: @color-accent2-90;
+        color: @color-accent5-90;
     }
 
     .cancel-button {
-        background-color: @color-surface-dark1;
+        background-color: transparent;
 
         &:hover {
-            background-color: @color-surface;
+            background-color: @color-surface-light3;
+        }
+
+        &:focus {
+            outline-color: @color-background-dark5;
+        }
+
+        .cancel-button-label {
+            color: @color-surface-dark2;
         }
     }
 }
\ No newline at end of file
diff --git a/src/routes/Library/styles.less b/src/routes/Library/styles.less
index da03d59ef..1bdd1978a 100644
--- a/src/routes/Library/styles.less
+++ b/src/routes/Library/styles.less
@@ -28,7 +28,7 @@
                 flex-grow: 0;
                 flex-shrink: 1;
                 flex-basis: 15rem;
-                height: 3rem;
+                height: 3.5rem;
 
                 &:not(:last-child) {
                     margin-right: 1.5rem;