diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java
index 8963bf60e..34bb14370 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java
@@ -22,7 +22,6 @@ import java.util.List;
 public class BlockLampPowerer extends Block implements INameableItem{
 
     private IIcon frontIcon;
-    private IIcon topIcon;
 
     public BlockLampPowerer(){
         super(Material.rock);
@@ -45,7 +44,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
 
     @Override
     public IIcon getIcon(int side, int meta){
-        if(side == 0 || side == 1) return this.topIcon;
         if(side == 3) return this.frontIcon;
         return this.blockIcon;
     }
@@ -53,7 +51,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
     @Override
     public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){
         int meta = world.getBlockMetadata(x, y, z);
-        if(side != meta && (side == 0 || side == 1)) return this.topIcon;
         if(side == meta) return this.frontIcon;
         return this.blockIcon;
     }
@@ -91,7 +88,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
     public void registerBlockIcons(IIconRegister iconReg){
         this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName());
         this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Front");
-        this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Top");
     }
 
     public static class TheItemBlock extends ItemBlock{
diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
index e30573928..ca8daa3df 100644
--- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
+++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
@@ -71,6 +71,7 @@ public class CreativeTab extends CreativeTabs{
         add(InitBlocks.blockTestifiBucksGreenSlab);
         add(InitBlocks.blockTestifiBucksWhiteSlab);
         add(InitBlocks.blockColoredLamp);
+        add(InitBlocks.blockLampPowerer);
 
         add(InitItems.itemDrill);
         add(InitItems.itemDrillUpgradeSpeed);
diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
index 5c2916356..50e187d7c 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang
+++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
@@ -63,7 +63,10 @@ tooltip.actuallyadditions.blockCoalGenerator.desc=Produces Energy from Coal and
 
 tooltip.actuallyadditions.blockColoredLamp.desc.1=Sneak-Right-Click to turn me on!
 tooltip.actuallyadditions.blockColoredLamp.desc.2=Right-Click me with a Dye to dye me!
-tooltip.actuallyadditions.blockColoredLamp.desc.3=Use a Lamp Powerer to toggle me with Redstone!
+tooltip.actuallyadditions.blockColoredLamp.desc.3=Use a Lamp Controller to toggle me with Redstone!
+
+tile.actuallyadditions.blockLampPowerer.name=Lamp Controller
+tooltip.actuallyadditions.blockLampPowerer.desc=Place me facing towards a Lamp and power me with Redstone to turn it on!
 
 tile.actuallyadditions.blockColoredLampWhite.name=White Lamp
 tile.actuallyadditions.blockColoredLampOrange.name=Orange Lamp
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png
new file mode 100644
index 000000000..9a38e92c4
Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png
new file mode 100644
index 000000000..7434c31de
Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png differ