diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index ac11625c8..deed59beb 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -84,8 +84,8 @@ QT_FORMS_UI = \
   forms/openuridialog.ui \
   forms/optionsdialog.ui \
   forms/overviewpage.ui \
-  forms/receiverequestdialog.ui \
   forms/receivecoinsdialog.ui \
+  forms/receiverequestdialog.ui \
   forms/rpcconsole.ui \
   forms/sendcoinsdialog.ui \
   forms/sendcoinsentry.ui \
@@ -117,10 +117,10 @@ QT_MOC_CPP = \
   moc_optionsmodel.cpp \
   moc_overviewpage.cpp \
   moc_paymentserver.cpp \
-  moc_receiverequestdialog.cpp \
   moc_qvalidatedlineedit.cpp \
   moc_qvaluecombobox.cpp \
   moc_receivecoinsdialog.cpp \
+  moc_receiverequestdialog.cpp \
   moc_recentrequeststablemodel.cpp \
   moc_rpcconsole.cpp \
   moc_sendcoinsdialog.cpp \
@@ -137,9 +137,15 @@ QT_MOC_CPP = \
   moc_walletmodel.cpp \
   moc_walletview.cpp
 
-BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
+BITCOIN_MM = \
+  macdockiconhandler.mm \
+  macnotificationhandler.mm
 
-QT_MOC = intro.moc overviewpage.moc rpcconsole.moc bitcoin.moc
+QT_MOC = \
+  bitcoin.moc \
+  intro.moc \
+  overviewpage.moc \
+  rpcconsole.moc
 
 QT_QRC_CPP = qrc_bitcoin.cpp
 QT_QRC = bitcoin.qrc
@@ -175,19 +181,19 @@ BITCOIN_QT_H = \
   overviewpage.h \
   paymentrequestplus.h \
   paymentserver.h \
-  receivecoinsdialog.h \
-  recentrequeststablemodel.h \
-  receiverequestdialog.h \
   qvalidatedlineedit.h \
   qvaluecombobox.h \
+  receivecoinsdialog.h \
+  receiverequestdialog.h \
+  recentrequeststablemodel.h \
   rpcconsole.h \
   sendcoinsdialog.h \
   sendcoinsentry.h \
   signverifymessagedialog.h \
   splashscreen.h \
   trafficgraphwidget.h \
-  transactiondescdialog.h \
   transactiondesc.h \
+  transactiondescdialog.h \
   transactionfilterproxy.h \
   transactionrecord.h \
   transactiontablemodel.h \
@@ -198,54 +204,54 @@ BITCOIN_QT_H = \
   walletview.h
 
 RES_ICONS = \
-  res/icons/bitcoin.png \
+  res/icons/add.png \
   res/icons/address-book.png \
-  res/icons/quit.png \
-  res/icons/send.png \
-  res/icons/toolbar.png \
-  res/icons/connect0_16.png \
-  res/icons/connect1_16.png \
-  res/icons/connect2_16.png \
-  res/icons/connect3_16.png \
-  res/icons/connect4_16.png \
-  res/icons/transaction0.png \
-  res/icons/transaction2.png \
+  res/icons/bitcoin.ico \
+  res/icons/bitcoin.png \
+  res/icons/bitcoin_testnet.ico \
+  res/icons/bitcoin_testnet.png \
   res/icons/clock1.png \
   res/icons/clock2.png \
   res/icons/clock3.png \
   res/icons/clock4.png \
   res/icons/clock5.png \
   res/icons/configure.png \
-  res/icons/receive.png \
-  res/icons/editpaste.png \
-  res/icons/editcopy.png \
-  res/icons/add.png \
-  res/icons/bitcoin_testnet.png \
-  res/icons/toolbar_testnet.png \
+  res/icons/connect0_16.png \
+  res/icons/connect1_16.png \
+  res/icons/connect2_16.png \
+  res/icons/connect3_16.png \
+  res/icons/connect4_16.png \
+  res/icons/debugwindow.png \
   res/icons/edit.png \
-  res/icons/history.png \
-  res/icons/overview.png \
+  res/icons/editcopy.png \
+  res/icons/editpaste.png \
   res/icons/export.png \
-  res/icons/synced.png \
-  res/icons/remove.png \
-  res/icons/tx_mined.png \
-  res/icons/tx_input.png \
-  res/icons/tx_output.png \
-  res/icons/tx_inout.png \
+  res/icons/filesave.png \
+  res/icons/history.png \
+  res/icons/key.png \
   res/icons/lock_closed.png \
   res/icons/lock_open.png \
-  res/icons/key.png \
-  res/icons/filesave.png \
+  res/icons/overview.png \
   res/icons/qrcode.png \
-  res/icons/debugwindow.png \
-  res/icons/bitcoin.ico \
-  res/icons/bitcoin_testnet.ico
+  res/icons/quit.png \
+  res/icons/receive.png \
+  res/icons/remove.png \
+  res/icons/send.png \
+  res/icons/synced.png \
+  res/icons/toolbar.png \
+  res/icons/toolbar_testnet.png \
+  res/icons/transaction0.png \
+  res/icons/transaction2.png \
+  res/icons/tx_inout.png \
+  res/icons/tx_input.png \
+  res/icons/tx_output.png \
+  res/icons/tx_mined.png
 
 BITCOIN_QT_CPP = \
   aboutdialog.cpp \
+  bitcoin.cpp \
   bitcoinaddressvalidator.cpp \
   bitcoinamountfield.cpp \
-  bitcoin.cpp \
   bitcoingui.cpp \
   bitcoinunits.cpp \
   clientmodel.cpp \
@@ -292,7 +298,9 @@ BITCOIN_QT_CPP += \
   walletview.cpp
 endif
 
-RES_IMAGES = res/images/about.png res/images/splash.png \
+RES_IMAGES = \
+  res/images/about.png \
+  res/images/splash.png \
   res/images/splash_testnet.png
 
 RES_MOVIES = res/movies/update_spinner.mng
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index 9c3f0417a..00ccfadf3 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -16,12 +16,13 @@ endif
 
 TEST_QT_H = \
   uritests.h \
-  paymentservertests.h \
-  paymentrequestdata.h
+  paymentrequestdata.h \
+  paymentservertests.h
 
 BUILT_SOURCES = $(TEST_QT_MOC_CPP)
 
 test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
+
 test_bitcoin_qt_SOURCES = \
   test_main.cpp \
   uritests.cpp \
@@ -30,7 +31,9 @@ if ENABLE_WALLET
 test_bitcoin_qt_SOURCES += \
   paymentservertests.cpp
 endif
+
 nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
+
 test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
 if ENABLE_WALLET
 test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
@@ -40,4 +43,3 @@ test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
   $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
 
 CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
-