Changed notification icon. Disabled security settings button for api < 18
Merge branch 'master' into ui-improvements