diff --git a/Objective-C/advanced/APIDemo/APIDemo.xcodeproj/project.pbxproj b/Objective-C/advanced/APIDemo/APIDemo.xcodeproj/project.pbxproj
index 2ec06772..d05ecdfc 100644
--- a/Objective-C/advanced/APIDemo/APIDemo.xcodeproj/project.pbxproj
+++ b/Objective-C/advanced/APIDemo/APIDemo.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1CD352992C9CE6A600534FCC /* CustomControls.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1CD352982C9CE6A600534FCC /* CustomControls.xib */; };
 		4A96E7211B856D5000031470 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A96E7201B856D5000031470 /* main.m */; };
 		4A96E7241B856D5000031470 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A96E7231B856D5000031470 /* AppDelegate.m */; };
 		4A96E72D1B856D5000031470 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A96E72B1B856D5000031470 /* Main.storyboard */; };
@@ -32,6 +33,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		1CD352982C9CE6A600534FCC /* CustomControls.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CustomControls.xib; sourceTree = "<group>"; };
 		4A96E71B1B856D5000031470 /* APIDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = APIDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4A96E71F1B856D5000031470 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4A96E7201B856D5000031470 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -169,6 +171,7 @@
 		AEE8DA9A201BD788008792E6 /* GAMCustomVideoControls */ = {
 			isa = PBXGroup;
 			children = (
+				1CD352982C9CE6A600534FCC /* CustomControls.xib */,
 				50DC0CEA212F1C2D00424CC7 /* GAMCustomVideoControlsController.h */,
 				50DC0CEB212F1C2D00424CC7 /* GAMCustomVideoControlsController.m */,
 				AEE8DA9C201BD7A5008792E6 /* SimpleNativeAdView.h */,
@@ -243,6 +246,7 @@
 				4A96E72D1B856D5000031470 /* Main.storyboard in Resources */,
 				4A96E7321B856D5000031470 /* LaunchScreen.xib in Resources */,
 				4A96E72F1B856D5000031470 /* Images.xcassets in Resources */,
+				1CD352992C9CE6A600534FCC /* CustomControls.xib in Resources */,
 				AED1111020320CA900EA4BEE /* NativeAdView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/Main.storyboard b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/Main.storyboard
index 9509b5a3..b223ec5e 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/Main.storyboard
+++ b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="RMx-3f-FxP">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23089" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="RMx-3f-FxP">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23077"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -38,11 +38,11 @@
                                 <rect key="frame" x="0.0" y="50" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WCw-Qf-5nD" id="37f-cq-3Eg">
-                                    <rect key="frame" x="0.0" y="0.0" width="344.66666666666669" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="348.66666666666669" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Arm-wq-HPj">
-                                            <rect key="frame" x="20" y="0.0" width="316.66666666666669" height="44"/>
+                                            <rect key="frame" x="16" y="0.0" width="324.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -723,14 +723,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Child-Directed" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oVL-yk-jDA">
-                                                    <rect key="frame" x="19.999999999999993" y="12.999999999999998" width="106.33333333333333" height="19.333333333333332"/>
+                                                    <rect key="frame" x="15.999999999999993" y="12.999999999999998" width="106.33333333333333" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Child-Directed" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d1F-y3-cwZ">
-                                                    <rect key="frame" x="248.66666666666671" y="12.999999999999998" width="106.33333333333333" height="19.333333333333332"/>
+                                                    <rect key="frame" x="252.66666666666671" y="12.999999999999998" width="106.33333333333333" height="19.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -747,7 +747,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <pickerView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Td-HF-rJc">
-                                                    <rect key="frame" x="20" y="11" width="335" height="128"/>
+                                                    <rect key="frame" x="16" y="11" width="343" height="128"/>
                                                 </pickerView>
                                             </subviews>
                                             <constraints>
@@ -770,7 +770,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zKt-6V-sip">
-                                                    <rect key="frame" x="20" y="11" width="335" height="24"/>
+                                                    <rect key="frame" x="16" y="11" width="343" height="24"/>
                                                     <state key="normal" title="LOAD TARGETED AD">
                                                         <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
@@ -853,76 +853,10 @@
                                 <rect key="frame" x="0.0" y="94" width="375" height="684"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KhV-Da-txU" userLabel="Outer Content View">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="508"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="558"/>
                                         <subviews>
-                                            <view contentMode="scaleToFill" placeholderIntrinsicWidth="359" placeholderIntrinsicHeight="250" translatesAutoresizingMaskIntoConstraints="NO" id="0b4-hv-R1y" userLabel="Placeholder View">
-                                                <rect key="frame" x="62.666666666666657" y="39" width="249.99999999999997" height="150"/>
-                                                <color key="backgroundColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="250" id="bIn-ih-thL"/>
-                                                    <constraint firstAttribute="height" priority="999" constant="150" id="cT5-GI-1J7"/>
-                                                </constraints>
-                                            </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QrL-SU-9zQ" customClass="CustomControlsView">
-                                                <rect key="frame" x="0.0" y="189" width="375" height="75"/>
-                                                <subviews>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q20-hQ-DfE" userLabel="Controls Inner View">
-                                                        <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
-                                                        <subviews>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ffY-HM-4rr">
-                                                                <rect key="frame" x="78.666666666666671" y="5" width="30" height="30"/>
-                                                                <state key="normal" title="Play"/>
-                                                                <connections>
-                                                                    <action selector="playPause:" destination="QrL-SU-9zQ" eventType="touchUpInside" id="GJy-U0-To8"/>
-                                                                </connections>
-                                                            </button>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OFZ-qU-pS1">
-                                                                <rect key="frame" x="263.66666666666669" y="5" width="35" height="30"/>
-                                                                <state key="normal" title="Mute"/>
-                                                                <connections>
-                                                                    <action selector="muteUnmute:" destination="QrL-SU-9zQ" eventType="touchUpInside" id="LXU-4K-02C"/>
-                                                                </connections>
-                                                            </button>
-                                                        </subviews>
-                                                        <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
-                                                        <constraints>
-                                                            <constraint firstItem="ffY-HM-4rr" firstAttribute="centerY" secondItem="OFZ-qU-pS1" secondAttribute="centerY" id="Drc-Po-zUA"/>
-                                                            <constraint firstAttribute="height" constant="40" id="OHB-7c-f2g"/>
-                                                            <constraint firstItem="OFZ-qU-pS1" firstAttribute="centerY" secondItem="Q20-hQ-DfE" secondAttribute="centerY" id="Rqo-BU-4Lq"/>
-                                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ffY-HM-4rr" secondAttribute="trailing" constant="20" symbolic="YES" id="d9D-La-SXX"/>
-                                                            <constraint firstItem="OFZ-qU-pS1" firstAttribute="centerX" secondItem="Q20-hQ-DfE" secondAttribute="centerX" multiplier="1.5" id="iYp-R6-bdy"/>
-                                                            <constraint firstItem="ffY-HM-4rr" firstAttribute="centerX" secondItem="Q20-hQ-DfE" secondAttribute="centerX" multiplier="0.5" id="lV9-3f-viW"/>
-                                                        </constraints>
-                                                    </view>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Video Status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bjS-DM-m1K">
-                                                        <rect key="frame" x="0.0" y="40" width="375" height="30"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="30" id="6HD-7c-UnR"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="75" id="3up-SY-cYt"/>
-                                                    <constraint firstAttribute="trailing" secondItem="Q20-hQ-DfE" secondAttribute="trailing" id="MAl-xE-JdX"/>
-                                                    <constraint firstItem="Q20-hQ-DfE" firstAttribute="top" secondItem="QrL-SU-9zQ" secondAttribute="top" id="bqj-lt-S23"/>
-                                                    <constraint firstItem="Q20-hQ-DfE" firstAttribute="leading" secondItem="QrL-SU-9zQ" secondAttribute="leading" id="gyK-jE-gOV"/>
-                                                    <constraint firstItem="bjS-DM-m1K" firstAttribute="top" secondItem="Q20-hQ-DfE" secondAttribute="bottom" id="nYF-RW-SRA"/>
-                                                    <constraint firstAttribute="trailing" secondItem="bjS-DM-m1K" secondAttribute="trailing" id="qMg-Gs-soe"/>
-                                                    <constraint firstItem="bjS-DM-m1K" firstAttribute="leading" secondItem="QrL-SU-9zQ" secondAttribute="leading" id="vc2-Rh-VuK"/>
-                                                </constraints>
-                                                <connections>
-                                                    <outlet property="controlsView" destination="Q20-hQ-DfE" id="GxP-dW-zbo"/>
-                                                    <outlet property="muteButton" destination="OFZ-qU-pS1" id="4Rc-Z7-E1a"/>
-                                                    <outlet property="playButton" destination="ffY-HM-4rr" id="Y59-OK-Dg7"/>
-                                                    <outlet property="videoStatusLabel" destination="bjS-DM-m1K" id="ZIg-ni-9cG"/>
-                                                </connections>
-                                            </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uxg-43-m5m" userLabel="Inner Content View">
-                                                <rect key="frame" x="8" y="264" width="359" height="170"/>
+                                                <rect key="frame" x="8" y="314" width="359" height="170"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hX9-o0-9m8" userLabel="Divider View">
                                                         <rect key="frame" x="219" y="0.0" width="1" height="170"/>
@@ -1003,7 +937,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KyY-32-oFm">
-                                                <rect key="frame" x="8" y="444" width="359" height="33"/>
+                                                <rect key="frame" x="8" y="494" width="359" height="33"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <state key="normal" title="Refresh Ad"/>
                                                 <connections>
@@ -1011,30 +945,35 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SDK Version" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwh-PQ-Nk5">
-                                                <rect key="frame" x="140" y="487" width="95" height="21"/>
+                                                <rect key="frame" x="140" y="537" width="95" height="21"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <color key="textColor" systemColor="darkTextColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
+                                            <view contentMode="scaleToFill" placeholderIntrinsicWidth="359" placeholderIntrinsicHeight="250" translatesAutoresizingMaskIntoConstraints="NO" id="0b4-hv-R1y" userLabel="Placeholder View">
+                                                <rect key="frame" x="37.666666666666657" y="39" width="300" height="200"/>
+                                                <color key="backgroundColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="300" id="bIn-ih-thL"/>
+                                                    <constraint firstAttribute="height" priority="999" constant="200" id="cT5-GI-1J7"/>
+                                                </constraints>
+                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstItem="dwh-PQ-Nk5" firstAttribute="centerX" secondItem="KhV-Da-txU" secondAttribute="centerX" id="1Mw-wL-4rZ"/>
-                                            <constraint firstItem="QrL-SU-9zQ" firstAttribute="top" secondItem="0b4-hv-R1y" secondAttribute="bottom" id="1mq-TQ-bsI"/>
                                             <constraint firstItem="Uxg-43-m5m" firstAttribute="leading" secondItem="KhV-Da-txU" secondAttribute="leading" constant="8" id="3tj-Xp-zg9"/>
+                                            <constraint firstItem="Uxg-43-m5m" firstAttribute="top" secondItem="0b4-hv-R1y" secondAttribute="bottom" constant="75" id="EC6-OM-RiX"/>
                                             <constraint firstItem="KyY-32-oFm" firstAttribute="top" secondItem="Uxg-43-m5m" secondAttribute="bottom" constant="10" id="ESs-WR-Xjc"/>
                                             <constraint firstItem="0b4-hv-R1y" firstAttribute="centerX" secondItem="KhV-Da-txU" secondAttribute="centerX" id="ILF-xy-kJh"/>
                                             <constraint firstItem="0b4-hv-R1y" firstAttribute="top" secondItem="tZz-Mi-1lE" secondAttribute="bottom" constant="10" id="MEb-lD-FKs"/>
                                             <constraint firstAttribute="trailing" secondItem="Uxg-43-m5m" secondAttribute="trailing" constant="8" id="Mdz-mS-DK1"/>
-                                            <constraint firstItem="Uxg-43-m5m" firstAttribute="top" secondItem="QrL-SU-9zQ" secondAttribute="bottom" id="NCE-Pn-b4x"/>
                                             <constraint firstItem="dwh-PQ-Nk5" firstAttribute="top" secondItem="KyY-32-oFm" secondAttribute="bottom" constant="10" id="Ti6-dk-ZH2"/>
                                             <constraint firstAttribute="trailing" secondItem="KyY-32-oFm" secondAttribute="trailing" constant="8" id="ZgR-lV-Yyv"/>
                                             <constraint firstAttribute="bottom" secondItem="dwh-PQ-Nk5" secondAttribute="bottom" id="aDx-iH-5Mo"/>
                                             <constraint firstItem="tZz-Mi-1lE" firstAttribute="leading" secondItem="KhV-Da-txU" secondAttribute="leading" constant="8" id="fpy-3L-eOH"/>
-                                            <constraint firstAttribute="trailing" secondItem="QrL-SU-9zQ" secondAttribute="trailing" id="jl4-9M-gbO"/>
                                             <constraint firstItem="tZz-Mi-1lE" firstAttribute="top" secondItem="KhV-Da-txU" secondAttribute="top" constant="8" id="jq7-t0-AEE"/>
                                             <constraint firstItem="KyY-32-oFm" firstAttribute="leading" secondItem="KhV-Da-txU" secondAttribute="leading" constant="8" id="pcs-9x-AqH"/>
-                                            <constraint firstItem="QrL-SU-9zQ" firstAttribute="leading" secondItem="KhV-Da-txU" secondAttribute="leading" id="uen-ig-uco"/>
                                             <constraint firstAttribute="trailing" secondItem="tZz-Mi-1lE" secondAttribute="trailing" constant="8" id="xkc-Vt-fD0"/>
                                         </constraints>
                                     </view>
@@ -1058,7 +997,6 @@
                     </view>
                     <navigationItem key="navigationItem" id="0ej-ay-H2A"/>
                     <connections>
-                        <outlet property="customControlsView" destination="QrL-SU-9zQ" id="7cq-c8-0KX"/>
                         <outlet property="customNativeAdSwitch" destination="KXa-3S-aBH" id="hXp-H0-9w7"/>
                         <outlet property="placeholderView" destination="0b4-hv-R1y" id="jnZ-GV-n71"/>
                         <outlet property="refreshButton" destination="KyY-32-oFm" id="0dC-Qm-rIK"/>
@@ -1184,9 +1122,6 @@
         <systemColor name="darkTextColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
-        <systemColor name="groupTableViewBackgroundColor">
-            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/NativeAdView.xib b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/NativeAdView.xib
index 2ad6ab79..288506e1 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/NativeAdView.xib
+++ b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/NativeAdView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23089" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23077"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -40,20 +40,21 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E5w-YA-UY8">
-                    <rect key="frame" x="318" y="229" width="47" height="34"/>
+                    <rect key="frame" x="318" y="259" width="47" height="34"/>
                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                     <state key="normal" title="Install">
+                        <color key="titleColor" red="0.016804177310000001" green="0.19835099580000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ysb-of-cat">
-                    <rect key="frame" x="230" y="237.5" width="33" height="17"/>
+                    <rect key="frame" x="230" y="267.5" width="33" height="17"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" systemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Store" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hwF-UL-Q8H">
-                    <rect key="frame" x="273" y="237.5" width="35" height="17"/>
+                    <rect key="frame" x="273" y="267.5" width="35" height="17"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" systemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
@@ -68,10 +69,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="fNp-yu-K4i" customClass="GADMediaView">
-                    <rect key="frame" x="87.5" y="102" width="200" height="120"/>
+                    <rect key="frame" x="62.5" y="102" width="250" height="150"/>
                     <constraints>
-                        <constraint firstAttribute="width" priority="999" constant="200" id="e3T-fD-di4"/>
-                        <constraint firstAttribute="height" priority="999" constant="120" placeholder="YES" id="f4C-60-tvt"/>
+                        <constraint firstAttribute="width" priority="999" constant="250" id="e3T-fD-di4"/>
+                        <constraint firstAttribute="height" priority="999" constant="150" placeholder="YES" id="f4C-60-tvt"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ad" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lp1-oz-XOs">
@@ -104,13 +105,13 @@
                 <constraint firstItem="beR-eV-DX1" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="Mvs-eV-Wzb"/>
                 <constraint firstItem="Ysb-of-cat" firstAttribute="centerY" secondItem="hwF-UL-Q8H" secondAttribute="centerY" id="Rud-i8-Myz"/>
                 <constraint firstItem="fNp-yu-K4i" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="TYN-lq-3DK"/>
+                <constraint firstItem="Ysb-of-cat" firstAttribute="top" secondItem="fNp-yu-K4i" secondAttribute="bottom" constant="15.5" id="TwW-Pe-AvQ"/>
                 <constraint firstItem="fNp-yu-K4i" firstAttribute="top" secondItem="PEQ-D9-2Vv" secondAttribute="bottom" constant="5" id="V0m-hf-6NS"/>
                 <constraint firstItem="GTT-Yh-eSq" firstAttribute="centerY" secondItem="2Of-AP-0h9" secondAttribute="centerY" id="YgR-kp-age"/>
                 <constraint firstItem="hwF-UL-Q8H" firstAttribute="leading" secondItem="Ysb-of-cat" secondAttribute="trailing" constant="10" id="aLb-sm-wAb"/>
                 <constraint firstAttribute="right" relation="greaterThanOrEqual" secondItem="lp1-oz-XOs" secondAttribute="right" constant="20" symbolic="YES" id="czi-qD-IaJ"/>
                 <constraint firstAttribute="trailing" secondItem="E5w-YA-UY8" secondAttribute="trailing" constant="10" id="eNM-dN-tvx"/>
                 <constraint firstItem="E5w-YA-UY8" firstAttribute="leading" secondItem="hwF-UL-Q8H" secondAttribute="trailing" constant="10" id="f39-vH-KWq"/>
-                <constraint firstItem="Ysb-of-cat" firstAttribute="top" secondItem="fNp-yu-K4i" secondAttribute="bottom" constant="15.5" id="g05-rC-22O"/>
                 <constraint firstItem="iNa-bH-h1m" firstAttribute="leading" secondItem="PEQ-D9-2Vv" secondAttribute="leading" id="mof-5F-8vM"/>
                 <constraint firstItem="E5w-YA-UY8" firstAttribute="centerY" secondItem="hwF-UL-Q8H" secondAttribute="centerY" id="rNj-VY-YrO"/>
                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="E5w-YA-UY8" secondAttribute="bottom" constant="20" symbolic="YES" id="uEI-XT-igi"/>
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/SimpleNativeAdView.xib b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/SimpleNativeAdView.xib
index 7855bb4a..c3bc8b21 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/SimpleNativeAdView.xib
+++ b/Objective-C/advanced/APIDemo/APIDemo/Base.lproj/SimpleNativeAdView.xib
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23089" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23077"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,21 +16,21 @@
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="24" text="Headline" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EJ7-Y2-nrO">
                     <rect key="frame" x="5" y="5" width="365" height="24"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" systemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hoj-tc-K51">
-                    <rect key="frame" x="101.5" y="39" width="171" height="100"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hoj-tc-K51" customClass="NativeAdView" customModule="APIDemo" customModuleProvider="target">
+                    <rect key="frame" x="84.5" y="39" width="206" height="120"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="100" id="Z4E-2z-qz3"/>
+                        <constraint firstAttribute="height" constant="120" id="Z4E-2z-qz3"/>
                         <constraint firstAttribute="width" secondItem="hoj-tc-K51" secondAttribute="height" multiplier="12:7" id="fAh-as-Khc"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Caption" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Opb-BT-xiP">
-                    <rect key="frame" x="5" y="149" width="365" height="17"/>
+                    <rect key="frame" x="5" y="169" width="365" height="17"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" systemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
@@ -49,11 +46,16 @@
                 <constraint firstAttribute="trailing" secondItem="Opb-BT-xiP" secondAttribute="trailing" constant="5" id="WYZ-v6-Hph"/>
             </constraints>
             <connections>
-                <outlet property="captionView" destination="Opb-BT-xiP" id="hSg-rU-Z7U"/>
-                <outlet property="headlineView" destination="EJ7-Y2-nrO" id="BKi-kL-8EA"/>
-                <outlet property="mainPlaceholder" destination="hoj-tc-K51" id="pmf-nl-x4R"/>
+                <outlet property="captionView" destination="Opb-BT-xiP" id="JQy-dl-IMG"/>
+                <outlet property="headlineView" destination="EJ7-Y2-nrO" id="dDU-Lq-0zL"/>
+                <outlet property="mainPlaceholder" destination="hoj-tc-K51" id="Rho-nb-5UT"/>
             </connections>
-            <point key="canvasLocation" x="13" y="27"/>
+            <point key="canvasLocation" x="20.800000000000001" y="24.287856071964018"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Objective-C/advanced/APIDemo/APIDemo/CustomControls.xib b/Objective-C/advanced/APIDemo/APIDemo/CustomControls.xib
new file mode 100644
index 00000000..a1b316c7
--- /dev/null
+++ b/Objective-C/advanced/APIDemo/APIDemo/CustomControls.xib
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23089" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23077"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clipsSubviews="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="63" placeholderIntrinsicHeight="34" translatesAutoresizingMaskIntoConstraints="NO" id="hcJ-K0-VFO" customClass="CustomControlsView">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <subviews>
+                <view contentMode="scaleToFill" fixedFrame="YES" placeholderIntrinsicWidth="63" placeholderIntrinsicHeight="34" translatesAutoresizingMaskIntoConstraints="NO" id="pao-J4-Vnr" userLabel="Controls Inner View">
+                    <rect key="frame" x="0.0" y="0.0" width="63" height="34"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleAspectFit" fixedFrame="YES" preservesSuperviewLayoutMargins="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="45d-iM-MBo">
+                            <rect key="frame" x="5" y="5" width="24" height="24"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration">
+                                <accessibilityTraits key="traits" button="YES" image="YES"/>
+                            </accessibility>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" image="video_pause"/>
+                            <connections>
+                                <action selector="playPause:" destination="hcJ-K0-VFO" eventType="touchUpInside" id="0CB-eL-LvM"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleAspectFit" fixedFrame="YES" preservesSuperviewLayoutMargins="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EeV-x8-pU7">
+                            <rect key="frame" x="34" y="5" width="24" height="24"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration">
+                                <accessibilityTraits key="traits" button="YES" image="YES"/>
+                            </accessibility>
+                            <state key="normal" image="video_mute"/>
+                            <connections>
+                                <action selector="muteUnmute:" destination="hcJ-K0-VFO" eventType="touchUpInside" id="WHq-Bk-O5c"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.79650297619047616" colorSpace="custom" customColorSpace="sRGB"/>
+                </view>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="height" constant="34" id="UmE-7W-Sbr"/>
+                <constraint firstAttribute="width" constant="63" id="nll-Ck-Ktr"/>
+            </constraints>
+            <edgeInsets key="layoutMargins" top="8" left="8" bottom="8" right="8"/>
+            <connections>
+                <outlet property="controlsView" destination="pao-J4-Vnr" id="u9k-TG-zXG"/>
+                <outlet property="muteButton" destination="EeV-x8-pU7" id="3ms-b3-3dN"/>
+                <outlet property="playButton" destination="45d-iM-MBo" id="3aL-mq-Onh"/>
+            </connections>
+            <point key="canvasLocation" x="-180" y="-635"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="video_mute" width="96" height="96"/>
+        <image name="video_pause" width="96" height="96"/>
+    </resources>
+</document>
diff --git a/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.h b/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.h
index 9d3ed031..b7c99c03 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.h
+++ b/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.h
@@ -1,29 +1,25 @@
+// Copyright 2024 Google LLC
 //
-//  Copyright (C) 2018 Google, Inc.
-//
-//  CustomControlsView.h
-//  APIDemo
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 #import <GoogleMobileAds/GoogleMobileAds.h>
+#import <UIKit/UIKit.h>
 
 /// A custom view which encapsulates the display of video controller related information and also
 /// custom video controls. Set the video options when requesting an ad, then set the video
 /// controller when the ad is received.
-@interface CustomControlsView : UIView<GADVideoControllerDelegate>
+@interface CustomControlsView : UIView <GADVideoControllerDelegate>
 
 /// Resets the controls status, and lets the controls view know the initial mute state.
 - (void)resetWithStartMuted:(BOOL)startMuted;
diff --git a/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.m b/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.m
index 0d5e8387..3330d230 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.m
+++ b/Objective-C/advanced/APIDemo/APIDemo/CustomControlsView.m
@@ -1,25 +1,20 @@
+// Copyright 2024 Google LLC
 //
-//  Copyright (C) 2018 Google, Inc.
-//
-//  CustomControlsView.m
-//  APIDemo
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #import "CustomControlsView.h"
 
 @interface CustomControlsView ()
-
 /// Boolean reflecting current playback state for UI.
 @property(nonatomic) BOOL playing;
 
@@ -35,27 +30,23 @@ @interface CustomControlsView ()
 /// The mute button.
 @property(nonatomic, weak) IBOutlet UIButton *muteButton;
 
-/// The label showing the video status for the current video controller.
-@property(nonatomic, weak) IBOutlet UILabel *videoStatusLabel;
-
 @end
 
 @implementation CustomControlsView
 
 - (void)resetWithStartMuted:(BOOL)startMuted {
-  self.muted = startMuted;
   self.playing = NO;
   self.controlsView.hidden = YES;
-  self.videoStatusLabel.text = @"";
+  self.muted = startMuted;
+  UIImage *image =
+      startMuted ? [UIImage imageNamed:@"video_mute"] : [UIImage imageNamed:@"video_unmute"];
+  [self.muteButton setImage:image forState:UIControlStateNormal];
 }
 
 - (void)setMediaContent:(GADMediaContent *)mediaContent {
   _mediaContent = mediaContent;
   self.controlsView.hidden = !_mediaContent.videoController.customControlsEnabled;
   _mediaContent.videoController.delegate = self;
-  self.videoStatusLabel.text = _mediaContent.hasVideoContent
-                                   ? @"Ad contains video content."
-                                   : @"Ad does not contain video content.";
 }
 
 - (IBAction)playPause:(id)sender {
@@ -72,17 +63,19 @@ - (IBAction)muteUnmute:(id)sender {
 }
 
 - (void)setPlaying:(BOOL)playing {
-  if (playing != self.playing) {
-    NSString *title = playing ? @"Pause" : @"Play";
-    [self.playButton setTitle:title forState:UIControlStateNormal];
+  if ((!playing && self.playing) || (playing && !self.playing)) {
+    UIImage *image =
+        playing ? [UIImage imageNamed:@"video_pause"] : [UIImage imageNamed:@"video_play"];
+    [self.playButton setImage:image forState:UIControlStateNormal];
   }
   _playing = playing;
 }
 
 - (void)setMuted:(BOOL)muted {
-  if (muted != self.muted) {
-    NSString *title = muted ? @"Unmute" : @"Mute";
-    [self.muteButton setTitle:title forState:UIControlStateNormal];
+  if ((!muted && self.muted) || (muted && !self.muted)) {
+    UIImage *image =
+        muted ? [UIImage imageNamed:@"video_mute"] : [UIImage imageNamed:@"video_unmute"];
+    [self.muteButton setImage:image forState:UIControlStateNormal];
   }
   _muted = muted;
 }
@@ -90,31 +83,26 @@ - (void)setMuted:(BOOL)muted {
 #pragma mark - GADVideoControllerDelegate
 
 - (void)videoControllerDidPlayVideo:(GADVideoController *)videoController {
-  self.videoStatusLabel.text = @"Video did play.";
   NSLog(@"%@", @(__PRETTY_FUNCTION__));
   self.playing = YES;
 }
 
 - (void)videoControllerDidPauseVideo:(GADVideoController *)videoController {
-  self.videoStatusLabel.text = @"Video did pause.";
   NSLog(@"%@", @(__PRETTY_FUNCTION__));
   self.playing = NO;
 }
 
 - (void)videoControllerDidMuteVideo:(GADVideoController *)videoController {
-  self.videoStatusLabel.text = @"Video has muted.";
   NSLog(@"%@", @(__PRETTY_FUNCTION__));
   self.muted = YES;
 }
 
 - (void)videoControllerDidUnmuteVideo:(GADVideoController *)videoController {
-  self.videoStatusLabel.text = @"Video has unmuted.";
   NSLog(@"%@", @(__PRETTY_FUNCTION__));
   self.muted = NO;
 }
 
 - (void)videoControllerDidEndVideoPlayback:(GADVideoController *)videoController {
-  self.videoStatusLabel.text = @"Video playback has ended.";
   NSLog(@"%@", @(__PRETTY_FUNCTION__));
   self.playing = NO;
 }
diff --git a/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.h b/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.h
index 3d09d2a8..4f626092 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.h
+++ b/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.h
@@ -17,11 +17,11 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>
 #import <GoogleMobileAds/GoogleMobileAds.h>
+#import <UIKit/UIKit.h>
 
-#import "SimpleNativeAdView.h"
 #import "CustomControlsView.h"
+#import "SimpleNativeAdView.h"
 
 @interface GAMCustomVideoControlsController : UIViewController
 
@@ -40,9 +40,6 @@
 /// Switch to custom native ads.
 @property(nonatomic, weak) IBOutlet UISwitch *customNativeAdSwitch;
 
-/// View containing information about video and custom controls.
-@property(nonatomic, weak) IBOutlet CustomControlsView *customControlsView;
-
 /// Refresh the native ad.
 @property(nonatomic, weak) IBOutlet UIButton *refreshButton;
 
diff --git a/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.m b/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.m
index b61423d4..a42ad2d3 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.m
+++ b/Objective-C/advanced/APIDemo/APIDemo/GAMCustomVideoControlsController.m
@@ -65,7 +65,6 @@ - (IBAction)refreshAd:(id)sender {
                                      rootViewController:self
                                                 adTypes:adTypes
                                                 options:@[ videoOptions ]];
-  [self.customControlsView resetWithStartMuted:videoOptions.startMuted];
   self.adLoader.delegate = self;
   [self.adLoader loadRequest:[GAMRequest request]];
 }
@@ -113,8 +112,6 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader
 
   // Populate the custom native ad view with its assets.
   [simpleNativeAdView populateWithCustomNativeAd:customNativeAd];
-
-  self.customControlsView.mediaContent = customNativeAd.mediaContent;
 }
 
 - (nonnull NSArray<NSString *> *)customNativeAdFormatIDsForAdLoader:
@@ -152,8 +149,6 @@ - (void)adLoader:(GADAdLoader *)adLoader didReceiveNativeAd:(GADNativeAd *)nativ
     heightConstraint.active = YES;
   }
 
-  self.customControlsView.mediaContent = nativeAd.mediaContent;
-
   // These assets are not guaranteed to be present. Check that they are before
   // showing or hiding them.
   ((UILabel *)nativeAdView.bodyView).text = nativeAd.body;
@@ -186,6 +181,30 @@ - (void)adLoader:(GADAdLoader *)adLoader didReceiveNativeAd:(GADNativeAd *)nativ
   // required to make the ad clickable.
   // Note: this should always be done after populating the ad views.
   nativeAdView.nativeAd = nativeAd;
+
+  // [START set_custom_video_controls]
+  // Add custom video controls to replace default video controls.
+  if (nativeAd.mediaContent.hasVideoContent) {
+    GADMediaView *mediaView = nativeAdView.mediaView;
+    if (mediaView) {
+      if (nativeAd.mediaContent.videoController.customControlsEnabled) {
+        CustomControlsView *customControlsView =
+            [[[NSBundle mainBundle] loadNibNamed:@"CustomControls" owner:nil
+                                         options:nil] firstObject];
+        if ([customControlsView isKindOfClass:[CustomControlsView class]]) {
+          [customControlsView resetWithStartMuted:self.startMutedSwitch.isOn];
+          customControlsView.mediaContent = mediaView.mediaContent;
+          [mediaView addSubview:customControlsView];
+          [NSLayoutConstraint activateConstraints:@[
+            [customControlsView.leadingAnchor constraintEqualToAnchor:mediaView.leadingAnchor],
+            [customControlsView.bottomAnchor constraintEqualToAnchor:mediaView.bottomAnchor],
+          ]];
+          [mediaView bringSubviewToFront:customControlsView];
+        }
+      }
+    }
+  }
+  // [END set_custom_video_controls]
 }
 
 /// Gets an image representing the number of stars. Returns nil if rating is less than 3.5 stars.
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/Contents.json b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/Contents.json
index da4a164c..73c00596 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/Contents.json
+++ b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/Contents.json b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/Contents.json
new file mode 100644
index 00000000..4403d6ee
--- /dev/null
+++ b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "video_mute.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/video_mute.png b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/video_mute.png
new file mode 100644
index 00000000..53726693
Binary files /dev/null and b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_mute.imageset/video_mute.png differ
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/Contents.json b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/Contents.json
new file mode 100644
index 00000000..d429a1bc
--- /dev/null
+++ b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "video_pause.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/video_pause.png b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/video_pause.png
new file mode 100644
index 00000000..c19e51ab
Binary files /dev/null and b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_pause.imageset/video_pause.png differ
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/Contents.json b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/Contents.json
new file mode 100644
index 00000000..cde409e1
--- /dev/null
+++ b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "video_play.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/video_play.png b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/video_play.png
new file mode 100644
index 00000000..51ef616d
Binary files /dev/null and b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_play.imageset/video_play.png differ
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/Contents.json b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/Contents.json
new file mode 100644
index 00000000..0f3697b5
--- /dev/null
+++ b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "video_unmute.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/video_unmute.png b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/video_unmute.png
new file mode 100644
index 00000000..e4fc961b
Binary files /dev/null and b/Objective-C/advanced/APIDemo/APIDemo/Images.xcassets/video_unmute.imageset/video_unmute.png differ
diff --git a/Objective-C/advanced/APIDemo/APIDemo/SimpleNativeAdView.m b/Objective-C/advanced/APIDemo/APIDemo/SimpleNativeAdView.m
index a332570a..4635a42f 100644
--- a/Objective-C/advanced/APIDemo/APIDemo/SimpleNativeAdView.m
+++ b/Objective-C/advanced/APIDemo/APIDemo/SimpleNativeAdView.m
@@ -18,6 +18,8 @@
 
 #import "SimpleNativeAdView.h"
 
+#import "GAMCustomVideoControlsController.h"
+
 /// Headline asset key.
 static NSString *const SimpleNativeAdViewHeadlineKey = @"Headline";
 
@@ -85,6 +87,24 @@ - (void)populateWithCustomNativeAd:(GADCustomNativeAd *)customNativeAd {
     GADMediaView *mediaView = [[GADMediaView alloc] init];
     mediaView.mediaContent = customNativeAd.mediaContent;
     mainView = mediaView;
+    // [START gam_set_custom_video_controls]
+    // Add custom video controls to replace default video controls.
+    if (customNativeAd.mediaContent.videoController.customControlsEnabled) {
+      CustomControlsView *customControlsView =
+          [[[NSBundle mainBundle] loadNibNamed:@"CustomControls" owner:nil
+                                       options:nil] firstObject];
+      if ([customControlsView isKindOfClass:[CustomControlsView class]]) {
+        customControlsView.mediaContent = customNativeAd.mediaContent;
+        [mediaView addSubview:customControlsView];
+
+        [NSLayoutConstraint activateConstraints:@[
+          [customControlsView.leadingAnchor constraintEqualToAnchor:mediaView.leadingAnchor],
+          [customControlsView.bottomAnchor constraintEqualToAnchor:mediaView.bottomAnchor],
+        ]];
+        [mediaView bringSubviewToFront:customControlsView];
+      }
+    }
+    // [END gam_set_custom_video_controls]
   } else {
     UIImage *image = [customNativeAd imageForKey:SimpleNativeAdViewMainImageKey].image;
     mainView = [[UIImageView alloc] initWithImage:image];