diff --git a/bookmarks/styles/bookmark-page.css b/bookmarks/styles/bookmark-page.css
index c6aa021..b751b7d 100644
--- a/bookmarks/styles/bookmark-page.css
+++ b/bookmarks/styles/bookmark-page.css
@@ -266,6 +266,9 @@ ul.bookmark-list {
       & a:visited:hover {
         color: var(--alternative-color);
       }
+      & a:not(:last-child) {
+        margin-right: var(--unit-1);
+      }
     }
 
     & .actions,
diff --git a/bookmarks/styles/components.css b/bookmarks/styles/components.css
index 82a6554..d5e1e60 100644
--- a/bookmarks/styles/components.css
+++ b/bookmarks/styles/components.css
@@ -103,7 +103,8 @@
 
   & .list-item-actions {
     display: flex;
-    gap: var(--unit-4);
+    gap: var(--unit-2);
+    margin-left: var(--unit-4);
     align-items: center;
 
     & .btn.btn-link {
diff --git a/bookmarks/styles/theme/autocomplete.css b/bookmarks/styles/theme/autocomplete.css
index 96952bd..513ba1e 100644
--- a/bookmarks/styles/theme/autocomplete.css
+++ b/bookmarks/styles/theme/autocomplete.css
@@ -54,6 +54,10 @@
     position: fixed;
     max-height: var(--menu-max-height, 200px);
     overflow: auto;
+    
+    & .menu-item {
+      white-space: normal;
+    }
 
     & .menu-item.selected > a,
     & .menu-item > a:hover {
@@ -63,7 +67,7 @@
 
     & .group-item,
     & .group-item:hover {
-      color: var(--tertiary-text-color);
+      margin-top: var(--unit-2);
       text-transform: uppercase;
       background: none;
       font-size: 0.6rem;
diff --git a/bookmarks/styles/theme/menus.css b/bookmarks/styles/theme/menus.css
index 55bc3f6..5fd5f65 100644
--- a/bookmarks/styles/theme/menus.css
+++ b/bookmarks/styles/theme/menus.css
@@ -7,6 +7,7 @@
   --menu-item-hover-color: var(--primary-text-color);
   --menu-item-bg-color: transparent;
   --menu-item-hover-bg-color: var(--primary-color-shade);
+  --menu-item-min-width: 120px;
 }
 
 /* Menus */
@@ -17,7 +18,7 @@
   box-shadow: var(--menu-box-shadow);
   list-style: none;
   margin: 0;
-  min-width: var(--control-width-xs);
+  min-width: var(--menu-item-min-width);
   transform: translateY(var(--layout-spacing-sm));
   z-index: var(--zindex-3);
 
@@ -28,16 +29,17 @@
 
   .menu-item {
     margin-top: 0;
-    padding: 0 var(--unit-4);
+    padding: 0 var(--unit-3);
     position: relative;
     text-decoration: none;
+    white-space: nowrap;
 
     &:first-of-type {
-      padding-top: var(--unit-2);
+      padding-top: var(--unit-1);
     }
 
     &:last-of-type {
-      padding-bottom: var(--unit-2);
+      padding-bottom: var(--unit-1);
     }
 
     & > a,
diff --git a/bookmarks/styles/theme/utilities.css b/bookmarks/styles/theme/utilities.css
index 45dad3e..9ba34bc 100644
--- a/bookmarks/styles/theme/utilities.css
+++ b/bookmarks/styles/theme/utilities.css
@@ -290,6 +290,10 @@
   font-weight: normal;
 }
 
+.text-semibold {
+  font-weight: 500;
+}
+
 .text-bold {
   font-weight: bold;
 }
diff --git a/bookmarks/templates/bookmarks/details/form.html b/bookmarks/templates/bookmarks/details/form.html
index 254e06e..d5916cf 100644
--- a/bookmarks/templates/bookmarks/details/form.html
+++ b/bookmarks/templates/bookmarks/details/form.html
@@ -56,7 +56,7 @@
           <h3>Status</h3>
           <div class="d-flex" style="gap: .8rem">
             <div class="form-group">
-              <label class="form-switch">
+              <label class="form-checkbox">
                 <input data-submit-on-change
                        type="checkbox"
                        name="is_archived"
@@ -65,7 +65,7 @@
               </label>
             </div>
             <div class="form-group">
-              <label class="form-switch">
+              <label class="form-checkbox">
                 <input data-submit-on-change
                        type="checkbox"
                        name="unread"
@@ -75,7 +75,7 @@
             </div>
             {% if details.profile.enable_sharing %}
               <div class="form-group">
-                <label class="form-switch">
+                <label class="form-checkbox">
                   <input data-submit-on-change
                          type="checkbox"
                          name="shared"