Simple improvements, added icon