Finally fixed issue
Moved from sprintf to asprintf
Started rename
Added new files
Renamed icon files