diff --git a/src/ui/gitree_ui.cpp b/src/ui/gitree_ui.cpp
index 44921fa..3d72b71 100644
--- a/src/ui/gitree_ui.cpp
+++ b/src/ui/gitree_ui.cpp
@@ -2197,12 +2197,19 @@ bool toolbar_action(const char* id, const char* label, const char* icon, const c
     if (enabled && ImGui::IsItemHovered())
         draw->AddRectFilled(minimum, maximum, IM_COL32(62, 66, 75, 210));
     const ImU32 text_color = enabled ? IM_COL32(218, 221, 226, 255) : IM_COL32(139, 144, 153, 255);
-    const ImVec2 label_size = ImGui::CalcTextSize(label);
-    const ImVec2 icon_size = ImGui::CalcTextSize(icon);
-    draw->AddText({minimum.x + (maximum.x - minimum.x - label_size.x) * 0.5f, minimum.y + ui(3.0f)},
+    const float label_font_size = ImGui::GetFontSize() * 0.72f;
+    const float icon_font_size = ImGui::GetFontSize() * 1.18f;
+    const ImVec2 label_size = g_regular_font
+        ? g_regular_font->CalcTextSizeA(label_font_size, std::numeric_limits<float>::max(), 0.0f, label)
+        : ImGui::CalcTextSize(label);
+    const ImVec2 icon_size = g_regular_font
+        ? g_regular_font->CalcTextSizeA(icon_font_size, std::numeric_limits<float>::max(), 0.0f, icon)
+        : ImGui::CalcTextSize(icon);
+    draw->AddText(g_regular_font, label_font_size,
+        {minimum.x + (maximum.x - minimum.x - label_size.x) * 0.5f, minimum.y + ui(2.5f)},
         text_color, label);
     const float icon_x = minimum.x + (maximum.x - minimum.x - icon_size.x) * 0.5f - (dropdown ? ui(4.0f) : 0.0f);
-    draw->AddText({icon_x, minimum.y + ui(25.0f)}, text_color, icon);
+    draw->AddText(g_regular_font, icon_font_size, {icon_x, minimum.y + ui(21.0f)}, text_color, icon);
     if (dropdown)
         draw->AddText({icon_x + icon_size.x + ui(7.0f), minimum.y + ui(23.0f)}, text_color, ICON_TB_CARET_DOWN);
     if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayShort)) {