Instrument cluster lights, '65 Valiant

While I got the lights working, I do believe that a couple are still out. I know the hi-beam indicator doesn't work.
Looking at the chart, it says they're all 158 bulbs, which are a bayonet style. But, the one I can sort of see behind the speedo looks much larger.

Would all of the '65 Valiant 200 instrument bulbs be the 158?

Also, would the column shift automatic have a lamp for the gear indicator? I see it on some models, but not sure if mine should have it.