diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c
index d7f6071b1..466037da0 100644
--- a/src/lv_draw/lv_draw_img.c
+++ b/src/lv_draw/lv_draw_img.c
@@ -7,7 +7,7 @@
  *      INCLUDES
  *********************/
 #include "lv_draw_img.h"
-#include "lv_log.h"
+#include "../lv_misc/lv_log.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_themes/lv_theme.c b/src/lv_themes/lv_theme.c
index 4f6c54e28..21cc38c2d 100644
--- a/src/lv_themes/lv_theme.c
+++ b/src/lv_themes/lv_theme.c
@@ -57,6 +57,15 @@ void lv_theme_set_current(lv_theme_t * th)
 {
 #if LV_THEME_LIVE_UPDATE == 0
     current_theme = th;
+
+#if LV_USE_GROUP
+    /*Copy group style modification callback functions*/
+    memcpy(&current_theme->group, &th->group, sizeof(th->group));
+#endif
+
+    /*Let the object know their style might change*/
+    lv_obj_report_style_mod(NULL);
+
 #else
     uint32_t style_num = sizeof(th->style) / sizeof(lv_style_t *); /*Number of styles in a theme*/
 
@@ -87,10 +96,10 @@ void lv_theme_set_current(lv_theme_t * th)
     /*Let the object know their style might change*/
     lv_obj_report_style_mod(NULL);
 
-#if LV_USE_GROUP
-    lv_group_report_style_mod(NULL);
 #endif
 
+#if LV_USE_GROUP
+    lv_group_report_style_mod(NULL);
 #endif
 }