diff --git a/plinth/templates/app-header.html b/plinth/templates/app-header.html
index efed5c201..e10945a86 100644
--- a/plinth/templates/app-header.html
+++ b/plinth/templates/app-header.html
@@ -43,10 +43,11 @@
     </section>
 
     {% if app_info.tags %}
-      <div class="app-tags">
+      <div class="app-tags d-flex align-items-center flex-wrap">
         {% for tag in app_info.tags %}
+        {% if not forloop.first %}•{% endif %}
           <a href="{{ active_section_url }}?tag={{ tag|urlencode }}"
-             class="btn btn-light rounded-pill tag">
+             class="btn btn-default rounded-pill tag">
             {% trans tag %}
           </a>
         {% endfor %}
diff --git a/plinth/templates/tags.html b/plinth/templates/tags.html
index 1dd96dfc7..215c416f8 100644
--- a/plinth/templates/tags.html
+++ b/plinth/templates/tags.html
@@ -8,12 +8,12 @@
   <div class="container">
     <div class="dropdown searchable-dropdown">
       <div class="tag-input">
-        <div id="selected-tags">
+        <div id="selected-tags" class="d-flex align-items-center flex-wrap">
           {% for tag in tags %}
-            <span class="btn btn-light rounded-pill tag"
+            <span class="btn btn-default rounded-pill tag d-flex align-items-center"
                   data-tag="{{ tag }}">
               {% trans tag %}
-              <button class="btn btn-sm btn-light remove-tag">
+              <button class="btn btn-sm btn-default remove-tag">
                 <i class="fa fa-times"></i>
               </button>
             </span>
diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css
index 446f67d0f..b18e180c0 100644
--- a/static/themes/default/css/main.css
+++ b/static/themes/default/css/main.css
@@ -292,16 +292,21 @@ html {
 /* Tags */
 .tag {
     --bs-btn-padding-y: 0.25rem; /* Make the badge shorter */
+    border-style: none;
+}
+
+#selected-tags .tag {
+    border-style: solid;
 }
 
 /* Tag Input Container */
 .tag-input {
     display: flex;
     align-items: center;
-    border: 1px solid #ced4da;
+    border: 1px solid var(--bs-border-color);
     border-radius: .25rem;
     padding: .375rem .75rem;
-    background-color: #fff;
+    background-color: var(--bs-body-bg);
     margin-bottom: 2rem;
 }