diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py
index c262dda552..a468eb5fdf 100644
--- a/src/Mod/Tux/NavigationIndicatorGui.py
+++ b/src/Mod/Tux/NavigationIndicatorGui.py
@@ -337,49 +337,49 @@ a0.setData("Undefined")
 a0.setObjectName("Indicator_NavigationUndefined")
 
 a1 = QtGui.QAction(gStyle)
-a1.setIcon(QtGui.QIcon(":/icons/NavigationOpenInventor.svg"))
+a1.setIcon(QtGui.QIcon(":/icons/NavigationOpenInventor_dark.svg"))
 a1.setText("OpenInventor")
 a1.setData("Gui::InventorNavigationStyle")
 a1.setObjectName("Indicator_NavigationOpenInventor")
 
 a2 = QtGui.QAction(gStyle)
-a2.setIcon(QtGui.QIcon(':/icons/NavigationCAD.svg'))
+a2.setIcon(QtGui.QIcon(':/icons/NavigationCAD_dark.svg'))
 a2.setText("CAD")
 a2.setData("Gui::CADNavigationStyle")
 a2.setObjectName("Indicator_NavigationCAD")
 
 a3 = QtGui.QAction(gStyle)
-a3.setIcon(QtGui.QIcon(":/icons/NavigationRevit.svg"))
+a3.setIcon(QtGui.QIcon(":/icons/NavigationRevit_dark.svg"))
 a3.setText("Revit")
 a3.setData("Gui::RevitNavigationStyle")
 a3.setObjectName("Indicator_NavigationRevit")
 
 a4 = QtGui.QAction(gStyle)
-a4.setIcon(QtGui.QIcon(":/icons/NavigationBlender.svg"))
+a4.setIcon(QtGui.QIcon(":/icons/NavigationBlender_dark.svg"))
 a4.setText("Blender")
 a4.setData("Gui::BlenderNavigationStyle")
 a4.setObjectName("Indicator_NavigationBlender")
 
 a5 = QtGui.QAction(gStyle)
-a5.setIcon(QtGui.QIcon(":/icons/NavigationMayaGesture.svg"))
+a5.setIcon(QtGui.QIcon(":/icons/NavigationMayaGesture_dark.svg"))
 a5.setText("MayaGesture")
 a5.setData("Gui::MayaGestureNavigationStyle")
 a5.setObjectName("Indicator_NavigationMayaGesture")
 
 a6 = QtGui.QAction(gStyle)
-a6.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad.svg"))
+a6.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad_dark.svg"))
 a6.setText("Touchpad")
 a6.setData("Gui::TouchpadNavigationStyle")
 a6.setObjectName("Indicator_NavigationTouchpad")
 
 a7 = QtGui.QAction(gStyle)
-a7.setIcon(QtGui.QIcon(":/icons/NavigationGesture.svg"))
+a7.setIcon(QtGui.QIcon(":/icons/NavigationGesture_dark.svg"))
 a7.setText("Gesture")
 a7.setData("Gui::GestureNavigationStyle")
 a7.setObjectName("Indicator_NavigationGesture")
 
 a8 = QtGui.QAction(gStyle)
-a8.setIcon(QtGui.QIcon(":/icons/NavigationOpenCascade.svg"))
+a8.setIcon(QtGui.QIcon(":/icons/NavigationOpenCascade_dark.svg"))
 a8.setText("OpenCascade")
 a8.setData("Gui::OpenCascadeNavigationStyle")
 a8.setObjectName("Indicator_NavigationOpenCascade")
diff --git a/src/Mod/Tux/Resources/Tux.qrc b/src/Mod/Tux/Resources/Tux.qrc
index e0752531af..899f777f65 100644
--- a/src/Mod/Tux/Resources/Tux.qrc
+++ b/src/Mod/Tux/Resources/Tux.qrc
@@ -4,14 +4,14 @@
         <file>icons/NavigationBlender_Pan.svg</file>
         <file>icons/NavigationBlender_Rotate.svg</file>
         <file>icons/NavigationBlender_Select.svg</file>
-        <file>icons/NavigationBlender.svg</file>
+        <file>icons/NavigationBlender_dark.svg</file>
         <file>icons/NavigationBlender_Zoom.svg</file>
         <file>icons/NavigationCADAlt.svg</file>
         <file>icons/NavigationCAD_Pan.svg</file>
         <file>icons/NavigationCAD_RotateAlt.svg</file>
         <file>icons/NavigationCAD_Rotate.svg</file>
         <file>icons/NavigationCAD_Select.svg</file>
-        <file>icons/NavigationCAD.svg</file>
+        <file>icons/NavigationCAD_dark.svg</file>
         <file>icons/NavigationCAD_Zoom.svg</file>
         <file>icons/NavigationGesture_Pan.svg</file>
         <file>icons/NavigationGesture_PanTouchAlt.svg</file>
@@ -21,7 +21,7 @@
         <file>icons/NavigationGesture_RotateTouch.svg</file>
         <file>icons/NavigationGesture_Select.svg</file>
         <file>icons/NavigationGesture_SelectTouch.svg</file>
-        <file>icons/NavigationGesture.svg</file>
+        <file>icons/NavigationGesture_dark.svg</file>
         <file>icons/NavigationGesture_Tilt.svg</file>
         <file>icons/NavigationGesture_TiltTouch.svg</file>
         <file>icons/NavigationGesture_Zoom.svg</file>
@@ -33,7 +33,7 @@
         <file>icons/NavigationMayaGesture_RotateTouch.svg</file>
         <file>icons/NavigationMayaGesture_Select.svg</file>
         <file>icons/NavigationMayaGesture_SelectTouch.svg</file>
-        <file>icons/NavigationMayaGesture.svg</file>
+        <file>icons/NavigationMayaGesture_dark.svg</file>
         <file>icons/NavigationMayaGesture_Tilt.svg</file>
         <file>icons/NavigationMayaGesture_TiltTouch.svg</file>
         <file>icons/NavigationMayaGesture_ZoomAlt.svg</file>
@@ -43,18 +43,18 @@
         <file>icons/NavigationOpenCascade_Pan.svg</file>
         <file>icons/NavigationOpenCascade_Rotate.svg</file>
         <file>icons/NavigationOpenCascade_Select.svg</file>
-        <file>icons/NavigationOpenCascade.svg</file>
+        <file>icons/NavigationOpenCascade_dark.svg</file>
         <file>icons/NavigationOpenCascade_ZoomAlt.svg</file>
         <file>icons/NavigationOpenCascade_Zoom.svg</file>
         <file>icons/NavigationOpenInventor_Pan.svg</file>
         <file>icons/NavigationOpenInventor_Rotate.svg</file>
         <file>icons/NavigationOpenInventor_Select.svg</file>
-        <file>icons/NavigationOpenInventor.svg</file>
+        <file>icons/NavigationOpenInventor_dark.svg</file>
         <file>icons/NavigationOpenInventor_ZoomAlt.svg</file>
         <file>icons/NavigationOpenInventor_Zoom.svg</file>
         <file>icons/NavigationRevit_Pan.svg</file>
         <file>icons/NavigationRevit_Rotate.svg</file>
-        <file>icons/NavigationRevit.svg</file>
+        <file>icons/NavigationRevit_dark.svg</file>
         <file>icons/NavigationTouchpad_Pan.svg</file>
         <file>icons/NavigationTouchpad_PanTouch.svg</file>
         <file>icons/NavigationTouchpad_RotateAlt.svg</file>
@@ -63,7 +63,7 @@
         <file>icons/NavigationTouchpad_RotateTouch.svg</file>
         <file>icons/NavigationTouchpad_Select.svg</file>
         <file>icons/NavigationTouchpad_SelectTouch.svg</file>
-        <file>icons/NavigationTouchpad.svg</file>
+        <file>icons/NavigationTouchpad_dark.svg</file>
         <file>icons/NavigationTouchpad_ZoomAlt.svg</file>
         <file>icons/NavigationTouchpad_Zoom.svg</file>
         <file>icons/NavigationTouchpad_ZoomTouch.svg</file>
diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender.svg b/src/Mod/Tux/Resources/icons/NavigationBlender_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationBlender.svg
rename to src/Mod/Tux/Resources/icons/NavigationBlender_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD.svg b/src/Mod/Tux/Resources/icons/NavigationCAD_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationCAD.svg
rename to src/Mod/Tux/Resources/icons/NavigationCAD_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture.svg b/src/Mod/Tux/Resources/icons/NavigationGesture_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationGesture.svg
rename to src/Mod/Tux/Resources/icons/NavigationGesture_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationMayaGesture.svg
rename to src/Mod/Tux/Resources/icons/NavigationMayaGesture_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade.svg b/src/Mod/Tux/Resources/icons/NavigationOpenCascade_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationOpenCascade.svg
rename to src/Mod/Tux/Resources/icons/NavigationOpenCascade_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor.svg b/src/Mod/Tux/Resources/icons/NavigationOpenInventor_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationOpenInventor.svg
rename to src/Mod/Tux/Resources/icons/NavigationOpenInventor_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationRevit.svg b/src/Mod/Tux/Resources/icons/NavigationRevit_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationRevit.svg
rename to src/Mod/Tux/Resources/icons/NavigationRevit_dark.svg
diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad.svg b/src/Mod/Tux/Resources/icons/NavigationTouchpad_dark.svg
similarity index 100%
rename from src/Mod/Tux/Resources/icons/NavigationTouchpad.svg
rename to src/Mod/Tux/Resources/icons/NavigationTouchpad_dark.svg