Ichikawa's definitely a cat, and I'm not just saying that because a catboy Ichikawa with Yamada would be adorable.
I don't know which animal Yamada would be. I'm tempted for dog because she's got that dominate and unconditional loving gene in her but I feel like there should be an animal that fits better. Maybe a fox or something.