Fixed some naming and hid the icon
Merge branch 'master' into kotlin