diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index b642160d07..cc710131a8 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -72,6 +72,7 @@ set( BMAPS_SMALL
     icon_eeschema_16
     icon_gerbview_16
     icon_kicad_16
+    icon_kicad_nightly_16
     icon_libedit_16
     icon_modedit_16
     icon_pagelayout_editor_16
@@ -529,6 +530,7 @@ set( BMAPS_32
     icon_eeschema_32
     icon_gerbview_32
     icon_kicad_32
+    icon_kicad_nightly_32
     icon_libedit_32
     icon_modedit_32
     icon_pagelayout_editor_32
@@ -544,6 +546,7 @@ set( BMAPS_BIG
     icon_eeschema
     icon_gerbview
     icon_kicad
+    icon_kicad_nightly
     icon_libedit
     icon_modedit
     icon_pcbnew
@@ -569,6 +572,7 @@ set( BMAPS_64
     icon_eeschema
     icon_gerbview
     icon_kicad
+    icon_kicad_nightly
     icon_libedit
     icon_modedit
     icon_pcbnew
@@ -583,6 +587,7 @@ set( BMAPS_128
     icon_eeschema
     icon_gerbview
     icon_kicad
+    icon_kicad_nightly
     icon_libedit
     icon_modedit
     icon_pcbnew
diff --git a/bitmaps_png/png/icon_kicad_nightly_128.png b/bitmaps_png/png/icon_kicad_nightly_128.png
new file mode 100644
index 0000000000..d7679e3dd2
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_128.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_16_16.png b/bitmaps_png/png/icon_kicad_nightly_16_16.png
new file mode 100644
index 0000000000..8d0554dfc0
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_16_16.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_16_dark_16.png b/bitmaps_png/png/icon_kicad_nightly_16_dark_16.png
new file mode 100644
index 0000000000..8d0554dfc0
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_16_dark_16.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_32_32.png b/bitmaps_png/png/icon_kicad_nightly_32_32.png
new file mode 100644
index 0000000000..6acd3a9ab7
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_32_32.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_32_dark_32.png b/bitmaps_png/png/icon_kicad_nightly_32_dark_32.png
new file mode 100644
index 0000000000..6acd3a9ab7
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_32_dark_32.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_48.png b/bitmaps_png/png/icon_kicad_nightly_48.png
new file mode 100644
index 0000000000..9f11864d1a
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_48.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_64.png b/bitmaps_png/png/icon_kicad_nightly_64.png
new file mode 100644
index 0000000000..64a9382d58
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_64.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_dark_128.png b/bitmaps_png/png/icon_kicad_nightly_dark_128.png
new file mode 100644
index 0000000000..d7679e3dd2
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_dark_128.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_dark_48.png b/bitmaps_png/png/icon_kicad_nightly_dark_48.png
new file mode 100644
index 0000000000..9f11864d1a
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_dark_48.png differ
diff --git a/bitmaps_png/png/icon_kicad_nightly_dark_64.png b/bitmaps_png/png/icon_kicad_nightly_dark_64.png
new file mode 100644
index 0000000000..64a9382d58
Binary files /dev/null and b/bitmaps_png/png/icon_kicad_nightly_dark_64.png differ
diff --git a/include/bitmaps/bitmap_info.h b/include/bitmaps/bitmap_info.h
index 9b7d776173..a24b736026 100644
--- a/include/bitmaps/bitmap_info.h
+++ b/include/bitmaps/bitmap_info.h
@@ -44,6 +44,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_16.png" ), 16, wxT( "light" ) },
     { BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_16.png" ), 16, wxT( "light" ) },
     { BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_16.png" ), 16, wxT( "light" ) },
+    { BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_16.png" ), 16, wxT( "light" ) },
     { BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_16.png" ), 16, wxT( "light" ) },
     { BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_16.png" ), 16, wxT( "light" ) },
     { BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_16.png" ), 16, wxT( "light" ) },
@@ -111,6 +112,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_dark_16.png" ), 16, wxT( "dark" ) },
     { BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_dark_16.png" ), 16, wxT( "dark" ) },
     { BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_dark_16.png" ), 16, wxT( "dark" ) },
+    { BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_dark_16.png" ), 16, wxT( "dark" ) },
     { BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_dark_16.png" ), 16, wxT( "dark" ) },
     { BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_dark_16.png" ), 16, wxT( "dark" ) },
     { BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_dark_16.png" ), 16, wxT( "dark" ) },
@@ -899,6 +901,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema_32, wxT( "icon_eeschema_32_32.png" ), 32, wxT( "light" ) },
     { BITMAPS::icon_gerbview_32, wxT( "icon_gerbview_32_32.png" ), 32, wxT( "light" ) },
     { BITMAPS::icon_kicad_32, wxT( "icon_kicad_32_32.png" ), 32, wxT( "light" ) },
+    { BITMAPS::icon_kicad_nightly_32, wxT( "icon_kicad_nightly_32_32.png" ), 32, wxT( "light" ) },
     { BITMAPS::icon_libedit_32, wxT( "icon_libedit_32_32.png" ), 32, wxT( "light" ) },
     { BITMAPS::icon_modedit_32, wxT( "icon_modedit_32_32.png" ), 32, wxT( "light" ) },
     { BITMAPS::icon_pagelayout_editor_32, wxT( "icon_pagelayout_editor_32_32.png" ), 32, wxT( "light" ) },
@@ -908,6 +911,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema_32, wxT( "icon_eeschema_32_dark_32.png" ), 32, wxT( "dark" ) },
     { BITMAPS::icon_gerbview_32, wxT( "icon_gerbview_32_dark_32.png" ), 32, wxT( "dark" ) },
     { BITMAPS::icon_kicad_32, wxT( "icon_kicad_32_dark_32.png" ), 32, wxT( "dark" ) },
+    { BITMAPS::icon_kicad_nightly_32, wxT( "icon_kicad_nightly_32_dark_32.png" ), 32, wxT( "dark" ) },
     { BITMAPS::icon_libedit_32, wxT( "icon_libedit_32_dark_32.png" ), 32, wxT( "dark" ) },
     { BITMAPS::icon_modedit_32, wxT( "icon_modedit_32_dark_32.png" ), 32, wxT( "dark" ) },
     { BITMAPS::icon_pagelayout_editor_32, wxT( "icon_pagelayout_editor_32_dark_32.png" ), 32, wxT( "dark" ) },
@@ -933,6 +937,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_64.png" ), 64, wxT( "light" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_64.png" ), 64, wxT( "light" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_64.png" ), 64, wxT( "light" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_64.png" ), 64, wxT( "light" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_64.png" ), 64, wxT( "light" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_64.png" ), 64, wxT( "light" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_64.png" ), 64, wxT( "light" ) },
@@ -943,6 +948,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_64.png" ), 64, wxT( "dark" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_64.png" ), 64, wxT( "dark" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_dark_64.png" ), 64, wxT( "dark" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_dark_64.png" ), 64, wxT( "dark" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_dark_64.png" ), 64, wxT( "dark" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_dark_64.png" ), 64, wxT( "dark" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_dark_64.png" ), 64, wxT( "dark" ) },
@@ -953,6 +959,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_128.png" ), 128, wxT( "light" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_128.png" ), 128, wxT( "light" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_128.png" ), 128, wxT( "light" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_128.png" ), 128, wxT( "light" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_128.png" ), 128, wxT( "light" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_128.png" ), 128, wxT( "light" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_128.png" ), 128, wxT( "light" ) },
@@ -963,6 +970,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_128.png" ), 128, wxT( "dark" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_128.png" ), 128, wxT( "dark" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_dark_128.png" ), 128, wxT( "dark" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_dark_128.png" ), 128, wxT( "dark" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_dark_128.png" ), 128, wxT( "dark" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_dark_128.png" ), 128, wxT( "dark" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_dark_128.png" ), 128, wxT( "dark" ) },
@@ -975,6 +983,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_48.png" ), 48, wxT( "light" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_48.png" ), 48, wxT( "light" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_48.png" ), 48, wxT( "light" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_48.png" ), 48, wxT( "light" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_48.png" ), 48, wxT( "light" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_48.png" ), 48, wxT( "light" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_48.png" ), 48, wxT( "light" ) },
@@ -998,6 +1007,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
     { BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_48.png" ), 48, wxT( "dark" ) },
     { BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_48.png" ), 48, wxT( "dark" ) },
     { BITMAPS::icon_kicad, wxT( "icon_kicad_dark_48.png" ), 48, wxT( "dark" ) },
+    { BITMAPS::icon_kicad_nightly, wxT( "icon_kicad_nightly_dark_48.png" ), 48, wxT( "dark" ) },
     { BITMAPS::icon_libedit, wxT( "icon_libedit_dark_48.png" ), 48, wxT( "dark" ) },
     { BITMAPS::icon_modedit, wxT( "icon_modedit_dark_48.png" ), 48, wxT( "dark" ) },
     { BITMAPS::icon_pcbnew, wxT( "icon_pcbnew_dark_48.png" ), 48, wxT( "dark" ) },
diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h
index 442cb65e98..df2b89b164 100644
--- a/include/bitmaps/bitmaps_list.h
+++ b/include/bitmaps/bitmaps_list.h
@@ -248,6 +248,10 @@ enum class BITMAPS : unsigned int
     icon_kicad_16,
     icon_kicad_24,
     icon_kicad_32,
+    icon_kicad_nightly,
+    icon_kicad_nightly_16,
+    icon_kicad_nightly_24,
+    icon_kicad_nightly_32,
     icon_libedit,
     icon_libedit_16,
     icon_libedit_24,