Moved some code around. Also re-added the potion icons that had been
removed in one of the last commits.