diff --git a/changelog.d/drafts-imp.skip b/changelog.d/drafts-imp.skip
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 8e95ad31f..876e97726 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -153,6 +153,12 @@
     margin-right: 0.8em;
     font-size: 1.1em;
   }
+
+  .timelines-chevron {
+    margin-left: 0.8em;
+    font-size: 1.1em;
+  }
+
   .timelines-background {
     padding: 0 0 0 0.6em;
   }
diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue
index bd72bd0d1..4b6c8e299 100644
--- a/src/components/navigation/navigation_entry.vue
+++ b/src/components/navigation/navigation_entry.vue
@@ -82,12 +82,8 @@
   --__horizontal-gap: 0.5em;
   --__vertical-gap: 0.4em;
 
-  padding: var(--__vertical-gap) var(--__horizontal-gap);
-  display: grid;
-  grid-template-columns: 1fr;
-  grid-auto-columns: var(--__line-height);
-  grid-auto-flow: column;
-  grid-gap: var(--__horizontal-gap);
+  padding: 0;
+  display: flex;
   align-items: baseline;
 
   &[aria-expanded] {
@@ -97,6 +93,8 @@
   .main-link {
     line-height: var(--__line-height);
     box-sizing: border-box;
+    flex: 1;
+    padding: var(--__vertical-gap) var(--__horizontal-gap);
   }
 
   .menu-icon {
@@ -106,16 +104,26 @@
     margin-right: var(--__horizontal-gap);
   }
 
-  .timelines-chevron,
+  .timelines-chevron {
+    line-height: var(--__line-height);
+    padding: 0;
+    width: var(--__line-height);
+    margin-right: 0;
+  }
+
   .extra-button {
     line-height: var(--__line-height);
-    width: 100%;
     padding: 0;
+    width: var(--__line-height);
     text-align: center;
+
+    &:last-child {
+      margin-right: calc(-1 * var(--__horizontal-gap));
+    }
   }
 
   .badge {
-    justify-self: center;
+    margin: 0 var(--__horizontal-gap);
   }
 
   .iconEmoji {