diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
index b0355df0..8d738d7f 100644
--- a/YACReaderLibrary/grid_comics_view.cpp
+++ b/YACReaderLibrary/grid_comics_view.cpp
@@ -100,12 +100,15 @@ GridComicsView::GridComicsView(QWidget *parent) :
     ctxt->setContextProperty("dragManager", this);
     ctxt->setContextProperty("dropManager", this);
 
-    ctxt->setContextProperty("showInfo", false);
+    bool showInfo = settings->value(COMICS_GRID_SHOW_INFO, false).toBool();
+    ctxt->setContextProperty("showInfo", showInfo);
 
     view->setSource(QUrl("qrc:/qml/GridComicsView.qml"));
 
-    showInfoAction = new QAction("Show info",this);
+    showInfoAction = new QAction(tr("Show info"),this);
+    showInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/show_comic_info.png"));
     showInfoAction->setCheckable(true);
+    showInfoAction->setChecked(showInfo);
     connect(showInfoAction, &QAction::toggled, this, &GridComicsView::showInfo);
 
     setShowMarks(true);//TODO save this in settings
@@ -166,6 +169,7 @@ void GridComicsView::setToolBar(QToolBar *toolBar)
 
     toolBarStretchAction = toolBar->addWidget(toolBarStretch);
     toolBar->addAction(showInfoAction);
+    showInfoSeparatorAction = toolBar->addSeparator();
     coverSizeSliderAction = toolBar->addWidget(coverSizeSliderWidget);
 }
 
@@ -433,6 +437,7 @@ void GridComicsView::closeEvent(QCloseEvent *event)
 {
     toolbar->removeAction(toolBarStretchAction);
     toolbar->removeAction(showInfoAction);
+    toolbar->removeAction(showInfoSeparatorAction);
     toolbar->removeAction(coverSizeSliderAction);
 
     /*QObject *object = view->rootObject();
@@ -445,4 +450,5 @@ void GridComicsView::closeEvent(QCloseEvent *event)
 
     //save settings
     settings->setValue(COMICS_GRID_COVER_SIZES, coverSizeSlider->value());
+    settings->setValue(COMICS_GRID_SHOW_INFO, showInfoAction->isChecked());
 }
diff --git a/YACReaderLibrary/grid_comics_view.h b/YACReaderLibrary/grid_comics_view.h
index 9aa6b9b8..8d3348ce 100644
--- a/YACReaderLibrary/grid_comics_view.h
+++ b/YACReaderLibrary/grid_comics_view.h
@@ -77,6 +77,7 @@ private:
     QSlider * coverSizeSlider;
     QAction * coverSizeSliderAction;
     QAction * showInfoAction;
+    QAction * showInfoSeparatorAction;
 
     YACReaderComicsSelectionHelper * selectionHelper;
     YACReaderComicInfoHelper * comicInfoHelper;
diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index 3eb7b46c..07aa91bc 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -35,7 +35,9 @@
         <file>../images/comics_view_toolbar/small_size_grid_zoom.png</file>
         <file>../images/comics_view_toolbar/small_size_grid_zoom@2x.png</file>
         <file>../images/comics_view_toolbar/trash.png</file>
-        <file>../images/comics_view_toolbar/trash.png</file>
+        <file>../images/comics_view_toolbar/trash@2x.png</file>
+        <file>../images/comics_view_toolbar/show_comic_info.png</file>
+        <file>../images/comics_view_toolbar/show_comic_info@2x.png</file>
         <file>../images/coversPackage.png</file>
         <file>../images/db.png</file>
         <file>../images/defaultCover.png</file>
diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml
index 9f5e7e29..247beed8 100644
--- a/YACReaderLibrary/qml/GridComicsView.qml
+++ b/YACReaderLibrary/qml/GridComicsView.qml
@@ -471,7 +471,7 @@ Rectangle {
             anchors.rightMargin: 10
             pixelAligned: true
             //flickDeceleration: -2000
-            snapMode: GridView.SnapToRow
+
             currentIndex: 0
             cacheBuffer: 0
 
diff --git a/common/yacreader_global_gui.h b/common/yacreader_global_gui.h
index 970e6264..2105cac9 100644
--- a/common/yacreader_global_gui.h
+++ b/common/yacreader_global_gui.h
@@ -53,6 +53,7 @@
 #define COMICS_VIEW_FLOW_SPLITTER_STATUS "COMICS_VIEW_FLOW_SPLITTER_STATUS"
 #define SIDEBAR_SPLITTER_STATUS "SIDEBAR_SPLITTER_STATUS"
 #define COMICS_GRID_COVER_SIZES "COMICS_GRID_COVER_SIZES"
+#define COMICS_GRID_SHOW_INFO "COMICS_GRID_SHOW_INFO"
 
 #define COMIC_VINE_API_KEY "COMIC_VINE_API_KEY"
 #define COMIC_VINE_BASE_URL "COMIC_VINE_BASE_URL"
diff --git a/images/comics_view_toolbar/show_comic_info.png b/images/comics_view_toolbar/show_comic_info.png
new file mode 100644
index 00000000..277dbc23
Binary files /dev/null and b/images/comics_view_toolbar/show_comic_info.png differ
diff --git a/images/comics_view_toolbar/show_comic_info@2x.png b/images/comics_view_toolbar/show_comic_info@2x.png
new file mode 100644
index 00000000..530d1f93
Binary files /dev/null and b/images/comics_view_toolbar/show_comic_info@2x.png differ