From 3a13fab009b145f9a02af6cdeb0b91ffffa4caef Mon Sep 17 00:00:00 2001
From: Daniel Bayley <daniel.bayley@me.com>
Date: Fri, 25 Aug 2023 13:44:53 +0100
Subject: [PATCH] Add `archive-x` (junk) icon (#1203)

* Add `archive-x` (junk) icon

* Improve metadata

* Refine `archive` icon

* Refine `archive-restore` icon

* Refine `archive-*` icons

* Update icons/archive-restore.svg

Co-authored-by: Karsa <contact@karsa.org>

* Update icons/archive-x.svg

Co-authored-by: Karsa <contact@karsa.org>

* Update icons/archive.svg

Co-authored-by: Karsa <contact@karsa.org>

---------

Co-authored-by: Karsa <contact@karsa.org>
---
 icons/archive-restore.json |  7 ++++---
 icons/archive-restore.svg  | 10 +++++-----
 icons/archive-x.json       | 18 ++++++++++++++++++
 icons/archive-x.svg        | 16 ++++++++++++++++
 icons/archive.json         |  5 ++++-
 icons/archive.svg          |  6 +++---
 6 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 icons/archive-x.json
 create mode 100644 icons/archive-x.svg

diff --git a/icons/archive-restore.json b/icons/archive-restore.json
index 95fb11653..ff6b2270e 100644
--- a/icons/archive-restore.json
+++ b/icons/archive-restore.json
@@ -5,11 +5,12 @@
     "ericfennis"
   ],
   "tags": [
-    "archive",
     "unarchive",
-    "restore",
     "index",
-    "box"
+    "backup",
+    "box",
+    "storage",
+    "records"
   ],
   "categories": [
     "files",
diff --git a/icons/archive-restore.svg b/icons/archive-restore.svg
index 718968c4c..ef30071da 100644
--- a/icons/archive-restore.svg
+++ b/icons/archive-restore.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="20" height="5" x="2" y="4" rx="2" />
-  <path d="M12 13v7" />
-  <path d="m9 16 3-3 3 3" />
-  <path d="M4 9v9a2 2 0 0 0 2 2h2" />
-  <path d="M20 9v9a2 2 0 0 1-2 2h-2" />
+  <rect width="20" height="5" x="2" y="3" rx="1" />
+  <path d="M4 8v11a2 2 0 0 0 2 2h2" />
+  <path d="M20 8v11a2 2 0 0 1-2 2h-2" />
+  <path d="m9 15 3-3 3 3" />
+  <path d="M12 12v9" />
 </svg>
diff --git a/icons/archive-x.json b/icons/archive-x.json
new file mode 100644
index 000000000..1a6428c7d
--- /dev/null
+++ b/icons/archive-x.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "index",
+    "backup",
+    "box",
+    "storage",
+    "records",
+    "junk"
+  ],
+  "categories": [
+    "files",
+    "mail"
+  ]
+}
\ No newline at end of file
diff --git a/icons/archive-x.svg b/icons/archive-x.svg
new file mode 100644
index 000000000..5b0d09ae8
--- /dev/null
+++ b/icons/archive-x.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <rect width="20" height="5" x="2" y="3" rx="1" />
+  <path d="M4 8v11a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8" />
+  <path d="m9.5 17 5-5" />
+  <path d="m9.5 12 5 5" />
+</svg>
diff --git a/icons/archive.json b/icons/archive.json
index cc827d90c..bd82aa027 100644
--- a/icons/archive.json
+++ b/icons/archive.json
@@ -7,7 +7,10 @@
   ],
   "tags": [
     "index",
-    "box"
+    "backup",
+    "box",
+    "storage",
+    "records"
   ],
   "categories": [
     "files",
diff --git a/icons/archive.svg b/icons/archive.svg
index ac3f8059f..4c5ae8e33 100644
--- a/icons/archive.svg
+++ b/icons/archive.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="20" height="5" x="2" y="4" rx="2" />
-  <path d="M4 9v9a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9" />
-  <path d="M10 13h4" />
+  <rect width="20" height="5" x="2" y="3" rx="1" />
+  <path d="M4 8v11a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8" />
+  <path d="M10 12h4" />
 </svg>