diff --git a/needles/gnome/apps/nautilus/nautilus_directory_documents.json b/needles/gnome/apps/nautilus/nautilus_directory_documents.json
index 19eeb898..85f732b5 100644
--- a/needles/gnome/apps/nautilus/nautilus_directory_documents.json
+++ b/needles/gnome/apps/nautilus/nautilus_directory_documents.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "height": 20,
       "type": "match",
-      "xpos": 202,
-      "width": 117,
-      "ypos": 163
+      "height": 20,
+      "width": 100,
+      "xpos": 16,
+      "ypos": 205
     }
   ],
   "properties": [],
diff --git a/needles/gnome/apps/nautilus/nautilus_directory_documents.png b/needles/gnome/apps/nautilus/nautilus_directory_documents.png
index a0207cab..f3480516 100644
Binary files a/needles/gnome/apps/nautilus/nautilus_directory_documents.png and b/needles/gnome/apps/nautilus/nautilus_directory_documents.png differ
diff --git a/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.json b/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.json
deleted file mode 100644
index 85f732b5..00000000
--- a/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 20,
-      "width": 100,
-      "xpos": 16,
-      "ypos": 205
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_directory_documents"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.png b/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.png
deleted file mode 100644
index f3480516..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_directory_documents_trash.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.json b/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.json
deleted file mode 100644
index 029dcd22..00000000
--- a/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 235,
-      "height": 22,
-      "type": "match",
-      "width": 82,
-      "ypos": 162
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_documents_folder"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.png b/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.png
deleted file mode 100644
index 3657c720..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_documents_folder-20220704.png and /dev/null differ
diff --git a/needles/gnome/apps/nautilus/nautilus_documents_folder.json b/needles/gnome/apps/nautilus/nautilus_documents_folder.json
deleted file mode 100644
index e904fa8e..00000000
--- a/needles/gnome/apps/nautilus/nautilus_documents_folder.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 251,
-      "ypos": 165,
-      "width": 82,
-      "height": 22,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_documents_folder"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_documents_folder.png b/needles/gnome/apps/nautilus/nautilus_documents_folder.png
deleted file mode 100644
index 1f75f88e..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_documents_folder.png and /dev/null differ
diff --git a/tests/applications/nautilus/copy_file.pm b/tests/applications/nautilus/copy_file.pm
index 82266bc6..f0381485 100644
--- a/tests/applications/nautilus/copy_file.pm
+++ b/tests/applications/nautilus/copy_file.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click onto a file to select it.
     assert_and_click("nautilus_test_file");
diff --git a/tests/applications/nautilus/create_directory.pm b/tests/applications/nautilus/create_directory.pm
index b343011f..5265ef69 100644
--- a/tests/applications/nautilus/create_directory.pm
+++ b/tests/applications/nautilus/create_directory.pm
@@ -9,7 +9,7 @@ sub run {
 my $self = shift;
 
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     wait_still_screen(2);
     
     #  Click on the Burger menu to open it
diff --git a/tests/applications/nautilus/delete_file.pm b/tests/applications/nautilus/delete_file.pm
index d992f8bb..7dc75b82 100644
--- a/tests/applications/nautilus/delete_file.pm
+++ b/tests/applications/nautilus/delete_file.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
 
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click onto a file to select it.
     assert_and_click("nautilus_test_file");
diff --git a/tests/applications/nautilus/hidden_files.pm b/tests/applications/nautilus/hidden_files.pm
index 443a7760..0cb15e60 100644
--- a/tests/applications/nautilus/hidden_files.pm
+++ b/tests/applications/nautilus/hidden_files.pm
@@ -8,8 +8,8 @@ use utils;
 sub run {
 	my $self = shift;
 	
-	#  Enter the Documents directory. 
-	assert_and_dclick("nautilus_documents_folder", timeout => '30', button => 'left', mousehide => '1');
+	#  Enter the Documents directory.
+	assert_and_click("nautilus_directory_documents", timeout => '30', button => 'left', mousehide => '1');
 	
 	# Check that we are in the Documents directory.
 	assert_screen("nautilus_documents_active", timeout => '30', no_wait => '0');
diff --git a/tests/applications/nautilus/move_file.pm b/tests/applications/nautilus/move_file.pm
index fa00ad9f..87a3bc4b 100644
--- a/tests/applications/nautilus/move_file.pm
+++ b/tests/applications/nautilus/move_file.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click onto a file to select it.
     assert_and_click("nautilus_test_file");
diff --git a/tests/applications/nautilus/move_file_into.pm b/tests/applications/nautilus/move_file_into.pm
index 1af23943..e49d9a8e 100644
--- a/tests/applications/nautilus/move_file_into.pm
+++ b/tests/applications/nautilus/move_file_into.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
 
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
 
     #  Right click onto a file to select it and open the context menu
     #  for it.
diff --git a/tests/applications/nautilus/new_instance.pm b/tests/applications/nautilus/new_instance.pm
index ba8c9a23..a18000d4 100644
--- a/tests/applications/nautilus/new_instance.pm
+++ b/tests/applications/nautilus/new_instance.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click on the Burger menu to open it
     assert_and_click("gnome_burger_menu");
diff --git a/tests/applications/nautilus/open_new_tab.pm b/tests/applications/nautilus/open_new_tab.pm
index 6cfb713b..63eb0700 100644
--- a/tests/applications/nautilus/open_new_tab.pm
+++ b/tests/applications/nautilus/open_new_tab.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click on the Burger menu to open it
     assert_and_click("gnome_burger_menu");
diff --git a/tests/applications/nautilus/permissions.pm b/tests/applications/nautilus/permissions.pm
index 768216f2..721c348b 100644
--- a/tests/applications/nautilus/permissions.pm
+++ b/tests/applications/nautilus/permissions.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Rigth click onto a file to open context menu.
     assert_and_click("nautilus_test_file", button => "right");
diff --git a/tests/applications/nautilus/rename_file.pm b/tests/applications/nautilus/rename_file.pm
index 3f70ae76..33ff1392 100644
--- a/tests/applications/nautilus/rename_file.pm
+++ b/tests/applications/nautilus/rename_file.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Click onto a file to select it.
     assert_and_click("nautilus_test_file");
diff --git a/tests/applications/nautilus/star_file.pm b/tests/applications/nautilus/star_file.pm
index 17859a71..711bc185 100644
--- a/tests/applications/nautilus/star_file.pm
+++ b/tests/applications/nautilus/star_file.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     
     #  Enter the Documents directory to get to the test data. 
-    assert_and_dclick("nautilus_directory_documents");
+    assert_and_click("nautilus_directory_documents");
     
     #  Right click onto a file to select it to see the
     #  context menu.