diff --git a/res/values/evolution_arrays.xml b/res/values/evolution_arrays.xml
index d73a63e..d9124da 100644
--- a/res/values/evolution_arrays.xml
+++ b/res/values/evolution_arrays.xml
@@ -1044,4 +1044,19 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+
+    <!-- QS Tiles Shape -->
+    <string-array name="quick_settings_tile_shape_entries">
+        <item>@string/quick_settings_tile_shape_dynamic</item>
+        <item>@string/quick_settings_tile_shape_circle</item>
+        <item>@string/quick_settings_tile_shape_rounded_square</item>
+        <item>@string/quick_settings_tile_shape_square</item>
+    </string-array>
+
+    <string-array name="quick_settings_tile_shape_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
 </resources>
diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index c913b96..4767231 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -446,6 +446,11 @@
     <string name="quick_settings_header_offset_summary">Adjust the image header size</string>
     <string name="quick_settings_transparency_title">Background transparency</string>
     <string name="quick_settings_transparency_summary">Set transparency level for QS background</string>
+    <string name="quick_settings_tile_shape_title">QS tiles shape</string>
+    <string name="quick_settings_tile_shape_dynamic">Dynamic</string>
+    <string name="quick_settings_tile_shape_circle">Circle</string>
+    <string name="quick_settings_tile_shape_rounded_square">Rounded square</string>
+    <string name="quick_settings_tile_shape_square">Square</string>
 
     <!-- Notifications -->
     <string name="notifications_heads_up_title">Heads up</string>
diff --git a/res/xml/evolution_settings_quick_settings.xml b/res/xml/evolution_settings_quick_settings.xml
index 373179e..7ff71c2 100644
--- a/res/xml/evolution_settings_quick_settings.xml
+++ b/res/xml/evolution_settings_quick_settings.xml
@@ -116,9 +116,16 @@
             android:key="qs_widgets_enabled"
             android:title="@string/qs_widgets_enabled_title"
             android:summary="@string/qs_widgets_enabled_summary"
-            android:defaultValue="false" />
+            android:defaultValue="false" />-->
 
-        <ListPreference
+        <org.evolution.settings.preferences.SystemSettingListPreference
+            android:key="qs_tile_shape"
+            android:title="@string/quick_settings_tile_shape_title"
+            android:entries="@array/quick_settings_tile_shape_entries"
+            android:entryValues="@array/quick_settings_tile_shape_values"
+            android:defaultValue="0" />
+
+        <!--<ListPreference
             android:key="qs_tile_ui_style"
             android:title="@string/quick_settings_tile_ui_style_title"
             android:entries="@array/quick_settings_tile_ui_style_entries"