Backport design fixes

backport of https://github.com/owncloud/documents/pull/298 to stable7