diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp
index 9987b817b2..1e72d35df0 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp
+++ b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp
@@ -945,7 +945,7 @@
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
+                            <property name="border">2</property>
                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
                             <property name="proportion">0</property>
                             <object class="wxBitmapButton" expanded="1">
@@ -1313,7 +1313,7 @@
                                     </object>
                                 </object>
                                 <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
+                                    <property name="border">2</property>
                                     <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="1">
diff --git a/pcbnew/dialogs/panel_modedit_defaults.cpp b/pcbnew/dialogs/panel_modedit_defaults.cpp
index ba3f7c4935..6188e4a61a 100644
--- a/pcbnew/dialogs/panel_modedit_defaults.cpp
+++ b/pcbnew/dialogs/panel_modedit_defaults.cpp
@@ -67,10 +67,9 @@ PANEL_MODEDIT_DEFAULTS::PANEL_MODEDIT_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame, PA
 
     m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
 
-    // 6.0 TODO: flag the Others row for now
-    auto attr = new wxGridCellAttr;
-    attr->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) );
-    m_grid->SetRowAttr( 3, attr );
+    wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+    infoFont.SetSymbolicSize( wxFONTSIZE_SMALL );
+    m_staticTextInfo->SetFont( infoFont );
 }
 
 
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
index 204023eb6e..25dcf173e6 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
@@ -41,6 +41,12 @@ PANEL_SETUP_MASK_AND_PASTE::PANEL_SETUP_MASK_AND_PASTE( PAGED_DIALOG* aParent,
 {
     m_Frame = aFrame;
     m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings();
+
+    wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+    infoFont.SetSymbolicSize( wxFONTSIZE_SMALL );
+    m_staticTextInfoValPos->SetFont( infoFont );
+    m_staticTextInfoValNeg->SetFont( infoFont );
+    m_staticTextInfoCopper->SetFont( infoFont );
 }
 
 
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
index db4692fa2a..69aa23ec23 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
@@ -108,11 +108,11 @@ PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* pare
 	
 	bSizer3->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 );
 	
-	m_staticTextInfo2 = new wxStaticText( this, wxID_ANY, _("Note: solder mask and paste values are used only for pads on copper layers."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextInfo2->Wrap( -1 );
-	m_staticTextInfo2->SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextInfoCopper = new wxStaticText( this, wxID_ANY, _("Note: solder mask and paste values are used only for pads on copper layers."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextInfoCopper->Wrap( -1 );
+	m_staticTextInfoCopper->SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
-	bSizer3->Add( m_staticTextInfo2, 0, wxALL, 5 );
+	bSizer3->Add( m_staticTextInfoCopper, 0, wxALL, 5 );
 	
 	
 	bMainSizer->Add( bSizer3, 1, wxRIGHT|wxLEFT, 5 );
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
index baaaf619f7..b0d362c423 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
@@ -1395,7 +1395,7 @@
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size"></property>
                                 <property name="moveable">1</property>
-                                <property name="name">m_staticTextInfo2</property>
+                                <property name="name">m_staticTextInfoCopper</property>
                                 <property name="pane_border">1</property>
                                 <property name="pane_position"></property>
                                 <property name="pane_size"></property>
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
index 05e79c4060..7f21fcf9a7 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
@@ -45,7 +45,7 @@ class PANEL_SETUP_MASK_AND_PASTE_BASE : public wxPanel
 		wxStaticText* m_staticTextRatio;
 		wxTextCtrl* m_SolderPasteMarginRatioCtrl;
 		wxStaticText* m_SolderPasteRatioMarginUnits;
-		wxStaticText* m_staticTextInfo2;
+		wxStaticText* m_staticTextInfoCopper;
 	
 	public: