margin fix for all pages and icon change