diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec
index 7832e83cb..53515cb58 100644
--- a/iOS/FlipperKit.podspec
+++ b/iOS/FlipperKit.podspec
@@ -70,7 +70,7 @@ Pod::Spec.new do |spec|
                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h',
                              'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h',
                              'iOS/FBDefines/FBMacros.h',
-                             'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h'
+                             'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h'
     header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\""
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                              "DEFINES_MODULE" => "YES",
diff --git a/iOS/FlipperKit/FlipperDiagnosticsViewController.h b/iOS/FlipperKit/FlipperDiagnosticsViewController.h
index cc11595fe..6fb8db3f5 100644
--- a/iOS/FlipperKit/FlipperDiagnosticsViewController.h
+++ b/iOS/FlipperKit/FlipperDiagnosticsViewController.h
@@ -14,7 +14,7 @@
 @property (strong, nonatomic) NSArray<NSDictionary *> *elements;
 @end
 
-@interface FlipperDiagnosticsViewController : UIViewController <FlipperStateUpdateListener>
+@interface FlipperDiagnosticsViewController : UIViewController<FlipperStateUpdateListener>
 @property(strong, nonatomic) StateTableDataSource *tableDataSource;
 @property(strong, nonatomic) UILabel *stateLabel;
 @property(strong, nonatomic) UITableView *stateTable;
diff --git a/iOS/Sample/MainStoryBoard.storyboard b/iOS/Sample/MainStoryBoard.storyboard
index d69963614..e6d0b17e7 100644
--- a/iOS/Sample/MainStoryBoard.storyboard
+++ b/iOS/Sample/MainStoryBoard.storyboard
@@ -194,6 +194,19 @@
                                     <action selector="tappedComponentKitLayout:" destination="2r2-64-LPh" eventType="touchUpInside" id="amo-e0-rJv"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EOQ-ZH-neu">
+                                <rect key="frame" x="0.0" y="292" width="375" height="60"/>
+                                <color key="backgroundColor" red="0.89411764709999997" green="0.87450980389999999" blue="0.92941176469999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="60" id="32l-Gv-9l5"/>
+                                </constraints>
+                                <state key="normal" title="Diagnostic Screen">
+                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="tappedDiagnosticScreen:" destination="2r2-64-LPh" eventType="touchUpInside" id="5ut-rC-ctB"/>
+                                </connections>
+                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U2A-FV-duk">
                                 <rect key="frame" x="0.0" y="224" width="375" height="60"/>
                                 <color key="backgroundColor" red="0.89411764709999997" green="0.87450980389999999" blue="0.92941176469999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -217,14 +230,17 @@
                             <constraint firstItem="R0E-21-TJB" firstAttribute="top" secondItem="fhd-5r-dZW" secondAttribute="top" id="4Og-b3-TDg"/>
                             <constraint firstItem="R0E-21-TJB" firstAttribute="leading" secondItem="fhd-5r-dZW" secondAttribute="leading" id="7mG-cL-FY7"/>
                             <constraint firstItem="xh0-Q4-60g" firstAttribute="leading" secondItem="fhd-5r-dZW" secondAttribute="leading" id="DPX-l5-Rca"/>
+                            <constraint firstItem="EOQ-ZH-neu" firstAttribute="trailing" secondItem="fhd-5r-dZW" secondAttribute="trailing" id="FfZ-R1-561"/>
                             <constraint firstItem="B57-dd-H6T" firstAttribute="leading" secondItem="fhd-5r-dZW" secondAttribute="leading" id="Hhd-in-vfk"/>
                             <constraint firstItem="U2A-FV-duk" firstAttribute="top" secondItem="wdV-rw-8hy" secondAttribute="bottom" constant="8" id="N7B-ib-na4"/>
                             <constraint firstItem="fhd-5r-dZW" firstAttribute="trailing" secondItem="B57-dd-H6T" secondAttribute="trailing" id="ODW-CJ-ean"/>
                             <constraint firstItem="fhd-5r-dZW" firstAttribute="trailing" secondItem="R0E-21-TJB" secondAttribute="trailing" id="QyG-ez-XwS"/>
+                            <constraint firstItem="EOQ-ZH-neu" firstAttribute="leading" secondItem="fhd-5r-dZW" secondAttribute="leading" id="XQN-cm-RsS"/>
                             <constraint firstItem="wdV-rw-8hy" firstAttribute="leading" secondItem="xh0-Q4-60g" secondAttribute="leading" id="ebs-Zh-KRL"/>
                             <constraint firstItem="wdV-rw-8hy" firstAttribute="top" secondItem="xh0-Q4-60g" secondAttribute="bottom" constant="8" id="g0a-Kf-scc"/>
                             <constraint firstItem="U2A-FV-duk" firstAttribute="trailing" secondItem="fhd-5r-dZW" secondAttribute="trailing" id="kCq-Gy-Opv"/>
                             <constraint firstItem="fhd-5r-dZW" firstAttribute="bottom" secondItem="B57-dd-H6T" secondAttribute="bottom" id="kh1-ra-tzR"/>
+                            <constraint firstItem="EOQ-ZH-neu" firstAttribute="top" secondItem="U2A-FV-duk" secondAttribute="bottom" constant="8" id="t6G-HJ-u4x"/>
                             <constraint firstItem="B57-dd-H6T" firstAttribute="top" secondItem="fhd-5r-dZW" secondAttribute="top" id="vGA-oo-EGc"/>
                             <constraint firstItem="U2A-FV-duk" firstAttribute="leading" secondItem="fhd-5r-dZW" secondAttribute="leading" id="zaZ-Bn-fhD"/>
                         </constraints>
@@ -243,9 +259,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sonarpattern" translatesAutoresizingMaskIntoConstraints="NO" id="ytS-7A-bty">
-                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
-                            </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WSh-CB-RQ8">
                                 <rect key="frame" x="40" y="257.5" width="295" height="152"/>
                                 <subviews>
@@ -306,6 +319,9 @@
                                     <constraint firstItem="Fel-3h-2Ts" firstAttribute="top" secondItem="cp1-5I-XfA" secondAttribute="bottom" constant="8" id="sAQ-IL-GiU"/>
                                 </constraints>
                             </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sonarpattern" translatesAutoresizingMaskIntoConstraints="NO" id="ytS-7A-bty">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
diff --git a/iOS/Sample/MainViewController.m b/iOS/Sample/MainViewController.mm
similarity index 86%
rename from iOS/Sample/MainViewController.m
rename to iOS/Sample/MainViewController.mm
index 2db0fe6f7..95b7fdf2e 100644
--- a/iOS/Sample/MainViewController.m
+++ b/iOS/Sample/MainViewController.mm
@@ -12,6 +12,7 @@
 #import "RootViewController.h"
 #import "UserDefaultsViewController.h"
 #import "CommunicationDemoViewController.h"
+#import <FlipperKit/FlipperDiagnosticsViewController.h>
 
 @interface MainViewController ()
 
@@ -23,6 +24,10 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 }
+- (IBAction)tappedDiagnosticScreen:(UIButton *)sender {
+    FlipperDiagnosticsViewController *controller = [[FlipperDiagnosticsViewController alloc] init];
+    [self.navigationController pushViewController:controller animated:true];
+}
 
 - (IBAction)tappedComponentKitLayout:(UIButton *)sender {
   RootViewController *rootViewController = [RootViewController new];
diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj
index b8beca34e..54e72fb11 100644
--- a/iOS/Sample/Sample.xcodeproj/project.pbxproj
+++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj
@@ -12,7 +12,7 @@
 		53B4A36B217E2B6200B36A53 /* CommunicationDemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53B4A36A217E2B6200B36A53 /* CommunicationDemoViewController.mm */; };
 		53D59DB320ABA18400207065 /* NetworkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAA20ABA18300207065 /* NetworkViewController.m */; };
 		53D59DB420ABA18400207065 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAB20ABA18300207065 /* AppDelegate.mm */; };
-		53D59DB520ABA18400207065 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAD20ABA18300207065 /* MainViewController.m */; };
+		53D59DB520ABA18400207065 /* MainViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAD20ABA18300207065 /* MainViewController.mm */; };
 		53D59DB620ABA18400207065 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAF20ABA18300207065 /* RootViewController.mm */; };
 		53D59DB720ABA18400207065 /* MainStoryBoard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53D59DB020ABA18400207065 /* MainStoryBoard.storyboard */; };
 		53D59DB820ABA18400207065 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 53D59DB120ABA18400207065 /* Icons.xcassets */; };
@@ -28,7 +28,7 @@
 		53D59DAA20ABA18300207065 /* NetworkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkViewController.m; sourceTree = SOURCE_ROOT; };
 		53D59DAB20ABA18300207065 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = SOURCE_ROOT; };
 		53D59DAC20ABA18300207065 /* NetworkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkViewController.h; sourceTree = SOURCE_ROOT; };
-		53D59DAD20ABA18300207065 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = SOURCE_ROOT; };
+		53D59DAD20ABA18300207065 /* MainViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainViewController.mm; sourceTree = SOURCE_ROOT; };
 		53D59DAE20ABA18300207065 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = SOURCE_ROOT; };
 		53D59DAF20ABA18300207065 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = SOURCE_ROOT; };
 		53D59DB020ABA18400207065 /* MainStoryBoard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryBoard.storyboard; sourceTree = SOURCE_ROOT; };
@@ -63,7 +63,7 @@
 				53D59DB120ABA18400207065 /* Icons.xcassets */,
 				53D59DB020ABA18400207065 /* MainStoryBoard.storyboard */,
 				53D59DB220ABA18400207065 /* MainViewController.h */,
-				53D59DAD20ABA18300207065 /* MainViewController.m */,
+				53D59DAD20ABA18300207065 /* MainViewController.mm */,
 				53D59DAC20ABA18300207065 /* NetworkViewController.h */,
 				53D59DAA20ABA18300207065 /* NetworkViewController.m */,
 				4E10233F216AD7B400160734 /* UserDefaultsViewController.h */,
@@ -208,7 +208,7 @@
 				53D59DB320ABA18400207065 /* NetworkViewController.m in Sources */,
 				53D59DB420ABA18400207065 /* AppDelegate.mm in Sources */,
 				53B4A36B217E2B6200B36A53 /* CommunicationDemoViewController.mm in Sources */,
-				53D59DB520ABA18400207065 /* MainViewController.m in Sources */,
+				53D59DB520ABA18400207065 /* MainViewController.mm in Sources */,
 				53D59DB620ABA18400207065 /* RootViewController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;