diff --git a/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java b/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java
index 5f02d34..6470fd6 100644
--- a/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java
+++ b/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java
@@ -89,17 +89,18 @@ public void generate(RecipeExporter recipeExporter) {
 
         // Cactus Tool Recipes
         ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.CACTUS_SWORD)
-                .pattern(" C ")
-                .pattern(" C ")
+                .pattern(" P ")
+                .pattern("CPC")
                 .pattern(" S ")
                 .input('C', ModItems.CACTUS_SKIN)
+                .input('P', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_PICKAXE)
-                .pattern("CCC")
-                .pattern(" S ")
+                .pattern("PPP")
+                .pattern("CSC")
                 .pattern(" S ")
                 .input('C', ModItems.CACTUS_SKIN)
                 .input('S', Items.STICK)
diff --git a/src/main/resources/assets/rafaels-useful-cactus/icon.gif b/src/main/resources/assets/rafaels-useful-cactus/icon.gif
deleted file mode 100644
index 5a86dfe..0000000
Binary files a/src/main/resources/assets/rafaels-useful-cactus/icon.gif and /dev/null differ
diff --git a/src/main/resources/assets/rafaels-useful-cactus/icon.png b/src/main/resources/assets/rafaels-useful-cactus/icon.png
new file mode 100644
index 0000000..242a6ad
Binary files /dev/null and b/src/main/resources/assets/rafaels-useful-cactus/icon.png differ
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index c27a530..c9a0204 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -13,7 +13,7 @@
 		"sources": "https://github.com/rafaelmehdiyev/Useful-Cactus-Fabric-1.21.x"
 	},
 	"license": "MIT",
-	"icon": "assets/rafaels-useful-cactus/icon.gif",
+	"icon": "assets/rafaels-useful-cactus/icon.png",
 	"environment": "*",
 	"entrypoints": {
 		"fabric-datagen": [