diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 8adeb8b3fbe3..31903fd5d34b 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -339,4 +339,5 @@ exportable.ExternalDiffSettings.presentable.name=External Diff
 exportable.ExportableFileTemplateSettings.presentable.name=File templates
 exportable.ProjectManager.presentable.name=Default project
 exportable.com.intellij.ide.ui.customization.CustomActionsSchema.presentable.name=Menus and toolbars customization
-exportable.ActionMacroManager.presentable.name=Macros
\ No newline at end of file
+exportable.ActionMacroManager.presentable.name=Macros
+exportable.ImportFilteringUsageViewSetting.presentable.name=Usage View: Imports
\ No newline at end of file
diff --git a/platform/usageView/src/com/intellij/usages/UsageViewSettings.java b/platform/usageView/src/com/intellij/usages/UsageViewSettings.java
index b6444549064d..5c5221dd92c4 100644
--- a/platform/usageView/src/com/intellij/usages/UsageViewSettings.java
+++ b/platform/usageView/src/com/intellij/usages/UsageViewSettings.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.usages;
 
-import com.intellij.openapi.components.*;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.Transient;
 import org.jetbrains.annotations.NonNls;
@@ -25,8 +28,8 @@ import java.io.File;
 @State(
   name = "UsageViewSettings",
   storages = {
-    @Storage(file = StoragePathMacros.APP_CONFIG + "/usageView.xml"),
-    @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml", deprecated = true)
+    @Storage(file = "usageView.xml"),
+    @Storage(file = "other.xml", deprecated = true)
   }
 )
 public class UsageViewSettings implements PersistentStateComponent<UsageViewSettings> {
diff --git a/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java b/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java
index 0f95b667e2f0..682c57bab8b7 100644
--- a/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java
+++ b/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.usages.impl;
 
-import com.intellij.openapi.components.*;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 
 /**
@@ -24,9 +27,9 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
 @State(
   name = "ImportFilteringUsageViewSetting",
   storages = {
-    @Storage(
-      file = StoragePathMacros.APP_CONFIG + "/other.xml"
-    )}
+    @Storage(file = "usageView.xml"),
+    @Storage(file = "other.xml", deprecated = true)
+  }
 )
 public class ImportFilteringUsageViewSetting implements PersistentStateComponent<ImportFilteringUsageViewSetting> {
   public static ImportFilteringUsageViewSetting getInstance() {
diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index 612c27aaded9..e61485813422 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -69,8 +69,7 @@
     <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.ImportPopupHectorComponentProvider"/>
 
     <usageFilteringRuleProvider implementation="com.intellij.usages.impl.ImportUsageFilteringRuleProvider"/>
-    <applicationService serviceInterface="com.intellij.usages.impl.ImportFilteringUsageViewSetting"
-                        serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
+    <applicationService serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
 
     <bundledColorScheme path="/colorSchemes/monokai"/>
     <bundledColorScheme path="/colorSchemes/twilight"/>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 6122c51eba2f..45381666b6d3 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -343,8 +343,7 @@
 
 
     <usageFilteringRuleProvider implementation="com.intellij.usages.impl.ImportUsageFilteringRuleProvider"/>
-    <applicationService serviceInterface="com.intellij.usages.impl.ImportFilteringUsageViewSetting"
-                        serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
+    <applicationService serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
 
     <!-- this depends on TemplateLanguageConfigurable which isn't registered in LangExtensions, so it should go here as well -->
     <errorQuickFixProvider implementation="com.intellij.psi.templateLanguages.TemplateLanguageErrorQuickFixProvider"/>