diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index daa7ff5adbf..8af5ab7ae59 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -277,6 +277,10 @@
     --- DRIVER UPDATES ---
 
 
+    [2008-10-07]
+    - Improved the button-lamps layout to all games. Now are more realistic.
+
+
     [2008-06-09]
     - Added Videomat (polish bootleg).
 
diff --git a/src/mame/layout/ampoker2.lay b/src/mame/layout/ampoker2.lay
index d3ac3b999d8..0347debe2ac 100644
--- a/src/mame/layout/ampoker2.lay
+++ b/src/mame/layout/ampoker2.lay
@@ -1,80 +1,104 @@
 <?xml version="1.0"?>
 <mamelayout version="2">
 	<element name="L0" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="DEAL/TAKE" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="DEAL/TAKE">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L1" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="BET/RED" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="BET/RED">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L2" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="BLACK" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="BLACK">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L3" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD1" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD1">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L4" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD2" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD2">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L5" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD3" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD3">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L6" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD4" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD4">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L7" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD5" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD5">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
diff --git a/src/mame/layout/sigmapkr.lay b/src/mame/layout/sigmapkr.lay
index bb91c245081..783900e8b1d 100644
--- a/src/mame/layout/sigmapkr.lay
+++ b/src/mame/layout/sigmapkr.lay
@@ -1,80 +1,104 @@
 <?xml version="1.0"?>
 <mamelayout version="2">
 	<element name="L0" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="DEAL/TAKE" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="DEAL/TAKE">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L1" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="BET" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="BET">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L2" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="1.0" blue="1.0" />
 		</rect>
-		<text string="DOUBLE" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<text string="DOUBLE">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L3" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD1" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD1">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L4" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD2" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD2">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L5" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD3" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD3">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L6" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD4" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD4">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>
 	</element>
 
 	<element name="L7" defstate="1">
-		<rect>
+		<rect state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
 		</rect>
-		<text string="HOLD5" state="1">
+		<rect state="0">
+			<color red="0.3" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HOLD5">
 			<color red="0.0" green="0.0" blue="0.0" />
 			<bounds x="0" y="0.1" width="1" height="0.8" />
 		</text>