diff --git a/typo3/sysext/context_help/locallang_csh_ttcontent.xlf b/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
index b15d8d85c432f155f0b200476c411fbe84a1ee2f..b5bff576226fe742308e5a4a9313f35248b9781c 100644
--- a/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
+++ b/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
@@ -39,11 +39,11 @@ Almost all the other types described below also includes the header with the exa
 <strong>Text</strong>
 The Text type allows you to insert regular page content.
 
-<strong>Text w/image</strong>
+<strong>Text & Images</strong>
 This is the same as the Text type (regular page content) but with the option of attaching images.
 
-<strong>Image</strong>
-The same as Text w/image but without the text field - so only images.
+<strong>Images</strong>
+The same as Text & Images but without the text field - so only images.
 
 <strong>Bullet list</strong>
 Lets you create a bullet list. Each line in the text-field will appear as a single line in the bulletlist.
@@ -254,7 +254,7 @@ tt_content:bodytext</source>
 				<source>Here you enter the body text of the content element. Usually you can use some HTML formatting tags, if you're using Internet Explorer you can even format the content visually.
 The field is reused in most other types and so switching between the content element types will bring the value of this field with it.
 
-When you're using this field with the "Text" and "Text w/image" types, the content is used as ordinary body text. Each linebreak normally signifies a new paragraph, you can use the special TYPO3 tag, &amp;lt;LINK&amp;gt;, for making links. You can use many HTML tags but there are limitations as well. This will depend on the implementation.
+When you're using this field with the "Text" and "Text &amp; Images" types, the content is used as ordinary body text. Each linebreak normally signifies a new paragraph, you can use the special TYPO3 tag, &amp;lt;LINK&amp;gt;, for making links. You can use many HTML tags but there are limitations as well. This will depend on the implementation.
 
 &lt;b&gt;Bulletlists:&lt;/b&gt;
 If the type is "Bulletlist" each line in this field is a bulletlist entry.
@@ -266,7 +266,7 @@ If the type is "Table" each line represents a table row. Within each line you di
 Types like "Script", "Form" and "Multimedia" use this field for parameters you can pass to the element. And the "HTML" type accepts any input as raw HTML which is simply displayed on the website without any preprocessing.
 
 &lt;strong&gt;Rich Text Editor:&lt;/strong&gt;
-With the types "Text" and "Text w/image" the Rich Text editor is used for editing if your browser supports it and the editor is generally enabled in the system. Be aware that the content is "cleansed" before it goes into the database when you're using the "Text" and "Text w/image" types.
+With the types "Text" and "Text &amp; Images" the Rich Text editor is used for editing if your browser supports it and the editor is generally enabled in the system. Be aware that the content is "cleansed" before it goes into the database when you're using the "Text" and "Text &amp; Images" types.
 
 &lt;b&gt;Making a mail form:&lt;/b&gt;
 When you have selected the content element type "Form" you should enter lines of parameters into this field. This is a brief example:
@@ -366,7 +366,7 @@ tt_content:bodytext</source>
 				<source>You can attach images to the content element and almost as many as you like.
 Depending on the configuration of TYPO3 you can even attach them in any format you like. Especially you do not need to worry about size and compression because these factors are normally handled by TYPO3 internally.
 
-When you use the "Text w/image" type, it's important to select a proper position of the image block. For this purpose, use the Position selector which is displayed below (or if you click in the image list field in the Classic backend). See link to "Page content / Position" below.
+When you use the "Text &amp; Images" type, it's important to select a proper position of the image block. For this purpose, use the Position selector which is displayed below (or if you click in the image list field in the Classic backend). See link to "Page content / Position" below.
 You can also display images in multiple columns and enable an option which enables a link so you can click the image and see a bigger version. Just to name a few options.
 Most likely you don't have all options available. This depends on your permissions in the system.</source>
 			</trans-unit>
@@ -702,7 +702,7 @@ tt_content:spaceBefore</source>
 				<source>If checked, a little "To top" link will be inserted after the content element.</source>
 			</trans-unit>
 			<trans-unit id="rte_enabled.description" xml:space="preserve">
-				<source>If checked, the Rich Text Editor will be disabled for the "Text" and "Text w/Image" types (&lt;em&gt;in this element only&lt;/em&gt;).</source>
+				<source>If checked, the Rich Text Editor will be disabled for the "Text" and "Text &amp; Image" types (&lt;em&gt;in this element only&lt;/em&gt;).</source>
 			</trans-unit>
 			<trans-unit id="_rte_enabled.seeAlso" xml:space="preserve">
 				<source>tt_content:bodytext</source>
diff --git a/typo3/sysext/css_styled_content/Documentation/Configuration/Constants/Index.rst b/typo3/sysext/css_styled_content/Documentation/Configuration/Constants/Index.rst
index 9ed017a815a3ad22f46dd0d4cb507ed326a0604e..714b5126735b052c81d39b81e982882619399f3b 100644
--- a/typo3/sysext/css_styled_content/Documentation/Configuration/Constants/Index.rst
+++ b/typo3/sysext/css_styled_content/Documentation/Configuration/Constants/Index.rst
@@ -420,8 +420,8 @@ colSpace
          int
 
    Description
-         Horizontal distance between images in content elements of type "Image"
-         or "Text w/Image". If you change this manually in your CSS, you need
+         Horizontal distance between images in content elements of type "Images"
+         or "Text & Images". If you change this manually in your CSS, you need
          to adjust this setting accordingly.
 
    Default
@@ -443,8 +443,8 @@ rowSpace
          int
 
    Description
-         Vertical distance after image rows in content elements of type "Image"
-         or "Text w/Image". If you change this manually in your CSS, you need
+         Vertical distance after image rows in content elements of type "Images"
+         or "Text & Images". If you change this manually in your CSS, you need
          to adjust this setting accordingly.
 
    Default
@@ -467,7 +467,7 @@ textMargin
 
    Description
          Horizontal distance between images and text in content elements of
-         type "Text w/Image".
+         type "Text & Images".
 
    Default
          10
diff --git a/typo3/sysext/css_styled_content/static/constants.txt b/typo3/sysext/css_styled_content/static/constants.txt
index 1b58d30a2bf7613d4563169b446f432968bea817..77d889724cf24c89895ec56194691082190f5ee9 100644
--- a/typo3/sysext/css_styled_content/static/constants.txt
+++ b/typo3/sysext/css_styled_content/static/constants.txt
@@ -60,11 +60,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index f53c297066262671b8f3b9bea0dd4cba28d8f43a..99e756b60f200bb6486518018e68a7f89a74ce18 100644
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -2294,7 +2294,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	div.csc-textpic-imagecolumn, td.csc-textpic-imagecolumn .csc-textpic-image { margin-right: {$styles.content.imgtext.colSpace}px; }
 	div.csc-textpic-imagecolumn.csc-textpic-lastcol, td.csc-textpic-imagecolumn.csc-textpic-lastcol .csc-textpic-image { margin-right: 0; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	div.csc-textpic-intext-left .csc-textpic-imagewrap,
 	div.csc-textpic-intext-left-nowrap .csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px;
diff --git a/typo3/sysext/css_styled_content/static/v3.8/constants.txt b/typo3/sysext/css_styled_content/static/v3.8/constants.txt
index c76405494636615fe4202cb252f8dd3c0673e81f..788b44b5beb6443a0399f904162db6e9f0f59e4f 100644
--- a/typo3/sysext/css_styled_content/static/v3.8/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v3.8/constants.txt
@@ -37,11 +37,11 @@ styles.content.imgtext {
   borderColor = black
     # cat=content/cImage/b; type=int[0-100]; label= Image border thickness: Thickness of border around images in content elements when "Border"-option for element is set.
   borderThick = 2
-    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image".
+    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images".
   colSpace = 10
-    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Image" or "Text w/Image".
+    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Images" or "Text & Images".
   rowSpace = 10
-    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/x; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
   linkWrap.width = 800m
   linkWrap.height = 600m
diff --git a/typo3/sysext/css_styled_content/static/v3.9/constants.txt b/typo3/sysext/css_styled_content/static/v3.9/constants.txt
index 8c66f345fe9aa72b5b932b48834c78b3a1f6fb48..fbfe281e58dccd0892427810894f5d64559e036e 100644
--- a/typo3/sysext/css_styled_content/static/v3.9/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v3.9/constants.txt
@@ -50,11 +50,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 5
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v3.9/setup.txt b/typo3/sysext/css_styled_content/static/v3.9/setup.txt
index df7b73be5264a4caa83656c0c505b07fa9ef6e1c..0dae41de06035712f2d4afd7e24b948bbd1f35b8 100644
--- a/typo3/sysext/css_styled_content/static/v3.9/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v3.9/setup.txt
@@ -1343,7 +1343,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.2/constants.txt b/typo3/sysext/css_styled_content/static/v4.2/constants.txt
index 266106e37658bd036b0ff9bd05c6c31996b20b26..d9825ea37d57e0596f17dd9b3bd50809e7d84f2b 100644
--- a/typo3/sysext/css_styled_content/static/v4.2/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.2/constants.txt
@@ -50,11 +50,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 5
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.2/setup.txt b/typo3/sysext/css_styled_content/static/v4.2/setup.txt
index 09bfa45c39181599da5ba586e0e258c96b58c85f..9c6d71c66c6f516333ae361d9a93362646e34084 100644
--- a/typo3/sysext/css_styled_content/static/v4.2/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.2/setup.txt
@@ -1360,7 +1360,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.3/constants.txt b/typo3/sysext/css_styled_content/static/v4.3/constants.txt
index 7cdb7646741b24210f35342500c4efa9df4e0e02..310239c75233e3be8c74d6cdb105d36b81df8e3a 100644
--- a/typo3/sysext/css_styled_content/static/v4.3/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.3/constants.txt
@@ -53,11 +53,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 5
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.3/setup.txt b/typo3/sysext/css_styled_content/static/v4.3/setup.txt
index 70abbe0f4ca438809f2e51eef4f363b7d67a47df..57be9f18e4c1e9e341cb4a33716ef23662e03344 100644
--- a/typo3/sysext/css_styled_content/static/v4.3/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.3/setup.txt
@@ -1721,7 +1721,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.4/constants.txt b/typo3/sysext/css_styled_content/static/v4.4/constants.txt
index 78268985e41bc2b7accbb86622034e7d791fffd7..c4d1cbefc3e85cd7e675cc0284ab5aad7ce64f85 100644
--- a/typo3/sysext/css_styled_content/static/v4.4/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.4/constants.txt
@@ -58,11 +58,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.4/setup.txt b/typo3/sysext/css_styled_content/static/v4.4/setup.txt
index 3a9610cbc4c5a86dab40ab56f8e55dd1d8815f77..b81a682f546cbd1876fb921c819dca8fb3852a64 100644
--- a/typo3/sysext/css_styled_content/static/v4.4/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.4/setup.txt
@@ -1711,7 +1711,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.5/constants.txt b/typo3/sysext/css_styled_content/static/v4.5/constants.txt
index e15bcf629b43dce2813d77e8a3cb2f158270140a..95e6aeedf1edb411d7bc242f4e69de59b1d1b864 100644
--- a/typo3/sysext/css_styled_content/static/v4.5/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.5/constants.txt
@@ -58,11 +58,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.5/setup.txt b/typo3/sysext/css_styled_content/static/v4.5/setup.txt
index d47c043309e4ec5f1dfa864bcc0a69e7896a8207..be4f9bc3edc9b78e7464b54328153216ea46fc80 100644
--- a/typo3/sysext/css_styled_content/static/v4.5/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.5/setup.txt
@@ -1797,7 +1797,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.6/constants.txt b/typo3/sysext/css_styled_content/static/v4.6/constants.txt
index 851c052e5bc2acfdc71ab7cb7e5372ddc9fbd7f1..1a9221d29e248df837057b9207ac2f79ad4b8c83 100644
--- a/typo3/sysext/css_styled_content/static/v4.6/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.6/constants.txt
@@ -58,11 +58,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.6/setup.txt b/typo3/sysext/css_styled_content/static/v4.6/setup.txt
index 427bf0fda73946ee578ca3722dc038b981500ec3..c510bdba6c40a7fda0dc5f416363a45693b28a60 100644
--- a/typo3/sysext/css_styled_content/static/v4.6/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.6/setup.txt
@@ -1690,7 +1690,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-firstcol { margin-left: 0px !important; }
 	DIV.csc-textpic DIV.csc-textpic-imagewrap .csc-textpic-lastcol { margin-right: 0px !important; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left DIV.csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap DIV.csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px !important;
diff --git a/typo3/sysext/css_styled_content/static/v4.7/constants.txt b/typo3/sysext/css_styled_content/static/v4.7/constants.txt
index bb52bb0987785be8101d2a82984e7adc65069130..a2b1b15787bc0e83ada5f033f53a8542afc5129f 100644
--- a/typo3/sysext/css_styled_content/static/v4.7/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v4.7/constants.txt
@@ -58,11 +58,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v4.7/setup.txt b/typo3/sysext/css_styled_content/static/v4.7/setup.txt
index 51ce4a3fc85dac3ec9c35ee269c9e69d7f8871b9..2475b8e9018b72ad129e826428145f63bb2e0c37 100644
--- a/typo3/sysext/css_styled_content/static/v4.7/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.7/setup.txt
@@ -2166,7 +2166,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic-imagecolumn, TD.csc-textpic-imagecolumn .csc-textpic-image { margin-right: {$styles.content.imgtext.colSpace}px; }
 	DIV.csc-textpic-imagecolumn.csc-textpic-lastcol, TD.csc-textpic-imagecolumn.csc-textpic-lastcol .csc-textpic-image { margin-right: 0; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left .csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap .csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px;
diff --git a/typo3/sysext/css_styled_content/static/v6.0/constants.txt b/typo3/sysext/css_styled_content/static/v6.0/constants.txt
index 336abe7763974db427b15c34969965e6079226ec..fec25b8f6fa19eebdc7db1e0156bcfa3e9f943cf 100644
--- a/typo3/sysext/css_styled_content/static/v6.0/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v6.0/constants.txt
@@ -56,11 +56,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v6.0/setup.txt b/typo3/sysext/css_styled_content/static/v6.0/setup.txt
index 63f071921a7efed785d2a711599d5fd8fde92479..f475716c00e17d253b19273aca87a2f79c91faa7 100644
--- a/typo3/sysext/css_styled_content/static/v6.0/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v6.0/setup.txt
@@ -2138,7 +2138,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic-imagecolumn, TD.csc-textpic-imagecolumn .csc-textpic-image { margin-right: {$styles.content.imgtext.colSpace}px; }
 	DIV.csc-textpic-imagecolumn.csc-textpic-lastcol, TD.csc-textpic-imagecolumn.csc-textpic-lastcol .csc-textpic-image { margin-right: 0; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left .csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap .csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px;
diff --git a/typo3/sysext/css_styled_content/static/v6.1/constants.txt b/typo3/sysext/css_styled_content/static/v6.1/constants.txt
index 336abe7763974db427b15c34969965e6079226ec..fec25b8f6fa19eebdc7db1e0156bcfa3e9f943cf 100644
--- a/typo3/sysext/css_styled_content/static/v6.1/constants.txt
+++ b/typo3/sysext/css_styled_content/static/v6.1/constants.txt
@@ -56,11 +56,11 @@ styles.content.imgtext {
     # cat=content/cImage/e4; type=boolean; label= Images, title in link and IMG: If you have the title in the <a>-tag (titleInLink=true), you don't get the 'title' in the <img>-tag. IE will not show the tooltip anymore. So to get the 'title' in <img> too (to keep IE happy), set this too. Recommended for accessibility is "false". For correct tooltips on IE, set this to "true".
   titleInLinkAndImg = 0
 
-    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between images in a block in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   colSpace = 10
-    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Image" or "Text w/Image". If you change this manually in your CSS, you need to adjust this setting accordingly.
+    # cat=content/cImage/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each image row in content elements of type "Images" or "Text & Images". If you change this manually in your CSS, you need to adjust this setting accordingly.
   rowSpace = 10
-    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text w/Image".
+    # cat=content/cImage/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images".
   textMargin = 10
 
     # cat=content/cImage/i1; type=color; label= Image border, color: Bordercolor of images in content elements when "Border"-option for element is set.
diff --git a/typo3/sysext/css_styled_content/static/v6.1/setup.txt b/typo3/sysext/css_styled_content/static/v6.1/setup.txt
index 5b9e99c2c35344e9d5ea89f9b29e7bf33ab06628..963d54917e29ac8bfd8b24456ac5f2905b8ea40f 100644
--- a/typo3/sysext/css_styled_content/static/v6.1/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v6.1/setup.txt
@@ -2139,7 +2139,7 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 	DIV.csc-textpic-imagecolumn, TD.csc-textpic-imagecolumn .csc-textpic-image { margin-right: {$styles.content.imgtext.colSpace}px; }
 	DIV.csc-textpic-imagecolumn.csc-textpic-lastcol, TD.csc-textpic-imagecolumn.csc-textpic-lastcol .csc-textpic-image { margin-right: 0; }
 
-	/* Add margin from image-block to text (in case of "Text w/ images") */
+	/* Add margin from image-block to text (in case of "Text & Images") */
 	DIV.csc-textpic-intext-left .csc-textpic-imagewrap,
 	DIV.csc-textpic-intext-left-nowrap .csc-textpic-imagewrap {
 		margin-right: {$styles.content.imgtext.textMargin}px;