diff --git a/styles/elements/_icon_link.scss b/styles/elements/_icon_link.scss
index 00daae3f..d9db1bd3 100644
--- a/styles/elements/_icon_link.scss
+++ b/styles/elements/_icon_link.scss
@@ -22,6 +22,7 @@
   background: none;
   transition: background-color $hover-transition-time;
   border-radius: $gap / 2;
+  cursor: pointer;
 
   .icon {
     @include icon-color($color-primary);
diff --git a/styles/elements/_panels.scss b/styles/elements/_panels.scss
index 303351fe..61b0acd6 100644
--- a/styles/elements/_panels.scss
+++ b/styles/elements/_panels.scss
@@ -69,6 +69,11 @@
 
     h1, h2, h3, h4, h5, h6 {
       margin: 0;
+      display: inline-block;
+    }
+
+    .icon-tooltip {
+      margin-left: $gap*2;
     }
   }
 }
diff --git a/templates/project_edit.html.to b/templates/project_edit.html.to
index 93768977..58c18bed 100644
--- a/templates/project_edit.html.to
+++ b/templates/project_edit.html.to
@@ -88,7 +88,7 @@
     <footer class='block-list__footer'>
       <a href='/' class='icon-link'>
         {% module Icon('plus') %}
-        <span>Add another environment</span>
+        <span class="icon-link">Add another environment</span>
       </a>
     </footer>
   </section>
diff --git a/templates/workspace_project_new.html b/templates/workspace_project_new.html
index 98242bed..68a5805f 100644
--- a/templates/workspace_project_new.html
+++ b/templates/workspace_project_new.html
@@ -39,13 +39,13 @@
           <li v-for="(_, i) in environments" class="block-list__item project-list-item__environment">
             <span class="project-list-item__environment">
               {{ TextInput(form.environment_name) }}
-              <span v-on:click="removeEnvironment(i)">{{ Icon('x') }}</span>
             </span>
+            <span v-on:click="removeEnvironment(i)">{{ Icon('x') }} Remove</span>
           </li>
         </ul>
 
         <div class="block-list__footer">
-          <a v-on:click="addEnvironment">Add another environment</a>
+          <a v-on:click="addEnvironment" class="icon-link">Add another environment</a>
         </div>
       </div>