Reorganize and fix icons
Add test key and password file