defined constants, removed duplicate function, fixed missing icon