diff --git a/src/gui/res/MainWindowBase.ui b/src/gui/res/MainWindowBase.ui
index cc5a9d0cb0..88f07b27ed 100644
--- a/src/gui/res/MainWindowBase.ui
+++ b/src/gui/res/MainWindowBase.ui
@@ -307,6 +307,19 @@
       <property name="sizeConstraint">
        <enum>QLayout::SetDefaultConstraint</enum>
       </property>
+      <item>
+       <widget class="QLabel" name="m_pLabelPadlock">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="Synergy.qrc">:/res/icons/16x16/padlock.png</pixmap>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="m_pStatusLabel">
         <property name="text">
diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc
index c905437857..a7027617a9 100644
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@@ -52,5 +52,6 @@
         <file>lang/Languages.xml</file>
         <file>icons/16x16/money.png</file>
         <file>image/spinning-wheel.gif</file>
+        <file>icons/16x16/padlock.png</file>
     </qresource>
 </RCC>
diff --git a/src/gui/res/icons/16x16/padlock.png b/src/gui/res/icons/16x16/padlock.png
new file mode 100644
index 0000000000..e313e97e96
Binary files /dev/null and b/src/gui/res/icons/16x16/padlock.png differ
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 8233eb1a1b..2f652a5c85 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -129,6 +129,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	m_pComboServerList->hide();
 
 	updateEdition();
+
+	m_pLabelPadlock->hide();
 }
 
 MainWindow::~MainWindow()
@@ -726,13 +728,22 @@ void MainWindow::setSynergyState(qSynergyState state)
 	switch (state)
 	{
 	case synergyConnected: {
+		if (m_AppConfig.getCryptoEnabled()) {
+			m_pLabelPadlock->show();
+		}
+		else {
+			m_pLabelPadlock->hide();
+		}
+
 		setStatus(tr("Synergy is running."));
 		break;
 	}
 	case synergyConnecting:
+		m_pLabelPadlock->hide();
 		setStatus(tr("Synergy is starting."));
 		break;
 	case synergyDisconnected:
+		m_pLabelPadlock->hide();
 		setStatus(tr("Synergy is not running."));
 		break;
 	}