diff --git a/resources/icons/printers/Creality_ENDER3.png b/resources/icons/printers/Creality_ENDER3.png
deleted file mode 100644
index 52861197c7..0000000000
Binary files a/resources/icons/printers/Creality_ENDER3.png and /dev/null differ
diff --git a/resources/profiles/BIBO2Touch.idx b/resources/profiles/BIBO.idx
similarity index 100%
rename from resources/profiles/BIBO2Touch.idx
rename to resources/profiles/BIBO.idx
diff --git a/resources/profiles/BIBO2Touch.ini b/resources/profiles/BIBO.ini
similarity index 100%
rename from resources/profiles/BIBO2Touch.ini
rename to resources/profiles/BIBO.ini
diff --git a/resources/profiles/BIBO2/BIBO2.svg b/resources/profiles/BIBO/BIBO2.svg
similarity index 100%
rename from resources/profiles/BIBO2/BIBO2.svg
rename to resources/profiles/BIBO/BIBO2.svg
diff --git a/resources/profiles/BIBO2/BIBO2_bed.stl b/resources/profiles/BIBO/BIBO2_bed.stl
similarity index 100%
rename from resources/profiles/BIBO2/BIBO2_bed.stl
rename to resources/profiles/BIBO/BIBO2_bed.stl
diff --git a/resources/profiles/BIBO/BIBO2_thumbnail.png b/resources/profiles/BIBO/BIBO2_thumbnail.png
new file mode 100644
index 0000000000..3d99c7ee87
Binary files /dev/null and b/resources/profiles/BIBO/BIBO2_thumbnail.png differ
diff --git a/resources/profiles/Creality/ENDER3_thumbnail.png b/resources/profiles/Creality/ENDER3_thumbnail.png
new file mode 100644
index 0000000000..8b1ca5889a
Binary files /dev/null and b/resources/profiles/Creality/ENDER3_thumbnail.png differ
diff --git a/resources/profiles/LulzBot.idx b/resources/profiles/LulzBot.idx
new file mode 100644
index 0000000000..4d6436f82e
--- /dev/null
+++ b/resources/profiles/LulzBot.idx
@@ -0,0 +1,2 @@
+min_slic3r_version = 2.2.0-alpha3
+0.0.1 Initial version
diff --git a/resources/profiles/Lulzbot.ini b/resources/profiles/LulzBot.ini
similarity index 99%
rename from resources/profiles/Lulzbot.ini
rename to resources/profiles/LulzBot.ini
index 721a9250ab..53151d8195 100644
--- a/resources/profiles/Lulzbot.ini
+++ b/resources/profiles/LulzBot.ini
@@ -2,9 +2,9 @@
 
 [vendor]
 # Vendor name will be shown by the Config Wizard.
-name = Lulzbot
+name = LulzBot
 config_version = 0.0.1
-config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Lulzbot/
+config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/LulzBot/
 
 [printer_model:MINI_AERO]
 name = Mini Aero
diff --git a/resources/profiles/LulzBot/MINI_AERO_thumbnail.png b/resources/profiles/LulzBot/MINI_AERO_thumbnail.png
new file mode 100644
index 0000000000..ded4eb673d
Binary files /dev/null and b/resources/profiles/LulzBot/MINI_AERO_thumbnail.png differ
diff --git a/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png b/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png
new file mode 100644
index 0000000000..ac6d48a693
Binary files /dev/null and b/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png differ
diff --git a/resources/icons/printers/PrusaResearch_MINI.png b/resources/profiles/PrusaResearch/MINI_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MINI.png
rename to resources/profiles/PrusaResearch/MINI_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5MMU2.png b/resources/profiles/PrusaResearch/MK2.5MMU2_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5MMU2.png
rename to resources/profiles/PrusaResearch/MK2.5MMU2_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5SMMU2S.png b/resources/profiles/PrusaResearch/MK2.5SMMU2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5SMMU2S.png
rename to resources/profiles/PrusaResearch/MK2.5SMMU2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5.png b/resources/profiles/PrusaResearch/MK2.5S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5.png
rename to resources/profiles/PrusaResearch/MK2.5S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5S.png b/resources/profiles/PrusaResearch/MK2.5_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5S.png
rename to resources/profiles/PrusaResearch/MK2.5_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2SMM.png b/resources/profiles/PrusaResearch/MK2SMM_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2SMM.png
rename to resources/profiles/PrusaResearch/MK2SMM_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2S.png b/resources/profiles/PrusaResearch/MK2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2S.png
rename to resources/profiles/PrusaResearch/MK2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3MMU2.png b/resources/profiles/PrusaResearch/MK3MMU2_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3MMU2.png
rename to resources/profiles/PrusaResearch/MK3MMU2_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3SMMU2S.png b/resources/profiles/PrusaResearch/MK3SMMU2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3SMMU2S.png
rename to resources/profiles/PrusaResearch/MK3SMMU2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3.png b/resources/profiles/PrusaResearch/MK3S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3.png
rename to resources/profiles/PrusaResearch/MK3S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3S.png b/resources/profiles/PrusaResearch/MK3_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3S.png
rename to resources/profiles/PrusaResearch/MK3_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_SL1.png b/resources/profiles/PrusaResearch/SL1_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_SL1.png
rename to resources/profiles/PrusaResearch/SL1_thumbnail.png
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index ac4357a2e2..bbdf5f2a1a 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -188,7 +188,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
 
         wxBitmap bitmap;
         int bitmap_width = 0;
-        const wxString bitmap_file = GUI::from_u8(Slic3r::var((boost::format("printers/%1%_%2%.png") % vendor.id % model.id).str()));
+        const wxString bitmap_file = GUI::from_u8(Slic3r::resources_dir() + "/profiles/" + vendor.id + "/" + model.id + "_thumbnail.png");
         if (wxFileExists(bitmap_file)) {
             bitmap.LoadFile(bitmap_file, wxBITMAP_TYPE_PNG);
             bitmap_width = bitmap.GetWidth();