Fixed icons for modals + small optimizations for mobile use