diff --git a/core/src/main/assets/fonts/pixel_font.ttf b/core/src/main/assets/fonts/pixel_font.ttf
index d75c17fb9..28cfd140d 100644
Binary files a/core/src/main/assets/fonts/pixel_font.ttf and b/core/src/main/assets/fonts/pixel_font.ttf differ
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
index cd3619525..621a2b620 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
@@ -512,7 +512,8 @@ public class Item implements Bundlable {
 				note = Notes.findCustomRecord(getClass());
 			}
 			if (note != null){
-				return Messages.get(this, "custom_note", note.title()) + "\n\n" + desc();
+				//we swap underscore(0x5F) with low macron(0x2CD) here to avoid highlighting in the item window
+				return Messages.get(this, "custom_note", note.title().replace('_', 'ˍ')) + "\n\n" + desc();
 			}
 		}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index 8fe5d07c4..9fd1c2116 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -187,7 +187,8 @@ public class Ring extends KindofMisc {
 		} else if (Notes.findCustomRecord(customNoteID) == null) {
 			Notes.CustomRecord note = Notes.findCustomRecord(getClass());
 			if (note != null){
-				desc = Messages.get(this, "custom_note", note.title()) + "\n\n" + super.info();
+				//we swap underscore(0x5F) with low macron(0x2CD) here to avoid highlighting in the item window
+				desc = Messages.get(this, "custom_note", note.title().replace('_', 'ˍ')) + "\n\n" + super.info();
 			} else {
 				desc = super.info();
 			}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/CustomNoteButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/CustomNoteButton.java
index 28db928b0..33b06ba74 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/CustomNoteButton.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/CustomNoteButton.java
@@ -328,6 +328,10 @@ public class CustomNoteButton extends IconButton {
 			resize(width, (int)delete.bottom());
 		}
 
+		@Override
+		protected boolean useHighlighting() {
+			return false;
+		}
 	}
 
 	private static void addNote(Notes.CustomRecord note, String promptTitle, String prompttext){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
index ba7f93d37..49444257a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
@@ -49,6 +49,7 @@ public class WndTitledMessage extends Window {
 		add(titlebar);
 
 		RenderedTextBlock text = PixelScene.renderTextBlock( 6 );
+		if (!useHighlighting()) text.setHightlighting(false);
 		text.text( message, width );
 		text.setPos( titlebar.left(), titlebar.bottom() + 2*GAP );
 		add( text );
@@ -66,4 +67,8 @@ public class WndTitledMessage extends Window {
 
 		resize( width, (int)text.bottom() + 2 );
 	}
+
+	protected boolean useHighlighting(){
+		return true;
+	}
 }