diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
index ab6f365df4..7a0dc4718c 100644
--- a/src/Gui/SoFCDB.cpp
+++ b/src/Gui/SoFCDB.cpp
@@ -190,18 +190,18 @@ void Gui::SoFCDB::init()
     NavigationStyle                 ::init();
     UserNavigationStyle             ::init();
     NavigationStateChart            ::init();
-    InventorNavigationStyle         ::init();
-    CADNavigationStyle              ::init();
-    RevitNavigationStyle            ::init();
     BlenderNavigationStyle          ::init();
-    SolidWorksNavigationStyle       ::init();
-    MayaGestureNavigationStyle      ::init();
-    TouchpadNavigationStyle         ::init();
+    CADNavigationStyle              ::init();
     GestureNavigationStyle          ::init();
+    MayaGestureNavigationStyle      ::init();
     OpenCascadeNavigationStyle      ::init();
+    InventorNavigationStyle         ::init();
     OpenSCADNavigationStyle         ::init();
-    TinkerCADNavigationStyle        ::init();
+    RevitNavigationStyle            ::init();
     SiemensNXStyle                  ::init();
+    SolidWorksNavigationStyle       ::init();
+    TinkerCADNavigationStyle        ::init();
+    TouchpadNavigationStyle         ::init();
 
     GLGraphicsItem                  ::init();
     GLFlagWindow                    ::init();
diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py
index 84b7f3db7b..3e68c64a90 100644
--- a/src/Mod/Tux/NavigationIndicatorGui.py
+++ b/src/Mod/Tux/NavigationIndicatorGui.py
@@ -74,9 +74,10 @@ def RePopulateIcons():
     a6.setIcon(QtGui.QIcon(":/icons/NavigationOpenInventor_" + StyleSheetType + ".svg"))
     a7.setIcon(QtGui.QIcon(":/icons/NavigationOpenSCAD_" + StyleSheetType + ".svg"))
     a8.setIcon(QtGui.QIcon(":/icons/NavigationRevit_" + StyleSheetType + ".svg"))
-    a9.setIcon(QtGui.QIcon(":/icons/NavigationSolidWorks_" + StyleSheetType + ".svg"))
-    a10.setIcon(QtGui.QIcon(":/icons/NavigationTinkerCAD_" + StyleSheetType + ".svg"))
-    a11.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad_" + StyleSheetType + ".svg"))
+    a9.setIcon(QtGui.QIcon(":/icons/NavigationSiemensNX_" + StyleSheetType + ".svg"))
+    a10.setIcon(QtGui.QIcon(":/icons/NavigationSolidWorks_" + StyleSheetType + ".svg"))
+    a11.setIcon(QtGui.QIcon(":/icons/NavigationTinkerCAD_" + StyleSheetType + ".svg"))
+    a12.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad_" + StyleSheetType + ".svg"))
 
 
 def retranslateUi():
@@ -474,6 +475,48 @@ def retranslateUi():
 
     global t9
     t9 = (
+        "<p align='center'><b>Siemens NX</b> "
+        + text06
+        + """</p>
+    <table>
+     <tr>
+      <th><small>"""
+        + text01
+        + """</small></th>
+      <th><small>"""
+        + text02
+        + """</small></th>
+      <th><small>"""
+        + text02
+        + """</small></th>
+      <th><small>"""
+        + text03
+        + """</small></th>
+      <th><small>"""
+        + text04
+        + """</small></th>
+        <th><small>"""
+        + text04
+        + """</small></th>
+     </tr>
+     <tr>
+      <td align='center'><img src=':/icons/Navigation_Mouse_Left.svg'></td>
+      <td align='center'><img src=':/icons/Navigation_Mouse_Scroll.svg'></td>
+      <td align='center'><img src=':/icons/Navigation_Mouse_MiddleLeft.svg'></td>
+      <td align='center'><img src=':/icons/Navigation_Mouse_Middle.svg'></td>
+      <td align='center'><img src=':/icons/Navigation_Mouse_MiddleRight.svg'></td>
+      <td align='center'><img src=':/icons/Navigation_Mouse_ShiftMiddle.svg'></td>
+     </tr>
+    </table>
+    <b>"""
+        + text08
+        + ":</b> "
+        + text10
+        + "</small></p>"
+    )
+
+    global t10
+    t10 = (
         "<p align='center'><b>SolidWorks</b> "
         + text06
         + """</p>
@@ -510,8 +553,8 @@ def retranslateUi():
         + "</small></p>"
     )
 
-    global t10
-    t10 = (
+    global t11
+    t11 = (
         "<p align='center'><b>TinkerCAD</b> "
         + text06
         + """</p>
@@ -539,8 +582,8 @@ def retranslateUi():
     </table>"""
     )
 
-    global t11
-    t11 = (
+    global t12
+    t12 = (
         "<p align='center'><b>Touchpad</b> "
         + text06
         + """</p>
@@ -716,19 +759,24 @@ a8.setData("Gui::RevitNavigationStyle")
 a8.setObjectName("Indicator_NavigationRevit")
 
 a9 = QtGui.QAction(gStyle)
-a9.setText("SolidWorks  ")
-a9.setData("Gui::SolidWorksNavigationStyle")
-a9.setObjectName("Indicator_NavigationSolidWorks")
+a9.setText("Siemens NX  ")
+a9.setData("Gui::SiemensNXStyle")
+a9.setObjectName("Indicator_NavigationSiemensNX")
 
 a10 = QtGui.QAction(gStyle)
-a10.setText("TinkerCAD  ")
-a10.setData("Gui::TinkerCADNavigationStyle")
-a10.setObjectName("Indicator_NavigationTinkerCAD")
+a10.setText("SolidWorks  ")
+a10.setData("Gui::SolidWorksNavigationStyle")
+a10.setObjectName("Indicator_NavigationSolidWorks")
 
 a11 = QtGui.QAction(gStyle)
-a11.setText("Touchpad  ")
-a11.setData("Gui::TouchpadNavigationStyle")
-a11.setObjectName("Indicator_NavigationTouchpad")
+a11.setText("TinkerCAD  ")
+a11.setData("Gui::TinkerCADNavigationStyle")
+a11.setObjectName("Indicator_NavigationTinkerCAD")
+
+a12 = QtGui.QAction(gStyle)
+a12.setText("Touchpad  ")
+a12.setData("Gui::TouchpadNavigationStyle")
+a12.setObjectName("Indicator_NavigationTouchpad")
 
 RePopulateIcons()
 
@@ -746,6 +794,7 @@ menu.addAction(a8)
 menu.addAction(a9)
 menu.addAction(a10)
 menu.addAction(a11)
+menu.addAction(a12)
 
 pView.Attach(indicator)
 
@@ -787,6 +836,7 @@ def onTooltip():
         a9.setToolTip(t9)
         a10.setToolTip(t10)
         a11.setToolTip(t11)
+        a12.setToolTip(t12)
         p.SetBool("Tooltip", 1)
     else:
         for i in gStyle.actions():
diff --git a/src/Mod/Tux/Resources/Tux.qrc b/src/Mod/Tux/Resources/Tux.qrc
index 6ec43834ca..413d549458 100644
--- a/src/Mod/Tux/Resources/Tux.qrc
+++ b/src/Mod/Tux/Resources/Tux.qrc
@@ -47,6 +47,8 @@
         <file>icons/NavigationOpenSCAD_dark.svg</file>
         <file>icons/NavigationRevit_light.svg</file>
         <file>icons/NavigationRevit_dark.svg</file>
+        <file>icons/NavigationSiemensNX_light.svg</file>
+        <file>icons/NavigationSiemensNX_dark.svg</file>
         <file>icons/NavigationSolidWorks_light.svg</file>
         <file>icons/NavigationSolidWorks_dark.svg</file>
         <file>icons/NavigationTinkerCAD_light.svg</file>
diff --git a/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg
new file mode 100644
index 0000000000..38ab2c06cc
--- /dev/null
+++ b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   id="svg2"
+   height="64"
+   width="64"
+   version="1.1"
+   viewBox="0 0 63.999999 63.999999"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0 -988.36)"
+     stroke="#2e3436"
+     stroke-width="6"
+     fill="none">
+    <path
+       id="path4144"
+       d="m16 1028.4v-20c0-8 4-12 16-12s16 4 16 12v20c0 8-4 17-16 17s-16-9-16-17z" />
+    <path
+       id="path4209"
+       d="m32 1004.4v12" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="fill:#2e3436;stroke:#2e3436;stroke-width:1.249;stroke-dasharray:none"
+     x="20.548067"
+     y="42.288612"
+     id="text1"><tspan
+       x="20.548067"
+       y="42.288612"
+       id="tspan2">NX</tspan></text>
+</svg>
diff --git a/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg
new file mode 100644
index 0000000000..0064477a86
--- /dev/null
+++ b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   id="svg2"
+   height="64"
+   width="64"
+   version="1.1"
+   viewBox="0 0 63.999999 63.999999"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0 -988.36)"
+     stroke="#d1cbc9"
+     stroke-width="6"
+     fill="none">
+    <path
+       id="path4144"
+       d="m16 1028.4v-20c0-8 4-12 16-12s16 4 16 12v20c0 8-4 17-16 17s-16-9-16-17z" />
+    <path
+       id="path4209"
+       d="m32 1004.4v12" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="fill:#d1cbc9;stroke:#d1cbc9;stroke-width:1.249;stroke-dasharray:none"
+     x="20.548067"
+     y="42.288612"
+     id="text1"><tspan
+       x="20.548067"
+       y="42.288612"
+       id="tspan2">NX</tspan></text>
+</svg>