diff --git a/Pdf4QtLib/sources/pdfitemmodels.cpp b/Pdf4QtLib/sources/pdfitemmodels.cpp
index 896f03f..f608ac4 100644
--- a/Pdf4QtLib/sources/pdfitemmodels.cpp
+++ b/Pdf4QtLib/sources/pdfitemmodels.cpp
@@ -713,7 +713,6 @@ QVariant PDFThumbnailsItemModel::data(const QModelIndex& index, int role) const
             QSizeF pageSize = page->getRotatedMediaBox().size();
             pageSize.scale(m_thumbnailSize, m_thumbnailSize, Qt::KeepAspectRatio);
             return pageSize.toSize() + QSize(m_extraItemWidthHint, m_extraItemHeighHint);
-            break;
         }
 
         default:
diff --git a/Pdf4QtViewer/pdf4qtviewer.qrc b/Pdf4QtViewer/pdf4qtviewer.qrc
index 1cd1bbc..997d02c 100644
--- a/Pdf4QtViewer/pdf4qtviewer.qrc
+++ b/Pdf4QtViewer/pdf4qtviewer.qrc
@@ -92,5 +92,11 @@
         <file>resources/pce-same-width.svg</file>
         <file>resources/certificate-manager.svg</file>
         <file>resources/select-table.svg</file>
+        <file>resources/sidebar-signature.png</file>
+        <file>resources/sidebar-speech.png</file>
+        <file>resources/sidebar-outline.png</file>
+        <file>resources/sidebar-thumbnails.png</file>
+        <file>resources/sidebar-visibility.png</file>
+        <file>resources/sidebar-attachment.png</file>
     </qresource>
 </RCC>
diff --git a/Pdf4QtViewer/pdfsidebarwidget.cpp b/Pdf4QtViewer/pdfsidebarwidget.cpp
index 08e0bc8..aea1f30 100644
--- a/Pdf4QtViewer/pdfsidebarwidget.cpp
+++ b/Pdf4QtViewer/pdfsidebarwidget.cpp
@@ -1,4 +1,4 @@
-//    Copyright (C) 2019-2022 Jakub Melka
+//    Copyright (C) 2019-2023 Jakub Melka
 //
 //    This file is part of PDF4QT.
 //
@@ -113,7 +113,7 @@ PDFSidebarWidget::PDFSidebarWidget(pdf::PDFDrawWidgetProxy* proxy,
     {
         if (pageInfo.second.button)
         {
-            connect(pageInfo.second.button, &QPushButton::clicked, this, &PDFSidebarWidget::onPageButtonClicked);
+            connect(pageInfo.second.button, &QToolButton::clicked, this, &PDFSidebarWidget::onPageButtonClicked);
         }
     }
 
diff --git a/Pdf4QtViewer/pdfsidebarwidget.h b/Pdf4QtViewer/pdfsidebarwidget.h
index b42652a..0aa30f3 100644
--- a/Pdf4QtViewer/pdfsidebarwidget.h
+++ b/Pdf4QtViewer/pdfsidebarwidget.h
@@ -1,4 +1,4 @@
-//    Copyright (C) 2019-2021 Jakub Melka
+//    Copyright (C) 2019-2023 Jakub Melka
 //
 //    This file is part of PDF4QT.
 //
@@ -24,6 +24,7 @@
 #include <QWidget>
 
 class QPushButton;
+class QToolButton;
 class QWidget;
 
 namespace Ui
@@ -113,7 +114,7 @@ private:
 
     struct PageInfo
     {
-        QPushButton* button = nullptr;
+        QToolButton* button = nullptr;
         QWidget* page = nullptr;
     };
 
diff --git a/Pdf4QtViewer/pdfsidebarwidget.ui b/Pdf4QtViewer/pdfsidebarwidget.ui
index e13eeac..858583c 100644
--- a/Pdf4QtViewer/pdfsidebarwidget.ui
+++ b/Pdf4QtViewer/pdfsidebarwidget.ui
@@ -29,79 +29,193 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QPushButton" name="bookmarksButton">
+      <widget class="QToolButton" name="bookmarksButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Bookmarks</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-outline.png</normaloff>:/resources/sidebar-outline.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="thumbnailsButton">
+      <widget class="QToolButton" name="thumbnailsButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Thumbnails</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-thumbnails.png</normaloff>:/resources/sidebar-thumbnails.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="optionalContentButton">
+      <widget class="QToolButton" name="optionalContentButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Visibility</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-visibility.png</normaloff>:/resources/sidebar-visibility.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="attachmentsButton">
+      <widget class="QToolButton" name="attachmentsButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Attachments</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-attachment.png</normaloff>:/resources/sidebar-attachment.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="speechButton">
+      <widget class="QToolButton" name="speechButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Speech</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-speech.png</normaloff>:/resources/sidebar-speech.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="signaturesButton">
+      <widget class="QToolButton" name="signaturesButton">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Signatures</string>
        </property>
+       <property name="icon">
+        <iconset resource="pdf4qtviewer.qrc">
+         <normaloff>:/resources/sidebar-signature.png</normaloff>:/resources/sidebar-signature.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-       <property name="flat">
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextUnderIcon</enum>
+       </property>
+       <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
@@ -124,7 +238,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>6</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="emptyPage"/>
      <widget class="QWidget" name="bookmarksPage">
@@ -175,7 +289,7 @@
              <string>Synchronize thumbnails with current page</string>
             </property>
             <property name="icon">
-             <iconset resource="pdfforqtviewer.qrc">
+             <iconset resource="pdf4qtviewer.qrc">
               <normaloff>:/resources/synchronize.svg</normaloff>:/resources/synchronize.svg</iconset>
             </property>
             <property name="checkable">
@@ -350,7 +464,7 @@
          <item>
           <widget class="QToolButton" name="speechPlayButton">
            <property name="icon">
-            <iconset resource="pdfforqtviewer.qrc">
+            <iconset resource="pdf4qtviewer.qrc">
              <normaloff>:/resources/play.svg</normaloff>:/resources/play.svg</iconset>
            </property>
           </widget>
@@ -358,7 +472,7 @@
          <item>
           <widget class="QToolButton" name="speechPauseButton">
            <property name="icon">
-            <iconset resource="pdfforqtviewer.qrc">
+            <iconset resource="pdf4qtviewer.qrc">
              <normaloff>:/resources/pause.svg</normaloff>:/resources/pause.svg</iconset>
            </property>
           </widget>
@@ -366,7 +480,7 @@
          <item>
           <widget class="QToolButton" name="speechStopButton">
            <property name="icon">
-            <iconset resource="pdfforqtviewer.qrc">
+            <iconset resource="pdf4qtviewer.qrc">
              <normaloff>:/resources/stop.svg</normaloff>:/resources/stop.svg</iconset>
            </property>
           </widget>
@@ -387,7 +501,7 @@
          <item>
           <widget class="QToolButton" name="speechSynchronizeButton">
            <property name="icon">
-            <iconset resource="pdfforqtviewer.qrc">
+            <iconset resource="pdf4qtviewer.qrc">
              <normaloff>:/resources/synchronize.svg</normaloff>:/resources/synchronize.svg</iconset>
            </property>
            <property name="checkable">
@@ -441,7 +555,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="pdfforqtviewer.qrc"/>
+  <include location="pdf4qtviewer.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Pdf4QtViewer/resources/sidebar-attachment.png b/Pdf4QtViewer/resources/sidebar-attachment.png
new file mode 100644
index 0000000..dfd0620
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-attachment.png differ
diff --git a/Pdf4QtViewer/resources/sidebar-outline.png b/Pdf4QtViewer/resources/sidebar-outline.png
new file mode 100644
index 0000000..829d0c1
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-outline.png differ
diff --git a/Pdf4QtViewer/resources/sidebar-signature.png b/Pdf4QtViewer/resources/sidebar-signature.png
new file mode 100644
index 0000000..3074e28
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-signature.png differ
diff --git a/Pdf4QtViewer/resources/sidebar-speech.png b/Pdf4QtViewer/resources/sidebar-speech.png
new file mode 100644
index 0000000..cc0deb2
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-speech.png differ
diff --git a/Pdf4QtViewer/resources/sidebar-thumbnails.png b/Pdf4QtViewer/resources/sidebar-thumbnails.png
new file mode 100644
index 0000000..4762437
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-thumbnails.png differ
diff --git a/Pdf4QtViewer/resources/sidebar-visibility.png b/Pdf4QtViewer/resources/sidebar-visibility.png
new file mode 100644
index 0000000..20d64e3
Binary files /dev/null and b/Pdf4QtViewer/resources/sidebar-visibility.png differ