diff --git a/Ghidra/Features/Base/data/base.theme.properties b/Ghidra/Features/Base/data/base.theme.properties
index 20738c8cdd..c003efd1a2 100644
--- a/Ghidra/Features/Base/data/base.theme.properties
+++ b/Ghidra/Features/Base/data/base.theme.properties
@@ -30,9 +30,9 @@ color.fg.infopanel.version = color.fg
 
 color.fg.interpreterpanel = color.fg
 color.fg.interpreterpanel.error = color.fg.error
-color.fg.listing.highlighter.default = yellow
-color.fg.listing.highlighter.scoped.read = rgb(204,204, 0)
-color.fg.listing.highlighter.scoped.write = green
+color.bg.listing.highlighter.default = yellow
+color.bg.listing.highlighter.scoped.read = rgb(204,204, 0)
+color.bg.listing.highlighter.scoped.write = green
 
 color.bg.markerservice = color.bg
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/processors/generic/PcodeFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/processors/generic/PcodeFieldFactory.java
index e018bfabde..14069949e0 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/processors/generic/PcodeFieldFactory.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/processors/generic/PcodeFieldFactory.java
@@ -63,6 +63,7 @@ public class PcodeFieldFactory extends FieldFactory {
 		formatter = new AttributedStringPcodeFormatter();
 
 		setOptions(fieldOptions);
+		formatter.setFontMetrics(getMetrics());
 	}
 
 	@Override