diff --git a/public/assets/css/designsystem_input.css b/public/assets/css/designsystem_input.css
index 2ec95bf2c..3b68e9eeb 100644
--- a/public/assets/css/designsystem_input.css
+++ b/public/assets/css/designsystem_input.css
@@ -16,8 +16,8 @@
   border-bottom: 2px solid rgba(70, 99, 114, 0.1);
   transition: border-color 0.2s ease-out;
 }
-.component_input:focus, .component_select:focus {
-    border-color: var(--emphasis-primary);
+.component_input:focus, .component_select:focus, .component_input:focus ~ component-icon img {
+    border-color: var(--emphasis-primary)!important;
 }
 
 input.component_input[readonly], textarea.component_textarea[readonly] {
diff --git a/public/assets/pages/connectpage/ctrl_form.css b/public/assets/pages/connectpage/ctrl_form.css
index d9f9b1ca7..d09197ff8 100644
--- a/public/assets/pages/connectpage/ctrl_form.css
+++ b/public/assets/pages/connectpage/ctrl_form.css
@@ -4,9 +4,6 @@
     box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
     background: white;
 }
-.component_page_connection_form .formbuilder:not(:empty) {
-    margin: 5px 0 10px 0;
-}
 .component_page_connection_form div.buttons {
     display: flex;
     margin: 0px 0px 15px 0px;
@@ -27,15 +24,6 @@
     transition: box-shadow 0.2s;
     box-shadow: 0px 2px 20px rgba(0, 0, 0, 0.2);
 }
-.component_page_connection_form .formBody form .formbuilder {
-    animation-name: PageConnectionFormBody;
-    opacity: 0;
-    animation-duration: 0.25s;
-    animation-fill-mode: forwards;
-}
-.component_page_connection_form form {
-    padding-top: 5px;
-}
 .component_page_connection_form form label {
     font-style: italic;
     font-size: 0.9em;
@@ -49,11 +37,13 @@
 .component_page_connection_form form .advanced_form {
     max-height: 156px;
     margin-top: 5px;
+    margin-bottom: 5px;
     padding-right: 10px;
 }
 .component_page_connection_form form button.emphasis {
     color: white;
     text-transform: uppercase;
+    margin-top: 5px;
 }
 
 .component_page_connection_form form .third-party {