diff --git a/testclient/AtCoreTest.desktop b/testclient/AtCoreTest.desktop
--- a/testclient/AtCoreTest.desktop
+++ b/testclient/AtCoreTest.desktop
@@ -1,9 +1,13 @@
 [Desktop Entry]
 Name=AtCore Test Client
-Exec=/usr/bin/AtCoreTest
+Name[nl]=AtCore testclient
+Name[pt]=Cliente de Testes do AtCore
+Name[sv]=AtCore testklient
+Name[uk]=Тестовий клієнт AtCore
+Name[x-test]=xxAtCore Test Clientxx
+Exec=AtCoreTest
 Icon=AtCoreTest
-Encoding=UTF-8
-Categories=Application;Graphics;
+Categories=Graphics;Qt;
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/testclient/AtCoreTest.menu b/testclient/AtCoreTest.menu
deleted file mode 100644
--- a/testclient/AtCoreTest.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(atcore):needs="x11" section="Graphics"\
-  title="AtCore Test Client" command="/usr/bin/AtCoreTest"
diff --git a/testclient/CMakeLists.txt b/testclient/CMakeLists.txt
--- a/testclient/CMakeLists.txt
+++ b/testclient/CMakeLists.txt
@@ -21,11 +21,6 @@
 	install(TARGETS AtCoreTest RUNTIME DESTINATION bin)
 
 	install(FILES
-        "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.menu"
-        RENAME AtCoreTest
-        DESTINATION share/menu)
-
-	install(FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.png"
         DESTINATION share/pixmaps)
 
diff --git a/testclient/widgets/axiscontrol.cpp b/testclient/widgets/axiscontrol.cpp
--- a/testclient/widgets/axiscontrol.cpp
+++ b/testclient/widgets/axiscontrol.cpp
@@ -150,7 +150,6 @@
 void AxisControl::setLabels(QGraphicsItem *item, QLatin1Char axis, int value)
 {
     auto *lb = new QGraphicsSimpleTextItem();
-
     lb->setBrush(palette().buttonText());
 
     if (this->logicalDpiX() <= 96) {
@@ -174,14 +173,23 @@
             lb->setY(item->y() - item->boundingRect().height());
         }
     } else {
-
+#ifndef Q_OS_WIN
         if (value < 0) {
             lb->setX(item->x() + lb->boundingRect().width() / fontMetrics().width(lb->text()));
             lb->setY(item->y() - lb->boundingRect().height() / fontMetrics().xHeight());
         } else {
             lb->setX(item->x() + lb->boundingRect().width() / fontMetrics().width(lb->text()));
             lb->setY(item->y() - lb->boundingRect().height() / fontMetrics().xHeight());
         }
+#else
+        if (value < 0) {
+            lb->setX(item->x() + lb->boundingRect().width() / fontMetrics().width(lb->text()));
+            lb->setY(item->y() - lb->boundingRect().height() / fontMetrics().height());
+        } else {
+            lb->setX(item->x() + lb->boundingRect().width() / fontMetrics().width(lb->text()));
+            lb->setY(item->y() - lb->boundingRect().height() / fontMetrics().height());
+        }
+#endif
     }
     scene()->addItem(lb);
 }