Refactored icons, added dropdown one