diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87552cff..233e313f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ CHANGELOG for FlatCAM Evo beta
 
 =================================================
 
+5.05.2022
+
+- changed the activity GIF's for the dark theme
+- changed some of the dark theme icons to the red color
+
 4.05.2020
 
 - some changes to the dark mode stylesheet to make it look better
diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py
index 8f9b5a88..8f4d5409 100644
--- a/appGUI/GUIElements.py
+++ b/appGUI/GUIElements.py
@@ -5487,6 +5487,9 @@ class FlatCAMActivityView(QtWidgets.QWidget):
         elif icon_kind == "Eclipse green":
             icon = icon_location + '/active_4_static.png'
             movie = icon_location + "/active_4.gif"
+        elif icon_kind == "Spinner green":
+            icon = icon_location + '/active_5_static.png'
+            movie = icon_location + "/active_5.gif"
         else:
             icon = icon_location + '/active_static.png'
             movie = icon_location + "/active.gif"
@@ -5700,7 +5703,7 @@ class AppSystemTray(QtWidgets.QSystemTrayIcon):
             self.menu_open.addSeparator()
 
             # Open Gerber ...
-            menu_opengerber = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/flatcam_icon24.png'),
+            menu_opengerber = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/open_gerber32.png'),
                                             '%s ...\t%s' % (_('Open Gerber'), _('Ctrl+G')), self)
             self.menu_open.addAction(menu_opengerber)
 
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index b5097172..ad440748 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -99,6 +99,8 @@ class MainGUI(QtWidgets.QMainWindow):
 
         FCLabel.patching_text_color = self.theme_safe_color
 
+        # self.setWindowFlags(QtCore.Qt.WindowType.FramelessWindowHint)
+
         # Divine icon pack by Ipapun @ finicons.com
 
         # #######################################################################
@@ -162,7 +164,7 @@ class MainGUI(QtWidgets.QMainWindow):
         )
 
         self.menufile_open = self.menufile.addMenu(
-            QtGui.QIcon(self.app.resource_location + '/folder32_bis.png'), '%s' % _('Open'))
+            QtGui.QIcon(self.app.resource_location + '/folder32.png'), '%s' % _('Open'))
         self.menufile_open.setToolTipsVisible(True)
 
         # Open Project ...
@@ -173,7 +175,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.menufile_open.addSeparator()
 
         # Open Gerber ...
-        self.menufileopengerber = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/flatcam_icon24.png'),
+        self.menufileopengerber = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/open_gerber32.png'),
                                                 '%s...\t%s' % (_('Open Gerber'), _('Ctrl+G')), self)
         self.menufile_open.addAction(self.menufileopengerber)
 
@@ -475,14 +477,14 @@ class MainGUI(QtWidgets.QMainWindow):
             QtGui.QIcon(self.app.resource_location + '/origin16.png'),
             '%s\t%s' % (_('Set Origin'), _('O')))
         self.menuedit_move2origin = self.menuedit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin2_16.png'),
+            QtGui.QIcon(self.app.resource_location + '/move2origin32.png'),
             '%s\t%s' % (_('Move to Origin'), _('Shift+O')))
         self.menuedit_center_in_origin = self.menuedit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin3_32.png'),
+            QtGui.QIcon(self.app.resource_location + '/custom_origin32.png'),
             '%s\t%s' % (_('Custom Origin'), ''))
 
         self.menueditjump = self.menuedit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/jump_to16.png'),
+            QtGui.QIcon(self.app.resource_location + '/jump_to32.png'),
             '%s\t%s' % (_('Jump to Location'), _('J')))
         self.menueditlocate = self.menuedit.addAction(
             QtGui.QIcon(self.app.resource_location + '/locate16.png'),
@@ -764,7 +766,7 @@ class MainGUI(QtWidgets.QMainWindow):
             '%s\t%s' % (_("Simplification"), '')
         )
         self.geo_paint_menuitem = self.geo_editor_menu.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'),
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'),
             '%s\t%s' % (_("Paint"), _('I'))
         )
         self.geo_transform_menuitem = self.geo_editor_menu.addAction(
@@ -1057,14 +1059,14 @@ class MainGUI(QtWidgets.QMainWindow):
         # ########################## File Toolbar# ###############################
         # ########################################################################
         self.file_open_gerber_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/flatcam_icon32.png'), _("Open Gerber"))
+            QtGui.QIcon(self.app.resource_location + '/open_gerber32.png'), _("Open Gerber"))
         self.file_open_excellon_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Open Excellon"))
+            QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Open Excellon"))
         self.toolbarfile.addSeparator()
         self.file_open_btn = self.toolbarfile.addAction(
             QtGui.QIcon(self.app.resource_location + '/folder32.png'), _("Open Project"))
         self.file_save_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/project_save32.png'), _("Save project"))
+            QtGui.QIcon(self.app.resource_location + '/save_as.png'), _("Save project"))
 
         # ########################################################################
         # ########################## Edit Toolbar# ###############################
@@ -1078,7 +1080,7 @@ class MainGUI(QtWidgets.QMainWindow):
                                           QToolButton
                                           {
                                               color: black;
-                                              background-color: tomato;
+                                              background-color: blue;
                                           }
                                           """)
         self.editor_exit_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/power16.png'))
@@ -1099,12 +1101,12 @@ class MainGUI(QtWidgets.QMainWindow):
         self.origin_btn = self.toolbaredit.addAction(
             QtGui.QIcon(self.app.resource_location + '/origin32.png'), _('Set Origin'))
         self.move2origin_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin2_32.png'), _('Move to Origin'))
+            QtGui.QIcon(self.app.resource_location + '/move2origin32.png'), _('Move to Origin'))
         self.center_in_origin_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin3_32.png'), _('Custom Origin'))
+            QtGui.QIcon(self.app.resource_location + '/custom_origin32.png'), _('Custom Origin'))
 
         self.jmp_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/jump_to16.png'), _('Jump to Location'))
+            QtGui.QIcon(self.app.resource_location + '/jump_to32.png'), _('Jump to Location'))
         self.locate_btn = self.toolbaredit.addAction(
             QtGui.QIcon(self.app.resource_location + '/locate32.png'), _('Locate in Object'))
 
@@ -1140,7 +1142,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # ########################## Tools Toolbar# ##############################
         # ########################################################################
         self.drill_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling"))
+            QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Drilling"))
         self.mill_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/milling_tool32.png'), _("Milling"))
         self.level_btn = self.toolbarplugins.addAction(
@@ -1151,13 +1153,13 @@ class MainGUI(QtWidgets.QMainWindow):
         self.toolbarplugins.addSeparator()
 
         self.isolation_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation"))
+            QtGui.QIcon(self.app.resource_location + '/iso32.png'), _("Isolation"))
         self.follow_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow"))
         self.ncc_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC"))
         self.paint_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint"))
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'), _("Paint"))
 
         self.toolbarplugins.addSeparator()
 
@@ -1188,7 +1190,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.punch_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber"))
         self.calculators_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators"))
+            QtGui.QIcon(self.app.resource_location + '/calculator32.png'), _("Calculators"))
 
         self.toolbarplugins.addSeparator()
 
@@ -1267,7 +1269,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.geo_add_buffer_btn = self.geo_edit_toolbar.addAction(
             QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Add Buffer'))
         self.geo_add_paint_btn = self.geo_edit_toolbar.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _('Paint Shape'))
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint Shape'))
         self.geo_eraser_btn = self.geo_edit_toolbar.addAction(
             QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _('Eraser'))
 
@@ -1355,7 +1357,7 @@ class MainGUI(QtWidgets.QMainWindow):
 
         # Snap GRID toolbar is always active to facilitate usage of measurements done on GRID
         self.grid_snap_btn = self.grid_toolbar.addAction(
-            QtGui.QIcon(self.app.resource_location + '/grid32.png'), _('Snap to grid'))
+            QtGui.QIcon(self.app.resource_location + '/grid18.png'), _('Snap to grid'))
         self.grid_gap_x_entry = FCEntry2()
         self.grid_gap_x_entry.setMaximumWidth(70)
         self.grid_gap_x_entry.setToolTip(_("Grid X snapping distance"))
@@ -1396,7 +1398,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # ########################################################################
         self.axis_status_label = FCLabel()
         self.axis_status_label.setToolTip(_("Toggle the display of axis on canvas"))
-        self.axis_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/axis16.png'))
+        self.axis_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/axis18.png'))
         self.status_toolbar.addWidget(self.axis_status_label)
         self.status_toolbar.addWidget(FCLabel(" "))
 
@@ -1408,7 +1410,7 @@ class MainGUI(QtWidgets.QMainWindow):
 
         self.hud_label = FCLabel()
         self.hud_label.setToolTip(_("HUD (Heads up display)"))
-        self.hud_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/hud16.png'))
+        self.hud_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/hud18.png'))
         self.status_toolbar.addWidget(self.hud_label)
         self.status_toolbar.addWidget(FCLabel(" "))
 
@@ -1846,7 +1848,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.draw_buffer = self.g_editor_cmenu.addAction(
             QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _("Buffer"))
         self.draw_paint = self.g_editor_cmenu.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint"))
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'), _("Paint"))
         self.draw_eraser = self.g_editor_cmenu.addAction(
             QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _("Eraser"))
         self.g_editor_cmenu.addSeparator()
@@ -1904,7 +1906,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.e_editor_cmenu = self.popMenu.addMenu(
             QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Exc Editor"))
         self.drill = self.e_editor_cmenu.addAction(
-            QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Add Drill"))
+            QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Add Drill"))
         self.drill_array = self.e_editor_cmenu.addAction(
             QtGui.QIcon(self.app.resource_location + '/addarray32.png'), _("Add Drill Array"))
         self.e_editor_cmenu.addSeparator()
@@ -1930,7 +1932,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.popmenu_numeric_move = self.popMenu.addAction(
             QtGui.QIcon(self.app.resource_location + '/move32_bis.png'), _("Num Move"))
         self.popmenu_move2origin = self.popMenu.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin2_32.png'), _("Move2Origin"))
+            QtGui.QIcon(self.app.resource_location + '/move2origin32.png'), _("Move2Origin"))
         self.popmenu_move = self.popMenu.addAction(
             QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move"))
         self.popmenu_properties = self.popMenu.addAction(
@@ -2453,14 +2455,14 @@ class MainGUI(QtWidgets.QMainWindow):
         # ##################### File Toolbar #####################################
         # ########################################################################
         self.file_open_gerber_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/flatcam_icon32.png'), _("Open Gerber"))
+            QtGui.QIcon(self.app.resource_location + '/open_gerber32.png'), _("Open Gerber"))
         self.file_open_excellon_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Open Excellon"))
+            QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Open Excellon"))
         self.toolbarfile.addSeparator()
         self.file_open_btn = self.toolbarfile.addAction(
             QtGui.QIcon(self.app.resource_location + '/folder32.png'), _("Open Project"))
         self.file_save_btn = self.toolbarfile.addAction(
-            QtGui.QIcon(self.app.resource_location + '/project_save32.png'), _("Save Project"))
+            QtGui.QIcon(self.app.resource_location + '/save_as.png'), _("Save Project"))
 
         # ########################################################################
         # ######################### Edit Toolbar #################################
@@ -2474,7 +2476,7 @@ class MainGUI(QtWidgets.QMainWindow):
                                           QToolButton
                                           {
                                               color: black;
-                                              background-color: tomato;
+                                              background-color: blue;
                                           }
                                           """)
         self.editor_exit_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/power16.png'))
@@ -2495,12 +2497,12 @@ class MainGUI(QtWidgets.QMainWindow):
         self.origin_btn = self.toolbaredit.addAction(
             QtGui.QIcon(self.app.resource_location + '/origin32.png'), _('Set Origin'))
         self.move2origin_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin2_32.png'), _('Move to Origin'))
+            QtGui.QIcon(self.app.resource_location + '/move2origin32.png'), _('Move to Origin'))
         self.center_in_origin_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/origin3_32.png'), _('Custom Origin'))
+            QtGui.QIcon(self.app.resource_location + '/custom_origin32.png'), _('Custom Origin'))
 
         self.jmp_btn = self.toolbaredit.addAction(
-            QtGui.QIcon(self.app.resource_location + '/jump_to16.png'), _('Jump to Location'))
+            QtGui.QIcon(self.app.resource_location + '/jump_to32.png'), _('Jump to Location'))
         self.locate_btn = self.toolbaredit.addAction(
             QtGui.QIcon(self.app.resource_location + '/locate32.png'), _('Locate in Object'))
 
@@ -2534,7 +2536,7 @@ class MainGUI(QtWidgets.QMainWindow):
         # ######################### Tools Toolbar #################################
         # #########################################################################
         self.drill_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling"))
+            QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Drilling"))
         self.mill_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/milling_tool32.png'), _("Milling"))
         self.level_btn = self.toolbarplugins.addAction(
@@ -2545,13 +2547,13 @@ class MainGUI(QtWidgets.QMainWindow):
         self.toolbarplugins.addSeparator()
 
         self.isolation_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation"))
+            QtGui.QIcon(self.app.resource_location + '/iso32.png'), _("Isolation"))
         self.follow_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow"))
         self.ncc_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC"))
         self.paint_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint"))
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'), _("Paint"))
 
         self.toolbarplugins.addSeparator()
 
@@ -2582,7 +2584,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.punch_btn = self.toolbarplugins.addAction(
             QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber"))
         self.calculators_btn = self.toolbarplugins.addAction(
-            QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators"))
+            QtGui.QIcon(self.app.resource_location + '/calculator32.png'), _("Calculators"))
 
         self.toolbarplugins.addSeparator()
 
@@ -2659,7 +2661,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.geo_add_buffer_btn = self.geo_edit_toolbar.addAction(
             QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Add Buffer'))
         self.geo_add_paint_btn = self.geo_edit_toolbar.addAction(
-            QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _('Paint Shape'))
+            QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint Shape'))
         self.geo_eraser_btn = self.geo_edit_toolbar.addAction(
             QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _('Eraser'))
 
diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py
index a7b757eb..f889a195 100644
--- a/appGUI/ObjectUI.py
+++ b/appGUI/ObjectUI.py
@@ -1128,7 +1128,7 @@ class GeometryObjectUI(ObjectUI):
 
         # Paint Button
         self.paint_tool_button = FCButton(_('Paint'))
-        self.paint_tool_button.setIcon(QtGui.QIcon(self.app.resource_location + '/paint20_1.png'))
+        self.paint_tool_button.setIcon(QtGui.QIcon(self.app.resource_location + '/paint32.png'))
         self.paint_tool_button.setToolTip(
             _("Creates tool paths to cover the\n"
               "whole area of a polygon.")
diff --git a/appGUI/preferences/general/GeneralAPPSetGroupUI.py b/appGUI/preferences/general/GeneralAPPSetGroupUI.py
index b7d92edf..a6b0c158 100644
--- a/appGUI/preferences/general/GeneralAPPSetGroupUI.py
+++ b/appGUI/preferences/general/GeneralAPPSetGroupUI.py
@@ -472,7 +472,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
             _("Select the GIF that show activity when FlatCAM is active.")
         )
         self.activity_combo = FCComboBox()
-        self.activity_combo.addItems(['Ball black', 'Ball green', 'Arrow green', 'Eclipse green'])
+        self.activity_combo.addItems(['Ball black', 'Ball green', 'Arrow green', 'Spinner green', 'Eclipse green'])
 
         par_grid.addWidget(self.activity_label, 10, 0)
         par_grid.addWidget(self.activity_combo, 10, 1)
diff --git a/appMain.py b/appMain.py
index 0362e04d..e67cf177 100644
--- a/appMain.py
+++ b/appMain.py
@@ -1929,7 +1929,7 @@ class App(QtCore.QObject):
         self.paste_tool.install(icon=QtGui.QIcon(self.resource_location + '/solderpastebis32.png'))
 
         self.calculator_tool = ToolCalculator(self)
-        self.calculator_tool.install(icon=QtGui.QIcon(self.resource_location + '/calculator16.png'), separator=True)
+        self.calculator_tool.install(icon=QtGui.QIcon(self.resource_location + '/calculator32.png'), separator=True)
 
         self.sub_tool = ToolSub(self)
         self.sub_tool.install(icon=QtGui.QIcon(self.resource_location + '/sub32.png'),
@@ -1956,7 +1956,7 @@ class App(QtCore.QObject):
                                   before=self.sub_tool.menuAction, separator=True)
 
         self.paint_tool = ToolPaint(self)
-        self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint20_1.png'), pos=self.ui.menu_plugins,
+        self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint32.png'), pos=self.ui.menu_plugins,
                                 before=self.sub_tool.menuAction, separator=True)
 
         self.isolation_tool = ToolIsolation(self)
@@ -3302,6 +3302,12 @@ class App(QtCore.QObject):
                         '<div>Icons by <a href="https://www.flaticon.com/authors/pixel-perfect" '
                         'title="Pixel perfect">Pixel perfect</a> from <a href="https://www.flaticon.com/" '
                         'title="Flaticon">www.flaticon.com</a></div>'
+                        '<div>Icons by <a href="https://www.flaticon.com/authors/anggara" '
+                        'title="Anggara"> Anggara </a> from <a href="https://www.flaticon.com/" '
+                        'title="Flaticon">www.flaticon.com</a></div>'
+                        '<div>Icons by <a href="https://www.flaticon.com/authors/kharisma" '
+                        'title="Kharisma"> Kharisma </a> from <a href="https://www.flaticon.com/" '
+                        'title="Flaticon">www.flaticon.com</a></div>'
                     )
                 )
                 attributions_label.setOpenExternalLinks(True)
@@ -5679,12 +5685,12 @@ class App(QtCore.QObject):
 
             # dia_box = Dialog_box(title=_("Jump to ..."),
             #                      label=_("Enter the coordinates in format X,Y:"),
-            #                      icon=QtGui.QIcon(self.resource_location + '/jump_to16.png'),
+            #                      icon=QtGui.QIcon(self.resource_location + '/jump_to32.png'),
             #                      initial_text=dia_box_location)
 
             dia_box = DialogBoxRadio(title=_("Jump to ..."),
                                      label=_("Enter the coordinates in format X,Y:"),
-                                     icon=QtGui.QIcon(self.resource_location + '/jump_to16.png'),
+                                     icon=QtGui.QIcon(self.resource_location + '/jump_to32.png'),
                                      initial_text=dia_box_location,
                                      reference=self.options['global_jump_ref'],
                                      parent=self.ui)
@@ -8337,7 +8343,7 @@ class App(QtCore.QObject):
         """
         dia_box = Dialog_box(title=_("Go to Line ..."),
                              label='%s:' % _("Line"),
-                             icon=QtGui.QIcon(self.resource_location + '/jump_to16.png'),
+                             icon=QtGui.QIcon(self.resource_location + '/jump_to32.png'),
                              initial_text='')
         try:
             line = int(dia_box.location) - 1
diff --git a/appPlugins/ToolCalculators.py b/appPlugins/ToolCalculators.py
index de515c71..b1ff4d20 100644
--- a/appPlugins/ToolCalculators.py
+++ b/appPlugins/ToolCalculators.py
@@ -652,7 +652,7 @@ class CalcUI:
 
         # ## Buttons
         self.calculate_vshape_button = FCButton(_("Calculate"))
-        self.calculate_vshape_button.setIcon(QtGui.QIcon(self.app.resource_location + '/calculator16.png'))
+        self.calculate_vshape_button.setIcon(QtGui.QIcon(self.app.resource_location + '/calculator32.png'))
 
         self.calculate_vshape_button.setToolTip(
             _("Calculate either the depth of cut or the effective tool diameter.")
@@ -1036,7 +1036,7 @@ class CalcUI:
 
         # ## Buttons
         self.calculate_tin_button = FCButton(_("Calculate"))
-        self.calculate_tin_button.setIcon(QtGui.QIcon(self.app.resource_location + '/calculator16.png'))
+        self.calculate_tin_button.setIcon(QtGui.QIcon(self.app.resource_location + '/calculator32.png'))
         self.calculate_tin_button.setToolTip(
             _("Calculate the chemical quantities for the desired volume of tinning solution.")
         )
diff --git a/assets/resources/active_5.gif b/assets/resources/active_5.gif
new file mode 100644
index 00000000..44b09b49
Binary files /dev/null and b/assets/resources/active_5.gif differ
diff --git a/assets/resources/active_5_static 0.png b/assets/resources/active_5_static 0.png
new file mode 100644
index 00000000..756e98af
Binary files /dev/null and b/assets/resources/active_5_static 0.png differ
diff --git a/assets/resources/active_5_static.png b/assets/resources/active_5_static.png
new file mode 100644
index 00000000..48945bd3
Binary files /dev/null and b/assets/resources/active_5_static.png differ
diff --git a/assets/resources/align32.png b/assets/resources/align32.png
index b81511a2..0b874bce 100644
Binary files a/assets/resources/align32.png and b/assets/resources/align32.png differ
diff --git a/assets/resources/axis18.png b/assets/resources/axis18.png
new file mode 100644
index 00000000..6618c6d7
Binary files /dev/null and b/assets/resources/axis18.png differ
diff --git a/assets/resources/calculator32.png b/assets/resources/calculator32.png
new file mode 100644
index 00000000..e678fe89
Binary files /dev/null and b/assets/resources/calculator32.png differ
diff --git a/assets/resources/copperfill32.png b/assets/resources/copperfill32.png
index 569f9f9b..4cb5ae67 100644
Binary files a/assets/resources/copperfill32.png and b/assets/resources/copperfill32.png differ
diff --git a/assets/resources/copy_file32.png b/assets/resources/copy_file32.png
index 878e6c83..0b325090 100644
Binary files a/assets/resources/copy_file32.png and b/assets/resources/copy_file32.png differ
diff --git a/assets/resources/corners_32.png b/assets/resources/corners_32.png
index b9f87261..fcc755d0 100644
Binary files a/assets/resources/corners_32.png and b/assets/resources/corners_32.png differ
diff --git a/assets/resources/custom_origin32.png b/assets/resources/custom_origin32.png
new file mode 100644
index 00000000..38c288d7
Binary files /dev/null and b/assets/resources/custom_origin32.png differ
diff --git a/assets/resources/cut32.png b/assets/resources/cut32.png
index dc68ca93..2d5bb734 100644
Binary files a/assets/resources/cut32.png and b/assets/resources/cut32.png differ
diff --git a/assets/resources/dark_resources/active.gif b/assets/resources/dark_resources/active.gif
index b2db1071..a457111c 100644
Binary files a/assets/resources/dark_resources/active.gif and b/assets/resources/dark_resources/active.gif differ
diff --git a/assets/resources/dark_resources/active_2.gif b/assets/resources/dark_resources/active_2.gif
index b9b7f7ba..c7e898c7 100644
Binary files a/assets/resources/dark_resources/active_2.gif and b/assets/resources/dark_resources/active_2.gif differ
diff --git a/assets/resources/dark_resources/active_3.gif b/assets/resources/dark_resources/active_3.gif
index e8e440a9..dae99274 100644
Binary files a/assets/resources/dark_resources/active_3.gif and b/assets/resources/dark_resources/active_3.gif differ
diff --git a/assets/resources/dark_resources/active_4.gif b/assets/resources/dark_resources/active_4.gif
index 98a32918..17249aec 100644
Binary files a/assets/resources/dark_resources/active_4.gif and b/assets/resources/dark_resources/active_4.gif differ
diff --git a/assets/resources/dark_resources/active_5.gif b/assets/resources/dark_resources/active_5.gif
new file mode 100644
index 00000000..9916884c
Binary files /dev/null and b/assets/resources/dark_resources/active_5.gif differ
diff --git a/assets/resources/dark_resources/active_5_static.png b/assets/resources/dark_resources/active_5_static.png
new file mode 100644
index 00000000..48945bd3
Binary files /dev/null and b/assets/resources/dark_resources/active_5_static.png differ
diff --git a/assets/resources/dark_resources/active_static.png b/assets/resources/dark_resources/active_static.png
index d583dbf5..8dde91e9 100644
Binary files a/assets/resources/dark_resources/active_static.png and b/assets/resources/dark_resources/active_static.png differ
diff --git a/assets/resources/dark_resources/align32.png b/assets/resources/dark_resources/align32.png
index 4249e35a..66e091d6 100644
Binary files a/assets/resources/dark_resources/align32.png and b/assets/resources/dark_resources/align32.png differ
diff --git a/assets/resources/dark_resources/axis18.png b/assets/resources/dark_resources/axis18.png
new file mode 100644
index 00000000..42f842df
Binary files /dev/null and b/assets/resources/dark_resources/axis18.png differ
diff --git a/assets/resources/dark_resources/calculator32.png b/assets/resources/dark_resources/calculator32.png
new file mode 100644
index 00000000..8cab2e04
Binary files /dev/null and b/assets/resources/dark_resources/calculator32.png differ
diff --git a/assets/resources/dark_resources/copperfill32.png b/assets/resources/dark_resources/copperfill32.png
index 5f420827..80e08c93 100644
Binary files a/assets/resources/dark_resources/copperfill32.png and b/assets/resources/dark_resources/copperfill32.png differ
diff --git a/assets/resources/dark_resources/copy_file32.png b/assets/resources/dark_resources/copy_file32.png
index d1f08ddf..578d1b2e 100644
Binary files a/assets/resources/dark_resources/copy_file32.png and b/assets/resources/dark_resources/copy_file32.png differ
diff --git a/assets/resources/dark_resources/corners_32.png b/assets/resources/dark_resources/corners_32.png
index c5ad0f00..e9029224 100644
Binary files a/assets/resources/dark_resources/corners_32.png and b/assets/resources/dark_resources/corners_32.png differ
diff --git a/assets/resources/dark_resources/custom_origin32.png b/assets/resources/dark_resources/custom_origin32.png
new file mode 100644
index 00000000..461d3ef1
Binary files /dev/null and b/assets/resources/dark_resources/custom_origin32.png differ
diff --git a/assets/resources/dark_resources/cut32.png b/assets/resources/dark_resources/cut32.png
index ca9db1ec..597a72cd 100644
Binary files a/assets/resources/dark_resources/cut32.png and b/assets/resources/dark_resources/cut32.png differ
diff --git a/assets/resources/dark_resources/distance32.png b/assets/resources/dark_resources/distance32.png
index 1aa556f4..efe1a30d 100644
Binary files a/assets/resources/dark_resources/distance32.png and b/assets/resources/dark_resources/distance32.png differ
diff --git a/assets/resources/dark_resources/distance_min32.png b/assets/resources/dark_resources/distance_min32.png
index a3ff60af..c33b2767 100644
Binary files a/assets/resources/dark_resources/distance_min32.png and b/assets/resources/dark_resources/distance_min32.png differ
diff --git a/assets/resources/dark_resources/doubleside32.png b/assets/resources/dark_resources/doubleside32.png
index fa79cdf8..80bd22d9 100644
Binary files a/assets/resources/dark_resources/doubleside32.png and b/assets/resources/dark_resources/doubleside32.png differ
diff --git a/assets/resources/dark_resources/drill32.png b/assets/resources/dark_resources/drill32.png
index 5e451469..e6bd086f 100644
Binary files a/assets/resources/dark_resources/drill32.png and b/assets/resources/dark_resources/drill32.png differ
diff --git a/assets/resources/dark_resources/edit_file32.png b/assets/resources/dark_resources/edit_file32.png
index 77ce0e1d..b4dfe584 100644
Binary files a/assets/resources/dark_resources/edit_file32.png and b/assets/resources/dark_resources/edit_file32.png differ
diff --git a/assets/resources/dark_resources/extract32.png b/assets/resources/dark_resources/extract32.png
index fa026ea5..08a78411 100644
Binary files a/assets/resources/dark_resources/extract32.png and b/assets/resources/dark_resources/extract32.png differ
diff --git a/assets/resources/dark_resources/extract_drill32.png b/assets/resources/dark_resources/extract_drill32.png
deleted file mode 100644
index 16f1dd72..00000000
Binary files a/assets/resources/dark_resources/extract_drill32.png and /dev/null differ
diff --git a/assets/resources/dark_resources/film32.png b/assets/resources/dark_resources/film32.png
index cd16dec9..d38094b2 100644
Binary files a/assets/resources/dark_resources/film32.png and b/assets/resources/dark_resources/film32.png differ
diff --git a/assets/resources/dark_resources/folder32.png b/assets/resources/dark_resources/folder32.png
index af0da2d8..bd1fbed1 100644
Binary files a/assets/resources/dark_resources/folder32.png and b/assets/resources/dark_resources/folder32.png differ
diff --git a/assets/resources/dark_resources/follow32.png b/assets/resources/dark_resources/follow32.png
index 76bd29e7..6737929f 100644
Binary files a/assets/resources/dark_resources/follow32.png and b/assets/resources/dark_resources/follow32.png differ
diff --git a/assets/resources/dark_resources/grid18.png b/assets/resources/dark_resources/grid18.png
new file mode 100644
index 00000000..0d14da44
Binary files /dev/null and b/assets/resources/dark_resources/grid18.png differ
diff --git a/assets/resources/dark_resources/grid32.png b/assets/resources/dark_resources/grid32.png
index 5929e363..957510aa 100644
Binary files a/assets/resources/dark_resources/grid32.png and b/assets/resources/dark_resources/grid32.png differ
diff --git a/assets/resources/dark_resources/hud18.png b/assets/resources/dark_resources/hud18.png
new file mode 100644
index 00000000..aa3df167
Binary files /dev/null and b/assets/resources/dark_resources/hud18.png differ
diff --git a/assets/resources/dark_resources/iso32.png b/assets/resources/dark_resources/iso32.png
new file mode 100644
index 00000000..30a84890
Binary files /dev/null and b/assets/resources/dark_resources/iso32.png differ
diff --git a/assets/resources/dark_resources/jump_to32.png b/assets/resources/dark_resources/jump_to32.png
index 14e30613..607b77ee 100644
Binary files a/assets/resources/dark_resources/jump_to32.png and b/assets/resources/dark_resources/jump_to32.png differ
diff --git a/assets/resources/dark_resources/level32.png b/assets/resources/dark_resources/level32.png
index 4e82638a..dc0bb059 100644
Binary files a/assets/resources/dark_resources/level32.png and b/assets/resources/dark_resources/level32.png differ
diff --git a/assets/resources/dark_resources/locate32.png b/assets/resources/dark_resources/locate32.png
index 3ade490a..41db2ccd 100644
Binary files a/assets/resources/dark_resources/locate32.png and b/assets/resources/dark_resources/locate32.png differ
diff --git a/assets/resources/dark_resources/milling_tool32.png b/assets/resources/dark_resources/milling_tool32.png
index 3ce4a593..bfead042 100644
Binary files a/assets/resources/dark_resources/milling_tool32.png and b/assets/resources/dark_resources/milling_tool32.png differ
diff --git a/assets/resources/dark_resources/move2origin32.png b/assets/resources/dark_resources/move2origin32.png
new file mode 100644
index 00000000..e5c8e476
Binary files /dev/null and b/assets/resources/dark_resources/move2origin32.png differ
diff --git a/assets/resources/dark_resources/ncc32.png b/assets/resources/dark_resources/ncc32.png
index 5c83a927..6aa16002 100644
Binary files a/assets/resources/dark_resources/ncc32.png and b/assets/resources/dark_resources/ncc32.png differ
diff --git a/assets/resources/dark_resources/open_excellon32.png b/assets/resources/dark_resources/open_excellon32.png
index 518e5083..084c5334 100644
Binary files a/assets/resources/dark_resources/open_excellon32.png and b/assets/resources/dark_resources/open_excellon32.png differ
diff --git a/assets/resources/dark_resources/open_gerber32.png b/assets/resources/dark_resources/open_gerber32.png
new file mode 100644
index 00000000..396d0884
Binary files /dev/null and b/assets/resources/dark_resources/open_gerber32.png differ
diff --git a/assets/resources/dark_resources/origin32.png b/assets/resources/dark_resources/origin32.png
index 5cfd7cb5..8e24cd41 100644
Binary files a/assets/resources/dark_resources/origin32.png and b/assets/resources/dark_resources/origin32.png differ
diff --git a/assets/resources/dark_resources/paint32.png b/assets/resources/dark_resources/paint32.png
new file mode 100644
index 00000000..2374b5e8
Binary files /dev/null and b/assets/resources/dark_resources/paint32.png differ
diff --git a/assets/resources/dark_resources/panelize32.png b/assets/resources/dark_resources/panelize32.png
index ff5ff124..93a47163 100644
Binary files a/assets/resources/dark_resources/panelize32.png and b/assets/resources/dark_resources/panelize32.png differ
diff --git a/assets/resources/dark_resources/punch32.png b/assets/resources/dark_resources/punch32.png
index ef0541a9..97c09fa8 100644
Binary files a/assets/resources/dark_resources/punch32.png and b/assets/resources/dark_resources/punch32.png differ
diff --git a/assets/resources/dark_resources/save_as.png b/assets/resources/dark_resources/save_as.png
index 1b209539..70fbaa25 100644
Binary files a/assets/resources/dark_resources/save_as.png and b/assets/resources/dark_resources/save_as.png differ
diff --git a/assets/resources/dark_resources/save_as_red.png b/assets/resources/dark_resources/save_as_red.png
new file mode 100644
index 00000000..e0821491
Binary files /dev/null and b/assets/resources/dark_resources/save_as_red.png differ
diff --git a/assets/resources/dark_resources/settings18.png b/assets/resources/dark_resources/settings18.png
index 5143f21a..99414df5 100644
Binary files a/assets/resources/dark_resources/settings18.png and b/assets/resources/dark_resources/settings18.png differ
diff --git a/assets/resources/dark_resources/splash.png b/assets/resources/dark_resources/splash.png
index 8d4e7a27..8c9c8e59 100644
Binary files a/assets/resources/dark_resources/splash.png and b/assets/resources/dark_resources/splash.png differ
diff --git a/assets/resources/dark_resources/trash32.png b/assets/resources/dark_resources/trash32.png
index 8ba6f690..bf801016 100644
Binary files a/assets/resources/dark_resources/trash32.png and b/assets/resources/dark_resources/trash32.png differ
diff --git a/assets/resources/distance32.png b/assets/resources/distance32.png
index 62717bb9..efa8e3e9 100644
Binary files a/assets/resources/distance32.png and b/assets/resources/distance32.png differ
diff --git a/assets/resources/distance_min32.png b/assets/resources/distance_min32.png
index e97c1a26..2812e7a6 100644
Binary files a/assets/resources/distance_min32.png and b/assets/resources/distance_min32.png differ
diff --git a/assets/resources/drill32.png b/assets/resources/drill32.png
index 6d9587ed..5f7872a6 100644
Binary files a/assets/resources/drill32.png and b/assets/resources/drill32.png differ
diff --git a/assets/resources/edit_file32.png b/assets/resources/edit_file32.png
index 1aa4896d..44f8500c 100644
Binary files a/assets/resources/edit_file32.png and b/assets/resources/edit_file32.png differ
diff --git a/assets/resources/extract32.png b/assets/resources/extract32.png
index adc61502..0b735202 100644
Binary files a/assets/resources/extract32.png and b/assets/resources/extract32.png differ
diff --git a/assets/resources/extract_drill32.png b/assets/resources/extract_drill32.png
deleted file mode 100644
index 41f740f2..00000000
Binary files a/assets/resources/extract_drill32.png and /dev/null differ
diff --git a/assets/resources/folder32.png b/assets/resources/folder32.png
index c24eeeca..85f73706 100644
Binary files a/assets/resources/folder32.png and b/assets/resources/folder32.png differ
diff --git a/assets/resources/follow32.png b/assets/resources/follow32.png
index fdfe3195..1bd9dc69 100644
Binary files a/assets/resources/follow32.png and b/assets/resources/follow32.png differ
diff --git a/assets/resources/grid18.png b/assets/resources/grid18.png
new file mode 100644
index 00000000..0d4f7c0a
Binary files /dev/null and b/assets/resources/grid18.png differ
diff --git a/assets/resources/grid32.png b/assets/resources/grid32.png
index b2d7ca1b..775bfcac 100644
Binary files a/assets/resources/grid32.png and b/assets/resources/grid32.png differ
diff --git a/assets/resources/hud18.png b/assets/resources/hud18.png
new file mode 100644
index 00000000..2147b661
Binary files /dev/null and b/assets/resources/hud18.png differ
diff --git a/assets/resources/iso32.png b/assets/resources/iso32.png
new file mode 100644
index 00000000..5a997e7b
Binary files /dev/null and b/assets/resources/iso32.png differ
diff --git a/assets/resources/jump_to32.png b/assets/resources/jump_to32.png
index d605ba11..86445e58 100644
Binary files a/assets/resources/jump_to32.png and b/assets/resources/jump_to32.png differ
diff --git a/assets/resources/level32.png b/assets/resources/level32.png
index 6fdf04c6..2106e6a6 100644
Binary files a/assets/resources/level32.png and b/assets/resources/level32.png differ
diff --git a/assets/resources/locate32.png b/assets/resources/locate32.png
index 66d630b0..4593d35f 100644
Binary files a/assets/resources/locate32.png and b/assets/resources/locate32.png differ
diff --git a/assets/resources/milling_tool32.png b/assets/resources/milling_tool32.png
index d038984f..ce03039a 100644
Binary files a/assets/resources/milling_tool32.png and b/assets/resources/milling_tool32.png differ
diff --git a/assets/resources/move2origin32.png b/assets/resources/move2origin32.png
new file mode 100644
index 00000000..3fa31e55
Binary files /dev/null and b/assets/resources/move2origin32.png differ
diff --git a/assets/resources/ncc32.png b/assets/resources/ncc32.png
index de42b0b8..70de5507 100644
Binary files a/assets/resources/ncc32.png and b/assets/resources/ncc32.png differ
diff --git a/assets/resources/open_excellon32.png b/assets/resources/open_excellon32.png
index 268e96fe..41f740f2 100644
Binary files a/assets/resources/open_excellon32.png and b/assets/resources/open_excellon32.png differ
diff --git a/assets/resources/open_gerber32.png b/assets/resources/open_gerber32.png
new file mode 100644
index 00000000..99e8d2ac
Binary files /dev/null and b/assets/resources/open_gerber32.png differ
diff --git a/assets/resources/origin32.png b/assets/resources/origin32.png
index f208af48..daab4021 100644
Binary files a/assets/resources/origin32.png and b/assets/resources/origin32.png differ
diff --git a/assets/resources/panelize32.png b/assets/resources/panelize32.png
index 5445781c..2746e599 100644
Binary files a/assets/resources/panelize32.png and b/assets/resources/panelize32.png differ
diff --git a/assets/resources/save_as.png b/assets/resources/save_as.png
index d80ebcf9..17172cd8 100644
Binary files a/assets/resources/save_as.png and b/assets/resources/save_as.png differ
diff --git a/assets/resources/save_as_red.png b/assets/resources/save_as_red.png
index 50155428..70fbaa25 100644
Binary files a/assets/resources/save_as_red.png and b/assets/resources/save_as_red.png differ
diff --git a/assets/resources/settings18.png b/assets/resources/settings18.png
index 3e578907..101915df 100644
Binary files a/assets/resources/settings18.png and b/assets/resources/settings18.png differ
diff --git a/assets/resources/splash.png b/assets/resources/splash.png
index 24f89b34..f44d1208 100644
Binary files a/assets/resources/splash.png and b/assets/resources/splash.png differ
diff --git a/assets/resources/trash32.png b/assets/resources/trash32.png
index ed725088..22e4da21 100644
Binary files a/assets/resources/trash32.png and b/assets/resources/trash32.png differ