diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp
index 68b6fdc80..378e188d8 100644
--- a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp
+++ b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp
@@ -204,6 +204,9 @@ void BookmarksToolbarButton::init()
 QString BookmarksToolbarButton::createTooltip() const
 {
     if (!m_bookmark->description().isEmpty()) {
+        if (!m_bookmark->urlString().isEmpty()) {
+            return QString("%1\n%2").arg(m_bookmark->description(), m_bookmark->urlString());
+        }
         return m_bookmark->description();
     }
 
diff --git a/src/lib/data/data.qrc b/src/lib/data/data.qrc
index 1ec12063e..4922d2a36 100644
--- a/src/lib/data/data.qrc
+++ b/src/lib/data/data.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/">
         <file>data/browsedata.db</file>
         <file>data/profiles.ini</file>
+        <file>data/bookmarks.json</file>
     </qresource>
 </RCC>
diff --git a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json
new file mode 100644
index 000000000..efc5c78f9
--- /dev/null
+++ b/src/lib/data/data/bookmarks.json
@@ -0,0 +1,74 @@
+{
+ "roots" :  {
+  "bookmark_bar" :   {
+   "children" : [
+    {
+     "description" : "Source code of QupZilla",
+     "keyword" : "qz-git",
+     "name" : "QupZilla Git",
+     "type" : "url",
+     "url" : "https://github.com/QupZilla/qupzilla",
+     "visit_count" : 0
+    },
+    {
+     "description" : "GitHub Issue Tracker for QupZilla",
+     "keyword" : "qz-issues",
+     "name" : "QupZilla Issues",
+     "type" : "url",
+     "url" : "https://github.com/QupZilla/qupzilla/issues",
+     "visit_count" : 0
+    },
+    {
+     "description" : "",
+     "keyword" : "qz-wiki",
+     "name" : "QupZilla Wiki",
+     "type" : "url",
+     "url" : "https://github.com/QupZilla/qupzilla/wiki",
+     "visit_count" : 0
+    },
+    {
+     "description" : "Blog with development updates",
+     "keyword" : "qz-blog",
+     "name" : "QupZilla Blog",
+     "type" : "url",
+     "url" : "http://blog.qupzilla.com/",
+     "visit_count" : 0
+    },
+    {
+     "description" : "QupZilla Homepage",
+     "keyword" : "qz-home",
+     "name" : "QupZilla Home",
+     "type" : "url",
+     "url" : "http://www.qupzilla.com/",
+     "visit_count" : 0
+    }
+   ],
+   "description" : "Bookmarks located in Bookmarks Toolbar",
+   "expanded" : true,
+   "expanded_sidebar" : true,
+   "name" : "Bookmarks Toolbar",
+   "type" : "folder"
+  },
+  "bookmark_menu" :   {
+   "children" : [
+
+   ],
+   "description" : "Bookmarks located in Bookmarks Menu",
+   "expanded" : true,
+   "expanded_sidebar" : true,
+   "name" : "Bookmarks Menu",
+   "type" : "folder"
+  },
+  "other" :   {
+   "children" : [
+
+   ],
+   "description" : "All other bookmarks",
+   "expanded" : true,
+   "expanded_sidebar" : true,
+   "name" : "Unsorted Bookmarks",
+   "type" : "folder"
+  }
+ },
+ "version" : 1
+}
\ No newline at end of file
diff --git a/src/lib/data/data/browsedata.db b/src/lib/data/data/browsedata.db
index 7013963c9..95824014b 100644
Binary files a/src/lib/data/data/browsedata.db and b/src/lib/data/data/browsedata.db differ
diff --git a/src/lib/other/browsinglibrary.cpp b/src/lib/other/browsinglibrary.cpp
index 10cf46e4f..840510492 100644
--- a/src/lib/other/browsinglibrary.cpp
+++ b/src/lib/other/browsinglibrary.cpp
@@ -108,6 +108,7 @@ void BrowsingLibrary::importBookmarks()
 
 void BrowsingLibrary::exportBookmarks()
 {
+    qDebug("BrowsingLibrary::exportBookmarks() NOT IMPLEMENTED");
 }
 
 void BrowsingLibrary::showHistory(QupZilla* mainClass)