Splitting theme module into two icons modules per theme