diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 85a9b09d1..c95c0e3fb 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -348,7 +348,15 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         return new HighlightedText(writer);
     }
 
+    private void updateHexButtons(ScriptExportMode exportMode) {
+        showFileOffsetInPcodeHexButton.setVisible(exportMode == ScriptExportMode.PCODE_HEX);
+        showOriginalBytesInPcodeHexButton.setVisible(exportMode == ScriptExportMode.PCODE_HEX);
+        resolveConstantsButton.setVisible(exportMode != ScriptExportMode.CONSTANTS && exportMode != ScriptExportMode.HEX);
+    }
+
     public void setHex(ScriptExportMode exportMode, String scriptName) {
+        updateHexButtons(exportMode);
+
         switch (exportMode) {
             case PCODE:
                 if (srcNoHex == null) {
@@ -662,9 +670,18 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         topButtonsPan.add(constantsViewButton);
         topButtonsPan.add(Box.createRigidArea(new Dimension(10, 0)));
         topButtonsPan.add(resolveConstantsButton);
+        topButtonsPan.add(Box.createRigidArea(new Dimension(10, 0)));
         topButtonsPan.add(showFileOffsetInPcodeHexButton);
         topButtonsPan.add(showOriginalBytesInPcodeHexButton);
 
+        if (hexOnlyButton.isSelected()) {
+            updateHexButtons(ScriptExportMode.HEX);
+        } else if (constantsViewButton.isSelected()) {
+            updateHexButtons(ScriptExportMode.CONSTANTS);
+        } else {
+            updateHexButtons(ScriptExportMode.PCODE);
+        }
+
         JPanel panCode = new JPanel(new BorderLayout());
         panCode.add(new JScrollPane(editor), BorderLayout.CENTER);
         panCode.add(topButtonsPan, BorderLayout.NORTH);
diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/fileoffset16.png b/src/com/jpexs/decompiler/flash/gui/graphics/fileoffset16.png
index 5deb5c2bf..7548fefef 100644
Binary files a/src/com/jpexs/decompiler/flash/gui/graphics/fileoffset16.png and b/src/com/jpexs/decompiler/flash/gui/graphics/fileoffset16.png differ
diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png b/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png
index 5deb5c2bf..5aeb6fe25 100644
Binary files a/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png and b/src/com/jpexs/decompiler/flash/gui/graphics/originalbytes16.png differ