diff --git a/bitmap2component/bitmap2component.icns b/bitmap2component/bitmap2component.icns
index 008db5b406..fc08f061cc 100644
Binary files a/bitmap2component/bitmap2component.icns and b/bitmap2component/bitmap2component.icns differ
diff --git a/bitmaps_png/mk_mac_icons.sh b/bitmaps_png/mk_mac_icons.sh
index 6215f5ac8a..7784606435 100755
--- a/bitmaps_png/mk_mac_icons.sh
+++ b/bitmaps_png/mk_mac_icons.sh
@@ -34,6 +34,18 @@ do
         # MacOS wants icons with 10% clearance on each side
         let "sub_sz = $sz * 8 / 10"
 
+        sigma=3
+        if [ $sz -eq 16 ]
+        then
+            sigma=2
+        elif [ $sz -ge 512 ]
+        then
+            sigma=5
+        fi
+
+        # Offset the drop shadow by one smaller than the kernel
+        let "off = $sigma - 1"
+
         # Use specialized icons for smaller sizes to keep pixel alignment
         if [ $sz -le 32 ]
         then
@@ -42,7 +54,7 @@ do
             inkscape sources/light/icon_${pgm}.svg -o macos_tmp/${pgm}_small_${sz}px.png -w ${sub_sz} -h ${sub_sz} --export-area-snap
         fi
 
-        convert macos_tmp/${pgm}_small_${sz}px.png -size $size xc:transparent +swap -gravity center -composite macos_tmp/${pgm}_${sz}px.png
+        convert macos_tmp/${pgm}_small_${sz}px.png \( +clone -background black -shadow 80x${sigma}+${off}+${off} \) +swap -background transparent -layers merge +repage -size $size xc:transparent +swap -gravity center -composite macos_tmp/${pgm}_${sz}px.png
 
         output+="macos_tmp/${pgm}_${sz}px.png "
     done
@@ -61,4 +73,4 @@ do
     fi
 done
 
-rm -rf macos_tmp
\ No newline at end of file
+# rm -rf macos_tmp
\ No newline at end of file
diff --git a/eeschema/eeschema.icns b/eeschema/eeschema.icns
index 1f2152c59b..2e1edc8270 100644
Binary files a/eeschema/eeschema.icns and b/eeschema/eeschema.icns differ
diff --git a/eeschema/eeschema_doc.icns b/eeschema/eeschema_doc.icns
index 1f2152c59b..2e1edc8270 100644
Binary files a/eeschema/eeschema_doc.icns and b/eeschema/eeschema_doc.icns differ
diff --git a/gerbview/gerbview.icns b/gerbview/gerbview.icns
index 90feb4ba97..1abb8eee94 100644
Binary files a/gerbview/gerbview.icns and b/gerbview/gerbview.icns differ
diff --git a/gerbview/gerbview_doc.icns b/gerbview/gerbview_doc.icns
index 90feb4ba97..1abb8eee94 100644
Binary files a/gerbview/gerbview_doc.icns and b/gerbview/gerbview_doc.icns differ
diff --git a/kicad/kicad.icns b/kicad/kicad.icns
index 45ea80ce5f..d840f1ceda 100644
Binary files a/kicad/kicad.icns and b/kicad/kicad.icns differ
diff --git a/kicad/kicad_doc.icns b/kicad/kicad_doc.icns
index 45ea80ce5f..d840f1ceda 100644
Binary files a/kicad/kicad_doc.icns and b/kicad/kicad_doc.icns differ
diff --git a/pagelayout_editor/pagelayout_editor.icns b/pagelayout_editor/pagelayout_editor.icns
index 3d4d8ed378..410e0a2fa9 100644
Binary files a/pagelayout_editor/pagelayout_editor.icns and b/pagelayout_editor/pagelayout_editor.icns differ
diff --git a/pagelayout_editor/pagelayout_editor_doc.icns b/pagelayout_editor/pagelayout_editor_doc.icns
index 3d4d8ed378..410e0a2fa9 100644
Binary files a/pagelayout_editor/pagelayout_editor_doc.icns and b/pagelayout_editor/pagelayout_editor_doc.icns differ
diff --git a/pcb_calculator/pcb_calculator.icns b/pcb_calculator/pcb_calculator.icns
index b9abe50cdd..2db8a29cbc 100644
Binary files a/pcb_calculator/pcb_calculator.icns and b/pcb_calculator/pcb_calculator.icns differ
diff --git a/pcbnew/pcbnew.icns b/pcbnew/pcbnew.icns
index 1d19482f76..8320307ce3 100644
Binary files a/pcbnew/pcbnew.icns and b/pcbnew/pcbnew.icns differ
diff --git a/pcbnew/pcbnew_doc.icns b/pcbnew/pcbnew_doc.icns
index 1d19482f76..8320307ce3 100644
Binary files a/pcbnew/pcbnew_doc.icns and b/pcbnew/pcbnew_doc.icns differ