diff --git a/docs/en/development/plugins/extension-points.md b/docs/en/development/plugins/extension-points.md
index 56c273e029..0359f5837e 100644
--- a/docs/en/development/plugins/extension-points.md
+++ b/docs/en/development/plugins/extension-points.md
@@ -33,6 +33,7 @@ The following extension points are provided for the frontend:
 ### profile.route
 ### profile.setting
 ### repo-config.route
+### repo-config.details
 ### repos.branch-details.information
 ### repos.content.metadata
 - Location: At meta data view for file
@@ -46,13 +47,13 @@ The following extension points are provided for the frontend:
 ### repositoryRole.role-details.information
 ### repository.setting
 ### repos.repository-avatar
+### repos.repository-avatar.primary
 - Location: At each repository in repository overview
 - can be used to add avatar for each repository (e.g., to mark repository type)
 
 ### repos.repository-details.information
 - Location: At bottom of a single repository view
 - can be used to show detailed information about the repository (how to clone, e.g.)
-
 ### repos.sources.view
 ### roles.route
 ### user.route
diff --git a/gradle/changelog/repository-avatar-extensionpoint.yaml b/gradle/changelog/repository-avatar-extensionpoint.yaml
new file mode 100644
index 0000000000..d8b07afbcd
--- /dev/null
+++ b/gradle/changelog/repository-avatar-extensionpoint.yaml
@@ -0,0 +1,2 @@
+- type: added
+  description: New extension points for custom repository avatars ([#1614](https://github.com/scm-manager/scm-manager/pull/1614))
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index 1452832896..2067368c3a 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -55824,7 +55824,7 @@ exports[`Storyshots RepositoryEntry Archived 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -55975,7 +55975,7 @@ exports[`Storyshots RepositoryEntry Avatar EP 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -56120,7 +56120,7 @@ exports[`Storyshots RepositoryEntry Before Title EP 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -56268,7 +56268,7 @@ exports[`Storyshots RepositoryEntry Default 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -56413,7 +56413,7 @@ exports[`Storyshots RepositoryEntry Exporting 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -56564,7 +56564,7 @@ exports[`Storyshots RepositoryEntry MultiRepositoryTags 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
@@ -56721,7 +56721,7 @@ exports[`Storyshots RepositoryEntry Quick Link EP 1`] = `
       className="CardColumn__AvatarWrapper-sc-1w6lsih-1 lhzEPm media-left"
     >
       <p
-        className="image is-64x64"
+        className="RepositoryAvatar__Avatar-uh53vb-0 igMDhE image is-64x64"
       >
         <img
           alt="Logo"
diff --git a/scm-ui/ui-components/src/forms/FileUpload.tsx b/scm-ui/ui-components/src/forms/FileUpload.tsx
index b5a0f6f964..48f53b5e0c 100644
--- a/scm-ui/ui-components/src/forms/FileUpload.tsx
+++ b/scm-ui/ui-components/src/forms/FileUpload.tsx
@@ -27,10 +27,12 @@ import { useTranslation } from "react-i18next";
 import { File } from "@scm-manager/ui-types";
 
 type Props = {
-  handleFile: (file: File) => void;
+  handleFile: (file: File, event?: ChangeEvent<HTMLInputElement>) => void;
+  filenamePlaceholder?: string;
+  disabled?: boolean;
 };
 
-const FileUpload: FC<Props> = ({ handleFile }) => {
+const FileUpload: FC<Props> = ({ handleFile, filenamePlaceholder = "", disabled = false }) => {
   const [t] = useTranslation("commons");
   const [file, setFile] = useState<File | null>(null);
 
@@ -41,21 +43,26 @@ const FileUpload: FC<Props> = ({ handleFile }) => {
           className="file-input"
           type="file"
           name="resume"
+          disabled={disabled}
           onChange={(event: ChangeEvent<HTMLInputElement>) => {
             const uploadedFile = event?.target?.files![0];
             // @ts-ignore the uploaded file doesn't match our types
             setFile(uploadedFile);
             // @ts-ignore the uploaded file doesn't match our types
-            handleFile(uploadedFile);
+            handleFile(uploadedFile, event);
           }}
         />
         <span className="file-cta">
           <span className="file-icon">
             <i className="fas fa-arrow-circle-up" />
           </span>
-          <span className="file-label">{t("fileUpload.label")}</span>
+          <span className="file-label has-text-weight-bold">{t("fileUpload.label")}</span>
         </span>
-        <span className="file-name">{file?.name || ""}</span>
+        {file?.name ? (
+          <span className="file-name">{file?.name}</span>
+        ) : (
+          <span className="file-name has-text-weight-light has-text-grey-light	">{filenamePlaceholder}</span>
+        )}
       </label>
     </div>
   );
diff --git a/scm-ui/ui-components/src/modals/FullscreenModal.tsx b/scm-ui/ui-components/src/modals/FullscreenModal.tsx
index 72951da5ca..8cb6a27ffc 100644
--- a/scm-ui/ui-components/src/modals/FullscreenModal.tsx
+++ b/scm-ui/ui-components/src/modals/FullscreenModal.tsx
@@ -33,6 +33,7 @@ type Props = {
   closeFunction: () => void;
   body: ReactNode;
   active: boolean;
+  closeButtonLabel?: string;
 };
 
 const FullSizedModal = styled(Modal)`
@@ -42,9 +43,9 @@ const FullSizedModal = styled(Modal)`
   }
 `;
 
-const FullscreenModal: FC<Props> = ({ title, closeFunction, body, active }) => {
+const FullscreenModal: FC<Props> = ({ title, closeFunction, body, active, closeButtonLabel }) => {
   const [t] = useTranslation("repos");
-  const footer = <Button label={t("diff.fullscreen.close")} action={closeFunction} color="grey" />;
+  const footer = <Button label={closeButtonLabel || t("diff.fullscreen.close")} action={closeFunction} color="grey" />;
 
   return <FullSizedModal title={title} closeFunction={closeFunction} body={body} footer={footer} active={active} />;
 };
diff --git a/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx b/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
index 5664ad07a6..e7822a0387 100644
--- a/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
+++ b/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
@@ -21,31 +21,42 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
+import React, { FC } from "react";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import { Repository } from "@scm-manager/ui-types";
 import { Image } from "@scm-manager/ui-components";
+import styled from "styled-components";
+
+const Avatar = styled.p`
+  border-radius: 5px;
+`;
 
 type Props = {
   repository: Repository;
 };
 
-class RepositoryAvatar extends React.Component<Props> {
-  render() {
-    const { repository } = this.props;
-    return (
-      <p className="image is-64x64">
-        <ExtensionPoint
-          name="repos.repository-avatar"
-          props={{
-            repository
-          }}
-        >
-          <Image src="/images/blib.jpg" alt="Logo" />
-        </ExtensionPoint>
-      </p>
-    );
-  }
-}
+const renderExtensionPoint = (repository: Repository) => {
+  return (
+    <ExtensionPoint
+      name="repos.repository-avatar.primary"
+      props={{
+        repository
+      }}
+    >
+      <ExtensionPoint
+        name="repos.repository-avatar"
+        props={{
+          repository
+        }}
+      >
+        <Image src="/images/blib.jpg" alt="Logo" />
+      </ExtensionPoint>
+    </ExtensionPoint>
+  );
+};
+
+const RepositoryAvatar: FC<Props> = ({ repository }) => {
+  return <Avatar className="image is-64x64">{renderExtensionPoint(repository)}</Avatar>;
+};
 
 export default RepositoryAvatar;
diff --git a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
index 5bf8fd4250..d3fff64834 100644
--- a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
@@ -57,6 +57,7 @@ const EditRepo: FC<Props> = ({ repository }) => {
       <Subtitle subtitle={t("repositoryForm.subtitle")} />
       <ErrorNotification error={error} />
       <RepositoryForm repository={repository} loading={isLoading} modifyRepository={update} />
+      <ExtensionPoint name="repo-config.details" props={extensionProps} renderAll={true}/>
       {repository._links.exportInfo && <ExportRepository repository={repository} />}
       <ExtensionPoint name="repo-config.route" props={extensionProps} renderAll={true} />
       <RepositoryDangerZone repository={repository} indexLinks={indexLinks} />