diff --git a/resources/noggit_font.ttf b/resources/noggit_font.ttf
index fce1dec9..1ee856b5 100644
Binary files a/resources/noggit_font.ttf and b/resources/noggit_font.ttf differ
diff --git a/src/noggit/ui/FontNoggit.hpp b/src/noggit/ui/FontNoggit.hpp
index 524f5d19..7005e45d 100755
--- a/src/noggit/ui/FontNoggit.hpp
+++ b/src/noggit/ui/FontNoggit.hpp
@@ -96,7 +96,7 @@ namespace Noggit
         VISIBILITY_FOG = 0xf8b2,
         VISIBILITY_WATER = 0xf8b3,
         VISIBILITY_GROUNDEFFECTS= 0xf8b4,
-        VISIBILITY_FLIGHT_BOUNDS = 0xf8b5,
+        // VISIBILITY_FLIGHT_BOUNDS = 0xf8b5,
         VISIBILITY_HIDDEN_MODELS = 0xf8b6,
         VISIBILITY_HOLE_LINES = 0xf8b7,
         VISIBILITY_ANIMATION = 0xf8b8,
@@ -125,7 +125,21 @@ namespace Noggit
         GIZMO_VISIBILITY_ALL = 0xf8cf,
         TOOL_LIGHT = 0xf8d0,
         VISIBILITY_VERTEX_PAINTER = 0xf8d1,
-        VISIBILITY_CLIMB = 0xf8d2
+        VISIBILITY_CLIMB = 0xf8d2,
+        VISIBILITY_BAKED_SHADOWS = 0xf8d3,
+        DOODAD = 0xf8d4,
+        CHARACTER_RADIUS = 0xf8d5,
+        SUN = 0xf8d6,
+        CHARACTER = 0xf8d7,
+        VIEW_MODE_GAME = 0xf8d8,
+        SOUND = 0xf8d9, // use for sound points
+        CUBE = 0xf8da,
+        POINTER = 0xf8db,
+        CREATURE = 0xf8dc,
+        CAMERA = 0xf8dd,
+        WINDOW = 0xf8de,
+        VISIBILITY_FLIGHT_BOUNDS = 0xf8df,
+
       };
     };
 
diff --git a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp
index a66f75ac..f98123b8 100755
--- a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp
+++ b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp
@@ -94,7 +94,7 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb)
     add_tool_icon(mapView, &mapView->_draw_models, tr("Doodads"), FontNoggit::VISIBILITY_DOODADS, tb);
     add_tool_icon(mapView, &mapView->_draw_wmo, tr("WMOs"), FontNoggit::VISIBILITY_WMO, tb);
     add_tool_icon(mapView, &mapView->_draw_wmo_doodads, tr("WMO doodads"), FontNoggit::VISIBILITY_WMO_DOODADS, tb);
-    add_tool_icon(mapView, &mapView->_draw_wmo_exterior, tr("WMO exterior"), FontNoggit::GIZMO_VISIBILITY, tb);
+    add_tool_icon(mapView, &mapView->_draw_wmo_exterior, tr("WMO exterior"), FontNoggit::UI_TOGGLE, tb);
     add_tool_icon(mapView, &mapView->_draw_terrain, tr("Terrain"), FontNoggit::VISIBILITY_TERRAIN, tb);
     add_tool_icon(mapView, &mapView->_draw_water, tr("Water"), FontNoggit::VISIBILITY_WATER, tb);
 
@@ -106,7 +106,7 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb)
     add_tool_icon(mapView, &mapView->_draw_contour, tr("Contours"), FontNoggit::VISIBILITY_CONTOURS, tb);
     add_tool_icon(mapView, &mapView->_draw_climb, tr("Climb"), FontNoggit::VISIBILITY_CLIMB, tb, tb->_climb_secondary_tool);
     add_tool_icon(mapView, &mapView->_draw_vertex_color, tr("Vertex Color"), FontNoggit::VISIBILITY_VERTEX_PAINTER, tb);
-    add_tool_icon(mapView, &mapView->_draw_baked_shadows, tr("Baked Shadows"), FontNoggit::TOOL_AREA_DESIGNATOR, tb); // TODO : better icon
+    add_tool_icon(mapView, &mapView->_draw_baked_shadows, tr("Baked Shadows"), FontNoggit::VISIBILITY_BAKED_SHADOWS, tb); // TODO : better icon
 
     addSeparator();
 
@@ -131,7 +131,7 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb)
 
     // normal view mode icon, and make them only 1 at a time out of the 3 view modes? 
     // add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Normal view"), FontNoggit::VIEW_AXIS, tb);
-    add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Game view"), FontNoggit::VISIBILITY_UNUSED, tb);
+    add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Game view"), FontNoggit::VIEW_MODE_GAME, tb);
     // add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Tile view"), FontNoggit::VIEW_MODE_2D, tb);
     addSeparator();