Quick unlock for settings + Extras

I adapted the commit of MartinRo (quick unlock) for my settings