diff --git a/CMakeLists.txt b/CMakeLists.txt
index 882d24b644302598102fc7916ffb62398d603f82..99c939f56eb5a7774ee0dbe699d93f0b05a297fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,9 +69,10 @@ IF(NOT CLIENT_ONLY)
   SET(CMAKE_INCLUDE_CURRENT_DIR ON)
   IF(USE_QT4)
     FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGl QtNetwork)
-
+    # TODO PythonQt is currently only handled with Qt 4
     FIND_PACKAGE(PythonQt COMPONENTS QtAll)
     SET(GEPETTO_GUI_HAS_PYTHONQT (${PythonQt_FOUND} AND ${PythonQt_QtAll_FOUND}) CACHE BOOL "Use PythonQt dependency")
+    ADD_DEFINITIONS(-DUSE_QT4)
   ELSE(USE_QT4)
     FOREACH (component "Core" "Widgets" "Gui" "OpenGL" "Network")
       FIND_PACKAGE ("Qt5${component}" REQUIRED)
diff --git a/src/gui/main.cc.in b/src/gui/main.cc.in
index 09f1b5edded774c0ea37d0a8f67dfff9aca5376e..b21e6ea60e1467b5dc102101b0e04e9e2a087ee4 100644
--- a/src/gui/main.cc.in
+++ b/src/gui/main.cc.in
@@ -1,6 +1,6 @@
 #include <QApplication>
 #include <QSettings>
-#include <QCommonStyle>
+#include <QStyleFactory>
 #include <QProcessEnvironment>
 #include <QSplashScreen>
 #include <QIcon>
@@ -39,7 +39,13 @@ int main(int argc, char *argv[])
   QApplication::setAttribute(Qt::AA_X11InitThreads);
 
   SafeApplication a(argc, argv);
-  a.setStyle(new QCommonStyle);
+  a.setStyle(QStyleFactory::create (
+#if USE_QT4
+        "cleanlooks"
+#else // USE_QT4
+        "fusion"
+#endif // USE_QT4
+        ));
   QPixmap pixmap(":/img/gepetto.png");
   a.setWindowIcon(pixmap);