Folders in Bookmark Toolbar

It is now possible to add folders into bookmarks toolbar.
2024-12-20 10:46:35 +01:00 · 2011-10-28 17:52:42 +02:00 · 2011-10-28 17:52:42 +02:00 · ed8969f7a9
commit ed8969f7a9
parent b2056321ef
32 changed files with 1336 additions and 512 deletions
--- a/11
+++ b/11
@ -64,6 +64,7 @@ A: Well, the problem with using excessive amount of processor time is very likel
       Before using AdBlock, you need to update filters by clicking Update Filters
       button.  
   
+   
 Q: When I add or edit my Search Engines and restart browser, the changes won't stay.
   What's wrong?
 ----------------------------------------------------------------------------------
@ -75,3 +76,13 @@ A: If you were using own builds from git, you have probably old version of profi
   restart anymore.
   

+Q: I have heard that QupZilla supports importing bookmarks from other browsers, but
+   I can't find this feature anywhere.
+----------------------------------------------------------------------------------
+A: This feature has been added in version 1.0.0-rc1. If you are using older version,
+   please upgrade it either by downloading installable packages from github or from
+   your distributions repository.
+   Then you can find Import Bookmarks option in Menu File -> Import Bookmarks...
+   Importing wizzard will then guide you with importing process.
+
+
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-QupZilla Web Browser - http://www.qupzilla.co.cc
+QupZilla Web Browser - http://www.qupzilla.co.cc (http://qupzilla.blogspot.com/)

 About QupZilla
 ----------------------------------------------------------------------------------------
@ -12,6 +12,12 @@ history (both also in sidebar) and tabs. Above that, you can read RSS feeds with
 RSS reader, block ads with builtin AdBlock plugin, block Flash content with Click2Flash
 or edit CA Certificates database with SSL Manager.

+QupZilla's main aim is to be very fast and very stable QtWebKit browser available to everyone.
+There is already a lot of QtWebKit browsers available, but they are either bound to KDE
+environment (rekonq), not actively developped (Arora) or very unstable and missing important
+features, but there is missing multiplatform, modern and actively developped browser. QupZilla 
+is trying to fill this gap by providing very stable browsing experience.
+
 History
 ----------------------------------------------------------------------------------------

--- a/bin/data/default/profiles/default/browsedata.db
+++ b/bin/data/default/profiles/default/browsedata.db
--- a/bin/locale/cs_CZ.qm
+++ b/bin/locale/cs_CZ.qm
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@ -58,7 +58,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
    , m_autofill(0)
    , m_networkCache(new QNetworkDiskCache)
    , m_desktopNotifications(0)
-    , m_iconProvider(new IconProvider)
+    , m_iconProvider(new IconProvider(this))
    , m_searchEnginesManager(0)
    , m_isClosing(false)
    , m_isStateChanged(false)
@ -427,6 +427,7 @@ void MainApplication::quitApplication()
    m_plugins->c2f_saveSettings();
    AdBlockManager::instance()->save();
    QFile::remove(getActiveProfilPath() + "WebpageIcons.db");
+    delete m_iconProvider;

 //    qDebug() << "Quitting application...";
    quit();
--- a/src/app/profileupdater.cpp
+++ b/src/app/profileupdater.cpp
@ -62,9 +62,16 @@ void ProfileUpdater::updateProfile(const QString &current, const QString &profil

    if (profileVersion == Updater::parseVersionFromString("1.0.0-b4")) {
        update100b4();
+        update100rc1();
        return;
    }

+    if (profileVersion == Updater::parseVersionFromString("1.0.0-rc1")) {
+        update100rc1();
+        return;
+    }
+
+
    std::cout << "incompatible profile version detected, updating profile data..." << std::endl;

    copyDataToProfile();
@ -85,6 +92,20 @@ void ProfileUpdater::update100b4()
    mApp->connectDatabase();

    QSqlQuery query;
-    query.exec("CREATE TABLE search_engines (id INTEGER PRIMARY KEY, name TEXT, icon TEXT,"
+    query.exec("CREATE TABLE IF NOT EXISTS search_engines (id INTEGER PRIMARY KEY, name TEXT, icon TEXT,"
               "url TEXT, shortcut TEXT, suggestionsUrl TEXT, suggestionsParameters TEXT);");
 }
+
+void ProfileUpdater::update100rc1()
+{
+    std::cout << "upgrading profile version from 1.0.0-rc1..." << std::endl;
+    mApp->connectDatabase();
+
+    QSqlQuery query;
+    query.exec("ALTER TABLE folders ADD COLUMN subfolder TEXT");
+    query.exec("UPDATE folders SET subfolder='no'");
+
+    query.exec("ALTER TABLE bookmarks ADD COLUMN toolbar_position NUMERIC");
+    query.exec("UPDATE bookmarks SET toolbar_position=0");
+
+}
--- a/src/app/profileupdater.h
+++ b/src/app/profileupdater.h
@ -38,6 +38,7 @@ private:
    void copyDataToProfile();

    void update100b4();
+    void update100rc1();

    QString m_profilePath;
    QString m_dataPath;
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@ -27,8 +27,8 @@
 #include "browsinglibrary.h"
 #include "globalfunctions.h"

-BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent) :
-    QWidget(parent)
+BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent)
+    : QWidget(parent)
    , m_isRefreshing(false)
    , ui(new Ui::BookmarksManager)
    , p_QupZilla(mainClass)
@ -39,16 +39,20 @@ BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent) :

    connect(ui->deleteB, SIGNAL(clicked()), this, SLOT(deleteItem()));
    connect(ui->bookmarksTree, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*)));
+    connect(ui->addSubfolder, SIGNAL(clicked()), this, SLOT(addSubfolder()));
    connect(ui->addFolder, SIGNAL(clicked()), this, SLOT(addFolder()));
+    connect(ui->renameFolder, SIGNAL(clicked()), this, SLOT(renameFolder()));
    connect(ui->bookmarksTree, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenuRequested(const QPoint &)));
    connect(ui->bookmarksTree, SIGNAL(itemControlClicked(QTreeWidgetItem*)), this, SLOT(itemControlClicked(QTreeWidgetItem*)));
    connect(ui->bookmarksTree, SIGNAL(itemMiddleButtonClicked(QTreeWidgetItem*)), this, SLOT(itemControlClicked(QTreeWidgetItem*)));

    connect(m_bookmarksModel, SIGNAL(bookmarkAdded(BookmarksModel::Bookmark)), this, SLOT(addBookmark(BookmarksModel::Bookmark)));
    connect(m_bookmarksModel, SIGNAL(bookmarkDeleted(BookmarksModel::Bookmark)), this, SLOT(removeBookmark(BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(subfolderAdded(QString)), this, SLOT(addSubfolder(QString)));
    connect(m_bookmarksModel, SIGNAL(folderAdded(QString)), this, SLOT(addFolder(QString)));
    connect(m_bookmarksModel, SIGNAL(folderDeleted(QString)), this, SLOT(removeFolder(QString)));
-    connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(folderRenamed(QString,QString)), this, SLOT(renameFolder(QString,QString)));

    connect(ui->optimizeDb, SIGNAL(clicked(QPoint)), this, SLOT(optimizeDb()));

@ -84,9 +88,39 @@ void BookmarksManager::addFolder()
    m_bookmarksModel->createFolder(text);
 }

+void BookmarksManager::addSubfolder()
+{
+    QString text = QInputDialog::getText(this, tr("Add new subfolder"), tr("Choose name for new subfolder in bookmarks toolbar: "));
+    if (text.isEmpty())
+        return;
+
+    m_bookmarksModel->createSubfolder(text);
+}
+
+void BookmarksManager::renameFolder()
+{
+    QTreeWidgetItem* item = ui->bookmarksTree->currentItem();
+    if (!item)
+        return;
+
+    if (!item->text(1).isEmpty())
+        return;
+
+    QString folder = item->text(0);
+
+    if (folder == tr("Bookmarks In Menu") || folder == tr("Bookmarks In ToolBar"))
+        return;
+
+    QString text = QInputDialog::getText(this, tr("Rename Folder"), tr("Choose name for folder: "), QLineEdit::Normal, folder);
+    if (text.isEmpty())
+        return;
+
+    m_bookmarksModel->renameFolder(folder, text);
+}
+
 void BookmarksManager::itemChanged(QTreeWidgetItem* item)
 {
-    if (!item || m_isRefreshing)
+    if (!item || m_isRefreshing || item->text(1).isEmpty())
        return;

    QString name = item->text(0);
@ -183,12 +217,12 @@ void BookmarksManager::refreshTable()
    newItem->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
    ui->bookmarksTree->addTopLevelItem(newItem);

-    newItem = new QTreeWidgetItem(ui->bookmarksTree);
-    newItem->setText(0, tr("Bookmarks In ToolBar"));
-    newItem->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
-    ui->bookmarksTree->addTopLevelItem(newItem);
+    QTreeWidgetItem* bookmarksToolbar = new QTreeWidgetItem(ui->bookmarksTree);
+    bookmarksToolbar->setText(0, tr("Bookmarks In ToolBar"));
+    bookmarksToolbar->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
+    ui->bookmarksTree->addTopLevelItem(bookmarksToolbar);

-    query.exec("SELECT name FROM folders");
+    query.exec("SELECT name FROM folders WHERE subfolder!='yes'");
    while(query.next()) {
        newItem = new QTreeWidgetItem(ui->bookmarksTree);
        newItem->setText(0, query.value(0).toString());
@ -211,17 +245,10 @@ void BookmarksManager::refreshTable()

        if (folder != "unsorted") {
            QList<QTreeWidgetItem*> findParent = ui->bookmarksTree->findItems(folder, 0);
-            if (findParent.count() == 1) {
+            if (findParent.count() != 1)
+                continue;
            item = new QTreeWidgetItem(findParent.at(0));
-            }else{
-                QTreeWidgetItem* newParent = new QTreeWidgetItem(ui->bookmarksTree);
-                newParent->setText(0, folder);
-                newParent->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
-                ui->bookmarksTree->addTopLevelItem(newParent);
-                item = new QTreeWidgetItem(newParent);
        }
-        } else
-            item = new QTreeWidgetItem(ui->bookmarksTree);

        item->setText(0, title);
        item->setText(1, url.toEncoded());
@ -233,8 +260,37 @@ void BookmarksManager::refreshTable()
        item->setFlags(item->flags() | Qt::ItemIsEditable);
        ui->bookmarksTree->addTopLevelItem(item);
    }
-    ui->bookmarksTree->expandAll();

+    query.exec("SELECT name FROM folders WHERE subfolder='yes'");
+    while(query.next()) {
+        newItem = new QTreeWidgetItem(bookmarksToolbar);
+        newItem->setText(0, query.value(0).toString());
+        newItem->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
+
+        QSqlQuery query2;
+        query2.prepare("SELECT title, url, id, icon FROM bookmarks WHERE folder=?");
+        query2.addBindValue(query.value(0).toString());
+        query2.exec();
+        while(query2.next()) {
+            QString title = query2.value(0).toString();
+            QUrl url = query2.value(1).toUrl();
+            int id = query2.value(2).toInt();
+            QIcon icon = IconProvider::iconFromBase64(query2.value(3).toByteArray());
+            QTreeWidgetItem* item = new QTreeWidgetItem(newItem);
+
+            item->setText(0, title);
+            item->setText(1, url.toEncoded());
+            item->setToolTip(0, title);
+            item->setToolTip(1, url.toEncoded());
+
+            item->setWhatsThis(1, QString::number(id));
+            item->setIcon(0, icon);
+            item->setFlags(item->flags() | Qt::ItemIsEditable);
+        }
+    }
+
+
+    ui->bookmarksTree->expandAll();
    ui->bookmarksTree->setUpdatesEnabled(true);
    m_isRefreshing = false;
 }
@ -252,7 +308,18 @@ void BookmarksManager::addBookmark(const BookmarksModel::Bookmark &bookmark)
    item->setToolTip(1, bookmark.url.toEncoded());
    item->setFlags(item->flags() | Qt::ItemIsEditable);

-    if (bookmark.folder != "unsorted")
+    if (bookmark.inSubfolder) {
+        QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(bookmark.folder, Qt::MatchExactly | Qt::MatchRecursive);
+        if (list.count() != 0) {
+            foreach (QTreeWidgetItem* it, list) {
+                if (it->text(1).isEmpty()) {
+                    it->addChild(item);
+                    break;
+                }
+            }
+        }
+    }
+    else if (bookmark.folder != "unsorted")
        ui->bookmarksTree->appendToParentItem(translatedFolder, item);
    else
        ui->bookmarksTree->addTopLevelItem(item);
@ -262,14 +329,40 @@ void BookmarksManager::addBookmark(const BookmarksModel::Bookmark &bookmark)
 void BookmarksManager::removeBookmark(const BookmarksModel::Bookmark &bookmark)
 {
    m_isRefreshing = true;
-    if (bookmark.folder == "unsorted") {
+
+    if (bookmark.inSubfolder) {
+        QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(bookmark.folder, Qt::MatchExactly | Qt::MatchRecursive);
+        QTreeWidgetItem* subfolderItem = 0;
+        if (list.count() != 0) {
+            foreach (QTreeWidgetItem* it, list) {
+                if (it->text(1).isEmpty()) {
+                    subfolderItem = it;
+                    break;
+                }
+            }
+        }
+        if (!subfolderItem)
+            return;
+
+        for (int i = 0; i < subfolderItem->childCount(); i++) {
+            QTreeWidgetItem* item = subfolderItem->child(i);
+            if (!item)
+                continue;
+            if (item->text(0) == bookmark.title  && item->whatsThis(1) == QString::number(bookmark.id)) {
+                ui->bookmarksTree->deleteItem(item);
+                return;
+            }
+        }
+    }
+    else if (bookmark.folder == "unsorted") {
        QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(bookmark.title, Qt::MatchExactly);
        if (list.count() == 0)
            return;
        QTreeWidgetItem* item = list.at(0);
        if (item && item->whatsThis(1) == QString::number(bookmark.id))
            ui->bookmarksTree->deleteItem(item);
-    } else {
+    }
+    else {
        QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(BookmarksModel::toTranslatedFolder(bookmark.folder), Qt::MatchExactly);
        if (list.count() == 0)
            return;
@ -298,17 +391,68 @@ void BookmarksManager::bookmarkEdited(const BookmarksModel::Bookmark &before, co
 void BookmarksManager::addFolder(const QString &name)
 {
    m_isRefreshing = true;
+
    QTreeWidgetItem* item = new QTreeWidgetItem(ui->bookmarksTree);
    item->setText(0, name);
    item->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
+
+    m_isRefreshing = false;
+}
+
+void BookmarksManager::addSubfolder(const QString &name)
+{
+    m_isRefreshing = true;
+
+    QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(tr("Bookmarks In ToolBar"), Qt::MatchExactly);
+    if (list.count() != 0) {
+        QTreeWidgetItem* item = new QTreeWidgetItem(list.at(0));
+        item->setText(0, name);
+        item->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
+    }
+
    m_isRefreshing = false;
 }

 void BookmarksManager::removeFolder(const QString &name)
 {
-    QTreeWidgetItem* item = ui->bookmarksTree->findItems(name, Qt::MatchExactly).at(0);
-    if (item)
-        ui->bookmarksTree->deleteItem(item);
+    QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(name, Qt::MatchExactly | Qt::MatchRecursive);
+    if (list.count() == 0)
+        return;
+
+    QTreeWidgetItem* folderItem = 0;
+    if (list.count() != 0) {
+        foreach (QTreeWidgetItem* it, list) {
+            if (it->text(1).isEmpty()) {
+                folderItem = it;
+                break;
+            }
+        }
+    }
+    if (!folderItem)
+        return;
+
+    ui->bookmarksTree->deleteItem(folderItem);
+}
+
+void BookmarksManager::renameFolder(const QString &before, const QString &after)
+{
+    QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(before, Qt::MatchExactly | Qt::MatchRecursive);
+    if (list.count() == 0)
+        return;
+
+    QTreeWidgetItem* folderItem = 0;
+    if (list.count() != 0) {
+        foreach (QTreeWidgetItem* it, list) {
+            if (it->text(0) == before && it->text(1).isEmpty()) {
+                folderItem = it;
+                break;
+            }
+        }
+    }
+    if (!folderItem)
+        return;
+
+    folderItem->setText(0, after);
 }

 void BookmarksManager::insertBookmark(const QUrl &url, const QString &title, const QIcon &icon)
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@ -54,7 +54,9 @@ private slots:
    void optimizeDb();
    void deleteItem();
    void itemChanged(QTreeWidgetItem* item);
+    void addSubfolder();
    void addFolder();
+    void renameFolder();
    void contextMenuRequested(const QPoint &position);
    void loadInNewTab();
    void itemControlClicked(QTreeWidgetItem* item);
@ -64,7 +66,9 @@ private slots:
    void removeBookmark(const BookmarksModel::Bookmark &bookmark);
    void bookmarkEdited(const BookmarksModel::Bookmark &before, const BookmarksModel::Bookmark &after);
    void addFolder(const QString &name);
+    void addSubfolder(const QString &name);
    void removeFolder(const QString &name);
+    void renameFolder(const QString &before, const QString &after);

 private:
    QupZilla* getQupZilla();
--- a/src/bookmarks/bookmarksmanager.ui
+++ b/src/bookmarks/bookmarksmanager.ui
@ -6,15 +6,15 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>735</width>
-    <height>547</height>
+    <width>689</width>
+    <height>467</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>Bookmarks</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="6">
+   <item row="0" column="0" colspan="9">
    <widget class="TreeWidget" name="bookmarksTree">
     <property name="contextMenuPolicy">
      <enum>Qt::CustomContextMenu</enum>
@ -37,24 +37,14 @@
     </column>
    </widget>
   </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="QPushButton" name="deleteB">
-     <property name="text">
-      <string>Delete</string>
-     </property>
-     <property name="shortcut">
-      <string>Del</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
+   <item row="1" column="0" colspan="4">
    <widget class="QPushButton" name="addFolder">
     <property name="text">
      <string>Add Folder</string>
     </property>
    </widget>
   </item>
-   <item row="1" column="4">
+   <item row="1" column="7">
    <spacer name="horizontalSpacer">
     <property name="orientation">
      <enum>Qt::Horizontal</enum>
@ -67,7 +57,7 @@
     </property>
    </spacer>
   </item>
-   <item row="1" column="5">
+   <item row="1" column="8">
    <widget class="ClickableLabel" name="optimizeDb">
     <property name="cursor">
      <cursorShape>PointingHandCursor</cursorShape>
@ -80,6 +70,30 @@
     </property>
    </widget>
   </item>
+   <item row="1" column="4">
+    <widget class="QPushButton" name="addSubfolder">
+     <property name="text">
+      <string>Add Subfolder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="5">
+    <widget class="QPushButton" name="renameFolder">
+     <property name="text">
+      <string>Rename Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="6">
+    <widget class="QPushButton" name="deleteB">
+     <property name="text">
+      <string>Delete</string>
+     </property>
+     <property name="shortcut">
+      <string>Del</string>
+     </property>
+    </widget>
+   </item>
  </layout>
 </widget>
 <customwidgets>
--- a/src/bookmarks/bookmarksmodel.cpp
+++ b/src/bookmarks/bookmarksmodel.cpp
@ -110,6 +110,7 @@ BookmarksModel::Bookmark BookmarksModel::getBookmark(int id)
        bookmark.title = query.value(1).toString();
        bookmark.folder = query.value(2).toString();
        bookmark.icon = IconProvider::iconFromBase64(query.value(3).toByteArray());
+        bookmark.inSubfolder = isSubfolder(bookmark.folder);
    }
    return bookmark;
 }
@ -135,6 +136,8 @@ bool BookmarksModel::saveBookmark(const QUrl &url, const QString &title, const Q
    bookmark.title = title;
    bookmark.folder = folder;
    bookmark.icon = icon;
+    bookmark.inSubfolder = isSubfolder(bookmark.folder);
+
    emit bookmarkAdded(bookmark);
    mApp->sendMessages(MainApplication::BookmarksChanged, true);
    return true;
@ -160,6 +163,7 @@ bool BookmarksModel::removeBookmark(int id)
    bookmark.title = query.value(1).toString();
    bookmark.folder = query.value(2).toString();
    bookmark.icon = IconProvider::iconFromBase64(query.value(3).toByteArray());
+    bookmark.inSubfolder = isSubfolder(bookmark.folder);

    if (!query.exec("DELETE FROM bookmarks WHERE id = " + QString::number(id)))
        return false;
@ -215,6 +219,7 @@ bool BookmarksModel::editBookmark(int id, const QString &title, const QUrl &url,
    before.url = query.value(1).toUrl();
    before.folder = query.value(2).toString();
    before.icon = IconProvider::iconFromBase64(query.value(3).toByteArray());
+    before.inSubfolder = isSubfolder(before.folder);

    Bookmark after;
    after.id = id;
@ -222,6 +227,7 @@ bool BookmarksModel::editBookmark(int id, const QString &title, const QUrl &url,
    after.url = url.isEmpty() ? before.url : url;
    after.folder = folder.isEmpty() ? before.folder : folder;
    after.icon = before.icon;
+    after.inSubfolder = isSubfolder(after.folder);

    query.prepare("UPDATE bookmarks SET title=?, url=?, folder=? WHERE id = ?");
    query.bindValue(0, after.title);
@ -284,6 +290,62 @@ bool BookmarksModel::removeFolder(const QString &name)
    return true;
 }

+bool BookmarksModel::renameFolder(const QString &before, const QString &after)
+{
+    QSqlQuery query;
+    query.prepare("SELECT name FROM folders WHERE name = ?");
+    query.bindValue(0, after);
+    query.exec();
+    if (query.next())
+        return false;
+
+    query.prepare("UPDATE folders SET name=? WHERE name=?");
+    query.bindValue(0, after);
+    query.bindValue(1, before);
+    if (!query.exec())
+            return false;
+
+    query.prepare("UPDATE bookmarks SET folder=? WHERE folder=?");
+    query.bindValue(0, after);
+    query.bindValue(1, before);
+    if (!query.exec())
+            return false;
+
+    emit folderRenamed(before, after);
+    return true;
+}
+
+bool BookmarksModel::createSubfolder(const QString &name)
+{
+    QSqlQuery query;
+    query.prepare("SELECT name FROM folders WHERE name = ?");
+    query.bindValue(0, name);
+    query.exec();
+    if (query.next())
+        return false;
+
+    query.prepare("INSERT INTO folders (name, subfolder) VALUES (?, 'yes')");
+    query.bindValue(0, name);
+    if (!query.exec())
+        return false;
+
+    emit subfolderAdded(name);
+    mApp->sendMessages(MainApplication::BookmarksChanged, true);
+    return true;
+}
+
+bool BookmarksModel::isSubfolder(const QString &name)
+{
+    QSqlQuery query;
+    query.prepare("SELECT subfolder FROM folders WHERE name = ?");
+    query.bindValue(0, name);
+    query.exec();
+    if (!query.next())
+        return false;
+
+    return query.value(0).toString() == "yes";
+}
+
 bool BookmarksModel::bookmarksEqual(const Bookmark &one, const Bookmark &two)
 {
    if (one.id != two.id)
--- a/src/bookmarks/bookmarksmodel.h
+++ b/src/bookmarks/bookmarksmodel.h
@ -37,12 +37,19 @@ public:
        QString folder;
        QUrl url;
        QIcon icon;
+        bool inSubfolder;
+
+        Bookmark()
+        {
+            inSubfolder = false;
+        }

        bool operator==(const Bookmark &other)
        {
            return (this->title == other.title &&
                    this->folder == other.folder &&
-                    this->url == other.url);
+                    this->url == other.url &&
+                    this->inSubfolder == other.inSubfolder);
        }
    };

@ -69,6 +76,11 @@ public:
    bool createFolder(const QString &name);
    bool removeFolder(const QString &name);

+    bool createSubfolder(const QString &name);
+    bool isSubfolder(const QString &name);
+
+    bool renameFolder(const QString &before, const QString &after);
+
    static bool bookmarksEqual(const Bookmark &one, const Bookmark &two);
    static QString toTranslatedFolder(const QString &name);
    static QString fromTranslatedFolder(const QString &name);
@ -81,6 +93,9 @@ signals:
    void folderAdded(const QString &title);
    void folderDeleted(const QString &title);

+    void subfolderAdded(const QString &title);
+    void folderRenamed(const QString &before, const QString &after);
+
 public slots:

 private:
@ -88,4 +103,7 @@ private:

 };

+typedef BookmarksModel::Bookmark Bookmark;
+Q_DECLARE_METATYPE(BookmarksModel::Bookmark)
+
 #endif // BOOKMARKSMODEL_H
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@ -22,8 +22,8 @@
 #include "historymodel.h"
 #include "toolbutton.h"

-BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent) :
-    QWidget(parent)
+BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent)
+    : QWidget(parent)
    , p_QupZilla(mainClass)
    , m_bookmarksModel(mApp->bookmarksModel())
    , m_historyModel(mApp->history())
@ -40,6 +40,9 @@ BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent) :
    connect(m_bookmarksModel, SIGNAL(bookmarkAdded(BookmarksModel::Bookmark)), this, SLOT(addBookmark(BookmarksModel::Bookmark)));
    connect(m_bookmarksModel, SIGNAL(bookmarkDeleted(BookmarksModel::Bookmark)), this, SLOT(removeBookmark(BookmarksModel::Bookmark)));
    connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(subfolderAdded(QString)), this, SLOT(subfolderAdded(QString)));
+    connect(m_bookmarksModel, SIGNAL(folderDeleted(QString)), this, SLOT(folderDeleted(QString)));
+    connect(m_bookmarksModel, SIGNAL(folderRenamed(QString,QString)), this, SLOT(folderRenamed(QString,QString)));

 //    QTimer::singleShot(0, this, SLOT(refreshBookmarks()));
    refreshBookmarks();
@ -63,6 +66,110 @@ void BookmarksToolbar::customContextMenuRequested(const QPoint &pos)
    menu.exec(p);
 }

+void BookmarksToolbar::showBookmarkContextMenu(const QPoint &pos)
+{
+    Q_UNUSED(pos)
+
+    ToolButton* button = qobject_cast<ToolButton*>(sender());
+    if (!button)
+        return;
+
+    QVariant buttonPointer = qVariantFromValue((void *) button);
+
+    QMenu menu;
+    menu.addAction(IconProvider::fromTheme("go-next"), tr("Move right"), this, SLOT(moveRight()))->setData(buttonPointer);
+    menu.addAction(IconProvider::fromTheme("go-previous"), tr("Move left"), this, SLOT(moveLeft()))->setData(buttonPointer);
+    menu.addSeparator();
+    menu.addAction(IconProvider::fromTheme("list-remove"), tr("Remove bookmark"), this, SLOT(removeButton()))->setData(buttonPointer);
+
+    //Prevent choosing first option with double rightclick
+    QPoint position = QCursor::pos();
+    QPoint p(position.x(), position.y()+1);
+    menu.exec(p);
+}
+
+void BookmarksToolbar::moveRight()
+{
+    QAction* act = qobject_cast<QAction*> (sender());
+    if (!act)
+        return;
+
+    ToolButton* button = (ToolButton*) act->data().value<void*>();
+
+    int index = m_layout->indexOf(button);
+    if (index == m_layout->count() - 1)
+        return;
+
+    ToolButton* buttonRight = qobject_cast<ToolButton*> (m_layout->itemAt(index + 1)->widget());
+    if (!buttonRight || buttonRight->menu())
+        return;
+
+    Bookmark bookmark = button->data().value<Bookmark>();
+    Bookmark bookmarkRight = buttonRight->data().value<Bookmark>();
+
+    QSqlQuery query;
+    query.prepare("UPDATE bookmarks SET toolbar_position=? WHERE id=?");
+    query.addBindValue(index + 1);
+    query.addBindValue(bookmark.id);
+    query.exec();
+
+    query.prepare("UPDATE bookmarks SET toolbar_position=? WHERE id=?");
+    query.addBindValue(index);
+    query.addBindValue(bookmarkRight.id);
+    query.exec();
+
+    QWidget* w = m_layout->takeAt(index)->widget();
+    m_layout->insertWidget(index + 1, w);
+}
+
+void BookmarksToolbar::moveLeft()
+{
+    QAction* act = qobject_cast<QAction*> (sender());
+    if (!act)
+        return;
+
+    ToolButton* button = (ToolButton*) act->data().value<void*>();
+
+    int index = m_layout->indexOf(button);
+    if (index == 0)
+        return;
+
+    ToolButton* buttonLeft = qobject_cast<ToolButton*> (m_layout->itemAt(index - 1)->widget());
+    if (!buttonLeft)
+        return;
+
+    Bookmark bookmark = button->data().value<Bookmark>();
+    Bookmark bookmarkLeft = buttonLeft->data().value<Bookmark>();
+
+    QSqlQuery query;
+    query.prepare("UPDATE bookmarks SET toolbar_position=? WHERE id=?");
+    query.addBindValue(index - 1);
+    query.addBindValue(bookmark.id);
+    query.exec();
+
+    query.prepare("UPDATE bookmarks SET toolbar_position=? WHERE id=?");
+    query.addBindValue(index);
+    query.addBindValue(bookmarkLeft.id);
+    query.exec();
+
+    QWidget* w = m_layout->takeAt(index)->widget();
+    m_layout->insertWidget(index - 1, w);
+}
+
+void BookmarksToolbar::removeButton()
+{
+    QAction* act = qobject_cast<QAction*> (sender());
+    if (!act)
+        return;
+
+    ToolButton* button = (ToolButton*) act->data().value<void*>();
+    if (!button)
+        return;
+
+    Bookmark bookmark = button->data().value<Bookmark>();
+    m_bookmarksModel->removeBookmark(bookmark.id);
+}
+
 void BookmarksToolbar::hidePanel()
 {
    p_QupZilla->showBookmarksToolbar();
@ -74,7 +181,9 @@ void BookmarksToolbar::loadClickedBookmark()
    if (!button)
        return;

-    p_QupZilla->loadAddress(button->data().toUrl());
+    Bookmark bookmark = button->data().value<Bookmark>();
+
+    p_QupZilla->loadAddress(bookmark.url);
 }

 void BookmarksToolbar::loadClickedBookmarkInNewTab()
@ -83,7 +192,9 @@ void BookmarksToolbar::loadClickedBookmarkInNewTab()
    if (!button)
        return;

-    p_QupZilla->tabWidget()->addView(button->data().toUrl());
+    Bookmark bookmark = button->data().value<Bookmark>();
+
+    p_QupZilla->tabWidget()->addView(bookmark.url);
 }

 void BookmarksToolbar::showMostVisited()
@ -92,6 +203,68 @@ void BookmarksToolbar::showMostVisited()
    m_mostVis->setVisible(!m_mostVis->isVisible());
 }

+int BookmarksToolbar::indexOfLastBookmark()
+{
+    for (int i = m_layout->count() - 1; i >= 0; i--) {
+        ToolButton* button = qobject_cast<ToolButton*>(m_layout->itemAt(i)->widget());
+        if (!button)
+            continue;
+
+        if (!button->menu())
+            return i + 1;
+    }
+
+    return 0;
+}
+
+void BookmarksToolbar::subfolderAdded(const QString &name)
+{
+    ToolButton* b = new ToolButton(this);
+    b->setPopupMode(QToolButton::InstantPopup);
+    b->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    b->setIcon(style()->standardIcon(QStyle::SP_DirIcon));
+    b->setText(name);
+
+    QMenu* menu = new QMenu(name);
+    b->setMenu(menu);
+    connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowFolderMenu()));
+
+    m_layout->insertWidget(m_layout->count() - 2, b);
+}
+
+void BookmarksToolbar::folderDeleted(const QString &name)
+{
+    int index = indexOfLastBookmark();
+
+    for (int i = index; i < m_layout->count(); i++) {
+        ToolButton* button = qobject_cast<ToolButton*>(m_layout->itemAt(i)->widget());
+        if (!button)
+            continue;
+
+        if (button->text() == name) {
+            delete button;
+            return;
+        }
+    }
+}
+
+void BookmarksToolbar::folderRenamed(const QString &before, const QString &after)
+{
+    int index = indexOfLastBookmark();
+
+    for (int i = index; i < m_layout->count(); i++) {
+        ToolButton* button = qobject_cast<ToolButton*>(m_layout->itemAt(i)->widget());
+        if (!button)
+            continue;
+
+        if (button->text() == before) {
+            button->setText(after);
+            button->menu()->setTitle(after);
+            return;
+        }
+    }
+}
+
 void BookmarksToolbar::addBookmark(const BookmarksModel::Bookmark &bookmark)
 {
    if (bookmark.folder != "bookmarksToolbar")
@ -102,18 +275,31 @@ void BookmarksToolbar::addBookmark(const BookmarksModel::Bookmark &bookmark)
        title+="..";
    }

+    QVariant v;
+    v.setValue<Bookmark>(bookmark);
+
    ToolButton* button = new ToolButton(this);
    button->setText(title);
-    button->setData(bookmark.url);
+    button->setData(v);
    button->setIcon(bookmark.icon);
    button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
    button->setToolTip(bookmark.url.toEncoded());
    button->setAutoRaise(true);
    button->setWhatsThis(bookmark.title);
+    button->setContextMenuPolicy(Qt::CustomContextMenu);

    connect(button, SIGNAL(clicked()), this, SLOT(loadClickedBookmark()));
    connect(button, SIGNAL(middleMouseClicked()), this, SLOT(loadClickedBookmarkInNewTab()));
-    m_layout->insertWidget(m_layout->count() - 2, button);
+    connect(button, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showBookmarkContextMenu(QPoint)));
+
+    int indexForBookmark = indexOfLastBookmark();
+    m_layout->insertWidget(indexForBookmark, button);
+
+    QSqlQuery query;
+    query.prepare("UPDATE bookmarks SET toolbar_position=? WHERE id=?");
+    query.addBindValue(indexForBookmark);
+    query.addBindValue(bookmark.id);
+    query.exec();
 }

 void BookmarksToolbar::removeBookmark(const BookmarksModel::Bookmark &bookmark)
@ -123,7 +309,9 @@ void BookmarksToolbar::removeBookmark(const BookmarksModel::Bookmark &bookmark)
        if (!button)
            continue;

-        if (button->data().toUrl() == bookmark.url) {
+        Bookmark book = button->data().value<Bookmark>();
+
+        if (book == bookmark) {
            delete button;
            return;
        }
@ -142,18 +330,24 @@ void BookmarksToolbar::bookmarkEdited(const BookmarksModel::Bookmark &before, co
            if (!button)
                continue;

-            if (button->data().toUrl() == before.url && button->whatsThis() == before.title) {
+            Bookmark book = button->data().value<Bookmark>();
+
+            if (book == before) {
                QString title = after.title;
                if (title.length()>15) {
                    title.truncate(13);
                    title+="..";
                }

+                QVariant v;
+                v.setValue<Bookmark>(after);
+
                button->setText(title);
-                button->setData(after.url);
+                button->setData(v);
                button->setIcon(after.icon);
                button->setToolTip(after.url.toEncoded());
                button->setWhatsThis(after.title);
+                return;
            }
        }
    }
@ -162,31 +356,54 @@ void BookmarksToolbar::bookmarkEdited(const BookmarksModel::Bookmark &before, co
 void BookmarksToolbar::refreshBookmarks()
 {
    QSqlQuery query;
-    query.exec("SELECT title, url, icon FROM bookmarks WHERE folder='bookmarksToolbar'");
+    query.exec("SELECT id, title, url, icon FROM bookmarks WHERE folder='bookmarksToolbar' ORDER BY toolbar_position");
    while(query.next()) {
-        QString title = query.value(0).toString();
-        QUrl url = query.value(1).toUrl();
-        QIcon icon = IconProvider::iconFromBase64(query.value(2).toByteArray());
-        QString title_ = title;
+        Bookmark bookmark;
+        bookmark.id = query.value(0).toInt();
+        bookmark.title = query.value(1).toString();
+        bookmark.url = query.value(2).toUrl();
+        bookmark.icon = IconProvider::iconFromBase64(query.value(3).toByteArray());
+        bookmark.folder = "bookmarksToolbar";
+        QString title = bookmark.title;
        if (title.length()>15) {
            title.truncate(13);
            title+="..";
        }

+        QVariant v;
+        v.setValue<Bookmark>(bookmark);
+
        ToolButton* button = new ToolButton(this);
        button->setText(title);
-        button->setData(url);
-        button->setIcon(icon);
+        button->setData(v);
+        button->setIcon(bookmark.icon);
        button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-        button->setToolTip(url.toEncoded());
-        button->setWhatsThis(title_);
+        button->setToolTip(bookmark.url.toEncoded());
+        button->setWhatsThis(bookmark.title);
        button->setAutoRaise(true);
+        button->setContextMenuPolicy(Qt::CustomContextMenu);

        connect(button, SIGNAL(clicked()), this, SLOT(loadClickedBookmark()));
        connect(button, SIGNAL(middleMouseClicked()), this, SLOT(loadClickedBookmarkInNewTab()));
+        connect(button, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showBookmarkContextMenu(QPoint)));
        m_layout->addWidget(button);
    }

+    query.exec("SELECT name FROM folders WHERE subfolder='yes'");
+    while(query.next()) {
+        ToolButton* b = new ToolButton(this);
+        b->setPopupMode(QToolButton::InstantPopup);
+        b->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        b->setIcon(style()->standardIcon(QStyle::SP_DirIcon));
+        b->setText(query.value(0).toString());
+
+        QMenu* menu = new QMenu(query.value(0).toString());
+        b->setMenu(menu);
+        connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowFolderMenu()));
+
+        m_layout->addWidget(b);
+    }
+
    m_mostVis = new ToolButton(this);
    m_mostVis->setPopupMode(QToolButton::InstantPopup);
    m_mostVis->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@ -204,6 +421,34 @@ void BookmarksToolbar::refreshBookmarks()
    m_mostVis->setVisible(m_bookmarksModel->isShowingMostVisited());
 }

+void BookmarksToolbar::aboutToShowFolderMenu()
+{
+    QMenu* menu = qobject_cast<QMenu*> (sender());
+    if (!menu)
+        return;
+
+    menu->clear();
+    QString folder = menu->title();
+
+    QSqlQuery query;
+    query.prepare("SELECT title, url, icon FROM bookmarks WHERE folder=?");
+    query.addBindValue(folder);
+    query.exec();
+    while(query.next()) {
+        QString title = query.value(0).toString();
+        QUrl url = query.value(1).toUrl();
+        QIcon icon = IconProvider::iconFromBase64(query.value(2).toByteArray());
+        if (title.length() > 40) {
+            title.truncate(40);
+            title += "..";
+        }
+        menu->addAction(icon, title, p_QupZilla, SLOT(loadActionUrl()))->setData(url);
+    }
+
+    if (menu->isEmpty())
+        menu->addAction(tr("Empty"));
+}
+
 void BookmarksToolbar::refreshMostVisited()
 {
    m_menuMostVisited->clear();
@ -216,4 +461,7 @@ void BookmarksToolbar::refreshMostVisited()
        }
        m_menuMostVisited->addAction(_iconForUrl(entry.url), entry.title, p_QupZilla, SLOT(loadActionUrl()))->setData(entry.url);
    }
+
+    if (m_menuMostVisited->isEmpty())
+        m_menuMostVisited->addAction(tr("Empty"));
 }
--- a/src/bookmarks/bookmarkstoolbar.h
+++ b/src/bookmarks/bookmarkstoolbar.h
@ -45,13 +45,26 @@ private slots:
    void loadClickedBookmark();
    void loadClickedBookmarkInNewTab();

+    void aboutToShowFolderMenu();
+    void showBookmarkContextMenu(const QPoint &pos);
+    void customContextMenuRequested(const QPoint &pos);
+
+    void moveRight();
+    void moveLeft();
+    void removeButton();
+
    void hidePanel();
+
    void addBookmark(const BookmarksModel::Bookmark &bookmark);
    void removeBookmark(const BookmarksModel::Bookmark &bookmark);
    void bookmarkEdited(const BookmarksModel::Bookmark &before, const BookmarksModel::Bookmark &after);
-    void customContextMenuRequested(const QPoint &pos);
+    void subfolderAdded(const QString &name);
+    void folderDeleted(const QString &name);
+    void folderRenamed(const QString &before, const QString &after);

 private:
+    int indexOfLastBookmark();
+
    QupZilla* p_QupZilla;
    BookmarksModel* m_bookmarksModel;
    HistoryModel* m_historyModel;
--- a/src/data/icons.qrc
+++ b/src/data/icons.qrc
@ -66,5 +66,8 @@
        <file>icons/browsers/firefox.png</file>
        <file>icons/browsers/chrome.png</file>
        <file>icons/browsers/opera.png</file>
+        <file>icons/faenza/go-next.png</file>
+        <file>icons/faenza/go-previous.png</file>
+        <file>icons/faenza/list-remove.png</file>
    </qresource>
 </RCC>
--- a/src/data/icons/faenza/go-next.png
+++ b/src/data/icons/faenza/go-next.png
--- a/src/data/icons/faenza/go-previous.png
+++ b/src/data/icons/faenza/go-previous.png
--- a/src/data/icons/faenza/list-remove.png
+++ b/src/data/icons/faenza/list-remove.png
--- a/src/downloads/downloaditem.cpp
+++ b/src/downloads/downloaditem.cpp
@ -281,7 +281,7 @@ void DownloadItem::customContextMenuRequested(const QPoint &pos)
    menu.addAction(QIcon::fromTheme("edit-copy"), tr("Copy Download Link"), this, SLOT(copyDownloadLink()));
    menu.addSeparator();
    menu.addAction(IconProvider::standardIcon(QStyle::SP_BrowserStop), tr("Cancel downloading"), this, SLOT(stop()))->setEnabled(m_downloading);
-    menu.addAction(QIcon::fromTheme("window-close"), tr("Clear"), this, SLOT(clear()))->setEnabled(!m_downloading);
+    menu.addAction(QIcon::fromTheme("list-remove"), tr("Clear"), this, SLOT(clear()))->setEnabled(!m_downloading);

    if (m_downloading || ui->downloadInfo->text().startsWith(tr("Cancelled")) || ui->downloadInfo->text().startsWith(tr("Error")))
        menu.actions().at(0)->setEnabled(false);
--- a/src/other/statusbarmessage.cpp
+++ b/src/other/statusbarmessage.cpp
@ -30,7 +30,7 @@ TipLabel::TipLabel(QupZilla* parent)
    setPalette(QToolTip::palette());
    ensurePolished();
    setFrameStyle(QFrame::NoFrame);
-    setMargin(2);
+    setMargin(3);
 }

 void TipLabel::show()
--- a/src/preferences/autofillmanager.ui
+++ b/src/preferences/autofillmanager.ui
@ -30,7 +30,7 @@
       <item row="0" column="0">
        <widget class="QTreeWidget" name="treePass">
         <attribute name="headerMinimumSectionSize">
-          <number>180</number>
+          <number>170</number>
         </attribute>
         <column>
          <property name="text">
--- a/src/sidebar/bookmarkssidebar.cpp
+++ b/src/sidebar/bookmarkssidebar.cpp
@ -43,9 +43,10 @@ BookmarksSideBar::BookmarksSideBar(QupZilla* mainClass, QWidget* parent)

    connect(m_bookmarksModel, SIGNAL(bookmarkAdded(BookmarksModel::Bookmark)), this, SLOT(addBookmark(BookmarksModel::Bookmark)));
    connect(m_bookmarksModel, SIGNAL(bookmarkDeleted(BookmarksModel::Bookmark)), this, SLOT(removeBookmark(BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)));
    connect(m_bookmarksModel, SIGNAL(folderAdded(QString)), this, SLOT(addFolder(QString)));
    connect(m_bookmarksModel, SIGNAL(folderDeleted(QString)), this, SLOT(removeFolder(QString)));
-    connect(m_bookmarksModel, SIGNAL(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)), this, SLOT(bookmarkEdited(BookmarksModel::Bookmark,BookmarksModel::Bookmark)));
+    connect(m_bookmarksModel, SIGNAL(folderRenamed(QString,QString)), this, SLOT(renameFolder(QString,QString)));

    QTimer::singleShot(0, this, SLOT(refreshTable()));
 }
@ -70,6 +71,12 @@ void BookmarksSideBar::loadInNewTab()
        p_QupZilla->tabWidget()->addView(action->data().toUrl(), tr("New Tab"), TabWidget::NewNotSelectedTab);
 }

+void BookmarksSideBar::copyAddress()
+{
+    if (QAction* action = qobject_cast<QAction*>(sender()))
+        QApplication::clipboard()->setText(action->data().toString());
+}
+
 void BookmarksSideBar::deleteItem()
 {
    QTreeWidgetItem* item = ui->bookmarksTree->currentItem();
@ -80,16 +87,6 @@ void BookmarksSideBar::deleteItem()
    m_bookmarksModel->removeBookmark(id);
 }

-void BookmarksSideBar::moveBookmark()
-{
-    QTreeWidgetItem* item = ui->bookmarksTree->currentItem();
-    if (!item)
-        return;
-    if (QAction* action = qobject_cast<QAction*>(sender())) {
-        m_bookmarksModel->editBookmark(item->whatsThis(0).toInt(), item->text(0), QUrl(), action->data().toString());
-    }
-}
-
 void BookmarksSideBar::contextMenuRequested(const QPoint &position)
 {
    if (!ui->bookmarksTree->itemAt(position))
@ -101,19 +98,10 @@ void BookmarksSideBar::contextMenuRequested(const QPoint &position)
    QMenu menu;
    menu.addAction(tr("Open link in actual &tab"), p_QupZilla, SLOT(loadActionUrl()))->setData(link);
    menu.addAction(tr("Open link in &new tab"), this, SLOT(loadInNewTab()))->setData(link);
+    menu.addAction(tr("Copy address"), this, SLOT(copyAddress()))->setData(link);
    menu.addSeparator();
-
-    QMenu moveMenu;
-    moveMenu.setTitle(tr("Move bookmark to &folder"));
-    moveMenu.addAction(QIcon(":icons/other/unsortedbookmarks.png"), tr("Unsorted Bookmarks"), this, SLOT(moveBookmark()))->setData("unsorted");
-    moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), tr("Bookmarks In Menu"), this, SLOT(moveBookmark()))->setData("bookmarksMenu");
-    moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), tr("Bookmarks In ToolBar"), this, SLOT(moveBookmark()))->setData("bookmarksToolbar");
-    QSqlQuery query;
-    query.exec("SELECT name FROM folders");
-    while(query.next())
-        moveMenu.addAction(style()->standardIcon(QStyle::SP_DirIcon), query.value(0).toString(), this, SLOT(moveBookmark()))->setData(query.value(0).toString());
-    menu.addMenu(&moveMenu);
    menu.addAction(tr("&Delete"), this, SLOT(deleteItem()));
+
    //Prevent choosing first option with double rightclick
    QPoint pos = QCursor::pos();
    QPoint p(pos.x(), pos.y()+1);
@ -182,11 +170,26 @@ void BookmarksSideBar::addFolder(const QString &name)

 void BookmarksSideBar::removeFolder(const QString &name)
 {
-    QTreeWidgetItem* item = ui->bookmarksTree->findItems(name, Qt::MatchExactly).at(0);
+    QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(name, Qt::MatchExactly);
+    if (list.count() == 0)
+        return;
+    QTreeWidgetItem* item = list.at(0);
    if (item)
        ui->bookmarksTree->deleteItem(item);
 }

+void BookmarksSideBar::renameFolder(const QString &before, const QString &after)
+{
+    QList<QTreeWidgetItem*> list = ui->bookmarksTree->findItems(before, Qt::MatchExactly);
+    if (list.count() == 0)
+        return;
+    QTreeWidgetItem* item = list.at(0);
+    if (!item)
+        return;
+
+    item->setText(0, after);
+}
+
 void BookmarksSideBar::refreshTable()
 {
    m_isRefreshing = true;
@ -199,12 +202,7 @@ void BookmarksSideBar::refreshTable()
    newItem->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
    ui->bookmarksTree->addTopLevelItem(newItem);

-    newItem = new QTreeWidgetItem(ui->bookmarksTree);
-    newItem->setText(0, tr("Bookmarks In ToolBar"));
-    newItem->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
-    ui->bookmarksTree->addTopLevelItem(newItem);
-
-    query.exec("SELECT name FROM folders");
+    query.exec("SELECT name FROM folders WHERE subfolder!='yes'");
    while(query.next()) {
        newItem = new QTreeWidgetItem(ui->bookmarksTree);
        newItem->setText(0, query.value(0).toString());
@ -223,19 +221,15 @@ void BookmarksSideBar::refreshTable()
        if (folder == "bookmarksMenu")
            folder = tr("Bookmarks In Menu");
        if (folder == "bookmarksToolbar")
-            folder = tr("Bookmarks In ToolBar");
+            continue;

        if (folder != "unsorted") {
            QList<QTreeWidgetItem*> findParent = ui->bookmarksTree->findItems(folder, 0);
-            if (findParent.count() == 1) {
+            if (findParent.count() != 1)
+                continue;
+
            item = new QTreeWidgetItem(findParent.at(0));
-            }else{
-                QTreeWidgetItem* newParent = new QTreeWidgetItem(ui->bookmarksTree);
-                newParent->setText(0, folder);
-                newParent->setIcon(0, style()->standardIcon(QStyle::SP_DirIcon));
-                ui->bookmarksTree->addTopLevelItem(newParent);
-                item = new QTreeWidgetItem(newParent);
-            }
+
        } else
            item = new QTreeWidgetItem(ui->bookmarksTree);

--- a/src/sidebar/bookmarkssidebar.h
+++ b/src/sidebar/bookmarkssidebar.h
@ -49,13 +49,15 @@ private slots:
    void loadInNewTab();
    void itemControlClicked(QTreeWidgetItem* item);
    void itemDoubleClicked(QTreeWidgetItem* item);
-    void moveBookmark();
+
+    void copyAddress();

    void addBookmark(const BookmarksModel::Bookmark &bookmark);
    void removeBookmark(const BookmarksModel::Bookmark &bookmark);
    void bookmarkEdited(const BookmarksModel::Bookmark &before, const BookmarksModel::Bookmark &after);
    void addFolder(const QString &name);
    void removeFolder(const QString &name);
+    void renameFolder(const QString &before, const QString &after);

 private:
    QupZilla* getQupZilla();
--- a/src/sidebar/historysidebar.cpp
+++ b/src/sidebar/historysidebar.cpp
@ -64,6 +64,12 @@ void HistorySideBar::loadInNewTab()
        p_QupZilla->tabWidget()->addView(action->data().toUrl(), tr("New Tab"), TabWidget::NewNotSelectedTab);
 }

+void HistorySideBar::copyAddress()
+{
+    if (QAction* action = qobject_cast<QAction*>(sender()))
+        QApplication::clipboard()->setText(action->data().toString());
+}
+
 void HistorySideBar::contextMenuRequested(const QPoint &position)
 {
    if (!ui->historyTree->itemAt(position))
@ -75,6 +81,7 @@ void HistorySideBar::contextMenuRequested(const QPoint &position)
    QMenu menu;
    menu.addAction(tr("Open link in actual tab"), p_QupZilla, SLOT(loadActionUrl()))->setData(link);
    menu.addAction(tr("Open link in new tab"), this, SLOT(loadInNewTab()))->setData(link);
+    menu.addAction(tr("Copy address"), this, SLOT(copyAddress()))->setData(link);

    //Prevent choosing first option with double rightclick
    QPoint pos = QCursor::pos();
--- a/src/sidebar/historysidebar.h
+++ b/src/sidebar/historysidebar.h
@ -48,6 +48,8 @@ private slots:
    void loadInNewTab();
    void itemControlClicked(QTreeWidgetItem* item);

+    void copyAddress();
+
    void historyEntryAdded(const HistoryModel::HistoryEntry &entry);
    void historyEntryDeleted(const HistoryModel::HistoryEntry &entry);
    void historyEntryEdited(const HistoryModel::HistoryEntry &before, const HistoryModel::HistoryEntry &after);
--- a/src/tools/iconprovider.cpp
+++ b/src/tools/iconprovider.cpp
@ -19,12 +19,13 @@
 #include "webview.h"
 #include "mainapplication.h"

-IconProvider::IconProvider(QObject* parent) :
-    QObject(parent)
+IconProvider::IconProvider(QObject* parent)
+    : QObject(parent)
 {
    m_timer = new QTimer(this);
    m_timer->setInterval(10*1000);
    m_timer->start();
+
    connect(m_timer, SIGNAL(timeout()), this, SLOT(saveIconsToDatabase()));
 }

@ -176,6 +177,12 @@ QIcon IconProvider::fromTheme(const QString &icon)
        return QIcon(":icons/locationbar/unknownpage.png");
    else if (icon == "user-bookmarks")
        return QIcon(":icons/faenza/user-bookmarks.png");
+    else if (icon == "list-remove")
+        return QIcon(":icons/faenza/list-remove.png");
+    else if (icon == "go-next")
+        return QIcon(":icons/faenza/go-next.png");
+    else if (icon == "go-previous")
+        return QIcon(":icons/faenza/go-previous.png");
    else
        return QIcon();
 #endif
@ -206,3 +213,9 @@ QByteArray IconProvider::iconToBase64(const QIcon &icon)
    buffer.close();
    return bArray.toBase64();
 }
+
+IconProvider::~IconProvider()
+{
+    delete m_timer;
+    saveIconsToDatabase();
+}
--- a/src/tools/iconprovider.h
+++ b/src/tools/iconprovider.h
@ -34,6 +34,7 @@ class IconProvider : public QObject
    Q_OBJECT
 public:
    explicit IconProvider(QObject* parent = 0);
+    ~IconProvider();

    void saveIcon(WebView* view);
    QIcon iconForUrl(const QUrl &url);
@ -55,6 +56,7 @@ public slots:

 private:
    QTimer* m_timer;
+
    struct Icon {
        QUrl url;
        QIcon icon;
--- a/translations/cs_CZ.ts
+++ b/translations/cs_CZ.ts
@ -486,102 +486,131 @@ p, li { white-space: pre-wrap; }
        <translation>Adresa</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="83"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Rename Folder</source>
+        <translation>Přejmenovat složku</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="90"/>
        <source>Delete</source>
        <translation>Odstranit</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="46"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="93"/>
        <source>Del</source>
        <translation>Del</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="53"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
        <source>Add Folder</source>
        <translation>Přidat složku</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="66"/>
        <source>Optimize Database</source>
        <translation>Optimalizovat databázi</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <source>Add Subfolder</source>
+        <translation>Přidat podsložku</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Add new folder</source>
        <translation>Přidat složku</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Choose name for new bookmark folder: </source>
        <translation>Zvolte jméno pro novou složku:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="110"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="144"/>
        <source>New Tab</source>
        <translation>Nový panel</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="160"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="182"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="208"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="336"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="378"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="216"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="242"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="480"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="522"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="161"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="210"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="337"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="379"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="221"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="244"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="406"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="481"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="523"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Panel záložek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="153"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Otevřít odkaz v &amp;aktuálním panelu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="154"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Add new subfolder</source>
+        <translation>Přidat podsložku</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Choose name for new subfolder in bookmarks toolbar: </source>
+        <translation>Zvolte jméno pro novou podsložku v panelu záložek: </translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Choose name for folder: </source>
+        <translation>Zvolte jméno pro složku: </translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="188"/>
        <source>Open link in &amp;new tab</source>
        <translation>Otevřít odkaz v novém &amp;panelu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="158"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="192"/>
        <source>Move bookmark to &amp;folder</source>
        <translation>Přesunout záložku do &amp;složky</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="159"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="335"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="377"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="193"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="479"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="521"/>
        <source>Unsorted Bookmarks</source>
        <translation>Nesetříděné záložky</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="332"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="476"/>
        <source>&lt;b&gt;Warning: &lt;/b&gt;You already have this page bookmarked!</source>
        <translation>&lt;b&gt;Upozornění: &lt;/b&gt;Tuto stránku již máte v záložkách!</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="343"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="487"/>
        <source>Choose name and location of bookmark.</source>
        <translation>Zvolte jméno a umístění záložky.</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="347"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="491"/>
        <source>Add New Bookmark</source>
        <translation>Přidat záložku</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="385"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="529"/>
        <source>Choose folder for bookmarks:</source>
        <translation>Zvolte složku pro záložky:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="386"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="530"/>
        <source>Bookmark All Tabs</source>
        <translation>Přidat všechny panely do záložek</translation>
    </message>
@ -589,22 +618,22 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksModel</name>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="304"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="317"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="366"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="379"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="306"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="319"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="368"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="381"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Panel záložek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="308"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="321"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="370"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="383"/>
        <source>Unsorted Bookmarks</source>
        <translation>Nesetříděné záložky</translation>
    </message>
@ -617,46 +646,45 @@ p, li { white-space: pre-wrap; }
        <translation>Hledat...</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="70"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="71"/>
        <source>New Tab</source>
        <translation>Nový panel</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="102"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="99"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Otevřít odkaz v &amp;aktuálním panelu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="100"/>
        <source>Open link in &amp;new tab</source>
        <translation>Otevřít odkaz v novém &amp;panelu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="107"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="101"/>
+        <source>Copy address</source>
+        <translation>Kopírovat adresu</translation>
+    </message>
+    <message>
        <source>Move bookmark to &amp;folder</source>
-        <translation>Přesunout záložku do &amp;složky</translation>
+        <translation type="obsolete">Přesunout záložku do &amp;složky</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="108"/>
        <source>Unsorted Bookmarks</source>
-        <translation>Nesetříděné záložky</translation>
+        <translation type="obsolete">Nesetříděné záložky</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="109"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="198"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="224"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="201"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="222"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="203"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="226"/>
        <source>Bookmarks In ToolBar</source>
-        <translation>Panel záložek</translation>
+        <translation type="obsolete">Panel záložek</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="116"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
        <source>&amp;Delete</source>
        <translation>&amp;Odstranit</translation>
    </message>
@ -664,45 +692,66 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksToolbar</name>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="53"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="56"/>
        <source>&amp;Bookmark Current Page</source>
        <translation>Přidat &amp;stránku do záložek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="54"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
        <source>Bookmark &amp;All Tabs</source>
        <translation>Přidat &amp;všechny panely do záložek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="55"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
        <source>&amp;Organize Bookmarks</source>
        <translation>Organizovat &amp;záložky</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Hide Most &amp;Visited</source>
        <translation>Skrýt &amp;Nejnavštěvovanější</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Show Most &amp;Visited</source>
        <translation>Zobrazit &amp;Nejnavštěvovanější</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="61"/>
        <source>&amp;Hide Toolbar</source>
        <translation>S&amp;krýt panel</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="80"/>
+        <source>Move right</source>
+        <translation>Posunout doprava</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="81"/>
+        <source>Move left</source>
+        <translation>Posunout doleva</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="83"/>
+        <source>Remove bookmark</source>
+        <translation>Odstranit záložku</translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="411"/>
        <source>Most visited</source>
        <translation>Nejnavštěvovanější</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="412"/>
        <source>Sites you visited the most</source>
        <translation>Nejvíce navštěvované stránky</translation>
    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="449"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="466"/>
+        <source>Empty</source>
+        <translation>Prázdný</translation>
+    </message>
    <message>
        <source>Sites You visited the most</source>
        <translation type="obsolete">Nejvíce navštěvované stránky</translation>
@ -934,42 +983,42 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ClickToFlash</name>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="95"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="110"/>
        <source>Object blocked by ClickToFlash</source>
        <translation>Objekt zablokován ClickToFlash pluginem</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="96"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="111"/>
        <source>Show more informations about object</source>
        <translation>Zobrazit více informací o objektu</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="98"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="113"/>
        <source>Delete object</source>
        <translation>Odstranit objekt</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="99"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="114"/>
        <source>Add %1 to whitelist</source>
        <translation>Přidat %1 na bílou listinu</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="205"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="220"/>
        <source>Flash Object</source>
        <translation>Flash objekt</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Attribute Name&lt;/b&gt;</source>
        <translation>&lt;b&gt;Jméno atributu&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Value&lt;/b&gt;</source>
        <translation>&lt;b&gt;Hodnota&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="219"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="234"/>
        <source>No more informations available.</source>
        <translation>Žádné další informace.</translation>
    </message>
@ -1587,30 +1636,35 @@ nebyl nalezen!</translation>
        <translation>Nový panel</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="76"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="82"/>
        <source>Open link in actual tab</source>
        <translation>Otevřít odkaz v aktuálním panelu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="77"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="83"/>
        <source>Open link in new tab</source>
        <translation>Otevřít odkaz v novém panelu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="94"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="188"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="84"/>
+        <source>Copy address</source>
+        <translation>Kopírovat adresu</translation>
+    </message>
+    <message>
+        <location filename="../src/sidebar/historysidebar.cpp" line="101"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="195"/>
        <source>Today</source>
        <translation>Dnes</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="96"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="190"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="197"/>
        <source>This Week</source>
        <translation>Tento týden</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="98"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="192"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="105"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="199"/>
        <source>This Month</source>
        <translation>Tento měsíc</translation>
    </message>
@ -1652,12 +1706,12 @@ nebyl nalezen!</translation>
 <context>
    <name>MainApplication</name>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="584"/>
+        <location filename="../src/app/mainapplication.cpp" line="585"/>
        <source>Last session crashed</source>
        <translation>Poslední relace spadla</translation>
    </message>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="585"/>
+        <location filename="../src/app/mainapplication.cpp" line="586"/>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?</source>
        <translation>&lt;b&gt;QupZilla spadla :-(&lt;/b&gt;&lt;br/&gt;Oops, poslední relace QupZilly skončila jejím pádem. Velice se omlouváme. Přejete si obnovit uložený stav?</translation>
    </message>
--- a/translations/de_DE.ts
+++ b/translations/de_DE.ts
@ -478,102 +478,131 @@ p, li { white-space: pre-wrap; }
        <translation>Url</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="83"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="90"/>
        <source>Delete</source>
        <translation>Löschen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="46"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="93"/>
        <source>Del</source>
        <translation>Entf</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="53"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
        <source>Add Folder</source>
        <translation>Ordner hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="66"/>
        <source>Optimize Database</source>
        <translation>Datenbank optimieren</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <source>Add Subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Add new folder</source>
        <translation>Neuen Ordner hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Choose name for new bookmark folder: </source>
        <translation>Namen für neues Lesezeichen angeben:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="110"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="144"/>
        <source>New Tab</source>
        <translation>Neuer Tab</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="160"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="182"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="208"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="336"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="378"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="216"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="242"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="480"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="522"/>
        <source>Bookmarks In Menu</source>
        <translation>Lesezeichen im Menü</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="161"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="210"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="337"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="379"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="221"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="244"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="406"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="481"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="523"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Lesezeichen in Werkzeug-Leiste</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="153"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Link in &amp;aktuellem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="154"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Add new subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Choose name for new subfolder in bookmarks toolbar: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Choose name for folder: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="188"/>
        <source>Open link in &amp;new tab</source>
        <translation>Link in &amp;neuem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="158"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="192"/>
        <source>Move bookmark to &amp;folder</source>
        <translation>Lesezeichen in &amp;Ordner verschieben</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="159"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="335"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="377"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="193"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="479"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="521"/>
        <source>Unsorted Bookmarks</source>
        <translation>Unsortierte Lesezeichen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="332"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="476"/>
        <source>&lt;b&gt;Warning: &lt;/b&gt;You already have this page bookmarked!</source>
        <translation>&lt;b&gt;Warnung: &lt;/b&gt;Diese Lesezeichen haben Sie bereits hinzugefügt!</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="343"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="487"/>
        <source>Choose name and location of bookmark.</source>
        <translation>Namen und Speicherort für Lesezeichen auswählen.</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="347"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="491"/>
        <source>Add New Bookmark</source>
        <translation>Neues Lesezeichen hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="385"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="529"/>
        <source>Choose folder for bookmarks:</source>
        <translation>Ordner für Lesezeichen auswählen:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="386"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="530"/>
        <source>Bookmark All Tabs</source>
        <translation>Lesezeichen für alle geöffneten Tabs hinzufügen</translation>
    </message>
@ -581,22 +610,22 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksModel</name>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="304"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="317"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="366"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="379"/>
        <source>Bookmarks In Menu</source>
        <translation>Lesezeichen im Menü</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="306"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="319"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="368"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="381"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Lesezeichen in Werkzeug-Leiste</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="308"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="321"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="370"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="383"/>
        <source>Unsorted Bookmarks</source>
        <translation>Unsortierte Lesezeichen</translation>
    </message>
@ -609,46 +638,45 @@ p, li { white-space: pre-wrap; }
        <translation>Suchen...</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="70"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="71"/>
        <source>New Tab</source>
        <translation>Neuer Tab</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="102"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="99"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Link in &amp;aktuellem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="100"/>
        <source>Open link in &amp;new tab</source>
        <translation>Link in &amp;neuem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="107"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="101"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
        <source>Move bookmark to &amp;folder</source>
-        <translation>Lesezeichen in &amp;Ordner verschieben</translation>
+        <translation type="obsolete">Lesezeichen in &amp;Ordner verschieben</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="108"/>
        <source>Unsorted Bookmarks</source>
-        <translation>Unsortierte Lesezeichen</translation>
+        <translation type="obsolete">Unsortierte Lesezeichen</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="109"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="198"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="224"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="201"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="222"/>
        <source>Bookmarks In Menu</source>
        <translation>Lesezeichen im Menü</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="203"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="226"/>
        <source>Bookmarks In ToolBar</source>
-        <translation>Lesezeichen in Werkzeug-Leiste</translation>
+        <translation type="obsolete">Lesezeichen in Werkzeug-Leiste</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="116"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
        <source>&amp;Delete</source>
        <translation>&amp;Löschen</translation>
    </message>
@ -656,45 +684,66 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksToolbar</name>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="53"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="56"/>
        <source>&amp;Bookmark Current Page</source>
        <translation>Lesezeichen für &amp;aktuelle Seite hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="54"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
        <source>Bookmark &amp;All Tabs</source>
        <translation>Lesezeichen für alle &amp;geöffneten Tabs hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="55"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
        <source>&amp;Organize Bookmarks</source>
        <translation>Bookmarks &amp;bearbeiten</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Hide Most &amp;Visited</source>
        <translation>Meistbesuchte &amp;verstecken</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Show Most &amp;Visited</source>
        <translation>Meistbesuchte &amp;anzeigen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="61"/>
        <source>&amp;Hide Toolbar</source>
        <translation>&amp;Werkzeugleiste verstecken</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="80"/>
+        <source>Move right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="81"/>
+        <source>Move left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="83"/>
+        <source>Remove bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="411"/>
        <source>Most visited</source>
        <translation>Meistbesuchte</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="412"/>
        <source>Sites you visited the most</source>
        <translation>Meistbesuchte Seiten</translation>
    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="449"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="466"/>
+        <source>Empty</source>
+        <translation type="unfinished">Leer</translation>
+    </message>
    <message>
        <source>Sites You visited the most</source>
        <translation type="obsolete">Meistbesuchte Seiten</translation>
@ -926,42 +975,42 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ClickToFlash</name>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="95"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="110"/>
        <source>Object blocked by ClickToFlash</source>
        <translation>Objekt blockiert von ClickToFlash</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="96"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="111"/>
        <source>Show more informations about object</source>
        <translation>Mehr Informationen anzeigen</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="98"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="113"/>
        <source>Delete object</source>
        <translation>Objekt löschen</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="99"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="114"/>
        <source>Add %1 to whitelist</source>
        <translation>%1 zur Whitelist hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="205"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="220"/>
        <source>Flash Object</source>
        <translation>Flash Objekt</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Attribute Name&lt;/b&gt;</source>
        <translation>&lt;b&gt;Attribut Name&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Value&lt;/b&gt;</source>
        <translation>&lt;b&gt;Wert&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="219"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="234"/>
        <source>No more informations available.</source>
        <translation>Keine weiteren Informationen verfügbar.</translation>
    </message>
@ -1578,30 +1627,35 @@ p, li { white-space: pre-wrap; }
        <translation>Neuer Tab</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="76"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="82"/>
        <source>Open link in actual tab</source>
        <translation>Link in aktuellem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="77"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="83"/>
        <source>Open link in new tab</source>
        <translation>Link in neuem Tab öffnen</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="94"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="188"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="84"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/sidebar/historysidebar.cpp" line="101"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="195"/>
        <source>Today</source>
        <translation>Heute</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="96"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="190"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="197"/>
        <source>This Week</source>
        <translation>Diese Woche</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="98"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="192"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="105"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="199"/>
        <source>This Month</source>
        <translation>Dieser Monat</translation>
    </message>
@ -1642,12 +1696,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>MainApplication</name>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="584"/>
+        <location filename="../src/app/mainapplication.cpp" line="585"/>
        <source>Last session crashed</source>
        <translation>Die letzte Sitzung wurde unerwartet beendet</translation>
    </message>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="585"/>
+        <location filename="../src/app/mainapplication.cpp" line="586"/>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?</source>
        <translation>&lt;b&gt;QupZilla ist abgestürzt :-(&lt;/b&gt;&lt;br/&gt;Hoppla,die letzte Sitzung wurde unerwartet beendet. Verzeihung. Möchten Sie den letzten Status wiederherstellen?</translation>
    </message>
--- a/translations/es.ts
+++ b/translations/es.ts
@ -466,102 +466,131 @@ p, li { white-space: pre-wrap; }
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="83"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="90"/>
        <source>Delete</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="46"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="93"/>
        <source>Del</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="53"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
        <source>Add Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="66"/>
        <source>Optimize Database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <source>Add Subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Add new folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Choose name for new bookmark folder: </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="110"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Add new subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Choose name for new subfolder in bookmarks toolbar: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Choose name for folder: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="144"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="153"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
        <source>Open link in actual &amp;tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="154"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="188"/>
        <source>Open link in &amp;new tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="158"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="192"/>
        <source>Move bookmark to &amp;folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="159"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="335"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="377"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="193"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="479"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="521"/>
        <source>Unsorted Bookmarks</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="160"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="182"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="208"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="336"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="378"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="216"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="242"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="480"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="522"/>
        <source>Bookmarks In Menu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="161"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="210"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="337"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="379"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="221"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="244"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="406"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="481"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="523"/>
        <source>Bookmarks In ToolBar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="332"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="476"/>
        <source>&lt;b&gt;Warning: &lt;/b&gt;You already have this page bookmarked!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="343"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="487"/>
        <source>Choose name and location of bookmark.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="347"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="491"/>
        <source>Add New Bookmark</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="385"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="529"/>
        <source>Choose folder for bookmarks:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="386"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="530"/>
        <source>Bookmark All Tabs</source>
        <translation type="unfinished"></translation>
    </message>
@ -569,22 +598,22 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksModel</name>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="304"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="317"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="366"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="379"/>
        <source>Bookmarks In Menu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="306"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="319"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="368"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="381"/>
        <source>Bookmarks In ToolBar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="308"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="321"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="370"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="383"/>
        <source>Unsorted Bookmarks</source>
        <translation type="unfinished"></translation>
    </message>
@ -597,46 +626,33 @@ p, li { white-space: pre-wrap; }
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="70"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="71"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="102"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="99"/>
        <source>Open link in actual &amp;tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="100"/>
        <source>Open link in &amp;new tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="107"/>
-        <source>Move bookmark to &amp;folder</source>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="101"/>
+        <source>Copy address</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="108"/>
-        <source>Unsorted Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="109"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="198"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="224"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="201"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="222"/>
        <source>Bookmarks In Menu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="203"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="226"/>
-        <source>Bookmarks In ToolBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="116"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
        <source>&amp;Delete</source>
        <translation type="unfinished"></translation>
    </message>
@ -644,45 +660,66 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksToolbar</name>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="53"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="56"/>
        <source>&amp;Bookmark Current Page</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="54"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
        <source>Bookmark &amp;All Tabs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="55"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
        <source>&amp;Organize Bookmarks</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Hide Most &amp;Visited</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Show Most &amp;Visited</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="61"/>
        <source>&amp;Hide Toolbar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="80"/>
+        <source>Move right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="81"/>
+        <source>Move left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="83"/>
+        <source>Remove bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="411"/>
        <source>Most visited</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="412"/>
        <source>Sites you visited the most</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="449"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="466"/>
+        <source>Empty</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>BookmarksWidget</name>
@ -910,42 +947,42 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ClickToFlash</name>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="95"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="110"/>
        <source>Object blocked by ClickToFlash</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="96"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="111"/>
        <source>Show more informations about object</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="98"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="113"/>
        <source>Delete object</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="99"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="114"/>
        <source>Add %1 to whitelist</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="205"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="220"/>
        <source>Flash Object</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Attribute Name&lt;/b&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Value&lt;/b&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="219"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="234"/>
        <source>No more informations available.</source>
        <translation type="unfinished"></translation>
    </message>
@ -1560,30 +1597,35 @@ p, li { white-space: pre-wrap; }
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="76"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="82"/>
        <source>Open link in actual tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="77"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="83"/>
        <source>Open link in new tab</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="94"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="188"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="84"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/sidebar/historysidebar.cpp" line="101"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="195"/>
        <source>Today</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="96"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="190"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="197"/>
        <source>This Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="98"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="192"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="105"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="199"/>
        <source>This Month</source>
        <translation type="unfinished"></translation>
    </message>
@ -1615,12 +1657,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>MainApplication</name>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="584"/>
+        <location filename="../src/app/mainapplication.cpp" line="585"/>
        <source>Last session crashed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="585"/>
+        <location filename="../src/app/mainapplication.cpp" line="586"/>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/nl_NL.ts
+++ b/translations/nl_NL.ts
@ -474,102 +474,131 @@ p, li { white-space: pre-wrap; }
        <translation>URL</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="83"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="90"/>
        <source>Delete</source>
        <translation>Verwijder</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="46"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="93"/>
        <source>Del</source>
        <translation>Del</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="53"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
        <source>Add Folder</source>
        <translation>Voeg map toe</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="66"/>
        <source>Optimize Database</source>
        <translation>Optimaliseer database</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <source>Add Subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Add new folder</source>
        <translation>Voeg nieuwe map toe</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Choose name for new bookmark folder: </source>
        <translation>Kies naam voor nieuwe bladwijzermap: </translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="110"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="144"/>
        <source>New Tab</source>
        <translation>Nieuw tabblad</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="160"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="182"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="208"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="336"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="378"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="216"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="242"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="480"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="522"/>
        <source>Bookmarks In Menu</source>
        <translation>Bladwijzers in menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="161"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="210"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="337"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="379"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="221"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="244"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="406"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="481"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="523"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Bladwijzers op werkbalk</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="153"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Open link in actueel &amp;tabblad</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="154"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Add new subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Choose name for new subfolder in bookmarks toolbar: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Choose name for folder: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="188"/>
        <source>Open link in &amp;new tab</source>
        <translation>Open link in &amp;nieuw tabblad</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="158"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="192"/>
        <source>Move bookmark to &amp;folder</source>
        <translation>Verplaats bladwijzer naar &amp;map</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="159"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="335"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="377"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="193"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="479"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="521"/>
        <source>Unsorted Bookmarks</source>
        <translation>Ongesorteerde bladwijzers</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="332"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="476"/>
        <source>&lt;b&gt;Warning: &lt;/b&gt;You already have this page bookmarked!</source>
        <translation>&lt;b&gt;Waarschuwing: &lt;/b&gt;U heeft deze pagina al gebladwijzerd!</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="343"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="487"/>
        <source>Choose name and location of bookmark.</source>
        <translation>Kies naam en locatie van deze bladwijzer.</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="347"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="491"/>
        <source>Add New Bookmark</source>
        <translation>Voeg nieuwe bladwijzer toe</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="385"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="529"/>
        <source>Choose folder for bookmarks:</source>
        <translation>Kies map voor bladwijzers:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="386"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="530"/>
        <source>Bookmark All Tabs</source>
        <translation>Bladwijzer alle tabbladen</translation>
    </message>
@ -577,22 +606,22 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksModel</name>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="304"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="317"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="366"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="379"/>
        <source>Bookmarks In Menu</source>
        <translation>Bladwijzers in menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="306"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="319"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="368"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="381"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Bladwijzers op werkbalk</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="308"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="321"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="370"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="383"/>
        <source>Unsorted Bookmarks</source>
        <translation>Ongesorteerde bladwijzers</translation>
    </message>
@ -605,46 +634,45 @@ p, li { white-space: pre-wrap; }
        <translation>Zoeken...</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="70"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="71"/>
        <source>New Tab</source>
        <translation>Nieuw tabblad</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="102"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="99"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Open link in actuele &amp;tab</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="100"/>
        <source>Open link in &amp;new tab</source>
        <translation>Open link in &amp;nieuwe tabblad</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="107"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="101"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
        <source>Move bookmark to &amp;folder</source>
-        <translation>Verplaats bladwijzer naar &amp;map</translation>
+        <translation type="obsolete">Verplaats bladwijzer naar &amp;map</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="108"/>
        <source>Unsorted Bookmarks</source>
-        <translation>Ongesorteerde bladwijzers</translation>
+        <translation type="obsolete">Ongesorteerde bladwijzers</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="109"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="198"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="224"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="201"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="222"/>
        <source>Bookmarks In Menu</source>
        <translation>Bladwijzers in menu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="203"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="226"/>
        <source>Bookmarks In ToolBar</source>
-        <translation>Bladwijzers op werkbalk</translation>
+        <translation type="obsolete">Bladwijzers op werkbalk</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="116"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
        <source>&amp;Delete</source>
        <translation>&amp;Verwijder</translation>
    </message>
@ -652,45 +680,66 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksToolbar</name>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="53"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="56"/>
        <source>&amp;Bookmark Current Page</source>
        <translation>&amp;Bladwijzer huidige pagina</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="54"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
        <source>Bookmark &amp;All Tabs</source>
        <translation>Bladwijzer &amp;alle tabbladen</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="55"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
        <source>&amp;Organize Bookmarks</source>
        <translation>&amp;Sorteer bladwijzers</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Hide Most &amp;Visited</source>
        <translation>Verberg meest &amp;bezocht</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Show Most &amp;Visited</source>
        <translation>Toon meest &amp;bezocht</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="61"/>
        <source>&amp;Hide Toolbar</source>
        <translation>&amp;Verberg werkbalk</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="80"/>
+        <source>Move right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="81"/>
+        <source>Move left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="83"/>
+        <source>Remove bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="411"/>
        <source>Most visited</source>
        <translation>Meest bezocht</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="412"/>
        <source>Sites you visited the most</source>
        <translation>Websites die u het meest bezocht heeft</translation>
    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="449"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="466"/>
+        <source>Empty</source>
+        <translation type="unfinished">Leeg</translation>
+    </message>
    <message>
        <source>Sites You visited the most</source>
        <translation type="obsolete">Websites die u het meest bezocht heeft</translation>
@ -922,42 +971,42 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ClickToFlash</name>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="95"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="110"/>
        <source>Object blocked by ClickToFlash</source>
        <translation>Object geblokkeerd door KlikVoorFlash</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="96"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="111"/>
        <source>Show more informations about object</source>
        <translation>Toon meer informatie over object</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="98"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="113"/>
        <source>Delete object</source>
        <translation>Verwijder object</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="99"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="114"/>
        <source>Add %1 to whitelist</source>
        <translation>Voeg %1 toe aan witte lijst</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="205"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="220"/>
        <source>Flash Object</source>
        <translation>Flash-object</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Attribute Name&lt;/b&gt;</source>
        <translation>&lt;b&gt;Naam van attribuut&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Value&lt;/b&gt;</source>
        <translation>&lt;b&gt;Waarde&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="219"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="234"/>
        <source>No more informations available.</source>
        <translation>Geen verdere informatie beschikbaar.</translation>
    </message>
@ -1575,30 +1624,35 @@ werd niet gevonden!</translation>
        <translation>Nieuw tabblad</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="76"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="82"/>
        <source>Open link in actual tab</source>
        <translation>Open link in huidig tabblad</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="77"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="83"/>
        <source>Open link in new tab</source>
        <translation>Open link in nieuw tabblad</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="94"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="188"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="84"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/sidebar/historysidebar.cpp" line="101"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="195"/>
        <source>Today</source>
        <translation>Vandaag</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="96"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="190"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="197"/>
        <source>This Week</source>
        <translation>Deze week</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="98"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="192"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="105"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="199"/>
        <source>This Month</source>
        <translation>Deze maand</translation>
    </message>
@ -1640,12 +1694,12 @@ werd niet gevonden!</translation>
 <context>
    <name>MainApplication</name>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="584"/>
+        <location filename="../src/app/mainapplication.cpp" line="585"/>
        <source>Last session crashed</source>
        <translation>Laatste sessie gecrashed</translation>
    </message>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="585"/>
+        <location filename="../src/app/mainapplication.cpp" line="586"/>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?</source>
        <translation>&lt;b&gt;QupZilla crashte :-(&lt;/b&gt;&lt;br/&gt;Oeps, de laatste sessie van QupZilla eindigde met een crash. We verontschuldigen ons. Wilt u proberen om de opgeslagen status te herstellen?</translation>
    </message>
--- a/translations/sk_SK.ts
+++ b/translations/sk_SK.ts
@ -280,7 +280,7 @@ p, li { white-space: pre-wrap; }
        <location filename="../src/preferences/autofillmanager.ui" line="103"/>
        <location filename="../src/preferences/autofillmanager.cpp" line="70"/>
        <source>Show Passwords</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť heslo</translation>
    </message>
    <message>
        <location filename="../src/preferences/autofillmanager.ui" line="113"/>
@ -290,7 +290,7 @@ p, li { white-space: pre-wrap; }
    <message>
        <location filename="../src/preferences/autofillmanager.cpp" line="70"/>
        <source>Are you sure that you want to show all passwords?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ste si istý, že chcete zobraziť všetky heslá?</translation>
    </message>
    <message>
        <location filename="../src/preferences/autofillmanager.cpp" line="100"/>
@ -478,102 +478,131 @@ p, li { white-space: pre-wrap; }
        <translation>Adresa</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="83"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="90"/>
        <source>Delete</source>
        <translation>Odstrániť</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="46"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="93"/>
        <source>Del</source>
        <translation>Del</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="53"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="43"/>
        <source>Add Folder</source>
        <translation>Pridať priečinok</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="66"/>
        <source>Optimize Database</source>
        <translation>Optimalizovať databázu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.ui" line="76"/>
+        <source>Add Subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Add new folder</source>
        <translation>Pridať nový priečinok</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="80"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="84"/>
        <source>Choose name for new bookmark folder: </source>
        <translation>Zvoľte názov nového priečinka:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="110"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="144"/>
        <source>New Tab</source>
        <translation>Nová karta</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="160"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="182"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="208"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="336"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="378"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="216"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="242"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="480"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="522"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="161"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="210"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="337"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="379"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="111"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="221"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="244"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="406"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="481"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="523"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Panel záložiek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="153"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="187"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Otvoriť odkaz na ak&amp;tuálnej karte</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="154"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Add new subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="93"/>
+        <source>Choose name for new subfolder in bookmarks toolbar: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="114"/>
+        <source>Choose name for folder: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="188"/>
        <source>Open link in &amp;new tab</source>
        <translation>Otvoriť odkaz na &amp;novej karte</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="158"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="192"/>
        <source>Move bookmark to &amp;folder</source>
        <translation>Presunúť záložku do &amp;priečinka</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="159"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="335"/>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="377"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="193"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="479"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="521"/>
        <source>Unsorted Bookmarks</source>
        <translation>Neroztriedené záložky</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="332"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="476"/>
        <source>&lt;b&gt;Warning: &lt;/b&gt;You already have this page bookmarked!</source>
        <translation>&lt;b&gt;Upozornenie: &lt;/b&gt;Túto stránku už máte v záložkách!</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="343"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="487"/>
        <source>Choose name and location of bookmark.</source>
        <translation>Zvoľte názov a umiestnenie záložky.</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="347"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="491"/>
        <source>Add New Bookmark</source>
        <translation>Pridať novú záložku</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="385"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="529"/>
        <source>Choose folder for bookmarks:</source>
        <translation>Zvoľte priečinok pre záložky:</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="386"/>
+        <location filename="../src/bookmarks/bookmarksmanager.cpp" line="530"/>
        <source>Bookmark All Tabs</source>
        <translation>Pridať všetky karty do záložiek</translation>
    </message>
@ -581,22 +610,22 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksModel</name>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="304"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="317"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="366"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="379"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="261"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="306"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="319"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="267"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="368"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="381"/>
        <source>Bookmarks In ToolBar</source>
        <translation>Panel záložiek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="308"/>
-        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="321"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="370"/>
+        <location filename="../src/bookmarks/bookmarksmodel.cpp" line="383"/>
        <source>Unsorted Bookmarks</source>
        <translation>Neroztriedené záložky</translation>
    </message>
@ -609,46 +638,45 @@ p, li { white-space: pre-wrap; }
        <translation>Hľadať...</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="70"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="71"/>
        <source>New Tab</source>
        <translation>Nová karta</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="102"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="99"/>
        <source>Open link in actual &amp;tab</source>
        <translation>Otvoriť odkaz na &amp;aktuálnej karte</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="100"/>
        <source>Open link in &amp;new tab</source>
        <translation>Otvoriť odkaz na &amp;novej karte</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="107"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="101"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
        <source>Move bookmark to &amp;folder</source>
-        <translation>Presunúť záložku do &amp;priečinka</translation>
+        <translation type="obsolete">Presunúť záložku do &amp;priečinka</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="108"/>
        <source>Unsorted Bookmarks</source>
-        <translation>Neroztriedené záložky</translation>
+        <translation type="obsolete">Neroztriedené záložky</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="109"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="198"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="224"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="201"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="222"/>
        <source>Bookmarks In Menu</source>
        <translation>Záložky v menu</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="203"/>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="226"/>
        <source>Bookmarks In ToolBar</source>
-        <translation>Panel záložiek</translation>
+        <translation type="obsolete">Panel záložiek</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="116"/>
+        <location filename="../src/sidebar/bookmarkssidebar.cpp" line="103"/>
        <source>&amp;Delete</source>
        <translation>O&amp;dstrániť</translation>
    </message>
@ -656,45 +684,66 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>BookmarksToolbar</name>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="53"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="56"/>
        <source>&amp;Bookmark Current Page</source>
        <translation>Pridať &amp;stránku do záložiek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="54"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
        <source>Bookmark &amp;All Tabs</source>
        <translation>Pridať všetky k&amp;arty do záložiek</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="55"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
        <source>&amp;Organize Bookmarks</source>
        <translation>&amp;Organizovať záložky</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Hide Most &amp;Visited</source>
        <translation>Skryť najna&amp;vštevovanejšie</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="57"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="60"/>
        <source>Show Most &amp;Visited</source>
        <translation>Zobraziť najna&amp;vštevovanejšie</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="58"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="61"/>
        <source>&amp;Hide Toolbar</source>
        <translation>Skr&amp;yť panel</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="194"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="80"/>
+        <source>Move right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="81"/>
+        <source>Move left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="83"/>
+        <source>Remove bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="411"/>
        <source>Most visited</source>
        <translation>Najnavštevovanejšie</translation>
    </message>
    <message>
-        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="195"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="412"/>
        <source>Sites you visited the most</source>
        <translation>Najnavštevovanejšie stránky</translation>
    </message>
+    <message>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="449"/>
+        <location filename="../src/bookmarks/bookmarkstoolbar.cpp" line="466"/>
+        <source>Empty</source>
+        <translation type="unfinished">Prázdne</translation>
+    </message>
    <message>
        <source>Sites You visited the most</source>
        <translation type="obsolete">Najnavštevovanejšie stránky</translation>
@ -926,42 +975,42 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ClickToFlash</name>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="95"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="110"/>
        <source>Object blocked by ClickToFlash</source>
        <translation>Objekt blokovaný ClickToFlash pluginom</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="96"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="111"/>
        <source>Show more informations about object</source>
        <translation>Zobraziť viac informácií o objekte</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="98"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="113"/>
        <source>Delete object</source>
        <translation>Vymazať objekt</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="99"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="114"/>
        <source>Add %1 to whitelist</source>
        <translation>Pridať %1 na zoznam výnimiek</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="205"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="220"/>
        <source>Flash Object</source>
        <translation>Flash objekt</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Attribute Name&lt;/b&gt;</source>
        <translation>&lt;b&gt;Názov atribútu&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="208"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="223"/>
        <source>&lt;b&gt;Value&lt;/b&gt;</source>
        <translation>&lt;b&gt;Hodnota&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../src/plugins/clicktoflash.cpp" line="219"/>
+        <location filename="../src/plugins/clicktoflash.cpp" line="234"/>
        <source>No more informations available.</source>
        <translation>Žiadne ďalšie dostupné informácie.</translation>
    </message>
@ -1586,30 +1635,35 @@ p, li { white-space: pre-wrap; }
        <translation>Nová karta</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="76"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="82"/>
        <source>Open link in actual tab</source>
        <translation>Otvoriť odkaz v aktuálnej karte</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="77"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="83"/>
        <source>Open link in new tab</source>
        <translation>Otvoriť odkaz na novej karte</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="94"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="188"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="84"/>
+        <source>Copy address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/sidebar/historysidebar.cpp" line="101"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="195"/>
        <source>Today</source>
        <translation>Dnes</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="96"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="190"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="103"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="197"/>
        <source>This Week</source>
        <translation>Tento týždeň</translation>
    </message>
    <message>
-        <location filename="../src/sidebar/historysidebar.cpp" line="98"/>
-        <location filename="../src/sidebar/historysidebar.cpp" line="192"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="105"/>
+        <location filename="../src/sidebar/historysidebar.cpp" line="199"/>
        <source>This Month</source>
        <translation>Tento mesiac</translation>
    </message>
@ -1650,12 +1704,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>MainApplication</name>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="584"/>
+        <location filename="../src/app/mainapplication.cpp" line="585"/>
        <source>Last session crashed</source>
        <translation>Minulá relácia spadla</translation>
    </message>
    <message>
-        <location filename="../src/app/mainapplication.cpp" line="585"/>
+        <location filename="../src/app/mainapplication.cpp" line="586"/>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?</source>
        <translation>&lt;b&gt;QupZilla spadla :-(&lt;/b&gt;&lt;br/&gt;Oops, minulá relácia QupZilly skončila pádom. Veľmi sa ospravedlňujeme. Chcete sa pokúsiť obnoviť uložený stav?</translation>
    </message>