diff --git a/cmd/argocd/commands/repo.go b/cmd/argocd/commands/repo.go
index e97add18d6..b333968018 100644
--- a/cmd/argocd/commands/repo.go
+++ b/cmd/argocd/commands/repo.go
@@ -186,7 +186,7 @@ func NewRepoRemoveCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command
 // Print table of repo info
 func printRepoTable(repos appsv1.Repositories) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	_, _ = fmt.Fprintf(w, "TYPE\nNAME\nREPO\tINSECURE\tLFS\tUSER\tSTATUS\tMESSAGE\n")
+	_, _ = fmt.Fprintf(w, "TYPE\tNAME\tREPO\tINSECURE\tLFS\tUSER\tSTATUS\tMESSAGE\n")
 	for _, r := range repos {
 		var username string
 		if r.Username == "" {
diff --git a/ui/src/app/settings/components/repos-list/repos-list.tsx b/ui/src/app/settings/components/repos-list/repos-list.tsx
index b20f850876..22507760d3 100644
--- a/ui/src/app/settings/components/repos-list/repos-list.tsx
+++ b/ui/src/app/settings/components/repos-list/repos-list.tsx
@@ -66,20 +66,26 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                                     <div className='argo-table-list'>
                                         <div className='argo-table-list__head'>
                                             <div className='row'>
-                                                <div className='columns small-5'>REPOSITORY</div>
-                                                <div className='columns small-2'>TYPE</div>
+                                                <div className='columns small-1'/>
+                                                <div className='columns small-1'>TYPE</div>
                                                 <div className='columns small-2'>NAME</div>
+                                                <div className='columns small-5'>REPOSITORY</div>
                                                 <div className='columns small-3'>CONNECTION STATUS</div>
                                             </div>
                                         </div>
                                         {repos.map((repo) => (
                                             <div className='argo-table-list__row' key={repo.repo}>
                                                 <div className='row'>
-                                                    <div className='columns small-5'>
-                                                        <i className={'icon argo-icon-' + repo.type}/> <Repo url={repo.repo}/>
+                                                    <div className='columns small-1'>
+                                                        <i className={'icon argo-icon-' + (repo.type || 'git')}/>
+                                                    </div>
+                                                    <div className='columns small-1'>
+                                                        {repo.type || 'git'}
                                                     </div>
-                                                    <div className='columns small-2'>{repo.type}</div>
                                                     <div className='columns small-2'>{repo.name}</div>
+                                                    <div className='columns small-5'>
+                                                        <Repo url={repo.repo}/>
+                                                    </div>
                                                     <div className='columns small-3'>
                                                         <ConnectionStateIcon
                                                             state={repo.connectionState}/> {repo.connectionState.status}
@@ -182,7 +188,6 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                           getApi={(api) => this.formApiSSH = api}
                           validateError={(params: NewSSHRepoParams) => ({
                               url: !params.url && 'Repo URL is required',
-                              sshPrivateKey: !params.sshPrivateKey && 'SSH private key data is required for connecting SSH repositories',
                           })}>
                         {(formApi) => (
                             <form onSubmit={formApi.submitForm} role='form' className='repos-list width-control'>