working version 1 with new icons - NO CODE CHANGES