encapsulated delivery icon to separate from lock

and as a bonus some tweaked text sizes and colors
// FREEBIE
No more push encoding pretense.

// FREEBIE
proguard: don't warn for test classes

// FREEBIE
Move targetSdkVersion back down to 19.

// FREEBIE
Update gradle-witness and actually use spongycastle.

// FREEBIE
proguard has guarded its last pro

// FREEBIE
make the light theme light

Fixes #2111
Tested on GB and LP
// FREEBIE
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into jxmods-full
3.1.1