diff --git a/ion-qt.pro b/ion-qt.pro
index 2cacab3..e01a7f9 100644
--- a/ion-qt.pro
+++ b/ion-qt.pro
@@ -395,15 +395,15 @@ FORMS += src/qt/forms/coincontroldialog.ui \
 contains(DEFINES, USE_NATIVE_I2P) {
 HEADERS += src/i2p.h \
 	src/i2psam.h \
-	src/qt/showi2paddresses.h \
+	src/qt/i2pshowaddresses.h \
 	src/qt/i2poptionswidget.h
 
 SOURCES += src/i2p.cpp \
 	src/i2psam.cpp \
-	src/qt/showi2paddresses.cpp \
+	src/qt/i2pshowaddresses.cpp \
 	src/qt/i2poptionswidget.cpp
 
-FORMS += src/qt/forms/showi2paddresses.ui \
+FORMS += src/qt/forms/i2pshowaddresses.ui \
 	src/qt/forms/i2poptionswidget.ui
 }
 
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index ecd7f89..a5114d8 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -35,7 +35,7 @@
 #include "masternodemanager.h"
 
 #ifdef USE_NATIVE_I2P
-#include "showi2paddresses.h"
+#include "i2pshowaddresses.h"
 #endif
 
 #ifdef Q_OS_MAC
diff --git a/src/qt/forms/i2poptionswidget.ui b/src/qt/forms/i2poptionswidget.ui
index d92f459..de119d2 100644
--- a/src/qt/forms/i2poptionswidget.ui
+++ b/src/qt/forms/i2poptionswidget.ui
@@ -77,9 +77,6 @@
        <property name="text">
         <string>127.0.0.1</string>
        </property>
-       <property name="frame">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
@@ -141,10 +138,7 @@
         </size>
        </property>
        <property name="text">
-        <string>ion-client</string>
-       </property>
-       <property name="frame">
-        <bool>false</bool>
+        <string>Ion-client</string>
        </property>
       </widget>
      </item>
diff --git a/src/qt/forms/showi2paddresses.ui b/src/qt/forms/i2pshowaddresses.ui
similarity index 98%
rename from src/qt/forms/showi2paddresses.ui
rename to src/qt/forms/i2pshowaddresses.ui
index 1c07aae..0c899d3 100644
--- a/src/qt/forms/showi2paddresses.ui
+++ b/src/qt/forms/i2pshowaddresses.ui
@@ -88,9 +88,6 @@
      <property name="acceptDrops">
       <bool>false</bool>
      </property>
-     <property name="frame">
-      <bool>false</bool>
-     </property>
      <property name="readOnly">
       <bool>true</bool>
      </property>
diff --git a/src/qt/i2poptionswidget.cpp b/src/qt/i2poptionswidget.cpp
index e4919d7..f42dfba 100644
--- a/src/qt/i2poptionswidget.cpp
+++ b/src/qt/i2poptionswidget.cpp
@@ -3,7 +3,7 @@
 
 #include "optionsmodel.h"
 #include "monitoreddatamapper.h"
-#include "showi2paddresses.h"
+#include "i2pshowaddresses.h"
 //#include "i2p.h"
 #include "util.h"
 #include "clientmodel.h"
@@ -96,5 +96,3 @@ void I2POptionsWidget::GenerateNewI2PAddress()
         i2pCurrDialog.exec();
     }
 }
-
-
diff --git a/src/qt/showi2paddresses.cpp b/src/qt/i2pshowaddresses.cpp
similarity index 94%
rename from src/qt/showi2paddresses.cpp
rename to src/qt/i2pshowaddresses.cpp
index 7ccefa3..d3ccb8b 100644
--- a/src/qt/showi2paddresses.cpp
+++ b/src/qt/i2pshowaddresses.cpp
@@ -1,5 +1,5 @@
-#include "showi2paddresses.h"
-#include "ui_showi2paddresses.h"
+#include "i2pshowaddresses.h"
+#include "ui_i2pshowaddresses.h"
 
 ShowI2PAddresses::ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent) :
     QDialog(parent),
diff --git a/src/showi2paddresses.h b/src/qt/i2pshowaddresses.h
similarity index 97%
rename from src/showi2paddresses.h
rename to src/qt/i2pshowaddresses.h
index bcd21a1..0c6e65b 100644
--- a/src/showi2paddresses.h
+++ b/src/qt/i2pshowaddresses.h
@@ -10,11 +10,11 @@ class ShowI2PAddresses;
 class ShowI2PAddresses : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent = 0);
     ~ShowI2PAddresses();
-    
+
 private:
     Ui::ShowI2PAddresses *ui;
 };
diff --git a/src/qt/locale/ion_en.ts b/src/qt/locale/ion_en.ts
index b9f0761..f4b5b2c 100644
--- a/src/qt/locale/ion_en.ts
+++ b/src/qt/locale/ion_en.ts
@@ -2667,7 +2667,7 @@ I2P-address...</source>
 <context>
     <name>ShowI2PAddresses</name>
     <message>
-        <location filename="../forms/showi2paddresses.ui" line="+20"/>
+        <location filename="../forms/i2pshowaddresses.ui" line="+20"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qt/showi2paddresses.h b/src/qt/showi2paddresses.h
deleted file mode 100644
index bcd21a1..0000000
--- a/src/qt/showi2paddresses.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef SHOWI2PADDRESSES_H
-#define SHOWI2PADDRESSES_H
-
-#include <QDialog>
-
-namespace Ui {
-class ShowI2PAddresses;
-}
-
-class ShowI2PAddresses : public QDialog
-{
-    Q_OBJECT
-    
-public:
-    explicit ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent = 0);
-    ~ShowI2PAddresses();
-    
-private:
-    Ui::ShowI2PAddresses *ui;
-};
-
-#endif // SHOWI2PADDRESSES_H
diff --git a/src/showi2paddresses.cpp b/src/showi2paddresses.cpp
deleted file mode 100644
index 7ccefa3..0000000
--- a/src/showi2paddresses.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "showi2paddresses.h"
-#include "ui_showi2paddresses.h"
-
-ShowI2PAddresses::ShowI2PAddresses(const QString& caption, const QString& pub, const QString& priv, const QString& b32, const QString& configFileName, QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::ShowI2PAddresses)
-{
-    ui->setupUi(this);
-    this->setWindowTitle(caption);
-    ui->pubText->setPlainText(pub);
-    ui->privText->setText("<b>mydestination=</b>" + priv);
-    ui->b32Line->setText(b32);
-    ui->label->setText(ui->label->text() + "\n" + configFileName);
-
-    QObject::connect(ui->privButton, SIGNAL(clicked()),
-                     ui->privText, SLOT(selectAll()));
-    QObject::connect(ui->privButton, SIGNAL(clicked()),
-                     ui->privText, SLOT(copy()));
-
-    QObject::connect(ui->pubButton, SIGNAL(clicked()),
-                     ui->pubText, SLOT(selectAll()));
-    QObject::connect(ui->pubButton, SIGNAL(clicked()),
-                     ui->pubText, SLOT(copy()));
-
-    QObject::connect(ui->b32Button, SIGNAL(clicked()),
-                     ui->b32Line, SLOT(selectAll()));
-    QObject::connect(ui->b32Button, SIGNAL(clicked()),
-                     ui->b32Line, SLOT(copy()));
-}
-
-ShowI2PAddresses::~ShowI2PAddresses()
-{
-    delete ui;
-}