diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index cb6ae0650..649431cc0 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -1040,7 +1040,7 @@ Public Sub MakeModuleIcon(sModule As String, iSize As Integer, Optional bStartup
     'hImage = hImage.Stretch(iSize, iSize)
     'hImageModule = Image.Load("img/module" &/ sModule & ".png") '.Stretch(iSize / 2, iSize / 2)
     'hImage.PaintImage(hImageModule, iSize / 16, iSize / 16, iSize * 0.75, iSize * 0.75)
-    hImage = Image.Load("img/module" &/ sModule & ".png")
+    hImage = Picture["img/module" &/ sModule & ".png"].Image
     hImage = hImage.Stretch(iSize, iSize)
 
     'If bExported Then MakeExportedIcon(hImage)
diff --git a/app/src/gambas3/img/module/class-dark.png b/app/src/gambas3/img/module/class-dark.png
new file mode 100644
index 000000000..0c1a0ff41
Binary files /dev/null and b/app/src/gambas3/img/module/class-dark.png differ
diff --git a/app/src/gambas3/img/module/form-dark.png b/app/src/gambas3/img/module/form-dark.png
new file mode 100644
index 000000000..e4f105197
Binary files /dev/null and b/app/src/gambas3/img/module/form-dark.png differ
diff --git a/app/src/gambas3/img/module/module-dark.png b/app/src/gambas3/img/module/module-dark.png
new file mode 100644
index 000000000..221de24e9
Binary files /dev/null and b/app/src/gambas3/img/module/module-dark.png differ
diff --git a/app/src/gambas3/img/module/report-dark.png b/app/src/gambas3/img/module/report-dark.png
new file mode 100644
index 000000000..e1d51d5fc
Binary files /dev/null and b/app/src/gambas3/img/module/report-dark.png differ
diff --git a/app/src/gambas3/img/module/termform-dark.png b/app/src/gambas3/img/module/termform-dark.png
new file mode 100644
index 000000000..e129ab5cd
Binary files /dev/null and b/app/src/gambas3/img/module/termform-dark.png differ
diff --git a/app/src/gambas3/img/module/webform-dark.png b/app/src/gambas3/img/module/webform-dark.png
new file mode 100644
index 000000000..b02bd317e
Binary files /dev/null and b/app/src/gambas3/img/module/webform-dark.png differ
diff --git a/app/src/gambas3/img/module/webpage-dark.png b/app/src/gambas3/img/module/webpage-dark.png
new file mode 100644
index 000000000..3945b16b9
Binary files /dev/null and b/app/src/gambas3/img/module/webpage-dark.png differ