diff --git a/better-air-filtering/graphics/icons/air-filter.png b/better-air-filtering/graphics/icons/air-filter.png
new file mode 100644
index 0000000..e02fab8
Binary files /dev/null and b/better-air-filtering/graphics/icons/air-filter.png differ
diff --git a/better-air-filtering/graphics/icons/expendable-air-filter.png b/better-air-filtering/graphics/icons/expendable-air-filter.png
index 13309f8..812e716 100644
Binary files a/better-air-filtering/graphics/icons/expendable-air-filter.png and b/better-air-filtering/graphics/icons/expendable-air-filter.png differ
diff --git a/better-air-filtering/graphics/icons/unused-liquid-filter.png b/better-air-filtering/graphics/icons/liquid-filter.png
similarity index 100%
rename from better-air-filtering/graphics/icons/unused-liquid-filter.png
rename to better-air-filtering/graphics/icons/liquid-filter.png
diff --git a/better-air-filtering/graphics/icons/unused-air-filter.png b/better-air-filtering/graphics/icons/unused-air-filter.png
deleted file mode 100644
index 812e716..0000000
Binary files a/better-air-filtering/graphics/icons/unused-air-filter.png and /dev/null differ
diff --git a/better-air-filtering/graphics/icons/used-air-filter-mask.png b/better-air-filtering/graphics/icons/used-air-filter-mask.png
new file mode 100644
index 0000000..6952077
Binary files /dev/null and b/better-air-filtering/graphics/icons/used-air-filter-mask.png differ
diff --git a/better-air-filtering/graphics/icons/used-air-filter.png b/better-air-filtering/graphics/icons/used-air-filter.png
deleted file mode 100644
index a6c1344..0000000
Binary files a/better-air-filtering/graphics/icons/used-air-filter.png and /dev/null differ
diff --git a/better-air-filtering/graphics/icons/used-liquid-filter-mask.png b/better-air-filtering/graphics/icons/used-liquid-filter-mask.png
new file mode 100644
index 0000000..d8cebeb
Binary files /dev/null and b/better-air-filtering/graphics/icons/used-liquid-filter-mask.png differ
diff --git a/better-air-filtering/graphics/icons/used-liquid-filter.png b/better-air-filtering/graphics/icons/used-liquid-filter.png
deleted file mode 100644
index a584519..0000000
Binary files a/better-air-filtering/graphics/icons/used-liquid-filter.png and /dev/null differ
diff --git a/better-air-filtering/locale/en/air-filtering.cfg b/better-air-filtering/locale/en/air-filtering.cfg
index 7773d47..154c64a 100644
--- a/better-air-filtering/locale/en/air-filtering.cfg
+++ b/better-air-filtering/locale/en/air-filtering.cfg
@@ -5,8 +5,11 @@ air-filter-machine-3=Air filter machine 3
 
 [item-name]
 expendable-air-filter=Expendable air FIlter
-unused-air-filter=Unused air filter
+air-filter=Air filter
 used-air-filter=Used air filter
+liquid-filter=Liquid filter
+used-liquid-filter=Used liquid filter
+
 
 [fluid-name]
 pollution=Pollution
diff --git a/better-air-filtering/prototypes/item.lua b/better-air-filtering/prototypes/item.lua
index 535334a..1a32bd0 100644
--- a/better-air-filtering/prototypes/item.lua
+++ b/better-air-filtering/prototypes/item.lua
@@ -51,8 +51,8 @@ data:extend({
     },
     {
         type = "item",
-        name = "unused-air-filter",
-        icon = "__better-air-filtering__/graphics/icons/unused-air-filter.png",
+        name = "air-filter",
+        icon = "__better-air-filtering__/graphics/icons/air-filter.png",
         icon_size = 32,
         flags = {},
         subgroup = "raw-material",
@@ -65,7 +65,14 @@ data:extend({
     {
         type = "item",
         name = "used-air-filter",
-        icon = "__better-air-filtering__/graphics/icons/used-air-filter.png",
+        icons = {
+            {
+                icon = "__better-air-filtering__/graphics/icons/air-filter.png"
+            },
+            {
+                icon = "__better-air-filtering__/graphics/icons/used-air-filter-mask.png",
+            },
+        },
         icon_size = 32,
         flags = {},
         subgroup = "raw-material",
@@ -74,8 +81,8 @@ data:extend({
     },
     {
         type = "item",
-        name = "unused-liquid-filter",
-        icon = "__better-air-filtering__/graphics/icons/unused-liquid-filter.png",
+        name = "liquid-filter",
+        icon = "__better-air-filtering__/graphics/icons/liquid-filter.png",
         icon_size = 32,
         flags = {},
         subgroup = "raw-material",
@@ -85,7 +92,14 @@ data:extend({
     {
         type = "item",
         name = "used-liquid-filter",
-        icon = "__better-air-filtering__/graphics/icons/used-liquid-filter.png",
+        icons = {
+            {
+                icon = "__better-air-filtering__/graphics/icons/liquid-filter.png"
+            },
+            {
+                icon = "__better-air-filtering__/graphics/icons/used-liquid-filter-mask.png",
+            },
+        },
         icon_size = 32,
         flags = {},
         subgroup = "raw-material",
diff --git a/better-air-filtering/prototypes/recipe.lua b/better-air-filtering/prototypes/recipe.lua
index cf8510c..e858731 100644
--- a/better-air-filtering/prototypes/recipe.lua
+++ b/better-air-filtering/prototypes/recipe.lua
@@ -61,10 +61,10 @@ data:extend({
     },
     {
         type = "recipe",
-        name = "unused-air-filter",
+        name = "air-filter",
         category = "crafting",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[unused-air-filter]",
+        order = "f[plastic-bar]-f[air-filter]",
         energy_required = 5,
         enabled = "false",
         ingredients =
@@ -73,7 +73,7 @@ data:extend({
             { "plastic-bar", 4 },
             { "steel-plate", 2 }
         },
-        result = "unused-air-filter"
+        result = "air-filter"
     },
     {
         type = "recipe",
@@ -124,7 +124,7 @@ data:extend({
         ingredients =
         {
             { type = "fluid", name = "pollution", amount = 20, fluidbox_index = 1 },
-            { type = "item", name = "unused-air-filter", amount = 1 },
+            { type = "item", name = "air-filter", amount = 1 },
         },
         results = { { type = "item", name = "used-air-filter", amount = 1 } }
     },
@@ -149,7 +149,10 @@ data:extend({
         name = "air-filter-recycling",
         icons = {
             {
-                icon = "__better-air-filtering__/graphics/icons/used-air-filter.png"
+                icon = "__better-air-filtering__/graphics/icons/air-filter.png"
+            },
+            {
+                icon = "__better-air-filtering__/graphics/icons/used-air-filter-mask.png",
             },
             {
                 icon = "__better-air-filtering__/graphics/icons/recipe/recycle.png",
@@ -160,7 +163,7 @@ data:extend({
         icon_size = 32,
         category = "crafting",
         subgroup = "raw-material",
-        order = "f[unused-air-filter]-f[air-filter-recycling]",
+        order = "f[air-filter]-f[air-filter-recycling]",
         energy_required = 5,
         enabled = "false",
         ingredients =
@@ -168,6 +171,6 @@ data:extend({
             { "used-air-filter", 1 },
             { "coal", 5 }
         },
-        result = "unused-air-filter"
+        result = "air-filter"
     }
 })
diff --git a/better-air-filtering/prototypes/technology.lua b/better-air-filtering/prototypes/technology.lua
index a6a0ac4..d0cc340 100644
--- a/better-air-filtering/prototypes/technology.lua
+++ b/better-air-filtering/prototypes/technology.lua
@@ -17,7 +17,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "unused-air-filter"
+        recipe = "air-filter"
       }
     },
     unit =
diff --git a/graphics/icons/air-filter.png b/graphics/icons/air-filter.png
new file mode 100644
index 0000000..e02fab8
Binary files /dev/null and b/graphics/icons/air-filter.png differ
diff --git a/graphics/icons/expendable-air-filter.png b/graphics/icons/expendable-air-filter.png
index 13309f8..812e716 100644
Binary files a/graphics/icons/expendable-air-filter.png and b/graphics/icons/expendable-air-filter.png differ
diff --git a/graphics/icons/liquid-filter.png b/graphics/icons/liquid-filter.png
new file mode 100644
index 0000000..87084c7
Binary files /dev/null and b/graphics/icons/liquid-filter.png differ
diff --git a/graphics/icons/old/used-air-filter.png b/graphics/icons/old/used-air-filter.png
new file mode 100644
index 0000000..187b62c
Binary files /dev/null and b/graphics/icons/old/used-air-filter.png differ
diff --git a/graphics/icons/old/used-liquid-filter.png b/graphics/icons/old/used-liquid-filter.png
new file mode 100644
index 0000000..870bab6
Binary files /dev/null and b/graphics/icons/old/used-liquid-filter.png differ
diff --git a/graphics/icons/used-air-filter-mask.png b/graphics/icons/used-air-filter-mask.png
new file mode 100644
index 0000000..6952077
Binary files /dev/null and b/graphics/icons/used-air-filter-mask.png differ
diff --git a/graphics/icons/used-liquid-filter-mask.png b/graphics/icons/used-liquid-filter-mask.png
new file mode 100644
index 0000000..d8cebeb
Binary files /dev/null and b/graphics/icons/used-liquid-filter-mask.png differ