Or, my personal preference, change the wording of "New Topic" and drop polls all together.
I'd prefer to see one button, too. The ability to create a poll should not be done away with, but should require explicit effort to get to. Hide it under Additional Options, and only those that really want to post a poll will do so.
How come this isn't a poll?