diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
index 67f0ab20a9..76a4ffebe3 100644
--- a/imgui/CMakeLists.txt
+++ b/imgui/CMakeLists.txt
@@ -22,8 +22,8 @@ FetchContent_Declare(
 )
 FetchContent_Declare(
     fonts
-    URL         https://github.com/wpilibsuite/thirdparty-fonts/releases/download/v0.1/fonts.zip
-    URL_HASH    SHA256=0d1cc6cfc86953a676993e23adcfb259ae621f3e1cc675761a5c4457472345da
+    URL         https://github.com/wpilibsuite/thirdparty-fonts/releases/download/v0.2/fonts.zip
+    URL_HASH    SHA256=cedf365657fab0770e11f72d49e4f0f889f564d2e635a4d214029d0ab6bcd324
 )
 FetchContent_Declare(
     stb
diff --git a/shared/config.gradle b/shared/config.gradle
index 1dd876b1eb..295d470655 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -17,7 +17,7 @@ nativeUtils {
             niLibVersion = "2023.1.0"
             opencvVersion = "4.6.0-3"
             googleTestVersion = "1.11.0-4"
-            imguiVersion = "1.88-9"
+            imguiVersion = "1.88-12"
             wpimathVersion = "-1"
         }
     }
diff --git a/wpigui/src/main/native/cpp/wpigui.cpp b/wpigui/src/main/native/cpp/wpigui.cpp
index 0dc9c8f4b9..a93ca2b164 100644
--- a/wpigui/src/main/native/cpp/wpigui.cpp
+++ b/wpigui/src/main/native/cpp/wpigui.cpp
@@ -9,7 +9,9 @@
 #include <cstring>
 
 #include <GLFW/glfw3.h>
+#include <IconsFontAwesome6.h>
 #include <imgui.h>
+#include <imgui_FontAwesomeSolid.h>
 #include <imgui_ProggyDotted.h>
 #include <imgui_impl_glfw.h>
 #include <imgui_internal.h>
@@ -104,7 +106,13 @@ static void IniWriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler,
 void gui::CreateContext() {
   gContext = new Context;
   AddFont("ProggyDotted", [](ImGuiIO& io, float size, const ImFontConfig* cfg) {
-    return ImGui::AddFontProggyDotted(io, size, cfg);
+    auto font = ImGui::AddFontProggyDotted(io, size, cfg);
+    static const ImWchar icons_ranges[] = {ICON_MIN_FA, ICON_MAX_16_FA, 0};
+    ImFontConfig icons_cfg;
+    icons_cfg.MergeMode = true;
+    icons_cfg.PixelSnapH = true;
+    ImGui::AddFontFontAwesomeSolid(io, size, &icons_cfg, icons_ranges);
+    return font;
   });
   PlatformCreateContext();
 }