diff --git a/src/admc/CMakeLists.txt b/src/admc/CMakeLists.txt
index 612971a5..8c09c8ac 100644
--- a/src/admc/CMakeLists.txt
+++ b/src/admc/CMakeLists.txt
@@ -197,7 +197,7 @@ set(ADMC_SOURCES
     console_widget/console_drag_model.cpp
     console_widget/console_impl.cpp
 
-    icon_manager/icon_manager.cpp
+    managers/icon_manager.cpp
 
     console_impls/object_impl.cpp
     console_impls/policy_impl.cpp
diff --git a/src/admc/console_impls/domain_info_impl.cpp b/src/admc/console_impls/domain_info_impl.cpp
index 0a63cd8c..26d9f118 100644
--- a/src/admc/console_impls/domain_info_impl.cpp
+++ b/src/admc/console_impls/domain_info_impl.cpp
@@ -30,7 +30,7 @@
 #include "utils.h"
 #include "status.h"
 #include "globals.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QSet>
 #include <QAction>
diff --git a/src/admc/console_impls/found_policy_impl.cpp b/src/admc/console_impls/found_policy_impl.cpp
index 2f7225a1..b96922c8 100644
--- a/src/admc/console_impls/found_policy_impl.cpp
+++ b/src/admc/console_impls/found_policy_impl.cpp
@@ -26,7 +26,7 @@
 #include "console_impls/policy_impl.h"
 #include "utils.h"
 #include "globals.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QAction>
 #include <QStandardItem>
diff --git a/src/admc/console_impls/object_impl.cpp b/src/admc/console_impls/object_impl.cpp
index b9cb1f12..84de3c31 100755
--- a/src/admc/console_impls/object_impl.cpp
+++ b/src/admc/console_impls/object_impl.cpp
@@ -53,7 +53,7 @@
 #include "utils.h"
 #include "tabs/general_user_tab.h"
 #include "tabs/general_group_tab.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "create_dialogs/create_pso_dialog.h"
 #include "results_widgets/pso_results_widget/pso_results_widget.h"
 
diff --git a/src/admc/console_impls/policy_impl.cpp b/src/admc/console_impls/policy_impl.cpp
index 032840bc..43c376f9 100755
--- a/src/admc/console_impls/policy_impl.cpp
+++ b/src/admc/console_impls/policy_impl.cpp
@@ -34,7 +34,7 @@
 #include "select_dialogs/select_object_dialog.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "fsmo/fsmo_utils.h"
 
 #include <QAction>
diff --git a/src/admc/console_impls/policy_ou_impl.cpp b/src/admc/console_impls/policy_ou_impl.cpp
index 1deab357..109fc4c4 100755
--- a/src/admc/console_impls/policy_ou_impl.cpp
+++ b/src/admc/console_impls/policy_ou_impl.cpp
@@ -33,7 +33,7 @@
 #include "select_dialogs/select_policy_dialog.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "fsmo/fsmo_utils.h"
 
 #include <QDebug>
diff --git a/src/admc/console_impls/policy_root_impl.cpp b/src/admc/console_impls/policy_root_impl.cpp
index 566c5224..85e2107e 100644
--- a/src/admc/console_impls/policy_root_impl.cpp
+++ b/src/admc/console_impls/policy_root_impl.cpp
@@ -29,7 +29,7 @@
 #include "gplink.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QList>
 #include <QStandardItem>
diff --git a/src/admc/console_impls/query_folder_impl.cpp b/src/admc/console_impls/query_folder_impl.cpp
index 4b42dca0..35d19069 100644
--- a/src/admc/console_impls/query_folder_impl.cpp
+++ b/src/admc/console_impls/query_folder_impl.cpp
@@ -31,7 +31,7 @@
 #include "globals.h"
 #include "settings.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QFileDialog>
 #include <QJsonDocument>
diff --git a/src/admc/console_impls/query_item_impl.cpp b/src/admc/console_impls/query_item_impl.cpp
index e0e71a2a..5217cdf6 100644
--- a/src/admc/console_impls/query_item_impl.cpp
+++ b/src/admc/console_impls/query_item_impl.cpp
@@ -30,7 +30,7 @@
 #include "globals.h"
 #include "settings.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QCoreApplication>
 #include <QFileDialog>
diff --git a/src/admc/globals.cpp b/src/admc/globals.cpp
index 121f2c60..b4c320ac 100644
--- a/src/admc/globals.cpp
+++ b/src/admc/globals.cpp
@@ -23,7 +23,7 @@
 #include "adldap.h"
 #include "settings.h"
 #include "status.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QLocale>
 
diff --git a/src/admc/main.cpp b/src/admc/main.cpp
index 7ae5580e..2837bb47 100644
--- a/src/admc/main.cpp
+++ b/src/admc/main.cpp
@@ -29,7 +29,7 @@
 #include "utils.h"
 #include "connection_options_dialog.h"
 #include "locale.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/admc/main_window.cpp b/src/admc/main_window.cpp
index 3bde40f8..36ed3fbb 100644
--- a/src/admc/main_window.cpp
+++ b/src/admc/main_window.cpp
@@ -43,7 +43,7 @@
 #include "status.h"
 #include "utils.h"
 #include "fsmo/fsmo_utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "console_impls/domain_info_impl.h"
 
 #include <QDesktopServices>
diff --git a/src/admc/icon_manager/icon_manager.cpp b/src/admc/managers/icon_manager.cpp
similarity index 100%
rename from src/admc/icon_manager/icon_manager.cpp
rename to src/admc/managers/icon_manager.cpp
diff --git a/src/admc/icon_manager/icon_manager.h b/src/admc/managers/icon_manager.h
similarity index 100%
rename from src/admc/icon_manager/icon_manager.h
rename to src/admc/managers/icon_manager.h
diff --git a/src/admc/results_widgets/domain_info_results_widget/domain_info_results_widget.cpp b/src/admc/results_widgets/domain_info_results_widget/domain_info_results_widget.cpp
index b40fc81d..5f31df27 100644
--- a/src/admc/results_widgets/domain_info_results_widget/domain_info_results_widget.cpp
+++ b/src/admc/results_widgets/domain_info_results_widget/domain_info_results_widget.cpp
@@ -29,7 +29,7 @@
 #include "ad_config.h"
 #include "status.h"
 #include "fsmo/fsmo_utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "utils.h"
 
 #include <QStandardItemModel>
diff --git a/src/admc/results_widgets/policy_ou_results_widget/drag_drop_links_model.cpp b/src/admc/results_widgets/policy_ou_results_widget/drag_drop_links_model.cpp
index 93297eac..785db382 100644
--- a/src/admc/results_widgets/policy_ou_results_widget/drag_drop_links_model.cpp
+++ b/src/admc/results_widgets/policy_ou_results_widget/drag_drop_links_model.cpp
@@ -1,7 +1,7 @@
 #include "drag_drop_links_model.h"
 #include "utils.h"
 #include "globals.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "ad_interface.h"
 #include "console_impls/policy_impl.h"
 
diff --git a/src/admc/results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp b/src/admc/results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp
index 8bc9cd16..8a60e926 100755
--- a/src/admc/results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp
+++ b/src/admc/results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp
@@ -26,7 +26,7 @@
 #include "console_widget/console_widget.h"
 #include "console_impls/item_type.h"
 #include "gplink.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "globals.h"
 
 #include <QStandardItemModel>
diff --git a/src/admc/results_widgets/policy_ou_results_widget/linked_policies_widget.cpp b/src/admc/results_widgets/policy_ou_results_widget/linked_policies_widget.cpp
index 41c928ff..b912bcf3 100644
--- a/src/admc/results_widgets/policy_ou_results_widget/linked_policies_widget.cpp
+++ b/src/admc/results_widgets/policy_ou_results_widget/linked_policies_widget.cpp
@@ -11,7 +11,7 @@
 #include "settings.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "drag_drop_links_model.h"
 
 #include <QAction>
diff --git a/src/admc/results_widgets/policy_results_widget.cpp b/src/admc/results_widgets/policy_results_widget.cpp
index 39dec4e9..ca5a5e93 100644
--- a/src/admc/results_widgets/policy_results_widget.cpp
+++ b/src/admc/results_widgets/policy_results_widget.cpp
@@ -30,7 +30,7 @@
 #include "settings.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QAction>
 #include <QHeaderView>
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index b387224d..44a2d970 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -23,7 +23,7 @@
 #include "ad_object.h"
 #include "ad_utils.h"
 #include "select_dialogs/select_object_dialog.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 #include "status.h"
 #include "globals.h"
 
diff --git a/src/admc/select_dialogs/select_container_dialog.cpp b/src/admc/select_dialogs/select_container_dialog.cpp
index 629296f4..14b041ac 100644
--- a/src/admc/select_dialogs/select_container_dialog.cpp
+++ b/src/admc/select_dialogs/select_container_dialog.cpp
@@ -26,7 +26,7 @@
 #include "settings.h"
 #include "status.h"
 #include "utils.h"
-#include "icon_manager/icon_manager.h"
+#include "managers/icon_manager.h"
 
 #include <QDialogButtonBox>
 #include <QHeaderView>