diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java
index 93add6091..1357ea163 100644
--- a/client/gui/AEBaseGui.java
+++ b/client/gui/AEBaseGui.java
@@ -164,7 +164,7 @@ public abstract class AEBaseGui extends GuiContainer
 				int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
 				int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
 
-				if ( x < mouse_x && x + tooltip.getWidth() > mouse_x )
+				if ( x < mouse_x && x + tooltip.getWidth() > mouse_x && tooltip.isVisible() )
 				{
 					if ( y < mouse_y && y + tooltip.getHeight() > mouse_y )
 					{
diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java
index e8dc44ea5..9cb5ef29a 100644
--- a/client/gui/widgets/GuiImgButton.java
+++ b/client/gui/widgets/GuiImgButton.java
@@ -116,17 +116,17 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			registerApp( 16 * 10 + 3, Settings.POWER_UNITS, PowerUnits.KJ, "AppEng.GuiITooltip.PowerUnits", "AppEng.GuiITooltip.UEUnits" );
 			registerApp( 16 * 10 + 4, Settings.POWER_UNITS, PowerUnits.WA, "AppEng.GuiITooltip.PowerUnits", "AppEng.GuiITooltip.WUnits" );
 
-			registerApp( 3, Settings.REDSTONE_OUTPUT, RedstoneMode.IGNORE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.AlwaysActive" );
-			registerApp( 0, Settings.REDSTONE_OUTPUT, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithoutSignal" );
-			registerApp( 1, Settings.REDSTONE_OUTPUT, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithSignal" );
-			registerApp( 2, Settings.REDSTONE_OUTPUT, RedstoneMode.SIGNAL_PULSE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveOnPulse" );
+			registerApp( 3, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.AlwaysActive" );
+			registerApp( 0, Settings.REDSTONE_CONTROLLED, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithoutSignal" );
+			registerApp( 1, Settings.REDSTONE_CONTROLLED, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithSignal" );
+			registerApp( 2, Settings.REDSTONE_CONTROLLED, RedstoneMode.SIGNAL_PULSE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveOnPulse" );
 
-			registerApp( 3, Settings.REDSTONE_INPUT, RedstoneMode.IGNORE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.AlwaysActive" );
-			registerApp( 0, Settings.REDSTONE_INPUT, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithoutSignal" );
-			registerApp( 1, Settings.REDSTONE_INPUT, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithSignal" );
+			registerApp( 3, Settings.REDSTONE_EMITTER, RedstoneMode.IGNORE, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.AlwaysActive" );
+			registerApp( 0, Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithoutSignal" );
+			registerApp( 1, Settings.REDSTONE_EMITTER, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.ActiveWithSignal" );
 
-			registerApp( 0, Settings.REDSTONE_OUTPUT, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.EmitLevelsBelow" );
-			registerApp( 1, Settings.REDSTONE_OUTPUT, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.EmitLevelAbove" );
+			registerApp( 0, Settings.REDSTONE_CONTROLLED, RedstoneMode.LOW_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.EmitLevelsBelow" );
+			registerApp( 1, Settings.REDSTONE_CONTROLLED, RedstoneMode.HIGH_SIGNAL, "AppEng.GuiITooltip.RedstoneMode", "AppEng.GuiITooltip.EmitLevelAbove" );
 
 			registerApp( 16 * 8 + 2, Settings.INCLUSION, IncludeExclude.WHITELIST, "AppEng.Gui.Whitelisted", "AppEng.Gui.WhitelistedDesc" );
 			registerApp( 16 * 8 + 3, Settings.INCLUSION, IncludeExclude.BLACKLIST, "AppEng.Gui.Blacklisted", "AppEng.Gui.BlacklistedDesc" );
@@ -185,6 +185,12 @@ public class GuiImgButton extends GuiButton implements ITooltip
 		}
 	}
 
+	@Override
+	public boolean isVisible()
+	{
+		return drawButton;
+	}
+
 	@Override
 	public void drawButton(Minecraft par1Minecraft, int par2, int par3)
 	{
@@ -244,9 +250,9 @@ public class GuiImgButton extends GuiButton implements ITooltip
 		return 256 - 1;
 	}
 
-	public Enum getSetting()
+	public Settings getSetting()
 	{
-		return buttonSetting;
+		return (Settings) buttonSetting;
 	}
 
 	public Enum getCurrentValue()
diff --git a/client/gui/widgets/GuiProgressBar.java b/client/gui/widgets/GuiProgressBar.java
index 18ea29166..75aee105b 100644
--- a/client/gui/widgets/GuiProgressBar.java
+++ b/client/gui/widgets/GuiProgressBar.java
@@ -93,4 +93,10 @@ public class GuiProgressBar extends GuiButton implements ITooltip
 		return height + 4;
 	}
 
+	@Override
+	public boolean isVisible()
+	{
+		return true;
+	}
+
 }
diff --git a/client/gui/widgets/ITooltip.java b/client/gui/widgets/ITooltip.java
index c5a1c0d4e..fb2a5ed65 100644
--- a/client/gui/widgets/ITooltip.java
+++ b/client/gui/widgets/ITooltip.java
@@ -42,4 +42,9 @@ public interface ITooltip
 	 */
 	int getHeight();
 
+	/**
+	 * @return true if button being drawn
+	 */
+	boolean isVisible();
+
 }