diff --git a/.golangci.yml b/.golangci.yml
index 2f1587a1e6..757de08e46 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -77,7 +77,6 @@ linters:
         - name: identical-branches
         - name: if-return
         - name: increment-decrement
-        - name: indent-error-flow
         - name: modifies-value-receiver
         - name: package-comments
         - name: range
diff --git a/eslint.config.ts b/eslint.config.ts
index c2fddc856c..6439b1863f 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -406,7 +406,7 @@ export default defineConfig([
       'no-dupe-keys': [2],
       'no-duplicate-case': [2],
       'no-duplicate-imports': [0],
-      'no-else-return': [2],
+      'no-else-return': [0],
       'no-empty-character-class': [2],
       'no-empty-function': [0],
       'no-empty-pattern': [2],
diff --git a/templates/repo/icon.tmpl b/templates/repo/icon.tmpl
index 68959317c0..09f4b0a224 100644
--- a/templates/repo/icon.tmpl
+++ b/templates/repo/icon.tmpl
@@ -17,10 +17,6 @@
 	{{svg "octicon-mirror" $size}}
 {{else if .Repo.IsFork}}
 	{{svg "octicon-repo-forked" $size}}
-{{else if .Repo.IsPrivate}}
-	{{svg "octicon-repo-locked" $size}}
-{{else if .Repo.IsTemplate}}
-	{{svg "octicon-repo-template" $size}}
 {{else}}
 	{{svg "octicon-repo" $size}}
 {{end}}
diff --git a/web_src/js/utils/mappings.ts b/web_src/js/utils/mappings.ts
index d99fe9aa29..b035c8b030 100644
--- a/web_src/js/utils/mappings.ts
+++ b/web_src/js/utils/mappings.ts
@@ -3,10 +3,7 @@ export function getRepoIcon(repo: Record<string, any>) {
     return 'octicon-mirror';
   } else if (repo.fork) {
     return 'octicon-repo-forked';
-  } else if (repo.private) {
-    return 'octicon-repo-locked';
-  } else if (repo.template) {
-    return `octicon-repo-template`;
+  } else {
+    return 'octicon-repo';
   }
-  return 'octicon-repo';
 }