diff --git a/Stepic/Images.xcassets/New placeholders/new-empty-noconnection.imageset/new-empty-noconnection.pdf b/Stepic/Images.xcassets/New placeholders/new-empty-noconnection.imageset/new-empty-noconnection.pdf
index 6499247c40..e08483bbe6 100644
Binary files a/Stepic/Images.xcassets/New placeholders/new-empty-noconnection.imageset/new-empty-noconnection.pdf and b/Stepic/Images.xcassets/New placeholders/new-empty-noconnection.imageset/new-empty-noconnection.pdf differ
diff --git a/Stepic/StepikPlaceholderStyle+Placeholders.swift b/Stepic/StepikPlaceholderStyle+Placeholders.swift
index 1a3744ebb0..765567070e 100644
--- a/Stepic/StepikPlaceholderStyle+Placeholders.swift
+++ b/Stepic/StepikPlaceholderStyle+Placeholders.swift
@@ -14,7 +14,7 @@ extension StepikPlaceholder.Style {
                                           text: NSLocalizedString("PlaceholderEmptyText", comment: ""),
                                           buttonTitle: NSLocalizedString("PlaceholderEmptyButton", comment: ""))
     static let noConnection = StepikPlaceholderStyle(id: "noConnection",
-                                          image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-noconnection"), scale: 0.35),
+                                          image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-noconnection"), scale: 0.49),
                                           text: NSLocalizedString("PlaceholderNoConnectionText", comment: ""),
                                           buttonTitle: NSLocalizedString("PlaceholderNoConnectionButton", comment: ""))
     static let emptyDownloads = StepikPlaceholderStyle(id: "emptyDownloads",
@@ -28,7 +28,7 @@ extension StepikPlaceholder.Style {
     static let emptyNotifications = StepikPlaceholderStyle(id: "emptyNotifications",
                                           image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-notifications"), scale: 0.48),
                                           text: NSLocalizedString("PlaceholderEmptyNotificationsText", comment: ""),
-                                          buttonTitle: NSLocalizedString("PlaceholderEmptyNotificationsButton", comment: ""))
+                                          buttonTitle: nil)
     static let emptyNotificationsLoading = StepikPlaceholderStyle(id: "emptyNotificationsLoading",
                                           image: PlaceholderImage(image: #imageLiteral(resourceName: "new-empty-notifications"), scale: 0.48),
                                           text: NSLocalizedString("Refreshing", comment: ""),
diff --git a/Stepic/StepikPlaceholderView.swift b/Stepic/StepikPlaceholderView.swift
index 11080d504a..167342949d 100644
--- a/Stepic/StepikPlaceholderView.swift
+++ b/Stepic/StepikPlaceholderView.swift
@@ -63,7 +63,7 @@ class StepikPlaceholderView: NibInitializableView {
         actionButton.layer.borderWidth = 0.5
         actionButton.layer.borderColor = UIColor(red: 204 / 255, green: 204 / 255, blue: 204 / 255, alpha: 1.0).cgColor
 
-        actionButton.contentEdgeInsets = UIEdgeInsets(top: 14.0, left: 25.0, bottom: 14.0, right: 25.0)
+        actionButton.contentEdgeInsets = UIEdgeInsets(top: 12.0, left: 23.0, bottom: 12.0, right: 23.0)
         actionButton.setTitleColor(UIColor(red: 83 / 255, green: 83 / 255, blue: 102 / 255, alpha: 1.0), for: .normal)
     }
 
@@ -111,29 +111,43 @@ class StepikPlaceholderView: NibInitializableView {
         if isVertical {
             stackView.axis = .vertical
             stackView.distribution = .equalCentering
+            stackView.alignment = .fill
         } else {
             stackView.axis = .horizontal
             stackView.distribution = .fillEqually
+            stackView.alignment = .center
+        }
+    }
+
+    override func updateConstraints() {
+        super.updateConstraints()
+        if let currentPlaceholder = self.currentPlaceholder {
+            self.rebuildConstraints(for: currentPlaceholder)
         }
     }
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        DispatchQueue.main.async { [weak self] in
-            if let currentPlaceholder = self?.currentPlaceholder {
-                self?.rebuildConstraints(for: currentPlaceholder)
-            }
-        }
+        setNeedsUpdateConstraints()
+        updateConstraintsIfNeeded()
     }
 
     func set(placeholder: StepikPlaceholderStyle) {
-        currentPlaceholder = placeholder
-
         imageView.image = placeholder.image?.image
 
         textLabel.text = placeholder.text
-        actionButton.setTitle(placeholder.buttonTitle, for: .normal)
 
+        // If it's first load prevent button title change animation
+        if currentPlaceholder == nil {
+            UIView.performWithoutAnimation {
+                self.actionButton.setTitle(placeholder.buttonTitle, for: .normal)
+                self.actionButton.layoutIfNeeded()
+            }
+        } else {
+            actionButton.setTitle(placeholder.buttonTitle, for: .normal)
+        }
+
+        currentPlaceholder = placeholder
         rebuildConstraints(for: placeholder)
     }
 }
diff --git a/Stepic/StepikPlaceholderView.xib b/Stepic/StepikPlaceholderView.xib
index dab64f3cfb..33f3f69ef2 100644
--- a/Stepic/StepikPlaceholderView.xib
+++ b/Stepic/StepikPlaceholderView.xib
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="17B1003" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StepikPlaceholderView" customModule="Stepic" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StepikPlaceholderView" customModule="Adaptive_1838" customModuleProvider="target">
             <connections>
                 <outlet property="actionButton" destination="dXG-an-amT" id="M4c-Xj-O9t"/>
                 <outlet property="actionsStackView" destination="v82-J3-qtd" id="gNk-qG-vR0"/>
@@ -26,14 +25,14 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="460"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="XS1-Gz-tve">
-                    <rect key="frame" x="0.0" y="16" width="0.0" height="428"/>
+                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="XS1-Gz-tve">
+                    <rect key="frame" x="35" y="18.5" width="305" height="424"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uwg-84-cSH">
-                            <rect key="frame" x="162.5" y="0.0" width="50" height="319.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="305" height="311.5"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="new-empty-empty" translatesAutoresizingMaskIntoConstraints="NO" id="a88-kE-Hjp">
-                                    <rect key="frame" x="25" y="319.5" width="0.0" height="0.0"/>
+                                    <rect key="frame" x="152.5" y="311.5" width="0.0" height="0.0"/>
                                     <constraints>
                                         <constraint firstAttribute="width" priority="999" id="9X1-pN-qad"/>
                                         <constraint firstAttribute="height" priority="999" id="oak-5u-Vj6"/>
@@ -50,19 +49,22 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1MX-nm-Okz">
-                            <rect key="frame" x="0.0" y="343.5" width="0.0" height="84.5"/>
+                            <rect key="frame" x="0.0" y="335.5" width="305" height="88.5"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="v82-J3-qtd">
-                                    <rect key="frame" x="0.0" y="0.0" width="0.0" height="84.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="305" height="88.5"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Nothing here" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gBL-cj-5yG">
-                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="20.5"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Nothing here" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" enabled="NO" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gBL-cj-5yG">
+                                            <rect key="frame" x="0.0" y="0.0" width="305" height="20.5"/>
                                             <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
                                             <color key="textColor" red="0.32549019607843138" green="0.32549019607843138" blue="0.40000000000000002" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dXG-an-amT">
-                                            <rect key="frame" x="163.5" y="44.5" width="48" height="40"/>
+                                            <rect key="frame" x="128.5" y="44.5" width="48" height="44"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="44" id="yjT-Vg-6SP"/>
+                                            </constraints>
                                             <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
                                             <state key="normal" title="Button"/>
                                             <connections>
@@ -96,9 +98,9 @@
             <constraints>
                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="XS1-Gz-tve" secondAttribute="bottom" constant="16" id="EGu-Bm-aha"/>
                 <constraint firstItem="XS1-Gz-tve" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="NFK-O9-lKk"/>
-                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="XS1-Gz-tve" secondAttribute="trailing" constant="16" id="kjK-xl-Xg5"/>
-                <constraint firstItem="XS1-Gz-tve" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="nfo-lH-mzj"/>
-                <constraint firstItem="XS1-Gz-tve" firstAttribute="top" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="top" constant="16" id="oJ1-tt-fWu"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="XS1-Gz-tve" secondAttribute="trailing" constant="35" id="kjK-xl-Xg5"/>
+                <constraint firstItem="XS1-Gz-tve" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="35" id="nfo-lH-mzj"/>
+                <constraint firstItem="XS1-Gz-tve" firstAttribute="top" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="top" priority="999" constant="16" id="oJ1-tt-fWu"/>
                 <constraint firstItem="XS1-Gz-tve" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="tAr-YY-SM7"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>