Fix change template form

app/assets/stylesheets/bootstrap_migration.scss

@@ -161,6 +161,10 @@ table {
   }
 }
 
+.input-group-prepend svg.active {
+  border: 0 !important;
+}
+
 // Polyfill deprecated selectors
 
 .hidden {

app/assets/stylesheets/pages/projects.scss

@@ -514,12 +514,6 @@
     }
   }
 
-  svg {
-    position: absolute;
-    left: $gl-padding;
-    top: $gl-padding;
-  }
-
   .project-fields-form {
     display: none;
 
@@ -530,25 +524,18 @@
   }
 
   .template-input-group {
-    position: relative;
-
-    @include media-breakpoint-up(sm) {
-      display: flex;
-    }
-
-    .input-group-prepend,
-    .input-group-append {
+    .input-group-prepend {
       flex: 1;
-      text-align: left;
-      padding-left: ($gl-padding * 3);
-      background-color: $white-light;
     }
 
-    .selected-template {
-      line-height: 20px;
+    .input-group-text {
+      width: 100%;
+      background-color: $white-light;
     }
 
     .selected-icon {
+      padding-right: $gl-padding;
+
       svg {
         display: none;
         top: 7px;

app/views/projects/_project_templates.html.haml

@@ -21,6 +21,7 @@
                 - Gitlab::ProjectTemplate.all.each do |template|
                   = custom_icon(template.logo)
               .selected-template
-          %button.btn.btn-default.change-template{ type: "button" } Change template
+          .input-group-append
+            %button.btn.btn-default.change-template{ type: "button" } Change template
 
     = render 'new_project_fields', f: f, project_name_id: "template-project-name"