Changed some paddings to margins

These changes do not modify graphical aspect yet, but they will be useful later on when using "on touch" drawable.