Some new screen and back hardware button handling
add icons
fix conflicts