I agree that the tank is too small, but if you upgraded, I'd go with a 40 gallon minimum. Personally, I have a 55 gallon and only one Angelfish (on purpose because I knew how big she would get). She was quarter size when I got her a year ago. Now she's over the size of a silver dollar, not including the fins. So they grow fairly fast.