diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c
index 2c0f3f4ab..4ad6f803d 100644
--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@@ -30,7 +30,7 @@
 #define LABEL_RECOLOR_PAR_LENGTH    6
 
 #define SHADOW_OPA_EXTRA_PRECISION      8       /*Calculate with 2^x bigger shadow opacity values to avoid rounding errors*/
-#define SHADOW_BOTTOM_AA_EXTRA_RADIUS   4       /*Add extra radius with LV_SHADOW_BOTTOM to cover anti-aliased corners*/
+#define SHADOW_BOTTOM_AA_EXTRA_RADIUS   3       /*Add extra radius with LV_SHADOW_BOTTOM to cover anti-aliased corners*/
 /**********************
  *      TYPEDEFS
  **********************/
@@ -1840,7 +1840,7 @@ static void lv_draw_shadow_bottom(const lv_area_t * coords, const lv_area_t * ma
 
     radius = lv_draw_cont_radius_corr(radius, width, height);
     radius += LV_ANTIALIAS * SHADOW_BOTTOM_AA_EXTRA_RADIUS;
-    swidth+= LV_ANTIALIAS;
+    swidth += LV_ANTIALIAS;
 
     lv_coord_t curve_x[radius + 1];             /*Stores the 'x' coordinates of a quarter circle.*/
     lv_point_t circ;
@@ -1852,46 +1852,53 @@ static void lv_draw_shadow_bottom(const lv_area_t * coords, const lv_area_t * ma
         lv_circ_next(&circ, &circ_tmp);
     }
 
-    int16_t row;
+    int16_t col;
     lv_opa_t line_1d_blur[swidth];
 
-    for(row = 0; row < swidth; row++) {
-        line_1d_blur[row] = (uint32_t)((uint32_t)(swidth - row) * style->body.opa) / (swidth);
+    for(col = 0; col < swidth; col++) {
+        line_1d_blur[col] = (uint32_t)((uint32_t)(swidth - col) * style->body.opa) / (swidth);
     }
 
     lv_point_t point_l;
     lv_point_t point_r;
     lv_area_t area_mid;
-    lv_point_t ofs1;
-    lv_point_t ofs2;
+    lv_point_t ofs_l;
+    lv_point_t ofs_r;
 
-    ofs1.x = coords->x1 + radius;
-    ofs1.y = coords->y2 - radius + 1 - LV_ANTIALIAS;
+    ofs_l.x = coords->x1 + radius;
+    ofs_l.y = coords->y2 - radius + 1 - LV_ANTIALIAS;
 
-    ofs2.x = coords->x2 - radius;
-    ofs2.y = coords->y2 - radius + 1 - LV_ANTIALIAS;
+    ofs_r.x = coords->x2 - radius;
+    ofs_r.y = coords->y2 - radius + 1 - LV_ANTIALIAS;
 
-    for(row = 0; row <= radius; row++) {
-        point_l.x = ofs1.x + radius - row - radius;
-        point_l.y = ofs1.y + curve_x[row];
+    printf("\n\n");
 
-        point_r.x = ofs2.x + row;
-        point_r.y = ofs2.y + curve_x[row];
+    for(col = 0; col <= radius; col++) {
+        point_l.x = ofs_l.x + radius - col - radius;
+        point_l.y = ofs_l.y + curve_x[col];
+
+        point_r.x = ofs_r.x + col;
+        point_r.y = ofs_r.y + curve_x[col];
+
+        printf("lx:%d, rx:%d\n", point_l.x, point_r.x);
 
         uint16_t d;
         for(d = 0; d < swidth; d++) {
             px_fp(point_l.x, point_l.y, mask, style->body.shadow.color, line_1d_blur[d]);
             point_l.y ++;
 
-            px_fp(point_r.x, point_r.y, mask, style->body.shadow.color, line_1d_blur[d]);
-            point_r.y ++;
+            /*Don't overdraw th pixel on the middle*/
+            if(point_r.x > ofs_l.x) {
+                px_fp(point_r.x, point_r.y, mask, style->body.shadow.color, line_1d_blur[d]);
+                point_r.y ++;
+            }
         }
 
     }
 
-    area_mid.x1 = ofs1.x + 1;
-    area_mid.y1 = ofs1.y + radius;
-    area_mid.x2 = ofs2.x - 1;
+    area_mid.x1 = ofs_l.x + 1;
+    area_mid.y1 = ofs_l.y + radius;
+    area_mid.x2 = ofs_r.x - 1;
     area_mid.y2 = area_mid.y1;
 
     uint16_t d;
diff --git a/lv_themes/lv_theme_material.c b/lv_themes/lv_theme_material.c
index 202eb0535..616eedb6b 100644
--- a/lv_themes/lv_theme_material.c
+++ b/lv_themes/lv_theme_material.c
@@ -15,7 +15,7 @@
  *      DEFINES
  *********************/
 #define DEF_RADIUS           4
-#define DEF_SHADOW_COLOR     LV_COLOR_HEX3(0x888)
+#define DEF_SHADOW_COLOR     LV_COLOR_HEX3(0xaaa)
 
 /**********************
  *      TYPEDEFS
@@ -259,7 +259,7 @@ static void sw_init(void)
     sw_indic.body.radius = LV_RADIUS_CIRCLE;
 
     lv_style_copy(&sw_knob_on, theme.slider.knob);
-    sw_knob_on.body.shadow.width = 4;
+    sw_knob_on.body.shadow.width = 3;
     sw_knob_on.body.shadow.type = LV_SHADOW_BOTTOM;
     sw_knob_on.body.shadow.color = DEF_SHADOW_COLOR;
 
@@ -328,7 +328,7 @@ static void cb_init(void)
     static lv_style_t rel, pr, tgl_rel, tgl_pr, ina;
     lv_style_copy(&rel,theme.panel);
     rel.body.shadow.type = LV_SHADOW_BOTTOM;
-    rel.body.shadow.width = 2;
+    rel.body.shadow.width = 3;
 
     lv_style_copy(&pr, &rel);
     pr.body.main_color = LV_COLOR_HEX3(0xccc);
@@ -370,7 +370,7 @@ static void btnm_init(void)
     bg.text.color = LV_COLOR_HEX3(0x555);
 
     lv_style_copy(&rel,theme.panel);
-    rel.body.border.part = LV_BORDER_RIGHT| LV_BORDER_BOTTOM;
+    rel.body.border.part = LV_BORDER_RIGHT;
     rel.body.border.width = 1;
     rel.body.border.color = LV_COLOR_HEX3(0xbbb);
     rel.body.empty = 1;
@@ -597,7 +597,7 @@ static void tabview_init(void)
     btn_bg.body.border.color = LV_COLOR_HEX3(0x888);
     btn_bg.body.border.part = LV_BORDER_BOTTOM;
     btn_bg.body.border.opa = LV_OPA_COVER;
-    btn_bg.body.shadow.width = 6;
+    btn_bg.body.shadow.width = 5;
     btn_bg.body.shadow.color = DEF_SHADOW_COLOR;
     btn_bg.body.shadow.type = LV_SHADOW_BOTTOM;
     btn_bg.body.padding.inner = 0;