diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index f317b346eb8..6a87ac0adaa 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -1048,9 +1048,6 @@
-
-
-
@@ -1065,9 +1062,6 @@
-
-
-
@@ -1327,14 +1321,6 @@
-
-
-
-
-
-
-
-
@@ -3746,14 +3732,6 @@
-
-
-
-
-
-
-
-
@@ -3831,11 +3809,6 @@
-
-
-
-
-
diff --git a/release/datafiles/blender_icons16/icon16_ndof_dom.dat b/release/datafiles/blender_icons16/icon16_ndof_dom.dat
deleted file mode 100644
index e6ecd80d5a9..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_ndof_dom.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_ndof_fly.dat b/release/datafiles/blender_icons16/icon16_ndof_fly.dat
deleted file mode 100644
index 84b672bdf9f..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_ndof_fly.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_ndof_trans.dat b/release/datafiles/blender_icons16/icon16_ndof_trans.dat
deleted file mode 100644
index f74edd6f8b0..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_ndof_trans.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_ndof_turn.dat b/release/datafiles/blender_icons16/icon16_ndof_turn.dat
deleted file mode 100644
index 5b0cee02b49..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_ndof_turn.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_ndof_dom.dat b/release/datafiles/blender_icons32/icon32_ndof_dom.dat
deleted file mode 100644
index 9c7e6fdfc99..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_ndof_dom.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_ndof_fly.dat b/release/datafiles/blender_icons32/icon32_ndof_fly.dat
deleted file mode 100644
index a328f8dc1ca..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_ndof_fly.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_ndof_trans.dat b/release/datafiles/blender_icons32/icon32_ndof_trans.dat
deleted file mode 100644
index 553752dda40..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_ndof_trans.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_ndof_turn.dat b/release/datafiles/blender_icons32/icon32_ndof_turn.dat
deleted file mode 100644
index 3f43546cdbf..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_ndof_turn.dat and /dev/null differ
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index ab4d54f039e..35aa0504cd7 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1456,8 +1456,8 @@ class USERPREF_PT_ndof_settings(Panel):
if is_view3d:
layout.separator()
layout.label(text="Fly/Walk Options")
- layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
- layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
+ layout.prop(input_prefs, "ndof_fly_helicopter")
+ layout.prop(input_prefs, "ndof_lock_horizon")
class USERPREF_PT_input_keyboard(PreferencePanel, Panel):
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 680fe3a00e5..fd8fe103a2d 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -529,10 +529,6 @@ set(ICON_NAMES
axis_side
axis_front
axis_top
- ndof_dom
- ndof_turn
- ndof_fly
- ndof_trans
layer_used
layer_active
sortalpha
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index c15f299bca8..2bf50d3b4b8 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -739,10 +739,10 @@ DEF_ICON_BLANK(251)
DEF_ICON(AXIS_SIDE)
DEF_ICON(AXIS_FRONT)
DEF_ICON(AXIS_TOP)
-DEF_ICON(NDOF_DOM)
-DEF_ICON(NDOF_TURN)
-DEF_ICON(NDOF_FLY)
-DEF_ICON(NDOF_TRANS)
+DEF_ICON_BLANK(252)
+DEF_ICON_BLANK(252a)
+DEF_ICON_BLANK(252b)
+DEF_ICON_BLANK(252c)
DEF_ICON(LAYER_USED)
DEF_ICON(LAYER_ACTIVE)
/* available */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 831f8d77285..5f029e840d3 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1121,13 +1121,6 @@ static void draw_rotation_guide(const RegionView3D *rv3d)
immEnd();
immUnbindProgram();
-# if 0
- /* find screen coordinates for rotation center, then draw pretty icon */
- mul_m4_v3(rv3d->persinv, rot_center);
- UI_icon_draw(rot_center[0], rot_center[1], ICON_NDOF_TURN);
- /* ^^ just playing around, does not work */
-# endif
-
GPU_blend(false);
glDepthMask(GL_TRUE);
}