diff --git a/.github/workflows/build_hex_viewer.yaml b/.github/workflows/build_hex_viewer.yaml
new file mode 100644
index 0000000..faec82c
--- /dev/null
+++ b/.github/workflows/build_hex_viewer.yaml
@@ -0,0 +1,44 @@
+name: "hex_viewer: Build and lint"
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - ".github/workflows/build_hex_viewer.yaml"
+      - "tools/apps/hex_viewer/**"
+  pull_request:
+    branches: [ master ]
+    paths:
+      - ".github/workflows/build_hex_viewer.yaml"
+      - "tools/apps/hex_viewer/**"
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        sdk-version: ["release", "dev", "rc"]
+    runs-on: ubuntu-latest
+    name: 'ufbt: Build for ${{ matrix.sdk-version }} Branch'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Build with ufbt
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1
+        id: build-app
+        with:
+          sdk-channel: ${{ matrix.sdk-version }}
+          app-dir: tools/apps/hex_viewer
+      - name: Upload app artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "flipperzero-hex_viewer-${{ matrix.sdk-version }}-${{ steps.build-app.outputs.suffix }}"
+          path: ${{ steps.build-app.outputs.fap-artifacts }}
+      - name: Lint sources
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1
+        continue-on-error: true
+        with:
+          skip-setup: true
+          task: lint
+          app-dir: tools/apps/hex_viewer
diff --git a/.gitmodules b/.gitmodules
index a681f36..add0830 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "subghz/apps/tpms"]
 	path = subghz/apps/tpms
 	url = https://github.com/prplecake/flipperzero-tpms
+[submodule "tools/apps/hex_viewer"]
+	path = tools/apps/hex_viewer
+	url = https://github.com/prplecake/flipperzero-hex-viewer
diff --git a/tools/apps/hex_viewer b/tools/apps/hex_viewer
new file mode 160000
index 0000000..1df1a17
--- /dev/null
+++ b/tools/apps/hex_viewer
@@ -0,0 +1 @@
+Subproject commit 1df1a1728067407e6ea80c1e863697c13e714335