Optimized icons and layout margins