Fix for buttons and fa icons