twitter themeing fixes

Change-Id: I8fb46be2dde51c26ee23569831a2278f4b0b35d7