diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java
index 19dbea50a..5a2958ddb 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java
@@ -1075,6 +1075,6 @@ public class A10Entity extends ContainerMobileVehicleEntity implements GeoEntity
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/aircraft.png");
+        return Mod.loc("textures/gui/vehicle/type/aircraft.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java
index a4dd2f850..d6ac0b901 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java
@@ -726,6 +726,6 @@ public class Ah6Entity extends ContainerMobileVehicleEntity implements GeoEntity
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/aircraft.png");
+        return Mod.loc("textures/gui/vehicle/type/aircraft.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
index 38325e6b5..31ad8faba 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
@@ -598,6 +598,6 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/defense.png");
+        return Mod.loc("textures/gui/vehicle/type/defense.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java
index 2a2c0efd9..7f746b673 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java
@@ -781,6 +781,6 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/land.png");
+        return Mod.loc("textures/gui/vehicle/type/land.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java
index 8b9a11521..66a5bcd2c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java
@@ -610,6 +610,6 @@ public class Hpj11Entity extends ContainerMobileVehicleEntity implements GeoEnti
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/defense.png");
+        return Mod.loc("textures/gui/vehicle/type/defense.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
index 0a7509b34..1131cfb23 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
@@ -364,6 +364,6 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/defense.png");
+        return Mod.loc("textures/gui/vehicle/type/defense.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java
index 42a197a3f..8bb0d1edc 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java
@@ -644,6 +644,6 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/land.png");
+        return Mod.loc("textures/gui/vehicle/type/land.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
index c2ccf6b52..96b82e8a4 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
@@ -460,6 +460,6 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/defense.png");
+        return Mod.loc("textures/gui/vehicle/type/defense.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
index f1b13ffdf..febd330b1 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
@@ -529,6 +529,6 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/defense.png");
+        return Mod.loc("textures/gui/vehicle/type/defense.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
index 2ebc61c4f..3e9488c47 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
@@ -824,6 +824,6 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/land.png");
+        return Mod.loc("textures/gui/vehicle/type/land.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java
index 32cafec63..418b1fbe8 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java
@@ -570,6 +570,6 @@ public class SpeedboatEntity extends ContainerMobileVehicleEntity implements Geo
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/water.png");
+        return Mod.loc("textures/gui/vehicle/type/water.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java
index a6a8a27b5..99fafd17d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java
@@ -363,6 +363,6 @@ public class Tom6Entity extends MobileVehicleEntity implements GeoEntity {
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/aircraft.png");
+        return Mod.loc("textures/gui/vehicle/type/aircraft.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java
index d44a6644d..0acf9b328 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java
@@ -315,6 +315,6 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity {
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/otto.png");
+        return Mod.loc("textures/gui/vehicle/type/otto.png");
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java
index 607b34a42..c7bd055e1 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java
@@ -1285,6 +1285,6 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
 
     @Override
     public @Nullable ResourceLocation getVehicleItemIcon() {
-        return Mod.loc("textures/gui/vehicle/land.png");
+        return Mod.loc("textures/gui/vehicle/type/land.png");
     }
 }
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/aircraft.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/aircraft.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/aircraft.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/aircraft.png
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/civilian.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/civilian.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/civilian.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/civilian.png
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/defense.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/defense.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/defense.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/defense.png
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/land.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/land.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/land.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/land.png
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/otto.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/otto.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/otto.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/otto.png
diff --git a/src/main/resources/assets/superbwarfare/textures/gui/vehicle/water.png b/src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/water.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gui/vehicle/water.png
rename to src/main/resources/assets/superbwarfare/textures/gui/vehicle/type/water.png