From 2c4b4ec74d747003f66ffa6d01089b11bb85ffd2 Mon Sep 17 00:00:00 2001
From: ariasuni <perso@hack-libre.org>
Date: Wed, 6 May 2020 02:26:06 +0200
Subject: [PATCH 1/2] Rename device icons as upstream and update Device Phone

---
 ...vice-mobile-24.svg => device-phone-24.svg} |  0
 ...vice-mobile-24.xml => device-phone-24.xml} |  0
 ...vice-mobile-16.svg => device-phone-16.svg} |  2 +-
 .../{webvr-16.svg => device-vr-16.svg}        |  0
 photon-icons.json                             | 26 +++++++++----------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename icons/android/{device-mobile-24.svg => device-phone-24.svg} (100%)
 rename icons/android/{device-mobile-24.xml => device-phone-24.xml} (100%)
 rename icons/desktop/{device-mobile-16.svg => device-phone-16.svg} (51%)
 mode change 100644 => 100755
 rename icons/desktop/{webvr-16.svg => device-vr-16.svg} (100%)

diff --git a/icons/android/device-mobile-24.svg b/icons/android/device-phone-24.svg
similarity index 100%
rename from icons/android/device-mobile-24.svg
rename to icons/android/device-phone-24.svg
diff --git a/icons/android/device-mobile-24.xml b/icons/android/device-phone-24.xml
similarity index 100%
rename from icons/android/device-mobile-24.xml
rename to icons/android/device-phone-24.xml
diff --git a/icons/desktop/device-mobile-16.svg b/icons/desktop/device-phone-16.svg
old mode 100644
new mode 100755
similarity index 51%
rename from icons/desktop/device-mobile-16.svg
rename to icons/desktop/device-phone-16.svg
index bac1f70..91c537f
--- a/icons/desktop/device-mobile-16.svg
+++ b/icons/desktop/device-phone-16.svg
@@ -1,4 +1,4 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M12 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM9 15H7v-1h2zm3-2.5a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" fill-opacity="context-fill-opacity" d="M12 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM9 15H7v-1h2zm3-2.5a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5z"/></svg>
diff --git a/icons/desktop/webvr-16.svg b/icons/desktop/device-vr-16.svg
similarity index 100%
rename from icons/desktop/webvr-16.svg
rename to icons/desktop/device-vr-16.svg
diff --git a/photon-icons.json b/photon-icons.json
index 8df6502..6eda069 100644
--- a/photon-icons.json
+++ b/photon-icons.json
@@ -561,15 +561,15 @@
         }
       }
     },
-    { "name": "Device Mobile",
+    { "name": "Device Phone",
       "tags": [],
       "categories": ["new"],
       "source": {
         "desktop": {
-          "16": "icons/desktop/device-mobile-16.svg"
+          "16": "icons/desktop/device-phone-16.svg"
         },
         "android": {
-          "24": "icons/android/device-mobile-24.svg"
+          "24": "icons/android/device-phone-24.svg"
         }
       }
     },
@@ -582,6 +582,15 @@
         }
       }
     },
+    { "name": "Device VR",
+      "tags": [],
+      "categories": ["new"],
+      "source": {
+        "desktop": {
+          "16": "icons/desktop/device-vr-16.svg"
+        }
+      }
+    },
     { "name": "Dictionaries",
       "tags": [],
       "categories": ["extensions"],
@@ -1960,7 +1969,7 @@
           "16": "icons/desktop/tip-16.svg"
         }
       }
-    },  
+    },
     { "name": "Toggle",
       "tags": [],
       "categories": ["new"],
@@ -2222,15 +2231,6 @@
         }
       }
     },
-    { "name": "Web VR",
-      "tags": [],
-      "categories": ["new"],
-      "source": {
-        "desktop": {
-          "16": "icons/desktop/webvr-16.svg"
-        }
-      }
-    },
     { "name": "Webide",
       "tags": ["deprecated"],
       "categories": ["developer"],

From 14da0e8259cc13ad82193958e0dc5831ad23118c Mon Sep 17 00:00:00 2001
From: ariasuni <perso@hack-libre.org>
Date: Wed, 6 May 2020 02:31:02 +0200
Subject: [PATCH 2/2] Add TV icon from upstream

---
 icons/desktop/device-tv-16.svg | 6 ++++++
 photon-icons.json              | 9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 icons/desktop/device-tv-16.svg

diff --git a/icons/desktop/device-tv-16.svg b/icons/desktop/device-tv-16.svg
new file mode 100644
index 0000000..ed65b4a
--- /dev/null
+++ b/icons/desktop/device-tv-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.5 2h-13A1.5 1.5 0 0 0 0 3.5v8A1.5 1.5 0 0 0 1.5 13h3a0.5 0.5 0 0 0 0 1h7a0.5 0.5 0 0 0 0-1h3a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 14.5 2zM14 11H2V4h12z"/>
+</svg>
diff --git a/photon-icons.json b/photon-icons.json
index 6eda069..de0c095 100644
--- a/photon-icons.json
+++ b/photon-icons.json
@@ -582,6 +582,15 @@
         }
       }
     },
+    { "name": "Device TV",
+      "tags": [],
+      "categories": ["new"],
+      "source": {
+        "desktop": {
+          "16": "icons/desktop/device-tv-16.svg"
+        }
+      }
+    },
     { "name": "Device VR",
       "tags": [],
       "categories": ["new"],