Comment 10 for bug 838854

@johnlea:

Ups, just re-read the description, where you already anticipated the non-default configuration problem... ;)

I would nevertheless suggest to still switch the icon, no matter if the configuration is non-2x2. I use 4x1 for example and I still want the icon to change accordingly, although my config is a non-2x2 one.
What do you think about a solution that links workspace 1 with the topleft-icon, workspace 2 with the topright-icon, workspace 3 with the bottomleft-icon and workspace 4 with the bottomright-icon, no matter if the configuration is 2x2, 1x4 or 4x1 ?

For more workspaces than 4 the cycling I suggested in comment #9 above would also work...
Using less workspaces than 4 (like 2 or 3) should also change the icon accordingly, no ?