diff --git a/components/lazmapviewer/images/imagelist.txt b/components/lazmapviewer/images/imagelist.txt
index 7b0f87733..f76cc7169 100644
--- a/components/lazmapviewer/images/imagelist.txt
+++ b/components/lazmapviewer/images/imagelist.txt
@@ -4,3 +4,9 @@ tmapview_200.png
 tmvgeonames.png
 tmvgeonames_150.png
 tmvgeonames_200.png
+tmvdefpc.png
+tmvdefpc_150.png
+tmvdefpc_200.png
+tmvdesynapse.png
+tmvdesynapse_150.png
+tmvdesynapse_200.png
diff --git a/components/lazmapviewer/images/tmvdefpc.png b/components/lazmapviewer/images/tmvdefpc.png
new file mode 100644
index 000000000..67607aa6b
Binary files /dev/null and b/components/lazmapviewer/images/tmvdefpc.png differ
diff --git a/components/lazmapviewer/images/tmvdefpc_150.png b/components/lazmapviewer/images/tmvdefpc_150.png
new file mode 100644
index 000000000..479582277
Binary files /dev/null and b/components/lazmapviewer/images/tmvdefpc_150.png differ
diff --git a/components/lazmapviewer/images/tmvdefpc_200.png b/components/lazmapviewer/images/tmvdefpc_200.png
new file mode 100644
index 000000000..0cfcdc8aa
Binary files /dev/null and b/components/lazmapviewer/images/tmvdefpc_200.png differ
diff --git a/components/lazmapviewer/images/tmvdesynapse.png b/components/lazmapviewer/images/tmvdesynapse.png
new file mode 100644
index 000000000..cf5a96fdd
Binary files /dev/null and b/components/lazmapviewer/images/tmvdesynapse.png differ
diff --git a/components/lazmapviewer/images/tmvdesynapse_150.png b/components/lazmapviewer/images/tmvdesynapse_150.png
new file mode 100644
index 000000000..aaa1d1766
Binary files /dev/null and b/components/lazmapviewer/images/tmvdesynapse_150.png differ
diff --git a/components/lazmapviewer/images/tmvdesynapse_200.png b/components/lazmapviewer/images/tmvdesynapse_200.png
new file mode 100644
index 000000000..2da8961fe
Binary files /dev/null and b/components/lazmapviewer/images/tmvdesynapse_200.png differ
diff --git a/components/lazmapviewer/images/tmvdewin32.png b/components/lazmapviewer/images/tmvdewin32.png
new file mode 100644
index 000000000..862655baf
Binary files /dev/null and b/components/lazmapviewer/images/tmvdewin32.png differ
diff --git a/components/lazmapviewer/images/tmvdewin32_150.png b/components/lazmapviewer/images/tmvdewin32_150.png
new file mode 100644
index 000000000..9ef12169d
Binary files /dev/null and b/components/lazmapviewer/images/tmvdewin32_150.png differ
diff --git a/components/lazmapviewer/images/tmvdewin32_200.png b/components/lazmapviewer/images/tmvdewin32_200.png
new file mode 100644
index 000000000..7e6aa9b41
Binary files /dev/null and b/components/lazmapviewer/images/tmvdewin32_200.png differ
diff --git a/components/lazmapviewer/source/addons/synapse_downloadengine/lazmapviewer_synapse.lpk b/components/lazmapviewer/lazmapviewer_synapse.lpk
similarity index 86%
rename from components/lazmapviewer/source/addons/synapse_downloadengine/lazmapviewer_synapse.lpk
rename to components/lazmapviewer/lazmapviewer_synapse.lpk
index 5e5e66042..b57cffa2c 100644
--- a/components/lazmapviewer/source/addons/synapse_downloadengine/lazmapviewer_synapse.lpk
+++ b/components/lazmapviewer/lazmapviewer_synapse.lpk
@@ -8,12 +8,13 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+        <OtherUnitFiles Value="source\addons\synapse_downloadengine"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <Files Count="1">
       <Item1>
-        <Filename Value="mvdlesynapse.pas"/>
+        <Filename Value="source\addons\synapse_downloadengine\mvdlesynapse.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="mvDLESynapse"/>
       </Item1>
diff --git a/components/lazmapviewer/source/addons/synapse_downloadengine/lazmapviewer_synapse.pas b/components/lazmapviewer/lazmapviewer_synapse.pas
similarity index 100%
rename from components/lazmapviewer/source/addons/synapse_downloadengine/lazmapviewer_synapse.pas
rename to components/lazmapviewer/lazmapviewer_synapse.pas
diff --git a/components/lazmapviewer/source/mvmapviewer_icons.res b/components/lazmapviewer/source/mvmapviewer_icons.res
index 326f436e7..ed999cafd 100644
Binary files a/components/lazmapviewer/source/mvmapviewer_icons.res and b/components/lazmapviewer/source/mvmapviewer_icons.res differ