diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
index 71aa89a50..44ce94453 100644
--- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx
+++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx
@@ -68,8 +68,8 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
 
   return (
     <ButtonToolbar className="filtered-list-toolbar">
-      {onToggleSidebar && (
-        <div>
+      <ButtonGroup>
+        {onToggleSidebar && (
           <ButtonGroup>
             <Button
               className="sidebar-toggle-button"
@@ -80,28 +80,28 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
               <SidebarIcon />
             </Button>
           </ButtonGroup>
-        </div>
-      )}
+        )}
+      </ButtonGroup>
 
-      <div>
-        <ButtonGroup>
-          {showEditFilter && (
-            <ListFilter
-              onFilterUpdate={setFilter}
-              filter={filter}
-              openFilterDialog={() => showEditFilter()}
-              view={view}
-              withSidebar={!!onToggleSidebar}
-            />
-          )}
-          <ListOperationButtons
-            onSelectAll={onSelectAll}
-            onSelectNone={onSelectNone}
-            otherOperations={operations}
-            itemsSelected={selectedIds.size > 0}
-            onEdit={onEdit}
-            onDelete={onDelete}
+      <ButtonGroup>
+        {showEditFilter && (
+          <ListFilter
+            onFilterUpdate={setFilter}
+            filter={filter}
+            openFilterDialog={() => showEditFilter()}
+            view={view}
+            withSidebar={!!onToggleSidebar}
           />
+        )}
+        <ListOperationButtons
+          onSelectAll={onSelectAll}
+          onSelectNone={onSelectNone}
+          otherOperations={operations}
+          itemsSelected={selectedIds.size > 0}
+          onEdit={onEdit}
+          onDelete={onDelete}
+        />
+        <ButtonGroup>
           <ListViewOptions
             displayMode={filter.displayMode}
             displayModeOptions={filterOptions.displayModeOptions}
@@ -110,10 +110,8 @@ export const FilteredListToolbar: React.FC<IFilteredListToolbar> = ({
             onSetZoom={zoomable ? setZoom : undefined}
           />
         </ButtonGroup>
-      </div>
-      <div>
-        <ButtonGroup></ButtonGroup>
-      </div>
+      </ButtonGroup>
+      <ButtonGroup></ButtonGroup>
     </ButtonToolbar>
   );
 };
diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss
index 9f78354a6..cc43bbecd 100644
--- a/ui/v2.5/src/components/List/styles.scss
+++ b/ui/v2.5/src/components/List/styles.scss
@@ -871,6 +871,14 @@ input[type="range"].zoom-slider {
     flex-wrap: wrap;
     justify-content: center;
     row-gap: 0.5rem;
+
+    &:first-child {
+      justify-content: flex-start;
+    }
+
+    &:last-child {
+      justify-content: flex-end;
+    }
   }
 
   .btn.display-mode-select {
diff --git a/ui/v2.5/src/components/Scenes/styles.scss b/ui/v2.5/src/components/Scenes/styles.scss
index 20647bf17..61a4cdbac 100644
--- a/ui/v2.5/src/components/Scenes/styles.scss
+++ b/ui/v2.5/src/components/Scenes/styles.scss
@@ -910,6 +910,7 @@ input[type="range"].blue-slider {
   & > div {
     display: flex;
     flex: 1;
+    flex-wrap: nowrap;
 
     &:first-child {
       justify-content: flex-start;
@@ -922,6 +923,16 @@ input[type="range"].blue-slider {
     &:last-child {
       justify-content: flex-end;
     }
+
+    @include media-breakpoint-down(xs) {
+      &:nth-child(2) {
+        justify-content: flex-end;
+      }
+
+      &:last-child {
+        display: none;
+      }
+    }
   }
 }