diff --git a/freecad/kiconnect/api.py b/freecad/kiconnect/api.py
index 8f24fdf..d7dbbf4 100644
--- a/freecad/kiconnect/api.py
+++ b/freecad/kiconnect/api.py
@@ -98,7 +98,7 @@ class APIObject(BaseObject):
 
 
 class APIViewProvider(BaseViewProvider):
-    ICON = 'icon_footprint_browser.svg'
+    ICON = 'kicad/icon_footprint_browser.svg'
     TYPE = 'KiConnect::API'
 
     def __init__(self, viewprovider):
diff --git a/freecad/kiconnect/board.py b/freecad/kiconnect/board.py
index cb90067..1a3e542 100644
--- a/freecad/kiconnect/board.py
+++ b/freecad/kiconnect/board.py
@@ -180,7 +180,7 @@ class BoardObject(BaseObject):
 
 class BoardViewProvider(BaseViewProvider):
     TYPE = 'KiConnect::Board'
-    ICON = 'board.svg'
+    ICON = 'kicad/board.svg'
 
 def makeBoard(parent, kicad_board, polygon):
     feature = App.ActiveDocument.addObject('App::DocumentObjectGroupPython', 'Board')
diff --git a/freecad/kiconnect/board_sketch.py b/freecad/kiconnect/board_sketch.py
index 2f307b0..b4eb537 100644
--- a/freecad/kiconnect/board_sketch.py
+++ b/freecad/kiconnect/board_sketch.py
@@ -74,7 +74,7 @@ class BoardSketchObject(BaseObject):
 
 class BoardSketchViewProvider(BaseViewProvider):
     TYPE = 'KiConnect::BoardSketch'
-    #ICON = 'board.svg'
+    #ICON = 'kicad/board.svg'
 
 def makeBoardSketch(parent, kicad_board, polygon):
     feature = App.ActiveDocument.addObject('Sketcher::SketchObjectPython', 'BoardSketch')
diff --git a/freecad/kiconnect/copper.py b/freecad/kiconnect/copper.py
index be1e640..62158d5 100644
--- a/freecad/kiconnect/copper.py
+++ b/freecad/kiconnect/copper.py
@@ -19,7 +19,7 @@ class CopperObject(BaseObject):
     TYPE = 'KiConnect::Copper'
 
 class CopperViewProvider(BaseViewProvider):
-    ICON = 'show_all_copper_layers.svg'
+    ICON = 'kicad/show_all_copper_layers.svg'
     TYPE = 'KiConnect::Copper'
 
 class Copper():
diff --git a/freecad/kiconnect/parts.py b/freecad/kiconnect/parts.py
index be42b69..2c98696 100644
--- a/freecad/kiconnect/parts.py
+++ b/freecad/kiconnect/parts.py
@@ -73,7 +73,7 @@ class PartsObject(BaseObject):
                     print(e)
 
 class PartsViewProvider(BaseViewProvider):
-    ICON = 'icon_footprint_browser.svg'
+    ICON = 'kicad/icon_footprint_browser.svg'
     TYPE = 'KiConnect::Parts'
 
 def makeParts(parent):
diff --git a/freecad/kiconnect/resources/icons/kicad/CREDITS b/freecad/kiconnect/resources/icons/kicad/CREDITS
new file mode 100644
index 0000000..fe1f104
--- /dev/null
+++ b/freecad/kiconnect/resources/icons/kicad/CREDITS
@@ -0,0 +1,9 @@
+ICONS:
+
+Original KiCad Icon work by Inigo Zuluaga and Fabrizio Tappero among others
+
+KiCad icons were redesigned in 2020 by Aleksandr Zyrianov
+
+KiCad nightly icon reworked by Rafael Silva based on the 2020 redesign
+
+License: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/freecad/kiconnect/resources/icons/board.svg b/freecad/kiconnect/resources/icons/kicad/board.svg
similarity index 100%
rename from freecad/kiconnect/resources/icons/board.svg
rename to freecad/kiconnect/resources/icons/kicad/board.svg
diff --git a/freecad/kiconnect/resources/icons/icon_footprint_browser.svg b/freecad/kiconnect/resources/icons/kicad/icon_footprint_browser.svg
similarity index 100%
rename from freecad/kiconnect/resources/icons/icon_footprint_browser.svg
rename to freecad/kiconnect/resources/icons/kicad/icon_footprint_browser.svg
diff --git a/freecad/kiconnect/resources/icons/show_all_copper_layers.svg b/freecad/kiconnect/resources/icons/kicad/show_all_copper_layers.svg
similarity index 100%
rename from freecad/kiconnect/resources/icons/show_all_copper_layers.svg
rename to freecad/kiconnect/resources/icons/kicad/show_all_copper_layers.svg