diff --git a/YACReaderLibrary/folder_content_view.cpp b/YACReaderLibrary/folder_content_view.cpp
index 79d87fa3..485032bf 100644
--- a/YACReaderLibrary/folder_content_view.cpp
+++ b/YACReaderLibrary/folder_content_view.cpp
@@ -283,9 +283,6 @@ void FolderContentView::applyTheme(const Theme &theme)
// Info panel colors
ctxt->setContextProperty("infoBackgroundColor", qv.infoBackgroundColor);
- ctxt->setContextProperty("topShadow", qv.topShadow.isEmpty() ? QUrl() : QUrl(qv.topShadow));
- ctxt->setContextProperty("infoShadow", qv.infoShadow);
- ctxt->setContextProperty("infoIndicator", qv.infoIndicator);
ctxt->setContextProperty("infoTextColor", qv.infoTextColor);
ctxt->setContextProperty("infoTitleColor", qv.infoTitleColor);
diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
index f30e4f90..262fb1cc 100644
--- a/YACReaderLibrary/grid_comics_view.cpp
+++ b/YACReaderLibrary/grid_comics_view.cpp
@@ -501,9 +501,6 @@ void GridComicsView::applyTheme(const Theme &theme)
// Info panel colors
ctxt->setContextProperty("infoBackgroundColor", qv.infoBackgroundColor);
- ctxt->setContextProperty("topShadow", qv.topShadow.isEmpty() ? QUrl() : QUrl(qv.topShadow));
- ctxt->setContextProperty("infoShadow", qv.infoShadow);
- ctxt->setContextProperty("infoIndicator", qv.infoIndicator);
ctxt->setContextProperty("infoTextColor", qv.infoTextColor);
ctxt->setContextProperty("infoTitleColor", qv.infoTitleColor);
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
index 87e35a53..ce442f1f 100644
--- a/YACReaderLibrary/info_comics_view.cpp
+++ b/YACReaderLibrary/info_comics_view.cpp
@@ -228,9 +228,9 @@ void InfoComicsView::applyTheme(const Theme &theme)
// Info panel colors
ctxt->setContextProperty("infoBackgroundColor", qv.infoBackgroundColor);
- ctxt->setContextProperty("topShadow", qv.topShadow.isEmpty() ? QUrl() : QUrl(qv.topShadow));
- ctxt->setContextProperty("infoShadow", qv.infoShadow);
- ctxt->setContextProperty("infoIndicator", qv.infoIndicator);
+ ctxt->setContextProperty("topShadow", QUrl::fromLocalFile(qv.topShadow));
+ ctxt->setContextProperty("infoShadow", QUrl::fromLocalFile(qv.infoShadow));
+ ctxt->setContextProperty("infoIndicator", QUrl::fromLocalFile(qv.infoIndicator));
ctxt->setContextProperty("infoTextColor", qv.infoTextColor);
ctxt->setContextProperty("infoTitleColor", qv.infoTitleColor);
diff --git a/YACReaderLibrary/qml.qrc b/YACReaderLibrary/qml.qrc
index d216b4f8..2d767d06 100644
--- a/YACReaderLibrary/qml.qrc
+++ b/YACReaderLibrary/qml.qrc
@@ -11,13 +11,9 @@
qml/reading.svg
qml/star.svg
qml/page.svg
- qml/info-indicator.png
- qml/info-shadow.png
- qml/info-indicator-light.png
- qml/info-shadow-light.png
- qml/info-indicator-light@2x.png
- qml/info-shadow-light@2x.png
- qml/info-top-shadow.png
+ qml/info-indicator.svg
+ qml/info-shadow.svg
+ qml/info-top-shadow.svg
qml/ComicInfoView.qml
qml/info-favorites.svg
qml/info-rating.svg
diff --git a/YACReaderLibrary/qml/info-indicator-light.png b/YACReaderLibrary/qml/info-indicator-light.png
deleted file mode 100644
index b08a8ead..00000000
Binary files a/YACReaderLibrary/qml/info-indicator-light.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-indicator-light@2x.png b/YACReaderLibrary/qml/info-indicator-light@2x.png
deleted file mode 100644
index 38abb8c8..00000000
Binary files a/YACReaderLibrary/qml/info-indicator-light@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-indicator.png b/YACReaderLibrary/qml/info-indicator.png
deleted file mode 100644
index af4a616a..00000000
Binary files a/YACReaderLibrary/qml/info-indicator.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-indicator.svg b/YACReaderLibrary/qml/info-indicator.svg
new file mode 100644
index 00000000..84d28a33
--- /dev/null
+++ b/YACReaderLibrary/qml/info-indicator.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-shadow-light.png b/YACReaderLibrary/qml/info-shadow-light.png
deleted file mode 100644
index e52f2c7a..00000000
Binary files a/YACReaderLibrary/qml/info-shadow-light.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-shadow-light@2x.png b/YACReaderLibrary/qml/info-shadow-light@2x.png
deleted file mode 100644
index 3abb75af..00000000
Binary files a/YACReaderLibrary/qml/info-shadow-light@2x.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-shadow.png b/YACReaderLibrary/qml/info-shadow.png
deleted file mode 100644
index 3508da2e..00000000
Binary files a/YACReaderLibrary/qml/info-shadow.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-shadow.svg b/YACReaderLibrary/qml/info-shadow.svg
new file mode 100644
index 00000000..67957428
--- /dev/null
+++ b/YACReaderLibrary/qml/info-shadow.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/qml/info-top-shadow.png b/YACReaderLibrary/qml/info-top-shadow.png
deleted file mode 100644
index 1fd60281..00000000
Binary files a/YACReaderLibrary/qml/info-top-shadow.png and /dev/null differ
diff --git a/YACReaderLibrary/qml/info-top-shadow.svg b/YACReaderLibrary/qml/info-top-shadow.svg
new file mode 100644
index 00000000..f8092b2a
--- /dev/null
+++ b/YACReaderLibrary/qml/info-top-shadow.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/themes/theme.h b/YACReaderLibrary/themes/theme.h
index bf3b7a1d..11dd94ad 100644
--- a/YACReaderLibrary/themes/theme.h
+++ b/YACReaderLibrary/themes/theme.h
@@ -226,9 +226,9 @@ struct QmlViewTheme {
// Info panel colors
QColor infoBackgroundColor;
- QString topShadow; // Image filename
- QString infoShadow; // Image filename
- QString infoIndicator; // Image filename
+ QString topShadow; // Recolored SVG path
+ QString infoShadow; // Recolored SVG path
+ QString infoIndicator; // Recolored SVG path
QColor infoTextColor;
QColor infoTitleColor;
diff --git a/YACReaderLibrary/themes/theme_factory.cpp b/YACReaderLibrary/themes/theme_factory.cpp
index f6fda6ca..75cb914a 100644
--- a/YACReaderLibrary/themes/theme_factory.cpp
+++ b/YACReaderLibrary/themes/theme_factory.cpp
@@ -149,9 +149,8 @@ struct QmlViewParams {
// Info panel colors
QColor infoBackgroundColor;
- QString topShadow; // Image filename
- QString infoShadow; // Image filename
- QString infoIndicator; // Image filename
+ QColor infoBorderColor;
+ QColor infoShadowColor;
QColor infoTextColor;
QColor infoTitleColor;
@@ -494,9 +493,9 @@ Theme makeTheme(const ThemeParams ¶ms)
theme.qmlView.textColor = qv.textColor;
theme.qmlView.showDropShadow = qv.showDropShadow;
theme.qmlView.infoBackgroundColor = qv.infoBackgroundColor;
- theme.qmlView.topShadow = qv.topShadow;
- theme.qmlView.infoShadow = qv.infoShadow;
- theme.qmlView.infoIndicator = qv.infoIndicator;
+ theme.qmlView.topShadow = recoloredSvgToThemeFile(":/qml/info-top-shadow.svg", qv.infoBackgroundColor, qv.infoBorderColor, qv.infoShadowColor, params.themeName);
+ theme.qmlView.infoShadow = recoloredSvgToThemeFile(":/qml/info-shadow.svg", qv.infoBackgroundColor, qv.infoBorderColor, qv.infoShadowColor, params.themeName);
+ theme.qmlView.infoIndicator = recoloredSvgToThemeFile(":/qml/info-indicator.svg", qv.infoBackgroundColor, qv.infoBorderColor, qv.infoShadowColor, params.themeName);
theme.qmlView.infoTextColor = qv.infoTextColor;
theme.qmlView.infoTitleColor = qv.infoTitleColor;
theme.qmlView.ratingUnselectedColor = qv.ratingUnselectedColor;
@@ -991,9 +990,8 @@ ThemeParams classicThemeParams()
qv.textColor = QColor(0xA8A8A8);
qv.showDropShadow = true;
qv.infoBackgroundColor = QColor(0x2E2E2E);
- qv.topShadow = "info-top-shadow.png";
- qv.infoShadow = "info-shadow.png";
- qv.infoIndicator = "info-indicator.png";
+ qv.infoBorderColor = QColor(0x404040);
+ qv.infoShadowColor = Qt::black;
qv.infoTextColor = QColor(0xB0B0B0);
qv.infoTitleColor = QColor(0xFFFFFF);
qv.ratingUnselectedColor = QColor(0x1C1C1C);
@@ -1244,9 +1242,8 @@ ThemeParams lightThemeParams()
qv.textColor = QColor(0x636363);
qv.showDropShadow = true;
qv.infoBackgroundColor = QColor(0xFFFFFF);
- qv.topShadow = "";
- qv.infoShadow = "info-shadow-light.png";
- qv.infoIndicator = "info-indicator-light.png";
+ qv.infoBorderColor = QColor(0x808080);
+ qv.infoShadowColor = QColor(0x444444);
qv.infoTextColor = QColor(0x404040);
qv.infoTitleColor = QColor(0x2E2E2E);
qv.ratingUnselectedColor = QColor(0xDEDEDE);
@@ -1497,9 +1494,8 @@ ThemeParams darkThemeParams()
qv.textColor = QColor(0xA8A8A8);
qv.showDropShadow = true;
qv.infoBackgroundColor = QColor(0x2E2E2E);
- qv.topShadow = "info-top-shadow.png";
- qv.infoShadow = "info-shadow.png";
- qv.infoIndicator = "info-indicator.png";
+ qv.infoBorderColor = QColor(0x404040);
+ qv.infoShadowColor = Qt::black;
qv.infoTextColor = QColor(0xB0B0B0);
qv.infoTitleColor = QColor(0xFFFFFF);
qv.ratingUnselectedColor = QColor(0x1C1C1C);