mixed up dimens & arrays

Change-Id: I9d8468beb852c3b483f372ef115ca050076504ec