diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 51c079b50e5..82a725516ba 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -629,9 +629,11 @@ LanguageSettingsProviderAssociationExtensionPoint=Language Settings Provider UI
 overrideAnnotation.label = C/C++ Override indicators
 
 transfer.EditorAppearance.name = C/C++ Editor Appearance
-transfer.EditorAppearance.description = Preference related to how the editor presents the edited code to the user (including colors, fonts, hovers, foldings, etc...)
+transfer.EditorAppearance.description = Preferences related to how the editor presents the edited code to the user (including colors, fonts, hovers, foldings, etc...)
 transfer.EditorBehavior.name = C/C++ Editor Behavior
-transfer.EditorBehavior.description = Preference related to how the editor process the edited code (typing, save action, etc...)
+transfer.EditorBehavior.description = Preferences related to how the editor deals with the edited code (typing, save action, etc...)
+transfer.CodeStyle.name = C/C++ Code Style 
+transfer.CodeStyle.description = C/C++ > Code Style preferences
 
 # Refresh Exclusion Contributors
 RefreshExclusionContributor.name = Resources
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 7b23e99066c..e86fecfc6d4 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -4497,6 +4497,7 @@
  <extension
        point="org.eclipse.ui.preferenceTransfer">
     <transfer
+          icon="icons/view16/c_pers.gif"
           id="org.eclipse.cdt.ui.transfer.editor.appearance"
           name="%transfer.EditorAppearance.name">
        <mapping scope="instance">
@@ -4555,6 +4556,7 @@
        </description>
     </transfer>
     <transfer
+          icon="icons/view16/c_pers.gif"
           id="org.eclipse.cdt.ui.transfer.editor.behavior"
           name="%transfer.EditorBehavior.name">
        <mapping scope="instance">
@@ -4588,15 +4590,31 @@
             <key name="stickyOccurrences"/>
             <key name="markOverloadedOperatorsOccurrences"/>
             <key name="scalability." match="prefix"/>
-            <key
-                  name="content_assist_proposals_timeout">
-            </key>
+            <key name="content_assist_proposals_timeout"/>
           </entry>
        </mapping>
        <description>
           %transfer.EditorBehavior.description 
        </description>
     </transfer>
+    <transfer
+          icon="icons/view16/c_pers.gif"
+          id="org.eclipse.cdt.ui.transfer.code_style"
+          name="%transfer.CodeStyle.name">
+       <mapping scope="instance">
+          <entry node="org.eclipse.cdt.ui">
+            <key name="codetemplates." match="prefix"/>
+            <key name="nameStyle." match="prefix"/>
+            <key name="formatter_profile"/>
+            <key name="class_member_ascending_visibility_order"/>
+            <key name="function_output_parameters_before_input"/>
+            <key name="function_pass_output_parameters_by_pointer"/>
+          </entry>
+       </mapping>
+       <description>
+          %transfer.CodeStyle.description 
+       </description>
+    </transfer>
 
  </extension>
  <extension