Merge with latest cm-11.0 source
new icons
clean up

Signed-off-by: Grarak <williye97@gmail.com>