diff --git a/gradle/changelog/file_input_component.yaml b/gradle/changelog/file_input_component.yaml
new file mode 100644
index 0000000000..d02e3abfb0
--- /dev/null
+++ b/gradle/changelog/file_input_component.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Harmonize FileInput component with styleguide ([#1693](https://github.com/scm-manager/scm-manager/pull/1693))
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 8485602fbd..6fa4ee4174 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -46984,6 +46984,91 @@ exports[`Storyshots Forms|DropDown With Translation 1`] = `
 </div>
 `;
 
+exports[`Storyshots Forms|FileInput Default 1`] = `
+<div
+  className="FileInputstories__Decorator-sc-5svgf8-0 icfkjP"
+>
+  <form
+    onSubmit={[Function]}
+  >
+    <div
+      className="field"
+    >
+      <label
+        className="label"
+      >
+        Upload File
+         
+        <span
+          className="tooltip has-tooltip-right Help__HelpTooltip-ykmmew-0 eRZLRi is-inline-block has-tooltip-multiline"
+          data-tooltip="Select your most loved file"
+        >
+          <i
+            className="fas fa-question-circle has-text-blue-light"
+          />
+        </span>
+      </label>
+      <div
+        className="file is-info has-name is-fullwidth"
+      >
+        <label
+          className="file-label"
+        >
+          <input
+            className="file-input"
+            name="uploadFile"
+            onBlur={[Function]}
+            onChange={[Function]}
+            type="file"
+          />
+          <span
+            className="file-cta"
+          >
+            <span
+              className="file-icon"
+            >
+              <i
+                className="fas fa-arrow-circle-up"
+              />
+            </span>
+            <span
+              className="file-label has-text-weight-bold"
+            >
+              fileInput.label
+            </span>
+          </span>
+          <span
+            className="file-name has-text-weight-light has-text-grey-light"
+          >
+            fileInput.noFileChosen
+          </span>
+        </label>
+      </div>
+    </div>
+    <div
+      className="level"
+    >
+      <div
+        className="level-left"
+      />
+      <div
+        className="level-right"
+      >
+        <button
+          className="button is-primary"
+          data-testid="submit-button"
+          onClick={[Function]}
+          type="submit"
+        >
+           
+          Submit
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+`;
+
 exports[`Storyshots Forms|InputField AutoFocus 1`] = `
 <div
   className="InputFieldstories__Decorator-kq2lhz-0 cURTRq"
diff --git a/scm-ui/ui-components/src/forms/FileInput.stories.tsx b/scm-ui/ui-components/src/forms/FileInput.stories.tsx
new file mode 100644
index 0000000000..e222ed5061
--- /dev/null
+++ b/scm-ui/ui-components/src/forms/FileInput.stories.tsx
@@ -0,0 +1,69 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import React, { FC, useState } from "react";
+import { MemoryRouter } from "react-router-dom";
+import { useForm } from "react-hook-form";
+import { storiesOf } from "@storybook/react";
+import { Level, SubmitButton } from "../index";
+import FileInput from "./FileInput";
+import styled from "styled-components";
+
+const Decorator = styled.div`
+  padding: 2rem;
+  max-width: 40rem;
+`;
+
+type Settings = {
+  uploadFile: string;
+};
+
+const ReactHookForm: FC = () => {
+  const { register, handleSubmit } = useForm<Settings>();
+  const [stored, setStored] = useState<Settings>();
+
+  const onSubmit = (settings: Settings) => {
+    setStored(settings);
+  };
+
+  return (
+    <>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <FileInput label="Upload File" helpText="Select your most loved file" {...register("uploadFile")} />
+        <Level right={<SubmitButton>Submit</SubmitButton>} />
+      </form>
+      {stored ? (
+        <div className="mt-5">
+          <pre>
+            <code>{JSON.stringify(stored, null, 2)}</code>
+          </pre>
+        </div>
+      ) : null}
+    </>
+  );
+};
+
+storiesOf("Forms|FileInput", module)
+  .addDecorator((storyFn) => <Decorator>{storyFn()}</Decorator>)
+  .addDecorator((storyFn) => <MemoryRouter>{storyFn()}</MemoryRouter>)
+  .add("Default", () => <ReactHookForm />);
diff --git a/scm-ui/ui-components/src/forms/FileInput.tsx b/scm-ui/ui-components/src/forms/FileInput.tsx
index f57e42c3d0..d257bef7d8 100644
--- a/scm-ui/ui-components/src/forms/FileInput.tsx
+++ b/scm-ui/ui-components/src/forms/FileInput.tsx
@@ -21,13 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { ChangeEvent, FC, FocusEvent } from "react";
+import React, { ChangeEvent, FC, FocusEvent, useState } from "react";
+import { useTranslation } from "react-i18next";
 import classNames from "classnames";
-import LabelWithHelpIcon from "./LabelWithHelpIcon";
+import { File } from "@scm-manager/ui-types";
 import { createAttributesForTesting } from "../devBuild";
+import LabelWithHelpIcon from "./LabelWithHelpIcon";
 
 type Props = {
   name?: string;
+  filenamePlaceholder?: string;
   className?: string;
   label?: string;
   placeholder?: string;
@@ -41,6 +44,7 @@ type Props = {
 
 const FileInput: FC<Props> = ({
   name,
+  filenamePlaceholder,
   testId,
   helpText,
   placeholder,
@@ -49,9 +53,16 @@ const FileInput: FC<Props> = ({
   className,
   ref,
   onBlur,
-  onChange
+  onChange,
 }) => {
+  const [t] = useTranslation("commons");
+  const [file, setFile] = useState<File | null>(null);
+
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const uploadedFile = event?.target?.files![0];
+    // @ts-ignore the uploaded file doesn't match our types
+    setFile(uploadedFile);
+
     if (onChange && event.target.files) {
       onChange(event);
     }
@@ -66,18 +77,33 @@ const FileInput: FC<Props> = ({
   return (
     <div className={classNames("field", className)}>
       <LabelWithHelpIcon label={label} helpText={helpText} />
-      <div className="control">
-        <input
-          ref={ref}
-          name={name}
-          className={classNames("input", "p-1", className)}
-          type="file"
-          placeholder={placeholder}
-          disabled={disabled}
-          onChange={handleChange}
-          onBlur={handleBlur}
-          {...createAttributesForTesting(testId)}
-        />
+      <div className="file is-info has-name is-fullwidth">
+        <label className="file-label">
+          <input
+            ref={ref}
+            name={name}
+            className="file-input"
+            type="file"
+            placeholder={placeholder}
+            disabled={disabled}
+            onChange={handleChange}
+            onBlur={handleBlur}
+            {...createAttributesForTesting(testId)}
+          />
+          <span className="file-cta">
+            <span className="file-icon">
+              <i className="fas fa-arrow-circle-up" />
+            </span>
+            <span className="file-label has-text-weight-bold">{t("fileInput.label")}</span>
+          </span>
+          {file?.name ? (
+            <span className="file-name">{file?.name}</span>
+          ) : (
+            <span className="file-name has-text-weight-light has-text-grey-light">
+              {filenamePlaceholder || t("fileInput.noFileChosen")}
+            </span>
+          )}
+        </label>
       </div>
     </div>
   );
diff --git a/scm-ui/ui-styles/src/scm.scss b/scm-ui/ui-styles/src/scm.scss
index c6bd5cafab..b5b1b25485 100644
--- a/scm-ui/ui-styles/src/scm.scss
+++ b/scm-ui/ui-styles/src/scm.scss
@@ -664,8 +664,9 @@ form .field:not(.is-grouped) {
   margin-bottom: 1rem;
 }
 .input,
-.textarea {
-  /*background-color: whitesmoke;*/
+.select select,
+.textarea,
+.file-name {
   border-color: $blue-light;
   box-shadow: none;
 }
diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json
index 48a8a37e4e..58eed0b2dc 100644
--- a/scm-ui/ui-webapp/public/locales/de/commons.json
+++ b/scm-ui/ui-webapp/public/locales/de/commons.json
@@ -122,6 +122,10 @@
   "fileUpload": {
     "label": "Datei auswählen"
   },
+  "fileInput": {
+    "label": "Datei auswählen",
+    "noFileChosen": "Keine Datei ausgewählt"
+  },
   "importLog": {
     "title": "Importprotokoll"
   },
diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json
index 9eceddd829..47fbba6a71 100644
--- a/scm-ui/ui-webapp/public/locales/en/commons.json
+++ b/scm-ui/ui-webapp/public/locales/en/commons.json
@@ -123,6 +123,10 @@
   "fileUpload": {
     "label": "Select File"
   },
+  "fileInput": {
+    "label": "Select File",
+    "noFileChosen": "No file chosen"
+  },
   "importLog": {
     "title": "Import Log"
   },