diff --git a/ownCloud/Client/ClientItemCell.swift b/ownCloud/Client/ClientItemCell.swift
index c7292415f..3ee34e160 100644
--- a/ownCloud/Client/ClientItemCell.swift
+++ b/ownCloud/Client/ClientItemCell.swift
@@ -54,8 +54,11 @@ class ClientItemCell: ThemeTableViewCell {
 		iconView.contentMode = .scaleAspectFit
 		moreButton.translatesAutoresizingMaskIntoConstraints = false
 
-		titleLabel.font = UIFont.systemFont(ofSize: 17, weight: UIFont.Weight.semibold)
-		detailLabel.font = UIFont.systemFont(ofSize: 14)
+		titleLabel.font = UIFont.preferredFont(forTextStyle: .headline)
+		titleLabel.adjustsFontForContentSizeCategory = true
+
+		detailLabel.font = UIFont.preferredFont(forTextStyle: .footnote)
+		detailLabel.adjustsFontForContentSizeCategory = true
 
 		detailLabel.textColor = UIColor.gray
 
diff --git a/ownCloud/Server List/ServerListBookmarkCell.swift b/ownCloud/Server List/ServerListBookmarkCell.swift
index 06b892048..21500bdea 100644
--- a/ownCloud/Server List/ServerListBookmarkCell.swift	
+++ b/ownCloud/Server List/ServerListBookmarkCell.swift	
@@ -40,7 +40,7 @@ class ServerListBookmarkCell : ThemeTableViewCell {
 		iconView.translatesAutoresizingMaskIntoConstraints = false
 		iconView.contentMode = .scaleAspectFit
 
-		titleLabel.font = UIFont.preferredFont(forTextStyle: .body)
+		titleLabel.font = UIFont.preferredFont(forTextStyle: .headline)
 		titleLabel.adjustsFontForContentSizeCategory = true
 
 		detailLabel.font = UIFont.preferredFont(forTextStyle: .subheadline)
diff --git a/ownCloud/Viewer/DisplayViewController.swift b/ownCloud/Viewer/DisplayViewController.swift
index 99aa1446a..9374cfcb8 100644
--- a/ownCloud/Viewer/DisplayViewController.swift
+++ b/ownCloud/Viewer/DisplayViewController.swift
@@ -55,6 +55,7 @@ class DisplayViewController: UIViewController {
 			OnMainThread {
 				self.iconImageView.isHidden = true
 			}
+			hideUIElements()
 			renderSpecificView()
 		}
 	}
@@ -214,7 +215,7 @@ class DisplayViewController: UIViewController {
 
 		parent.navigationItem.title = item.name
 		let actionsBarButtonItem = UIBarButtonItem(title: "•••", style: .plain, target: self, action: #selector(optionsBarButtonPressed))
-		actionsBarButtonItem.accessibilityLabel = item.name + " " + "Actions".localized
+		actionsBarButtonItem.accessibilityLabel = item.name! + " " + "Actions".localized
 		parent.navigationItem.rightBarButtonItem = actionsBarButtonItem
 	}
 
@@ -248,6 +249,15 @@ class DisplayViewController: UIViewController {
 		// This function is intended to be overwritten by the subclases to implement a custom view based on the source property.s
 	}
 
+	func hideUIElements() {
+		iconImageView.isHidden = true
+		progressView?.isHidden = true
+		cancelButton?.isHidden = true
+		metadataInfoLabel?.isHidden = true
+		showPreviewButton?.isHidden = true
+		noNetworkLabel?.isHidden = true
+	}
+
 	// MARK: - KVO observing
 	// swiftlint:disable block_based_kvo
 	override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {