diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/Representation.java b/android/src/main/java/com/qliktrialreactnativestraighttable/Representation.java
index ea8f553d..f7f13e0b 100644
--- a/android/src/main/java/com/qliktrialreactnativestraighttable/Representation.java
+++ b/android/src/main/java/com/qliktrialreactnativestraighttable/Representation.java
@@ -48,6 +48,7 @@ public JSONObject toEvent() throws JSONException {
     column.put("urlPosition", urlPosition);
     column.put("globalMax", globalMax);
     column.put("globalMin", globalMin);
+    column.put("imageSetting", imageSetting);
     if(miniChart != null) {
       column.put("miniChart", miniChart.toEvent());
     }
diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java b/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java
index 83f6cd4a..7de0d7cd 100644
--- a/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java
+++ b/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java
@@ -127,7 +127,7 @@ protected void updateScrollbarBounds() {
   }
 
   protected void updateRowHeights() {
-    tableView.cellContentStyle.themedRowHeight = (tableView.cellContentStyle.getLineHeight() * tableView.cellContentStyle.lineCount) + CellView.PADDING_X_2;
+    tableView.cellContentStyle.themedRowHeight = tableView.cellContentStyle.getLineHeight() + CellView.PADDING_X_2;
     tableView.rowHeight = tableView.cellContentStyle.themedRowHeight;
     tableView.headerHeight = tableView.headerContentStyle.getLineHeight() + CellView.PADDING_X_2;
     tableView.totalsHeight = tableView.cellContentStyle.getLineHeight() + CellView.PADDING_X_2;
diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java b/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java
index 18dcc2bb..57a83cb5 100644
--- a/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java
+++ b/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java
@@ -65,7 +65,7 @@ void measureLineCountNoUpdate() {
   }
 
   protected int calculateLineCount() {
-    int width = Math.max(column.width - textView.getPaddingRight() - textView.getPaddingLeft(), 0);
+    int width = Math.max(column.width - textView.getPaddingRight() - textView.getPaddingLeft() - additionalPadding, 0);
     measureTextPaint.setTypeface(textView.getTypeface());
     StaticLayout.Builder builder = StaticLayout.Builder.obtain(textView.getText(), 0, textView.getText().length(), measureTextPaint, width);
     builder.setIncludePad(true);
diff --git a/src/components/ImageCell.tsx b/src/components/ImageCell.tsx
index 09801db0..69cc3edc 100644
--- a/src/components/ImageCell.tsx
+++ b/src/components/ImageCell.tsx
@@ -10,11 +10,14 @@ export type ImageCellProps = {
 
 const ImageCell: React.FC<ImageCellProps> = ({ rowData, colData, style }) => {
   const imageUrl = useMemo(() => {
+    if(colData?.representation?.imageSetting === 'label') {
+      return rowData.qText;
+    }
     const imageIndex = colData?.stylingInfo?.indexOf('imageUrl');
     if (imageIndex !== -1 && rowData.qAttrExps) {
       return rowData.qAttrExps.qValues[imageIndex].qText;
     }
-    return undefined;
+    return rowData.qText;
   }, [colData, rowData]);
   return (
     <View style={style}>
diff --git a/src/components/TextCell.tsx b/src/components/TextCell.tsx
index 4071480c..52acf5f2 100644
--- a/src/components/TextCell.tsx
+++ b/src/components/TextCell.tsx
@@ -19,7 +19,7 @@ const iconMap = new Map([
   ['Q', 'remove'],
   ['è', 'warning'],
   ['¢', 'clean-hands'],
-  ['©', 'lag'],
+  ['©', 'flag'],
   ['23F4', 'lightbulb'],
   ['2013', 'stop'],
   ['&', 'pie-chart'],