Code cleanup, launcher & bookmark images

Added proper support for launcher and bookmark images + some minor code
cleanup