(#32) Fixed some overwritten changes

1 job for 32-change-favorite-icon-to-own-component-button in 3 minutes and 29 seconds