2 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 6e36fa4..5d05a3d 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -200,8 +200,6 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
         assert((error != -1) && "Failed to load font.");
     }
 
-    QApplication::setFont(QFont("Lato"));
-
     bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0;
     tabs_ = nullptr;
     if (options.count("no-tabs") && !splitter_) {
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 249523c..f04575d 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -10,6 +10,7 @@
 
 #include <boost/bind.hpp>
 
+#include <QFont>
 #include <QLabel>
 #include <QMimeData>
 #include <QObject>
@@ -59,6 +60,10 @@ QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* setting
     connect(this, SIGNAL(clicked(const QModelIndex&)), this, SLOT(handleClicked(const QModelIndex&)));
 
     settings_->onSettingChanged.connect(boost::bind(&QtTreeWidget::handleSettingChanged, this, _1));
+
+    QFont lato = font();
+    lato.setFamily("Lato");
+    setFont(lato);
 }
 
 QtTreeWidget::~QtTreeWidget() {