1 files changed, 5 insertions, 4 deletions

diff --git a/src/TooltipWindow.cc b/src/TooltipWindow.cc
index 79d4163..0fb7273 100644
--- a/src/TooltipWindow.cc
+++ b/src/TooltipWindow.cc
@@ -55,8 +55,8 @@ void TooltipWindow::raiseTooltip() {
 
     resize(m_lastText);
     reconfigTheme();
-    int h = theme()->font().height() + theme()->bevelWidth() * 2;
-    int w = theme()->font().textWidth(m_lastText) + theme()->bevelWidth() * 2;
+    int h = theme()->iconbarTheme().text().font().height() + theme()->bevelWidth() * 2;
+    int w = theme()->iconbarTheme().text().font().textWidth(m_lastText) + theme()->bevelWidth() * 2;
 
     Window root_ret; // not used
     Window window_ret; // not used
@@ -90,11 +90,12 @@ void TooltipWindow::raiseTooltip() {
 
     show();
     clear();
-    theme()->font().drawText(*this, screen().screenNumber(),
+    // TODO: make this use a TextButton like TextDialog does
+    theme()->iconbarTheme().text().font().drawText(*this, screen().screenNumber(),
                              theme()->iconbarTheme().text().textGC(), 
                              m_lastText,
                              theme()->bevelWidth(),
-                             theme()->bevelWidth() + theme()->font().ascent());
+                             theme()->bevelWidth() + theme()->iconbarTheme().text().font().ascent());
 }
 
 void TooltipWindow::updateText(const FbTk::BiDiString& text) {