Fix IndexOutofBounds
Icons for Table
Merge remote-tracking branch 'origin/master' into TranslationService