Bug 1037655 - Move popup icon live preview into a preview icon in the editor 

With line 163, I think we can now remove line 147.