Split icons and indicators

- Icons are now always 24x24px images, while indicators are 12x12px
- Indicators and Icons can now be used together

Followed up with: I32aef3ea2e66fd823aeb07dac06cfefba9954270

Change-Id: I49cfe9c8eedb0404d03f783b40eb2c79a6104d21