diff --git a/toonz/sources/toonzqt/paletteviewer.cpp b/toonz/sources/toonzqt/paletteviewer.cpp
index cd7a4546..d87f49a1 100644
--- a/toonz/sources/toonzqt/paletteviewer.cpp
+++ b/toonz/sources/toonzqt/paletteviewer.cpp
@@ -393,6 +393,10 @@ void PaletteViewer::createPaletteToolBar() {
     m_paletteToolBar->setStyleSheet("QToolBar{spacing:3px;}");
     m_paletteToolBar->addWidget(m_freezePaletteToolButton);
 
+    m_paletteToolBar->addSeparator();
+    CommandManager *cmd = CommandManager::instance();
+    QAction *gizmo      = cmd->getAction("MI_OpenPltGizmo");
+    m_paletteToolBar->addAction(gizmo);
   } else if (m_viewType == STUDIO_PALETTE) {
     QToolButton *toolButton = new QToolButton(this);
     toolButton->setPopupMode(QToolButton::InstantPopup);
diff --git a/toonz/sources/toonzqt/paletteviewergui.cpp b/toonz/sources/toonzqt/paletteviewergui.cpp
index 228645cd..c8638847 100644
--- a/toonz/sources/toonzqt/paletteviewergui.cpp
+++ b/toonz/sources/toonzqt/paletteviewergui.cpp
@@ -726,12 +726,16 @@ void PageViewer::paintEvent(QPaintEvent *e) {
       }
 
       // draw frame if the style is selected or current
-      if (m_styleSelection->isSelected(m_page->getIndex(), i) ||
-          currentStyleIndex == styleIndex) {
+      if (m_styleSelection->isSelected(m_page->getIndex(), i)) {
         QRect itemRect = getItemRect(i).adjusted(0, -1, 0, 1);
         p.setPen(Qt::NoPen);
         p.setBrush(getSelectedBorderColor());
         p.drawRoundRect(itemRect, 7, 25);
+      } else if (currentStyleIndex == styleIndex) {
+        QRect itemRect = getItemRect(i).adjusted(1, 0, -1, 0);
+        p.setPen(Qt::NoPen);
+        p.setBrush(getSelectedBorderColor());
+        p.drawRoundRect(itemRect, 7, 25);
       }
       // paint style
       QRect chipRect = getItemRect(i).adjusted(4, 4, -5, -5);
@@ -1172,8 +1176,12 @@ void PageViewer::contextMenuEvent(QContextMenuEvent *event) {
   menu.addAction(clearAct);
 
   menu.addSeparator();
-  QAction *openPltGizmoAct = cmd->getAction("MI_OpenPltGizmo");
-  menu.addAction(openPltGizmoAct);
+  // currently palette gizmo can only change colors from the current level
+  // palette due to the way modifyColor works.
+  if (m_viewType == LEVEL_PALETTE) {
+    QAction *openPltGizmoAct = cmd->getAction("MI_OpenPltGizmo");
+    menu.addAction(openPltGizmoAct);
+  }
   QAction *openStyleControlAct = cmd->getAction("MI_OpenStyleControl");
   menu.addAction(openStyleControlAct);
   QAction *openStyleNameEditorAct = menu.addAction(tr("Name Editor"));