Update integrations icon.

Riot/Assets/Base.lproj/Main.storyboard

@@ -38,7 +38,7 @@
                             <barButtonItem image="search_icon" id="wyR-qv-IxC" userLabel="Menu Bar Button Item">
                                 <inset key="imageInsets" minX="-5" minY="0.0" maxX="5" maxY="0.0"/>
                             </barButtonItem>
-                            <barButtonItem image="apps-icon" id="cal-D0-6Fw">
+                            <barButtonItem image="integrations_icon" id="cal-D0-6Fw">
                                 <inset key="imageInsets" minX="10" minY="0.0" maxX="-10" maxY="0.0"/>
                             </barButtonItem>
                         </rightBarButtonItems>
@@ -597,9 +597,9 @@
         <segue reference="cUw-vU-gJq"/>
     </inferredMetricsTieBreakers>
     <resources>
-        <image name="apps-icon" width="24" height="24"/>
+        <image name="integrations_icon" width="24" height="24"/>
         <image name="logo" width="120" height="101"/>
-        <image name="search_icon" width="22" height="22"/>
+        <image name="search_icon" width="24" height="24"/>
         <image name="settings_icon" width="24" height="24"/>
         <image name="tab_favourites" width="24" height="24"/>
         <image name="tab_groups" width="24" height="24"/>

Riot/Assets/Images.xcassets/Common/admin_icon.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Room/apps-icon.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "integrations_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "integrations_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "integrations_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Generated/Images.swift

@@ -27,9 +27,8 @@ internal enum Asset {
     internal static let callSpeakerOnIcon = ImageAsset(name: "call_speaker_on_icon")
     internal static let callVideoMuteOffIcon = ImageAsset(name: "call_video_mute_off_icon")
     internal static let callVideoMuteOnIcon = ImageAsset(name: "call_video_mute_on_icon")
+    internal static let callkitIcon = ImageAsset(name: "callkit_icon")
     internal static let cameraSwitch = ImageAsset(name: "camera_switch")
-    internal static let riotIconCallkit = ImageAsset(name: "riot_icon_callkit")
-    internal static let adminIcon = ImageAsset(name: "admin_icon")
     internal static let backIcon = ImageAsset(name: "back_icon")
     internal static let camera = ImageAsset(name: "camera")
     internal static let chevron = ImageAsset(name: "chevron")
@@ -89,6 +88,7 @@ internal enum Asset {
     internal static let appsIcon = ImageAsset(name: "apps-icon")
     internal static let detailsIcon = ImageAsset(name: "details_icon")
     internal static let editIcon = ImageAsset(name: "edit_icon")
+    internal static let integrationsIcon = ImageAsset(name: "integrations_icon")
     internal static let jumpToUnread = ImageAsset(name: "jump_to_unread")
     internal static let mainAliasIcon = ImageAsset(name: "main_alias_icon")
     internal static let membersListIcon = ImageAsset(name: "members_list_icon")

Riot/Modules/Room/RoomViewController.m

@@ -1488,7 +1488,7 @@
                 else
                 {
                     // Reset original icon
-                    self.navigationItem.rightBarButtonItems[1].image = [UIImage imageNamed:@"apps-icon"];
+                    self.navigationItem.rightBarButtonItems[1].image = [UIImage imageNamed:@"integrations_icon"];
                     self.navigationItem.rightBarButtonItems[1].accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_integrations", @"Vector", nil);
                 }