[TASK] Improve code

- Some renamings
- ext_icon