1. Change some methods to protected
2. Update icons