Code cleanup
Improved performance of icon button touch ripple