diff --git a/needles/anaconda_install_destination_select_disk_1-gtk320bug.json b/needles/anaconda_install_destination_select_disk_1-gtk320bug.json
new file mode 100644
index 00000000..9467d540
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_1-gtk320bug.json
@@ -0,0 +1,19 @@
+{
+  "tags": [
+    "anaconda_install_destination_select_disk_1",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 37,
+      "height": 18,
+      "ypos": 269,
+      "width": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [
+    "workaround"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_1-gtk320bug.png b/needles/anaconda_install_destination_select_disk_1-gtk320bug.png
new file mode 100644
index 00000000..b1014032
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_1-gtk320bug.png differ
diff --git a/needles/anaconda_install_destination_select_disk_2-gtk320bug.json b/needles/anaconda_install_destination_select_disk_2-gtk320bug.json
new file mode 100644
index 00000000..b568c3b5
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_2-gtk320bug.json
@@ -0,0 +1,19 @@
+{
+  "properties": [
+    "workaround"
+  ],
+  "tags": [
+    "anaconda_install_destination_select_disk_2",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "ypos": 271,
+      "height": 14,
+      "xpos": 186,
+      "type": "match",
+      "width": 16
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_2-gtk320bug.png b/needles/anaconda_install_destination_select_disk_2-gtk320bug.png
new file mode 100644
index 00000000..cbaf920f
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_2-gtk320bug.png differ
diff --git a/needles/anaconda_part_select_root.json b/needles/anaconda_part_select_root.json
index c48a11c5..e66dd527 100644
--- a/needles/anaconda_part_select_root.json
+++ b/needles/anaconda_part_select_root.json
@@ -1,16 +1,17 @@
-{
-    "area": [
-        {
-            "height": 21,
-            "type": "match",
-            "width": 79,
-            "xpos": 41,
-            "ypos": 197
-        }
-    ],
-    "tags": [
-        "anaconda_part_select_root",
-        "ENV-DISTRI-fedora",
-        "ENV-FLAVOR-server"
-    ]
-}
+{
+  "area": [
+    {
+      "height": 21,
+      "xpos": 41,
+      "ypos": 189,
+      "width": 79,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "anaconda_part_select_root",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_select_root.png b/needles/anaconda_part_select_root.png
index 7b93d89d..36143e95 100644
Binary files a/needles/anaconda_part_select_root.png and b/needles/anaconda_part_select_root.png differ
diff --git a/needles/anaconda_part_select_swap-freetype262.json b/needles/anaconda_part_select_swap-freetype262.json
deleted file mode 100644
index 8eefd627..00000000
--- a/needles/anaconda_part_select_swap-freetype262.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "tags": [
-    "anaconda_part_select_swap",
-    "ENV-DISTRI-fedora",
-    "ENV-FLAVOR-generic_boot"
-  ],
-  "properties": [],
-  "area": [
-    {
-      "height": 19,
-      "width": 48,
-      "ypos": 233,
-      "xpos": 51,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda_part_select_swap-freetype262.png b/needles/anaconda_part_select_swap-freetype262.png
deleted file mode 100644
index 2fe274ca..00000000
Binary files a/needles/anaconda_part_select_swap-freetype262.png and /dev/null differ
diff --git a/needles/anaconda_part_select_swap.json b/needles/anaconda_part_select_swap.json
index f5d3ecfb..ed8c7ce1 100644
--- a/needles/anaconda_part_select_swap.json
+++ b/needles/anaconda_part_select_swap.json
@@ -1,17 +1,17 @@
-{
-    "area": [
-        {
-            "height": 19,
-            "type": "match",
-            "width": 48,
-            "xpos": 51,
-            "ypos": 245
-        }
-    ],
-    "properties": [],
-    "tags": [
-        "anaconda_part_select_swap",
-        "ENV-DISTRI-fedora",
-        "ENV-FLAVOR-generic_boot"
-    ]
-}
+{
+  "area": [
+    {
+      "height": 19,
+      "ypos": 235,
+      "xpos": 50,
+      "width": 48,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "anaconda_part_select_swap",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-generic_boot"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_select_swap.png b/needles/anaconda_part_select_swap.png
index 350952ea..db474f08 100644
Binary files a/needles/anaconda_part_select_swap.png and b/needles/anaconda_part_select_swap.png differ