diff --git a/check-needles.py b/check-needles.py
index 65c0a59a..b0faba7f 100755
--- a/check-needles.py
+++ b/check-needles.py
@@ -105,6 +105,14 @@ for section in ("desktop", "networking", "sound", "files", "user", "hardware",
                 "accessibility", "tipstricks", "morehelp"):
     testliterals.append(f"help_section_{section}")
     testliterals.append(f"help_section_content_{section}")
+# Needles for Calculator
+for button in ("div", "divider", "zero", "one", "two", "three", "four", "five",
+                "six","seven", "eight", "nine", "mod", "percent", "pi", "root",
+                "square", "sub"):
+    testliterals.append(f"calc_button_{button}")
+for result in ("BokZw", "Czo4s", "O9qsL", "WIxiR", "b5y2B", "h7MfO", "qxuBK",
+                "tWshx", "uC8Ul", "3LAG3"):
+    testliterals.append(f"calc_result_{result}")
 # variable-y in custom_change_device but we only have one value
 testliterals.append("anaconda_part_device_sda")
 # for Anaconda help related needles.
diff --git a/needles/gnome/apps/calculator/calc_about_shown.json b/needles/gnome/apps/calculator/calc_about_shown.json
new file mode 100644
index 00000000..e24c5e79
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_about_shown.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 102,
+            "type": "match",
+            "width": 101,
+            "xpos": 280,
+            "ypos": 292
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "calc_about_shown"
+    ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_about_shown.png b/needles/gnome/apps/calculator/calc_about_shown.png
new file mode 100644
index 00000000..04a2474d
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_about_shown.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_add.json b/needles/gnome/apps/calculator/calc_button_add.json
new file mode 100644
index 00000000..be9d95b6
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_add.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 383,
+      "ypos": 567,
+      "width": 31,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_add"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_add.png b/needles/gnome/apps/calculator/calc_button_add.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_add.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_bclose.json b/needles/gnome/apps/calculator/calc_button_bclose.json
new file mode 100644
index 00000000..776eb953
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_bclose.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 313,
+      "ypos": 371,
+      "width": 32,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_bclose"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_bclose.png b/needles/gnome/apps/calculator/calc_button_bclose.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_bclose.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_bopen.json b/needles/gnome/apps/calculator/calc_button_bopen.json
new file mode 100644
index 00000000..7c7638f9
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_bopen.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 252,
+      "ypos": 375,
+      "width": 22,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_bopen"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_bopen.png b/needles/gnome/apps/calculator/calc_button_bopen.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_bopen.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_div.json b/needles/gnome/apps/calculator/calc_button_div.json
new file mode 100644
index 00000000..a0317243
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_div.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 385,
+      "ypos": 422,
+      "width": 28,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_div"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_div.png b/needles/gnome/apps/calculator/calc_button_div.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_div.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_divider.json b/needles/gnome/apps/calculator/calc_button_divider.json
new file mode 100644
index 00000000..3fd661bd
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_divider.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 248,
+      "ypos": 566,
+      "width": 29,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_divider"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_divider.png b/needles/gnome/apps/calculator/calc_button_divider.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_divider.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_eight.json b/needles/gnome/apps/calculator/calc_button_eight.json
new file mode 100644
index 00000000..007c8893
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_eight.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 251,
+      "ypos": 423,
+      "width": 24,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_eight"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_eight.png b/needles/gnome/apps/calculator/calc_button_eight.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_eight.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_equals.json b/needles/gnome/apps/calculator/calc_button_equals.json
new file mode 100644
index 00000000..4667009f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_equals.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 451,
+      "ypos": 539,
+      "width": 30,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_equals"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_equals.png b/needles/gnome/apps/calculator/calc_button_equals.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_equals.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_five.json b/needles/gnome/apps/calculator/calc_button_five.json
new file mode 100644
index 00000000..b15a7c7f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_five.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 250,
+      "ypos": 467,
+      "width": 28,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_five"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_five.png b/needles/gnome/apps/calculator/calc_button_five.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_five.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_four.json b/needles/gnome/apps/calculator/calc_button_four.json
new file mode 100644
index 00000000..8db3b51a
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_four.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 182,
+      "ypos": 470,
+      "width": 30,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_four"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_four.png b/needles/gnome/apps/calculator/calc_button_four.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_four.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_mod.json b/needles/gnome/apps/calculator/calc_button_mod.json
new file mode 100644
index 00000000..61ef0b0e
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_mod.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 382,
+      "ypos": 378,
+      "width": 37,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_mod"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_mod.png b/needles/gnome/apps/calculator/calc_button_mod.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_mod.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_multi.json b/needles/gnome/apps/calculator/calc_button_multi.json
new file mode 100644
index 00000000..ffc7b62f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_multi.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 387,
+      "ypos": 470,
+      "width": 26,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_multi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_multi.png b/needles/gnome/apps/calculator/calc_button_multi.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_multi.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_nine.json b/needles/gnome/apps/calculator/calc_button_nine.json
new file mode 100644
index 00000000..3945cd96
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_nine.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 317,
+      "ypos": 421,
+      "width": 27,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_nine"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_nine.png b/needles/gnome/apps/calculator/calc_button_nine.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_nine.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_one.json b/needles/gnome/apps/calculator/calc_button_one.json
new file mode 100644
index 00000000..fdaa7daf
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_one.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 178,
+      "ypos": 515,
+      "width": 31,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_one.png b/needles/gnome/apps/calculator/calc_button_one.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_one.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_percent.json b/needles/gnome/apps/calculator/calc_button_percent.json
new file mode 100644
index 00000000..65b13038
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_percent.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 317,
+      "ypos": 564,
+      "width": 27,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_percent"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_percent.png b/needles/gnome/apps/calculator/calc_button_percent.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_percent.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_pi.json b/needles/gnome/apps/calculator/calc_button_pi.json
new file mode 100644
index 00000000..ba6b37b3
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_pi.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 452,
+      "ypos": 373,
+      "width": 32,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_pi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_pi.png b/needles/gnome/apps/calculator/calc_button_pi.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_pi.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_root.json b/needles/gnome/apps/calculator/calc_button_root.json
new file mode 100644
index 00000000..47d07a89
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_root.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 453,
+      "ypos": 418,
+      "width": 31,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_root"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_root.png b/needles/gnome/apps/calculator/calc_button_root.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_root.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_seven.json b/needles/gnome/apps/calculator/calc_button_seven.json
new file mode 100644
index 00000000..9ab9bcee
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_seven.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 182,
+      "ypos": 421,
+      "width": 28,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_seven"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_seven.png b/needles/gnome/apps/calculator/calc_button_seven.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_seven.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_six.json b/needles/gnome/apps/calculator/calc_button_six.json
new file mode 100644
index 00000000..e56186d2
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_six.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 318,
+      "ypos": 471,
+      "width": 28,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_six"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_six.png b/needles/gnome/apps/calculator/calc_button_six.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_six.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_square.json b/needles/gnome/apps/calculator/calc_button_square.json
new file mode 100644
index 00000000..498bb48e
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_square.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 454,
+      "ypos": 470,
+      "width": 28,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_square"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_square.png b/needles/gnome/apps/calculator/calc_button_square.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_square.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_sub.json b/needles/gnome/apps/calculator/calc_button_sub.json
new file mode 100644
index 00000000..cc430342
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_sub.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 383,
+      "ypos": 515,
+      "width": 34,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_sub"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_sub.png b/needles/gnome/apps/calculator/calc_button_sub.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_sub.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_three.json b/needles/gnome/apps/calculator/calc_button_three.json
new file mode 100644
index 00000000..99bc3b8c
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_three.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 319,
+      "ypos": 518,
+      "width": 26,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_three"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_three.png b/needles/gnome/apps/calculator/calc_button_three.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_three.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_two.json b/needles/gnome/apps/calculator/calc_button_two.json
new file mode 100644
index 00000000..0a6eaf60
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_two.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 251,
+      "ypos": 518,
+      "width": 23,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_two.png b/needles/gnome/apps/calculator/calc_button_two.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_two.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_zero.json b/needles/gnome/apps/calculator/calc_button_zero.json
new file mode 100644
index 00000000..902fcc0b
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_zero.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 181,
+      "ypos": 566,
+      "width": 28,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_zero"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_zero.png b/needles/gnome/apps/calculator/calc_button_zero.png
new file mode 100644
index 00000000..e16d0605
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_zero.png differ
diff --git a/needles/gnome/apps/calculator/calc_credits_shown.json b/needles/gnome/apps/calculator/calc_credits_shown.json
new file mode 100644
index 00000000..28c394df
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_credits_shown.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 255,
+      "ypos": 409,
+      "width": 147,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_credits_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_credits_shown.png b/needles/gnome/apps/calculator/calc_credits_shown.png
new file mode 100644
index 00000000..40852b88
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_credits_shown.png differ
diff --git a/needles/gnome/apps/calculator/calc_help_factorial.json b/needles/gnome/apps/calculator/calc_help_factorial.json
new file mode 100644
index 00000000..92ea773c
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_help_factorial.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 5,
+      "ypos": 121,
+      "width": 168,
+      "height": 44,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_help_factorial"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_help_factorial.png b/needles/gnome/apps/calculator/calc_help_factorial.png
new file mode 100644
index 00000000..8c79c931
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_help_factorial.png differ
diff --git a/needles/gnome/apps/calculator/calc_help_keyboard.json b/needles/gnome/apps/calculator/calc_help_keyboard.json
new file mode 100644
index 00000000..769422e5
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_help_keyboard.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 7,
+      "ypos": 125,
+      "width": 317,
+      "height": 41,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_help_keyboard"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_help_keyboard.png b/needles/gnome/apps/calculator/calc_help_keyboard.png
new file mode 100644
index 00000000..eb07202b
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_help_keyboard.png differ
diff --git a/needles/gnome/apps/calculator/calc_help_main_view.json b/needles/gnome/apps/calculator/calc_help_main_view.json
new file mode 100644
index 00000000..48a88abb
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_help_main_view.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 9,
+      "ypos": 86,
+      "width": 106,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_help_main_view"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_help_main_view.png b/needles/gnome/apps/calculator/calc_help_main_view.png
new file mode 100644
index 00000000..b1073140
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_help_main_view.png differ
diff --git a/needles/gnome/apps/calculator/calc_help_using_factorial.json b/needles/gnome/apps/calculator/calc_help_using_factorial.json
new file mode 100644
index 00000000..ca897928
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_help_using_factorial.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 6,
+      "ypos": 527,
+      "width": 92,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_help_using_factorial"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_help_using_factorial.png b/needles/gnome/apps/calculator/calc_help_using_factorial.png
new file mode 100644
index 00000000..a38e3fc2
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_help_using_factorial.png differ
diff --git a/needles/gnome/apps/calculator/calc_help_using_keyboard.json b/needles/gnome/apps/calculator/calc_help_using_keyboard.json
new file mode 100644
index 00000000..749b4beb
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_help_using_keyboard.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 2,
+      "ypos": 276,
+      "width": 173,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_help_using_keyboard"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_help_using_keyboard.png b/needles/gnome/apps/calculator/calc_help_using_keyboard.png
new file mode 100644
index 00000000..d9b12553
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_help_using_keyboard.png differ
diff --git a/needles/gnome/apps/calculator/calc_menu_about.json b/needles/gnome/apps/calculator/calc_menu_about.json
new file mode 100644
index 00000000..473e982c
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_menu_about.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 363,
+      "ypos": 487,
+      "width": 121,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_menu_about"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_menu_about.png b/needles/gnome/apps/calculator/calc_menu_about.png
new file mode 100644
index 00000000..e7fb0e7d
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_menu_about.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_3LAG3.json b/needles/gnome/apps/calculator/calc_result_3LAG3.json
new file mode 100644
index 00000000..f2c5264e
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_3LAG3.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 161,
+      "ypos": 292,
+      "width": 33,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_3LAG3"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_3LAG3.png b/needles/gnome/apps/calculator/calc_result_3LAG3.png
new file mode 100644
index 00000000..9f0ad7fb
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_3LAG3.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_BokZw.json b/needles/gnome/apps/calculator/calc_result_BokZw.json
new file mode 100644
index 00000000..a15ee5e1
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_BokZw.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 159,
+      "ypos": 291,
+      "width": 52,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_BokZw"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_BokZw.png b/needles/gnome/apps/calculator/calc_result_BokZw.png
new file mode 100644
index 00000000..4cfdc781
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_BokZw.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_Czo4s.json b/needles/gnome/apps/calculator/calc_result_Czo4s.json
new file mode 100644
index 00000000..6cb8174f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_Czo4s.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 159,
+      "ypos": 293,
+      "width": 40,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_Czo4s"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_Czo4s.png b/needles/gnome/apps/calculator/calc_result_Czo4s.png
new file mode 100644
index 00000000..b9bfd6b0
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_Czo4s.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_O9qsL.json b/needles/gnome/apps/calculator/calc_result_O9qsL.json
new file mode 100644
index 00000000..fdbaeeb0
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_O9qsL.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 156,
+      "ypos": 292,
+      "width": 147,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_O9qsL"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_O9qsL.png b/needles/gnome/apps/calculator/calc_result_O9qsL.png
new file mode 100644
index 00000000..c381c31c
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_O9qsL.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_WIxiR.json b/needles/gnome/apps/calculator/calc_result_WIxiR.json
new file mode 100644
index 00000000..7ee455cd
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_WIxiR.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 158,
+      "ypos": 291,
+      "width": 40,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_WIxiR"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_WIxiR.png b/needles/gnome/apps/calculator/calc_result_WIxiR.png
new file mode 100644
index 00000000..281871da
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_WIxiR.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_b5y2B.json b/needles/gnome/apps/calculator/calc_result_b5y2B.json
new file mode 100644
index 00000000..2487a3f0
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_b5y2B.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 161,
+      "ypos": 291,
+      "width": 52,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_b5y2B"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_b5y2B.png b/needles/gnome/apps/calculator/calc_result_b5y2B.png
new file mode 100644
index 00000000..a64767e9
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_b5y2B.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_h7MfO.json b/needles/gnome/apps/calculator/calc_result_h7MfO.json
new file mode 100644
index 00000000..9f5d9a95
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_h7MfO.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 158,
+      "ypos": 291,
+      "width": 43,
+      "height": 37,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_h7MfO"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_h7MfO.png b/needles/gnome/apps/calculator/calc_result_h7MfO.png
new file mode 100644
index 00000000..84e43718
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_h7MfO.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_qxuBK.json b/needles/gnome/apps/calculator/calc_result_qxuBK.json
new file mode 100644
index 00000000..49e851ef
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_qxuBK.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 156,
+      "ypos": 293,
+      "width": 39,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_qxuBK"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_qxuBK.png b/needles/gnome/apps/calculator/calc_result_qxuBK.png
new file mode 100644
index 00000000..b52ace6f
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_qxuBK.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_tWshx.json b/needles/gnome/apps/calculator/calc_result_tWshx.json
new file mode 100644
index 00000000..83eb350d
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_tWshx.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 159,
+      "ypos": 292,
+      "width": 35,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_tWshx"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_tWshx.png b/needles/gnome/apps/calculator/calc_result_tWshx.png
new file mode 100644
index 00000000..9d7be19e
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_tWshx.png differ
diff --git a/needles/gnome/apps/calculator/calc_result_uC8Ul.json b/needles/gnome/apps/calculator/calc_result_uC8Ul.json
new file mode 100644
index 00000000..c1bcb636
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_result_uC8Ul.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 159,
+      "ypos": 292,
+      "width": 43,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_result_uC8Ul"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_result_uC8Ul.png b/needles/gnome/apps/calculator/calc_result_uC8Ul.png
new file mode 100644
index 00000000..5dfbcd91
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_result_uC8Ul.png differ
diff --git a/templates.fif.json b/templates.fif.json
index 62f8a8b1..457b25a1 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1052,6 +1052,23 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "calculator": {
+            "profiles": {
+                "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
+                "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL_PATH": "tests/applications/calculator",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
+            }
+        },
         "clocks": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
diff --git a/tests/applications/calculator/aaa_setup.pm b/tests/applications/calculator/aaa_setup.pm
new file mode 100644
index 00000000..83ab3106
--- /dev/null
+++ b/tests/applications/calculator/aaa_setup.pm
@@ -0,0 +1,25 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script starts the Calculator and stores an image.
+
+sub run {
+    my $self = shift;
+    # Run the application
+    menu_launch_type("Calculator");
+    assert_screen("apps_run_calculator");
+    # Make sure that the application will be in the
+    # basic mode.
+    send_key("ctrl-alt-b");
+}
+
+sub test_flags {
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
+
diff --git a/tests/applications/calculator/about.pm b/tests/applications/calculator/about.pm
new file mode 100644
index 00000000..a08c7713
--- /dev/null
+++ b/tests/applications/calculator/about.pm
@@ -0,0 +1,31 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script checks that Gnome Calculator shows About.
+
+sub run {
+    my $self = shift;
+    # Let's wait until everything settles down properly
+    # before we start testing.
+    sleep 5;
+    # Open the menu and click on the About item.
+    assert_and_click("gnome_burger_menu");
+    wait_still_screen(2);
+    assert_and_click("calc_menu_about");
+    # Check that it is shown.
+    assert_screen("calc_about_shown");
+    # Click on the Credits button and check that it shows.
+    assert_and_click("gnome_button_credits");
+    assert_screen("calc_credits_shown");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
+
diff --git a/tests/applications/calculator/calculator.pm b/tests/applications/calculator/calculator.pm
new file mode 100644
index 00000000..dbc6aadf
--- /dev/null
+++ b/tests/applications/calculator/calculator.pm
@@ -0,0 +1,108 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script checks that Gnome Calculator works in Basic mode.
+
+# This subroutine rewrites the number into a word.
+sub rewrite {
+    my $number = shift;
+    my %numbers = (
+        0 => 'zero',
+        1 => 'one',
+        2 => 'two',
+        3 => 'three',
+        4 => 'four',
+        5 => 'five',
+        6 => 'six',
+        7 => 'seven',
+        8 => 'eight',
+        9 => 'nine',
+        "." => 'divider',
+        "%" => 'percent',
+        "p" => 'pi',
+        "r" => 'root',
+        "s" => 'square'
+    );
+    my $rewritten = $numbers{$number};
+    return $rewritten;
+}
+
+# This subroutine performs the clicking of simple operations
+# in the Calculator.
+sub calculate {
+    my ($a, $b, $operation) = @_;
+    # Create lists of the numbers.
+    my @first = split('', $a);
+    my @second = split('', $b);
+
+    # For each digit of the first number, click on
+    # the corresponding button.
+    foreach (@first) {
+        my $word = rewrite($_);
+        assert_and_click("calc_button_$word");
+    }
+    # Click the operation button.
+    assert_and_click("calc_button_$operation");
+    # For each digit of the second number, click on
+    # the corresponding button.
+    foreach (@second) {
+        my $word = rewrite($_);
+        assert_and_click("calc_button_$word");
+    }
+    # Click on the Equals button
+    assert_and_click("calc_button_equals");
+    # Assert the result has appeared on the screen.
+    my $identifier = hashed_string("$a-$operation-$b");
+    assert_screen("calc_result_$identifier");
+    # Clear the display.
+    send_key("esc");
+}
+
+sub run {
+    my $self = shift;
+    # Wait until everything settles.
+    sleep 5;
+    # Check that two numbers can be added.
+    calculate("10", "23", "add");
+    # Check that two numbers can be subtracted.
+    calculate("67", "45", "sub");
+    # Check that two numbers can be multiplied.
+    calculate("9", "0.8", "multi");
+    # Check that two numbers can be divided.
+    calculate("77", "7", "div");
+    # Check that two numbers can be divided using modulo.
+    calculate("28", "5", "mod");
+    # Check that you can count with Pi
+    calculate("p", "10", "multi");
+    # Check that you can use a root
+    calculate("r144", "10", "add");
+    # Check that you can use square
+    calculate("12s", "44", "sub");
+    # Check that you can use percents
+    calculate("33%", "90", "multi");
+
+    # Check that you can use brackets
+    assert_and_click("calc_button_three");
+    assert_and_click("calc_button_multi");
+    assert_and_click("calc_button_bopen");
+    assert_and_click("calc_button_two");
+    assert_and_click("calc_button_add");
+    assert_and_click("calc_button_three");
+    assert_and_click("calc_button_bclose");
+    assert_and_click("calc_button_equals");
+    my $identifier = hashed_string("3*(3+2)");
+    assert_screen("calc_result_$identifier");
+    send_key("esc");
+
+}
+
+sub test_flags {
+    return {fatal => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
+
diff --git a/tests/applications/calculator/help.pm b/tests/applications/calculator/help.pm
new file mode 100644
index 00000000..b4e670e5
--- /dev/null
+++ b/tests/applications/calculator/help.pm
@@ -0,0 +1,33 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This script checks that Gnome Calculator shows help.
+
+sub run {
+    my $self = shift;
+    # Wait until everything settles.
+    sleep 5;
+    # Open Help
+    send_key("f1");
+    wait_still_screen(2);
+
+    # Browse through a couple of links and
+    # check they are not empty.
+    assert_and_click("calc_help_using_keyboard");
+    assert_screen("calc_help_keyboard");
+    assert_and_click("calc_help_main_view");
+    assert_and_click("calc_help_using_factorial");
+    assert_screen("calc_help_factorial");
+    assert_and_click("calc_help_main_view");
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
+