diff --git a/common/board_printout.cpp b/common/board_printout.cpp
index b6826ea92a..eba8df7ff9 100644
--- a/common/board_printout.cpp
+++ b/common/board_printout.cpp
@@ -65,8 +65,9 @@ void BOARD_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
 
 
 BOARD_PRINTOUT::BOARD_PRINTOUT( const BOARD_PRINTOUT_SETTINGS& aParams,
-        const KIGFX::VIEW* aView, const wxString& aTitle ) :
-    wxPrintout( aTitle ), m_settings( aParams )
+                                const KIGFX::VIEW* aView, const wxString& aTitle ) :
+    wxPrintout( aTitle ),
+    m_settings( aParams )
 {
     m_view = aView;
 }
diff --git a/common/dialogs/dialog_print_generic.cpp b/common/dialogs/dialog_print_generic.cpp
index cdcc93431e..96f23d9612 100644
--- a/common/dialogs/dialog_print_generic.cpp
+++ b/common/dialogs/dialog_print_generic.cpp
@@ -28,7 +28,9 @@ static constexpr double MIN_SCALE = 0.01;
 static constexpr double MAX_SCALE = 100.0;
 
 DIALOG_PRINT_GENERIC::DIALOG_PRINT_GENERIC( EDA_DRAW_FRAME* aParent, PRINTOUT_SETTINGS* aSettings )
-    : DIALOG_PRINT_GENERIC_BASE( aParent ), m_config( nullptr ), m_settings( aSettings )
+    : DIALOG_PRINT_GENERIC_BASE( aParent ),
+      m_config( nullptr ),
+      m_settings( aSettings )
 {
     // Note: for the validator, min value is 0.0, to allow typing values like 0.5
     // that start by 0
diff --git a/gerbview/dialogs/dialog_print_gerbview.cpp b/gerbview/dialogs/dialog_print_gerbview.cpp
index 6b68ed99ad..21458ec1f0 100644
--- a/gerbview/dialogs/dialog_print_gerbview.cpp
+++ b/gerbview/dialogs/dialog_print_gerbview.cpp
@@ -102,8 +102,10 @@ private:
 };
 
 
-DIALOG_PRINT_GERBVIEW::DIALOG_PRINT_GERBVIEW( GERBVIEW_FRAME* aParent, BOARD_PRINTOUT_SETTINGS* aSettings ) :
-    DIALOG_PRINT_GENERIC( aParent, aSettings ), m_parent( aParent )
+DIALOG_PRINT_GERBVIEW::DIALOG_PRINT_GERBVIEW( GERBVIEW_FRAME* aParent,
+                                              BOARD_PRINTOUT_SETTINGS* aSettings ) :
+    DIALOG_PRINT_GENERIC( aParent, aSettings ),
+    m_parent( aParent )
 {
     m_config = Kiface().KifaceSettings();
 
@@ -307,6 +309,7 @@ int GERBVIEW_CONTROL::Print( const TOOL_EVENT& aEvent )
     m_toolMgr->RunAction( GERBVIEW_ACTIONS::selectionClear, true );
 
     BOARD_PRINTOUT_SETTINGS settings( m_frame->GetPageSettings() );
+    settings.m_colorSettings = m_frame->GetColorSettings();
     DIALOG_PRINT_GERBVIEW dlg( m_frame, &settings );
     dlg.ForcePrintBorder( false );
     dlg.ShowModal();
diff --git a/gerbview/gerbview_printout.cpp b/gerbview/gerbview_printout.cpp
index b1cb063a81..5af3e84a94 100644
--- a/gerbview/gerbview_printout.cpp
+++ b/gerbview/gerbview_printout.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <fctsys.h>
-#include <pgm_base.h>
 #include <gr_basic.h>
 #include <base_units.h>
 #include <base_screen.h>
@@ -31,14 +30,13 @@
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
 #include "gerbview_printout.h"
-#include <gal/gal_print.h>
 #include <view/view.h>
 #include <gerbview_painter.h>
 #include <math/util.h>      // for KiROUND
 
 
 GERBVIEW_PRINTOUT::GERBVIEW_PRINTOUT( GBR_LAYOUT* aLayout, const BOARD_PRINTOUT_SETTINGS& aParams,
-        const KIGFX::VIEW* aView, const wxString& aTitle ) :
+                                      const KIGFX::VIEW* aView, const wxString& aTitle ) :
     BOARD_PRINTOUT( aParams, aView, aTitle )
 {
     m_layout = aLayout;