diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/.content.xml b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/.content.xml
new file mode 100644
index 0000000000..e4aae2cdc9
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Generic Text &amp; Image"
+    sling:resourceSuperType="foundation/components/textimage"
+    allowedParents="[*/parsys]"
+    componentGroup="General"/>
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/_cq_editConfig.xml b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/_cq_editConfig.xml
new file mode 100644
index 0000000000..3632801d0f
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/_cq_editConfig.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:EditConfig">
+    <cq:dropTargets jcr:primaryType="nt:unstructured">
+        <image
+            jcr:primaryType="cq:DropTargetConfig"
+            accept="[image/.*]"
+            groups="[media]"
+            propertyName="./image/fileReference">
+            <parameters
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="acs-commons/components/content/generic-text-image">
+                <image
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="foundation/components/image"
+                    imageCrop=""
+                    imageMap=""
+                    imageRotate=""/>
+            </parameters>
+        </image>
+    </cq:dropTargets>
+</jcr:root>
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/.content.xml b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/.content.xml
new file mode 100644
index 0000000000..b6df785dc6
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[acs-commons.components]"/>
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/css.txt b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/css.txt
new file mode 100644
index 0000000000..f7da87336d
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/css.txt
@@ -0,0 +1 @@
+textimage.css
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/textimage.css b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/textimage.css
new file mode 100644
index 0000000000..e380e56fe4
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/clientlib/textimage.css
@@ -0,0 +1,28 @@
+/*
+ * #%L
+ * ACS AEM Commons Package
+ * %%
+ * Copyright (C) 2014 Adobe
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+div.generic-text-image div.image {
+    float: left;
+    margin: 0 0.5em 0.5em 0;
+}
+
+div.generic-text-image.image_right div.image {
+    float: right;
+    margin: 0 0 0.5em 0.5em;
+}
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/dialog.xml b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/dialog.xml
new file mode 100644
index 0000000000..9e94dd7cf4
--- /dev/null
+++ b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/dialog.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:TabPanel"
+    activeTab="{Long}0"
+    xtype="tabpanel">
+    <items jcr:primaryType="cq:WidgetCollection">
+        <tab1
+            jcr:primaryType="cq:Widget"
+            anchor="100%"
+            title="Text"
+            xtype="panel">
+            <items jcr:primaryType="cq:WidgetCollection">
+                <text
+                    jcr:primaryType="cq:Widget"
+                    script="rte.textimage.json?addElementQuery=div[class=&quot;text&quot;].jsp"
+                    xtype="slingscriptinclude"/>
+                <richFlag
+                    jcr:primaryType="cq:Widget"
+                    ignoreData="{Boolean}true"
+                    name="./textIsRich"
+                    value="true"
+                    xtype="hidden"/>
+            </items>
+        </tab1>
+        <tab2
+            jcr:primaryType="cq:Widget"
+            path="/libs/foundation/components/textimage/dialog/items/tab2.infinity.json"
+            xtype="cqinclude"/>
+        <tab3
+            jcr:primaryType="cq:Widget"
+            path="/libs/foundation/components/textimage/dialog/items/tab3.infinity.json"
+            xtype="cqinclude"/>
+        <tab4
+            jcr:primaryType="cq:Widget"
+            xtype="componentstyles"/>
+    </items>
+</jcr:root>
diff --git a/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/icon.png b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/icon.png
new file mode 100644
index 0000000000..1e80e8dd27
Binary files /dev/null and b/content/src/main/content/jcr_root/apps/acs-commons/components/content/generic-text-image/icon.png differ