diff --git a/core/src/main/resources/jenkins/mvn/GlobalMavenConfig/config.groovy b/core/src/main/resources/jenkins/mvn/GlobalMavenConfig/config.groovy
index 53a41b6b1922..7d1ff84aa72f 100644
--- a/core/src/main/resources/jenkins/mvn/GlobalMavenConfig/config.groovy
+++ b/core/src/main/resources/jenkins/mvn/GlobalMavenConfig/config.groovy
@@ -3,10 +3,6 @@ package jenkins.mvn.GlobalMavenConfig
 def f = namespace(lib.FormTagLib)
 
 f.section(title:_("Maven Configuration")) {
-    div(class: "jenkins-form-item") {
-        f.dropdownDescriptorSelector(title:_("Default settings provider"), field:"settingsProvider")
-    }
-    div(class: "jenkins-form-item") {
-        f.dropdownDescriptorSelector(title:_("Default global settings provider"), field:"globalSettingsProvider")
-    }
+  f.dropdownDescriptorSelector(title:_("Default settings provider"), field:"settingsProvider")
+  f.dropdownDescriptorSelector(title:_("Default global settings provider"), field:"globalSettingsProvider")
 }
diff --git a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
index 0ad0f39ffa4b..db0b5b9f276b 100644
--- a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
+++ b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
@@ -31,7 +31,7 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName) {
             Functions.getSortedDescriptorsForGlobalConfigByDescriptor(my.FILTER).each { Descriptor descriptor ->
                 set("descriptor",descriptor)
                 set("instance",descriptor)
-                f.rowSet(name:descriptor.jsonSafeClassName) {
+                f.rowSet(name:descriptor.jsonSafeClassName, isFormItem: "false") {
                     st.include(from:descriptor, page:descriptor.globalConfigPage)
                 }
             }
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index 7a75da4a21d7..a9761fb937ef 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -919,15 +919,16 @@ table.parameters > tbody:hover {
 
 /* ========================= editable combobox style ========================= */
 .comboBoxList {
-  border: 1px solid #000;
   overflow: visible;
-  background-color: white;
-  color: black;
+  background-color: var(--background);
+  color: var(--text-color);
+  border-radius: var(--form-input-border-radius);
+  box-shadow: 0 10px 20px rgba(black, 0.1);
 }
 
 .comboBoxSelectedItem {
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: var(--primary);
+  color: var(--text-color);
 }
 
 .combobox-values {