Add glyphicons again
Move logic to activityService