RWH code re-organized into meaningful and added icon too