diff --git a/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
index effeb870a..92fa780a4 100644
--- a/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
+++ b/snappymail/v/0.0.0/themes/NextcloudV25+/styles.css
@@ -593,23 +593,32 @@
 
 /* #endregion */
 
-/* #region input */
-
-#rl-app input {
-    box-shadow: none;
-}
+/* #region input & select */
 
+#rl-app select,
+#rl-app .select,
+#rl-app .emailaddresses,
 #rl-app input:not([type="checkbox"]) {
     padding: 0 12px;
     font-size: var(--nc-default-font-size);
     color: var(--nc-color-main-text);
     background-color: unset;
     height: 36px;
-    outline: none;
     border: 2px solid var(--nc-color-border-dark);
     border-radius: var(--nc-border-radius-large);
+    line-height: 32px;
+    outline: none;
 }
 
+#rl-app select:hover,
+#rl-app select:active,
+#rl-app select:focus,
+#rl-app .select:hover,
+#rl-app .select:active,
+#rl-app .select:focus,
+#rl-app .emailaddresses:hover,
+#rl-app .emailaddresses:active,
+#rl-app .emailaddresses:focus,
 #rl-app input:hover,
 #rl-app input:active,
 #rl-app input:focus,
@@ -619,6 +628,14 @@
     border-color: var(--nc-color-primary-element);
 }
 
+/* #endregion */
+
+/* #region input */
+
+#rl-app input {
+    box-shadow: none;
+}
+
 #rl-app input[type="search"]::-webkit-search-decoration,
 #rl-app input[type="search"]::-webkit-search-cancel-button,
 #rl-app input[type="search"]::-webkit-search-results-button,
@@ -723,33 +740,6 @@ input[type="checkbox"] {
 
 /* #region select */
 
-#rl-app select,
-#rl-app .select,
-#rl-app .emailaddresses {
-    padding: 8px 12px;
-    font-size: var(--nc-default-font-size);
-    color: var(--nc-color-main-text);
-    background-color: unset;
-    height: 44px;
-    outline: none;
-    border: 2px solid var(--nc-color-border-dark);
-    border-radius: var(--nc-border-radius-large);
-    line-height: 24px;
-    box-sizing: border-box;
-}
-
-#rl-app select:hover,
-#rl-app select:active,
-#rl-app select:focus,
-#rl-app .select:hover,
-#rl-app .select:active,
-#rl-app .select:focus,
-#rl-app .emailaddresses:hover,
-#rl-app .emailaddresses:active,
-#rl-app .emailaddresses:focus {
-    border-color: var(--nc-color-primary-element);
-}
-
 #rl-app select option {
     background-color: var(--nc-color-background-dark);
     color: var(--nc-color-main-text);
@@ -760,6 +750,9 @@ input[type="checkbox"] {
 /* #region select email address */
 
 #rl-app .emailaddresses {
+    padding: 8px 12px;
+    height: 44px;
+    line-height: 24px;
     display: inline-flex;
     align-items: center;
     flex-wrap: wrap;
@@ -1931,12 +1924,6 @@ html.sm-msgView-bottom #rl-app .messageView {
     border: none;
 }
 
-#rl-app #V-PopupsDomain .domain-form .tab-content input,
-#rl-app #V-PopupsDomain .domain-form .tab-content select {
-    height: 44px;
-    padding: 8px 12px;
-}
-
 #rl-app #V-PopupsLanguages label {
     background-color: var(--nc-color-background-dark) !important;
     border-color: var(--nc-color-border);