Fixing loading button and icons