diff --git a/src/environments-dialog.ui b/src/environments-dialog.ui
index c79abd5..42d5061 100644
--- a/src/environments-dialog.ui
+++ b/src/environments-dialog.ui
@@ -50,18 +50,6 @@
                           </object>
                         </child>
 
-                        <child>
-                          <object class="GtkButton" id="add_variable_button">
-                            <property name="label">Add Variable</property>
-                            <property name="icon-name">list-add-symbolic</property>
-                            <property name="tooltip-text">Add variable</property>
-                            <signal name="clicked" handler="on_add_variable_clicked"/>
-                            <style>
-                              <class name="flat"/>
-                            </style>
-                          </object>
-                        </child>
-
                         <child>
                           <object class="GtkButton" id="add_environment_button">
                             <property name="label">Add Environment</property>
@@ -89,6 +77,41 @@
                         </child>
                       </object>
                     </child>
+
+                    <!-- Add Variable Button at Bottom -->
+                    <child>
+                      <object class="GtkBox">
+                        <property name="orientation">horizontal</property>
+                        <property name="spacing">12</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-top">6</property>
+
+                        <child>
+                          <object class="GtkBox">
+                            <property name="orientation">horizontal</property>
+                            <property name="width-request">150</property>
+
+                            <child>
+                              <object class="GtkButton" id="add_variable_button">
+                                <property name="icon-name">list-add-symbolic</property>
+                                <property name="tooltip-text">Add variable</property>
+                                <signal name="clicked" handler="on_add_variable_clicked"/>
+                                <style>
+                                  <class name="flat"/>
+                                  <class name="circular"/>
+                                </style>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+
+                        <child>
+                          <object class="GtkBox">
+                            <property name="hexpand">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/src/widgets/environment-column-header.ui b/src/widgets/environment-column-header.ui
index 4fded58..cb7c52b 100644
--- a/src/widgets/environment-column-header.ui
+++ b/src/widgets/environment-column-header.ui
@@ -25,7 +25,7 @@
 
         <child>
           <object class="GtkButton" id="edit_button">
-            <property name="icon-name">document-edit-symbolic</property>
+            <property name="icon-name">edit-symbolic</property>
             <property name="tooltip-text">Edit environment</property>
             <signal name="clicked" handler="on_edit_clicked"/>
             <style>