diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 95256ca0e..25aaa06ae 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -27,7 +27,7 @@ set(client_UI
     sharedialog.ui
     sharelinkwidget.ui
     shareusergroupwidget.ui
-    sharewidget.ui
+    shareuserline.ui
     sslerrordialog.ui
     addcertificatedialog.ui
     proxyauthdialog.ui
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 768888781..07041805f 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -14,7 +14,7 @@
 
 #include "shareusergroupwidget.h"
 #include "ui_shareusergroupwidget.h"
-#include "ui_sharewidget.h"
+#include "ui_shareuserline.h"
 #include "account.h"
 #include "json.h"
 #include "folderman.h"
@@ -156,7 +156,7 @@ void ShareUserGroupWidget::searchForSharees()
     QSharedPointer<Sharee> currentUser(new Sharee(_account->credentials()->user(), "", Sharee::Type::User));
     blacklist << currentUser;
 
-    foreach (auto sw, _ui->scrollArea->findChildren<ShareWidget*>()) {
+    foreach (auto sw, _ui->scrollArea->findChildren<ShareUserLine*>()) {
         blacklist << sw->share()->getShareWith();
     }
     _ui->errorLabel->hide();
@@ -187,7 +187,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
                 continue;
             }
 
-            ShareWidget *s = new ShareWidget(share, _maxSharingPermissions, _isFile, _ui->scrollArea);
+            ShareUserLine *s = new ShareUserLine(share, _maxSharingPermissions, _isFile, _ui->scrollArea);
             connect(s, SIGNAL(resizeRequested()), this, SLOT(slotAdjustScrollWidgetSize()));
             connect(s, SIGNAL(visualDeletionDone()), this, SLOT(getShares()));
             layout->addWidget(s);
@@ -214,7 +214,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
 void ShareUserGroupWidget::slotAdjustScrollWidgetSize()
 {
     QScrollArea *scrollArea = _ui->scrollArea;
-    if (scrollArea->findChildren<ShareWidget*>().count() <= 3) {
+    if (scrollArea->findChildren<ShareUserLine*>().count() <= 3) {
         auto minimumSize = scrollArea->widget()->sizeHint();
         auto spacing = scrollArea->widget()->layout()->spacing();
         minimumSize.rwidth() += spacing;
@@ -302,12 +302,12 @@ void ShareUserGroupWidget::displayError(int code, const QString& message)
     _ui->shareeLineEdit->setEnabled(true);
 }
 
-ShareWidget::ShareWidget(QSharedPointer<Share> share,
-                         SharePermissions maxSharingPermissions,
-                         bool isFile,
-                         QWidget *parent) :
+ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
+                             SharePermissions maxSharingPermissions,
+                             bool isFile,
+                             QWidget *parent) :
   QWidget(parent),
-  _ui(new Ui::ShareWidget),
+  _ui(new Ui::ShareUserLine),
   _share(share),
   _isFile(isFile)
 {
@@ -381,18 +381,18 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
     }
 }
 
-void ShareWidget::on_deleteShareButton_clicked()
+void ShareUserLine::on_deleteShareButton_clicked()
 {
     setEnabled(false);
     _share->deleteShare();
 }
 
-ShareWidget::~ShareWidget()
+ShareUserLine::~ShareUserLine()
 {
     delete _ui;
 }
 
-void ShareWidget::slotEditPermissionsChanged()
+void ShareUserLine::slotEditPermissionsChanged()
 {
     setEnabled(false);
 
@@ -427,7 +427,7 @@ void ShareWidget::slotEditPermissionsChanged()
     _share->setPermissions(permissions);
 }
 
-void ShareWidget::slotPermissionsChanged()
+void ShareUserLine::slotPermissionsChanged()
 {
     setEnabled(false);
     
@@ -452,7 +452,7 @@ void ShareWidget::slotPermissionsChanged()
     _share->setPermissions(permissions);
 }
 
-void ShareWidget::slotDeleteAnimationFinished()
+void ShareUserLine::slotDeleteAnimationFinished()
 {
     emit resizeRequested();
     emit visualDeletionDone();
@@ -464,7 +464,7 @@ void ShareWidget::slotDeleteAnimationFinished()
     connect(this, SIGNAL(destroyed(QObject*)), parentWidget(), SLOT(repaint()));
 }
 
-void ShareWidget::slotShareDeleted()
+void ShareUserLine::slotShareDeleted()
 {
     QPropertyAnimation *animation = new QPropertyAnimation(this, "maximumHeight", this);
 
@@ -478,18 +478,18 @@ void ShareWidget::slotShareDeleted()
     animation->start();
 }
 
-void ShareWidget::slotPermissionsSet()
+void ShareUserLine::slotPermissionsSet()
 {
     displayPermissions();
     setEnabled(true);
 }
 
-QSharedPointer<Share> ShareWidget::share() const
+QSharedPointer<Share> ShareUserLine::share() const
 {
     return _share;
 }
 
-void ShareWidget::displayPermissions()
+void ShareUserLine::displayPermissions()
 {
     auto perm = _share->getPermissions();
 
diff --git a/src/gui/shareusergroupwidget.h b/src/gui/shareusergroupwidget.h
index 578f9fa71..501c37db5 100644
--- a/src/gui/shareusergroupwidget.h
+++ b/src/gui/shareusergroupwidget.h
@@ -34,7 +34,7 @@ namespace OCC {
 
 namespace Ui {
 class ShareUserGroupWidget;
-class ShareWidget;
+class ShareUserLine;
 }
 
 class AbstractCredentials;
@@ -45,44 +45,6 @@ class Sharee;
 class ShareManager;
 class ShareeModel;
 
-class ShareWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ShareWidget(QSharedPointer<Share> Share,
-                         SharePermissions maxSharingPermissions,
-                         bool isFile,
-                         QWidget *parent = 0);
-    ~ShareWidget();
-
-    QSharedPointer<Share> share() const;
-
-signals:
-    void visualDeletionDone();
-    void resizeRequested();
-
-private slots:
-    void on_deleteShareButton_clicked();
-    void slotPermissionsChanged();
-    void slotEditPermissionsChanged();
-    void slotDeleteAnimationFinished();
-
-    void slotShareDeleted();
-    void slotPermissionsSet();
-private:
-    void displayPermissions();
-
-    Ui::ShareWidget *_ui;
-    QSharedPointer<Share> _share;
-    bool _isFile;
-
-    QAction *_permissionCreate;
-    QAction *_permissionUpdate;
-    QAction *_permissionDelete;
-};
-
-
 /**
  * @brief The ShareDialog (user/group) class
  * @ingroup gui
@@ -134,6 +96,46 @@ private:
     QProgressIndicator _pi_sharee;
 };
 
+/**
+ * The widget displayed for each user/group share
+ */
+class ShareUserLine : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ShareUserLine(QSharedPointer<Share> Share,
+                           SharePermissions maxSharingPermissions,
+                           bool isFile,
+                           QWidget *parent = 0);
+    ~ShareUserLine();
+
+    QSharedPointer<Share> share() const;
+
+signals:
+    void visualDeletionDone();
+    void resizeRequested();
+
+private slots:
+    void on_deleteShareButton_clicked();
+    void slotPermissionsChanged();
+    void slotEditPermissionsChanged();
+    void slotDeleteAnimationFinished();
+
+    void slotShareDeleted();
+    void slotPermissionsSet();
+private:
+    void displayPermissions();
+
+    Ui::ShareUserLine *_ui;
+    QSharedPointer<Share> _share;
+    bool _isFile;
+
+    QAction *_permissionCreate;
+    QAction *_permissionUpdate;
+    QAction *_permissionDelete;
+};
+
 }
 
 #endif // SHAREUSERGROUPWIDGET_H
diff --git a/src/gui/sharewidget.ui b/src/gui/shareuserline.ui
similarity index 96%
rename from src/gui/sharewidget.ui
rename to src/gui/shareuserline.ui
index 02d1c7040..b95dbbcaf 100644
--- a/src/gui/sharewidget.ui
+++ b/src/gui/shareuserline.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OCC::ShareWidget</class>
- <widget class="QWidget" name="OCC::ShareWidget">
+ <class>OCC::ShareUserLine</class>
+ <widget class="QWidget" name="OCC::ShareUserLine">
   <property name="enabled">
    <bool>true</bool>
   </property>