diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json
index eae697e1f..f75af994e 100644
--- a/packages/power-bi/package.json
+++ b/packages/power-bi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-powerbi",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",
diff --git a/packages/power-bi/src/lib/components/QuickFilter/QuickFilter.tsx b/packages/power-bi/src/lib/components/QuickFilter/QuickFilter.tsx
index 1f5c45bd6..20bcbea64 100644
--- a/packages/power-bi/src/lib/components/QuickFilter/QuickFilter.tsx
+++ b/packages/power-bi/src/lib/components/QuickFilter/QuickFilter.tsx
@@ -1,4 +1,4 @@
-import { Chip } from '@equinor/eds-core-react';
+import { Button, Chip, Tooltip } from '@equinor/eds-core-react';
 import { tokens } from '@equinor/eds-tokens';
 import styled from 'styled-components';
 
@@ -9,7 +9,7 @@ import { ExpandedFilter } from '../expandedFilter/ExpandedFilter';
 import { FilterController } from '../Filter/Filter';
 import { PowerBiFilterGroup } from '../quickFilterGroup/QuickFilterGroup';
 
-import { StyledCompactFilterWrapper } from './quickFilter.styles';
+import { StyledButtonContent, StyledCompactFilterWrapper } from './quickFilter.styles';
 
 interface PowerBIQuickFilterProps {
   controller: FilterController;
@@ -82,11 +82,31 @@ export const PowerBIQuickFilter = ({ controller }: PowerBIQuickFilterProps): JSX
           <StyledFilterButtons>
             <OtherFiltersAppliedInfo activeFilters={calculateHiddenFilters(shownFilters, activeFilters)} />
             <FilterButtonContainer>
-              <FilterClearIcon isDisabled={!isAnyFiltersActive()} onClick={async () => await resetFilter()} />
-
-              <div onClick={() => setIsFilterExpanded(!isFilterExpanded)}>
-                {isFilterExpanded ? <FilterCollapseIcon /> : <FilterExpandIcon />}
-              </div>
+              <Button
+                style={{ height: '40px' }}
+                variant="ghost_icon"
+                disabled={!isAnyFiltersActive()}
+                onClick={async () => await resetFilter()}
+              >
+                <FilterClearIcon isDisabled={!isAnyFiltersActive()} />
+              </Button>
+              <Tooltip title={isFilterExpanded ? 'Hide all filter options' : 'Show all filter options'}>
+                <Button
+                  style={{ height: '40px' }}
+                  variant="ghost"
+                  onClick={() => setIsFilterExpanded(!isFilterExpanded)}
+                >
+                  {isFilterExpanded ? (
+                    <StyledButtonContent>
+                      <FilterCollapseIcon /> <div>Hide all</div>
+                    </StyledButtonContent>
+                  ) : (
+                    <StyledButtonContent>
+                      <FilterExpandIcon /> <div>Show all</div>
+                    </StyledButtonContent>
+                  )}
+                </Button>
+              </Tooltip>
             </FilterButtonContainer>
           </StyledFilterButtons>
         </StyledCompactFilterWrapper>
@@ -101,14 +121,13 @@ const StyledFilterButtons = styled.div`
 `;
 
 const StyledQuickFilterWrapper = styled.div`
-  display: grid;
+  display: flex;
   width: 100%;
   justify-content: flex-start;
-  grid-template-columns: repeat(auto-fit, minmax(max-content, 50px));
-  grid-template-rows: 1fr;
   gap: 10px;
   align-items: center;
-  overflow-x: hidden;
+  overflow-x: auto;
+  box-sizing: border-box;
   padding-left: 10px;
   padding-right: 10px;
 `;
@@ -117,13 +136,16 @@ const FilterButtonContainer = styled.div`
   display: flex;
   align-items: center;
   height: 48px;
-  width: 96px;
+  width: fit-content;
+  gap: 10px;
+  padding: 0 10px;
 `;
 
 const FilterWrapper = styled.div`
   width: 100%;
   overflow-x: auto;
   overflow-y: hidden;
+  background-color: ${tokens.colors.ui.background__light.hex};
 `;
 
 interface OtherFiltersAppliedInfoProps {
diff --git a/packages/power-bi/src/lib/components/QuickFilter/quickFilter.styles.ts b/packages/power-bi/src/lib/components/QuickFilter/quickFilter.styles.ts
index 325a51aed..7d4351b93 100644
--- a/packages/power-bi/src/lib/components/QuickFilter/quickFilter.styles.ts
+++ b/packages/power-bi/src/lib/components/QuickFilter/quickFilter.styles.ts
@@ -2,10 +2,17 @@ import { tokens } from '@equinor/eds-tokens';
 import styled from 'styled-components';
 
 export const StyledCompactFilterWrapper = styled.div`
-  height: 50px;
   width: 100%;
   background-color: ${tokens.colors.ui.background__light.hex};
   display: grid;
   grid-template-columns: 1fr auto;
   grid-template-rows: 1fr;
 `;
+
+export const StyledButtonContent = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 80px;
+  white-space: nowrap;
+`;
diff --git a/packages/power-bi/src/lib/components/expandedFilter/expandedFilter.styles.ts b/packages/power-bi/src/lib/components/expandedFilter/expandedFilter.styles.ts
index 52e63899c..c6fb6642f 100644
--- a/packages/power-bi/src/lib/components/expandedFilter/expandedFilter.styles.ts
+++ b/packages/power-bi/src/lib/components/expandedFilter/expandedFilter.styles.ts
@@ -16,6 +16,8 @@ export const StyledExpandedFilterWrapper = styled.div`
   height: 250px;
   overflow: hidden;
   border-bottom: 1px solid ${tokens.colors.ui.background__medium.hex};
+  background-color: ${tokens.colors.ui.background__light.hex};
+  margin-bottom: 10px;
 `;
 
 export const StyledSidebar = styled.div`
diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
index ccb8a69b6..a4d7da01a 100644
--- a/packages/workspace-fusion/package.json
+++ b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",