diff --git a/application/palemoon/themes/windows/places/libraryToolbar.svg b/application/palemoon/themes/windows/places/libraryToolbar.svg
new file mode 100644
index 0000000000..5fcf42ae3a
--- /dev/null
+++ b/application/palemoon/themes/windows/places/libraryToolbar.svg
@@ -0,0 +1,41 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
+  <defs>
+    <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f9f3ac"/>
+      <stop offset="1" stop-color="#ffdc46"/>
+    </linearGradient>
+    <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#e3f1fc"/>
+    </linearGradient>
+  </defs>
+  <g id="file">
+    <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/>
+    <g id="file-individual">
+      <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/>
+      <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/>
+    </g>
+  </g>
+  <g id="view">
+    <path fill="#a7dd8c" d="M17 2v1h2V2z"/>
+    <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill="#c5a2ec" d="M17 4v1h2V4z"/>
+    <path fill="#ec8e8e" d="M17 6v1h2V6z"/>
+    <path fill="#8ebbec" d="M17 9v1h2V9z"/>
+    <path fill="#a7dd8c" d="M17 11v1h2v-1z"/>
+    <path fill="#fac090" d="M17 13v1h2v-1z"/>
+  </g>
+  <g id="bk-restore">
+    <g id="star">
+      <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/>
+      <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/>
+    </g>
+    <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/>
+  </g>
+</svg>
diff --git a/application/palemoon/themes/windows/places/organizer.css b/application/palemoon/themes/windows/places/organizer.css
index 45851d0da6..f7b87d34ef 100644
--- a/application/palemoon/themes/windows/places/organizer.css
+++ b/application/palemoon/themes/windows/places/organizer.css
@@ -6,12 +6,14 @@
   --toolbar-custom-color: hsl(210,75%,92%);
   --toolbar-highlight-top: rgba(255,255,255,.5);
   --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
+  --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png");
 }
 
 /* Use SVG for HiDPI 133%+ */
 @media (min-resolution: 1.33dppx) {
   :root {
     --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+    --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg");
   }
 }
 
@@ -92,35 +94,23 @@
 #organizeButton, 
 #viewMenu, 
 #maintenanceButton {
-  list-style-image: url("chrome://browser/skin/places/libraryToolbar.png");
+  list-style-image: var(--library-toolbar-image);
 }
 
 /* organize button */
 #organizeButton {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
-#organizeButton:hover,
-#organizeButton[open="true"] {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
 
 /* view button */
 #viewMenu {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
-#viewMenu:hover,
-#viewMenu[open="true"] {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
 
 /* maintenance button */
 #maintenanceButton {
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
-#maintenanceButton:hover,
-#maintenanceButton[open="true"] {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
 
 /* Root View */
 #placesView {