diff --git a/data/resources/gamedb.json b/data/resources/gamedb.json
index ace122d69..915ea2f21 100644
--- a/data/resources/gamedb.json
+++ b/data/resources/gamedb.json
@@ -147901,7 +147901,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Europe)",
   "discSetSerials": [
@@ -147944,7 +147945,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Europe)",
   "discSetSerials": [
@@ -147987,7 +147989,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Europe)",
   "discSetSerials": [
@@ -148030,7 +148033,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (France)",
   "discSetSerials": [
@@ -148073,7 +148077,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (France)",
   "discSetSerials": [
@@ -148116,7 +148121,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (France)",
   "discSetSerials": [
@@ -148159,7 +148165,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Germany)",
   "discSetSerials": [
@@ -148202,7 +148209,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Germany)",
   "discSetSerials": [
@@ -148245,7 +148253,8 @@
    }
   ],
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Germany)",
   "discSetSerials": [
@@ -148296,7 +148305,10 @@
    "SLPS-00700",
    "SLPS-00701",
    "SLPS-00702"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPS-00701",
@@ -148336,7 +148348,10 @@
    "SLPS-00700",
    "SLPS-00701",
    "SLPS-00702"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPS-00702",
@@ -148376,7 +148391,10 @@
    "SLPS-00700",
    "SLPS-00701",
    "SLPS-00702"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCES-00900",
@@ -148425,7 +148443,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Spain)",
   "discSetSerials": [
@@ -148481,7 +148500,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Spain)",
   "discSetSerials": [
@@ -148537,7 +148557,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "DisplayActiveStartOffset": -44
+   "DisplayActiveStartOffset": -44,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VII (Spain)",
   "discSetSerials": [
@@ -148604,7 +148625,10 @@
    "SCUS-94163",
    "SCUS-94164",
    "SCUS-94165"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCUS-94164",
@@ -148648,7 +148672,10 @@
    "SCUS-94163",
    "SCUS-94164",
    "SCUS-94165"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCUS-94165",
@@ -148692,7 +148719,10 @@
    "SCUS-94163",
    "SCUS-94164",
    "SCUS-94165"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCUS-94961",
@@ -148709,7 +148739,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCUS-94179",
@@ -148726,7 +148759,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCPS-45007",
@@ -148752,7 +148788,10 @@
   "linkCable": false,
   "controllers": [
    "DigitalController"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-84020",
@@ -148796,7 +148835,10 @@
    "SLPM-84021",
    "SLPM-84022",
    "SLPM-87383"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-84021",
@@ -148840,7 +148882,10 @@
    "SLPM-84021",
    "SLPM-84022",
    "SLPM-87383"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-84022",
@@ -148884,7 +148929,10 @@
    "SLPM-84021",
    "SLPM-84022",
    "SLPM-87383"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-87383",
@@ -148931,7 +148979,10 @@
    "SLPM-84021",
    "SLPM-84022",
    "SLPM-87383"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCED-02062",
@@ -148948,7 +148999,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLED-02258",
@@ -148965,7 +149019,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCES-02080",
@@ -149007,7 +149064,8 @@
    "versionTested": "0.1-986-gfc911de1"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Europe, Australia)",
   "discSetSerials": [
@@ -149057,7 +149115,8 @@
    "versionTested": "0.1-986-gfc911de1"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Europe, Australia)",
   "discSetSerials": [
@@ -149107,7 +149166,8 @@
    "versionTested": "0.1-986-gfc911de1"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Europe, Australia)",
   "discSetSerials": [
@@ -149157,7 +149217,8 @@
    "versionTested": "0.1-986-gfc911de1"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Europe, Australia)",
   "discSetSerials": [
@@ -149182,7 +149243,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLES-02081",
@@ -149219,7 +149283,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (France)",
   "discSetSerials": [
@@ -149264,7 +149329,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (France)",
   "discSetSerials": [
@@ -149309,7 +149375,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (France)",
   "discSetSerials": [
@@ -149354,7 +149421,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (France)",
   "discSetSerials": [
@@ -149399,7 +149467,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Germany)",
   "discSetSerials": [
@@ -149444,7 +149513,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Germany)",
   "discSetSerials": [
@@ -149489,7 +149559,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Germany)",
   "discSetSerials": [
@@ -149534,7 +149605,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Germany)",
   "discSetSerials": [
@@ -149579,7 +149651,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Italy)",
   "discSetSerials": [
@@ -149624,7 +149697,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Italy)",
   "discSetSerials": [
@@ -149669,7 +149743,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Italy)",
   "discSetSerials": [
@@ -149714,7 +149789,8 @@
    }
   ],
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Italy)",
   "discSetSerials": [
@@ -149768,7 +149844,10 @@
    "SLPM-87385",
    "SLPM-87386",
    "SLPM-87387"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-87385",
@@ -149811,7 +149890,10 @@
    "SLPM-87385",
    "SLPM-87386",
    "SLPM-87387"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-87386",
@@ -149854,7 +149936,10 @@
    "SLPM-87385",
    "SLPM-87386",
    "SLPM-87387"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-87387",
@@ -149897,7 +149982,10 @@
    "SLPM-87385",
    "SLPM-87386",
    "SLPM-87387"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPM-80269",
@@ -149914,7 +150002,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLED-02262",
@@ -149931,7 +150022,10 @@
      }
     ]
    }
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLES-02084",
@@ -149972,7 +150066,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Spain)",
   "discSetSerials": [
@@ -150021,7 +150116,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Spain)",
   "discSetSerials": [
@@ -150070,7 +150166,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Spain)",
   "discSetSerials": [
@@ -150119,7 +150216,8 @@
    "versionTested": "0.1-4416-g24b4be51"
   },
   "traits": {
-   "IsLibCryptProtected": true
+   "IsLibCryptProtected": true,
+   "DisableWidescreen": true
   },
   "discSetName": "Final Fantasy VIII (Spain)",
   "discSetSerials": [
@@ -150173,7 +150271,10 @@
    "SLUS-00908",
    "SLUS-00909",
    "SLUS-00910"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLUS-00908",
@@ -150219,7 +150320,10 @@
    "SLUS-00908",
    "SLUS-00909",
    "SLUS-00910"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLUS-00909",
@@ -150265,7 +150369,10 @@
    "SLUS-00908",
    "SLUS-00909",
    "SLUS-00910"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLUS-00910",
@@ -150311,7 +150418,10 @@
    "SLUS-00908",
    "SLUS-00909",
    "SLUS-00910"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCPS-45375",
@@ -150339,7 +150449,10 @@
   "controllers": [
    "AnalogController",
    "DigitalController"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SLPS-01266",
@@ -400430,6 +400543,9 @@
   "compatibility": {
    "rating": 5,
    "versionTested": "0.1-1323-ga6acd33"
+  },
+  "traits": {
+   "DisableWidescreen": true
   }
  },
  {
diff --git a/src/core/game_database.cpp b/src/core/game_database.cpp
index ede2d0458..4fe4f531d 100644
--- a/src/core/game_database.cpp
+++ b/src/core/game_database.cpp
@@ -24,6 +24,8 @@
 #include <optional>
 #include <sstream>
 
+#include "IconsFontAwesome5.h"
+
 Log_SetChannel(GameDatabase);
 
 #ifdef _WIN32
@@ -233,8 +235,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.cpu_execution_mode != CPUExecutionMode::Interpreter)
     {
-      Host::AddKeyedOSDMessage("gamedb_force_interpreter",
-                               TRANSLATE_STR("OSDMessage", "CPU interpreter forced by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_force_interpreter", ICON_FA_MICROCHIP,
+                              TRANSLATE_STR("OSDMessage", "CPU interpreter forced by game settings."), osd_duration);
     }
 
     settings.cpu_execution_mode = CPUExecutionMode::Interpreter;
@@ -244,8 +246,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_renderer != GPURenderer::Software)
     {
-      Host::AddKeyedOSDMessage("gamedb_force_software",
-                               TRANSLATE_STR("OSDMessage", "Software renderer forced by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_force_software", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "Software renderer forced by game settings."), osd_duration);
     }
 
     settings.gpu_renderer = GPURenderer::Software;
@@ -255,8 +257,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_renderer != GPURenderer::Software)
     {
-      Host::AddKeyedOSDMessage(
-        "gamedb_force_software_rb",
+      Host::AddIconOSDMessage(
+        "gamedb_force_software_rb", ICON_FA_MAGIC,
         TRANSLATE_STR("OSDMessage", "Using software renderer for readbacks based on game settings."), osd_duration);
     }
 
@@ -267,8 +269,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_disable_interlacing)
     {
-      Host::AddKeyedOSDMessage("gamedb_force_interlacing",
-                               TRANSLATE_STR("OSDMessage", "Interlacing forced by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_force_interlacing", ICON_FA_TV,
+                              TRANSLATE_STR("OSDMessage", "Interlacing forced by game settings."), osd_duration);
     }
 
     settings.gpu_disable_interlacing = false;
@@ -278,8 +280,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_true_color)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_true_color",
-                               TRANSLATE_STR("OSDMessage", "True color disabled by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_true_color", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "True color disabled by game settings."), osd_duration);
     }
 
     settings.gpu_true_color = false;
@@ -289,8 +291,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_resolution_scale > 1)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_upscaling",
-                               TRANSLATE_STR("OSDMessage", "Upscaling disabled by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_upscaling", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "Upscaling disabled by game settings."), osd_duration);
     }
 
     settings.gpu_resolution_scale = 1;
@@ -300,9 +302,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_scaled_dithering)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_scaled_dithering",
-                               TRANSLATE_STR("OSDMessage", "Scaled dithering disabled by game settings."),
-                               osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_scaled_dithering", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "Scaled dithering disabled by game settings."), osd_duration);
     }
 
     settings.gpu_scaled_dithering = false;
@@ -310,14 +311,13 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
 
   if (HasTrait(Trait::DisableWidescreen))
   {
-    if (display_osd_messages &&
-        (settings.display_aspect_ratio == DisplayAspectRatio::R16_9 || settings.gpu_widescreen_hack))
+    if (display_osd_messages && settings.gpu_widescreen_hack)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_widescreen",
-                               TRANSLATE_STR("OSDMessage", "Widescreen disabled by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_widescreen", ICON_FA_TV,
+                              TRANSLATE_STR("OSDMessage", "Widescreen rendering disabled by game settings."),
+                              osd_duration);
     }
 
-    settings.display_aspect_ratio = DisplayAspectRatio::R4_3;
     settings.gpu_widescreen_hack = false;
   }
 
@@ -325,9 +325,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_force_ntsc_timings)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_force_ntsc_timings",
-                               TRANSLATE_STR("OSDMessage", "Forcing NTSC Timings disallowed by game settings."),
-                               osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_force_ntsc_timings", ICON_FA_TV,
+                              TRANSLATE_STR("OSDMessage", "Forcing NTSC Timings disallowed by game settings."),
+                              osd_duration);
     }
 
     settings.gpu_force_ntsc_timings = false;
@@ -337,9 +337,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_pgxp",
-                               TRANSLATE_STR("OSDMessage", "PGXP geometry correction disabled by game settings."),
-                               osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_pgxp", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "PGXP geometry correction disabled by game settings."),
+                              osd_duration);
     }
 
     settings.gpu_pgxp_enable = false;
@@ -349,8 +349,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_culling)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_pgxp_culling",
-                               TRANSLATE_STR("OSDMessage", "PGXP culling disabled by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_pgxp_culling", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "PGXP culling disabled by game settings."), osd_duration);
     }
 
     settings.gpu_pgxp_culling = false;
@@ -360,8 +360,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_texture_correction)
     {
-      Host::AddKeyedOSDMessage(
-        "gamedb_disable_pgxp_texture",
+      Host::AddIconOSDMessage(
+        "gamedb_disable_pgxp_texture", ICON_FA_MAGIC,
         TRANSLATE_STR("OSDMessage", "PGXP perspective corrected textures disabled by game settings."), osd_duration);
     }
 
@@ -373,8 +373,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
     if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_texture_correction &&
         settings.gpu_pgxp_color_correction)
     {
-      Host::AddKeyedOSDMessage(
-        "gamedb_disable_pgxp_texture",
+      Host::AddIconOSDMessage(
+        "gamedb_disable_pgxp_texture", ICON_FA_MAGIC,
         TRANSLATE_STR("OSDMessage", "PGXP perspective corrected colors disabled by game settings."), osd_duration);
     }
 
@@ -385,8 +385,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_vertex_cache)
     {
-      Host::AddKeyedOSDMessage("gamedb_force_pgxp_vertex_cache",
-                               TRANSLATE_STR("OSDMessage", "PGXP vertex cache forced by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_force_pgxp_vertex_cache", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "PGXP vertex cache forced by game settings."), osd_duration);
     }
 
     settings.gpu_pgxp_vertex_cache = true;
@@ -396,8 +396,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable && !settings.gpu_pgxp_cpu)
     {
-      Host::AddKeyedOSDMessage("gamedb_force_pgxp_cpu",
-                               TRANSLATE_STR("OSDMessage", "PGXP CPU mode forced by game settings."), osd_duration);
+      Host::AddIconOSDMessage("gamedb_force_pgxp_cpu", ICON_FA_MICROCHIP,
+                              TRANSLATE_STR("OSDMessage", "PGXP CPU mode forced by game settings."), osd_duration);
     }
 
     settings.gpu_pgxp_cpu = true;
@@ -407,9 +407,9 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   {
     if (display_osd_messages && settings.gpu_pgxp_enable && settings.gpu_pgxp_depth_buffer)
     {
-      Host::AddKeyedOSDMessage("gamedb_disable_pgxp_depth",
-                               TRANSLATE_STR("OSDMessage", "PGXP Depth Buffer disabled by game settings."),
-                               osd_duration);
+      Host::AddIconOSDMessage("gamedb_disable_pgxp_depth", ICON_FA_MAGIC,
+                              TRANSLATE_STR("OSDMessage", "PGXP Depth Buffer disabled by game settings."),
+                              osd_duration);
     }
 
     settings.gpu_pgxp_depth_buffer = false;