diff --git a/demos/2d/fog_of_war/icon.png.flags b/demos/2d/fog_of_war/icon.png.flags
deleted file mode 100644
index dbef2209e80..00000000000
--- a/demos/2d/fog_of_war/icon.png.flags
+++ /dev/null
@@ -1 +0,0 @@
-gen_mipmaps=true
diff --git a/demos/2d/lookat/engine.cfg b/demos/2d/lookat/engine.cfg
index 56917a39ec7..81df107f0e7 100644
--- a/demos/2d/lookat/engine.cfg
+++ b/demos/2d/lookat/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Look At Pointer"
 main_scene="res://lookat.scn"
+icon="res://icon.png"
diff --git a/demos/2d/lookat/icon.png b/demos/2d/lookat/icon.png
new file mode 100644
index 00000000000..442cc1799f8
Binary files /dev/null and b/demos/2d/lookat/icon.png differ
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg
index 261111904ce..6e660572d6f 100644
--- a/demos/2d/motion/engine.cfg
+++ b/demos/2d/motion/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Motion Test"
 main_scene="res://motion.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/motion/icon.png b/demos/2d/motion/icon.png
new file mode 100644
index 00000000000..9e64961d3c9
Binary files /dev/null and b/demos/2d/motion/icon.png differ
diff --git a/demos/2d/polygon_path_finder/engine.cfg b/demos/2d/polygon_path_finder/engine.cfg
new file mode 100644
index 00000000000..47450408af8
--- /dev/null
+++ b/demos/2d/polygon_path_finder/engine.cfg
@@ -0,0 +1,5 @@
+[application]
+
+name="Polygon Pathfinder"
+main_scene="res://poly_with_holes.scn"
+icon="res://icon.png"
diff --git a/demos/2d/polygon_path_finder/icon.png b/demos/2d/polygon_path_finder/icon.png
new file mode 100644
index 00000000000..643f5595ee6
Binary files /dev/null and b/demos/2d/polygon_path_finder/icon.png differ
diff --git a/demos/2d/polygon_path_finder/poly_with_holes.scn b/demos/2d/polygon_path_finder/poly_with_holes.scn
new file mode 100644
index 00000000000..6b340377b7b
Binary files /dev/null and b/demos/2d/polygon_path_finder/poly_with_holes.scn differ
diff --git a/demos/2d/polygon_path_finder_demo/polygonpathfinder.gd b/demos/2d/polygon_path_finder/polygonpathfinder.gd
similarity index 100%
rename from demos/2d/polygon_path_finder_demo/polygonpathfinder.gd
rename to demos/2d/polygon_path_finder/polygonpathfinder.gd
diff --git a/demos/2d/polygon_path_finder_demo/engine.cfg b/demos/2d/polygon_path_finder_demo/engine.cfg
deleted file mode 100644
index de5593c4179..00000000000
--- a/demos/2d/polygon_path_finder_demo/engine.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[application]
-
-name="polygon_path_finder_demo"
-main_scene="res://new_scene_poly_with_holes.scn"
-icon="res://icon.png"
diff --git a/demos/2d/polygon_path_finder_demo/icon.png b/demos/2d/polygon_path_finder_demo/icon.png
deleted file mode 100644
index 0c422e37b0e..00000000000
Binary files a/demos/2d/polygon_path_finder_demo/icon.png and /dev/null differ
diff --git a/demos/2d/polygon_path_finder_demo/icon.png.flags b/demos/2d/polygon_path_finder_demo/icon.png.flags
deleted file mode 100644
index dbef2209e80..00000000000
--- a/demos/2d/polygon_path_finder_demo/icon.png.flags
+++ /dev/null
@@ -1 +0,0 @@
-gen_mipmaps=true
diff --git a/demos/2d/polygon_path_finder_demo/new_scene_poly_with_holes.scn b/demos/2d/polygon_path_finder_demo/new_scene_poly_with_holes.scn
deleted file mode 100644
index 07838be41e7..00000000000
Binary files a/demos/2d/polygon_path_finder_demo/new_scene_poly_with_holes.scn and /dev/null differ
diff --git a/demos/2d/texscreen/engine.cfg b/demos/2d/texscreen/engine.cfg
index fb683dfc1d7..92d0e98d5b7 100644
--- a/demos/2d/texscreen/engine.cfg
+++ b/demos/2d/texscreen/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Glass Bubbles (Texscreen)"
 main_scene="res://bubbles.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/texscreen/icon.png b/demos/2d/texscreen/icon.png
new file mode 100644
index 00000000000..d74d025cedf
Binary files /dev/null and b/demos/2d/texscreen/icon.png differ
diff --git a/demos/3d/truck_town/engine.cfg b/demos/3d/truck_town/engine.cfg
index 3c340e6dcd2..b2a463e1e2a 100644
--- a/demos/3d/truck_town/engine.cfg
+++ b/demos/3d/truck_town/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Truck Town"
 main_scene="res://car_select.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/3d/truck_town/icon.png b/demos/3d/truck_town/icon.png
new file mode 100644
index 00000000000..7d7bd42116d
Binary files /dev/null and b/demos/3d/truck_town/icon.png differ
diff --git a/demos/gui/drag_and_drop/engine.cfg b/demos/gui/drag_and_drop/engine.cfg
index 448939c61d8..49b9b935129 100644
--- a/demos/gui/drag_and_drop/engine.cfg
+++ b/demos/gui/drag_and_drop/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Drag & Drop (GUI)"
 main_scene="res://drag_and_drop.scn"
+icon="res://icon.png"
diff --git a/demos/gui/drag_and_drop/icon.png b/demos/gui/drag_and_drop/icon.png
new file mode 100644
index 00000000000..f900d8d4a37
Binary files /dev/null and b/demos/gui/drag_and_drop/icon.png differ
diff --git a/demos/gui/input_mapping/engine.cfg b/demos/gui/input_mapping/engine.cfg
index 6470ec6cd8c..811635ce258 100644
--- a/demos/gui/input_mapping/engine.cfg
+++ b/demos/gui/input_mapping/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Input Mapping GUI"
 main_scene="res://controls.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/gui/input_mapping/icon.png b/demos/gui/input_mapping/icon.png
new file mode 100644
index 00000000000..5a1abf4f581
Binary files /dev/null and b/demos/gui/input_mapping/icon.png differ
diff --git a/demos/gui/translation/engine.cfg b/demos/gui/translation/engine.cfg
index 169b65e1547..dcd3d1983d7 100644
--- a/demos/gui/translation/engine.cfg
+++ b/demos/gui/translation/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Translation Demo"
 main_scene="res://main.scn"
+icon="res://icon.png"
 
 [locale]
 
diff --git a/demos/gui/translation/icon.png b/demos/gui/translation/icon.png
new file mode 100644
index 00000000000..4be5ac1127f
Binary files /dev/null and b/demos/gui/translation/icon.png differ
diff --git a/demos/misc/regex/engine.cfg b/demos/misc/regex/engine.cfg
index 0a6f4f869cf..ef5483e0969 100644
--- a/demos/misc/regex/engine.cfg
+++ b/demos/misc/regex/engine.cfg
@@ -2,3 +2,4 @@
 
 name="RegEx"
 main_scene="res://regex.scn"
+icon="res://icon.png"
diff --git a/demos/misc/regex/icon.png b/demos/misc/regex/icon.png
new file mode 100644
index 00000000000..7a5232ec4ba
Binary files /dev/null and b/demos/misc/regex/icon.png differ
diff --git a/demos/misc/tween/icon.png b/demos/misc/tween/icon.png
index 3e991fcc291..ed55c24140f 100644
Binary files a/demos/misc/tween/icon.png and b/demos/misc/tween/icon.png differ
diff --git a/demos/misc/window_management/icon.png b/demos/misc/window_management/icon.png
index 0c422e37b0e..ec5c7891f99 100644
Binary files a/demos/misc/window_management/icon.png and b/demos/misc/window_management/icon.png differ
diff --git a/demos/misc/window_management/icon.png.flags b/demos/misc/window_management/icon.png.flags
deleted file mode 100644
index 5130fd1aabc..00000000000
--- a/demos/misc/window_management/icon.png.flags
+++ /dev/null
@@ -1 +0,0 @@
-gen_mipmaps=false
diff --git a/demos/viewport/3d_in_2d/engine.cfg b/demos/viewport/3d_in_2d/engine.cfg
index cc893361b56..6d456d7bd48 100644
--- a/demos/viewport/3d_in_2d/engine.cfg
+++ b/demos/viewport/3d_in_2d/engine.cfg
@@ -2,3 +2,4 @@
 
 name="3D in 2D"
 main_scene="res://main.scn"
+icon="res://icon.png"
diff --git a/demos/viewport/3d_in_2d/icon.png b/demos/viewport/3d_in_2d/icon.png
new file mode 100644
index 00000000000..d8a332c18f7
Binary files /dev/null and b/demos/viewport/3d_in_2d/icon.png differ
diff --git a/demos/viewport/gui_in_3d/engine.cfg b/demos/viewport/gui_in_3d/engine.cfg
index 25a66361320..252e53ca333 100644
--- a/demos/viewport/gui_in_3d/engine.cfg
+++ b/demos/viewport/gui_in_3d/engine.cfg
@@ -2,3 +2,4 @@
 
 name="GUI in 3D"
 main_scene="res://gui_3d.scn"
+icon="res://icon.png"
diff --git a/demos/viewport/gui_in_3d/icon.png b/demos/viewport/gui_in_3d/icon.png
new file mode 100644
index 00000000000..22bdd791bbd
Binary files /dev/null and b/demos/viewport/gui_in_3d/icon.png differ
diff --git a/demos/viewport/screen_capture/engine.cfg b/demos/viewport/screen_capture/engine.cfg
index b25ed8258ed..a843242720f 100644
--- a/demos/viewport/screen_capture/engine.cfg
+++ b/demos/viewport/screen_capture/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Screen Capturing"
 main_scene="res://screen_capture.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/viewport/screen_capture/icon.png b/demos/viewport/screen_capture/icon.png
new file mode 100644
index 00000000000..a6968247759
Binary files /dev/null and b/demos/viewport/screen_capture/icon.png differ