Replace margin by padding to fix missing border