diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java
index d37399cf..835543da 100644
--- a/common/buildcraft/transport/Gate.java
+++ b/common/buildcraft/transport/Gate.java
@@ -23,6 +23,7 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
+import java.util.BitSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +43,8 @@ public final class Gate {
 	public ITrigger[] triggers = new ITrigger[8];
 	public ITriggerParameter[] triggerParameters = new ITriggerParameter[8];
 	public IAction[] actions = new IAction[8];
-	public boolean broadcastSignal[] = new boolean[4];
+	public BitSet broadcastSignal = new BitSet(PipeWire.VALUES.length);
+	public BitSet prevBroadcastSignal = new BitSet(PipeWire.VALUES.length);
 	public int redstoneOutput = 0;
 
 	// / CONSTRUCTOR
@@ -108,8 +110,8 @@ public final class Gate {
 			}
 		}
 
-		for (int i = 0; i < 4; ++i) {
-			data.setBoolean("wireState[" + i + "]", broadcastSignal[i]);
+		for (PipeWire wire : PipeWire.VALUES) {
+			data.setBoolean("wireState[" + wire.ordinal() + "]", broadcastSignal.get(wire.ordinal()));
 		}
 		data.setByte("redstoneOutput", (byte) redstoneOutput);
 	}
@@ -126,8 +128,8 @@ public final class Gate {
 			}
 		}
 
-		for (int i = 0; i < 4; ++i) {
-			broadcastSignal[i] = data.getBoolean("wireState[" + i + "]");
+		for (PipeWire wire : PipeWire.VALUES) {
+			broadcastSignal.set(wire.ordinal(), data.getBoolean("wireState[" + wire.ordinal() + "]"));
 		}
 		redstoneOutput = data.getByte("redstoneOutput");
 	}
@@ -162,11 +164,12 @@ public final class Gate {
 	}
 
 	public boolean isGateActive() {
-		for (boolean b : broadcastSignal) {
-			if (b)
+		for (GateExpansionController expansion : expansions.values()) {
+			if (expansion.isActive())
 				return true;
 		}
-		return redstoneOutput > 0;
+		return redstoneOutput > 0 || !broadcastSignal.isEmpty();
+
 	}
 
 	public int getRedstoneOutput() {
@@ -181,10 +184,12 @@ public final class Gate {
 
 	public void resolveActions() {
 		int oldRedstoneOutput = redstoneOutput;
-		boolean[] oldBroadcastSignal = broadcastSignal;
-
 		redstoneOutput = 0;
-		broadcastSignal = new boolean[4];
+
+		BitSet temp = prevBroadcastSignal;
+		temp.clear();
+		prevBroadcastSignal = broadcastSignal;
+		broadcastSignal = temp;
 
 		// Tell the gate to prepare for resolving actions. (Disable pulser)
 		startResolution();
@@ -225,7 +230,7 @@ public final class Gate {
 				} else if (action instanceof ActionRedstoneFaderOutput) {
 					redstoneOutput = ((ActionRedstoneFaderOutput) action).level;
 				} else if (action instanceof ActionSignalOutput) {
-					broadcastSignal[((ActionSignalOutput) action).color.ordinal()] = true;
+					broadcastSignal.set(((ActionSignalOutput) action).color.ordinal());
 				} else {
 					for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
 						TileEntity tile = pipe.container.getTile(side);
@@ -246,12 +251,9 @@ public final class Gate {
 			pipe.updateNeighbors(true);
 		}
 
-		for (int i = 0; i < oldBroadcastSignal.length; ++i) {
-			if (oldBroadcastSignal[i] != broadcastSignal[i]) {
-				pipe.container.scheduleRenderUpdate();
-				pipe.updateSignalState();
-				break;
-			}
+		if (!prevBroadcastSignal.equals(broadcastSignal)) {
+			pipe.container.scheduleRenderUpdate();
+			pipe.updateSignalState();
 		}
 	}
 
diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java
index b25c8ae4..54c435c8 100644
--- a/common/buildcraft/transport/Pipe.java
+++ b/common/buildcraft/transport/Pipe.java
@@ -277,30 +277,30 @@ public abstract class Pipe<T extends PipeTransport> implements IDropControlInven
 		}
 	}
 
-	private void updateSignalStateForColor(PipeWire color) {
-		if (!wireSet[color.ordinal()])
+	private void updateSignalStateForColor(PipeWire wire) {
+		if (!wireSet[wire.ordinal()])
 			return;
 
 		// STEP 1: compute internal signal strength
 
-		if (gate != null && gate.broadcastSignal[color.ordinal()]) {
-			receiveSignal(255, color);
+		if (gate != null && gate.broadcastSignal.get(wire.ordinal())) {
+			receiveSignal(255, wire);
 		} else {
-			readNearbyPipesSignal(color);
+			readNearbyPipesSignal(wire);
 		}
 
 		// STEP 2: transmit signal in nearby blocks
 
-		if (signalStrength[color.ordinal()] > 1) {
+		if (signalStrength[wire.ordinal()] > 1) {
 			for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) {
 				TileEntity tile = container.getTile(o);
 
 				if (tile instanceof TileGenericPipe) {
 					TileGenericPipe tilePipe = (TileGenericPipe) tile;
 
-					if (BlockGenericPipe.isFullyDefined(tilePipe.pipe) && tilePipe.pipe.wireSet[color.ordinal()])
-						if (isWireConnectedTo(tile, color)) {
-							tilePipe.pipe.receiveSignal(signalStrength[color.ordinal()] - 1, color);
+					if (BlockGenericPipe.isFullyDefined(tilePipe.pipe) && tilePipe.pipe.wireSet[wire.ordinal()])
+						if (isWireConnectedTo(tile, wire)) {
+							tilePipe.pipe.receiveSignal(signalStrength[wire.ordinal()] - 1, wire);
 						}
 				}
 			}
diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java
index 3718a8f6..b7493d59 100644
--- a/common/buildcraft/transport/render/PipeRendererTESR.java
+++ b/common/buildcraft/transport/render/PipeRendererTESR.java
@@ -458,7 +458,13 @@ public class PipeRendererTESR extends TileEntitySpecialRenderer {
 
 		bindTexture(TextureMap.locationBlocksTexture);
 
-		renderGate(pipe, pipe.pipe.gate.logic.getIconDark(), 0);
+		Icon iconLogic;
+		if (pipe.pipe.gate.isGateActive())
+			iconLogic = pipe.pipe.gate.logic.getIconLit();
+		else
+			iconLogic = pipe.pipe.gate.logic.getIconDark();
+
+		renderGate(pipe, iconLogic, 0);
 
 		Icon materialIcon = pipe.pipe.gate.material.getIconBlock();
 		if (materialIcon != null)