diff --git a/src/Gui/Inventor/SoFCPlacementIndicatorKit.h b/src/Gui/Inventor/SoFCPlacementIndicatorKit.h
index 57045b3660..1d07804c7a 100644
--- a/src/Gui/Inventor/SoFCPlacementIndicatorKit.h
+++ b/src/Gui/Inventor/SoFCPlacementIndicatorKit.h
@@ -26,6 +26,10 @@
 
 #include <Inventor/nodekits/SoBaseKit.h>
 
+#include <Inventor/fields/SoSFBool.h>
+#include <Inventor/fields/SoSFEnum.h>
+#include <Inventor/fields/SoSFFloat.h>
+
 #include <FCGlobal.h>
 
 namespace Gui {
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index 7c5a748e87..f96ac8c28a 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -22,6 +22,8 @@
 
 #include "PreCompiled.h"
 
+#include <Inventor/SoFCPlacementIndicatorKit.h>
+
 #ifndef _PreComp_
 # ifdef FC_OS_WIN32
 #  include <windows.h>
@@ -1425,15 +1427,18 @@ void View3DInventorViewer::setAxisCross(bool on)
 
     if (on) {
         if (!axisGroup) {
-            axisCross = new Gui::SoShapeScale;
-            auto axisKit = new Gui::SoAxisCrossKit();
-            axisKit->set("xAxis.appearance.drawStyle", "lineWidth 2");
-            axisKit->set("yAxis.appearance.drawStyle", "lineWidth 2");
-            axisKit->set("zAxis.appearance.drawStyle", "lineWidth 2");
-            axisCross->setPart("shape", axisKit);
-            axisCross->scaleFactor = 1.0F;
+            using enum SoFCPlacementIndicatorKit::Part;
+
+            constexpr float axisCrossLength = 2.0F;
+
+            auto axisCrossKit = new Gui::SoFCPlacementIndicatorKit();
+            axisCrossKit->axisLength = axisCrossLength;
+
+            auto annotation = new So3DAnnotation();
+            annotation->addChild(axisCrossKit);
+
             axisGroup = new SoSkipBoundingGroup;
-            axisGroup->addChild(axisCross);
+            axisGroup->addChild(annotation);
 
             sep->addChild(axisGroup);
         }