+ some code refactoring + change a little bit gray color in colorchange_del icons to avoid collision in Dark mode