diff --git a/components/PartsList/index.js b/components/PartsList/index.js
index 0972b91..e3ecf91 100644
--- a/components/PartsList/index.js
+++ b/components/PartsList/index.js
@@ -7,6 +7,8 @@ import { FilterContainer } from "../StyledFilter/StyledFilter.styled.js";
 export default function PartsList({ parts }) {
   const [categoryFilter, setCategoryFilter] = useState("alle");
   const [statusFilter, setStatusFilter] = useState("alle");
+  const [activeCategoryFilter, setActiveCategoryFilter] = useState("alle");
+  const [activeStatusFilter, setActiveStatusFilter] = useState("alle");
 
   // filter the parts array based on the categoryFilter and statusFilter
   const filteredParts = parts.filter((part) => {
@@ -30,31 +32,86 @@ export default function PartsList({ parts }) {
     <>
       <FilterContainer>
         {/* render a filterButton for each object in 'sets' with given 'function', 'value to set' and 'name' */}
+        {/* funct2 + value2 for activeFilter-highlighting */}
         <StyledFilter
-          sets={[
-            { funct: setCategoryFilter, value: "alle", name: "alle" },
-            { funct: setCategoryFilter, value: "teller", name: "teller" },
-            { funct: setCategoryFilter, value: "vase", name: "vase" },
-            { funct: setCategoryFilter, value: "schüssel", name: "schüssel" },
-            { funct: setCategoryFilter, value: "figur", name: "figur" },
+          filters={[
+            {
+              functionToSet: setCategoryFilter,
+              valueToSet: "alle",
+              buttonName: "alle",
+              activeFunctionToSet: setActiveCategoryFilter,
+              activeValueToSet: "alle",
+            },
+            {
+              functionToSet: setCategoryFilter,
+              valueToSet: "teller",
+              buttonName: "teller",
+              activeFunctionToSet: setActiveCategoryFilter,
+              activeValueToSet: "teller",
+            },
+            {
+              functionToSet: setCategoryFilter,
+              valueToSet: "vase",
+              buttonName: "vase",
+              activeFunctionToSet: setActiveCategoryFilter,
+              activeValueToSet: "vase",
+            },
+            {
+              functionToSet: setCategoryFilter,
+              valueToSet: "schüssel",
+              buttonName: "schüssel",
+              activeFunctionToSet: setActiveCategoryFilter,
+              activeValueToSet: "schüssel",
+            },
+            {
+              functionToSet: setCategoryFilter,
+              valueToSet: "figur",
+              buttonName: "figur",
+              activeFunctionToSet: setActiveCategoryFilter,
+              activeValueToSet: "figur",
+            },
           ]}
+          activeFilter={activeCategoryFilter}
         />
         <StyledFilter
-          sets={[
-            { funct: setStatusFilter, value: "alle", name: "alle" },
+          filters={[
+            {
+              functionToSet: setStatusFilter,
+              valueToSet: "alle",
+              buttonName: "alle",
+              activeFunctionToSet: setActiveStatusFilter,
+              activeValueToSet: "alle",
+            },
+            {
+              functionToSet: setStatusFilter,
+              valueToSet: "!isAssembled",
+              buttonName: "unverbaut",
+              activeFunctionToSet: setActiveStatusFilter,
+              activeValueToSet: "!isAssembled",
+            },
+            {
+              functionToSet: setStatusFilter,
+              valueToSet: "inAssembler",
+              buttonName: "in Verarbeitung",
+              activeFunctionToSet: setActiveStatusFilter,
+              activeValueToSet: "inAssembler",
+            },
             {
-              funct: setStatusFilter,
-              value: "!isAssembled",
-              name: "unverbaut",
+              functionToSet: setStatusFilter,
+              valueToSet: "isAssembled",
+              buttonName: "verbaut",
+              activeFunctionToSet: setActiveStatusFilter,
+              activeValueToSet: "isAssembled",
             },
             {
-              funct: setStatusFilter,
-              value: "inAssembler",
-              name: "in Verarbeitung",
+              functionToSet: setStatusFilter,
+              valueToSet: "isSold",
+              buttonName: "verkauft",
+              activeFunctionToSet: setActiveStatusFilter,
+              activeValueToSet: "isSold",
             },
-            { funct: setStatusFilter, value: "isAssembled", name: "verbaut" },
-            { funct: setStatusFilter, value: "isSold", name: "verkauft" },
           ]}
+          activeFilter={activeStatusFilter}
         />
       </FilterContainer>
       <PartsListContainer>
diff --git a/components/StyledFilter/StyledFilter.styled.js b/components/StyledFilter/StyledFilter.styled.js
index ffb4c3a..02080ec 100644
--- a/components/StyledFilter/StyledFilter.styled.js
+++ b/components/StyledFilter/StyledFilter.styled.js
@@ -16,5 +16,5 @@ export const FilterButtonContainer = styled.section`
 `;
 
 export const FilterButton = styled.button`
-  font-weight: bold;
+  ${(props) => (props.isActiveFilter === true ? "font-weight: bold" : "")}
 `;
diff --git a/components/StyledFilter/index.js b/components/StyledFilter/index.js
index e0e36b0..30d6dde 100644
--- a/components/StyledFilter/index.js
+++ b/components/StyledFilter/index.js
@@ -1,12 +1,19 @@
 import { FilterButtonContainer, FilterButton } from "./StyledFilter.styled";
 
-export default function StyledFilter({ sets }) {
-  // Mapping over the "sets" array and rendering a FilterButton component for each element with the given "function", "value to set" and "name"
+export default function StyledFilter({ filters, activeFilter }) {
+  // Mapping over given "filters" array of objects and rendering a FilterButton component for each element with the given "functionToSet", "valueToSet" and "buttonName"
   return (
     <FilterButtonContainer>
-      {sets.map((set) => (
-        <FilterButton key={set.name} onClick={() => set.funct(set.value)}>
-          {set.name}
+      {filters.map((filter) => (
+        <FilterButton
+          key={filter.buttonName}
+          onClick={() => {
+            filter.functionToSet(filter.valueToSet);
+            filter.activeFunctionToSet(filter.activeValueToSet);
+          }}
+          isActiveFilter={filter.activeValueToSet === activeFilter}
+        >
+          {filter.buttonName}
         </FilterButton>
       ))}
     </FilterButtonContainer>