diff --git a/admin/templates/states_panel.html b/admin/templates/states_panel.html
index 503b3fa..540cc42 100644
--- a/admin/templates/states_panel.html
+++ b/admin/templates/states_panel.html
@@ -1,17 +1,20 @@
 {% extends "base.html" %}
 {% load i18n django_bootstrap5 %}
 
+{% block actions %}
+    <button type="button" class="btn btn-green-admin" data-bs-toggle="modal" data-bs-target="#addStateModal">
+      <i class="bi bi-plus"></i>
+      {% trans "New State" %}
+    </button>
+{% endblock %}
+
 {% block content %}
 <div class="row">
   <div class="col">
     <h3>{{ subtitle }}</h3>
   </div>
-  <div class="col text-end">
-    <button type="button" class="btn btn-green-admin" data-bs-toggle="modal" data-bs-target="#addStateModal">
-      {% trans "Add" %}
-    </button>
-  </div>
 </div>
+
 <div class="row mt-4">
   <div class="col">
     {% if state_definitions %}
diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 131a300..6e99277 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -220,7 +220,7 @@
             </div>
           </div>
 
-          <div class="d-flex flex-wrap gap-2 justify-content-end">
+          <div class="d-flex flex-wrap gap-2 justify-content-end p-2 mb-2">
           {% block actions %}
           {% endblock %}
           </div>
diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html
index 5477693..6868bb4 100644
--- a/dashboard/templates/unassigned_devices.html
+++ b/dashboard/templates/unassigned_devices.html
@@ -93,8 +93,9 @@
       <button id="remove-button" class="btn btn-danger me-2" type="submit" value="{% url 'lot:del_devices' %}" name="url" disabled>
         <i class="bi bi-trash"></i> {% trans 'Remove' %}
       </button>
-      <button class="btn btn-success" type="submit" name="url" value="{% url 'lot:add_devices' %}">
-        {% trans 'Add' %}
+      <button class="btn btn-green-user" type="submit" name="url" value="{% url 'lot:add_devices' %}">
+        <i class="bi bi-folder-plus ps-2"></i>
+        {% trans 'Assign to lot' %}
       </button>
     </div>
   </form>
diff --git a/lot/templates/lots.html b/lot/templates/lots.html
index 23c3d83..c48ef25 100644
--- a/lot/templates/lots.html
+++ b/lot/templates/lots.html
@@ -5,14 +5,12 @@
     {% if show_closed %}
       <a href="?show_closed=false" class="btn btn-green-admin">
         {% trans 'Hide closed lots' %}
-
-      <i class="ps-2 bi bi-x-octagon-fill"></i>
+        <i class="bi bi-archive-fill"></i>
       </a>
     {% else %}
       <a href="?show_closed=true" class="btn btn-green-admin">
         {% trans 'Show closed lots' %}
-
-      <i class="ps-2 bi bi-x-octagon"></i>
+        <i class="bi bi-archive"></i>
       </a>
     {% endif %}