Added 3322 themed icons + refactored widget code