diff --git a/bitmap2component/bitmap2component.icns b/bitmap2component/bitmap2component.icns
index 1ef3b88616..008db5b406 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
new file mode 100755
index 0000000000..6215f5ac8a
--- /dev/null
+++ b/bitmaps_png/mk_mac_icons.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# make macos icons using Inkscape
+
+mkdir macos_tmp
+# convert .svg files into .png files
+
+SIZES="16x16
+       32x32
+       128x128
+       256x256
+       512x512
+       1024x1024"
+
+ICONS="bitmap2component
+       eeschema
+       gerbview
+       kicad
+       pagelayout_editor
+       pcbcalculator
+       pcbnew"
+
+
+for pgm in $ICONS
+do
+    output=""
+
+    for size in $SIZES
+    do
+        sz=${size%x*}
+
+        echo -e '\E[0;32m'"\nMaking the applications icons with size $size."
+        
+        # MacOS wants icons with 10% clearance on each side
+        let "sub_sz = $sz * 8 / 10"
+
+        # Use specialized icons for smaller sizes to keep pixel alignment
+        if [ $sz -le 32 ]
+        then
+            inkscape sources/light/icon_${pgm}_${sz}.svg -o macos_tmp/${pgm}_small_${sz}px.png -w ${sub_sz} -h ${sub_sz} --export-area-snap
+        else
+            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
+
+        output+="macos_tmp/${pgm}_${sz}px.png "
+    done
+
+    if [ ${pgm} == "pcbcalculator" ]
+    then
+        # mismatch in the pcbcalculator icon names
+        png2icns ../pcb_calculator/pcb_calculator.icns ${output}
+    elif [ ${pgm} == "bitmap2component" ]
+    then
+        #bitmap2component does not have associated documents
+        png2icns ../${pgm}/${pgm}.icns ${output}
+    else
+        png2icns ../${pgm}/${pgm}.icns ${output}
+        cp ../${pgm}/${pgm}.icns ../${pgm}/${pgm}_doc.icns
+    fi
+done
+
+rm -rf macos_tmp
\ No newline at end of file
diff --git a/eeschema/eeschema.icns b/eeschema/eeschema.icns
index d344490bf4..1f2152c59b 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 d344490bf4..1f2152c59b 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 5e4ae33a76..90feb4ba97 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 5e4ae33a76..90feb4ba97 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 dab12def46..45ea80ce5f 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 dab12def46..45ea80ce5f 100644
Binary files a/kicad/kicad_doc.icns and b/kicad/kicad_doc.icns differ
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index af20a0f967..7d89db2ad3 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -62,15 +62,15 @@ endif()
 
 if( APPLE )
     # setup bundle
-    set( PL_EDITOR_RESOURCES pl_editor.icns pl_editor_doc.icns )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor.icns" PROPERTIES
+    set( PL_EDITOR_RESOURCES pagelayout_editor.icns pagelayout_editor_doc.icns )
+    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pagelayout_editor.icns" PROPERTIES
         MACOSX_PACKAGE_LOCATION Resources
         )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor_doc.icns" PROPERTIES
+    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pagelayout_editor_doc.icns" PROPERTIES
         MACOSX_PACKAGE_LOCATION Resources
         )
-    set( MACOSX_BUNDLE_ICON_FILE pl_editor.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_ICON_FILE pagelayout_editor.icns )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME pl_editor )
 endif()
 
diff --git a/pagelayout_editor/pagelayout_editor.icns b/pagelayout_editor/pagelayout_editor.icns
new file mode 100644
index 0000000000..3d4d8ed378
Binary files /dev/null and b/pagelayout_editor/pagelayout_editor.icns differ
diff --git a/pagelayout_editor/pagelayout_editor_doc.icns b/pagelayout_editor/pagelayout_editor_doc.icns
new file mode 100644
index 0000000000..3d4d8ed378
Binary files /dev/null and b/pagelayout_editor/pagelayout_editor_doc.icns differ
diff --git a/pagelayout_editor/pl_editor.icns b/pagelayout_editor/pl_editor.icns
deleted file mode 100644
index 3df694ca40..0000000000
Binary files a/pagelayout_editor/pl_editor.icns and /dev/null differ
diff --git a/pagelayout_editor/pl_editor_doc.icns b/pagelayout_editor/pl_editor_doc.icns
deleted file mode 100644
index 3df694ca40..0000000000
Binary files a/pagelayout_editor/pl_editor_doc.icns and /dev/null differ
diff --git a/pcb_calculator/pcb_calculator.icns b/pcb_calculator/pcb_calculator.icns
index 64b5b85b54..b9abe50cdd 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 69b3ebd72c..1d19482f76 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 69b3ebd72c..1d19482f76 100644
Binary files a/pcbnew/pcbnew_doc.icns and b/pcbnew/pcbnew_doc.icns differ