Merge origin/laranja into laranja
Novo Layout, icone too