diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index 0d45767258..5765ebdb4c 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.30.1.tar.gz 25920970 BLAKE2B 03a651134bda5814dc4e989a763f148b3a03694640d1baaa4be6e075ad9c5e798959bc477484f8214423e15836cc01de033e10606ee04dc375521101b4c75f13 SHA512 04c71f15fdbe17443b0f98cef2c2562b7d360f14065e4fab2c2dc1eaf9bbd0d8aa9a267dd1eab208d77cf00622edf6b5126b2d266b817f301a2281aae82eed45
-DIST imhex-patterns-1.30.1.tar.gz 3377742 BLAKE2B 4fa9475f7b04f5765f0a81258e9d01bf814b7b7a0b318c096fdc3ba728938f3f782c9c30fde7ced79626b70b550649d883eda6cf5bbc4b3d8d3a9ad8ac1c5364 SHA512 d734c7fe1c31c9b7845422047a9b9d1289c432cfe98d2b08ca5fe22b82262e3ae41ec14e93d3c62d24c87294fcdf439719cef6bc2ee5b2b54b45377addb9f06a
+DIST imhex-1.31.0.tar.gz 25062606 BLAKE2B 9db337f5aa54ccefd925175f8b4869ece873a7c466d6ddded88c26d6f4fd7ba73a7789964ad2ae6a902d2ec653980ef2482434ddcbbbc224aaac8906b16e92c5 SHA512 483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8
+DIST imhex-patterns-1.31.0.tar.gz 4448476 BLAKE2B 0bace799f0d2280ccd11a1fcafa9d22620a74691f6b5622d3ad0e260143792c8239158ba021de8e775d5d8589f6dfee990d25beab4288c053d9a5b138b8cc252 SHA512 aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba
diff --git a/app-editors/imhex/files/llvm-16.patch b/app-editors/imhex/files/llvm-16.patch
new file mode 100644
index 0000000000..5c7efa5faa
--- /dev/null
+++ b/app-editors/imhex/files/llvm-16.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index 624e401..cfd30c3 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -503,7 +503,7 @@ macro(addBundledLibraries)
+         add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
+         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
+     else()
+-        find_package(LLVM REQUIRED Demangle)
++        find_package(LLVM 16 REQUIRED Demangle)
+     endif()
+ 
+     if (NOT USE_SYSTEM_YARA)
diff --git a/app-editors/imhex/imhex-1.30.1.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild
similarity index 79%
rename from app-editors/imhex/imhex-1.30.1.ebuild
rename to app-editors/imhex/imhex-1.31.0.ebuild
index 1ea5d0cef7..ccbb9ef59a 100644
--- a/app-editors/imhex/imhex-1.30.1.ebuild
+++ b/app-editors/imhex/imhex-1.31.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs desktop
 
 DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
 HOMEPAGE="https://github.com/WerWolv/ImHex"
@@ -20,6 +20,11 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+system-llvm"
+
+PATCHES=(
+	"${FILESDIR}/llvm-16.patch"
+)
 
 DEPEND="
 	app-forensics/yara
@@ -41,6 +46,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
+	system-llvm? ( <sys-devel/llvm-17 )
 	app-admin/chrpath
 	gnome-base/librsvg
 	sys-devel/lld
@@ -53,19 +59,6 @@ pkg_pretend() {
 	fi
 }
 
-src_prepare() {
-	default
-	# We are removing all tests altogether
-	# The tests need ImHex installed to succeed (see https://bugs.gentoo.org/attachment.cgi?id=860683), so we remove them
-	# We could use `ln "${BUILD_DIR}/lib/libimhex.so.${PV}" "/lib64/libimhex.so.${PV}"` and  circumvent sandboxing
-	sed -i \
-		-e 's/enable_testing/#enable_testing/' \
-		-e 's/add_subdirectory(tests/#add_subdirectory(tests/' \
-		"${S}/CMakeLists.txt" || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-D CMAKE_BUILD_TYPE="Release" \
@@ -76,7 +69,6 @@ src_configure() {
 		-D CMAKE_OBJC_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_SKIP_RPATH=ON \
-		-D IMHEX_USE_BUNDLED_CA=OFF \
 		-D IMHEX_PLUGINS_IN_SHARE=OFF \
 		-D IMHEX_STRIP_RELEASE=OFF \
 		-D IMHEX_OFFLINE_BUILD=ON \
@@ -85,12 +77,13 @@ src_configure() {
 		-D IMHEX_IGNORE_BAD_COMPILER=OFF \
 		-D IMHEX_USE_GTK_FILE_PICKER=OFF \
 		-D IMHEX_DISABLE_STACKTRACE=OFF \
+		-D IMHEX_USE_DEFAULT_BUILD_SETTINGS=OFF \
+		-D IMHEX_STRICT_WARNINGS=OFF \
 		-D IMHEX_VERSION="${PV}" \
 		-D PROJECT_VERSION="${PV}" \
 		-D USE_SYSTEM_CAPSTONE=ON \
-		-D USE_SYSTEM_CURL=ON \
 		-D USE_SYSTEM_FMT=ON \
-		-D USE_SYSTEM_LLVM=ON \
+		-D USE_SYSTEM_LLVM=$(use system-llvm) \
 		-D USE_SYSTEM_NFD=ON \
 		-D USE_SYSTEM_NLOHMANN_JSON=ON \
 		-D USE_SYSTEM_YARA=ON
@@ -102,6 +95,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
+	domenu "${S}/dist/${PN}.desktop"
+
 	# Install patterns
 	insinto /usr/share/imhex
 	rm -rf "${S_PATTERNS}/tests"
diff --git a/app-editors/imhex/metadata.xml b/app-editors/imhex/metadata.xml
index 51ae868323..276772b0cc 100644
--- a/app-editors/imhex/metadata.xml
+++ b/app-editors/imhex/metadata.xml
@@ -10,6 +10,9 @@
 		<bugs-to>https://github.com/WerWolv/ImHex/issues</bugs-to>
 		<remote-id type="github">WerWolv/ImHex</remote-id>
 	</upstream>
+	<use>
+		<flag name="system-llvm">Use the system LLVM installation</flag>
+	</use>
 	<longdescription lang="en">
 		Features