diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 4bf7835371..5d00f85654 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -243,7 +243,7 @@ void EDA_DRAW_PANEL_GAL::StopDrawing()
 }
 
 
-void EDA_DRAW_PANEL_GAL::SetHighContrastLayer( LAYER_NUM aLayer )
+void EDA_DRAW_PANEL_GAL::SetHighContrastLayer( LAYER_ID aLayer )
 {
     // Set display settings for high contrast mode
     KIGFX::RENDER_SETTINGS* rSettings = m_view->GetPainter()->GetSettings();
@@ -257,7 +257,7 @@ void EDA_DRAW_PANEL_GAL::SetHighContrastLayer( LAYER_NUM aLayer )
 }
 
 
-void EDA_DRAW_PANEL_GAL::SetTopLayer( LAYER_NUM aLayer )
+void EDA_DRAW_PANEL_GAL::SetTopLayer( LAYER_ID aLayer )
 {
     m_view->ClearTopLayers();
     m_view->SetTopLayer( aLayer );
diff --git a/include/class_draw_panel_gal.h b/include/class_draw_panel_gal.h
index 6d9dae1bba..8795d94f29 100644
--- a/include/class_draw_panel_gal.h
+++ b/include/class_draw_panel_gal.h
@@ -136,13 +136,13 @@ public:
      * Function SetHighContrastLayer
      * Takes care of display settings for the given layer to be displayed in high contrast mode.
      */
-    virtual void SetHighContrastLayer( LAYER_NUM aLayer );
+    virtual void SetHighContrastLayer( LAYER_ID aLayer );
 
     /**
      * Function SetTopLayer
      * Moves the selected layer to the top, so it is displayed above all others.
      */
-    virtual void SetTopLayer( LAYER_NUM aLayer );
+    virtual void SetTopLayer( LAYER_ID aLayer );
 
 protected:
     void onPaint( wxPaintEvent& WXUNUSED( aEvent ) );
diff --git a/include/view/view.h b/include/view/view.h
index 529f3c63ce..57e7a8bf3f 100644
--- a/include/view/view.h
+++ b/include/view/view.h
@@ -508,7 +508,7 @@ public:
 
     const BOX2I CalculateExtents() ;
 
-    static const int VIEW_MAX_LAYERS = 128;      ///< maximum number of layers that may be shown
+    static const int VIEW_MAX_LAYERS = 256;      ///< maximum number of layers that may be shown
 
 private:
     struct VIEW_LAYER