Fixed discussion icon in narrow layout

Change-Id: Id90e0bc9301d88446d114696a933bbbaaa23bd33
Fixed margins in narrow mode

Change-Id: I3036ca5d049d25d6939a820700603fa71db0372b