diff --git a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
index bf70df2f4..218ca43f5 100644
--- a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
+++ b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
@@ -125,8 +125,8 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     centerString(gunItem.getGunDisplayName(), 20),
-                    w / 2 + 140,
-                    h - 38,
+                    w / 2 + 138,
+                    h - 34,
                     0xFFFFFF,
                     true
             );
@@ -135,8 +135,8 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     centerString(getGunAmmoType(stack), 20),
-                    w / 2 + 140,
-                    h - 30,
+                    w / 2 + 138,
+                    h - 26,
                     0xC8A679,
                     true
             );
diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java
index 6a166c0b3..b132d50e1 100644
--- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java
@@ -15,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
@@ -186,4 +187,14 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/ak_47_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "AK-47";
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java
index 7d4587f87..e2a31996f 100644
--- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java
@@ -195,7 +195,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
 
     @Override
     public ResourceLocation getGunIcon() {
-        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/aa_12.png");
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/aa_12_icon.png");
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java
index d3e71c12f..975939494 100644
--- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java
+++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java
@@ -15,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
@@ -177,4 +178,14 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/abekiri_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "Abekiri";
+    }
 }
diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java
index d4d98beb3..e5c4cc59a 100644
--- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java
@@ -2,6 +2,7 @@ package net.mcreator.target.item.gun;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import net.mcreator.target.TargetMod;
 import net.mcreator.target.client.renderer.item.BocekItemRenderer;
 import net.mcreator.target.init.TargetModItems;
 import net.mcreator.target.item.AnimatedItem;
@@ -14,6 +15,7 @@ import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -180,4 +182,14 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/bocek_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "Bocek";
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java
index 79c5059be..09de17ab2 100644
--- a/src/main/java/net/mcreator/target/item/gun/Devotion.java
+++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java
@@ -18,6 +18,7 @@ import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
@@ -234,4 +235,14 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/devotion_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "Devotion";
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java
index 08561c110..0bc64d77d 100644
--- a/src/main/java/net/mcreator/target/item/gun/GunItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java
@@ -96,7 +96,7 @@ public abstract class GunItem extends Item {
     }
 
     public ResourceLocation getGunIcon() {
-        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/default.png");
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/default_icon.png");
     }
 
     public String getGunDisplayName() {
diff --git a/src/main/resources/assets/target/textures/gun_icon/aa_12.png b/src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png
similarity index 100%
rename from src/main/resources/assets/target/textures/gun_icon/aa_12.png
rename to src/main/resources/assets/target/textures/gun_icon/aa_12_icon.png
diff --git a/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png b/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png
new file mode 100644
index 000000000..750c4ad8d
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/abekiri_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png b/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png
new file mode 100644
index 000000000..8e913c852
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/ak_47_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png b/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png
new file mode 100644
index 000000000..6e05510ce
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/bocek_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/default.png b/src/main/resources/assets/target/textures/gun_icon/default_icon.png
similarity index 100%
rename from src/main/resources/assets/target/textures/gun_icon/default.png
rename to src/main/resources/assets/target/textures/gun_icon/default_icon.png
diff --git a/src/main/resources/assets/target/textures/gun_icon/devotion_icon.png b/src/main/resources/assets/target/textures/gun_icon/devotion_icon.png
new file mode 100644
index 000000000..4ae6d3539
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/devotion_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png b/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png
new file mode 100644
index 000000000..f374b3ce3
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/hk416_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/hunting_rifle_icon.png b/src/main/resources/assets/target/textures/gun_icon/hunting_rifle_icon.png
new file mode 100644
index 000000000..98b0d4dce
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/hunting_rifle_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png b/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png
new file mode 100644
index 000000000..53ab98e41
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/kraber_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/m4_icon.png b/src/main/resources/assets/target/textures/gun_icon/m4_icon.png
new file mode 100644
index 000000000..6adf779ce
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/m4_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/m60_icon.png b/src/main/resources/assets/target/textures/gun_icon/m60_icon.png
new file mode 100644
index 000000000..5e78c74da
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/m60_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/m79_icon.png b/src/main/resources/assets/target/textures/gun_icon/m79_icon.png
new file mode 100644
index 000000000..b3a679482
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/m79_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/m870_icon.png b/src/main/resources/assets/target/textures/gun_icon/m870_icon.png
new file mode 100644
index 000000000..5766660b9
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/m870_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/m98b_icon.png b/src/main/resources/assets/target/textures/gun_icon/m98b_icon.png
new file mode 100644
index 000000000..a704e87cc
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/m98b_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png b/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png
new file mode 100644
index 000000000..f67dd5321
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/marlin_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png b/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png
new file mode 100644
index 000000000..e547b8248
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/minigun_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png b/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png
new file mode 100644
index 000000000..c3b62e96e
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/mk14ebr_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/rpg_icon.png b/src/main/resources/assets/target/textures/gun_icon/rpg_icon.png
new file mode 100644
index 000000000..125e5e6c9
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/rpg_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png b/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png
new file mode 100644
index 000000000..53fec9047
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/rpk_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/sentinel_icon.png b/src/main/resources/assets/target/textures/gun_icon/sentinel_icon.png
new file mode 100644
index 000000000..5f5ff8256
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/sentinel_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/sks_icon.png b/src/main/resources/assets/target/textures/gun_icon/sks_icon.png
new file mode 100644
index 000000000..62fcee434
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/sks_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/svd_icon.png b/src/main/resources/assets/target/textures/gun_icon/svd_icon.png
new file mode 100644
index 000000000..937b90b9f
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/svd_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/taser_icon.png b/src/main/resources/assets/target/textures/gun_icon/taser_icon.png
new file mode 100644
index 000000000..2450a0cfa
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/taser_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png b/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png
new file mode 100644
index 000000000..da0817240
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/trachelium_icon.png differ
diff --git a/src/main/resources/assets/target/textures/gun_icon/vector_icon.png b/src/main/resources/assets/target/textures/gun_icon/vector_icon.png
new file mode 100644
index 000000000..0bc1a785d
Binary files /dev/null and b/src/main/resources/assets/target/textures/gun_icon/vector_icon.png differ