diff --git a/app/devices/views.py b/app/devices/views.py
index 24ddebe..984d0e5 100644
--- a/app/devices/views.py
+++ b/app/devices/views.py
@@ -88,6 +88,14 @@ def get_context_data(self, **kwargs):
             4: 'bg-dark',        # CRITICAL
         }
 
+        context['level_map'] = {
+            0: 'debug',
+            1: 'info',
+            2: 'warning',
+            3: 'error',
+            4: 'critical',
+        }
+
         sensors = defaultdict(list)
         # add available sensors
         for measurement in Measurement.objects.filter(device=device, time_measured=device.last_update).all():
diff --git a/app/templates/campaigns/detail.html b/app/templates/campaigns/detail.html
index 10effc9..eb3a198 100644
--- a/app/templates/campaigns/detail.html
+++ b/app/templates/campaigns/detail.html
@@ -47,9 +47,12 @@ <h3 class="mb-0">{% trans "Rooms" %}</h3>
                     </td>
                     <td class="text-end">
                         <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                          <a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
-                          <a href="" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
-                          <a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
+                          <a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">
+                            <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
+                        <a href="" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
+                            </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
+                        <a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
+                            </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
                         </div>
                     </td>
                 </tr>
@@ -86,8 +89,10 @@ <h3 class="mb-0">{% trans "Participants" %}</h3>
                     <td>{{ user.email }}</td>
                     <td class="text-end">
                         <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                          <a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
-                          <a href="" class="btn btn-danger btn-sm">{% trans "Remove" %}</a>
+                          <a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">
+                            <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
+                          <a href="" class="btn btn-danger btn-sm"><i class="bi bi-x-octagon">
+                            </i> <span class="d-none d-sm-inline">{% trans "Remove" %}</span></a>
                         </div>
                     </td>
                 </tr>
diff --git a/app/templates/campaigns/my.html b/app/templates/campaigns/my.html
index a879214..48e7358 100644
--- a/app/templates/campaigns/my.html
+++ b/app/templates/campaigns/my.html
@@ -25,9 +25,12 @@ <h5 class="mb-1">
                     </div>
                     <div>
                         <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                        <a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
-                        <a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
-                        <a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
+                            <a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">
+                                <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
+                            <a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
+                                </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
+                            <a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
+                                </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
                         </div>
                     </div>
                 </div>
diff --git a/app/templates/campaigns/my_organizations.html b/app/templates/campaigns/my_organizations.html
index 8eb13c5..10f14cf 100644
--- a/app/templates/campaigns/my_organizations.html
+++ b/app/templates/campaigns/my_organizations.html
@@ -29,7 +29,7 @@ <h5 class="mb-1"><a href="{% url 'organizations-detail' organization.pk %}">{{ o
                             <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
                         <a href="" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
                             </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
-                        <a href="" class="btn btn-danger btn-sm"><i class="bi bi-pencil-square">
+                        <a href="" class="btn btn-danger btn-sm"><i class="bi bi-trash">
                             </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
                     </div>
                 </div>
diff --git a/app/templates/campaigns/organization_detail.html b/app/templates/campaigns/organization_detail.html
index 7604caa..8f89871 100644
--- a/app/templates/campaigns/organization_detail.html
+++ b/app/templates/campaigns/organization_detail.html
@@ -23,7 +23,7 @@ <h3 class="mb-0">{% trans "Users" %}</h3>
                         <tr>
                             <th>{% trans "Username" %}</th>
                             <th>{% trans "Email" %}</th>
-                            <th>{% trans "Actions" %}</th>
+                            <th></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -31,7 +31,7 @@ <h3 class="mb-0">{% trans "Users" %}</h3>
                             <tr>
                                 <td>{{ user.username }}</td>
                                 <td>{{ user.email }}</td>
-                                <td>
+                                <td class="text-end">
                                     <a href="{% url 'remove-user-from-organization' organization.pk user.pk %}" class="btn btn-danger btn-sm" title="{% trans 'Remove User' %}">
                                         <i class="bi bi-trash"></i> {% trans "Remove" %}
                                     </a>
diff --git a/app/templates/devices/detail.html b/app/templates/devices/detail.html
index 63d99c0..02eb829 100644
--- a/app/templates/devices/detail.html
+++ b/app/templates/devices/detail.html
@@ -93,14 +93,28 @@ <h3 class="mt-4 mb-4">{% trans "Log" %}</h3>
         <ul class="list-group mb-3">
             {% for log in device_logs %}
                 <li class="list-group-item">
-                    <div class="d-flex w-100 justify-content-between">
+                    <div class="d-flex w-100 justify-content-start">
                         <small class="text-muted">{{ log.timestamp|naturaltime }}</small>
                         <!-- Display log level with badge using the mapping -->
                         {% with badge_class=level_badge_map|get:log.level %}
                             {% if badge_class %}
-                                <span class="badge {{ badge_class }}">{{ log.get_level_display }}</span>
+                                <span class="badge {{ badge_class }} ms-2">
+                                    {% if log.level == 0 %}
+                                        <i class="bi bi-info-circle"></i> {{ level_map|get:log.level|capfirst }}
+                                    {% elif log.level == 1 %}
+                                        <i class="bi bi-info-circle"></i> {{ level_map|get:log.level|capfirst }}
+                                    {% elif log.level == 2 %}
+                                        <i class="bi bi-exclamation-triangle"></i> {{ level_map|get:log.level|capfirst }}
+                                    {% elif log.level == 3 %}
+                                        <i class="bi bi-exclamation-octagon"></i> {{ level_map|get:log.level|capfirst }}
+                                    {% elif log.level == 4 %}
+                                        <i class="bi bi-x-octagon"></i> {{ level_map|get:log.level|capfirst }}
+                                    {% else %}
+                                        {{ level_map|get:log.level|default:_("unknown") }}
+                                    {% endif %}
+                                </span>
                             {% else %}
-                                <span class="badge bg-light text-dark">{{ log.get_level_display }}</span>
+                                <span class="badge bg-light text-dark">{{ level_map|get:log.level|capfirst }}</span>
                             {% endif %}
                         {% endwith %}
                     </div>
diff --git a/app/templates/workshops/my.html b/app/templates/workshops/my.html
index c586784..a7ba7dc 100644
--- a/app/templates/workshops/my.html
+++ b/app/templates/workshops/my.html
@@ -22,9 +22,12 @@ <h5 class="mb-1"><a href="{% url 'workshop-detail' workshop.pk %}">{{ workshop.t
                     </div>
                     <div>
                         <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                            <a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
-                            <a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
-                            <a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
+                            <a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">
+                                <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
+                            <a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
+                                </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
+                            <a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
+                                </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
                         </div>
                     </div>
                 </div>