diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java
index 3ec79d988..dfc1dcd99 100755
--- a/src/main/java/forestry/core/gadgets/BlockBase.java
+++ b/src/main/java/forestry/core/gadgets/BlockBase.java
@@ -242,7 +242,7 @@ public class BlockBase extends BlockForestry {
 	@Override
 	public IIcon getIcon(int side, int metadata) {
 		if (metadata >= definitions.size() || definitions.get(metadata) == null)
-			metadata = 0;
+			return null;
 		return definitions.get(metadata).getBlockTextureFromSideAndMetadata(side, metadata);
 	}
 
diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java
index 3eecb210f..d475e9a55 100755
--- a/src/main/java/forestry/core/gadgets/BlockSoil.java
+++ b/src/main/java/forestry/core/gadgets/BlockSoil.java
@@ -248,7 +248,7 @@ public class BlockSoil extends Block {
 	public IIcon getIcon(int i, int j) {
 
 		int meta = j;
-		int type = meta & 0x03;
+		int type = meta & 0x0f;
 		int maturity = meta >> 2;
 
 			if (type == 1)
@@ -256,8 +256,10 @@ public class BlockSoil extends Block {
 					return iconBogEarth;
 				else
 					return iconPeat;
-			else
+			else if (type == 0)
 				return iconHumus;
+			else
+				return null;
 	}
 
 }
diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java
index bb47886ae..fe83c8d50 100755
--- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java
+++ b/src/main/java/forestry/farming/gadgets/BlockMushroom.java
@@ -11,12 +11,15 @@
 package forestry.farming.gadgets;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSapling;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -106,6 +109,13 @@ public class BlockMushroom extends BlockSapling {
 	}
 
 	/* ICONS */
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+		list.add(new ItemStack(item, 1, 0));
+		list.add(new ItemStack(item, 1, 1));
+	}
+
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerBlockIcons(IIconRegister register) {
@@ -114,11 +124,13 @@ public class BlockMushroom extends BlockSapling {
 	@SideOnly(Side.CLIENT)
 	@Override
 	public IIcon getIcon(int side, int meta) {
-		int type = meta & 0x03;
-		if (type > 0)
+		int type = meta & 0x0f;
+		if (type == 0)
+			return Blocks.brown_mushroom.getIcon(side, meta);
+		else if (type == 1)
 			return Blocks.red_mushroom.getIcon(side, meta);
 		else
-			return Blocks.brown_mushroom.getIcon(side, meta);
+			return null;
 	}
 
 }