diff --git a/frontend/app/framework/angular/forms/editable-title.component.html b/frontend/app/framework/angular/forms/editable-title.component.html
index b419d0204..a02e4562c 100644
--- a/frontend/app/framework/angular/forms/editable-title.component.html
+++ b/frontend/app/framework/angular/forms/editable-title.component.html
@@ -5,7 +5,7 @@
                 <div class="form-group mr-2">
                     <sqx-control-errors for="name"></sqx-control-errors>
                     
-                    <input type="text" class="form-control form-underlined" formControlName="name" [maxLength]="maxLength" sqxFocusOnInit (keydown)="onKeyDown($event)" spellcheck="false">
+                    <input type="text" class="form-control" formControlName="name" [maxLength]="maxLength" sqxFocusOnInit (keydown)="onKeyDown($event)" spellcheck="false">
                 </div>
             </div>
             <div class="col-auto">
diff --git a/frontend/app/framework/angular/forms/editable-title.component.scss b/frontend/app/framework/angular/forms/editable-title.component.scss
index 9fd482411..bc0b38e36 100644
--- a/frontend/app/framework/angular/forms/editable-title.component.scss
+++ b/frontend/app/framework/angular/forms/editable-title.component.scss
@@ -5,6 +5,7 @@
     }
 
     &-edit {
+        @include absolute(0, 0, null, null);
         color: $color-border-dark;
         cursor: pointer;
         padding: .6rem .25rem;
@@ -14,6 +15,7 @@
         display: inline;
         font-size: 1.2rem;
         font-weight: normal;
+        padding-right: 1.75rem;
     }
 
     &-view {
diff --git a/frontend/app/framework/angular/forms/editors/color-picker.component.scss b/frontend/app/framework/angular/forms/editors/color-picker.component.scss
index d967a078c..810bc9781 100644
--- a/frontend/app/framework/angular/forms/editors/color-picker.component.scss
+++ b/frontend/app/framework/angular/forms/editors/color-picker.component.scss
@@ -21,4 +21,6 @@
 .circle {
     @include circle(16px);
     border: 1px solid $color-border-dark;
+    margin: 0;
+    margin-bottom: .125rem;
 }
\ No newline at end of file
diff --git a/frontend/app/theme/_forms.scss b/frontend/app/theme/_forms.scss
index 150aef091..f1f19545f 100644
--- a/frontend/app/theme/_forms.scss
+++ b/frontend/app/theme/_forms.scss
@@ -282,54 +282,4 @@ $select-indicator: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/sv
     &.custom-select {
         background: $color-dark2-control escape-svg($select-indicator) no-repeat right .75rem center / 8px 10px;
     }
-}
-
-input {
-    &.form-empty {
-        border: 0;
-    }
-
-    &.form-underlined {
-        & {
-            border: 0;
-            border-bottom: 1px solid $color-input;
-            border-radius: 0;
-        }
-
-        &:focus,
-        &.focus {
-            background: transparent;
-            border-bottom-color: $color-theme-blue;
-            box-shadow: none;
-            outline: none;
-        }
-
-        &:disabled {
-            background: none;
-        }
-
-        &[readonly] {
-            background: none;
-        }
-
-        &.ng-invalid {
-            &.ng-touched,
-            &.ng-dirty {
-                & {
-                    background: transparent;
-                    border-bottom-color: $color-theme-error;
-                    border-color: transparent;
-                    box-shadow: none;
-                    outline: none;
-                }
-
-                &:hover,
-                &:focus {
-                    border-bottom-color: $color-theme-error-dark;
-                    border-color: transparent;
-                    box-shadow: none;
-                }
-            }
-        }
-    }
 }
\ No newline at end of file