diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
index 028537b990..8b8b5aac77 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -15,6 +15,7 @@
         <ul>
           <li>Azure Functions: Publish using wrong dotnet version (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/661">#661</a>)</li>
           <li>Rider 2023.1 EAP 1 makes corelibs.log grow infinitely (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/657">#657</a>)</li>
+          <li>No icons shown for item templates in Rider 2023.1 (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/663">#663</a>)</li>
         </ul>
     </html>
     ]]>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Daemon/RunMarkers/FunctionAppRunMarkerGutterMark.cs b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Daemon/RunMarkers/FunctionAppRunMarkerGutterMark.cs
index 27946e5e30..b7e0b9f621 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Daemon/RunMarkers/FunctionAppRunMarkerGutterMark.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Daemon/RunMarkers/FunctionAppRunMarkerGutterMark.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 JetBrains s.r.o.
+// Copyright (c) 2020-2023 JetBrains s.r.o.
 //
 // All rights reserved.
 //
@@ -33,14 +33,11 @@
 using JetBrains.UI.RichText;
 using JetBrains.UI.ThemedIcons;
 using JetBrains.Util;
-using JetBrains.Util.Logging;
 
 namespace JetBrains.ReSharper.Azure.Daemon.RunMarkers
 {
-    public abstract class FunctionAppRunMarkerGutterMark : IconGutterMarkType
+    public abstract class FunctionAppRunMarkerGutterMark : RunMarkerGutterMark
     {
-        private static readonly ILogger ourLogger = Logger.GetLogger<FunctionAppRunMarkerGutterMark>();
-
         public override IAnchor Priority => BulbMenuAnchors.PermanentBackgroundItems;
 
         protected FunctionAppRunMarkerGutterMark([NotNull] IconId iconId) : base(iconId)
@@ -115,4 +112,4 @@ public FunctionAppMethodRunMarkerGutterMark() : base(FunctionAppRunMarkersThemed
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
index b0c2a3b9a2..0d6b1ddc4a 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -34,6 +34,7 @@
         <ul>
           <li>Azure Functions: Publish using wrong dotnet version (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/661">#661</a>)</li>
           <li>Rider 2023.1 EAP 1 makes corelibs.log grow infinitely (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/657">#657</a>)</li>
+          <li>No icons shown for item templates in Rider 2023.1 (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/663">#663</a>)</li>
         </ul>
         <p>[3.50.0-2022.3]</p>
         <ul>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/icons/RiderIconsPatcher.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/icons/RiderIconsPatcher.kt
index 1597cfb083..f4ab03caf9 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/icons/RiderIconsPatcher.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/icons/RiderIconsPatcher.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 JetBrains s.r.o.
+ * Copyright (c) 2020-2023 JetBrains s.r.o.
  *
  * All rights reserved.
  *
@@ -23,10 +23,9 @@
 package org.jetbrains.icons
 
 import com.intellij.httpClient.RestClientIcons
+import com.intellij.openapi.util.CachedImageIcon
 import com.intellij.openapi.util.IconLoader
 import com.intellij.openapi.util.IconPathPatcher
-import com.intellij.ui.RetrievableIcon
-import com.intellij.util.ReflectionUtil
 import icons.CommonIcons
 import javax.swing.Icon
 
@@ -44,17 +43,14 @@ internal class RiderIconsPatcher : IconPathPatcher() {
             IconLoader.installPathPatcher(RiderIconsPatcher())
         }
 
-        private fun path(icon: Icon): String? {
-            val iconToProcess =
-                    if (icon is RetrievableIcon) icon.retrieveIcon()
-                    else icon
+        private data class IconAndClassLoader(val icon: Icon?, val classLoader: ClassLoader?)
 
-            if (iconToProcess is IconLoader.CachedImageIcon) {
-                return ReflectionUtil.getField(iconToProcess.javaClass, iconToProcess, String::class.java, "originalPath")
-                        ?: throw RuntimeException("originalPath field wasn't found in ${iconToProcess.javaClass.simpleName}")
-            }
+        private fun common(icon: Icon): IconAndClassLoader {
+            return IconAndClassLoader(icon, CommonIcons::class.java.classLoader)
+        }
 
-            return null
+        private fun restClient(icon: Icon): IconAndClassLoader {
+            return IconAndClassLoader(icon, RestClientIcons::class.java.classLoader)
         }
 
         private fun normalize(path: String) : String {
@@ -65,15 +61,19 @@ internal class RiderIconsPatcher : IconPathPatcher() {
         }
     }
 
-    override fun patchPath(path: String, classLoader: ClassLoader?): String? = myIconsOverrideMap[normalize(path)]
+    override fun patchPath(path: String, classLoader: ClassLoader?): String? {
+        val iconAndClassLoader = myIconsOverrideMap[normalize(path)] ?: return null
+        return (iconAndClassLoader.icon as? CachedImageIcon)?.originalPath
+    }
 
-    override fun getContextClassLoader(path: String, originalClassLoader: ClassLoader?): ClassLoader? =
-        if (myIconsOverrideMap.containsKey(normalize(path))) javaClass.classLoader
-        else originalClassLoader
+    override fun getContextClassLoader(path: String, originalClassLoader: ClassLoader?): ClassLoader? {
+        val iconAndClassLoader = myIconsOverrideMap[normalize(path)] ?: return null
+        return iconAndClassLoader.classLoader ?: originalClassLoader
+    }
 
     private val myIconsOverrideMap = mapOf(
-            "/resharper/FunctionAppRunMarkers/RunFunctionApp.svg" to path(CommonIcons.AzureFunctions.FunctionAppRunConfiguration),
-            "/resharper/FunctionAppRunMarkers/Trigger.svg" to path(RestClientIcons.Http_requests_filetype),
-            "/resharper/FunctionAppTemplates/AzureFunctionsTrigger.svg" to path(CommonIcons.AzureFunctions.FunctionApp)
+            "/resharper/FunctionAppRunMarkers/RunFunctionApp.svg" to common(CommonIcons.AzureFunctions.FunctionAppRunConfiguration),
+            "/resharper/FunctionAppRunMarkers/Trigger.svg" to restClient(RestClientIcons.Http_requests_filetype),
+            "/resharper/FunctionAppTemplates/AzureFunctionsTrigger.svg" to common(CommonIcons.AzureFunctions.FunctionApp)
     )
 }