Cleaned all layouts / added new icons