diff --git a/uds-android-theme-public-mobile/src/main/res/raw/Link.json b/uds-android-theme-public-mobile/src/main/res/raw/Link.json
index 0143f2e..38e0356 100644
--- a/uds-android-theme-public-mobile/src/main/res/raw/Link.json
+++ b/uds-android-theme-public-mobile/src/main/res/raw/Link.json
@@ -38,6 +38,14 @@
         "iconSpace": 2
       }
     },
+    {
+      "if": {
+        "iconPosition": "right"
+      },
+      "tokens": {
+        "iconSpace": 1
+      }
+    },
     {
       "if": {
         "pressed": true
@@ -191,7 +199,7 @@
     },
     "icon": null,
     "iconSize": 24,
-    "iconSpace": 1,
+    "iconSpace": 0,
     "iconTranslateX": 0,
     "iconTranslateY": 0,
     "outerBorderColor": {
diff --git a/uds-android-theme-public-mobile/src/main/res/raw/theme.json b/uds-android-theme-public-mobile/src/main/res/raw/theme.json
index 9899b7e..5f8101b 100644
--- a/uds-android-theme-public-mobile/src/main/res/raw/theme.json
+++ b/uds-android-theme-public-mobile/src/main/res/raw/theme.json
@@ -5301,6 +5301,14 @@
             "iconSpace": 2
           }
         },
+        {
+          "if": {
+            "iconPosition": "right"
+          },
+          "tokens": {
+            "iconSpace": 1
+          }
+        },
         {
           "if": {
             "pressed": true
@@ -5454,7 +5462,7 @@
         },
         "icon": null,
         "iconSize": 24,
-        "iconSpace": 1,
+        "iconSpace": 0,
         "iconTranslateX": 0,
         "iconTranslateY": 0,
         "outerBorderColor": {