diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp
index 5a5b2b08c1..5aa5aa316a 100644
--- a/common/dialog_about/dialog_about.cpp
+++ b/common/dialog_about/dialog_about.cpp
@@ -26,6 +26,8 @@
 #include <config.h>
 #include <string>
 
+#include <kicad_build_version.h>
+
 #include <wx/clipbrd.h>
 #include <wx/msgdlg.h>
 #include <wx/hyperlink.h>
@@ -76,7 +78,11 @@ DIALOG_ABOUT::DIALOG_ABOUT( EDA_BASE_FRAME *aParent, ABOUT_APP_INFO& aAppInfo )
     else
     {
         wxIcon icon;
+#if KICAD_IS_NIGHTLY
+        icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly ) );
+#else
         icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
+#endif
         SetIcon( icon );
         m_bitmapApp->SetBitmap( icon );
     }
diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp
index c2de770e67..86aa4e5fee 100644
--- a/kicad/kicad_manager_frame.cpp
+++ b/kicad/kicad_manager_frame.cpp
@@ -33,6 +33,7 @@
 #include <eda_base_frame.h>
 #include <filehistory.h>
 #include <kiplatform/app.h>
+#include <kicad_build_version.h>
 #include <kiway.h>
 #include <kiway_express.h>
 #include <launch_ext.h>
@@ -127,12 +128,21 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
     wxIcon icon;
     wxIconBundle icon_bundle;
 
+#if KICAD_IS_NIGHTLY
+    icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly ) );
+    icon_bundle.AddIcon( icon );
+    icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly_32 ) );
+    icon_bundle.AddIcon( icon );
+    icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly_16 ) );
+    icon_bundle.AddIcon( icon );
+#else
     icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
     icon_bundle.AddIcon( icon );
     icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_32 ) );
     icon_bundle.AddIcon( icon );
     icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_16 ) );
     icon_bundle.AddIcon( icon );
+#endif
 
     SetIcons( icon_bundle );