diff --git a/.gitattributes b/.gitattributes
index 304e1fc84f..935939e3e2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7279,24 +7279,62 @@ images/codecompletion/cc_variable.png -text
 images/codecompletion/cc_variable_150.png -text
 images/codecompletion/cc_variable_200.png -text
 images/codeexplorer/ce_classinterface.png -text svneol=unset#image/png
+images/codeexplorer/ce_classinterface_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_classinterface_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_cycleimplementation.png -text svneol=unset#image/png
+images/codeexplorer/ce_cycleimplementation_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_cycleimplementation_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_cycleinterface.png -text svneol=unset#image/png
+images/codeexplorer/ce_cycleinterface_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_cycleinterface_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_default.png -text
+images/codeexplorer/ce_default_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_default_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_deprecated.png -text
+images/codeexplorer/ce_deprecated_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_deprecated_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_experimental.png -text
+images/codeexplorer/ce_experimental_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_experimental_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_finalization.png -text
+images/codeexplorer/ce_finalization_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_finalization_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_helper.png -text svneol=unset#image/png
+images/codeexplorer/ce_helper_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_helper_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_implementation.png -text
+images/codeexplorer/ce_implementation_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_implementation_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_initialization.png -text
+images/codeexplorer/ce_initialization_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_initialization_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_interface.png -text
+images/codeexplorer/ce_interface_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_interface_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_library.png -text
+images/codeexplorer/ce_library_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_library_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_platform.png -text
+images/codeexplorer/ce_platform_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_platform_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_program.png -text
+images/codeexplorer/ce_program_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_program_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_property_readonly.png -text svneol=unset#image/png
+images/codeexplorer/ce_property_readonly_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_property_readonly_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_section.png -text svneol=unset#image/png
+images/codeexplorer/ce_section_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_section_200.png -text svneol=unset#image/png
 images/codeexplorer/ce_unimplemented.png -text
+images/codeexplorer/ce_unimplemented_150.png -text svneol=unset#image/png
+images/codeexplorer/ce_unimplemented_200.png -text svneol=unset#image/png
 images/codeexplorer/show_category.png -text
+images/codeexplorer/show_category_150.png -text svneol=unset#image/png
+images/codeexplorer/show_category_200.png -text svneol=unset#image/png
 images/codeexplorer/show_source.png -text
+images/codeexplorer/show_source_150.png -text svneol=unset#image/png
+images/codeexplorer/show_source_200.png -text svneol=unset#image/png
 images/codetoolsdefines/da_block.png -text svneol=unset#image/png
 images/codetoolsdefines/da_define.png -text svneol=unset#image/png
 images/codetoolsdefines/da_definerecurse.png -text svneol=unset#image/png
@@ -7870,6 +7908,8 @@ images/designer/tab_order.png -text
 images/designer/tab_order_150.png -text
 images/designer/tab_order_200.png -text
 images/folder.png -text
+images/folder_150.png -text svneol=unset#image/png
+images/folder_200.png -text svneol=unset#image/png
 images/icon-naming-spec.xml svneol=native#text/plain
 images/icons/aqua.ico -text
 images/icons/blue.ico -text svneol=unset#image/ico
@@ -8564,6 +8604,8 @@ images/states/state_warning_200.png -text
 images/states/state_warning_69.png -text
 images/states/state_warning_75.png -text
 images/template.png -text svneol=unset#image/png
+images/template_150.png -text svneol=unset#image/png
+images/template_200.png -text svneol=unset#image/png
 images/vase_trans.xpm -text svneol=native#image/x-xpixmap
 images/windows/win_formeditor.ico -text
 images/windows/win_main.ico -text
diff --git a/doceditor/lazde.res b/doceditor/lazde.res
index 99f5b20b07..e42c1c4359 100644
Binary files a/doceditor/lazde.res and b/doceditor/lazde.res differ
diff --git a/ide/buildmodesmanager.pas b/ide/buildmodesmanager.pas
index 76a697b147..b15f79df62 100644
--- a/ide/buildmodesmanager.pas
+++ b/ide/buildmodesmanager.pas
@@ -123,14 +123,14 @@ procedure SwitchBuildMode(aBuildModeID: string);
 procedure UpdateBuildModeCombo(aCombo: TComboBox);
 
 // Functions dealing with many BuildModes. They depend on TBuildModesCheckList.
-function AddPathToBuildModes(aPath, CurDirectory: string; IsIncludeFile: Boolean): Boolean;
+function AddPathToBuildModes(aDir: string; IsIncludeFile: Boolean): Boolean;
 procedure RemovePathFromBuildModes(ObsoletePaths: String; pcos: TParsedCompilerOptString);
 function BuildManyModes: Boolean;
 
 // Check if UnitDirectory is part of the Unit Search Paths.
 //  If not, ask user if he wants to extend dependencies or the Unit Search Paths.
 // Not strictly for many BuildModes but it adds a path to them all.
-function CheckDirIsInSearchPath(UnitInfo: TUnitInfo; AllowAddingDependencies, IsIncludeFile: Boolean): Boolean;
+function CheckDirIsInSearchPath(UnitInfo: TUnitInfo; IsIncludeFile: Boolean): Boolean;
 
 var
   OnLoadIDEOptionsHook: TOnLoadIDEOptions;
@@ -208,7 +208,7 @@ begin
   end;
 end;
 
-function AddPathToBuildModes(aPath, CurDirectory: string; IsIncludeFile: Boolean): Boolean;
+function AddPathToBuildModes(aDir: string; IsIncludeFile: Boolean): Boolean;
 var
   DlgCapt, DlgMsg: String;
   i: Integer;
@@ -229,17 +229,20 @@ begin
     if Project1.BuildModes.Count > 1 then
       Ok:=BMList.Show
     else begin
-      Ok:=IDEMessageDialog(DlgCapt, Format(DlgMsg,[LineEnding,CurDirectory]),
+      Ok:=IDEMessageDialog(DlgCapt, Format(DlgMsg,[LineEnding,aDir]),
                            mtConfirmation,[mbYes,mbNo]) = mrYes;
       BMList.SelectFirst; // The only (Default) build mode must be selected.
     end;
     if not Ok then Exit(False);
+    if not Project1.IsVirtual then
+      aDir:=CreateRelativePath(aDir, Project1.Directory);
     for i:=0 to Project1.BuildModes.Count-1 do
       if BMList.IsSelected(i) then
-        if IsIncludeFile then
-          Project1.BuildModes[i].CompilerOptions.MergeToIncludePaths(aPath)
-        else
-          Project1.BuildModes[i].CompilerOptions.MergeToUnitPaths(aPath);
+        with Project1.BuildModes[i].CompilerOptions do
+          if IsIncludeFile then
+            MergeToIncludePaths(aDir)
+          else
+            MergeToUnitPaths(aDir);
   finally
     BMList.Free;
   end;
@@ -374,15 +377,11 @@ begin
   end;
 end;
 
-function CheckDirIsInSearchPath(UnitInfo: TUnitInfo;
-  AllowAddingDependencies, IsIncludeFile: Boolean): Boolean;
+function CheckDirIsInSearchPath(UnitInfo: TUnitInfo; IsIncludeFile: Boolean): Boolean;
 // Check if the given unit's path is on Unit- or Include-search path.
 // Returns true if it is OK to add the unit to current project.
 var
-  CurDirectory, CurPath, ShortDir: String;
-  Owners: TFPList;
-  APackage: TLazPackage;
-  i: Integer;
+  UnitDir, CurPath: String;
 begin
   Result:=True;
   if UnitInfo.IsVirtual then exit;
@@ -390,36 +389,10 @@ begin
     CurPath:=Project1.CompilerOptions.GetIncludePath(false)
   else
     CurPath:=Project1.CompilerOptions.GetUnitPath(false);
-  CurDirectory:=AppendPathDelim(UnitInfo.GetDirectory);
-  if SearchDirectoryInSearchPath(CurPath,CurDirectory)<1 then
-  begin
-    if AllowAddingDependencies then begin
-      Owners:=PkgBoss.GetPossibleOwnersOfUnit(UnitInfo.Filename,[]);
-      try
-        if (Owners<>nil) then begin
-          for i:=0 to Owners.Count-1 do begin
-            if TObject(Owners[i]) is TLazPackage then begin
-              APackage:=TLazPackage(Owners[i]);
-              if IDEMessageDialog(lisAddPackageRequirement,
-                Format(lisAddPackageToProject, [APackage.IDAsString]),
-                mtConfirmation,[mbYes,mbCancel],'')<>mrYes
-              then
-                Exit(True);
-              PkgBoss.AddProjectDependency(Project1,APackage);
-              Exit(False);
-            end;
-          end;
-        end;
-      finally
-        Owners.Free;
-      end;
-    end;
-    // unit is not in a package => extend unit path
-    ShortDir:=CurDirectory;
-    if (not Project1.IsVirtual) then
-      ShortDir:=CreateRelativePath(ShortDir,Project1.Directory);
-    Result:=AddPathToBuildModes(ShortDir,CurDirectory,IsIncludeFile);
-  end;
+  UnitDir:=AppendPathDelim(UnitInfo.GetDirectory);
+  if SearchDirectoryInSearchPath(CurPath,UnitDir)<1 then
+    // unit is not in search path => extend it
+    Result:=AddPathToBuildModes(UnitDir,IsIncludeFile);
 end;
 
 { TBuildModesForm }
diff --git a/ide/main.pp b/ide/main.pp
index cd9e50a433..ff8fe28274 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -12352,7 +12352,7 @@ begin
   BeginCodeTool(ActiveSourceEditor,ActiveUnitInfo,[]);
   OkToAdd:=True;
   if FilenameIsPascalUnit(AnUnitInfo.Filename) then begin
-    OkToAdd:=CheckDirIsInSearchPath(AnUnitInfo,False,False);
+    OkToAdd:=CheckDirIsInSearchPath(AnUnitInfo,False);
     if (pfMainUnitHasUsesSectionForAllUnits in Project1.Flags) then begin
       AnUnitInfo.ReadUnitNameFromSource(false);
       ShortUnitName:=AnUnitInfo.Unit_Name;
@@ -12369,7 +12369,7 @@ begin
     end;
   end
   else if CompareFileExt(AnUnitInfo.Filename,'inc',false)=0 then
-    OkToAdd:=CheckDirIsInSearchPath(AnUnitInfo,False,True);
+    OkToAdd:=CheckDirIsInSearchPath(AnUnitInfo,True);
   if OkToAdd then
     ;
   Project1.Modified:=true;
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 3a4bf9db1f..e8db8e9a51 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -1851,9 +1851,9 @@ begin
   then begin
     OkToAdd:=True;
     if FilenameIsPascalUnit(ActiveUnitInfo.Filename) then
-      OkToAdd:=CheckDirIsInSearchPath(ActiveUnitInfo,False,False)
+      OkToAdd:=CheckDirIsInSearchPath(ActiveUnitInfo,False)
     else if CompareFileExt(ActiveUnitInfo.Filename,'inc',false)=0 then
-      OkToAdd:=CheckDirIsInSearchPath(ActiveUnitInfo,False,True);
+      OkToAdd:=CheckDirIsInSearchPath(ActiveUnitInfo,True);
     if OkToAdd then begin
       ActiveUnitInfo.IsPartOfProject:=true;
       Project1.Modified:=true;
@@ -5309,22 +5309,11 @@ begin
 
     // add new path to unit path
     if AnUnitInfo.IsPartOfProject
-    and (not Project1.IsVirtual)
     and (FilenameIsPascalUnit(NewFilename))
     and (CompareFilenames(NewFilePath,Project1.Directory)<>0) then begin
       OldUnitPath:=Project1.CompilerOptions.GetUnitPath(false);
-
-      if SearchDirectoryInSearchPath(OldUnitPath,NewFilePath,1)<1 then begin
-        //DebugLn('RenameUnit NewFilePath="',NewFilePath,'" OldUnitPath="',OldUnitPath,'"');
-        if IDEMessageDialog(lisExtendUnitPath,
-          Format(lisTheDirectoryIsNotYetInTheUnitPathAddIt,[NewFilePath,LineEnding]),
-          mtConfirmation,[mbYes,mbNo])=mrYes then
-        begin
-          Project1.CompilerOptions.OtherUnitFiles:=
-                       Project1.CompilerOptions.OtherUnitFiles+';'
-                       +CreateRelativePath(NewFilePath,Project1.Directory);
-        end;
-      end;
+      if SearchDirectoryInSearchPath(OldUnitPath,NewFilePath,1)<1 then
+        AddPathToBuildModes(NewFilePath, False);
     end;
 
     // rename lfm file
@@ -5383,8 +5372,7 @@ begin
       Result:=ForceDirectoryInteractive(ExtractFilePath(NewLRSFilename),[mbRetry,mbIgnore]);
       if Result=mrCancel then exit;
       if Result=mrOk then begin
-        if not CodeToolBoss.SaveBufferAs(LRSCode,NewLRSFilename,LRSCode)
-        then
+        if not CodeToolBoss.SaveBufferAs(LRSCode,NewLRSFilename,LRSCode) then
           DebugLn(['RenameUnit CodeToolBoss.SaveBufferAs failed: NewResFilename="',NewLRSFilename,'"']);
       end;
 
diff --git a/images/codeexplorer/ce_classinterface.png b/images/codeexplorer/ce_classinterface.png
index b335cb11c4..92fc5aa869 100644
Binary files a/images/codeexplorer/ce_classinterface.png and b/images/codeexplorer/ce_classinterface.png differ
diff --git a/images/codeexplorer/ce_classinterface_150.png b/images/codeexplorer/ce_classinterface_150.png
new file mode 100644
index 0000000000..0381c9d0e7
Binary files /dev/null and b/images/codeexplorer/ce_classinterface_150.png differ
diff --git a/images/codeexplorer/ce_classinterface_200.png b/images/codeexplorer/ce_classinterface_200.png
new file mode 100644
index 0000000000..e279144aa3
Binary files /dev/null and b/images/codeexplorer/ce_classinterface_200.png differ
diff --git a/images/codeexplorer/ce_cycleimplementation.png b/images/codeexplorer/ce_cycleimplementation.png
index 138a1ae463..35bc156ee1 100644
Binary files a/images/codeexplorer/ce_cycleimplementation.png and b/images/codeexplorer/ce_cycleimplementation.png differ
diff --git a/images/codeexplorer/ce_cycleimplementation_150.png b/images/codeexplorer/ce_cycleimplementation_150.png
new file mode 100644
index 0000000000..57fb6ae691
Binary files /dev/null and b/images/codeexplorer/ce_cycleimplementation_150.png differ
diff --git a/images/codeexplorer/ce_cycleimplementation_200.png b/images/codeexplorer/ce_cycleimplementation_200.png
new file mode 100644
index 0000000000..23e814ab62
Binary files /dev/null and b/images/codeexplorer/ce_cycleimplementation_200.png differ
diff --git a/images/codeexplorer/ce_cycleinterface.png b/images/codeexplorer/ce_cycleinterface.png
index 6c0955fda0..20b0594298 100644
Binary files a/images/codeexplorer/ce_cycleinterface.png and b/images/codeexplorer/ce_cycleinterface.png differ
diff --git a/images/codeexplorer/ce_cycleinterface_150.png b/images/codeexplorer/ce_cycleinterface_150.png
new file mode 100644
index 0000000000..0bb972249a
Binary files /dev/null and b/images/codeexplorer/ce_cycleinterface_150.png differ
diff --git a/images/codeexplorer/ce_cycleinterface_200.png b/images/codeexplorer/ce_cycleinterface_200.png
new file mode 100644
index 0000000000..63f6eed27f
Binary files /dev/null and b/images/codeexplorer/ce_cycleinterface_200.png differ
diff --git a/images/codeexplorer/ce_default.png b/images/codeexplorer/ce_default.png
index 27657e4706..64035176b2 100644
Binary files a/images/codeexplorer/ce_default.png and b/images/codeexplorer/ce_default.png differ
diff --git a/images/codeexplorer/ce_default_150.png b/images/codeexplorer/ce_default_150.png
new file mode 100644
index 0000000000..baf785ae2e
Binary files /dev/null and b/images/codeexplorer/ce_default_150.png differ
diff --git a/images/codeexplorer/ce_default_200.png b/images/codeexplorer/ce_default_200.png
new file mode 100644
index 0000000000..922ededc4d
Binary files /dev/null and b/images/codeexplorer/ce_default_200.png differ
diff --git a/images/codeexplorer/ce_deprecated.png b/images/codeexplorer/ce_deprecated.png
index c012511356..6de9b40d56 100644
Binary files a/images/codeexplorer/ce_deprecated.png and b/images/codeexplorer/ce_deprecated.png differ
diff --git a/images/codeexplorer/ce_deprecated_150.png b/images/codeexplorer/ce_deprecated_150.png
new file mode 100644
index 0000000000..d8f82ee879
Binary files /dev/null and b/images/codeexplorer/ce_deprecated_150.png differ
diff --git a/images/codeexplorer/ce_deprecated_200.png b/images/codeexplorer/ce_deprecated_200.png
new file mode 100644
index 0000000000..b481b37a0c
Binary files /dev/null and b/images/codeexplorer/ce_deprecated_200.png differ
diff --git a/images/codeexplorer/ce_experimental.png b/images/codeexplorer/ce_experimental.png
index 7fbab15cbf..05daf9b784 100644
Binary files a/images/codeexplorer/ce_experimental.png and b/images/codeexplorer/ce_experimental.png differ
diff --git a/images/codeexplorer/ce_experimental_150.png b/images/codeexplorer/ce_experimental_150.png
new file mode 100644
index 0000000000..567906a1e4
Binary files /dev/null and b/images/codeexplorer/ce_experimental_150.png differ
diff --git a/images/codeexplorer/ce_experimental_200.png b/images/codeexplorer/ce_experimental_200.png
new file mode 100644
index 0000000000..af56850a8b
Binary files /dev/null and b/images/codeexplorer/ce_experimental_200.png differ
diff --git a/images/codeexplorer/ce_finalization.png b/images/codeexplorer/ce_finalization.png
index 4221b53602..e7516304f7 100644
Binary files a/images/codeexplorer/ce_finalization.png and b/images/codeexplorer/ce_finalization.png differ
diff --git a/images/codeexplorer/ce_finalization_150.png b/images/codeexplorer/ce_finalization_150.png
new file mode 100644
index 0000000000..aa797034e0
Binary files /dev/null and b/images/codeexplorer/ce_finalization_150.png differ
diff --git a/images/codeexplorer/ce_finalization_200.png b/images/codeexplorer/ce_finalization_200.png
new file mode 100644
index 0000000000..467a12e4e4
Binary files /dev/null and b/images/codeexplorer/ce_finalization_200.png differ
diff --git a/images/codeexplorer/ce_helper.png b/images/codeexplorer/ce_helper.png
index 6187b15aec..c8cbe384eb 100644
Binary files a/images/codeexplorer/ce_helper.png and b/images/codeexplorer/ce_helper.png differ
diff --git a/images/codeexplorer/ce_helper_150.png b/images/codeexplorer/ce_helper_150.png
new file mode 100644
index 0000000000..b0d8c89ae1
Binary files /dev/null and b/images/codeexplorer/ce_helper_150.png differ
diff --git a/images/codeexplorer/ce_helper_200.png b/images/codeexplorer/ce_helper_200.png
new file mode 100644
index 0000000000..55c98e33d1
Binary files /dev/null and b/images/codeexplorer/ce_helper_200.png differ
diff --git a/images/codeexplorer/ce_implementation.png b/images/codeexplorer/ce_implementation.png
index 53d200321b..9b12044cf8 100644
Binary files a/images/codeexplorer/ce_implementation.png and b/images/codeexplorer/ce_implementation.png differ
diff --git a/images/codeexplorer/ce_implementation_150.png b/images/codeexplorer/ce_implementation_150.png
new file mode 100644
index 0000000000..417d7ecc5c
Binary files /dev/null and b/images/codeexplorer/ce_implementation_150.png differ
diff --git a/images/codeexplorer/ce_implementation_200.png b/images/codeexplorer/ce_implementation_200.png
new file mode 100644
index 0000000000..be4c8ca2a8
Binary files /dev/null and b/images/codeexplorer/ce_implementation_200.png differ
diff --git a/images/codeexplorer/ce_initialization.png b/images/codeexplorer/ce_initialization.png
index 460b14df86..a7a1e48cd6 100644
Binary files a/images/codeexplorer/ce_initialization.png and b/images/codeexplorer/ce_initialization.png differ
diff --git a/images/codeexplorer/ce_initialization_150.png b/images/codeexplorer/ce_initialization_150.png
new file mode 100644
index 0000000000..a52e4618d8
Binary files /dev/null and b/images/codeexplorer/ce_initialization_150.png differ
diff --git a/images/codeexplorer/ce_initialization_200.png b/images/codeexplorer/ce_initialization_200.png
new file mode 100644
index 0000000000..4265e1c856
Binary files /dev/null and b/images/codeexplorer/ce_initialization_200.png differ
diff --git a/images/codeexplorer/ce_interface.png b/images/codeexplorer/ce_interface.png
index 7d863f9497..71eb29f00e 100644
Binary files a/images/codeexplorer/ce_interface.png and b/images/codeexplorer/ce_interface.png differ
diff --git a/images/codeexplorer/ce_interface_150.png b/images/codeexplorer/ce_interface_150.png
new file mode 100644
index 0000000000..a8eff75b33
Binary files /dev/null and b/images/codeexplorer/ce_interface_150.png differ
diff --git a/images/codeexplorer/ce_interface_200.png b/images/codeexplorer/ce_interface_200.png
new file mode 100644
index 0000000000..efde42cddf
Binary files /dev/null and b/images/codeexplorer/ce_interface_200.png differ
diff --git a/images/codeexplorer/ce_library.png b/images/codeexplorer/ce_library.png
index 47667430a9..c1cc8faf26 100644
Binary files a/images/codeexplorer/ce_library.png and b/images/codeexplorer/ce_library.png differ
diff --git a/images/codeexplorer/ce_library_150.png b/images/codeexplorer/ce_library_150.png
new file mode 100644
index 0000000000..11ab2ecaed
Binary files /dev/null and b/images/codeexplorer/ce_library_150.png differ
diff --git a/images/codeexplorer/ce_library_200.png b/images/codeexplorer/ce_library_200.png
new file mode 100644
index 0000000000..0dee1025a7
Binary files /dev/null and b/images/codeexplorer/ce_library_200.png differ
diff --git a/images/codeexplorer/ce_platform.png b/images/codeexplorer/ce_platform.png
index f640256399..1bf90852d5 100644
Binary files a/images/codeexplorer/ce_platform.png and b/images/codeexplorer/ce_platform.png differ
diff --git a/images/codeexplorer/ce_platform_150.png b/images/codeexplorer/ce_platform_150.png
new file mode 100644
index 0000000000..ee2fb15a15
Binary files /dev/null and b/images/codeexplorer/ce_platform_150.png differ
diff --git a/images/codeexplorer/ce_platform_200.png b/images/codeexplorer/ce_platform_200.png
new file mode 100644
index 0000000000..7996f0999b
Binary files /dev/null and b/images/codeexplorer/ce_platform_200.png differ
diff --git a/images/codeexplorer/ce_program.png b/images/codeexplorer/ce_program.png
index 79e1bd7fa0..76646a2769 100644
Binary files a/images/codeexplorer/ce_program.png and b/images/codeexplorer/ce_program.png differ
diff --git a/images/codeexplorer/ce_program_150.png b/images/codeexplorer/ce_program_150.png
new file mode 100644
index 0000000000..7b1a947313
Binary files /dev/null and b/images/codeexplorer/ce_program_150.png differ
diff --git a/images/codeexplorer/ce_program_200.png b/images/codeexplorer/ce_program_200.png
new file mode 100644
index 0000000000..9bab26c22c
Binary files /dev/null and b/images/codeexplorer/ce_program_200.png differ
diff --git a/images/codeexplorer/ce_property_readonly.png b/images/codeexplorer/ce_property_readonly.png
index cf8b5caca6..30aa5dfa87 100644
Binary files a/images/codeexplorer/ce_property_readonly.png and b/images/codeexplorer/ce_property_readonly.png differ
diff --git a/images/codeexplorer/ce_property_readonly_150.png b/images/codeexplorer/ce_property_readonly_150.png
new file mode 100644
index 0000000000..367d7c4b1e
Binary files /dev/null and b/images/codeexplorer/ce_property_readonly_150.png differ
diff --git a/images/codeexplorer/ce_property_readonly_200.png b/images/codeexplorer/ce_property_readonly_200.png
new file mode 100644
index 0000000000..1554c033e2
Binary files /dev/null and b/images/codeexplorer/ce_property_readonly_200.png differ
diff --git a/images/codeexplorer/ce_section.png b/images/codeexplorer/ce_section.png
index 784e8fa482..97564ba6b5 100644
Binary files a/images/codeexplorer/ce_section.png and b/images/codeexplorer/ce_section.png differ
diff --git a/images/codeexplorer/ce_section_150.png b/images/codeexplorer/ce_section_150.png
new file mode 100644
index 0000000000..b538dc5bbc
Binary files /dev/null and b/images/codeexplorer/ce_section_150.png differ
diff --git a/images/codeexplorer/ce_section_200.png b/images/codeexplorer/ce_section_200.png
new file mode 100644
index 0000000000..0dde1551c7
Binary files /dev/null and b/images/codeexplorer/ce_section_200.png differ
diff --git a/images/codeexplorer/ce_unimplemented.png b/images/codeexplorer/ce_unimplemented.png
index 8347aa896f..1e78d1b5f7 100644
Binary files a/images/codeexplorer/ce_unimplemented.png and b/images/codeexplorer/ce_unimplemented.png differ
diff --git a/images/codeexplorer/ce_unimplemented_150.png b/images/codeexplorer/ce_unimplemented_150.png
new file mode 100644
index 0000000000..210e87eb79
Binary files /dev/null and b/images/codeexplorer/ce_unimplemented_150.png differ
diff --git a/images/codeexplorer/ce_unimplemented_200.png b/images/codeexplorer/ce_unimplemented_200.png
new file mode 100644
index 0000000000..46f7e7cf2f
Binary files /dev/null and b/images/codeexplorer/ce_unimplemented_200.png differ
diff --git a/images/codeexplorer/show_category.png b/images/codeexplorer/show_category.png
index 17b4aa0301..798f88d41d 100644
Binary files a/images/codeexplorer/show_category.png and b/images/codeexplorer/show_category.png differ
diff --git a/images/codeexplorer/show_category_150.png b/images/codeexplorer/show_category_150.png
new file mode 100644
index 0000000000..db76b16b7e
Binary files /dev/null and b/images/codeexplorer/show_category_150.png differ
diff --git a/images/codeexplorer/show_category_200.png b/images/codeexplorer/show_category_200.png
new file mode 100644
index 0000000000..00e424d50b
Binary files /dev/null and b/images/codeexplorer/show_category_200.png differ
diff --git a/images/codeexplorer/show_source.png b/images/codeexplorer/show_source.png
index a6ad7e0d59..00710f3e16 100644
Binary files a/images/codeexplorer/show_source.png and b/images/codeexplorer/show_source.png differ
diff --git a/images/codeexplorer/show_source_150.png b/images/codeexplorer/show_source_150.png
new file mode 100644
index 0000000000..f2e2a826f5
Binary files /dev/null and b/images/codeexplorer/show_source_150.png differ
diff --git a/images/codeexplorer/show_source_200.png b/images/codeexplorer/show_source_200.png
new file mode 100644
index 0000000000..b8c338dae0
Binary files /dev/null and b/images/codeexplorer/show_source_200.png differ
diff --git a/images/folder.png b/images/folder.png
index 071a45673b..97564ba6b5 100644
Binary files a/images/folder.png and b/images/folder.png differ
diff --git a/images/folder_150.png b/images/folder_150.png
new file mode 100644
index 0000000000..b538dc5bbc
Binary files /dev/null and b/images/folder_150.png differ
diff --git a/images/folder_200.png b/images/folder_200.png
new file mode 100644
index 0000000000..0dde1551c7
Binary files /dev/null and b/images/folder_200.png differ
diff --git a/images/laz_images.res b/images/laz_images.res
index 0203e8c741..1a5a000266 100644
Binary files a/images/laz_images.res and b/images/laz_images.res differ
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index 90f460015f..448762cbf8 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -1,8 +1,12 @@
 btn_downarrow.png
 folder.png
+folder_150.png
+folder_200.png
 ide_icon48x48.png
 mainiconproject.ico
 template.png
+template_150.png
+template_200.png
 actions/arrow_down.png
 actions/arrow_down_150.png
 actions/arrow_down_200.png
@@ -139,24 +143,62 @@ codecompletion/cc_variable.png
 codecompletion/cc_variable_150.png
 codecompletion/cc_variable_200.png
 codeexplorer/ce_classinterface.png
+codeexplorer/ce_classinterface_150.png
+codeexplorer/ce_classinterface_200.png
 codeexplorer/ce_cycleimplementation.png
+codeexplorer/ce_cycleimplementation_150.png
+codeexplorer/ce_cycleimplementation_200.png
 codeexplorer/ce_cycleinterface.png
+codeexplorer/ce_cycleinterface_150.png
+codeexplorer/ce_cycleinterface_200.png
 codeexplorer/ce_default.png
+codeexplorer/ce_default_150.png
+codeexplorer/ce_default_200.png
 codeexplorer/ce_deprecated.png
+codeexplorer/ce_deprecated_150.png
+codeexplorer/ce_deprecated_200.png
 codeexplorer/ce_experimental.png
+codeexplorer/ce_experimental_150.png
+codeexplorer/ce_experimental_200.png
 codeexplorer/ce_finalization.png
+codeexplorer/ce_finalization_150.png
+codeexplorer/ce_finalization_200.png
 codeexplorer/ce_helper.png
+codeexplorer/ce_helper_150.png
+codeexplorer/ce_helper_200.png
 codeexplorer/ce_implementation.png
+codeexplorer/ce_implementation_150.png
+codeexplorer/ce_implementation_200.png
 codeexplorer/ce_initialization.png
+codeexplorer/ce_initialization_150.png
+codeexplorer/ce_initialization_200.png
 codeexplorer/ce_interface.png
+codeexplorer/ce_interface_150.png
+codeexplorer/ce_interface_200.png
 codeexplorer/ce_library.png
+codeexplorer/ce_library_150.png
+codeexplorer/ce_library_200.png
 codeexplorer/ce_platform.png
+codeexplorer/ce_platform_150.png
+codeexplorer/ce_platform_200.png
 codeexplorer/ce_program.png
+codeexplorer/ce_program_150.png
+codeexplorer/ce_program_200.png
 codeexplorer/ce_property_readonly.png
+codeexplorer/ce_property_readonly_150.png
+codeexplorer/ce_property_readonly_200.png
 codeexplorer/ce_section.png
+codeexplorer/ce_section_150.png
+codeexplorer/ce_section_200.png
 codeexplorer/ce_unimplemented.png
+codeexplorer/ce_unimplemented_150.png
+codeexplorer/ce_unimplemented_200.png
 codeexplorer/show_category.png
+codeexplorer/show_category_150.png
+codeexplorer/show_category_200.png
 codeexplorer/show_source.png
+codeexplorer/show_source_150.png
+codeexplorer/show_source_200.png
 codetoolsdefines/da_block.png
 codetoolsdefines/da_define.png
 codetoolsdefines/da_definerecurse.png
diff --git a/images/template.png b/images/template.png
index a0cc462f41..68580db300 100644
Binary files a/images/template.png and b/images/template.png differ
diff --git a/images/template_150.png b/images/template_150.png
new file mode 100644
index 0000000000..fad8a09218
Binary files /dev/null and b/images/template_150.png differ
diff --git a/images/template_200.png b/images/template_200.png
new file mode 100644
index 0000000000..208e00c5c1
Binary files /dev/null and b/images/template_200.png differ