diff --git a/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/Contents.json
new file mode 100644
index 00000000..8c0ebca1
--- /dev/null
+++ b/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "open-book.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/open-book.png b/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/open-book.png
new file mode 100644
index 00000000..4e28e75f
Binary files /dev/null and b/Kiwix-iOS/Assets.xcassets/Library/BookColor.imageset/open-book.png differ
diff --git a/Kiwix-iOS/Assets.xcassets/DownloadColor.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Library/Download/DownloadColor.imageset/Contents.json
similarity index 100%
rename from Kiwix-iOS/Assets.xcassets/DownloadColor.imageset/Contents.json
rename to Kiwix-iOS/Assets.xcassets/Library/Download/DownloadColor.imageset/Contents.json
diff --git a/Kiwix-iOS/Assets.xcassets/DownloadColor.imageset/arrows.png b/Kiwix-iOS/Assets.xcassets/Library/Download/DownloadColor.imageset/arrows.png
similarity index 100%
rename from Kiwix-iOS/Assets.xcassets/DownloadColor.imageset/arrows.png
rename to Kiwix-iOS/Assets.xcassets/Library/Download/DownloadColor.imageset/arrows.png
diff --git a/Kiwix-iOS/Assets.xcassets/FolderColor.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Library/Local/FolderColor.imageset/Contents.json
similarity index 100%
rename from Kiwix-iOS/Assets.xcassets/FolderColor.imageset/Contents.json
rename to Kiwix-iOS/Assets.xcassets/Library/Local/FolderColor.imageset/Contents.json
diff --git a/Kiwix-iOS/Assets.xcassets/FolderColor.imageset/folder.png b/Kiwix-iOS/Assets.xcassets/Library/Local/FolderColor.imageset/folder.png
similarity index 100%
rename from Kiwix-iOS/Assets.xcassets/FolderColor.imageset/folder.png
rename to Kiwix-iOS/Assets.xcassets/Library/Local/FolderColor.imageset/folder.png
diff --git a/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift b/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
index e4a2a4df..f19b3fd8 100644
--- a/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
+++ b/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
@@ -10,19 +10,18 @@ import UIKit
 import DZNEmptyDataSet
 
 extension CloudBooksController {
-    
     func imageForEmptyDataSet(scrollView: UIScrollView!) -> UIImage! {
         return UIImage(named: "CloudColor")
     }
     
     func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
-        let string = NSLocalizedString("There are some books in the cloud", comment: "Cloud Book Controller")
+        let string = NSLocalizedString("There are some books in the cloud", comment: "Library, cloud tab")
         let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
         return NSAttributedString(string: string, attributes: attributes)
     }
     
     func buttonTitleForEmptyDataSet(scrollView: UIScrollView!, forState state: UIControlState) -> NSAttributedString! {
-        let string = isRefreshing ? NSLocalizedString("Refreshing...", comment: "Cloud Book Controller") : NSLocalizedString("Refresh", comment: "Cloud Book Controller")
+        let string = isRefreshing ? NSLocalizedString("Refreshing...", comment: "Library, cloud tab") : NSLocalizedString("Refresh", comment: "Library, cloud tab")
         let attributes = [NSFontAttributeName: UIFont.boldSystemFontOfSize(17), NSForegroundColorAttributeName: isRefreshing ? UIColor.grayColor() : AppColors.theme]
         return NSAttributedString(string: string, attributes: attributes)
     }
@@ -35,33 +34,52 @@ extension CloudBooksController {
     func verticalOffsetForEmptyDataSet(scrollView: UIScrollView!) -> CGFloat {
         return -navigationController!.navigationBar.frame.height
     }
-    
 }
 
 extension DownloadTasksController {
+    func imageForEmptyDataSet(scrollView: UIScrollView!) -> UIImage! {
+        return UIImage(named: "DownloadColor")
+    }
+    
     func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
-        let string = NSLocalizedString("No Download Tasks", comment: "")
+        let string = NSLocalizedString("No Download Tasks", comment: "Library, download tab")
         let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
         return NSAttributedString(string: string, attributes: attributes)
     }
+}
+
+extension LocalBooksController {
+    func imageForEmptyDataSet(scrollView: UIScrollView!) -> UIImage! {
+        return UIImage(named: "FolderColor")
+    }
+    
+    func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
+        let string = NSLocalizedString("No Local Books on Device", comment: "Library, local tab")
+        let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
+        return NSAttributedString(string: string, attributes: attributes)
+    }
+    
+    func descriptionForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
+        let string = NSLocalizedString("Add Book by download in app or iTunes File Sharing. New books will show up here automatically.", comment: "Library, local tab")
+        let paragraph = NSMutableParagraphStyle()
+        paragraph.lineBreakMode = .ByWordWrapping
+        paragraph.alignment = .Center
+        let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(14), NSForegroundColorAttributeName: UIColor.lightGrayColor(), NSParagraphStyleAttributeName: paragraph]
+        return NSAttributedString(string: string, attributes: attributes)
+    }
     
     func verticalOffsetForEmptyDataSet(scrollView: UIScrollView!) -> CGFloat {
-        return tabBarController!.navigationController!.navigationBar.frame.maxY
-    }
-    
-}
-
-extension LocalBooksController {
-    func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
-        let string = NSLocalizedString("No Local Books on Device", comment: "")
-        let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
-        return NSAttributedString(string: string, attributes: attributes)
+        return -tabBarController!.navigationController!.navigationBar.frame.maxY
     }
 }
 
 extension BookDetailController {
+    func imageForEmptyDataSet(scrollView: UIScrollView!) -> UIImage! {
+        return UIImage(named: "BookColor")
+    }
+    
     func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
-        let string = NSLocalizedString("Choose A Book", comment: "")
+        let string = NSLocalizedString("Tap on A Book to See Detail", comment: "")
         let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
         return NSAttributedString(string: string, attributes: attributes)
     }
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index b950fd0b..bf5044fe 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.8.912</string>
+	<string>1.8.919</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index fe9ffa60..5410c4c9 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.915</string>
+	<string>1.8.922</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>