diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml
index 8eb00fa5cdb68..668cff7cd4f20 100644
--- a/core/res/res/drawable-nodpi/platlogo.xml
+++ b/core/res/res/drawable-nodpi/platlogo.xml
@@ -18,22 +18,21 @@
 
     <viewport android:viewportHeight="25" android:viewportWidth="25" />
 
-    <group>
-        <path
-            android:name="shadow"
-            android:pathData="m12,2.5 a11,11 0 1,0 1,0
-            M6.5,7.5
-            l5,0 l0,7 l7,0 l0,5 l-12,0 z"
-            android:fill="#40000000"
-            />
-        <path
-            android:name="circle-L-ranch"
-            android:pathData="m12,1.5 a11,11 0 1,0 1,0
-            M6.5,6.5
-            l5,0 l0,7 l7,0 l0,5 l-12,0 z"
-            android:fill="#FFFFFF40"
-            />
-    </group>
+    <path
+        android:name="shadow"
+        android:pathData="m12,2.5 a11,11 0 1,0 1,0
+        M6.5,7.5
+        l5,0 l0,7 l7,0 l0,5 l-12,0 z"
+        android:fill="#40000000"
+        />
+    <path
+        android:name="circle-L-ranch"
+        android:pathData="m12,1.5 a11,11 0 1,0 1,0
+        M6.5,6.5
+        l5,0 l0,7 l7,0 l0,5 l-12,0 z"
+        android:fill="#FFFFFF40"
+        />
+
 </vector>
 
 
diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml
index 49028b4d55646..b8ddb77bd2df1 100644
--- a/core/res/res/drawable-nodpi/stat_sys_adb.xml
+++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml
@@ -18,13 +18,13 @@
 
     <viewport android:viewportHeight="25" android:viewportWidth="25" />
 
-    <group>
-        <path
-            android:name="adb"
-            android:pathData="m3,3l8,0l0,11l11,0l0,8l-19,0z"
-            android:fill="#FFFFFFFF"
-            />
-    </group>
+
+    <path
+        android:name="adb"
+        android:pathData="m3,3l8,0l0,11l11,0l0,8l-19,0z"
+        android:fill="#FFFFFFFF"
+        />
+
 </vector>
 
 
diff --git a/packages/SystemUI/res/drawable/ic_settings_24dp.xml b/packages/SystemUI/res/drawable/ic_settings_24dp.xml
index 5c38a22221ac6..a2f78225b77b2 100644
--- a/packages/SystemUI/res/drawable/ic_settings_24dp.xml
+++ b/packages/SystemUI/res/drawable/ic_settings_24dp.xml
@@ -20,10 +20,10 @@ android:height="24dp"/>
     <viewport android:viewportWidth="24.0"
           android:viewportHeight="24.0"/>
 
-<group>
+
 <path
      android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
      android:fill="#ffffffff"
      />
-</group>
+
 </vector>
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
index c015cc84a910a..744795e5e889f 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
@@ -24,12 +24,11 @@
         android:viewportHeight="100"
         android:viewportWidth="100" />
 
-    <group>
-        <path
-            android:name="x"
-            android:pathData="M0,0L100,100M0,100L100,0z"
-            android:stroke="@color/recents_task_bar_dark_dismiss_color"
-            android:strokeWidth="8.0"
-            android:strokeLineCap="square" />
-    </group>
+    <path
+        android:name="x"
+        android:pathData="M0,0L100,100M0,100L100,0z"
+        android:stroke="@color/recents_task_bar_dark_dismiss_color"
+        android:strokeWidth="8.0"
+        android:strokeLineCap="square" />
+
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_light.xml b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
index 9c93db95e5c50..96bfbe1194512 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_light.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
@@ -24,12 +24,12 @@
         android:viewportHeight="100"
         android:viewportWidth="100" />
 
-    <group>
-        <path
-            android:name="x"
-            android:pathData="M0,0L100,100M0,100L100,0z"
-            android:stroke="@color/recents_task_bar_light_dismiss_color"
-            android:strokeWidth="8.0"
-            android:strokeLineCap="square" />
-    </group>
+
+    <path
+        android:name="x"
+        android:pathData="M0,0L100,100M0,100L100,0z"
+        android:stroke="@color/recents_task_bar_light_dismiss_color"
+        android:strokeWidth="8.0"
+        android:strokeLineCap="square" />
+
 </vector>
\ No newline at end of file