diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 3db6b39d..6fc2b017 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -64,5 +64,7 @@
         <item>org.cyanogenmod.platform.internal.CMHardwareService</item>
         <item>org.cyanogenmod.platform.internal.AppSuggestManagerService</item>
         <item>org.cyanogenmod.platform.internal.PerformanceManagerService</item>
+        <item>org.cyanogenmod.platform.internal.ThemeManagerService</item>
+        <item>org.cyanogenmod.platform.internal.IconCacheManagerService</item>
     </string-array>
 </resources>
diff --git a/sepolicy/service.te b/sepolicy/service.te
index 579e2b86..1a6559f5 100644
--- a/sepolicy/service.te
+++ b/sepolicy/service.te
@@ -9,3 +9,5 @@ type cm_telephony_service, system_api_service, system_server_service, service_ma
 type cm_hardware_service, system_api_service, system_server_service, service_manager_type;
 type cm_app_suggest_service, system_api_service, system_server_service, service_manager_type;
 type cm_performance_service, system_api_service, system_server_service, service_manager_type;
+type cm_themes_service, system_api_service, system_server_service, service_manager_type;
+type cm_iconcache_service, system_api_service, system_server_service, service_manager_type;
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 4baf0f8d..04efc6fe 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -9,3 +9,5 @@ cmtelephonymanager                        u:object_r:cm_telephony_service:s0
 cmhardware                                u:object_r:cm_hardware_service:s0
 cmappsuggest                              u:object_r:cm_app_suggest_service:s0
 cmperformance                             u:object_r:cm_performance_service:s0
+cmthemes                                  u:object_r:cm_themes_service:s0
+cmiconcache                               u:object_r:cm_iconcache_service:s0