moved icons to bottom right corner
Merge branch 'staging'