diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index c18ed6f22490b..b49b64d5acfa8 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
@@ -236,6 +237,16 @@ private function writeText($content, array $options = array())
      */
     private function formatDefaultValue($default)
     {
+        if (is_string($default)) {
+            $default = OutputFormatter::escape($default);
+        } elseif (is_array($default)) {
+            foreach ($default as $key => $value) {
+                if (is_string($value)) {
+                    $default[$key] = OutputFormatter::escape($value);
+                }
+            }
+        }
+
         if (PHP_VERSION_ID < 50400) {
             return str_replace(array('\/', '\\\\'), array('/', '\\'), json_encode($default));
         }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
index 45b3b2fff9034..8f825ecb68395 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
@@ -31,6 +31,7 @@ public static function getInputArguments()
             'input_argument_2' => new InputArgument('argument_name', InputArgument::IS_ARRAY, 'argument description'),
             'input_argument_3' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', 'default_value'),
             'input_argument_4' => new InputArgument('argument_name', InputArgument::REQUIRED, "multiline\nargument description"),
+            'input_argument_with_style' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', '<comment>style</>'),
         );
     }
 
@@ -43,6 +44,8 @@ public static function getInputOptions()
             'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', array()),
             'input_option_5' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, "multiline\noption description"),
             'input_option_6' => new InputOption('option_name', array('o', 'O'), InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
+            'input_option_with_style' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description', '<comment>style</>'),
+            'input_option_with_style_array' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'option description', array('<comment>Hello</comment>', '<info>world</info>')),
         );
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.json b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.json
new file mode 100644
index 0000000000000..9334235109451
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": false,
+    "is_array": false,
+    "description": "argument description",
+    "default": "<comment>style</>"
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.md b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.md
new file mode 100644
index 0000000000000..45adf2f488bd9
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.md
@@ -0,0 +1,7 @@
+**argument_name:**
+
+* Name: argument_name
+* Is required: no
+* Is array: no
+* Description: argument description
+* Default: `'<comment>style</>'`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.txt
new file mode 100644
index 0000000000000..35384a6be87e7
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>  argument description<comment> [default: "\<comment>style\</>"]</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.xml
new file mode 100644
index 0000000000000..73332c796e8e4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="0">
+  <description>argument description</description>
+  <defaults>
+    <default>&lt;comment&gt;style&lt;/&gt;</default>
+  </defaults>
+</argument>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.json
new file mode 100644
index 0000000000000..df328bf824e70
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": false,
+    "description": "option description",
+    "default": "<comment>style</>"
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.md
new file mode 100644
index 0000000000000..3f6dd2369a7c2
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Description: option description
+* Default: `'<comment>style</>'`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.txt
new file mode 100644
index 0000000000000..880a53518e214
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name=OPTION_NAME</info>  option description<comment> [default: "\<comment>style\</>"]</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.xml
new file mode 100644
index 0000000000000..764b9e6521596
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option description</description>
+  <defaults>
+    <default>&lt;comment&gt;style&lt;/&gt;</default>
+  </defaults>
+</option>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.json
new file mode 100644
index 0000000000000..b1754550b52de
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.json
@@ -0,0 +1,12 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": true,
+    "description": "option description",
+    "default": [
+        "<comment>Hello</comment>",
+        "<info>world</info>"
+    ]
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.md
new file mode 100644
index 0000000000000..24e58b530258d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: yes
+* Is value required: yes
+* Is multiple: yes
+* Description: option description
+* Default: `array (  0 => '<comment>Hello</comment>',  1 => '<info>world</info>',)`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.txt
new file mode 100644
index 0000000000000..265c18c5a45d2
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name=OPTION_NAME</info>  option description<comment> [default: ["\<comment>Hello\</comment>","\<info>world\</info>"]]</comment><comment> (multiple values allowed)</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.xml
new file mode 100644
index 0000000000000..09dc865830e93
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="1">
+  <description>option description</description>
+  <defaults>
+    <default>&lt;comment&gt;Hello&lt;/comment&gt;</default>
+    <default>&lt;info&gt;world&lt;/info&gt;</default>
+  </defaults>
+</option>