diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index f6a2543960b..472551b8d8e 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -4009,8 +4009,9 @@ protected:
 
 void gpoker_state::prepare_display()
 {
-	set_display_segmask(0x7ff, 0x7f);
-	display_matrix(12, 11, m_o | (m_r >> 3 & 0xf00), m_r & 0x7ff);
+	set_display_segmask(0x7ff, 0x20ff); // 7seg + bottom-right diagonal
+	u16 segs = BITSWAP16(m_o, 15,14,7,12,11,10,9,8,6,6,5,4,3,2,1,0) & 0x20ff;
+	display_matrix(14, 11, segs | (m_r >> 3 & 0xf00), m_r & 0x7ff);
 }
 
 WRITE16_MEMBER(gpoker_state::write_r)
diff --git a/src/mame/layout/gjackpot.lay b/src/mame/layout/gjackpot.lay
index b05b961360d..0b1ef189161 100644
--- a/src/mame/layout/gjackpot.lay
+++ b/src/mame/layout/gjackpot.lay
@@ -21,12 +21,9 @@
 	<element name="text_9"><text string="9"><color red="0.9" green="0.8" blue="0.3" /></text></element>
 	<element name="text_10"><text string="10"><color red="0.9" green="0.8" blue="0.3" /></text></element>
 
+	<!-- actually a 8seg digit: default 7seg + bottom-right diagonal -->
 	<element name="digit" defstate="0">
-		<led7seg><color red="0.2" green="1.0" blue="0.9" /></led7seg>
-	</element>
-	<element name="seg_h" defstate="0">
-		<text state="0" string="\"><color red="0.0235" green="0.1255" blue="0.1098" /></text>
-		<text state="1" string="\"><color red="0.2" green="1.0" blue="0.9" /></text>
+		<led14seg><color red="0.2" green="1.0" blue="0.9" /></led14seg>
 	</element>
 
 	<element name="sym_heart" defstate="0">
@@ -69,18 +66,6 @@
 		<bezel name="digit1" element="digit"><bounds x="92" y="19" width="10" height="15" /></bezel>
 		<bezel name="digit0" element="digit"><bounds x="102" y="19" width="10" height="15" /></bezel>
 
-		<bezel name="10.7" element="seg_h"><bounds x="3" y="27" width="8" height="5" /></bezel>
-		<bezel name="9.7" element="seg_h"><bounds x="13" y="27" width="8" height="5" /></bezel>
-		<bezel name="8.7" element="seg_h"><bounds x="23" y="27" width="8" height="5" /></bezel>
-		<bezel name="7.7" element="seg_h"><bounds x="33" y="27" width="8" height="5" /></bezel>
-		<bezel name="6.7" element="seg_h"><bounds x="43" y="27" width="8" height="5" /></bezel>
-		<bezel name="5.7" element="seg_h"><bounds x="53" y="27" width="8" height="5" /></bezel>
-		<bezel name="4.7" element="seg_h"><bounds x="63" y="27" width="8" height="5" /></bezel>
-		<bezel name="3.7" element="seg_h"><bounds x="73" y="27" width="8" height="5" /></bezel>
-		<bezel name="2.7" element="seg_h"><bounds x="83" y="27" width="8" height="5" /></bezel>
-		<bezel name="1.7" element="seg_h"><bounds x="93" y="27" width="8" height="5" /></bezel>
-		<bezel name="0.7" element="seg_h"><bounds x="103" y="27" width="8" height="5" /></bezel>
-
 	<!-- VFD card symbols -->
 
 		<bezel name="10.10" element="sym_heart"><bounds x="4" y="15" width="3" height="3" /></bezel>
diff --git a/src/mame/layout/gpoker.lay b/src/mame/layout/gpoker.lay
index 93ac57a043c..18c8cd6a74f 100644
--- a/src/mame/layout/gpoker.lay
+++ b/src/mame/layout/gpoker.lay
@@ -13,12 +13,9 @@
 	<element name="text_4"><text string="4"><color red="0.9" green="0.9" blue="0.9" /></text></element>
 	<element name="text_5"><text string="5"><color red="0.9" green="0.9" blue="0.9" /></text></element>
 
+	<!-- actually a 8seg digit: default 7seg + bottom-right diagonal -->
 	<element name="digit" defstate="0">
-		<led7seg><color red="0.2" green="1.0" blue="0.9" /></led7seg>
-	</element>
-	<element name="seg_h" defstate="0">
-		<text state="0" string="\"><color red="0.0235" green="0.1255" blue="0.1098" /></text>
-		<text state="1" string="\"><color red="0.2" green="1.0" blue="0.9" /></text>
+		<led14seg><color red="0.2" green="1.0" blue="0.9" /></led14seg>
 	</element>
 
 	<element name="sym_heart" defstate="0">
@@ -61,18 +58,6 @@
 		<bezel name="digit1" element="digit"><bounds x="92" y="12" width="10" height="15" /></bezel>
 		<bezel name="digit0" element="digit"><bounds x="102" y="12" width="10" height="15" /></bezel>
 
-		<bezel name="9.7" element="seg_h"><bounds x="3" y="20" width="8" height="5" /></bezel>
-		<bezel name="8.7" element="seg_h"><bounds x="13" y="20" width="8" height="5" /></bezel>
-		<bezel name="7.7" element="seg_h"><bounds x="23" y="20" width="8" height="5" /></bezel>
-		<bezel name="6.7" element="seg_h"><bounds x="33" y="20" width="8" height="5" /></bezel>
-		<bezel name="5.7" element="seg_h"><bounds x="43" y="20" width="8" height="5" /></bezel>
-		<bezel name="10.7" element="seg_h"><bounds x="53" y="20" width="8" height="5" /></bezel>
-		<bezel name="4.7" element="seg_h"><bounds x="63" y="20" width="8" height="5" /></bezel>
-		<bezel name="3.7" element="seg_h"><bounds x="73" y="20" width="8" height="5" /></bezel>
-		<bezel name="2.7" element="seg_h"><bounds x="83" y="20" width="8" height="5" /></bezel>
-		<bezel name="1.7" element="seg_h"><bounds x="93" y="20" width="8" height="5" /></bezel>
-		<bezel name="0.7" element="seg_h"><bounds x="103" y="20" width="8" height="5" /></bezel>
-
 	<!-- VFD card symbols -->
 
 		<bezel name="9.10" element="sym_heart"><bounds x="4" y="8" width="3" height="3" /></bezel>