1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 78fc42fb..2e1d006e 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -37,7 +37,6 @@
 
 #include "resources/image.h"
 #include "resources/imageset.h"
-#include "resources/imageloader.h"
 #include "resources/resourcemanager.h"
 #include "resources/theme.h"
 
@@ -88,10 +87,6 @@ Gui::Gui(Graphics *graphics):
     // Set graphics
     setGraphics(graphics);
 
-    // Set image loader
-    static ImageLoader imageLoader;
-    gcn::Image::setImageLoader(&imageLoader);
-
     // Set input
     guiInput = new SDLInput;
     setInput(guiInput);
@@ -112,7 +107,7 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     const int fontSize = config.getValue("fontSize", 11);
-    std::string fontFile = branding.getValue("font", "fonts/dejavusans.ttf");
+    std::string fontFile = branding.getValue("font", "fonts/DejaVuSerifCondensed.ttf");
     std::string path = resman->getPath(fontFile);
 
     try
@@ -127,7 +122,7 @@ Gui::Gui(Graphics *graphics):
     }
 
     // Set bold font
-    fontFile = branding.getValue("boldFont", "fonts/dejavusans-bold.ttf");
+    fontFile = branding.getValue("boldFont", "fonts/DejaVuSerifCondensed-Bold.ttf");
     path = resman->getPath(fontFile);
     try
     {
@@ -205,6 +200,9 @@ void Gui::draw()
     int mouseX, mouseY;
     Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
 
+    mouseX /= graphics->getScale();
+    mouseY /= graphics->getScale();
+
     if ((Client::hasMouseFocus() || button & SDL_BUTTON(1))
             && mCustomCursor
             && mMouseCursorAlpha > 0.0f)