diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 9d5efdc36..2a25e7769 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index dd8a891c4..99d467498 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 82e836585..058526cbb 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -250,9 +250,18 @@ table {
 
 div.title-container {
   display: flex;
+  // On small screens, `flex-direction: column;` ensures the control buttons don't appear on the
+  // same line as the title, but rather break to the next line.
+  flex-direction: column;
   flex-wrap: wrap;
   justify-content: space-between;
 
+  @include media-breakpoint-up(lg) {
+    // On large screens, `flex-direction: row;` allows the control buttons to appear vertically
+    // aligned with the title.
+    flex-direction: row;
+  }
+
   #content-title {
     display: flex;
     flex: 1 0;
@@ -501,7 +510,7 @@ div.content-container {
   position: relative;
   display: flex;
   flex-direction: column;
-  width: calc(100% - 3rem);  // $sidenav-width-closed
+  width: calc(100% - #{$sidenav-width-closed});
   min-height: 100vh;
   overflow-x: hidden;
   overflow-y: auto;